Update examples

kateinoigakukun · kateinoigakukun · commit 00889ece9079 · 2025-03-06T17:49:40.000+09:00
diff --git a/Examples/Basic/index.html b/Examples/Basic/index.html
@@ -14,8 +14,8 @@
 
 <body>
   <script type="module">
-    import { instantiate } from "./.build/plugins/PackageToJS/outputs/Package/index.js";
-    await instantiate(fetch("./.build/plugins/PackageToJS/outputs/Package/main.wasm"));
+    import { init } from "./.build/plugins/PackageToJS/outputs/Package/index.js";
+    await init(fetch("./.build/plugins/PackageToJS/outputs/Package/main.wasm"));
   </script>
 </body>
 
diff --git a/Examples/Embedded/index.html b/Examples/Embedded/index.html
@@ -14,8 +14,8 @@
 
 <body>
   <script type="module">
-    import { instantiate } from "./.build/plugins/PackageToJS/outputs/Package/index.js";
-    await instantiate(fetch("./.build/plugins/PackageToJS/outputs/Package/main.wasm"));
+    import { init } from "./.build/plugins/PackageToJS/outputs/Package/index.js";
+    await init(fetch("./.build/plugins/PackageToJS/outputs/Package/main.wasm"));
   </script>
 </body>
 
diff --git a/Plugins/PackageToJS/Templates/bin/test.js b/Plugins/PackageToJS/Templates/bin/test.js
@@ -1,8 +1,4 @@
-import { NodeRunner, BrowserRunner } from "../test.js"
+import { NodeRunner } from "../test.js"
 
-const runners = {
-    "node": NodeRunner,
-    "browser": BrowserRunner,
-}
-const runner = new runners[process.env.TEST_RUNNER || "node"]()
+const runner = new NodeRunner()
 await runner.run()
diff --git a/Plugins/PackageToJS/Templates/index.d.ts b/Plugins/PackageToJS/Templates/index.d.ts
@@ -1,7 +1,4 @@
-/**
- * The path to the WebAssembly module relative to the root of the package
- */
-export declare const MODULE_PATH: string;
+import type { Import, Export } from './instantiate.js'
 
 export type Options = {
     /**
@@ -26,9 +23,3 @@ export declare function init(
     instance: WebAssembly.Instance,
     exports: Export
 }>
-
-export declare function runTest(
-    moduleSource: WebAssembly.Module | ArrayBufferView | ArrayBuffer | Response | PromiseLike<Response>,
-    imports: Import,
-    options: Options | undefined
-): Promise<{ exitCode: number }>
diff --git a/Plugins/PackageToJS/Templates/index.js b/Plugins/PackageToJS/Templates/index.js
@@ -1,7 +1,6 @@
 // @ts-check
 import { WASI, WASIProcExit, File, OpenFile, ConsoleStdout, PreopenDirectory } from '@bjorn3/browser_wasi_shim';
-import { instantiate } from './instantiate.js';
-export const MODULE_PATH = "@PACKAGE_TO_JS_MODULE_PATH@";
+import { instantiate, MODULE_PATH } from './instantiate.js';
 
 /** @type {import('./index.d').init} */
 export async function init(
@@ -29,20 +28,3 @@ export async function init(
         exports,
     }
 }
-
-/** @type {import('./index.d').runTest} */
-export async function runTest(
-    moduleSource,
-    imports,
-    options
-) {
-    try {
-        const { instance, exports } = await init(moduleSource, imports, options);
-        return { exitCode: 0 };
-    } catch (error) {
-        if (error instanceof WASIProcExit) {
-            return { exitCode: error.code };
-        }
-        throw error;
-    }
-}
diff --git a/Plugins/PackageToJS/Templates/instantiate.d.ts b/Plugins/PackageToJS/Templates/instantiate.d.ts
@@ -5,6 +5,11 @@ export type Export = {
     // TODO: Generate type from .swift files
 }
 
+/**
+ * The path to the WebAssembly module relative to the root of the package
+ */
+export declare const MODULE_PATH: string;
+
 /**
  * Low-level interface to create an instance of a WebAssembly module
  *
diff --git a/Plugins/PackageToJS/Templates/instantiate.js b/Plugins/PackageToJS/Templates/instantiate.js
@@ -2,6 +2,8 @@
 // @ts-ignore
 import { SwiftRuntime } from "./runtime.js"
 
+export const MODULE_PATH = "@PACKAGE_TO_JS_MODULE_PATH@";
+
 /** @type {import('./instantiate.d').createInstantiator} */
 export async function createInstantiator(
     imports,
diff --git a/Plugins/PackageToJS/Templates/test.d.ts b/Plugins/PackageToJS/Templates/test.d.ts
@@ -2,8 +2,3 @@ export declare class NodeRunner {
     constructor()
     run(): Promise<void>
 }
-
-export declare class BrowserRunner {
-    constructor()
-    run(): Promise<void>
-}
diff --git a/Plugins/PackageToJS/Templates/test.js b/Plugins/PackageToJS/Templates/test.js
@@ -45,10 +45,3 @@ Please ensure you are using Node.js v18.x or newer.
         swift.main()
     }
 }
-
-export class BrowserRunner {
-    constructor() { }
-
-    async run() {
-    }
-}

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,11 @@ export type Export = {`
`5`	`5`	`// TODO: Generate type from .swift files`
`6`	`6`	`}`
`7`	`7`
	`8`	`+/**`
	`9`	`+ * The path to the WebAssembly module relative to the root of the package`
	`10`	`+ */`
	`11`	`+export declare const MODULE_PATH: string;`
	`12`	`+`
`8`	`13`	`/**`
`9`	`14`	`* Low-level interface to create an instance of a WebAssembly module`
`10`	`15`	`*`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,3 @@ export declare class NodeRunner {`
`2`	`2`	`constructor()`
`3`	`3`	`run(): Promise<void>`
`4`	`4`	`}`
`5`		`-`
`6`		`-export declare class BrowserRunner {`
`7`		`- constructor()`
`8`		`- run(): Promise<void>`
`9`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -45,10 +45,3 @@ Please ensure you are using Node.js v18.x or newer.`
`45`	`45`	`swift.main()`
`46`	`46`	`}`
`47`	`47`	`}`
`48`		`-`
`49`		`-export class BrowserRunner {`
`50`		`- constructor() { }`
`51`		`-`
`52`		`- async run() {`
`53`		`- }`
`54`		`-}`