@bytecodealliance/jco 0.14.0 → 0.14.2

package/src/cmd/run.js

@@ -10,7 +10,54 @@ import c from 'chalk-template';
 export async function run (componentPath, args, opts) {
   // Ensure that `args` is an array
   args = [...args];
+  return runComponent(componentPath, args, opts, `
+    if (!mod.run || !mod.run.run) {
+      console.error('Not a valid command component to execute.');
+      process.exit(1);
+    }
+    try {
+      mod.run.run();
+      // for stdout flushing
+      await new Promise(resolve => setTimeout(resolve));
+      process.exit(0);
+    }
+    catch (e) {
+      console.error(e);
+      process.exit(1);
+    }
+  `);
+}
+
+export async function serve (componentPath, args, opts) {
+  let tryFindPort = false;
+  let { port, host } = opts;
+  if (port === undefined) {
+    tryFindPort = true;
+    port = '8000';
+  }
+  // Ensure that `args` is an array
+  args = [...args];
+  return runComponent(componentPath, args, opts, `
+    import { HTTPServer } from '@bytecodealliance/preview2-shim/http';
+    const server = new HTTPServer(mod.incomingHandler);
+    ${tryFindPort ? `
+    let port = ${port};
+    while (true) {
+      try {
+        server.listen(port, ${JSON.stringify(host)});
+        break;
+      } catch (e) {
+        if (e.code !== 'EADDRINUSE')
+          throw e;
+      }
+      port++;
+    }
+    ` : `server.listen(${port}, ${JSON.stringify(host)})`}
+    console.error(\`Server listening on \${port}...\`);
+  `);
+}
 
