Support latest wasm-tools version (#184)

* Add functions to WorldType * Support latest wasm-tools version
microsoft · Aug 26, 2024 · 8a5c437 · 8a5c437
1 parent 9e7dab8
commit 8a5c437
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 8 deletions.
diff --git a/wasm-component-model/package-lock.json b/wasm-component-model/package-lock.json
diff --git a/wasm-component-model/package.json b/wasm-component-model/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@vscode/wasm-component-model",
-	"version": "0.1.0-pre.15",
+	"version": "0.1.0-pre.16",
 	"description": "A VS Code specific component model implementation",
 	"author": "Visual Studio Code Team",
 	"license": "MIT",

diff --git a/wasm-component-model/src/common/componentModel.ts b/wasm-component-model/src/common/componentModel.ts
@@ -4035,11 +4035,16 @@ export type WorldType = {
 	readonly imports?: {
 		readonly functions?: Map<string, FunctionType<JFunction>>;
 		readonly interfaces?: Map<string, InterfaceType>;
+		create?(service: any, context: WasmContext): any;
+		loop?(service: any, context: WasmContext): any;
 	};
 	readonly exports?: {
 		readonly functions?: Map<string, FunctionType<JFunction>>;
 		readonly interfaces?: Map<string, InterfaceType>;
+		bind?(service: any, context: WasmContext): any;
 	};
+	bind?(service: any, code: Code, context?: ComponentModelContext): Promise<any>;
+	bind?(service: any, code: Code, port: RAL.ConnectionPort, context?: ComponentModelContext): Promise<any>;
 };
 
 export type PackageType = {

diff --git a/wasm-component-model/src/tools/wit-json.ts b/wasm-component-model/src/tools/wit-json.ts
@@ -419,7 +419,7 @@ export namespace ObjectKind {
 		return typeof (kind as FuncObject).function === 'object';
 	}
 	export function isInterfaceObject(kind: ObjectKind): kind is InterfaceObject {
-		return typeof (kind as InterfaceObject).interface === 'number';
+		return InterfaceObjectId.is((kind as InterfaceObject).interface);
 	}
 }
 
@@ -431,8 +431,20 @@ export interface FuncObject {
 	function: Func;
 }
 
+export type InterfaceObjectId = number | { id: number};
+export namespace InterfaceObjectId {
+	export function isNumber(value: InterfaceObjectId): value is number {
+		return typeof value === 'number';
+	}
+	export function isId(value: InterfaceObjectId): value is { id: number } {
+		return typeof value === 'object' && typeof (value as { id: number }).id === 'number';
+	}
+	export function is(value: InterfaceObjectId): value is { id: number } {
+		return isNumber(value) || isId(value);
+	}
+}
 export interface InterfaceObject {
-	interface: number;
+	interface: InterfaceObjectId;
 }
 
 export type TypeReference = number | string;

diff --git a/wasm-component-model/src/tools/wit2ts.ts b/wasm-component-model/src/tools/wit2ts.ts
@@ -9,7 +9,7 @@ import * as path from 'node:path';
 import { ResolvedOptions } from './options';
 import {
 	AbstractType, BaseType, BorrowHandleType, Callable, Constructor, Document, Documentation, EnumCase, EnumType, Field, Flag,
-	FlagsType, Func, Interface, ListType, Member, Method, ObjectKind, OptionType, OwnHandleType, Owner, Package, Param,
+	FlagsType, Func, Interface, InterfaceObjectId, ListType, Member, Method, ObjectKind, OptionType, OwnHandleType, Owner, Package, Param,
 	RecordType, ReferenceType, ResourceType, ResultType, StaticMethod, TupleType, Type, TypeKind, TypeReference, VariantCase,
 	VariantType, World, type InterfaceObject, type PackageNameParts, type TypeObject
 } from './wit-json';
@@ -720,8 +720,14 @@ class SymbolTable {
 		return this.resultErrorTypes.has(item);
 	}
 
-	public getInterface(ref: number): Interface {
-		return this.document.interfaces[ref];
+	public getInterface(ref: InterfaceObjectId): Interface {
+		if (InterfaceObjectId.isNumber(ref)) {
+			return this.document.interfaces[ref];
+		} else if (InterfaceObjectId.isId(ref)) {
+			return this.document.interfaces[ref.id];
+		} else {
+			throw new Error(`Unknown interface object id ${JSON.stringify(ref)}`);
+		}
 	}
 
 	public getPackage(ref: number): Package {