@bytecodealliance/jco 1.24.1 → 1.24.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytecodealliance/jco",
-  "version": "1.24.1",
+  "version": "1.24.2",
   "description": "JavaScript tooling for working with WebAssembly Components",
   "keywords": [
     "Component",
@@ -32,11 +32,7 @@
   "files": [
     "lib",
     "src",
-    "types",
-    "obj/*.core*.wasm",
-    "obj/*.js",
-    "obj/*.ts",
-    "obj/interfaces"
+    "types"
   ],
   "type": "module",
   "main": "src/jco.js",
@@ -62,9 +58,10 @@
   "dependencies": {
     "@bytecodealliance/componentize-js": "^0.21.0",
     "@bytecodealliance/componentize-js-0-19-3": "npm:@bytecodealliance/componentize-js@^0.19.3",
+    "@bytecodealliance/jco-transpile": "^0.3.3",
     "@bytecodealliance/preview2-shim": "^0.17.9",
     "@bytecodealliance/preview3-shim": "^0.1.2",
-    "binaryen": "^123.0.0",
+    "binaryen": "^130.0.0",
     "commander": "^14",
     "mkdirp": "^3",
     "ora": "^8",

package/src/api.js

@@ -1,68 +1,16 @@
 // @ts-check
 export { optimizeComponent as opt } from "./cmd/opt.js";
 export { transpileComponent as transpile, typesComponent as types } from "./cmd/transpile.js";
-import { $init, tools } from "../obj/wasm-tools.js";
-const {
-    print: printFn,
-    parse: parseFn,
-    componentWit: componentWitFn,
-    componentNew: componentNewFn,
-    componentEmbed: componentEmbedFn,
-    metadataAdd: metadataAddFn,
-    metadataShow: metadataShowFn,
-} = tools;
 
-/**
- * @param {Uint8Array} binary
- */
-export async function print(binary) {
-    await $init;
-    return printFn(binary);
-}
-/**
- * @param {string} wat
- */
-export async function parse(wat) {
-    await $init;
-    return parseFn(wat);
-}
-/**
- * @param {Uint8Array} binary
- */
-export async function componentWit(binary) {
-    await $init;
-    return componentWitFn(binary);
-}
-/**
- * @param {Uint8Array} binary
- * @param {Array<[string, Uint8Array]>} [adapters]
- */
-export async function componentNew(binary, adapters) {
-    await $init;
-    return componentNewFn(binary, adapters);
-}
-/**
- * @param {tools.EmbedOpts} embedOpts
- */
-export async function componentEmbed(embedOpts) {
-    await $init;
-    return componentEmbedFn(embedOpts);
-}
-/**
- * @param {Uint8Array} binary
- * @param {tools.ProducersFields} metadata
- */
-export async function metadataAdd(binary, metadata) {
-    await $init;
-    return metadataAddFn(binary, metadata);
-}
-/**
- * @param {Uint8Array} binary
- */
-export async function metadataShow(binary) {
-    await $init;
-    return metadataShowFn(binary);
-}
+export {
+    print,
+    parse,
+    componentWit,
+    componentNew,
+    componentEmbed,
+    metadataAdd,
+    metadataShow,
+} from "@bytecodealliance/jco-transpile/wasm-tools";
 
 export function preview1AdapterCommandPath() {
     return new URL("../lib/wasi_snapshot_preview1.command.wasm", import.meta.url);

package/src/cmd/componentize.js

@@ -1,7 +1,7 @@
 import { stat, readFile, writeFile } from "node:fs/promises";
 import { resolve, basename } from "node:path";
 
-import * as wasmToolsComponent from "../../obj/wasm-tools.js";
+import { componentWitMetadataForWorld } from "@bytecodealliance/jco-transpile";
 
 import { styleText, isWindows } from "../common.js";
 
@@ -19,13 +19,8 @@ const DEBUG_FEATURES = ["stdio"];
  * @returns bool
  */
 async function usesOlderWasiHTTP(witPath, worldName) {
-    await wasmToolsComponent.$init;
-
     witPath = (isWindows ? "//?/" : "") + resolve(witPath);
-    const worldMetadata = wasmToolsComponent.tools.componentWitMetadataForWorld(
-        { tag: "path", val: witPath },
-        worldName ?? null,
-    );
+    const worldMetadata = await componentWitMetadataForWorld({ tag: "path", val: witPath }, worldName ?? null);
 
     // Check if the an old `wasi:http/incoming-handler` version is exported
     const exportsOldIncomingHandler = worldMetadata.exports.some((iface) => {

package/src/cmd/opt.js

@@ -1,15 +1,14 @@
+import { fileURLToPath } from "node:url";
 import { writeFile } from "node:fs/promises";
 
-import { $init, tools } from "../../obj/wasm-tools.js";
-const { metadataShow, print } = tools;
-import { fileURLToPath } from "node:url";
+import { metadataShow, print } from "@bytecodealliance/jco-transpile/wasm-tools";
+
 import { readFile, sizeStr, fixedDigitDisplay, table, spawnIOTmp, setShowSpinner, getShowSpinner } from "../common.js";
 import ora from "#ora";
 
 import { styleText } from "../common.js";
 
 export async function opt(componentPath, opts, program) {
-    await $init;
     const varIdx = program.parent.rawArgs.indexOf("--");
     if (varIdx !== -1) {
         opts.optArgs = program.parent.rawArgs.slice(varIdx + 1);
@@ -81,11 +80,10 @@ function byteLengthLEB128(val) {
  * @returns {Promise<{ component: Uint8Array, compressionInfo: { beforeBytes: number, afterBytes: number }[] >}
  */
 export async function optimizeComponent(componentBytes, opts) {
-    await $init;
     const showSpinner = getShowSpinner();
     let spinner;
     try {
-        let componentMetadata = metadataShow(componentBytes);
+        let componentMetadata = await metadataShow(componentBytes);
         componentMetadata.forEach((metadata, index) => {
             // add index to the metadata object
             metadata.index = index;
@@ -211,7 +209,7 @@ export async function optimizeComponent(componentBytes, opts) {
         // verify it still parses ok
         if (!opts?.noVerify) {
             try {
-                print(outComponentBytes);
+                await print(outComponentBytes);
             } catch (e) {
                 throw new Error(`Internal error performing optimization.\n${e.message}`);
             }

package/src/cmd/run.js

@@ -5,7 +5,7 @@ import process from "node:process";
 import { fileURLToPath, pathToFileURL } from "node:url";
 
 import { getTmpDir, styleText } from "../common.js";
-import { transpile } from "./transpile.js";
+import { transpileCmd } from "./transpile.js";
 
 const DEFAULT_SERVE_HOST = "localhost";
 
@@ -85,7 +85,7 @@ async function runComponent(componentPath, args, opts, executor) {
 
     try {
         try {
-            await transpile(componentPath, {
+            await transpileCmd(componentPath, {
                 name,
                 quiet: true,
                 noTypescript: true,