+async function runComponent (componentPath, args, opts, executor) {
   const jcoImport = opts.jcoImport ? resolve(opts.jcoImport) : null;
 
   const name = basename(componentPath.slice(0, -extname(componentPath).length || Infinity));
@@ -18,6 +65,7 @@ export async function run (componentPath, args, opts) {
   if (opts.jcoDir) {
     await mkdir(outDir, { recursive: true });
   }
+
   try {
     try {
       await transpile(componentPath, {
@@ -26,7 +74,8 @@ export async function run (componentPath, args, opts) {
         noTypescript: true,
         wasiShim: true,
         outDir,
-        tracing: opts.jcoTrace
+        tracing: opts.jcoTrace,
+        map: opts.jcoMap
       });
     }
     catch (e) {
@@ -63,30 +112,11 @@ export async function run (componentPath, args, opts) {
     const runPath = resolve(outDir, '_run.js');
     await writeFile(runPath, `
       ${jcoImport ? `import ${JSON.stringify(pathToFileURL(jcoImport))}` : ''}
-      function logInvalidCommand () {
-        console.error('Not a valid command component to execute, make sure it was built to a command adapter and with the same version.');
-      }
       try {
         process.argv[1] = "${name}";
-        const mod = await import('./${name}.js');
-        if (!mod.run || !mod.run.run) {
-          logInvalidCommand();
-          process.exit(1);
-        }
-        try {
-          mod.run.run();
-          // TODO: figure out stdout flush!
-          setTimeout(() => {});
-        }
-        catch (e) {
-          console.error(e);
-          process.exit(1);
-        }
-      }
-      catch (e) {
-        logInvalidCommand();
-        throw e;
-      }
+      } catch {}
+      const mod = await import('./${name}.js');
+      ${executor}
     `);
 
     process.exitCode = await new Promise((resolve, reject) => {
@@ -102,4 +132,4 @@ export async function run (componentPath, args, opts) {
         await rm(outDir, { recursive: true });
     } catch {}
   }
-}
+}

package/src/cmd/transpile.d.ts

@@ -8,13 +8,13 @@ export function transpile(componentPath: any, opts: any, program: any): Promise<
  *   map?: Record<string, string>,
  *   validLiftingOptimization?: bool,
  *   tracing?: bool,
- *   noNodejsCompat?: bool,
+ *   nodejsCompat?: bool,
  *   tlaCompat?: bool,
  *   base64Cutoff?: bool,
  *   js?: bool,
  *   minify?: bool,
  *   optimize?: bool,
- *   noNamespacedExports?: bool,
+ *   namespacedExports?: bool,
  *   optArgs?: string[],
  * }} opts
  * @returns {Promise<{ files: { [filename: string]: Uint8Array }, imports: string[], exports: [string, 'function' | 'instance'][] }>}
@@ -25,13 +25,13 @@ export function transpileComponent(component: Uint8Array, opts?: {
     map?: Record<string, string>;
     validLiftingOptimization?: bool;
     tracing?: bool;
-    noNodejsCompat?: bool;
+    nodejsCompat?: bool;
     tlaCompat?: bool;
     base64Cutoff?: bool;
     js?: bool;
     minify?: bool;
     optimize?: bool;
-    noNamespacedExports?: bool;
+    namespacedExports?: bool;
     optArgs?: string[];
 }): Promise<{
     files: {

package/src/cmd/transpile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transpile.d.ts","sourceRoot":"","sources":["transpile.js"],"names":[],"mappings":"AAWA,sFA2BC;AAuBD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,8CAlBW,UAAU;UAEV,MAAM;oBACI,OAAO,GAAG,MAAM;UAC1B,OAAO,MAAM,EAAE,MAAM,CAAC;;;;;;;;;;cAUlB,MAAM,EAAE;;;;;aAEoD,MAAM,EAAE;aAAW,CAAC,MAAM,EAAE,UAAU,GAAG,UAAU,CAAC,EAAE;GA4IhI"}
+{"version":3,"file":"transpile.d.ts","sourceRoot":"","sources":["transpile.js"],"names":[],"mappings":"AAWA,sFA2BC;AAuBD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,8CAlBW,UAAU;UAEV,MAAM;oBACI,OAAO,GAAG,MAAM;UAC1B,OAAO,MAAM,EAAE,MAAM,CAAC;;;;;;;;;;cAUlB,MAAM,EAAE;;;;;aAEoD,MAAM,EAAE;aAAW,CAAC,MAAM,EAAE,UAAU,GAAG,UAAU,CAAC,EAAE;GAmShI"}

package/src/cmd/transpile.js

@@ -81,7 +81,7 @@ async function wasm2Js (source) {
  */
 export async function transpileComponent (component, opts = {}) {
   await $init;
-  if (opts.noWasiShim || opts.instantiation) opts.wasiShim = false;
+  if (opts.instantiation) opts.wasiShim = false;
 
   let spinner;
   const showSpinner = getShowSpinner();
@@ -97,8 +97,6 @@ export async function transpileComponent (component, opts = {}) {
       'wasi:filesystem/*': '@bytecodealliance/preview2-shim/filesystem#*',
       'wasi:http/*': '@bytecodealliance/preview2-shim/http#*',
       'wasi:io/*': '@bytecodealliance/preview2-shim/io#*',
-      'wasi:logging/*': '@bytecodealliance/preview2-shim/logging#*',
-      'wasi:poll/*': '@bytecodealliance/preview2-shim/poll#*',
       'wasi:random/*': '@bytecodealliance/preview2-shim/random#*',
       'wasi:sockets/*': '@bytecodealliance/preview2-shim/sockets#*',
     }, opts.map || {});
@@ -121,8 +119,8 @@ export async function transpileComponent (component, opts = {}) {
     instantiation,
     validLiftingOptimization: opts.validLiftingOptimization ?? false,
     tracing: opts.tracing ?? false,
-    noNodejsCompat: !(opts.nodejsCompat ?? true),
-    noTypescript: opts.noTypescript || false,
+    noNodejsCompat: opts.nodejsCompat === false,
+    noTypescript: opts.typescript === false,
     tlaCompat: opts.tlaCompat ?? false,
     base64Cutoff: opts.js ? 0 : opts.base64Cutoff ?? 5000,
     noNamespacedExports: opts.namespacedExports === false,

package/src/cmd/wasm-tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wasm-tools.d.ts","sourceRoot":"","sources":["wasm-tools.js"],"names":[],"mappings":"AAOA,2DAKC;AAED,2DASC;AAED,kEASC;AAED,kEAsBC;AAED,oEAaC;AAED,iEAUC;AAED,kEAiCC"}
+{"version":3,"file":"wasm-tools.d.ts","sourceRoot":"","sources":["wasm-tools.js"],"names":[],"mappings":"AAQA,2DAKC;AAED,2DASC;AAED,kEASC;AAED,kEAsBC;AAED,oEAaC;AAED,iEAUC;AAED,kEAiCC"}

package/src/jco.js

@@ -2,7 +2,7 @@
 import { program, Option } from 'commander';
 import { opt } from './cmd/opt.js';
 import { transpile } from './cmd/transpile.js';
-import { run } from './cmd/run.js';
+import { run as runCmd, serve as serveCmd } from './cmd/run.js';
 import { parse, print, componentNew, componentEmbed, metadataAdd, metadataShow, componentWit } from './cmd/wasm-tools.js';
 import { componentize } from './cmd/componentize.js';
 import c from 'chalk-template';
@@ -11,7 +11,7 @@ program
   .name('jco')
   .description(c`{bold jco - WebAssembly JS Component Tools}\n      JS Component Transpilation Bindgen & Wasm Tools for JS`)
   .usage('<command> [options]')
-  .version('0.14.0');
+  .version('0.14.2');
 
 function myParseInt(value) {
   return parseInt(value, 10);
@@ -52,15 +52,48 @@ program.command('transpile')
   .action(asyncAction(transpile));
 
 program.command('run')
-  .description('Run a WebAssembly Command component')
+  .description('Run a WASI Command component')
   .usage('<command.wasm> <args...>')
   .helpOption(false)
-  .argument('<command>', 'Wasm command binary to run')
+  .allowUnknownOption(true)
+  .allowExcessArguments(true)
+  .argument('<command>', 'WASI command binary to run')
   .option('--jco-dir <dir>', 'Instead of using a temporary dir, set the output directory for the run command')
   .option('--jco-trace', 'Enable call tracing')
   .option('--jco-import <module>', 'Custom module to import before the run executes to support custom environment setup')
-  .argument('[args...]', 'Any CLI arguments to provide to the command')
-  .action(asyncAction(run));
+  .option('--jco-map <mappings...>', 'specifier=./output custom mappings for the component imports')
+  .argument('[args...]', 'Any CLI arguments for the component')
+  .action(asyncAction(async function run (cmd, args, opts, command) {
+    // specially only allow help option in first position
+    if (cmd === '--help' || cmd === '-h') {
+      command.help();
+    } else {
+      return runCmd(cmd, args, opts);
+    }
+  }));
+
+program.command('serve')
+  .description('Serve a WASI HTTP component')
+  .usage('<server.wasm> <args...>')
+  .helpOption(false)
+  .allowUnknownOption(true)
+  .allowExcessArguments(true)
+  .argument('<server>', 'WASI server binary to run')
+  .option('--port <number>')
+  .option('--host <host>')
+  .option('--jco-dir <dir>', 'Instead of using a temporary dir, set the output directory for the transpiled code')
+  .option('--jco-trace', 'Enable call tracing')
+  .option('--jco-import <module>', 'Custom module to import before the server executes to support custom environment setup')
+  .option('--jco-map <mappings...>', 'specifier=./output custom mappings for the component imports')
+  .argument('[args...]', 'Any CLI arguments for the component')
+  .action(asyncAction(async function serve (cmd, args, opts, command) {
+    // specially only allow help option in first position
+    if (cmd === '--help' || cmd === '-h') {
+      command.help();
+    } else {
+      return serveCmd(cmd, args, opts);
+    }
+  }));
 
 program.command('opt')
   .description('optimizes a Wasm component, including running wasm-opt Binaryen optimizations')
@@ -124,6 +157,8 @@ program.command('embed')
   .option('-m, --metadata <metadata...>', 'field=name[@version] producer metadata to add with the embedding')
   .action(asyncAction(componentEmbed));
 
+program.showHelpAfterError();
+
 program.parse();
 
 function asyncAction (cmd) {