PackageToJS: Fetch module from the default location if init is called without options

kateinoigakukun · kateinoigakukun · commit ec9470c122bf · 2025-03-17T07:26:21.000Z
diff --git a/.gitignore b/.gitignore
@@ -9,4 +9,4 @@ xcuserdata/
 .vscode
 Examples/*/Bundle
 Examples/*/package-lock.json
-/Package.resolved
+Package.resolved
diff --git a/Examples/ActorOnWebWorker/index.html b/Examples/ActorOnWebWorker/index.html
@@ -8,7 +8,7 @@
 <body>
   <script type="module">
     import { init } from "./Bundle/index.js"
-    init(fetch(new URL("./Bundle/main.wasm", import.meta.url)));
+    init();
   </script>
   <h1>Full-text Search with Actor on Web Worker</h1>
 
diff --git a/Examples/Basic/.gitignore b/Examples/Basic/.gitignore
diff --git a/Examples/Basic/index.html b/Examples/Basic/index.html
@@ -8,7 +8,7 @@
 <body>
   <script type="module">
     import { init } from "./.build/plugins/PackageToJS/outputs/Package/index.js";
-    await init(fetch("./.build/plugins/PackageToJS/outputs/Package/main.wasm"));
+    init();
   </script>
 </body>
 
diff --git a/Examples/Embedded/.gitignore b/Examples/Embedded/.gitignore
diff --git a/Examples/Embedded/index.html b/Examples/Embedded/index.html
@@ -8,7 +8,7 @@
 <body>
   <script type="module">
     import { init } from "./.build/plugins/PackageToJS/outputs/Package/index.js";
-    await init(fetch("./.build/plugins/PackageToJS/outputs/Package/main.wasm"));
+    init();
   </script>
 </body>
 
diff --git a/Examples/Multithreading/.gitignore b/Examples/Multithreading/.gitignore
diff --git a/Examples/Multithreading/index.html b/Examples/Multithreading/index.html
@@ -29,7 +29,7 @@
 <body>
   <script type="module">
     import { init } from "./Bundle/index.js"
-    init(fetch(new URL("./Bundle/main.wasm", import.meta.url)));
+    init();
   </script>
   <h1>Threading Example</h1>
   <p>
diff --git a/Examples/OffscrenCanvas/.gitignore b/Examples/OffscrenCanvas/.gitignore
diff --git a/Examples/OffscrenCanvas/index.html b/Examples/OffscrenCanvas/index.html
@@ -70,7 +70,7 @@
 <body>
   <script type="module">
     import { init } from "./Bundle/index.js"
-    init(fetch(new URL("./Bundle/main.wasm", import.meta.url)));
+    init();
   </script>
   <h1>OffscreenCanvas Example</h1>
   <p>
diff --git a/Plugins/PackageToJS/Templates/index.d.ts b/Plugins/PackageToJS/Templates/index.d.ts
@@ -1,29 +1,21 @@
-import type { Import, Export } from './instantiate.js'
+import type { Export, ModuleSource } from './instantiate.js'
 
 export type Options = {
     /**
-     * The CLI arguments to pass to the WebAssembly module
+     * The WebAssembly module to instantiate
+     *
+     * If not provided, the module will be fetched from the default path.
      */
-    args?: string[]
-/* #if USE_SHARED_MEMORY */
-    /**
-     * The WebAssembly memory to use (must be 'shared')
-     */
-    memory: WebAssembly.Memory
-/* #endif */
+    module?: ModuleSource
 }
 
 /**
- * Initialize the given WebAssembly module
+ * Instantiate and initialize the module
  *
- * This is a convenience function that creates an instantiator and instantiates the module.
- * @param moduleSource - The WebAssembly module to instantiate
- * @param imports - The imports to add
- * @param options - The options
+ * This is a convenience function for browser environments.
+ * If you need a more flexible API, see `instantiate`.
  */
-export declare function init(
-    moduleSource: WebAssembly.Module | ArrayBufferView | ArrayBuffer | Response | PromiseLike<Response>
-): Promise<{
+export declare function init(options?: Options): Promise<{
     instance: WebAssembly.Instance,
     exports: Export
 }>
diff --git a/Plugins/PackageToJS/Templates/index.js b/Plugins/PackageToJS/Templates/index.js
@@ -3,12 +3,16 @@ import { instantiate } from './instantiate.js';
 import { defaultBrowserSetup /* #if USE_SHARED_MEMORY */, createDefaultWorkerFactory /* #endif */} from './platforms/browser.js';
 
 /** @type {import('./index.d').init} */
-export async function init(moduleSource) {
-    const options = await defaultBrowserSetup({
-        module: moduleSource,
+export async function init(options = {}) {
+    let module = options.module;
+    if (!module) {
+        module = fetch(new URL("@PACKAGE_TO_JS_MODULE_PATH@", import.meta.url))
+    }
+    const instantiateOptions = await defaultBrowserSetup({
+        module,
 /* #if USE_SHARED_MEMORY */
         spawnWorker: createDefaultWorkerFactory()
 /* #endif */
     })
-    return await instantiate(options);
+    return await instantiate(instantiateOptions);
 }
diff --git a/Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Resources/hello-world-2-2-index-html.html b/Sources/JavaScriptKit/Documentation.docc/Tutorials/Hello-World/Resources/hello-world-2-2-index-html.html
@@ -5,7 +5,7 @@
     <title>Swift Web App</title>
     <script type="module">
         import { init } from "./.build/plugins/PackageToJS/outputs/Package/index.js";
-        await init(fetch("./.build/plugins/PackageToJS/outputs/Package/main.wasm"));
+        init();
     </script>
 </head>
 <body>
