PackageToJS: Make some options optional in option setup functions

Author: kateinoigakukun

Plugins/PackageToJS/Templates/platforms/browser.d.ts

@@ -1,6 +1,6 @@
 import type { InstantiateOptions, ModuleSource/* #if HAS_IMPORTS */, Imports/* #endif */ } from "../instantiate.js"
 
-export function defaultBrowserSetup(options: {
+export function defaultBrowserSetup(options?: {
     module: ModuleSource,
 /* #if IS_WASI */
     args?: string[],
@@ -11,7 +11,7 @@ export function defaultBrowserSetup(options: {
     getImports: () => Imports,
 /* #endif */
 /* #if USE_SHARED_MEMORY */
-    spawnWorker: (module: WebAssembly.Module, memory: WebAssembly.Memory, startArg: any) => Worker,
+    spawnWorker?: (module: WebAssembly.Module, memory: WebAssembly.Memory, startArg: any) => Worker,
 /* #endif */
 }): Promise<InstantiateOptions>
 

Plugins/PackageToJS/Templates/platforms/browser.js

@@ -102,9 +102,9 @@ class DefaultBrowserThreadRegistry {
 /** @type {import('./browser.d.ts').defaultBrowserSetup} */
 export async function defaultBrowserSetup(options) {
 /* #if IS_WASI */
-    const args = options.args ?? []
-    const onStdoutLine = options.onStdoutLine ?? ((line) => console.log(line))
-    const onStderrLine = options.onStderrLine ?? ((line) => console.error(line))
+    const args = options?.args ?? []
+    const onStdoutLine = options?.onStdoutLine ?? ((line) => console.log(line))
+    const onStderrLine = options?.onStderrLine ?? ((line) => console.error(line))
     const wasi = new WASI(/* args */[MODULE_PATH, ...args], /* env */[], /* fd */[
         new OpenFile(new File([])), // stdin
         ConsoleStdout.lineBuffered((stdout) => {
@@ -118,13 +118,13 @@ export async function defaultBrowserSetup(options) {
 /* #endif */
 /* #if USE_SHARED_MEMORY */
     const memory = new WebAssembly.Memory(MEMORY_TYPE);
-    const threadChannel = new DefaultBrowserThreadRegistry(options.spawnWorker)
+    const threadChannel = new DefaultBrowserThreadRegistry(options?.spawnWorker || createDefaultWorkerFactory())
 /* #endif */
 
     return {
-        module: options.module,
+        module: options?.module,
 /* #if HAS_IMPORTS */
-        getImports() { return options.getImports() },
+        getImports() { return options?.getImports() },
 /* #endif */
 /* #if IS_WASI */
         wasi: Object.assign(wasi, {

Plugins/PackageToJS/Templates/platforms/node.d.ts

@@ -7,10 +7,10 @@ export type DefaultNodeSetupOptions = {
 /* #endif */
     onExit?: (code: number) => void,
 /* #if USE_SHARED_MEMORY */
-    spawnWorker: (module: WebAssembly.Module, memory: WebAssembly.Memory, startArg: any) => Worker,
+    spawnWorker?: (module: WebAssembly.Module, memory: WebAssembly.Memory, startArg: any) => Worker,
 /* #endif */
 }
 
-export function defaultNodeSetup(options: DefaultNodeSetupOptions): Promise<InstantiateOptions>
+export function defaultNodeSetup(options?: DefaultNodeSetupOptions): Promise<InstantiateOptions>
 
 export function createDefaultWorkerFactory(preludeScript?: string): (module: WebAssembly.Module, memory: WebAssembly.Memory, startArg: any) => Worker

Plugins/PackageToJS/Templates/platforms/node.js

@@ -113,7 +113,7 @@ class DefaultNodeThreadRegistry {
 /* #endif */
 
 /** @type {import('./node.d.ts').defaultNodeSetup} */
-export async function defaultNodeSetup(options) {
+export async function defaultNodeSetup(options = {}) {
     const path = await import("node:path");
     const { fileURLToPath } = await import("node:url");
     const { readFile } = await import("node:fs/promises")
@@ -134,7 +134,7 @@ export async function defaultNodeSetup(options) {
     const module = await WebAssembly.compile(new Uint8Array(await readFile(path.join(pkgDir, MODULE_PATH))))
 /* #if USE_SHARED_MEMORY */
     const memory = new WebAssembly.Memory(MEMORY_TYPE);
-    const threadChannel = new DefaultNodeThreadRegistry(options.spawnWorker)
+    const threadChannel = new DefaultNodeThreadRegistry(options.spawnWorker || createDefaultWorkerFactory())
 /* #endif */
 
     return {