Merge pull request #1 from golemcloud/update-and-use-forked-comp-js

Update and use forked golem repos
golemcloud · Jun 14, 2024 · 7c255cb · 7c255cb
2 parents 8abf412 + 7d20f6c
commit 7c255cb
Show file tree

Hide file tree

Showing 8 changed files with 70 additions and 68 deletions.
diff --git a/README.md b/README.md
@@ -61,8 +61,9 @@ 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
+  types [options] <wit-path>            Generate types for the given WIT
   run [options] <command> [args...]     Run a WASI Command component
-  serve [options] <command> [args...]   Serve a WASI HTTP component
+  serve [options] <server> [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]

diff --git a/crates/js-component-bindgen/src/intrinsics.rs b/crates/js-component-bindgen/src/intrinsics.rs
@@ -560,19 +560,10 @@ pub fn render_intrinsics(
                         utf8EncodedLen = 0;
                         return 1;
                     }
-                    let allocLen = 0;
-                    let ptr = 0;
-                    let writtenTotal = 0;
-                    while (s.length > 0) {
-                        ptr = realloc(ptr, allocLen, 1, allocLen += s.length * 2);
-                        const { read, written } = utf8Encoder.encodeInto(
-                            s,
-                            new Uint8Array(memory.buffer, ptr + writtenTotal, allocLen - writtenTotal),
-                        );
-                        writtenTotal += written;
-                        s = s.slice(read);
-                    }
-                    utf8EncodedLen = writtenTotal;
+                    let buf = utf8Encoder.encode(s);
+                    let ptr = realloc(0, 0, 1, buf.length);
+                    new Uint8Array(memory.buffer).set(buf, ptr);
+                    utf8EncodedLen = buf.length;
                     return ptr;
                 }
             "),

diff --git a/crates/js-component-bindgen/src/transpile_bindgen.rs b/crates/js-component-bindgen/src/transpile_bindgen.rs
@@ -261,10 +261,10 @@ impl<'a> JsBindgen<'a> {
                 uwrite!(
                     output,
                     "\
-                        {}
-                        {}
                         export async function instantiate(getCoreModule, imports, instantiateCore = WebAssembly.instantiate) {{
                             {}
+                            {}
+                            {}
                     ",
                     &js_intrinsics as &str,
                     &intrinsic_definitions as &str,
@@ -276,10 +276,10 @@ impl<'a> JsBindgen<'a> {
                 uwrite!(
                     output,
                     "\
-                        {}
-                        {}
                         export function instantiate(getCoreModule, imports, instantiateCore = (module, importObject) => new WebAssembly.Instance(module, importObject)) {{
                             {}
+                            {}
+                            {}
                     ",
                     &js_intrinsics as &str,
                     &intrinsic_definitions as &str,

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "@bytecodealliance/jco",
-  "version": "1.2.4",
+  "name": "@golemcloud/jco",
+  "version": "1.2.4-golem.3",
   "description": "JavaScript tooling for working with WebAssembly Components",
   "author": "Guy Bedford",
   "bin": {
@@ -27,7 +27,7 @@
     "terser": "^5"
   },
   "devDependencies": {
-    "@bytecodealliance/componentize-js": "^0.8.3",
+    "@golemcloud/componentize-js": "0.8.3-golem.2",
     "@types/node": "^18.11.17",
     "@typescript-eslint/eslint-plugin": "^5.41.0",
     "@typescript-eslint/parser": "^5.41.0",

diff --git a/src/cmd/componentize.js b/src/cmd/componentize.js
@@ -5,10 +5,10 @@ import c from 'chalk-template';
 export async function componentize (jsSource, opts) {
   let componentizeFn;
   try {
-    ({ componentize: componentizeFn } = await eval('import("@bytecodealliance/componentize-js")'));
+    ({ componentize: componentizeFn } = await eval('import("@golemcloud/componentize-js")'));
   } catch (e) {
-    if (e?.code === 'ERR_MODULE_NOT_FOUND' && e?.message?.includes('\'@bytecodealliance/componentize-js\''))
-      throw new Error(`componentize-js must first be installed separately via "npm install @bytecodealliance/componentize-js".`);
+    if (e?.code === 'ERR_MODULE_NOT_FOUND' && e?.message?.includes('\'@golemcloud/componentize-js\''))
+      throw new Error(`componentize-js must first be installed separately via "npm install @golemcloud/componentize-js".`);
     throw e;
   }
   const source = await readFile(jsSource, 'utf8');

diff --git a/test/codegen.js b/test/codegen.js
@@ -2,7 +2,7 @@ import { readFile } from 'node:fs/promises';
 import { readdirSync } from 'node:fs';
 import { exec, jcoPath } from './helpers.js';
 import { strictEqual } from 'node:assert';
-import { componentNew, componentEmbed, transpile } from '@bytecodealliance/jco';
+import { componentNew, componentEmbed, transpile } from '@golemcloud/jco';
 import { ok } from 'node:assert';
 
 const eslintPath = `node_modules/eslint/bin/eslint.js`;

diff --git a/xtask/src/build/workspace.rs b/xtask/src/build/workspace.rs
@@ -10,11 +10,11 @@ pub(crate) fn run(release: bool) -> anyhow::Result<()> {
     cmd!(sh, "node node_modules/typescript/bin/tsc -p tsconfig.json").read()?;
     sh.copy_file(
         "lib/wasi_snapshot_preview1.command.wasm",
-        "node_modules/@bytecodealliance/jco/lib",
+        "node_modules/@golemcloud/jco/lib",
     )?;
     sh.copy_file(
         "lib/wasi_snapshot_preview1.reactor.wasm",
-        "node_modules/@bytecodealliance/jco/lib",
+        "node_modules/@golemcloud/jco/lib",
     )?;
     Ok(())
 }