@bytecodealliance/jco 1.0.2 → 1.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytecodealliance/jco",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "JavaScript tooling for working with WebAssembly Components",
   "author": "Guy Bedford",
   "bin": {
@@ -18,16 +18,16 @@
   },
   "type": "module",
   "dependencies": {
-    "@bytecodealliance/preview2-shim": "0.15.1",
-    "binaryen": "^111.0.0",
-    "chalk-template": "^0.4.0",
-    "commander": "^9.4.1",
-    "mkdirp": "^1.0.4",
-    "ora": "^6.1.2",
-    "terser": "^5.16.1"
+    "@bytecodealliance/preview2-shim": "0.16.0",
+    "binaryen": "^116.0.0",
+    "chalk-template": "^1",
+    "commander": "^12",
+    "mkdirp": "^3",
+    "ora": "^8",
+    "terser": "^5"
   },
   "devDependencies": {
-    "@bytecodealliance/componentize-js": "^0.7.0",
+    "@bytecodealliance/componentize-js": "^0.8.0",
     "@types/node": "^18.11.17",
     "@typescript-eslint/eslint-plugin": "^5.41.0",
     "@typescript-eslint/parser": "^5.41.0",
@@ -56,7 +56,7 @@
     "build:types:preview2-shim": "cargo xtask generate wasi-types",
     "lint": "eslint -c eslintrc.cjs lib/**/*.js packages/*/lib/**/*.js",
     "test:lts": "mocha -u tdd test/test.js --timeout 30000",
-    "test": "node --experimental-wasm-multi-memory node_modules/mocha/bin/mocha.js -u tdd test/test.js --timeout 30000",
+    "test": "node --stack-trace-limit=100 --experimental-wasm-multi-memory node_modules/mocha/bin/mocha.js -u tdd test/test.js --timeout 30000",
     "prepublishOnly": "cargo xtask build release && npm run test"
   },
   "files": [

package/src/cmd/componentize.js

@@ -1,7 +1,6 @@
 import { readFile, writeFile } from 'node:fs/promises';
-import { resolve } from 'node:path';
+import { resolve, basename } from 'node:path';
 import c from 'chalk-template';
-import { isWindows } from '../common.js';
 
 export async function componentize (jsSource, opts) {
   let componentizeFn;
@@ -14,6 +13,7 @@ export async function componentize (jsSource, opts) {
   }
   const source = await readFile(jsSource, 'utf8');
   const { component, imports } = await componentizeFn(source, {
+    sourceName: basename(jsSource),
     witPath: resolve(opts.wit),
     worldName: opts.worldName,
     enableStdout: opts.enableStdout,

package/src/cmd/run.js

@@ -2,7 +2,7 @@ import { getTmpDir } from '../common.js';
 import { transpile } from './transpile.js';
 import { rm, stat, mkdir, writeFile, symlink } from 'node:fs/promises';
 import { basename, resolve, extname } from 'node:path';
-import { fork } from 'node:child_process';
+import { spawn } from 'node:child_process';
 import process from 'node:process';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 import c from 'chalk-template';
@@ -75,7 +75,8 @@ async function runComponent (componentPath, args, opts, executor) {
         wasiShim: true,
         outDir,
         tracing: opts.jcoTrace,
-        map: opts.jcoMap
+        map: opts.jcoMap,
+        importBindings: opts.jcoImportBindings,
       });
     }
     catch (e) {
@@ -112,6 +113,7 @@ async function runComponent (componentPath, args, opts, executor) {
     const runPath = resolve(outDir, '_run.js');
     await writeFile(runPath, `
       ${jcoImport ? `import ${JSON.stringify(pathToFileURL(jcoImport))}` : ''}
+      import process from 'node:process';
       try {
         process.argv[1] = "${name}";
       } catch {}
@@ -119,8 +121,10 @@ async function runComponent (componentPath, args, opts, executor) {
       ${executor}
     `);
 
+    const nodePath = process.env.JCO_RUN_PATH || process.argv[0];
+
     process.exitCode = await new Promise((resolve, reject) => {
-      const cp = fork(runPath, args, { stdio: 'inherit' });
+      const cp = spawn(nodePath, [...process.env.JCO_RUN_ARGS ? process.env.JCO_RUN_ARGS.split(' ') : [], runPath, ...args], { stdio: 'inherit' });
 
       cp.on('error', reject);
       cp.on('exit', resolve);

package/src/cmd/transpile.js

@@ -80,6 +80,7 @@ async function wasm2Js (source) {
  * @param {{
  *   name: string,
  *   instantiation?: 'async' | 'sync',
+ *   importBindings?: 'js' | 'optimized', 'hybrid', 'direct-optimized',
  *   map?: Record<string, string>,
  *   validLiftingOptimization?: bool,
  *   tracing?: bool,
@@ -133,6 +134,7 @@ export async function transpileComponent (component, opts = {}) {
     name: opts.name ?? 'component',
     map: Object.entries(opts.map ?? {}),
     instantiation,
+    importBindings: opts.importBindings ? { tag: opts.importBindings } : null,
     validLiftingOptimization: opts.validLiftingOptimization ?? false,
     tracing: opts.tracing ?? false,
     noNodejsCompat: opts.nodejsCompat === false,

package/src/jco.js

@@ -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('1.0.2');
+  .version('1.1.0');
 
 function myParseInt(value) {
   return parseInt(value, 10);
@@ -38,6 +38,7 @@ program.command('transpile')
   .option('-O, --optimize', 'optimize the component first')
   .option('--no-typescript', 'do not output TypeScript .d.ts types')
   .option('--valid-lifting-optimization', 'optimize component binary validations assuming all lifted values are valid')
+  .addOption(new Option('--import-bindings [mode]', 'bindings mode for imports').choices(['js', 'optimized', 'hybrid', 'direct-optimized']).preset('js'))
   .option('--tracing', 'emit `tracing` calls on function entry/exit')
   .option('-b, --base64-cutoff <bytes>', 'set the byte size under which core Wasm binaries will be inlined as base64', myParseInt)
   .option('--tla-compat', 'enables compatibility for JS environments without top-level await support via an async $init promise export')
@@ -64,6 +65,7 @@ program.command('run')
   .option('--jco-trace', 'Enable call tracing')
   .option('--jco-import <module>', 'Custom module to import before the run executes to support custom environment setup')
   .option('--jco-map <mappings...>', 'specifier=./output custom mappings for the component imports')
+  .addOption(new Option('--jco-import-bindings [mode]', 'bindings mode for imports').choices(['js', 'optimized', 'hybrid', 'direct-optimized']).preset('js'))
   .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
@@ -86,6 +88,7 @@ program.command('serve')
   .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')
+  .addOption(new Option('--jco-import-bindings [mode]', 'bindings mode for imports').choices(['js', 'optimized', 'hybrid', 'direct-optimized']).preset('js'))
   .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) {