@bytecodealliance/jco 1.0.3 → 1.1.0

package/README.md

@@ -96,7 +96,7 @@ fn();
 Imports can be remapped using the `--map` flag, or to provide imports as an argument use the `--instantiation` option.
 
 Components relying on WASI bindings will contain external WASI imports, which are automatically updated
-to the `@bytecodealliance/preview-shim` package. This package can be installed from npm separately for
+to the `@bytecodealliance/preview2-shim` package. This package can be installed from npm separately for
 runtime usage. This shim layer supports both Node.js and browsers.
 
 Options include:

package/obj/interfaces/wasi-filesystem-types.d.ts

@@ -145,10 +145,6 @@ export interface DirectoryEntry {
 import type { Error } from './wasi-io-streams.js';
 export { Error };
 
-export class DirectoryEntryStream {
-  readDirectoryEntry(): DirectoryEntry | undefined;
-}
-
 export class Descriptor {
   readViaStream(offset: Filesize): InputStream;
   writeViaStream(offset: Filesize): OutputStream;
@@ -161,3 +157,7 @@ export class Descriptor {
   metadataHash(): MetadataHashValue;
   metadataHashAt(pathFlags: PathFlags, path: string): MetadataHashValue;
 }
+
+export class DirectoryEntryStream {
+  readDirectoryEntry(): DirectoryEntry | undefined;
+}

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

@@ -14,7 +14,6 @@ const { getTerminalStdin } = terminalStdin;
 const { getTerminalStdout } = terminalStdout;
 const { getDirectories } = preopens;
 const { Descriptor,
-  DirectoryEntryStream,
   filesystemErrorCode } = types;
 const { Error: Error$1 } = error;
 const { InputStream,
@@ -46,6 +45,7 @@ async function fetchCompile (url) {
 
 function getErrorPayload(e) {
   if (e && hasOwnProperty.call(e, 'payload')) return e.payload;
+  if (e instanceof Error) throw e;
   return e;
 }
 
@@ -58,7 +58,7 @@ const instantiateCore = WebAssembly.instantiate;
 const T_FLAG = 1 << 30;
 
 function rscTableCreateOwn (table, rep) {
-  if (rep === 0) throw new Error('Invalid rep');
+  if (rep === 0) throw new TypeError('Invalid rep');
   const free = table[0] & ~T_FLAG;
   if (free === 0) {
     table.push(0);
@@ -76,7 +76,7 @@ function rscTableRemove (table, handle) {
   const val = table[(handle << 1) + 1];
   const own = (val & T_FLAG) !== 0;
   const rep = val & ~T_FLAG;
-  if (val === 0 || (scope & T_FLAG) !== 0) throw new Error('Invalid handle');
+  if (val === 0 || (scope & T_FLAG) !== 0) throw new TypeError('Invalid handle');
   table[handle << 1] = table[0] | T_FLAG;
   table[0] = handle | T_FLAG;
   return { rep, scope, own };
@@ -91,7 +91,7 @@ const symbolRscRep = Symbol.for('cabiRep');
 const symbolDispose = Symbol.dispose || Symbol.for('dispose');
 
 function throwUninitialized() {
-  throw new Error('Wasm uninitialized use `await $init` first');
+  throw new TypeError('Wasm uninitialized use `await $init` first');
 }
 
 const toUint64 = val => BigInt.asUintN(64, BigInt(val));
@@ -129,14 +129,17 @@ function utf8Encode(s, realloc, memory) {
 
 let exports0;
 let exports1;
+const handleTable2 = [T_FLAG, 0];
+const captureTable2= new Map();
+let captureCnt2 = 0;
+handleTables[2] = handleTable2;
 
 function trampoline5() {
   const ret = getStderr();
   if (!(ret instanceof OutputStream)) {
-    throw new Error('Resource error: Not a valid "OutputStream" resource.');
+    throw new TypeError('Resource error: Not a valid "OutputStream" resource.');
   }
   var handle0 = ret[symbolRscHandle];
-  
   if (!handle0) {
     const rep = ret[symbolRscRep] || ++captureCnt2;
     captureTable2.set(rep, ret);
@@ -168,14 +171,17 @@ function trampoline6(arg0) {
   }
   exit(variant0);
 }
+const handleTable1 = [T_FLAG, 0];
+const captureTable1= new Map();
+let captureCnt1 = 0;
+handleTables[1] = handleTable1;
 
 function trampoline7() {
   const ret = getStdin();
   if (!(ret instanceof InputStream)) {
-    throw new Error('Resource error: Not a valid "InputStream" resource.');
+    throw new TypeError('Resource error: Not a valid "InputStream" resource.');
   }
   var handle0 = ret[symbolRscHandle];
-  
   if (!handle0) {
     const rep = ret[symbolRscRep] || ++captureCnt1;
     captureTable1.set(rep, ret);
@@ -187,10 +193,9 @@ function trampoline7() {
 function trampoline8() {
   const ret = getStdout();
   if (!(ret instanceof OutputStream)) {
-    throw new Error('Resource error: Not a valid "OutputStream" resource.');
+    throw new TypeError('Resource error: Not a valid "OutputStream" resource.');
   }
   var handle0 = ret[symbolRscHandle];
-  
   if (!handle0) {
     const rep = ret[symbolRscRep] || ++captureCnt2;
     captureTable2.set(rep, ret);
@@ -201,6 +206,10 @@ function trampoline8() {
 let exports2;
 let memory0;
 let realloc0;
+const handleTable5 = [T_FLAG, 0];
+const captureTable5= new Map();
+let captureCnt5 = 0;
+handleTables[5] = handleTable5;
 
 function trampoline11(arg0) {
   const ret = getDirectories();
@@ -211,10 +220,9 @@ function trampoline11(arg0) {
     const e = vec3[i];
     const base = result3 + i * 12;var [tuple0_0, tuple0_1] = e;
     if (!(tuple0_0 instanceof Descriptor)) {
-      throw new Error('Resource error: Not a valid "Descriptor" resource.');
+      throw new TypeError('Resource error: Not a valid "Descriptor" resource.');
     }
     var handle1 = tuple0_0[symbolRscHandle];
-    
     if (!handle1) {
       const rep = tuple0_0[symbolRscRep] || ++captureCnt5;
       captureTable5.set(rep, tuple0_0);
@@ -252,10 +260,9 @@ function trampoline12(arg0, arg1, arg2) {
       const e = variant5.val;
       dataView(memory0).setInt8(arg2 + 0, 0, true);
       if (!(e instanceof InputStream)) {
-        throw new Error('Resource error: Not a valid "InputStream" resource.');
+        throw new TypeError('Resource error: Not a valid "InputStream" resource.');
       }
       var handle3 = e[symbolRscHandle];
-      
       if (!handle3) {
         const rep = e[symbolRscRep] || ++captureCnt1;
         captureTable1.set(rep, e);
@@ -457,10 +464,9 @@ function trampoline13(arg0, arg1, arg2) {
       const e = variant5.val;
       dataView(memory0).setInt8(arg2 + 0, 0, true);
       if (!(e instanceof OutputStream)) {
-        throw new Error('Resource error: Not a valid "OutputStream" resource.');
+        throw new TypeError('Resource error: Not a valid "OutputStream" resource.');
       }
       var handle3 = e[symbolRscHandle];
-      
       if (!handle3) {
         const rep = e[symbolRscRep] || ++captureCnt2;
         captureTable2.set(rep, e);
@@ -662,10 +668,9 @@ function trampoline14(arg0, arg1) {
       const e = variant5.val;
       dataView(memory0).setInt8(arg1 + 0, 0, true);
       if (!(e instanceof OutputStream)) {
-        throw new Error('Resource error: Not a valid "OutputStream" resource.');
+        throw new TypeError('Resource error: Not a valid "OutputStream" resource.');
       }
       var handle3 = e[symbolRscHandle];
-      
       if (!handle3) {
         const rep = e[symbolRscRep] || ++captureCnt2;
         captureTable2.set(rep, e);
@@ -1405,10 +1410,9 @@ function trampoline17(arg0, arg1, arg2, arg3, arg4, arg5, arg6) {
       const e = variant9.val;
       dataView(memory0).setInt8(arg6 + 0, 0, true);
       if (!(e instanceof Descriptor)) {
-        throw new Error('Resource error: Not a valid "Descriptor" resource.');
+        throw new TypeError('Resource error: Not a valid "Descriptor" resource.');
       }
       var handle7 = e[symbolRscHandle];
-      
       if (!handle7) {
         const rep = e[symbolRscRep] || ++captureCnt5;
         captureTable5.set(rep, e);
@@ -1784,6 +1788,10 @@ function trampoline18(arg0, arg1) {
     }
   }
 }
+const handleTable0 = [T_FLAG, 0];
+const captureTable0= new Map();
+let captureCnt0 = 0;
+handleTables[0] = handleTable0;
 
 function trampoline19(arg0, arg1) {
   var handle1 = arg0;
@@ -2004,10 +2012,9 @@ function trampoline20(arg0, arg1, arg2) {
           const e = variant5.val;
           dataView(memory0).setInt8(arg2 + 4, 0, true);
           if (!(e instanceof Error$1)) {
-            throw new Error('Resource error: Not a valid "Error" resource.');
+            throw new TypeError('Resource error: Not a valid "Error" resource.');
           }
           var handle4 = e[symbolRscHandle];
-          
           if (!handle4) {
             const rep = e[symbolRscRep] || ++captureCnt0;
             captureTable0.set(rep, e);
@@ -2071,10 +2078,9 @@ function trampoline21(arg0, arg1, arg2) {
           const e = variant5.val;
           dataView(memory0).setInt8(arg2 + 4, 0, true);
           if (!(e instanceof Error$1)) {
-            throw new Error('Resource error: Not a valid "Error" resource.');
+            throw new TypeError('Resource error: Not a valid "Error" resource.');
           }
           var handle4 = e[symbolRscHandle];
-          
           if (!handle4) {
             const rep = e[symbolRscRep] || ++captureCnt0;
             captureTable0.set(rep, e);
@@ -2132,10 +2138,9 @@ function trampoline22(arg0, arg1) {
           const e = variant4.val;
           dataView(memory0).setInt8(arg1 + 8, 0, true);
           if (!(e instanceof Error$1)) {
-            throw new Error('Resource error: Not a valid "Error" resource.');
+            throw new TypeError('Resource error: Not a valid "Error" resource.');
           }
           var handle3 = e[symbolRscHandle];
-          
           if (!handle3) {
             const rep = e[symbolRscRep] || ++captureCnt0;
             captureTable0.set(rep, e);
@@ -2195,10 +2200,9 @@ function trampoline23(arg0, arg1, arg2, arg3) {
           const e = variant5.val;
           dataView(memory0).setInt8(arg3 + 4, 0, true);
           if (!(e instanceof Error$1)) {
-            throw new Error('Resource error: Not a valid "Error" resource.');
+            throw new TypeError('Resource error: Not a valid "Error" resource.');
           }
           var handle4 = e[symbolRscHandle];
-          
           if (!handle4) {
             const rep = e[symbolRscRep] || ++captureCnt0;
             captureTable0.set(rep, e);
@@ -2258,10 +2262,9 @@ function trampoline24(arg0, arg1, arg2, arg3) {
           const e = variant5.val;
           dataView(memory0).setInt8(arg3 + 4, 0, true);
           if (!(e instanceof Error$1)) {
-            throw new Error('Resource error: Not a valid "Error" resource.');
+            throw new TypeError('Resource error: Not a valid "Error" resource.');
           }
           var handle4 = e[symbolRscHandle];
-          
           if (!handle4) {
             const rep = e[symbolRscRep] || ++captureCnt0;
             captureTable0.set(rep, e);
@@ -2318,10 +2321,9 @@ function trampoline25(arg0, arg1) {
           const e = variant4.val;
           dataView(memory0).setInt8(arg1 + 4, 0, true);
           if (!(e instanceof Error$1)) {
-            throw new Error('Resource error: Not a valid "Error" resource.');
+            throw new TypeError('Resource error: Not a valid "Error" resource.');
           }
           var handle3 = e[symbolRscHandle];
-          
           if (!handle3) {
             const rep = e[symbolRscRep] || ++captureCnt0;
             captureTable0.set(rep, e);
@@ -2377,6 +2379,10 @@ function trampoline27(arg0) {
   dataView(memory0).setInt32(arg0 + 4, len3, true);
   dataView(memory0).setInt32(arg0 + 0, result3, true);
 }
+const handleTable3 = [T_FLAG, 0];
+const captureTable3= new Map();
+let captureCnt3 = 0;
+handleTables[3] = handleTable3;
 
 function trampoline28(arg0) {
   const ret = getTerminalStdin();
@@ -2387,10 +2393,9 @@ function trampoline28(arg0) {
     const e = variant1;
     dataView(memory0).setInt8(arg0 + 0, 1, true);
     if (!(e instanceof TerminalInput)) {
-      throw new Error('Resource error: Not a valid "TerminalInput" resource.');
+      throw new TypeError('Resource error: Not a valid "TerminalInput" resource.');
     }
     var handle0 = e[symbolRscHandle];
-    
     if (!handle0) {
       const rep = e[symbolRscRep] || ++captureCnt3;
       captureTable3.set(rep, e);
@@ -2399,6 +2404,10 @@ function trampoline28(arg0) {
     dataView(memory0).setInt32(arg0 + 4, handle0, true);
   }
 }
+const handleTable4 = [T_FLAG, 0];
+const captureTable4= new Map();
+let captureCnt4 = 0;
+handleTables[4] = handleTable4;
 
 function trampoline29(arg0) {
   const ret = getTerminalStdout();
@@ -2409,10 +2418,9 @@ function trampoline29(arg0) {
     const e = variant1;
     dataView(memory0).setInt8(arg0 + 0, 1, true);
     if (!(e instanceof TerminalOutput)) {
-      throw new Error('Resource error: Not a valid "TerminalOutput" resource.');
+      throw new TypeError('Resource error: Not a valid "TerminalOutput" resource.');
     }
     var handle0 = e[symbolRscHandle];
-    
     if (!handle0) {
       const rep = e[symbolRscRep] || ++captureCnt4;
       captureTable4.set(rep, e);
@@ -2431,10 +2439,9 @@ function trampoline30(arg0) {
     const e = variant1;
     dataView(memory0).setInt8(arg0 + 0, 1, true);
     if (!(e instanceof TerminalOutput)) {
-      throw new Error('Resource error: Not a valid "TerminalOutput" resource.');
+      throw new TypeError('Resource error: Not a valid "TerminalOutput" resource.');
     }
     var handle0 = e[symbolRscHandle];
-    
     if (!handle0) {
       const rep = e[symbolRscRep] || ++captureCnt4;
       captureTable4.set(rep, e);
@@ -2453,103 +2460,86 @@ let captureCnt6 = 0;
 handleTables[6] = handleTable6;
 function trampoline0(handle) {
   const handleEntry = rscTableRemove(handleTable6, handle);
-  if (!handleEntry.own) throw new Error('Internal error: Unexpected borrow handle');
-  const rsc = captureTable6.get(handleEntry.rep);
-  if (rsc) {
-    if (rsc[symbolDispose]) rsc[symbolDispose]();
-    captureTable6.delete(handleEntry.rep);
-  } else if (DirectoryEntryStream[symbolCabiDispose]) {
-    DirectoryEntryStream[symbolCabiDispose](handleEntry.rep);
+  if (handleEntry.own) {
+    throw new TypeError('unreachable resource trampoline')
   }
 }
-const handleTable0 = [T_FLAG, 0];
-const captureTable0= new Map();
-let captureCnt0 = 0;
-handleTables[0] = handleTable0;
 function trampoline1(handle) {
   const handleEntry = rscTableRemove(handleTable0, handle);
-  if (!handleEntry.own) throw new Error('Internal error: Unexpected borrow handle');
-  const rsc = captureTable0.get(handleEntry.rep);
-  if (rsc) {
-    if (rsc[symbolDispose]) rsc[symbolDispose]();
-    captureTable0.delete(handleEntry.rep);
-  } else if (Error$1[symbolCabiDispose]) {
-    Error$1[symbolCabiDispose](handleEntry.rep);
+  if (handleEntry.own) {
+    
+    const rsc = captureTable0.get(handleEntry.rep);
+    if (rsc) {
+      if (rsc[symbolDispose]) rsc[symbolDispose]();
+      captureTable0.delete(handleEntry.rep);
+    } else if (Error$1[symbolCabiDispose]) {
+      Error$1[symbolCabiDispose](handleEntry.rep);
+    }
   }
 }
-const handleTable1 = [T_FLAG, 0];
-const captureTable1= new Map();
-let captureCnt1 = 0;
-handleTables[1] = handleTable1;
 function trampoline2(handle) {
   const handleEntry = rscTableRemove(handleTable1, handle);
-  if (!handleEntry.own) throw new Error('Internal error: Unexpected borrow handle');
-  const rsc = captureTable1.get(handleEntry.rep);
-  if (rsc) {
-    if (rsc[symbolDispose]) rsc[symbolDispose]();
-    captureTable1.delete(handleEntry.rep);
-  } else if (InputStream[symbolCabiDispose]) {
-    InputStream[symbolCabiDispose](handleEntry.rep);
+  if (handleEntry.own) {
+    
+    const rsc = captureTable1.get(handleEntry.rep);
+    if (rsc) {
+      if (rsc[symbolDispose]) rsc[symbolDispose]();
+      captureTable1.delete(handleEntry.rep);
+    } else if (InputStream[symbolCabiDispose]) {
+      InputStream[symbolCabiDispose](handleEntry.rep);
+    }
   }
 }
-const handleTable2 = [T_FLAG, 0];
-const captureTable2= new Map();
-let captureCnt2 = 0;
-handleTables[2] = handleTable2;
 function trampoline3(handle) {
   const handleEntry = rscTableRemove(handleTable2, handle);
-  if (!handleEntry.own) throw new Error('Internal error: Unexpected borrow handle');
-  const rsc = captureTable2.get(handleEntry.rep);
-  if (rsc) {
-    if (rsc[symbolDispose]) rsc[symbolDispose]();
-    captureTable2.delete(handleEntry.rep);
-  } else if (OutputStream[symbolCabiDispose]) {
-    OutputStream[symbolCabiDispose](handleEntry.rep);
+  if (handleEntry.own) {
+    
+    const rsc = captureTable2.get(handleEntry.rep);
+    if (rsc) {
+      if (rsc[symbolDispose]) rsc[symbolDispose]();
+      captureTable2.delete(handleEntry.rep);
+    } else if (OutputStream[symbolCabiDispose]) {
+      OutputStream[symbolCabiDispose](handleEntry.rep);
+    }
   }
 }
-const handleTable5 = [T_FLAG, 0];
-const captureTable5= new Map();
-let captureCnt5 = 0;
-handleTables[5] = handleTable5;
 function trampoline4(handle) {
   const handleEntry = rscTableRemove(handleTable5, handle);
-  if (!handleEntry.own) throw new Error('Internal error: Unexpected borrow handle');
-  const rsc = captureTable5.get(handleEntry.rep);
-  if (rsc) {
-    if (rsc[symbolDispose]) rsc[symbolDispose]();
-    captureTable5.delete(handleEntry.rep);
-  } else if (Descriptor[symbolCabiDispose]) {
-    Descriptor[symbolCabiDispose](handleEntry.rep);
+  if (handleEntry.own) {
+    
+    const rsc = captureTable5.get(handleEntry.rep);
+    if (rsc) {
+      if (rsc[symbolDispose]) rsc[symbolDispose]();
+      captureTable5.delete(handleEntry.rep);
+    } else if (Descriptor[symbolCabiDispose]) {
+      Descriptor[symbolCabiDispose](handleEntry.rep);
+    }
   }
 }
-const handleTable4 = [T_FLAG, 0];
-const captureTable4= new Map();
-let captureCnt4 = 0;
-handleTables[4] = handleTable4;
 function trampoline9(handle) {
-  const handleEntry = rscTableRemove(handleTable4, handle);
-  if (!handleEntry.own) throw new Error('Internal error: Unexpected borrow handle');
-  const rsc = captureTable4.get(handleEntry.rep);
-  if (rsc) {
-    if (rsc[symbolDispose]) rsc[symbolDispose]();
-    captureTable4.delete(handleEntry.rep);
-  } else if (TerminalOutput[symbolCabiDispose]) {
-    TerminalOutput[symbolCabiDispose](handleEntry.rep);
+  const handleEntry = rscTableRemove(handleTable3, handle);
+  if (handleEntry.own) {
+    
+    const rsc = captureTable3.get(handleEntry.rep);
+    if (rsc) {
+      if (rsc[symbolDispose]) rsc[symbolDispose]();
+      captureTable3.delete(handleEntry.rep);
+    } else if (TerminalInput[symbolCabiDispose]) {
+      TerminalInput[symbolCabiDispose](handleEntry.rep);
+    }
   }
 }
-const handleTable3 = [T_FLAG, 0];
-const captureTable3= new Map();
-let captureCnt3 = 0;
-handleTables[3] = handleTable3;
 function trampoline10(handle) {
-  const handleEntry = rscTableRemove(handleTable3, handle);
-  if (!handleEntry.own) throw new Error('Internal error: Unexpected borrow handle');
-  const rsc = captureTable3.get(handleEntry.rep);
-  if (rsc) {
-    if (rsc[symbolDispose]) rsc[symbolDispose]();
-    captureTable3.delete(handleEntry.rep);
-  } else if (TerminalInput[symbolCabiDispose]) {
-    TerminalInput[symbolCabiDispose](handleEntry.rep);
+  const handleEntry = rscTableRemove(handleTable4, handle);
+  if (handleEntry.own) {
+    
+    const rsc = captureTable4.get(handleEntry.rep);
+    if (rsc) {
+      if (rsc[symbolDispose]) rsc[symbolDispose]();
+      captureTable4.delete(handleEntry.rep);
+    } else if (TerminalOutput[symbolCabiDispose]) {
+      TerminalOutput[symbolCabiDispose](handleEntry.rep);
+    }
   }
 }
 
@@ -3011,10 +3001,10 @@ export const $init = (async() => {
       'get-stdout': trampoline8,
     },
     'wasi:cli/terminal-input@0.2.0': {
-      '[resource-drop]terminal-input': trampoline10,
+      '[resource-drop]terminal-input': trampoline9,
     },
     'wasi:cli/terminal-output@0.2.0': {
-      '[resource-drop]terminal-output': trampoline9,
+      '[resource-drop]terminal-output': trampoline10,
     },
     'wasi:cli/terminal-stderr@0.2.0': {
       'get-terminal-stderr': exports0['19'],

package/obj/wasm-tools.js

@@ -46,6 +46,7 @@ async function fetchCompile (url) {
 
 function getErrorPayload(e) {
   if (e && hasOwnProperty.call(e, 'payload')) return e.payload;
+  if (e instanceof Error) throw e;
   return e;
 }
 
@@ -58,7 +59,7 @@ const instantiateCore = WebAssembly.instantiate;
 const T_FLAG = 1 << 30;
 
 function rscTableCreateOwn (table, rep) {
-  if (rep === 0) throw new Error('Invalid rep');
+  if (rep === 0) throw new TypeError('Invalid rep');
   const free = table[0] & ~T_FLAG;
   if (free === 0) {
     table.push(0);
@@ -76,7 +77,7 @@ function rscTableRemove (table, handle) {
   const val = table[(handle << 1) + 1];
   const own = (val & T_FLAG) !== 0;
   const rep = val & ~T_FLAG;
-  if (val === 0 || (scope & T_FLAG) !== 0) throw new Error('Invalid handle');
+  if (val === 0 || (scope & T_FLAG) !== 0) throw new TypeError('Invalid handle');
   table[handle << 1] = table[0] | T_FLAG;
   table[0] = handle | T_FLAG;
   return { rep, scope, own };
@@ -91,7 +92,7 @@ const symbolRscRep = Symbol.for('cabiRep');
 const symbolDispose = Symbol.dispose || Symbol.for('dispose');
 
 function throwUninitialized() {
-  throw new Error('Wasm uninitialized use `await $init` first');
+  throw new TypeError('Wasm uninitialized use `await $init` first');
 }
 
 const toUint64 = val => BigInt.asUintN(64, BigInt(val));
@@ -129,14 +130,17 @@ function utf8Encode(s, realloc, memory) {
 
 let exports0;
 let exports1;
+const handleTable2 = [T_FLAG, 0];
+const captureTable2= new Map();
+let captureCnt2 = 0;
+handleTables[2] = handleTable2;
 
 function trampoline5() {
   const ret = getStderr();
   if (!(ret instanceof OutputStream)) {
-    throw new Error('Resource error: Not a valid "OutputStream" resource.');
+    throw new TypeError('Resource error: Not a valid "OutputStream" resource.');
   }
   var handle0 = ret[symbolRscHandle];
-  
   if (!handle0) {
     const rep = ret[symbolRscRep] || ++captureCnt2;
     captureTable2.set(rep, ret);
@@ -168,14 +172,17 @@ function trampoline6(arg0) {
   }
   exit(variant0);
 }
+const handleTable1 = [T_FLAG, 0];
+const captureTable1= new Map();
+let captureCnt1 = 0;
+handleTables[1] = handleTable1;
 
 function trampoline7() {
   const ret = getStdin();
   if (!(ret instanceof InputStream)) {
-    throw new Error('Resource error: Not a valid "InputStream" resource.');
+    throw new TypeError('Resource error: Not a valid "InputStream" resource.');
   }
   var handle0 = ret[symbolRscHandle];
-  
   if (!handle0) {
     const rep = ret[symbolRscRep] || ++captureCnt1;
     captureTable1.set(rep, ret);
@@ -187,10 +194,9 @@ function trampoline7() {
 function trampoline8() {
   const ret = getStdout();
   if (!(ret instanceof OutputStream)) {
-    throw new Error('Resource error: Not a valid "OutputStream" resource.');
+    throw new TypeError('Resource error: Not a valid "OutputStream" resource.');
   }
   var handle0 = ret[symbolRscHandle];
-  
   if (!handle0) {
     const rep = ret[symbolRscRep] || ++captureCnt2;
     captureTable2.set(rep, ret);
@@ -201,6 +207,10 @@ function trampoline8() {
 let exports2;
 let memory0;
 let realloc0;
+const handleTable5 = [T_FLAG, 0];
+const captureTable5= new Map();
+let captureCnt5 = 0;
+handleTables[5] = handleTable5;
 
 function trampoline11(arg0) {
   const ret = getDirectories();
@@ -211,10 +221,9 @@ function trampoline11(arg0) {
     const e = vec3[i];
     const base = result3 + i * 12;var [tuple0_0, tuple0_1] = e;
     if (!(tuple0_0 instanceof Descriptor)) {
-      throw new Error('Resource error: Not a valid "Descriptor" resource.');
+      throw new TypeError('Resource error: Not a valid "Descriptor" resource.');
     }
     var handle1 = tuple0_0[symbolRscHandle];
-    
     if (!handle1) {
       const rep = tuple0_0[symbolRscRep] || ++captureCnt5;
       captureTable5.set(rep, tuple0_0);
@@ -252,10 +261,9 @@ function trampoline12(arg0, arg1, arg2) {
       const e = variant5.val;
       dataView(memory0).setInt8(arg2 + 0, 0, true);
       if (!(e instanceof InputStream)) {
-        throw new Error('Resource error: Not a valid "InputStream" resource.');
+        throw new TypeError('Resource error: Not a valid "InputStream" resource.');
       }
       var handle3 = e[symbolRscHandle];
-      
       if (!handle3) {
         const rep = e[symbolRscRep] || ++captureCnt1;
         captureTable1.set(rep, e);
@@ -457,10 +465,9 @@ function trampoline13(arg0, arg1, arg2) {
       const e = variant5.val;
       dataView(memory0).setInt8(arg2 + 0, 0, true);
       if (!(e instanceof OutputStream)) {
-        throw new Error('Resource error: Not a valid "OutputStream" resource.');
+        throw new TypeError('Resource error: Not a valid "OutputStream" resource.');
       }
       var handle3 = e[symbolRscHandle];
-      
       if (!handle3) {
         const rep = e[symbolRscRep] || ++captureCnt2;
         captureTable2.set(rep, e);
@@ -662,10 +669,9 @@ function trampoline14(arg0, arg1) {
       const e = variant5.val;
       dataView(memory0).setInt8(arg1 + 0, 0, true);
       if (!(e instanceof OutputStream)) {
-        throw new Error('Resource error: Not a valid "OutputStream" resource.');
+        throw new TypeError('Resource error: Not a valid "OutputStream" resource.');
       }
       var handle3 = e[symbolRscHandle];
-      
       if (!handle3) {
         const rep = e[symbolRscRep] || ++captureCnt2;
         captureTable2.set(rep, e);
@@ -1082,6 +1088,10 @@ function trampoline15(arg0, arg1) {
     }
   }
 }
+const handleTable6 = [T_FLAG, 0];
+const captureTable6= new Map();
+let captureCnt6 = 0;
+handleTables[6] = handleTable6;
 
 function trampoline16(arg0, arg1) {
   var handle1 = arg0;
@@ -1105,10 +1115,9 @@ function trampoline16(arg0, arg1) {
       const e = variant5.val;
       dataView(memory0).setInt8(arg1 + 0, 0, true);
       if (!(e instanceof DirectoryEntryStream)) {
-        throw new Error('Resource error: Not a valid "DirectoryEntryStream" resource.');
+        throw new TypeError('Resource error: Not a valid "DirectoryEntryStream" resource.');
       }
       var handle3 = e[symbolRscHandle];
-      
       if (!handle3) {
         const rep = e[symbolRscRep] || ++captureCnt6;
         captureTable6.set(rep, e);
@@ -1890,10 +1899,9 @@ function trampoline19(arg0, arg1, arg2, arg3, arg4, arg5, arg6) {
       const e = variant9.val;
       dataView(memory0).setInt8(arg6 + 0, 0, true);
       if (!(e instanceof Descriptor)) {
-        throw new Error('Resource error: Not a valid "Descriptor" resource.');
+        throw new TypeError('Resource error: Not a valid "Descriptor" resource.');
       }
       var handle7 = e[symbolRscHandle];
-      
       if (!handle7) {
         const rep = e[symbolRscRep] || ++captureCnt5;
         captureTable5.set(rep, e);
@@ -2725,6 +2733,10 @@ function trampoline22(arg0, arg1) {
     }
   }
 }
+const handleTable0 = [T_FLAG, 0];
+const captureTable0= new Map();
+let captureCnt0 = 0;
+handleTables[0] = handleTable0;
 
 function trampoline23(arg0, arg1) {
   var handle1 = arg0;
@@ -2945,10 +2957,9 @@ function trampoline24(arg0, arg1, arg2) {
           const e = variant5.val;
           dataView(memory0).setInt8(arg2 + 4, 0, true);
           if (!(e instanceof Error$1)) {
-            throw new Error('Resource error: Not a valid "Error" resource.');
+            throw new TypeError('Resource error: Not a valid "Error" resource.');
           }
           var handle4 = e[symbolRscHandle];
-          
           if (!handle4) {
             const rep = e[symbolRscRep] || ++captureCnt0;
             captureTable0.set(rep, e);
@@ -3012,10 +3023,9 @@ function trampoline25(arg0, arg1, arg2) {
           const e = variant5.val;
           dataView(memory0).setInt8(arg2 + 4, 0, true);
           if (!(e instanceof Error$1)) {
-            throw new Error('Resource error: Not a valid "Error" resource.');
+            throw new TypeError('Resource error: Not a valid "Error" resource.');
           }
           var handle4 = e[symbolRscHandle];
-          
           if (!handle4) {
             const rep = e[symbolRscRep] || ++captureCnt0;
             captureTable0.set(rep, e);
@@ -3073,10 +3083,9 @@ function trampoline26(arg0, arg1) {
           const e = variant4.val;
           dataView(memory0).setInt8(arg1 + 8, 0, true);
           if (!(e instanceof Error$1)) {
-            throw new Error('Resource error: Not a valid "Error" resource.');
+            throw new TypeError('Resource error: Not a valid "Error" resource.');
           }
           var handle3 = e[symbolRscHandle];
-          
           if (!handle3) {
             const rep = e[symbolRscRep] || ++captureCnt0;
             captureTable0.set(rep, e);
@@ -3136,10 +3145,9 @@ function trampoline27(arg0, arg1, arg2, arg3) {
           const e = variant5.val;
           dataView(memory0).setInt8(arg3 + 4, 0, true);
           if (!(e instanceof Error$1)) {
-            throw new Error('Resource error: Not a valid "Error" resource.');
+            throw new TypeError('Resource error: Not a valid "Error" resource.');
           }
           var handle4 = e[symbolRscHandle];
-          
           if (!handle4) {
             const rep = e[symbolRscRep] || ++captureCnt0;
             captureTable0.set(rep, e);
@@ -3199,10 +3207,9 @@ function trampoline28(arg0, arg1, arg2, arg3) {
           const e = variant5.val;
           dataView(memory0).setInt8(arg3 + 4, 0, true);
           if (!(e instanceof Error$1)) {
-            throw new Error('Resource error: Not a valid "Error" resource.');
+            throw new TypeError('Resource error: Not a valid "Error" resource.');
           }
           var handle4 = e[symbolRscHandle];
-          
           if (!handle4) {
             const rep = e[symbolRscRep] || ++captureCnt0;
             captureTable0.set(rep, e);
@@ -3259,10 +3266,9 @@ function trampoline29(arg0, arg1) {
           const e = variant4.val;
           dataView(memory0).setInt8(arg1 + 4, 0, true);
           if (!(e instanceof Error$1)) {
-            throw new Error('Resource error: Not a valid "Error" resource.');
+            throw new TypeError('Resource error: Not a valid "Error" resource.');
           }
           var handle3 = e[symbolRscHandle];
-          
           if (!handle3) {
             const rep = e[symbolRscRep] || ++captureCnt0;
             captureTable0.set(rep, e);
@@ -3318,6 +3324,10 @@ function trampoline31(arg0) {
   dataView(memory0).setInt32(arg0 + 4, len3, true);
   dataView(memory0).setInt32(arg0 + 0, result3, true);
 }
+const handleTable3 = [T_FLAG, 0];
+const captureTable3= new Map();
+let captureCnt3 = 0;
+handleTables[3] = handleTable3;
 
 function trampoline32(arg0) {
   const ret = getTerminalStdin();
@@ -3328,10 +3338,9 @@ function trampoline32(arg0) {
     const e = variant1;
     dataView(memory0).setInt8(arg0 + 0, 1, true);
     if (!(e instanceof TerminalInput)) {
-      throw new Error('Resource error: Not a valid "TerminalInput" resource.');
+      throw new TypeError('Resource error: Not a valid "TerminalInput" resource.');
     }
     var handle0 = e[symbolRscHandle];
-    
     if (!handle0) {
       const rep = e[symbolRscRep] || ++captureCnt3;
       captureTable3.set(rep, e);
@@ -3340,6 +3349,10 @@ function trampoline32(arg0) {
     dataView(memory0).setInt32(arg0 + 4, handle0, true);
   }
 }
+const handleTable4 = [T_FLAG, 0];
+const captureTable4= new Map();
+let captureCnt4 = 0;
+handleTables[4] = handleTable4;
 
 function trampoline33(arg0) {
   const ret = getTerminalStdout();
@@ -3350,10 +3363,9 @@ function trampoline33(arg0) {
     const e = variant1;
     dataView(memory0).setInt8(arg0 + 0, 1, true);
     if (!(e instanceof TerminalOutput)) {
-      throw new Error('Resource error: Not a valid "TerminalOutput" resource.');
+      throw new TypeError('Resource error: Not a valid "TerminalOutput" resource.');
     }
     var handle0 = e[symbolRscHandle];
-    
     if (!handle0) {
       const rep = e[symbolRscRep] || ++captureCnt4;
       captureTable4.set(rep, e);
@@ -3372,10 +3384,9 @@ function trampoline34(arg0) {
     const e = variant1;
     dataView(memory0).setInt8(arg0 + 0, 1, true);
     if (!(e instanceof TerminalOutput)) {
-      throw new Error('Resource error: Not a valid "TerminalOutput" resource.');
+      throw new TypeError('Resource error: Not a valid "TerminalOutput" resource.');
     }
     var handle0 = e[symbolRscHandle];
-    
     if (!handle0) {
       const rep = e[symbolRscRep] || ++captureCnt4;
       captureTable4.set(rep, e);
@@ -3393,109 +3404,95 @@ let postReturn3;
 let postReturn4;
 let postReturn5;
 let postReturn6;
-const handleTable6 = [T_FLAG, 0];
-const captureTable6= new Map();
-let captureCnt6 = 0;
-handleTables[6] = handleTable6;
 function trampoline0(handle) {
   const handleEntry = rscTableRemove(handleTable6, handle);
-  if (!handleEntry.own) throw new Error('Internal error: Unexpected borrow handle');
-  const rsc = captureTable6.get(handleEntry.rep);
-  if (rsc) {
-    if (rsc[symbolDispose]) rsc[symbolDispose]();
-    captureTable6.delete(handleEntry.rep);
-  } else if (DirectoryEntryStream[symbolCabiDispose]) {
-    DirectoryEntryStream[symbolCabiDispose](handleEntry.rep);
+  if (handleEntry.own) {
+    
+    const rsc = captureTable6.get(handleEntry.rep);
+    if (rsc) {
+      if (rsc[symbolDispose]) rsc[symbolDispose]();
+      captureTable6.delete(handleEntry.rep);
+    } else if (DirectoryEntryStream[symbolCabiDispose]) {
+      DirectoryEntryStream[symbolCabiDispose](handleEntry.rep);
+    }
   }
 }
-const handleTable0 = [T_FLAG, 0];
-const captureTable0= new Map();
-let captureCnt0 = 0;
-handleTables[0] = handleTable0;
 function trampoline1(handle) {
   const handleEntry = rscTableRemove(handleTable0, handle);
-  if (!handleEntry.own) throw new Error('Internal error: Unexpected borrow handle');
-  const rsc = captureTable0.get(handleEntry.rep);
-  if (rsc) {
-    if (rsc[symbolDispose]) rsc[symbolDispose]();
-    captureTable0.delete(handleEntry.rep);
-  } else if (Error$1[symbolCabiDispose]) {
-    Error$1[symbolCabiDispose](handleEntry.rep);
+  if (handleEntry.own) {
+    
+    const rsc = captureTable0.get(handleEntry.rep);
+    if (rsc) {
+      if (rsc[symbolDispose]) rsc[symbolDispose]();
+      captureTable0.delete(handleEntry.rep);
+    } else if (Error$1[symbolCabiDispose]) {
+      Error$1[symbolCabiDispose](handleEntry.rep);
+    }
   }
 }
-const handleTable1 = [T_FLAG, 0];
-const captureTable1= new Map();
-let captureCnt1 = 0;
-handleTables[1] = handleTable1;
 function trampoline2(handle) {
   const handleEntry = rscTableRemove(handleTable1, handle);
-  if (!handleEntry.own) throw new Error('Internal error: Unexpected borrow handle');
-  const rsc = captureTable1.get(handleEntry.rep);
-  if (rsc) {
-    if (rsc[symbolDispose]) rsc[symbolDispose]();
-    captureTable1.delete(handleEntry.rep);
-  } else if (InputStream[symbolCabiDispose]) {
-    InputStream[symbolCabiDispose](handleEntry.rep);
+  if (handleEntry.own) {
+    
+    const rsc = captureTable1.get(handleEntry.rep);
+    if (rsc) {
+      if (rsc[symbolDispose]) rsc[symbolDispose]();
+      captureTable1.delete(handleEntry.rep);
+    } else if (InputStream[symbolCabiDispose]) {
+      InputStream[symbolCabiDispose](handleEntry.rep);
+    }
   }
 }
-const handleTable2 = [T_FLAG, 0];
-const captureTable2= new Map();
-let captureCnt2 = 0;
-handleTables[2] = handleTable2;
 function trampoline3(handle) {
   const handleEntry = rscTableRemove(handleTable2, handle);
-  if (!handleEntry.own) throw new Error('Internal error: Unexpected borrow handle');
-  const rsc = captureTable2.get(handleEntry.rep);
-  if (rsc) {
-    if (rsc[symbolDispose]) rsc[symbolDispose]();
-    captureTable2.delete(handleEntry.rep);
-  } else if (OutputStream[symbolCabiDispose]) {
-    OutputStream[symbolCabiDispose](handleEntry.rep);
+  if (handleEntry.own) {
+    
+    const rsc = captureTable2.get(handleEntry.rep);
+    if (rsc) {
+      if (rsc[symbolDispose]) rsc[symbolDispose]();
+      captureTable2.delete(handleEntry.rep);
+    } else if (OutputStream[symbolCabiDispose]) {
+      OutputStream[symbolCabiDispose](handleEntry.rep);
+    }
   }
 }
-const handleTable5 = [T_FLAG, 0];
-const captureTable5= new Map();
-let captureCnt5 = 0;
-handleTables[5] = handleTable5;
 function trampoline4(handle) {
   const handleEntry = rscTableRemove(handleTable5, handle);
-  if (!handleEntry.own) throw new Error('Internal error: Unexpected borrow handle');
-  const rsc = captureTable5.get(handleEntry.rep);
-  if (rsc) {
-    if (rsc[symbolDispose]) rsc[symbolDispose]();
-    captureTable5.delete(handleEntry.rep);
-  } else if (Descriptor[symbolCabiDispose]) {
-    Descriptor[symbolCabiDispose](handleEntry.rep);
+  if (handleEntry.own) {
+    
+    const rsc = captureTable5.get(handleEntry.rep);
+    if (rsc) {
+      if (rsc[symbolDispose]) rsc[symbolDispose]();
+      captureTable5.delete(handleEntry.rep);
+    } else if (Descriptor[symbolCabiDispose]) {
+      Descriptor[symbolCabiDispose](handleEntry.rep);
+    }
   }
 }
-const handleTable4 = [T_FLAG, 0];
-const captureTable4= new Map();
-let captureCnt4 = 0;
-handleTables[4] = handleTable4;
 function trampoline9(handle) {
-  const handleEntry = rscTableRemove(handleTable4, handle);
-  if (!handleEntry.own) throw new Error('Internal error: Unexpected borrow handle');
-  const rsc = captureTable4.get(handleEntry.rep);
-  if (rsc) {
-    if (rsc[symbolDispose]) rsc[symbolDispose]();
-    captureTable4.delete(handleEntry.rep);
-  } else if (TerminalOutput[symbolCabiDispose]) {
-    TerminalOutput[symbolCabiDispose](handleEntry.rep);
+  const handleEntry = rscTableRemove(handleTable3, handle);
+  if (handleEntry.own) {
+    
+    const rsc = captureTable3.get(handleEntry.rep);
+    if (rsc) {
+      if (rsc[symbolDispose]) rsc[symbolDispose]();
+      captureTable3.delete(handleEntry.rep);
+    } else if (TerminalInput[symbolCabiDispose]) {
+      TerminalInput[symbolCabiDispose](handleEntry.rep);
+    }
   }
 }
-const handleTable3 = [T_FLAG, 0];
-const captureTable3= new Map();
-let captureCnt3 = 0;
-handleTables[3] = handleTable3;
 function trampoline10(handle) {
-  const handleEntry = rscTableRemove(handleTable3, handle);
-  if (!handleEntry.own) throw new Error('Internal error: Unexpected borrow handle');
-  const rsc = captureTable3.get(handleEntry.rep);
-  if (rsc) {
-    if (rsc[symbolDispose]) rsc[symbolDispose]();
-    captureTable3.delete(handleEntry.rep);
-  } else if (TerminalInput[symbolCabiDispose]) {
-    TerminalInput[symbolCabiDispose](handleEntry.rep);
+  const handleEntry = rscTableRemove(handleTable4, handle);
+  if (handleEntry.own) {
+    
+    const rsc = captureTable4.get(handleEntry.rep);
+    if (rsc) {
+      if (rsc[symbolDispose]) rsc[symbolDispose]();
+      captureTable4.delete(handleEntry.rep);
+    } else if (TerminalOutput[symbolCabiDispose]) {
+      TerminalOutput[symbolCabiDispose](handleEntry.rep);
+    }
   }
 }
 
@@ -4078,10 +4075,10 @@ export const $init = (async() => {
       'get-stdout': trampoline8,
     },
     'wasi:cli/terminal-input@0.2.0': {
-      '[resource-drop]terminal-input': trampoline10,
+      '[resource-drop]terminal-input': trampoline9,
     },
     'wasi:cli/terminal-output@0.2.0': {
-      '[resource-drop]terminal-output': trampoline9,
+      '[resource-drop]terminal-output': trampoline10,
     },
     'wasi:cli/terminal-stderr@0.2.0': {
       'get-terminal-stderr': exports0['23'],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytecodealliance/jco",
-  "version": "1.0.3",
+  "version": "1.1.0",
   "description": "JavaScript tooling for working with WebAssembly Components",
   "author": "Guy Bedford",
   "bin": {
@@ -27,7 +27,7 @@
     "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,5 +1,5 @@
 import { readFile, writeFile } from 'node:fs/promises';
-import { resolve } from 'node:path';
+import { resolve, basename } from 'node:path';
 import c from 'chalk-template';
 
 export async function componentize (jsSource, opts) {
@@ -13,7 +13,7 @@ export async function componentize (jsSource, opts) {
   }
   const source = await readFile(jsSource, 'utf8');
   const { component, imports } = await componentizeFn(source, {
-    sourceName: jsSource,
+    sourceName: basename(jsSource),
     witPath: resolve(opts.wit),
     worldName: opts.worldName,
     enableStdout: opts.enableStdout,

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.3');
+  .version('1.1.0');
 
 function myParseInt(value) {
   return parseInt(value, 10);