Merge branch 'main' into chore/wasi-sockets-udp-worker-thread

README.md

@@ -10,6 +10,12 @@
   <p>
     <a href="https://github.com/bytecodealliance/jco/actions?query=workflow%3ACI"><img src="https://github.com/bytecodealliance/jco/workflows/CI/badge.svg" alt="build status" /></a>
   </p>
+
+  <h3>
+    <a href="https://bytecodealliance.github.io/jco/">Contributing</a>
+    <span> | </span>
+    <a href="https://bytecodealliance.zulipchat.com/#narrow/stream/409526-jco">Chat on Zulip</a>
+  </h3>
 </div>
 
 ## Overview

packages/preview2-shim/lib/browser/filesystem.js

@@ -37,15 +37,18 @@ function getChildEntry (parentEntry, subpath, openFlags) {
   let segmentIdx;
   do {
     if (!entry || !entry.dir) throw 'not-directory';
-    segmentIdx = subpath.indexOf('/');
+    segmentIdx = subpath.indexOf('/', segmentIdx);
     const segment = segmentIdx === -1 ? subpath : subpath.slice(0, segmentIdx);
-    if (segment === '.' || segment === '') return entry;
-    if (segment === '..') throw 'no-entry';
-    if (!entry.dir[segment] && openFlags.create)
+    if (segment === '.' || segment === '')
+      /* continue traversing */;
+    else if (segment === '..')
+      throw 'no-entry';
+    else if (!entry.dir[segment] && openFlags.create)
       entry = entry.dir[segment] = openFlags.directory ? { dir: {} } : { source: new Uint8Array([]) };
     else
       entry = entry.dir[segment];
-  } while (segmentIdx !== -1)
+    subpath = subpath.substring(segmentIdx + 1);
+  } while (segmentIdx !== -1);
   if (!entry) throw 'no-entry';
   return entry;
 }
@@ -179,13 +182,13 @@ class Descriptor {
   stat() {
     let type = 'unknown', size = BigInt(0);
     if (this.#entry.source) {
-      type = 'directory';
-    }
-    else if (this.#entry.dir) {
       type = 'regular-file';
       const source = getSource(this.#entry);
       size = BigInt(source.byteLength);
     }
+    else if (this.#entry.dir) {
+      type = 'directory';
+    }
     return {
       type,
       linkCount: BigInt(0),

packages/preview2-shim/lib/browser/random.js

@@ -33,7 +33,7 @@ export const random = {
       for (var generated = 0; generated < len; generated += MAX_BYTES) {
         // buffer.slice automatically checks if the end is past the end of
         // the buffer so we don't have to here
-        crypto.getRandomValues(bytes.slice(generated, generated + MAX_BYTES));
+        crypto.getRandomValues(bytes.subarray(generated, generated + MAX_BYTES));
       }
     } else {
       crypto.getRandomValues(bytes);

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();
@@ -119,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,

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 } 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';
@@ -55,12 +55,21 @@ program.command('run')
   .description('Run a WebAssembly Command component')
   .usage('<command.wasm> <args...>')
   .helpOption(false)
+  .allowUnknownOption(true)
+  .allowExcessArguments(true)
   .argument('<command>', 'Wasm 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));
+  .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('opt')
   .description('optimizes a Wasm component, including running wasm-opt Binaryen optimizations')
@@ -124,6 +133,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) {