@bytecodealliance/jco 0.14.1 → 0.14.2

package/README.md

@@ -10,17 +10,24 @@
   <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
 
-`jco` is a fully native JS tool for working with [WebAssembly Components](https://github.com/WebAssembly/component-model) in JavaScript.
+JCO provides a fully native JS toolchain for working with [WebAssembly Components](https://github.com/WebAssembly/component-model) in JavaScript.
 
 Features include:
 
 * "Transpiling" Wasm Component binaries into ES modules that can run in any JS environment.
 * WASI Preview2 support in Node.js ([undergoing stabilization](https://github.com/bytecodealliance/jco/milestone/1)) & browsers (experimental).
 * Component builds of [Wasm Tools](https://github.com/bytecodealliance/wasm-tools) helpers, available for use as a library or CLI commands for use in native JS environments, as well as optimization helper for Components via Binaryen.
+* Run and serve commands like Wasmtime, as JS implementations of the Command and HTTP Proxy worlds.
 * "Componentize" command to easily create components written in JavaScript (wrapper of [ComponentizeJS](https://github.com/bytecodealliance/ComponentizeJS)).
 
 For creating components in other languages, see the [Cargo Component](https://github.com/bytecodealliance/cargo-Component) project for Rust and [Wit Bindgen](https://github.com/bytecodealliance/wit-bindgen) for various guest bindgen helpers.
@@ -33,7 +40,7 @@ For creating components in other languages, see the [Cargo Component](https://gi
 npm install @bytecodealliance/jco
 ```
 
-jco can be used as either a library or a CLI via the `jco` CLI command.
+JCO can be used as either a library import or as a CLI via the `jco` command.
 
 ## Example
 
@@ -54,7 +61,8 @@ Options:
 Commands:
   componentize [options] <js-source>    Create a component from a JavaScript module
   transpile [options] <component-path>  Transpile a WebAssembly Component to JS + core Wasm for JavaScript execution
-  run <command> [args...]               Run a WebAssembly Command component
+  run [options] <command> [args...]     Run a WASI Command component
+  serve [options] <command> [args...]   Serve a WASI HTTP component
   opt [options] <component-file>        optimizes a Wasm component, including running wasm-opt Binaryen optimizations
   wit [options] <component-path>        extract the WIT from a WebAssembly Component [wasm-tools component wit]
   print [options] <input>               print the WebAssembly WAT text for a binary file [wasm-tools print]
@@ -110,9 +118,9 @@ Options include:
 
 To directly call into the transpilation in Rust, the bindgen used in jco is also available on crates.io as [js-component-bindgen](https://crates.io/crates/js-component-bindgen).
 
-### Run
+### Run & Serve
 
-For Wasm components that implement the WASI Command world, a `jco run` utility is provided to run these applications in Node.js:
+For Wasm components that implement the WASI Command world, a `jco run` utility is provided to run these applications in Node.js.
 
 ```
 jco run cowasy.component.wasm hello
@@ -120,7 +128,13 @@ jco run cowasy.component.wasm hello
 
 Using the preview2-shim WASI implementation, full access to the underlying system primitives is provided, including filesystem and environment variable permissions.
 
-> [preview2-shim](packages/preview2-shim) is currently being stabilized in Node.js, tracking in https://github.com/bytecodealliance/jco/milestone/1.
+For HTTP Proxy components, `jco serve` provides a JS server implementation:
+
+```
+jco serve --port 8080 server.wasm
+```
+
+> [Wasmtime](https://github.com/bytecodealliance/wasmtime) generally provides the most performant implementation for executing command and proxy worlds to use. These implementations are rather for when JS virtualization is required or the most convenient approach.
 
 ### Componentize
 

package/obj/js-component-bindgen-component.d.ts

@@ -69,7 +69,6 @@ import { WasiFilesystemTypes } from './interfaces/wasi-filesystem-types.js';
 import { WasiIoError } from './interfaces/wasi-io-error.js';
 import { WasiIoStreams } from './interfaces/wasi-io-streams.js';
 import { WasiRandomRandom } from './interfaces/wasi-random-random.js';
-import { WasiSocketsTcp } from './interfaces/wasi-sockets-tcp.js';
 export function generate(component: Uint8Array, options: GenerateOptions): Transpiled;
 export function generateTypes(name: string, options: TypeGenerationOptions): Files;
 

package/obj/js-component-bindgen-component.js

@@ -97,7 +97,7 @@ function utf8Encode(s, realloc, memory) {
 let exports0;
 let exports1;
 
-function trampoline8() {
+function trampoline7() {
   const ret = getStderr();
   if (!(ret instanceof OutputStream)) {
     throw new Error('Resource error: Not a valid "OutputStream" resource.');
@@ -107,7 +107,7 @@ function trampoline8() {
   return handle0;
 }
 
-function trampoline9(arg0) {
+function trampoline8(arg0) {
   let variant0;
   switch (arg0) {
     case 0: {
@@ -131,7 +131,7 @@ function trampoline9(arg0) {
   exit(variant0);
 }
 
-function trampoline10() {
+function trampoline9() {
   const ret = getStdin();
   if (!(ret instanceof InputStream)) {
     throw new Error('Resource error: Not a valid "InputStream" resource.');
@@ -141,7 +141,7 @@ function trampoline10() {
   return handle0;
 }
 
-function trampoline11() {
+function trampoline10() {
   const ret = getStdout();
   if (!(ret instanceof OutputStream)) {
     throw new Error('Resource error: Not a valid "OutputStream" resource.');
@@ -152,7 +152,7 @@ function trampoline11() {
 }
 let exports2;
 
-function trampoline12(arg0) {
+function trampoline11(arg0) {
   const ret = getDirectories();
   var vec3 = ret;
   var len3 = vec3.length;
@@ -163,8 +163,8 @@ function trampoline12(arg0) {
     if (!(tuple0_0 instanceof Descriptor)) {
       throw new Error('Resource error: Not a valid "Descriptor" resource.');
     }
-    var handle1 = handleCnt3++;
-    handleTable3.set(handle1, { rep: tuple0_0, own: true });
+    var handle1 = handleCnt5++;
+    handleTable5.set(handle1, { rep: tuple0_0, own: true });
     dataView(memory0).setInt32(base + 0, handle1, true);
     var ptr2 = utf8Encode(tuple0_1, realloc0, memory0);
     var len2 = utf8EncodedLen;
@@ -177,9 +177,9 @@ function trampoline12(arg0) {
 let memory0;
 let realloc0;
 
-function trampoline13(arg0, arg1, arg2) {
+function trampoline12(arg0, arg1, arg2) {
   var handle1 = arg0;
-  var rsc0 = handleTable3.get(handle1).rep;
+  var rsc0 = handleTable5.get(handle1).rep;
   let ret;
   try {
     ret = { tag: 'ok', val: Descriptor.prototype.readViaStream.call(rsc0, BigInt.asUintN(64, arg1)) };
@@ -370,9 +370,9 @@ function trampoline13(arg0, arg1, arg2) {
   }
 }
 
-function trampoline14(arg0, arg1, arg2) {
+function trampoline13(arg0, arg1, arg2) {
   var handle1 = arg0;
-  var rsc0 = handleTable3.get(handle1).rep;
+  var rsc0 = handleTable5.get(handle1).rep;
   let ret;
   try {
     ret = { tag: 'ok', val: Descriptor.prototype.writeViaStream.call(rsc0, BigInt.asUintN(64, arg1)) };
@@ -563,9 +563,9 @@ function trampoline14(arg0, arg1, arg2) {
   }
 }
 
-function trampoline15(arg0, arg1) {
+function trampoline14(arg0, arg1) {
   var handle1 = arg0;
-  var rsc0 = handleTable3.get(handle1).rep;
+  var rsc0 = handleTable5.get(handle1).rep;
   let ret;
   try {
     ret = { tag: 'ok', val: Descriptor.prototype.appendViaStream.call(rsc0) };
@@ -756,9 +756,9 @@ function trampoline15(arg0, arg1) {
   }
 }
 
-function trampoline16(arg0, arg1) {
+function trampoline15(arg0, arg1) {
   var handle1 = arg0;
-  var rsc0 = handleTable3.get(handle1).rep;
+  var rsc0 = handleTable5.get(handle1).rep;
   let ret;
   try {
     ret = { tag: 'ok', val: Descriptor.prototype.getType.call(rsc0) };
@@ -987,9 +987,9 @@ function trampoline16(arg0, arg1) {
   }
 }
 
-function trampoline17(arg0, arg1) {
+function trampoline16(arg0, arg1) {
   var handle1 = arg0;
-  var rsc0 = handleTable3.get(handle1).rep;
+  var rsc0 = handleTable5.get(handle1).rep;
   let ret;
   try {
     ret = { tag: 'ok', val: Descriptor.prototype.stat.call(rsc0) };
@@ -1251,9 +1251,9 @@ function trampoline17(arg0, arg1) {
   }
 }
 
-function trampoline18(arg0, arg1, arg2, arg3, arg4, arg5, arg6) {
+function trampoline17(arg0, arg1, arg2, arg3, arg4, arg5, arg6) {
   var handle1 = arg0;
-  var rsc0 = handleTable3.get(handle1).rep;
+  var rsc0 = handleTable5.get(handle1).rep;
   if ((arg1 & 4294967294) !== 0) {
     throw new TypeError('flags have extraneous bits set');
   }
@@ -1297,8 +1297,8 @@ function trampoline18(arg0, arg1, arg2, arg3, arg4, arg5, arg6) {
       if (!(e instanceof Descriptor)) {
         throw new Error('Resource error: Not a valid "Descriptor" resource.');
       }
-      var handle6 = handleCnt3++;
-      handleTable3.set(handle6, { rep: e, own: true });
+      var handle6 = handleCnt5++;
+      handleTable5.set(handle6, { rep: e, own: true });
       dataView(memory0).setInt32(arg6 + 4, handle6, true);
       break;
     }
@@ -1473,9 +1473,9 @@ function trampoline18(arg0, arg1, arg2, arg3, arg4, arg5, arg6) {
   }
 }
 
-function trampoline19(arg0, arg1) {
+function trampoline18(arg0, arg1) {
   var handle1 = arg0;
-  var rsc0 = handleTable3.get(handle1).rep;
+  var rsc0 = handleTable5.get(handle1).rep;
   let ret;
   try {
     ret = { tag: 'ok', val: Descriptor.prototype.metadataHash.call(rsc0) };
@@ -1663,7 +1663,7 @@ function trampoline19(arg0, arg1) {
   }
 }
 
-function trampoline20(arg0, arg1) {
+function trampoline19(arg0, arg1) {
   var handle1 = arg0;
   var rsc0 = handleTable0.get(handle1).rep;
   const ret = filesystemErrorCode(rsc0);
@@ -1836,7 +1836,7 @@ function trampoline20(arg0, arg1) {
   }
 }
 
-function trampoline21(arg0, arg1, arg2) {
+function trampoline20(arg0, arg1, arg2) {
   var handle1 = arg0;
   var rsc0 = handleTable1.get(handle1).rep;
   let ret;
@@ -1891,7 +1891,7 @@ function trampoline21(arg0, arg1, arg2) {
   }
 }
 
-function trampoline22(arg0, arg1, arg2) {
+function trampoline21(arg0, arg1, arg2) {
   var handle1 = arg0;
   var rsc0 = handleTable1.get(handle1).rep;
   let ret;
@@ -1946,7 +1946,7 @@ function trampoline22(arg0, arg1, arg2) {
   }
 }
 
-function trampoline23(arg0, arg1) {
+function trampoline22(arg0, arg1) {
   var handle1 = arg0;
   var rsc0 = handleTable2.get(handle1).rep;
   let ret;
@@ -1995,7 +1995,7 @@ function trampoline23(arg0, arg1) {
   }
 }
 
-function trampoline24(arg0, arg1, arg2, arg3) {
+function trampoline23(arg0, arg1, arg2, arg3) {
   var handle1 = arg0;
   var rsc0 = handleTable2.get(handle1).rep;
   var ptr2 = arg1;
@@ -2046,7 +2046,7 @@ function trampoline24(arg0, arg1, arg2, arg3) {
   }
 }
 
-function trampoline25(arg0, arg1, arg2, arg3) {
+function trampoline24(arg0, arg1, arg2, arg3) {
   var handle1 = arg0;
   var rsc0 = handleTable2.get(handle1).rep;
   var ptr2 = arg1;
@@ -2097,7 +2097,7 @@ function trampoline25(arg0, arg1, arg2, arg3) {
   }
 }
 
-function trampoline26(arg0, arg1) {
+function trampoline25(arg0, arg1) {
   var handle1 = arg0;
   var rsc0 = handleTable2.get(handle1).rep;
   let ret;
@@ -2145,7 +2145,7 @@ function trampoline26(arg0, arg1) {
   }
 }
 
-function trampoline27(arg0, arg1) {
+function trampoline26(arg0, arg1) {
   const ret = getRandomBytes(BigInt.asUintN(64, arg0));
   var val0 = ret;
   var len0 = val0.byteLength;
@@ -2156,7 +2156,7 @@ function trampoline27(arg0, arg1) {
   dataView(memory0).setInt32(arg1 + 0, ptr0, true);
 }
 
-function trampoline28(arg0) {
+function trampoline27(arg0) {
   const ret = getEnvironment();
   var vec3 = ret;
   var len3 = vec3.length;
@@ -2177,7 +2177,7 @@ function trampoline28(arg0) {
   dataView(memory0).setInt32(arg0 + 0, result3, true);
 }
 
-function trampoline29(arg0) {
+function trampoline28(arg0) {
   const ret = getTerminalStdin();
   var variant1 = ret;
   if (variant1 === null || variant1=== undefined) {
@@ -2188,13 +2188,13 @@ function trampoline29(arg0) {
     if (!(e instanceof TerminalInput)) {
       throw new Error('Resource error: Not a valid "TerminalInput" resource.');
     }
-    var handle0 = handleCnt6++;
-    handleTable6.set(handle0, { rep: e, own: true });
+    var handle0 = handleCnt3++;
+    handleTable3.set(handle0, { rep: e, own: true });
     dataView(memory0).setInt32(arg0 + 4, handle0, true);
   }
 }
 
-function trampoline30(arg0) {
+function trampoline29(arg0) {
   const ret = getTerminalStdout();
   var variant1 = ret;
   if (variant1 === null || variant1=== undefined) {
@@ -2205,13 +2205,13 @@ function trampoline30(arg0) {
     if (!(e instanceof TerminalOutput)) {
       throw new Error('Resource error: Not a valid "TerminalOutput" resource.');
     }
-    var handle0 = handleCnt7++;
-    handleTable7.set(handle0, { rep: e, own: true });
+    var handle0 = handleCnt4++;
+    handleTable4.set(handle0, { rep: e, own: true });
     dataView(memory0).setInt32(arg0 + 4, handle0, true);
   }
 }
 
-function trampoline31(arg0) {
+function trampoline30(arg0) {
   const ret = getTerminalStderr();
   var variant1 = ret;
   if (variant1 === null || variant1=== undefined) {
@@ -2222,8 +2222,8 @@ function trampoline31(arg0) {
     if (!(e instanceof TerminalOutput)) {
       throw new Error('Resource error: Not a valid "TerminalOutput" resource.');
     }
-    var handle0 = handleCnt7++;
-    handleTable7.set(handle0, { rep: e, own: true });
+    var handle0 = handleCnt4++;
+    handleTable4.set(handle0, { rep: e, own: true });
     dataView(memory0).setInt32(arg0 + 4, handle0, true);
   }
 }
@@ -2232,11 +2232,11 @@ let realloc1;
 let postReturn0;
 let postReturn1;
 function trampoline0(handle) {
-  const handleEntry = handleTable4.get(handle);
+  const handleEntry = handleTable6.get(handle);
   if (!handleEntry) {
     throw new Error(`Resource error: Invalid handle ${handle}`);
   }
-  handleTable4.delete(handle);
+  handleTable6.delete(handle);
   if (handleEntry.own && handleEntry.rep[symbolDispose]) {
     handleEntry.rep[symbolDispose]();
   }
@@ -2272,16 +2272,6 @@ function trampoline3(handle) {
   }
 }
 function trampoline4(handle) {
-  const handleEntry = handleTable3.get(handle);
-  if (!handleEntry) {
-    throw new Error(`Resource error: Invalid handle ${handle}`);
-  }
-  handleTable3.delete(handle);
-  if (handleEntry.own && handleEntry.rep[symbolDispose]) {
-    handleEntry.rep[symbolDispose]();
-  }
-}
-function trampoline5(handle) {
   const handleEntry = handleTable5.get(handle);
   if (!handleEntry) {
     throw new Error(`Resource error: Invalid handle ${handle}`);
@@ -2291,22 +2281,22 @@ function trampoline5(handle) {
     handleEntry.rep[symbolDispose]();
   }
 }
-function trampoline6(handle) {
-  const handleEntry = handleTable7.get(handle);
+function trampoline5(handle) {
+  const handleEntry = handleTable4.get(handle);
   if (!handleEntry) {
     throw new Error(`Resource error: Invalid handle ${handle}`);
   }
-  handleTable7.delete(handle);
+  handleTable4.delete(handle);
   if (handleEntry.own && handleEntry.rep[symbolDispose]) {
     handleEntry.rep[symbolDispose]();
   }
 }
-function trampoline7(handle) {
-  const handleEntry = handleTable6.get(handle);
+function trampoline6(handle) {
+  const handleEntry = handleTable3.get(handle);
   if (!handleEntry) {
     throw new Error(`Resource error: Invalid handle ${handle}`);
   }
-  handleTable6.delete(handle);
+  handleTable3.delete(handle);
   if (handleEntry.own && handleEntry.rep[symbolDispose]) {
     handleEntry.rep[symbolDispose]();
   }
@@ -2701,14 +2691,12 @@ const handleTable5= new Map();
 let handleCnt5 = 0;
 const handleTable6= new Map();
 let handleCnt6 = 0;
-const handleTable7= new Map();
-let handleCnt7 = 0;
 
 let _initialized = false;
 export const $init = (async() => {
   const module0 = fetchCompile(new URL('./js-component-bindgen-component.core.wasm', import.meta.url));
   const module1 = fetchCompile(new URL('./js-component-bindgen-component.core2.wasm', import.meta.url));
-  const module2 = base64Compile('AGFzbQEAAAABUQxgAX8AYAN/fn8AYAJ/fwBgB39/f39/f38AYAR/f39/AGACfn8AYAl/f39/f35+f38Bf2ACf38Bf2AEf39/fwF/YAF/AX9gA39/fwF/YAF/AAMgHwABAQICAgMCAgEBAgQEAgUAAAAABgcHCAgHBwkHCgsEBQFwAR8fB50BIAEwAAABMQABATIAAgEzAAMBNAAEATUABQE2AAYBNwAHATgACAE5AAkCMTAACgIxMQALAjEyAAwCMTMADQIxNAAOAjE1AA8CMTYAEAIxNwARAjE4ABICMTkAEwIyMAAUAjIxABUCMjIAFgIyMwAXAjI0ABgCMjUAGQIyNgAaAjI3ABsCMjgAHAIyOQAdAjMwAB4IJGltcG9ydHMBAAqZAx8JACAAQQARAAALDQAgACABIAJBAREBAAsNACAAIAEgAkECEQEACwsAIAAgAUEDEQIACwsAIAAgAUEEEQIACwsAIAAgAUEFEQIACxUAIAAgASACIAMgBCAFIAZBBhEDAAsLACAAIAFBBxECAAsLACAAIAFBCBECAAsNACAAIAEgAkEJEQEACw0AIAAgASACQQoRAQALCwAgACABQQsRAgALDwAgACABIAIgA0EMEQQACw8AIAAgASACIANBDREEAAsLACAAIAFBDhECAAsLACAAIAFBDxEFAAsJACAAQRARAAALCQAgAEEREQAACwkAIABBEhEAAAsJACAAQRMRAAALGQAgACABIAIgAyAEIAUgBiAHIAhBFBEGAAsLACAAIAFBFREHAAsLACAAIAFBFhEHAAsPACAAIAEgAiADQRcRCAALDwAgACABIAIgA0EYEQgACwsAIAAgAUEZEQcACwsAIAAgAUEaEQcACwkAIABBGxEJAAsLACAAIAFBHBEHAAsNACAAIAEgAkEdEQoACwkAIABBHhELAAsALglwcm9kdWNlcnMBDHByb2Nlc3NlZC1ieQENd2l0LWNvbXBvbmVudAYwLjE5LjAAkhAEbmFtZQATEndpdC1jb21wb25lbnQ6c2hpbQH1Dx8ARWluZGlyZWN0LXdhc2k6ZmlsZXN5c3RlbS9wcmVvcGVuc0AwLjIuMC1yYy0yMDIzLTExLTEwLWdldC1kaXJlY3RvcmllcwFVaW5kaXJlY3Qtd2FzaTpmaWxlc3lzdGVtL3R5cGVzQDAuMi4wLXJjLTIwMjMtMTEtMTAtW21ldGhvZF1kZXNjcmlwdG9yLnJlYWQtdmlhLXN0cmVhbQJWaW5kaXJlY3Qtd2FzaTpmaWxlc3lzdGVtL3R5cGVzQDAuMi4wLXJjLTIwMjMtMTEtMTAtW21ldGhvZF1kZXNjcmlwdG9yLndyaXRlLXZpYS1zdHJlYW0DV2luZGlyZWN0LXdhc2k6ZmlsZXN5c3RlbS90eXBlc0AwLjIuMC1yYy0yMDIzLTExLTEwLVttZXRob2RdZGVzY3JpcHRvci5hcHBlbmQtdmlhLXN0cmVhbQROaW5kaXJlY3Qtd2FzaTpmaWxlc3lzdGVtL3R5cGVzQDAuMi4wLXJjLTIwMjMtMTEtMTAtW21ldGhvZF1kZXNjcmlwdG9yLmdldC10eXBlBUppbmRpcmVjdC13YXNpOmZpbGVzeXN0ZW0vdHlwZXNAMC4yLjAtcmMtMjAyMy0xMS0xMC1bbWV0aG9kXWRlc2NyaXB0b3Iuc3RhdAZNaW5kaXJlY3Qtd2FzaTpmaWxlc3lzdGVtL3R5cGVzQDAuMi4wLXJjLTIwMjMtMTEtMTAtW21ldGhvZF1kZXNjcmlwdG9yLm9wZW4tYXQHU2luZGlyZWN0LXdhc2k6ZmlsZXN5c3RlbS90eXBlc0AwLjIuMC1yYy0yMDIzLTExLTEwLVttZXRob2RdZGVzY3JpcHRvci5tZXRhZGF0YS1oYXNoCEhpbmRpcmVjdC13YXNpOmZpbGVzeXN0ZW0vdHlwZXNAMC4yLjAtcmMtMjAyMy0xMS0xMC1maWxlc3lzdGVtLWVycm9yLWNvZGUJRmluZGlyZWN0LXdhc2k6aW8vc3RyZWFtc0AwLjIuMC1yYy0yMDIzLTExLTEwLVttZXRob2RdaW5wdXQtc3RyZWFtLnJlYWQKT2luZGlyZWN0LXdhc2k6aW8vc3RyZWFtc0AwLjIuMC1yYy0yMDIzLTExLTEwLVttZXRob2RdaW5wdXQtc3RyZWFtLmJsb2NraW5nLXJlYWQLTmluZGlyZWN0LXdhc2k6aW8vc3RyZWFtc0AwLjIuMC1yYy0yMDIzLTExLTEwLVttZXRob2Rdb3V0cHV0LXN0cmVhbS5jaGVjay13cml0ZQxIaW5kaXJlY3Qtd2FzaTppby9zdHJlYW1zQDAuMi4wLXJjLTIwMjMtMTEtMTAtW21ldGhvZF1vdXRwdXQtc3RyZWFtLndyaXRlDVtpbmRpcmVjdC13YXNpOmlvL3N0cmVhbXNAMC4yLjAtcmMtMjAyMy0xMS0xMC1bbWV0aG9kXW91dHB1dC1zdHJlYW0uYmxvY2tpbmctd3JpdGUtYW5kLWZsdXNoDlFpbmRpcmVjdC13YXNpOmlvL3N0cmVhbXNAMC4yLjAtcmMtMjAyMy0xMS0xMC1bbWV0aG9kXW91dHB1dC1zdHJlYW0uYmxvY2tpbmctZmx1c2gPQGluZGlyZWN0LXdhc2k6cmFuZG9tL3JhbmRvbUAwLjIuMC1yYy0yMDIzLTExLTEwLWdldC1yYW5kb20tYnl0ZXMQQWluZGlyZWN0LXdhc2k6Y2xpL2Vudmlyb25tZW50QDAuMi4wLXJjLTIwMjMtMTEtMTAtZ2V0LWVudmlyb25tZW50EUdpbmRpcmVjdC13YXNpOmNsaS90ZXJtaW5hbC1zdGRpbkAwLjIuMC1yYy0yMDIzLTExLTEwLWdldC10ZXJtaW5hbC1zdGRpbhJJaW5kaXJlY3Qtd2FzaTpjbGkvdGVybWluYWwtc3Rkb3V0QDAuMi4wLXJjLTIwMjMtMTEtMTAtZ2V0LXRlcm1pbmFsLXN0ZG91dBNJaW5kaXJlY3Qtd2FzaTpjbGkvdGVybWluYWwtc3RkZXJyQDAuMi4wLXJjLTIwMjMtMTEtMTAtZ2V0LXRlcm1pbmFsLXN0ZGVychQmYWRhcHQtd2FzaV9zbmFwc2hvdF9wcmV2aWV3MS1wYXRoX29wZW4VLGFkYXB0LXdhc2lfc25hcHNob3RfcHJldmlldzEtZmRfZmlsZXN0YXRfZ2V0FidhZGFwdC13YXNpX3NuYXBzaG90X3ByZXZpZXcxLXJhbmRvbV9nZXQXJGFkYXB0LXdhc2lfc25hcHNob3RfcHJldmlldzEtZmRfcmVhZBglYWRhcHQtd2FzaV9zbmFwc2hvdF9wcmV2aWV3MS1mZF93cml0ZRkoYWRhcHQtd2FzaV9zbmFwc2hvdF9wcmV2aWV3MS1lbnZpcm9uX2dldBouYWRhcHQtd2FzaV9zbmFwc2hvdF9wcmV2aWV3MS1lbnZpcm9uX3NpemVzX2dldBslYWRhcHQtd2FzaV9zbmFwc2hvdF9wcmV2aWV3MS1mZF9jbG9zZRwrYWRhcHQtd2FzaV9zbmFwc2hvdF9wcmV2aWV3MS1mZF9wcmVzdGF0X2dldB0wYWRhcHQtd2FzaV9zbmFwc2hvdF9wcmV2aWV3MS1mZF9wcmVzdGF0X2Rpcl9uYW1lHiZhZGFwdC13YXNpX3NuYXBzaG90X3ByZXZpZXcxLXByb2NfZXhpdA');
+  const module2 = base64Compile('AGFzbQEAAAABUQxgAX8AYAN/fn8AYAJ/fwBgB39/f39/f38AYAR/f39/AGACfn8AYAl/f39/f35+f38Bf2ACf38Bf2AEf39/fwF/YAF/AX9gA39/fwF/YAF/AAMgHwABAQICAgMCAgEBAgQEAgUAAAAABgcHCAgHBwkHCgsEBQFwAR8fB50BIAEwAAABMQABATIAAgEzAAMBNAAEATUABQE2AAYBNwAHATgACAE5AAkCMTAACgIxMQALAjEyAAwCMTMADQIxNAAOAjE1AA8CMTYAEAIxNwARAjE4ABICMTkAEwIyMAAUAjIxABUCMjIAFgIyMwAXAjI0ABgCMjUAGQIyNgAaAjI3ABsCMjgAHAIyOQAdAjMwAB4IJGltcG9ydHMBAAqZAx8JACAAQQARAAALDQAgACABIAJBAREBAAsNACAAIAEgAkECEQEACwsAIAAgAUEDEQIACwsAIAAgAUEEEQIACwsAIAAgAUEFEQIACxUAIAAgASACIAMgBCAFIAZBBhEDAAsLACAAIAFBBxECAAsLACAAIAFBCBECAAsNACAAIAEgAkEJEQEACw0AIAAgASACQQoRAQALCwAgACABQQsRAgALDwAgACABIAIgA0EMEQQACw8AIAAgASACIANBDREEAAsLACAAIAFBDhECAAsLACAAIAFBDxEFAAsJACAAQRARAAALCQAgAEEREQAACwkAIABBEhEAAAsJACAAQRMRAAALGQAgACABIAIgAyAEIAUgBiAHIAhBFBEGAAsLACAAIAFBFREHAAsLACAAIAFBFhEHAAsPACAAIAEgAiADQRcRCAALDwAgACABIAIgA0EYEQgACwsAIAAgAUEZEQcACwsAIAAgAUEaEQcACwkAIABBGxEJAAsLACAAIAFBHBEHAAsNACAAIAEgAkEdEQoACwkAIABBHhELAAsALglwcm9kdWNlcnMBDHByb2Nlc3NlZC1ieQENd2l0LWNvbXBvbmVudAYwLjE5LjAAkhAEbmFtZQATEndpdC1jb21wb25lbnQ6c2hpbQH1Dx8ARWluZGlyZWN0LXdhc2k6ZmlsZXN5c3RlbS9wcmVvcGVuc0AwLjIuMC1yYy0yMDIzLTExLTEwLWdldC1kaXJlY3RvcmllcwFVaW5kaXJlY3Qtd2FzaTpmaWxlc3lzdGVtL3R5cGVzQDAuMi4wLXJjLTIwMjMtMTEtMTAtW21ldGhvZF1kZXNjcmlwdG9yLnJlYWQtdmlhLXN0cmVhbQJWaW5kaXJlY3Qtd2FzaTpmaWxlc3lzdGVtL3R5cGVzQDAuMi4wLXJjLTIwMjMtMTEtMTAtW21ldGhvZF1kZXNjcmlwdG9yLndyaXRlLXZpYS1zdHJlYW0DV2luZGlyZWN0LXdhc2k6ZmlsZXN5c3RlbS90eXBlc0AwLjIuMC1yYy0yMDIzLTExLTEwLVttZXRob2RdZGVzY3JpcHRvci5hcHBlbmQtdmlhLXN0cmVhbQROaW5kaXJlY3Qtd2FzaTpmaWxlc3lzdGVtL3R5cGVzQDAuMi4wLXJjLTIwMjMtMTEtMTAtW21ldGhvZF1kZXNjcmlwdG9yLmdldC10eXBlBUppbmRpcmVjdC13YXNpOmZpbGVzeXN0ZW0vdHlwZXNAMC4yLjAtcmMtMjAyMy0xMS0xMC1bbWV0aG9kXWRlc2NyaXB0b3Iuc3RhdAZNaW5kaXJlY3Qtd2FzaTpmaWxlc3lzdGVtL3R5cGVzQDAuMi4wLXJjLTIwMjMtMTEtMTAtW21ldGhvZF1kZXNjcmlwdG9yLm9wZW4tYXQHU2luZGlyZWN0LXdhc2k6ZmlsZXN5c3RlbS90eXBlc0AwLjIuMC1yYy0yMDIzLTExLTEwLVttZXRob2RdZGVzY3JpcHRvci5tZXRhZGF0YS1oYXNoCEhpbmRpcmVjdC13YXNpOmZpbGVzeXN0ZW0vdHlwZXNAMC4yLjAtcmMtMjAyMy0xMS0xMC1maWxlc3lzdGVtLWVycm9yLWNvZGUJRmluZGlyZWN0LXdhc2k6aW8vc3RyZWFtc0AwLjIuMC1yYy0yMDIzLTExLTEwLVttZXRob2RdaW5wdXQtc3RyZWFtLnJlYWQKT2luZGlyZWN0LXdhc2k6aW8vc3RyZWFtc0AwLjIuMC1yYy0yMDIzLTExLTEwLVttZXRob2RdaW5wdXQtc3RyZWFtLmJsb2NraW5nLXJlYWQLTmluZGlyZWN0LXdhc2k6aW8vc3RyZWFtc0AwLjIuMC1yYy0yMDIzLTExLTEwLVttZXRob2Rdb3V0cHV0LXN0cmVhbS5jaGVjay13cml0ZQxIaW5kaXJlY3Qtd2FzaTppby9zdHJlYW1zQDAuMi4wLXJjLTIwMjMtMTEtMTAtW21ldGhvZF1vdXRwdXQtc3RyZWFtLndyaXRlDVtpbmRpcmVjdC13YXNpOmlvL3N0cmVhbXNAMC4yLjAtcmMtMjAyMy0xMS0xMC1bbWV0aG9kXW91dHB1dC1zdHJlYW0uYmxvY2tpbmctd3JpdGUtYW5kLWZsdXNoDlFpbmRpcmVjdC13YXNpOmlvL3N0cmVhbXNAMC4yLjAtcmMtMjAyMy0xMS0xMC1bbWV0aG9kXW91dHB1dC1zdHJlYW0uYmxvY2tpbmctZmx1c2gPQGluZGlyZWN0LXdhc2k6cmFuZG9tL3JhbmRvbUAwLjIuMC1yYy0yMDIzLTExLTEwLWdldC1yYW5kb20tYnl0ZXMQQWluZGlyZWN0LXdhc2k6Y2xpL2Vudmlyb25tZW50QDAuMi4wLXJjLTIwMjMtMTItMDUtZ2V0LWVudmlyb25tZW50EUdpbmRpcmVjdC13YXNpOmNsaS90ZXJtaW5hbC1zdGRpbkAwLjIuMC1yYy0yMDIzLTEyLTA1LWdldC10ZXJtaW5hbC1zdGRpbhJJaW5kaXJlY3Qtd2FzaTpjbGkvdGVybWluYWwtc3Rkb3V0QDAuMi4wLXJjLTIwMjMtMTItMDUtZ2V0LXRlcm1pbmFsLXN0ZG91dBNJaW5kaXJlY3Qtd2FzaTpjbGkvdGVybWluYWwtc3RkZXJyQDAuMi4wLXJjLTIwMjMtMTItMDUtZ2V0LXRlcm1pbmFsLXN0ZGVychQmYWRhcHQtd2FzaV9zbmFwc2hvdF9wcmV2aWV3MS1wYXRoX29wZW4VLGFkYXB0LXdhc2lfc25hcHNob3RfcHJldmlldzEtZmRfZmlsZXN0YXRfZ2V0FidhZGFwdC13YXNpX3NuYXBzaG90X3ByZXZpZXcxLXJhbmRvbV9nZXQXJGFkYXB0LXdhc2lfc25hcHNob3RfcHJldmlldzEtZmRfcmVhZBglYWRhcHQtd2FzaV9zbmFwc2hvdF9wcmV2aWV3MS1mZF93cml0ZRkoYWRhcHQtd2FzaV9zbmFwc2hvdF9wcmV2aWV3MS1lbnZpcm9uX2dldBouYWRhcHQtd2FzaV9zbmFwc2hvdF9wcmV2aWV3MS1lbnZpcm9uX3NpemVzX2dldBslYWRhcHQtd2FzaV9zbmFwc2hvdF9wcmV2aWV3MS1mZF9jbG9zZRwrYWRhcHQtd2FzaV9zbmFwc2hvdF9wcmV2aWV3MS1mZF9wcmVzdGF0X2dldB0wYWRhcHQtd2FzaV9zbmFwc2hvdF9wcmV2aWV3MS1mZF9wcmVzdGF0X2Rpcl9uYW1lHiZhZGFwdC13YXNpX3NuYXBzaG90X3ByZXZpZXcxLXByb2NfZXhpdA');
   const module3 = base64Compile('AGFzbQEAAAABUQxgAX8AYAN/fn8AYAJ/fwBgB39/f39/f38AYAR/f39/AGACfn8AYAl/f39/f35+f38Bf2ACf38Bf2AEf39/fwF/YAF/AX9gA39/fwF/YAF/AALAASAAATAAAAABMQABAAEyAAEAATMAAgABNAACAAE1AAIAATYAAwABNwACAAE4AAIAATkAAQACMTAAAQACMTEAAgACMTIABAACMTMABAACMTQAAgACMTUABQACMTYAAAACMTcAAAACMTgAAAACMTkAAAACMjAABgACMjEABwACMjIABwACMjMACAACMjQACAACMjUABwACMjYABwACMjcACQACMjgABwACMjkACgACMzAACwAIJGltcG9ydHMBcAEfHwklAQBBAAsfAAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHgAuCXByb2R1Y2VycwEMcHJvY2Vzc2VkLWJ5AQ13aXQtY29tcG9uZW50BjAuMTkuMAAcBG5hbWUAFRR3aXQtY29tcG9uZW50OmZpeHVwcw');
   ({ exports: exports0 } = await instantiateCore(await module2));
   ({ exports: exports1 } = await instantiateCore(await module0, {
@@ -2733,34 +2721,34 @@ export const $init = (async() => {
     env: {
       memory: exports1.memory,
     },
-    'wasi:cli/environment@0.2.0-rc-2023-11-10': {
+    'wasi:cli/environment@0.2.0-rc-2023-12-05': {
       'get-environment': exports0['16'],
     },
-    'wasi:cli/exit@0.2.0-rc-2023-11-10': {
-      exit: trampoline9,
+    'wasi:cli/exit@0.2.0-rc-2023-12-05': {
+      exit: trampoline8,
     },
-    'wasi:cli/stderr@0.2.0-rc-2023-11-10': {
-      'get-stderr': trampoline8,
+    'wasi:cli/stderr@0.2.0-rc-2023-12-05': {
+      'get-stderr': trampoline7,
     },
-    'wasi:cli/stdin@0.2.0-rc-2023-11-10': {
-      'get-stdin': trampoline10,
+    'wasi:cli/stdin@0.2.0-rc-2023-12-05': {
+      'get-stdin': trampoline9,
     },
-    'wasi:cli/stdout@0.2.0-rc-2023-11-10': {
-      'get-stdout': trampoline11,
+    'wasi:cli/stdout@0.2.0-rc-2023-12-05': {
+      'get-stdout': trampoline10,
     },
-    'wasi:cli/terminal-input@0.2.0-rc-2023-11-10': {
-      '[resource-drop]terminal-input': trampoline7,
+    'wasi:cli/terminal-input@0.2.0-rc-2023-12-05': {
+      '[resource-drop]terminal-input': trampoline6,
     },
-    'wasi:cli/terminal-output@0.2.0-rc-2023-11-10': {
-      '[resource-drop]terminal-output': trampoline6,
+    'wasi:cli/terminal-output@0.2.0-rc-2023-12-05': {
+      '[resource-drop]terminal-output': trampoline5,
     },
-    'wasi:cli/terminal-stderr@0.2.0-rc-2023-11-10': {
+    'wasi:cli/terminal-stderr@0.2.0-rc-2023-12-05': {
       'get-terminal-stderr': exports0['19'],
     },
-    'wasi:cli/terminal-stdin@0.2.0-rc-2023-11-10': {
+    'wasi:cli/terminal-stdin@0.2.0-rc-2023-12-05': {
       'get-terminal-stdin': exports0['17'],
     },
-    'wasi:cli/terminal-stdout@0.2.0-rc-2023-11-10': {
+    'wasi:cli/terminal-stdout@0.2.0-rc-2023-12-05': {
       'get-terminal-stdout': exports0['18'],
     },
     'wasi:filesystem/preopens@0.2.0-rc-2023-11-10': {
@@ -2794,28 +2782,25 @@ export const $init = (async() => {
     'wasi:random/random@0.2.0-rc-2023-11-10': {
       'get-random-bytes': exports0['15'],
     },
-    'wasi:sockets/tcp@0.2.0-rc-2023-11-10': {
-      '[resource-drop]tcp-socket': trampoline5,
-    },
   }));
   memory0 = exports1.memory;
   realloc0 = exports2.cabi_import_realloc;
   ({ exports: exports3 } = await instantiateCore(await module3, {
     '': {
       $imports: exports0.$imports,
-      '0': trampoline12,
-      '1': trampoline13,
-      '10': trampoline22,
-      '11': trampoline23,
-      '12': trampoline24,
-      '13': trampoline25,
-      '14': trampoline26,
-      '15': trampoline27,
-      '16': trampoline28,
-      '17': trampoline29,
-      '18': trampoline30,
-      '19': trampoline31,
-      '2': trampoline14,
+      '0': trampoline11,
+      '1': trampoline12,
+      '10': trampoline21,
+      '11': trampoline22,
+      '12': trampoline23,
+      '13': trampoline24,
+      '14': trampoline25,
+      '15': trampoline26,
+      '16': trampoline27,
+      '17': trampoline28,
+      '18': trampoline29,
+      '19': trampoline30,
+      '2': trampoline13,
       '20': exports2.path_open,
       '21': exports2.fd_filestat_get,
       '22': exports2.random_get,
@@ -2826,14 +2811,14 @@ export const $init = (async() => {
       '27': exports2.fd_close,
       '28': exports2.fd_prestat_get,
       '29': exports2.fd_prestat_dir_name,
-      '3': trampoline15,
+      '3': trampoline14,
       '30': exports2.proc_exit,
-      '4': trampoline16,
-      '5': trampoline17,
-      '6': trampoline18,
-      '7': trampoline19,
-      '8': trampoline20,
-      '9': trampoline21,
+      '4': trampoline15,
+      '5': trampoline16,
+      '6': trampoline17,
+      '7': trampoline18,
+      '8': trampoline19,
+      '9': trampoline20,
     },
   }));
   realloc1 = exports1.cabi_realloc;

package/obj/wasm-tools.d.ts

@@ -14,7 +14,6 @@ import { WasiFilesystemTypes } from './interfaces/wasi-filesystem-types.js';
 import { WasiIoError } from './interfaces/wasi-io-error.js';
 import { WasiIoStreams } from './interfaces/wasi-io-streams.js';
 import { WasiRandomRandom } from './interfaces/wasi-random-random.js';
-import { WasiSocketsTcp } from './interfaces/wasi-sockets-tcp.js';
 import { LocalWasmToolsTools } from './interfaces/local-wasm-tools-tools.js';
 export const tools: typeof LocalWasmToolsTools;
 

package/obj/wasm-tools.js

@@ -97,7 +97,7 @@ function utf8Encode(s, realloc, memory) {
 let exports0;
 let exports1;
 
-function trampoline8() {
+function trampoline7() {
   const ret = getStderr();
   if (!(ret instanceof OutputStream)) {
     throw new Error('Resource error: Not a valid "OutputStream" resource.');
@@ -107,7 +107,7 @@ function trampoline8() {
   return handle0;
 }
 
-function trampoline9(arg0) {
+function trampoline8(arg0) {
   let variant0;
   switch (arg0) {
     case 0: {
@@ -131,7 +131,7 @@ function trampoline9(arg0) {
   exit(variant0);
 }
 
-function trampoline10() {
+function trampoline9() {
   const ret = getStdin();
   if (!(ret instanceof InputStream)) {
     throw new Error('Resource error: Not a valid "InputStream" resource.');
@@ -141,7 +141,7 @@ function trampoline10() {
   return handle0;
 }
 
-function trampoline11() {
+function trampoline10() {
   const ret = getStdout();
   if (!(ret instanceof OutputStream)) {
     throw new Error('Resource error: Not a valid "OutputStream" resource.');
@@ -152,7 +152,7 @@ function trampoline11() {
 }
 let exports2;
 
-function trampoline12(arg0) {
+function trampoline11(arg0) {
   const ret = getDirectories();
   var vec3 = ret;
   var len3 = vec3.length;
@@ -163,8 +163,8 @@ function trampoline12(arg0) {
     if (!(tuple0_0 instanceof Descriptor)) {
       throw new Error('Resource error: Not a valid "Descriptor" resource.');
     }
-    var handle1 = handleCnt3++;
-    handleTable3.set(handle1, { rep: tuple0_0, own: true });
+    var handle1 = handleCnt5++;
+    handleTable5.set(handle1, { rep: tuple0_0, own: true });
     dataView(memory0).setInt32(base + 0, handle1, true);
     var ptr2 = utf8Encode(tuple0_1, realloc0, memory0);
     var len2 = utf8EncodedLen;
@@ -177,9 +177,9 @@ function trampoline12(arg0) {
 let memory0;
 let realloc0;
 
-function trampoline13(arg0, arg1, arg2) {
+function trampoline12(arg0, arg1, arg2) {
   var handle1 = arg0;
-  var rsc0 = handleTable3.get(handle1).rep;
+  var rsc0 = handleTable5.get(handle1).rep;
   let ret;
   try {
     ret = { tag: 'ok', val: Descriptor.prototype.readViaStream.call(rsc0, BigInt.asUintN(64, arg1)) };
@@ -370,9 +370,9 @@ function trampoline13(arg0, arg1, arg2) {
   }
 }
 
-function trampoline14(arg0, arg1, arg2) {
+function trampoline13(arg0, arg1, arg2) {
   var handle1 = arg0;
-  var rsc0 = handleTable3.get(handle1).rep;
+  var rsc0 = handleTable5.get(handle1).rep;
   let ret;
   try {
     ret = { tag: 'ok', val: Descriptor.prototype.writeViaStream.call(rsc0, BigInt.asUintN(64, arg1)) };
@@ -563,9 +563,9 @@ function trampoline14(arg0, arg1, arg2) {
   }
 }
 
-function trampoline15(arg0, arg1) {
+function trampoline14(arg0, arg1) {
   var handle1 = arg0;
-  var rsc0 = handleTable3.get(handle1).rep;
+  var rsc0 = handleTable5.get(handle1).rep;
   let ret;
   try {
     ret = { tag: 'ok', val: Descriptor.prototype.appendViaStream.call(rsc0) };
@@ -756,9 +756,9 @@ function trampoline15(arg0, arg1) {
   }
 }
 
-function trampoline16(arg0, arg1) {
+function trampoline15(arg0, arg1) {
   var handle1 = arg0;
-  var rsc0 = handleTable3.get(handle1).rep;
+  var rsc0 = handleTable5.get(handle1).rep;
   let ret;
   try {
     ret = { tag: 'ok', val: Descriptor.prototype.getType.call(rsc0) };
@@ -987,9 +987,9 @@ function trampoline16(arg0, arg1) {
   }
 }
 
-function trampoline17(arg0, arg1) {
+function trampoline16(arg0, arg1) {
   var handle1 = arg0;
-  var rsc0 = handleTable3.get(handle1).rep;
+  var rsc0 = handleTable5.get(handle1).rep;
   let ret;
   try {
     ret = { tag: 'ok', val: Descriptor.prototype.stat.call(rsc0) };
@@ -1251,9 +1251,9 @@ function trampoline17(arg0, arg1) {
   }
 }
 
-function trampoline18(arg0, arg1, arg2, arg3, arg4, arg5, arg6) {
+function trampoline17(arg0, arg1, arg2, arg3, arg4, arg5, arg6) {
   var handle1 = arg0;
-  var rsc0 = handleTable3.get(handle1).rep;
+  var rsc0 = handleTable5.get(handle1).rep;
   if ((arg1 & 4294967294) !== 0) {
     throw new TypeError('flags have extraneous bits set');
   }
@@ -1297,8 +1297,8 @@ function trampoline18(arg0, arg1, arg2, arg3, arg4, arg5, arg6) {
       if (!(e instanceof Descriptor)) {
         throw new Error('Resource error: Not a valid "Descriptor" resource.');
       }
-      var handle6 = handleCnt3++;
-      handleTable3.set(handle6, { rep: e, own: true });
+      var handle6 = handleCnt5++;
+      handleTable5.set(handle6, { rep: e, own: true });
       dataView(memory0).setInt32(arg6 + 4, handle6, true);
       break;
     }
@@ -1473,9 +1473,9 @@ function trampoline18(arg0, arg1, arg2, arg3, arg4, arg5, arg6) {
   }
 }
 
-function trampoline19(arg0, arg1) {
+function trampoline18(arg0, arg1) {
   var handle1 = arg0;
-  var rsc0 = handleTable3.get(handle1).rep;
+  var rsc0 = handleTable5.get(handle1).rep;
   let ret;
   try {
     ret = { tag: 'ok', val: Descriptor.prototype.metadataHash.call(rsc0) };
@@ -1663,7 +1663,7 @@ function trampoline19(arg0, arg1) {
   }
 }
 
-function trampoline20(arg0, arg1) {
+function trampoline19(arg0, arg1) {
   var handle1 = arg0;
   var rsc0 = handleTable0.get(handle1).rep;
   const ret = filesystemErrorCode(rsc0);
@@ -1836,7 +1836,7 @@ function trampoline20(arg0, arg1) {
   }
 }
 
-function trampoline21(arg0, arg1, arg2) {
+function trampoline20(arg0, arg1, arg2) {
   var handle1 = arg0;
   var rsc0 = handleTable1.get(handle1).rep;
   let ret;
@@ -1891,7 +1891,7 @@ function trampoline21(arg0, arg1, arg2) {
   }
 }
 
-function trampoline22(arg0, arg1, arg2) {
+function trampoline21(arg0, arg1, arg2) {
   var handle1 = arg0;
   var rsc0 = handleTable1.get(handle1).rep;
   let ret;
@@ -1946,7 +1946,7 @@ function trampoline22(arg0, arg1, arg2) {
   }
 }
 
-function trampoline23(arg0, arg1) {
+function trampoline22(arg0, arg1) {
   var handle1 = arg0;
   var rsc0 = handleTable2.get(handle1).rep;
   let ret;
@@ -1995,7 +1995,7 @@ function trampoline23(arg0, arg1) {
   }
 }
 
-function trampoline24(arg0, arg1, arg2, arg3) {
+function trampoline23(arg0, arg1, arg2, arg3) {
   var handle1 = arg0;
   var rsc0 = handleTable2.get(handle1).rep;
   var ptr2 = arg1;
@@ -2046,7 +2046,7 @@ function trampoline24(arg0, arg1, arg2, arg3) {
   }
 }
 
-function trampoline25(arg0, arg1, arg2, arg3) {
+function trampoline24(arg0, arg1, arg2, arg3) {
   var handle1 = arg0;
   var rsc0 = handleTable2.get(handle1).rep;
   var ptr2 = arg1;
@@ -2097,7 +2097,7 @@ function trampoline25(arg0, arg1, arg2, arg3) {
   }
 }
 
-function trampoline26(arg0, arg1) {
+function trampoline25(arg0, arg1) {
   var handle1 = arg0;
   var rsc0 = handleTable2.get(handle1).rep;
   let ret;
@@ -2145,7 +2145,7 @@ function trampoline26(arg0, arg1) {
   }
 }
 
-function trampoline27(arg0, arg1) {
+function trampoline26(arg0, arg1) {
   const ret = getRandomBytes(BigInt.asUintN(64, arg0));
   var val0 = ret;
   var len0 = val0.byteLength;
@@ -2156,7 +2156,7 @@ function trampoline27(arg0, arg1) {
   dataView(memory0).setInt32(arg1 + 0, ptr0, true);
 }
 
-function trampoline28(arg0) {
+function trampoline27(arg0) {
   const ret = getEnvironment();
   var vec3 = ret;
   var len3 = vec3.length;
@@ -2177,7 +2177,7 @@ function trampoline28(arg0) {
   dataView(memory0).setInt32(arg0 + 0, result3, true);
 }
 
-function trampoline29(arg0) {
+function trampoline28(arg0) {
   const ret = getTerminalStdin();
   var variant1 = ret;
   if (variant1 === null || variant1=== undefined) {
@@ -2188,13 +2188,13 @@ function trampoline29(arg0) {
     if (!(e instanceof TerminalInput)) {
       throw new Error('Resource error: Not a valid "TerminalInput" resource.');
     }
-    var handle0 = handleCnt6++;
-    handleTable6.set(handle0, { rep: e, own: true });
+    var handle0 = handleCnt3++;
+    handleTable3.set(handle0, { rep: e, own: true });
     dataView(memory0).setInt32(arg0 + 4, handle0, true);
   }
 }
 
-function trampoline30(arg0) {
+function trampoline29(arg0) {
   const ret = getTerminalStdout();
   var variant1 = ret;
   if (variant1 === null || variant1=== undefined) {
@@ -2205,13 +2205,13 @@ function trampoline30(arg0) {
     if (!(e instanceof TerminalOutput)) {
       throw new Error('Resource error: Not a valid "TerminalOutput" resource.');
     }
-    var handle0 = handleCnt7++;
-    handleTable7.set(handle0, { rep: e, own: true });
+    var handle0 = handleCnt4++;
+    handleTable4.set(handle0, { rep: e, own: true });
     dataView(memory0).setInt32(arg0 + 4, handle0, true);
   }
 }
 
-function trampoline31(arg0) {
+function trampoline30(arg0) {
   const ret = getTerminalStderr();
   var variant1 = ret;
   if (variant1 === null || variant1=== undefined) {
@@ -2222,8 +2222,8 @@ function trampoline31(arg0) {
     if (!(e instanceof TerminalOutput)) {
       throw new Error('Resource error: Not a valid "TerminalOutput" resource.');
     }
-    var handle0 = handleCnt7++;
-    handleTable7.set(handle0, { rep: e, own: true });
+    var handle0 = handleCnt4++;
+    handleTable4.set(handle0, { rep: e, own: true });
     dataView(memory0).setInt32(arg0 + 4, handle0, true);
   }
 }
@@ -2232,11 +2232,11 @@ let realloc1;
 let postReturn0;
 let postReturn1;
 function trampoline0(handle) {
-  const handleEntry = handleTable4.get(handle);
+  const handleEntry = handleTable6.get(handle);
   if (!handleEntry) {
     throw new Error(`Resource error: Invalid handle ${handle}`);
   }
-  handleTable4.delete(handle);
+  handleTable6.delete(handle);
   if (handleEntry.own && handleEntry.rep[symbolDispose]) {
     handleEntry.rep[symbolDispose]();
   }
@@ -2272,16 +2272,6 @@ function trampoline3(handle) {
   }
 }
 function trampoline4(handle) {
-  const handleEntry = handleTable3.get(handle);
-  if (!handleEntry) {
-    throw new Error(`Resource error: Invalid handle ${handle}`);
-  }
-  handleTable3.delete(handle);
-  if (handleEntry.own && handleEntry.rep[symbolDispose]) {
-    handleEntry.rep[symbolDispose]();
-  }
-}
-function trampoline5(handle) {
   const handleEntry = handleTable5.get(handle);
   if (!handleEntry) {
     throw new Error(`Resource error: Invalid handle ${handle}`);
@@ -2291,22 +2281,22 @@ function trampoline5(handle) {
     handleEntry.rep[symbolDispose]();
   }
 }
-function trampoline6(handle) {
-  const handleEntry = handleTable7.get(handle);
+function trampoline5(handle) {
+  const handleEntry = handleTable4.get(handle);
   if (!handleEntry) {
     throw new Error(`Resource error: Invalid handle ${handle}`);
   }
-  handleTable7.delete(handle);
+  handleTable4.delete(handle);
   if (handleEntry.own && handleEntry.rep[symbolDispose]) {
     handleEntry.rep[symbolDispose]();
   }
 }
-function trampoline7(handle) {
-  const handleEntry = handleTable6.get(handle);
+function trampoline6(handle) {
+  const handleEntry = handleTable3.get(handle);
   if (!handleEntry) {
     throw new Error(`Resource error: Invalid handle ${handle}`);
   }
-  handleTable6.delete(handle);
+  handleTable3.delete(handle);
   if (handleEntry.own && handleEntry.rep[symbolDispose]) {
     handleEntry.rep[symbolDispose]();
   }
@@ -2857,14 +2847,12 @@ const handleTable5= new Map();
 let handleCnt5 = 0;
 const handleTable6= new Map();
 let handleCnt6 = 0;
-const handleTable7= new Map();
-let handleCnt7 = 0;
 
 let _initialized = false;
 export const $init = (async() => {
   const module0 = fetchCompile(new URL('./wasm-tools.core.wasm', import.meta.url));
   const module1 = fetchCompile(new URL('./wasm-tools.core2.wasm', import.meta.url));
-  const module2 = base64Compile('AGFzbQEAAAABUQxgAX8AYAN/fn8AYAJ/fwBgB39/f39/f38AYAR/f39/AGACfn8AYAl/f39/f35+f38Bf2ACf38Bf2AEf39/fwF/YAF/AX9gA39/fwF/YAF/AAMgHwABAQICAgMCAgEBAgQEAgUAAAAABgcHCAgHBwkHCgsEBQFwAR8fB50BIAEwAAABMQABATIAAgEzAAMBNAAEATUABQE2AAYBNwAHATgACAE5AAkCMTAACgIxMQALAjEyAAwCMTMADQIxNAAOAjE1AA8CMTYAEAIxNwARAjE4ABICMTkAEwIyMAAUAjIxABUCMjIAFgIyMwAXAjI0ABgCMjUAGQIyNgAaAjI3ABsCMjgAHAIyOQAdAjMwAB4IJGltcG9ydHMBAAqZAx8JACAAQQARAAALDQAgACABIAJBAREBAAsNACAAIAEgAkECEQEACwsAIAAgAUEDEQIACwsAIAAgAUEEEQIACwsAIAAgAUEFEQIACxUAIAAgASACIAMgBCAFIAZBBhEDAAsLACAAIAFBBxECAAsLACAAIAFBCBECAAsNACAAIAEgAkEJEQEACw0AIAAgASACQQoRAQALCwAgACABQQsRAgALDwAgACABIAIgA0EMEQQACw8AIAAgASACIANBDREEAAsLACAAIAFBDhECAAsLACAAIAFBDxEFAAsJACAAQRARAAALCQAgAEEREQAACwkAIABBEhEAAAsJACAAQRMRAAALGQAgACABIAIgAyAEIAUgBiAHIAhBFBEGAAsLACAAIAFBFREHAAsLACAAIAFBFhEHAAsPACAAIAEgAiADQRcRCAALDwAgACABIAIgA0EYEQgACwsAIAAgAUEZEQcACwsAIAAgAUEaEQcACwkAIABBGxEJAAsLACAAIAFBHBEHAAsNACAAIAEgAkEdEQoACwkAIABBHhELAAsALglwcm9kdWNlcnMBDHByb2Nlc3NlZC1ieQENd2l0LWNvbXBvbmVudAYwLjE5LjAAkhAEbmFtZQATEndpdC1jb21wb25lbnQ6c2hpbQH1Dx8ARWluZGlyZWN0LXdhc2k6ZmlsZXN5c3RlbS9wcmVvcGVuc0AwLjIuMC1yYy0yMDIzLTExLTEwLWdldC1kaXJlY3RvcmllcwFVaW5kaXJlY3Qtd2FzaTpmaWxlc3lzdGVtL3R5cGVzQDAuMi4wLXJjLTIwMjMtMTEtMTAtW21ldGhvZF1kZXNjcmlwdG9yLnJlYWQtdmlhLXN0cmVhbQJWaW5kaXJlY3Qtd2FzaTpmaWxlc3lzdGVtL3R5cGVzQDAuMi4wLXJjLTIwMjMtMTEtMTAtW21ldGhvZF1kZXNjcmlwdG9yLndyaXRlLXZpYS1zdHJlYW0DV2luZGlyZWN0LXdhc2k6ZmlsZXN5c3RlbS90eXBlc0AwLjIuMC1yYy0yMDIzLTExLTEwLVttZXRob2RdZGVzY3JpcHRvci5hcHBlbmQtdmlhLXN0cmVhbQROaW5kaXJlY3Qtd2FzaTpmaWxlc3lzdGVtL3R5cGVzQDAuMi4wLXJjLTIwMjMtMTEtMTAtW21ldGhvZF1kZXNjcmlwdG9yLmdldC10eXBlBUppbmRpcmVjdC13YXNpOmZpbGVzeXN0ZW0vdHlwZXNAMC4yLjAtcmMtMjAyMy0xMS0xMC1bbWV0aG9kXWRlc2NyaXB0b3Iuc3RhdAZNaW5kaXJlY3Qtd2FzaTpmaWxlc3lzdGVtL3R5cGVzQDAuMi4wLXJjLTIwMjMtMTEtMTAtW21ldGhvZF1kZXNjcmlwdG9yLm9wZW4tYXQHU2luZGlyZWN0LXdhc2k6ZmlsZXN5c3RlbS90eXBlc0AwLjIuMC1yYy0yMDIzLTExLTEwLVttZXRob2RdZGVzY3JpcHRvci5tZXRhZGF0YS1oYXNoCEhpbmRpcmVjdC13YXNpOmZpbGVzeXN0ZW0vdHlwZXNAMC4yLjAtcmMtMjAyMy0xMS0xMC1maWxlc3lzdGVtLWVycm9yLWNvZGUJRmluZGlyZWN0LXdhc2k6aW8vc3RyZWFtc0AwLjIuMC1yYy0yMDIzLTExLTEwLVttZXRob2RdaW5wdXQtc3RyZWFtLnJlYWQKT2luZGlyZWN0LXdhc2k6aW8vc3RyZWFtc0AwLjIuMC1yYy0yMDIzLTExLTEwLVttZXRob2RdaW5wdXQtc3RyZWFtLmJsb2NraW5nLXJlYWQLTmluZGlyZWN0LXdhc2k6aW8vc3RyZWFtc0AwLjIuMC1yYy0yMDIzLTExLTEwLVttZXRob2Rdb3V0cHV0LXN0cmVhbS5jaGVjay13cml0ZQxIaW5kaXJlY3Qtd2FzaTppby9zdHJlYW1zQDAuMi4wLXJjLTIwMjMtMTEtMTAtW21ldGhvZF1vdXRwdXQtc3RyZWFtLndyaXRlDVtpbmRpcmVjdC13YXNpOmlvL3N0cmVhbXNAMC4yLjAtcmMtMjAyMy0xMS0xMC1bbWV0aG9kXW91dHB1dC1zdHJlYW0uYmxvY2tpbmctd3JpdGUtYW5kLWZsdXNoDlFpbmRpcmVjdC13YXNpOmlvL3N0cmVhbXNAMC4yLjAtcmMtMjAyMy0xMS0xMC1bbWV0aG9kXW91dHB1dC1zdHJlYW0uYmxvY2tpbmctZmx1c2gPQGluZGlyZWN0LXdhc2k6cmFuZG9tL3JhbmRvbUAwLjIuMC1yYy0yMDIzLTExLTEwLWdldC1yYW5kb20tYnl0ZXMQQWluZGlyZWN0LXdhc2k6Y2xpL2Vudmlyb25tZW50QDAuMi4wLXJjLTIwMjMtMTEtMTAtZ2V0LWVudmlyb25tZW50EUdpbmRpcmVjdC13YXNpOmNsaS90ZXJtaW5hbC1zdGRpbkAwLjIuMC1yYy0yMDIzLTExLTEwLWdldC10ZXJtaW5hbC1zdGRpbhJJaW5kaXJlY3Qtd2FzaTpjbGkvdGVybWluYWwtc3Rkb3V0QDAuMi4wLXJjLTIwMjMtMTEtMTAtZ2V0LXRlcm1pbmFsLXN0ZG91dBNJaW5kaXJlY3Qtd2FzaTpjbGkvdGVybWluYWwtc3RkZXJyQDAuMi4wLXJjLTIwMjMtMTEtMTAtZ2V0LXRlcm1pbmFsLXN0ZGVychQmYWRhcHQtd2FzaV9zbmFwc2hvdF9wcmV2aWV3MS1wYXRoX29wZW4VLGFkYXB0LXdhc2lfc25hcHNob3RfcHJldmlldzEtZmRfZmlsZXN0YXRfZ2V0FidhZGFwdC13YXNpX3NuYXBzaG90X3ByZXZpZXcxLXJhbmRvbV9nZXQXJGFkYXB0LXdhc2lfc25hcHNob3RfcHJldmlldzEtZmRfcmVhZBglYWRhcHQtd2FzaV9zbmFwc2hvdF9wcmV2aWV3MS1mZF93cml0ZRkoYWRhcHQtd2FzaV9zbmFwc2hvdF9wcmV2aWV3MS1lbnZpcm9uX2dldBouYWRhcHQtd2FzaV9zbmFwc2hvdF9wcmV2aWV3MS1lbnZpcm9uX3NpemVzX2dldBslYWRhcHQtd2FzaV9zbmFwc2hvdF9wcmV2aWV3MS1mZF9jbG9zZRwrYWRhcHQtd2FzaV9zbmFwc2hvdF9wcmV2aWV3MS1mZF9wcmVzdGF0X2dldB0wYWRhcHQtd2FzaV9zbmFwc2hvdF9wcmV2aWV3MS1mZF9wcmVzdGF0X2Rpcl9uYW1lHiZhZGFwdC13YXNpX3NuYXBzaG90X3ByZXZpZXcxLXByb2NfZXhpdA');
+  const module2 = base64Compile('AGFzbQEAAAABUQxgAX8AYAN/fn8AYAJ/fwBgB39/f39/f38AYAR/f39/AGACfn8AYAl/f39/f35+f38Bf2ACf38Bf2AEf39/fwF/YAF/AX9gA39/fwF/YAF/AAMgHwABAQICAgMCAgEBAgQEAgUAAAAABgcHCAgHBwkHCgsEBQFwAR8fB50BIAEwAAABMQABATIAAgEzAAMBNAAEATUABQE2AAYBNwAHATgACAE5AAkCMTAACgIxMQALAjEyAAwCMTMADQIxNAAOAjE1AA8CMTYAEAIxNwARAjE4ABICMTkAEwIyMAAUAjIxABUCMjIAFgIyMwAXAjI0ABgCMjUAGQIyNgAaAjI3ABsCMjgAHAIyOQAdAjMwAB4IJGltcG9ydHMBAAqZAx8JACAAQQARAAALDQAgACABIAJBAREBAAsNACAAIAEgAkECEQEACwsAIAAgAUEDEQIACwsAIAAgAUEEEQIACwsAIAAgAUEFEQIACxUAIAAgASACIAMgBCAFIAZBBhEDAAsLACAAIAFBBxECAAsLACAAIAFBCBECAAsNACAAIAEgAkEJEQEACw0AIAAgASACQQoRAQALCwAgACABQQsRAgALDwAgACABIAIgA0EMEQQACw8AIAAgASACIANBDREEAAsLACAAIAFBDhECAAsLACAAIAFBDxEFAAsJACAAQRARAAALCQAgAEEREQAACwkAIABBEhEAAAsJACAAQRMRAAALGQAgACABIAIgAyAEIAUgBiAHIAhBFBEGAAsLACAAIAFBFREHAAsLACAAIAFBFhEHAAsPACAAIAEgAiADQRcRCAALDwAgACABIAIgA0EYEQgACwsAIAAgAUEZEQcACwsAIAAgAUEaEQcACwkAIABBGxEJAAsLACAAIAFBHBEHAAsNACAAIAEgAkEdEQoACwkAIABBHhELAAsALglwcm9kdWNlcnMBDHByb2Nlc3NlZC1ieQENd2l0LWNvbXBvbmVudAYwLjE5LjAAkhAEbmFtZQATEndpdC1jb21wb25lbnQ6c2hpbQH1Dx8ARWluZGlyZWN0LXdhc2k6ZmlsZXN5c3RlbS9wcmVvcGVuc0AwLjIuMC1yYy0yMDIzLTExLTEwLWdldC1kaXJlY3RvcmllcwFVaW5kaXJlY3Qtd2FzaTpmaWxlc3lzdGVtL3R5cGVzQDAuMi4wLXJjLTIwMjMtMTEtMTAtW21ldGhvZF1kZXNjcmlwdG9yLnJlYWQtdmlhLXN0cmVhbQJWaW5kaXJlY3Qtd2FzaTpmaWxlc3lzdGVtL3R5cGVzQDAuMi4wLXJjLTIwMjMtMTEtMTAtW21ldGhvZF1kZXNjcmlwdG9yLndyaXRlLXZpYS1zdHJlYW0DV2luZGlyZWN0LXdhc2k6ZmlsZXN5c3RlbS90eXBlc0AwLjIuMC1yYy0yMDIzLTExLTEwLVttZXRob2RdZGVzY3JpcHRvci5hcHBlbmQtdmlhLXN0cmVhbQROaW5kaXJlY3Qtd2FzaTpmaWxlc3lzdGVtL3R5cGVzQDAuMi4wLXJjLTIwMjMtMTEtMTAtW21ldGhvZF1kZXNjcmlwdG9yLmdldC10eXBlBUppbmRpcmVjdC13YXNpOmZpbGVzeXN0ZW0vdHlwZXNAMC4yLjAtcmMtMjAyMy0xMS0xMC1bbWV0aG9kXWRlc2NyaXB0b3Iuc3RhdAZNaW5kaXJlY3Qtd2FzaTpmaWxlc3lzdGVtL3R5cGVzQDAuMi4wLXJjLTIwMjMtMTEtMTAtW21ldGhvZF1kZXNjcmlwdG9yLm9wZW4tYXQHU2luZGlyZWN0LXdhc2k6ZmlsZXN5c3RlbS90eXBlc0AwLjIuMC1yYy0yMDIzLTExLTEwLVttZXRob2RdZGVzY3JpcHRvci5tZXRhZGF0YS1oYXNoCEhpbmRpcmVjdC13YXNpOmZpbGVzeXN0ZW0vdHlwZXNAMC4yLjAtcmMtMjAyMy0xMS0xMC1maWxlc3lzdGVtLWVycm9yLWNvZGUJRmluZGlyZWN0LXdhc2k6aW8vc3RyZWFtc0AwLjIuMC1yYy0yMDIzLTExLTEwLVttZXRob2RdaW5wdXQtc3RyZWFtLnJlYWQKT2luZGlyZWN0LXdhc2k6aW8vc3RyZWFtc0AwLjIuMC1yYy0yMDIzLTExLTEwLVttZXRob2RdaW5wdXQtc3RyZWFtLmJsb2NraW5nLXJlYWQLTmluZGlyZWN0LXdhc2k6aW8vc3RyZWFtc0AwLjIuMC1yYy0yMDIzLTExLTEwLVttZXRob2Rdb3V0cHV0LXN0cmVhbS5jaGVjay13cml0ZQxIaW5kaXJlY3Qtd2FzaTppby9zdHJlYW1zQDAuMi4wLXJjLTIwMjMtMTEtMTAtW21ldGhvZF1vdXRwdXQtc3RyZWFtLndyaXRlDVtpbmRpcmVjdC13YXNpOmlvL3N0cmVhbXNAMC4yLjAtcmMtMjAyMy0xMS0xMC1bbWV0aG9kXW91dHB1dC1zdHJlYW0uYmxvY2tpbmctd3JpdGUtYW5kLWZsdXNoDlFpbmRpcmVjdC13YXNpOmlvL3N0cmVhbXNAMC4yLjAtcmMtMjAyMy0xMS0xMC1bbWV0aG9kXW91dHB1dC1zdHJlYW0uYmxvY2tpbmctZmx1c2gPQGluZGlyZWN0LXdhc2k6cmFuZG9tL3JhbmRvbUAwLjIuMC1yYy0yMDIzLTExLTEwLWdldC1yYW5kb20tYnl0ZXMQQWluZGlyZWN0LXdhc2k6Y2xpL2Vudmlyb25tZW50QDAuMi4wLXJjLTIwMjMtMTItMDUtZ2V0LWVudmlyb25tZW50EUdpbmRpcmVjdC13YXNpOmNsaS90ZXJtaW5hbC1zdGRpbkAwLjIuMC1yYy0yMDIzLTEyLTA1LWdldC10ZXJtaW5hbC1zdGRpbhJJaW5kaXJlY3Qtd2FzaTpjbGkvdGVybWluYWwtc3Rkb3V0QDAuMi4wLXJjLTIwMjMtMTItMDUtZ2V0LXRlcm1pbmFsLXN0ZG91dBNJaW5kaXJlY3Qtd2FzaTpjbGkvdGVybWluYWwtc3RkZXJyQDAuMi4wLXJjLTIwMjMtMTItMDUtZ2V0LXRlcm1pbmFsLXN0ZGVychQmYWRhcHQtd2FzaV9zbmFwc2hvdF9wcmV2aWV3MS1wYXRoX29wZW4VLGFkYXB0LXdhc2lfc25hcHNob3RfcHJldmlldzEtZmRfZmlsZXN0YXRfZ2V0FidhZGFwdC13YXNpX3NuYXBzaG90X3ByZXZpZXcxLXJhbmRvbV9nZXQXJGFkYXB0LXdhc2lfc25hcHNob3RfcHJldmlldzEtZmRfcmVhZBglYWRhcHQtd2FzaV9zbmFwc2hvdF9wcmV2aWV3MS1mZF93cml0ZRkoYWRhcHQtd2FzaV9zbmFwc2hvdF9wcmV2aWV3MS1lbnZpcm9uX2dldBouYWRhcHQtd2FzaV9zbmFwc2hvdF9wcmV2aWV3MS1lbnZpcm9uX3NpemVzX2dldBslYWRhcHQtd2FzaV9zbmFwc2hvdF9wcmV2aWV3MS1mZF9jbG9zZRwrYWRhcHQtd2FzaV9zbmFwc2hvdF9wcmV2aWV3MS1mZF9wcmVzdGF0X2dldB0wYWRhcHQtd2FzaV9zbmFwc2hvdF9wcmV2aWV3MS1mZF9wcmVzdGF0X2Rpcl9uYW1lHiZhZGFwdC13YXNpX3NuYXBzaG90X3ByZXZpZXcxLXByb2NfZXhpdA');
   const module3 = base64Compile('AGFzbQEAAAABUQxgAX8AYAN/fn8AYAJ/fwBgB39/f39/f38AYAR/f39/AGACfn8AYAl/f39/f35+f38Bf2ACf38Bf2AEf39/fwF/YAF/AX9gA39/fwF/YAF/AALAASAAATAAAAABMQABAAEyAAEAATMAAgABNAACAAE1AAIAATYAAwABNwACAAE4AAIAATkAAQACMTAAAQACMTEAAgACMTIABAACMTMABAACMTQAAgACMTUABQACMTYAAAACMTcAAAACMTgAAAACMTkAAAACMjAABgACMjEABwACMjIABwACMjMACAACMjQACAACMjUABwACMjYABwACMjcACQACMjgABwACMjkACgACMzAACwAIJGltcG9ydHMBcAEfHwklAQBBAAsfAAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHgAuCXByb2R1Y2VycwEMcHJvY2Vzc2VkLWJ5AQ13aXQtY29tcG9uZW50BjAuMTkuMAAcBG5hbWUAFRR3aXQtY29tcG9uZW50OmZpeHVwcw');
   ({ exports: exports0 } = await instantiateCore(await module2));
   ({ exports: exports1 } = await instantiateCore(await module0, {
@@ -2889,34 +2877,34 @@ export const $init = (async() => {
     env: {
       memory: exports1.memory,
     },
-    'wasi:cli/environment@0.2.0-rc-2023-11-10': {
+    'wasi:cli/environment@0.2.0-rc-2023-12-05': {
       'get-environment': exports0['16'],
     },
-    'wasi:cli/exit@0.2.0-rc-2023-11-10': {
-      exit: trampoline9,
+    'wasi:cli/exit@0.2.0-rc-2023-12-05': {
+      exit: trampoline8,
     },
-    'wasi:cli/stderr@0.2.0-rc-2023-11-10': {
-      'get-stderr': trampoline8,
+    'wasi:cli/stderr@0.2.0-rc-2023-12-05': {
+      'get-stderr': trampoline7,
     },
-    'wasi:cli/stdin@0.2.0-rc-2023-11-10': {
-      'get-stdin': trampoline10,
+    'wasi:cli/stdin@0.2.0-rc-2023-12-05': {
+      'get-stdin': trampoline9,
     },
-    'wasi:cli/stdout@0.2.0-rc-2023-11-10': {
-      'get-stdout': trampoline11,
+    'wasi:cli/stdout@0.2.0-rc-2023-12-05': {
+      'get-stdout': trampoline10,
     },
-    'wasi:cli/terminal-input@0.2.0-rc-2023-11-10': {
-      '[resource-drop]terminal-input': trampoline7,
+    'wasi:cli/terminal-input@0.2.0-rc-2023-12-05': {
+      '[resource-drop]terminal-input': trampoline6,
     },
-    'wasi:cli/terminal-output@0.2.0-rc-2023-11-10': {
-      '[resource-drop]terminal-output': trampoline6,
+    'wasi:cli/terminal-output@0.2.0-rc-2023-12-05': {
+      '[resource-drop]terminal-output': trampoline5,
     },
-    'wasi:cli/terminal-stderr@0.2.0-rc-2023-11-10': {
+    'wasi:cli/terminal-stderr@0.2.0-rc-2023-12-05': {
       'get-terminal-stderr': exports0['19'],
     },
-    'wasi:cli/terminal-stdin@0.2.0-rc-2023-11-10': {
+    'wasi:cli/terminal-stdin@0.2.0-rc-2023-12-05': {
       'get-terminal-stdin': exports0['17'],
     },
-    'wasi:cli/terminal-stdout@0.2.0-rc-2023-11-10': {
+    'wasi:cli/terminal-stdout@0.2.0-rc-2023-12-05': {
       'get-terminal-stdout': exports0['18'],
     },
     'wasi:filesystem/preopens@0.2.0-rc-2023-11-10': {
@@ -2950,28 +2938,25 @@ export const $init = (async() => {
     'wasi:random/random@0.2.0-rc-2023-11-10': {
       'get-random-bytes': exports0['15'],
     },
-    'wasi:sockets/tcp@0.2.0-rc-2023-11-10': {
-      '[resource-drop]tcp-socket': trampoline5,
-    },
   }));
   memory0 = exports1.memory;
   realloc0 = exports2.cabi_import_realloc;
   ({ exports: exports3 } = await instantiateCore(await module3, {
     '': {
       $imports: exports0.$imports,
-      '0': trampoline12,
-      '1': trampoline13,
-      '10': trampoline22,
-      '11': trampoline23,
-      '12': trampoline24,
-      '13': trampoline25,
-      '14': trampoline26,
-      '15': trampoline27,
-      '16': trampoline28,
-      '17': trampoline29,
-      '18': trampoline30,
-      '19': trampoline31,
-      '2': trampoline14,
+      '0': trampoline11,
+      '1': trampoline12,
+      '10': trampoline21,
+      '11': trampoline22,
+      '12': trampoline23,
+      '13': trampoline24,
+      '14': trampoline25,
+      '15': trampoline26,
+      '16': trampoline27,
+      '17': trampoline28,
+      '18': trampoline29,
+      '19': trampoline30,
+      '2': trampoline13,
       '20': exports2.path_open,
       '21': exports2.fd_filestat_get,
       '22': exports2.random_get,
@@ -2982,14 +2967,14 @@ export const $init = (async() => {
       '27': exports2.fd_close,
       '28': exports2.fd_prestat_get,
       '29': exports2.fd_prestat_dir_name,
-      '3': trampoline15,
+      '3': trampoline14,
       '30': exports2.proc_exit,
-      '4': trampoline16,
-      '5': trampoline17,
-      '6': trampoline18,
-      '7': trampoline19,
-      '8': trampoline20,
-      '9': trampoline21,
+      '4': trampoline15,
+      '5': trampoline16,
+      '6': trampoline17,
+      '7': trampoline18,
+      '8': trampoline19,
+      '9': trampoline20,
     },
   }));
   realloc1 = exports1.cabi_realloc;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytecodealliance/jco",
-  "version": "0.14.1",
+  "version": "0.14.2",
   "description": "JavaScript tooling for working with WebAssembly Components",
   "author": "Guy Bedford",
   "bin": {
@@ -18,7 +18,7 @@
   },
   "type": "module",
   "dependencies": {
-    "@bytecodealliance/preview2-shim": "0.14.1",
+    "@bytecodealliance/preview2-shim": "0.14.2",
     "binaryen": "^111.0.0",
     "chalk-template": "^0.4.0",
     "commander": "^9.4.1",

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.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,

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.1');
+  .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) {