From a11599ca990d239073f4b9978723800d8565d9fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dirk=20B=C3=A4umer?= Date: Mon, 26 Aug 2024 20:17:52 +0200 Subject: [PATCH] Update samples to latest component model (#1089) --- wasm-component-model-async/package-lock.json | 8 ++++---- wasm-component-model-async/package.json | 2 +- wasm-component-model-async/src/calculator.ts | 13 +++++++------ wasm-component-model-resource/package-lock.json | 8 ++++---- wasm-component-model-resource/package.json | 2 +- wasm-component-model-resource/src/calculator.ts | 12 ++++++------ wasm-component-model/package-lock.json | 8 ++++---- wasm-component-model/package.json | 2 +- wasm-component-model/src/calculator.ts | 3 +++ 9 files changed, 31 insertions(+), 27 deletions(-) diff --git a/wasm-component-model-async/package-lock.json b/wasm-component-model-async/package-lock.json index b88b2032e..9951869be 100644 --- a/wasm-component-model-async/package-lock.json +++ b/wasm-component-model-async/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "MIT", "dependencies": { - "@vscode/wasm-component-model": "0.1.0-pre.13" + "@vscode/wasm-component-model": "0.1.0-pre.16" }, "devDependencies": { "@types/node": "^18.14.6", @@ -794,9 +794,9 @@ "dev": true }, "node_modules/@vscode/wasm-component-model": { - "version": "0.1.0-pre.13", - "resolved": "https://registry.npmjs.org/@vscode/wasm-component-model/-/wasm-component-model-0.1.0-pre.13.tgz", - "integrity": "sha512-GFB3WCbTNagaN0+BaJ6YJVsHsglWIpG8FdCqU2BaMpqR/+zHD0BRJl6y9ZrYihlkgzFkhyZRrGeWK0N4Ce11hg==", + "version": "0.1.0-pre.16", + "resolved": "https://registry.npmjs.org/@vscode/wasm-component-model/-/wasm-component-model-0.1.0-pre.16.tgz", + "integrity": "sha512-fe4J7Nz7PKlLuZ3z8zQNp7n/6w+RwDW2kCyHI0dRGQ0Htjz0al3guEynn+o/FywCamywwRUoQO9wIhRJBwvj/w==", "dependencies": { "semver": "^7.6.0", "uuid": "^9.0.1", diff --git a/wasm-component-model-async/package.json b/wasm-component-model-async/package.json index 6163c52f0..f6f6c8f0c 100644 --- a/wasm-component-model-async/package.json +++ b/wasm-component-model-async/package.json @@ -29,7 +29,7 @@ ] }, "dependencies": { - "@vscode/wasm-component-model": "0.1.0-pre.13" + "@vscode/wasm-component-model": "0.1.0-pre.16" }, "devDependencies": { "@types/vscode": "1.89.0", diff --git a/wasm-component-model-async/src/calculator.ts b/wasm-component-model-async/src/calculator.ts index 1385468ab..d66b58679 100644 --- a/wasm-component-model-async/src/calculator.ts +++ b/wasm-component-model-async/src/calculator.ts @@ -76,11 +76,12 @@ export type Types = { }; export namespace calculator { export type Operation = Types.Operation; + export const Operation = Types.Operation; export type Imports = { log: (msg: string) => void; }; export namespace Imports { - export type Promisified = $wcm.$imports.Promisify + export type Promisified = $wcm.$imports.Promisify; } export namespace imports { export type Promisify = $wcm.$imports.Promisify; @@ -89,7 +90,7 @@ export namespace calculator { calc: (o: Operation) => u32; }; export namespace Exports { - export type Promisified = $wcm.$exports.Promisify + export type Promisified = $wcm.$exports.Promisify; } export namespace exports { export type Promisify = $wcm.$exports.Promisify; @@ -106,7 +107,7 @@ export namespace Types.$ { export namespace Types._ { export const id = 'vscode:example/types' as const; export const witName = 'types' as const; - export const types: Map = new Map([ + export const types: Map = new Map([ ['Operands', $.Operands], ['Operation', $.Operation] ]); @@ -143,7 +144,7 @@ export namespace calculator._ { return $wcm.$imports.create(_, service, context); } export function loop(service: calculator.Imports, context: $wcm.WasmContext): calculator.Imports { - return $wcm.$imports.loop(_, service, context); + return $wcm.$imports.loop(_, service, context); } } export type Imports = { @@ -161,8 +162,8 @@ export namespace calculator._ { 'calc': (o_Operation_case: i32, o_Operation_0: i32, o_Operation_1: i32) => i32; }; export function bind(service: calculator.Imports, code: $wcm.Code, context?: $wcm.ComponentModelContext): Promise; - export function bind(service: $wcm.$imports.Promisify, code: $wcm.Code, port: $wcm.RAL.ConnectionPort, context?: $wcm.ComponentModelContext): Promise<$wcm.$exports.Promisify>; - export function bind(service: calculator.Imports | $wcm.$imports.Promisify, code: $wcm.Code, portOrContext?: $wcm.RAL.ConnectionPort | $wcm.ComponentModelContext, context?: $wcm.ComponentModelContext | undefined): Promise | Promise<$wcm.$exports.Promisify> { + export function bind(service: calculator.Imports.Promisified, code: $wcm.Code, port: $wcm.RAL.ConnectionPort, context?: $wcm.ComponentModelContext): Promise; + export function bind(service: calculator.Imports | calculator.Imports.Promisified, code: $wcm.Code, portOrContext?: $wcm.RAL.ConnectionPort | $wcm.ComponentModelContext, context?: $wcm.ComponentModelContext | undefined): Promise | Promise { return $wcm.$main.bind(_, service, code, portOrContext, context); } } \ No newline at end of file diff --git a/wasm-component-model-resource/package-lock.json b/wasm-component-model-resource/package-lock.json index d3ec47b80..5f02a8c47 100644 --- a/wasm-component-model-resource/package-lock.json +++ b/wasm-component-model-resource/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "MIT", "dependencies": { - "@vscode/wasm-component-model": "0.1.0-pre.13" + "@vscode/wasm-component-model": "0.1.0-pre.16" }, "devDependencies": { "@types/node": "^18.14.6", @@ -794,9 +794,9 @@ "dev": true }, "node_modules/@vscode/wasm-component-model": { - "version": "0.1.0-pre.13", - "resolved": "https://registry.npmjs.org/@vscode/wasm-component-model/-/wasm-component-model-0.1.0-pre.13.tgz", - "integrity": "sha512-GFB3WCbTNagaN0+BaJ6YJVsHsglWIpG8FdCqU2BaMpqR/+zHD0BRJl6y9ZrYihlkgzFkhyZRrGeWK0N4Ce11hg==", + "version": "0.1.0-pre.16", + "resolved": "https://registry.npmjs.org/@vscode/wasm-component-model/-/wasm-component-model-0.1.0-pre.16.tgz", + "integrity": "sha512-fe4J7Nz7PKlLuZ3z8zQNp7n/6w+RwDW2kCyHI0dRGQ0Htjz0al3guEynn+o/FywCamywwRUoQO9wIhRJBwvj/w==", "dependencies": { "semver": "^7.6.0", "uuid": "^9.0.1", diff --git a/wasm-component-model-resource/package.json b/wasm-component-model-resource/package.json index 69ffafe12..3027d58c1 100644 --- a/wasm-component-model-resource/package.json +++ b/wasm-component-model-resource/package.json @@ -29,7 +29,7 @@ ] }, "dependencies": { - "@vscode/wasm-component-model": "0.1.0-pre.13" + "@vscode/wasm-component-model": "0.1.0-pre.16" }, "devDependencies": { "@types/vscode": "1.88.0", diff --git a/wasm-component-model-resource/src/calculator.ts b/wasm-component-model-resource/src/calculator.ts index ad5f703ec..75b2fbec3 100644 --- a/wasm-component-model-resource/src/calculator.ts +++ b/wasm-component-model-resource/src/calculator.ts @@ -38,7 +38,7 @@ export namespace calculator { export type Imports = { }; export namespace Imports { - export type Promisified = $wcm.$imports.Promisify + export type Promisified = $wcm.$imports.Promisify; } export namespace imports { export type Promisify = $wcm.$imports.Promisify; @@ -47,7 +47,7 @@ export namespace calculator { types: Types; }; export namespace Exports { - export type Promisified = $wcm.$exports.Promisify + export type Promisified = $wcm.$exports.Promisify; } export namespace exports { export type Promisify = $wcm.$exports.Promisify; @@ -85,7 +85,7 @@ export namespace Types._ { export type WasmInterface = Engine.WasmInterface & { '[dtor]engine': (self: i32) => void }; } } - export const types: Map = new Map([ + export const types: Map = new Map([ ['Operation', $.Operation], ['Engine', $.Engine] ]); @@ -118,7 +118,7 @@ export namespace calculator._ { return $wcm.$imports.create(_, service, context); } export function loop(service: calculator.Imports, context: $wcm.WasmContext): calculator.Imports { - return $wcm.$imports.loop(_, service, context); + return $wcm.$imports.loop(_, service, context); } } export type Imports = { @@ -139,8 +139,8 @@ export namespace calculator._ { 'vscode:example/types#[method]engine.execute': (self: i32) => i32; }; export function bind(service: calculator.Imports, code: $wcm.Code, context?: $wcm.ComponentModelContext): Promise; - export function bind(service: $wcm.$imports.Promisify, code: $wcm.Code, port: $wcm.RAL.ConnectionPort, context?: $wcm.ComponentModelContext): Promise<$wcm.$exports.Promisify>; - export function bind(service: calculator.Imports | $wcm.$imports.Promisify, code: $wcm.Code, portOrContext?: $wcm.RAL.ConnectionPort | $wcm.ComponentModelContext, context?: $wcm.ComponentModelContext | undefined): Promise | Promise<$wcm.$exports.Promisify> { + export function bind(service: calculator.Imports.Promisified, code: $wcm.Code, port: $wcm.RAL.ConnectionPort, context?: $wcm.ComponentModelContext): Promise; + export function bind(service: calculator.Imports | calculator.Imports.Promisified, code: $wcm.Code, portOrContext?: $wcm.RAL.ConnectionPort | $wcm.ComponentModelContext, context?: $wcm.ComponentModelContext | undefined): Promise | Promise { return $wcm.$main.bind(_, service, code, portOrContext, context); } } \ No newline at end of file diff --git a/wasm-component-model/package-lock.json b/wasm-component-model/package-lock.json index 8a61db5f0..0d8740c96 100644 --- a/wasm-component-model/package-lock.json +++ b/wasm-component-model/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "MIT", "dependencies": { - "@vscode/wasm-component-model": "0.1.0-pre.15" + "@vscode/wasm-component-model": "0.1.0-pre.16" }, "devDependencies": { "@types/node": "^18.14.6", @@ -794,9 +794,9 @@ "dev": true }, "node_modules/@vscode/wasm-component-model": { - "version": "0.1.0-pre.15", - "resolved": "https://registry.npmjs.org/@vscode/wasm-component-model/-/wasm-component-model-0.1.0-pre.15.tgz", - "integrity": "sha512-CnFjmDV7wKsteheSDdAO7yGF1eBvNHJjQ0x9petSKL+UVtn9oqKZ3TpJjlkLws1olIHWfzCHD9Ib9di41YBS0w==", + "version": "0.1.0-pre.16", + "resolved": "https://registry.npmjs.org/@vscode/wasm-component-model/-/wasm-component-model-0.1.0-pre.16.tgz", + "integrity": "sha512-fe4J7Nz7PKlLuZ3z8zQNp7n/6w+RwDW2kCyHI0dRGQ0Htjz0al3guEynn+o/FywCamywwRUoQO9wIhRJBwvj/w==", "dependencies": { "semver": "^7.6.0", "uuid": "^9.0.1", diff --git a/wasm-component-model/package.json b/wasm-component-model/package.json index c1cedd919..93713a1b8 100644 --- a/wasm-component-model/package.json +++ b/wasm-component-model/package.json @@ -29,7 +29,7 @@ ] }, "dependencies": { - "@vscode/wasm-component-model": "0.1.0-pre.15" + "@vscode/wasm-component-model": "0.1.0-pre.16" }, "devDependencies": { "@types/vscode": "1.88.0", diff --git a/wasm-component-model/src/calculator.ts b/wasm-component-model/src/calculator.ts index 599b6e7f8..d66b58679 100644 --- a/wasm-component-model/src/calculator.ts +++ b/wasm-component-model/src/calculator.ts @@ -137,6 +137,9 @@ export namespace calculator._ { export const functions: Map = new Map([ ['log', $.imports.log] ]); + export const interfaces: Map = new Map([ + ['Types', Types._] + ]); export function create(service: calculator.Imports, context: $wcm.WasmContext): Imports { return $wcm.$imports.create(_, service, context); }