fix: optimized bindgen fixes, test latest componentizejs (#406)

crates/js-component-bindgen/src/transpile_bindgen.rs

@@ -763,12 +763,12 @@ impl<'a> Instantiator<'a, '_> {
                         "".into()
                     }
                 } else {
-                    // imported resource is one without a defined resource index
-                    // if it is a captured instance (class instance was created externally so had to
+                    // Imported resource is one without a defined resource index.
+                    // If it is a captured instance (class instance was created externally so had to
                     // be assigned a rep), and there is a Symbol.dispose handler, call it explicitly
-                    // for imported resources when the resource is dropped, otherwise
-                    // if it is an instance without a captured class definition, then call the
-                    // low-level bindgen destructor
+                    // for imported resources when the resource is dropped.
+                    // Otherwise if it is an instance without a captured class definition, then
+                    // call the low-level bindgen destructor.
                     let symbol_dispose = self.gen.intrinsic(Intrinsic::SymbolDispose);
                     let symbol_cabi_dispose = self.gen.intrinsic(Intrinsic::SymbolCabiDispose);
 
@@ -792,14 +792,14 @@ impl<'a> Instantiator<'a, '_> {
                     }
                 };
 
-                // If the unexpected borrow handle case does ever happen in further testing,
-                // then we must handle this.
                 let rsc_table_remove = self.gen.intrinsic(Intrinsic::ResourceTableRemove);
                 uwrite!(
                     self.src.js,
                     "function trampoline{i}(handle) {{
                         const handleEntry = {rsc_table_remove}(handleTable{tid}, handle);
-                        if (!handleEntry.own) throw new Error('Internal error: Unexpected borrow handle');{dtor}
+                        if (handleEntry.own) {{
+                            {dtor}
+                        }}
                     }}
                     ",
                 );
@@ -1164,7 +1164,7 @@ impl<'a> Instantiator<'a, '_> {
                 Some(BindingsMode::DirectOptimized) => {
                     uwriteln!(
                         self.src.js_init,
-                        "trampoline{} = {callee_name}({memory}, {realloc}, {post_return}, {string_encoding});",
+                        "trampoline{} = {callee_name}({memory}{realloc}{post_return}{string_encoding});",
                         trampoline.as_u32()
                     );
                 }

package.json

@@ -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",

packages/preview2-shim/lib/nodejs/clocks.js

@@ -38,7 +38,7 @@ export const wallClock = {
 
 monotonicClock.resolution[symbolCabiLower] = () => resolution;
 monotonicClock.now[symbolCabiLower] = () => hrtime.bigint;
-wallClock.resolution[symbolCabiLower] = (memory) => {
+wallClock.resolution[symbolCabiLower] = ({ memory }) => {
   let buf32 = new Int32Array(memory.buffer);
   return function now(retptr) {
     if (memory.buffer !== buf32.buffer) buf32 = new Int32Array(memory.buffer);
@@ -49,7 +49,7 @@ wallClock.resolution[symbolCabiLower] = (memory) => {
   };
 };
 
-wallClock.now[symbolCabiLower] = (memory) => {
+wallClock.now[symbolCabiLower] = ({ memory }) => {
   let buf32 = new Int32Array(memory.buffer);
   let buf64 = new BigInt64Array(memory.buffer);
   return function now(retptr) {

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

@@ -31,7 +31,7 @@ function getRandomBytes(len) {
   return randomBytes(Number(len));
 }
 
-randomBytes[Symbol.for("cabiLower")] = ({ memory, realloc }) => {
+getRandomBytes[Symbol.for("cabiLower")] = ({ memory, realloc }) => {
   let buf32 = new Uint32Array(memory.buffer);
   return function randomBytes(len, retptr) {
     len = Number(len);

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,

test/cli.js

@@ -441,7 +441,7 @@ export async function cliTest(fixtures) {
       ]);
     });
 
-    test("Componentize", async () => {
+    (process.platform === 'win32' ? test.skip : test)("Componentize", async () => {
       const { stdout, stderr } = await exec(
         jcoPath,
         "componentize",

test/preview2.js

@@ -61,7 +61,7 @@ export async function preview2Test() {
       strictEqual(stderr, "writing to stderr: hello, world\n");
     });
 
-    test("wasi-http-proxy", async () => {
+    (process.platform === 'win32' ? test.skip : test)("wasi-http-proxy", async () => {
       const server = createServer(async (req, res) => {
         if (req.url == "/api/examples") {
           res.writeHead(200, {