@bytecodealliance/jco 0.4.0 → 0.4.1

package/README.md

@@ -98,7 +98,7 @@ Add new producer metadata to a component or core Wasm binary.
 Usage: jco <command> [options]
 
 jco - WebAssembly JS Component Tools
-      JS Component Bindgen & Wasm Tools for JS
+       JS Component Transpilation Bindgen & Wasm Tools for JS
 
 Options:
   -V, --version                         output the version number
@@ -109,7 +109,8 @@ Commands:
   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]
-  metadata [options] [module]           extract the producer metadata for a Wasm binary [wasm-tools metadata show]
+  metadata-show [options] [module]      extract the producer metadata for a Wasm binary [wasm-tools metadata show]
+  metadata-add [options] [module]       add producer metadata for a Wasm binary [wasm-tools metadata add]
   parse [options] <input>               parses the Wasm text format into a binary file [wasm-tools parse]
   new [options] <core-module>           create a WebAssembly component adapted from a component core Wasm [wasm-tools component new]
   embed [options] [core-module]         embed the component typing section into a core Wasm module [wasm-tools component embed]

package/api.mjs

@@ -40303,7 +40303,6 @@ let exports2;
 let realloc0;
 let postReturn0;
 let postReturn1;
-let postReturn2;
 const exports = {
   parse(arg0) {
     const ptr0 = utf8Encode(arg0, realloc0, memory0);
@@ -40713,7 +40712,7 @@ const exports = {
         const base9 = dataView(memory0).getInt32(ret + 4, true);
         const result9 = [];
         for (let i = 0; i < len9; i++) {
-          const base = base9 + i * 28;
+          const base = base9 + i * 36;
           let variant2;
           switch (dataView(memory0).getUint8(base + 0, true)) {
             case 0: {
@@ -40750,8 +40749,8 @@ const exports = {
               throw new TypeError('invalid variant discriminant for ModuleMetaType');
             }
           }
-          const len8 = dataView(memory0).getInt32(base + 24, true);
-          const base8 = dataView(memory0).getInt32(base + 20, true);
+          const len8 = dataView(memory0).getInt32(base + 32, true);
+          const base8 = dataView(memory0).getInt32(base + 28, true);
           const result8 = [];
           for (let i = 0; i < len8; i++) {
             const base = base8 + i * 16;
@@ -40776,6 +40775,7 @@ const exports = {
           result9.push({
             name: variant2,
             metaType: variant3,
+            range: [dataView(memory0).getInt32(base + 20, true) >>> 0, dataView(memory0).getInt32(base + 24, true) >>> 0],
             producers: result8,
           });
         }
@@ -40872,49 +40872,6 @@ const exports = {
     }
     return variant10.val;
   },
-  extractCoreModules(arg0) {
-    const val0 = arg0;
-    const len0 = val0.byteLength;
-    const ptr0 = realloc0(0, 0, 1, len0 * 1);
-    const src0 = new Uint8Array(val0.buffer || val0, val0.byteOffset, len0 * 1);
-    (new Uint8Array(memory0.buffer, ptr0, len0 * 1)).set(src0);
-    const ret = exports1['exports#extract-core-modules'](ptr0, len0);
-    let variant3;
-    switch (dataView(memory0).getUint8(ret + 0, true)) {
-      case 0: {
-        const len1 = dataView(memory0).getInt32(ret + 8, true);
-        const base1 = dataView(memory0).getInt32(ret + 4, true);
-        const result1 = [];
-        for (let i = 0; i < len1; i++) {
-          const base = base1 + i * 8;
-          result1.push([dataView(memory0).getInt32(base + 0, true) >>> 0, dataView(memory0).getInt32(base + 4, true) >>> 0]);
-        }
-        variant3= {
-          tag: 'ok',
-          val: result1
-        };
-        break;
-      }
-      case 1: {
-        const ptr2 = dataView(memory0).getInt32(ret + 4, true);
-        const len2 = dataView(memory0).getInt32(ret + 8, true);
-        const result2 = utf8Decoder.decode(new Uint8Array(memory0.buffer, ptr2, len2));
-        variant3= {
-          tag: 'err',
-          val: result2
-        };
-        break;
-      }
-      default: {
-        throw new TypeError('invalid variant discriminant for expected');
-      }
-    }
-    postReturn2(ret);
-    if (variant3.tag === 'err') {
-      throw new ComponentError(variant3.val);
-    }
-    return variant3.val;
-  },
   
 };
 
@@ -40941,7 +40898,6 @@ const $init = (async() => {
   realloc0 = exports1.cabi_realloc;
   postReturn0 = exports1['cabi_post_exports#component-embed'];
   postReturn1 = exports1['cabi_post_exports#metadata-show'];
-  postReturn2 = exports1['cabi_post_exports#extract-core-modules'];
 })();
 
 await $init;
@@ -41004,7 +40960,7 @@ _obj_wasm_tools_js__WEBPACK_IMPORTED_MODULE_0__ = (__webpack_async_dependencies_
 
 
 
-const { extractCoreModules, print } = _obj_wasm_tools_js__WEBPACK_IMPORTED_MODULE_0__/* .exports */ .I;
+const { metadataShow, print } = _obj_wasm_tools_js__WEBPACK_IMPORTED_MODULE_0__/* .exports */ .I;
 
 let WASM_OPT;
 try {
@@ -41060,7 +41016,7 @@ async function optimizeComponent (componentBytes, opts) {
   const showSpinner = (0,_common_js__WEBPACK_IMPORTED_MODULE_4__/* .getShowSpinner */ .AZ)();
   let spinner;
   try {
-    const coreModules = extractCoreModules(componentBytes);
+    const coreModules = metadataShow(componentBytes).slice(1, -1).map(({ range }) => range);
 
     let completed = 0;
     const spinnerText = () => chalk_template__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z`{cyan ${completed} / ${coreModules.length}} Running Binaryen on WebAssembly Component Internal Core Modules \n`;

package/cli.mjs

@@ -43627,7 +43627,6 @@ let exports2;
 let realloc0;
 let postReturn0;
 let postReturn1;
-let postReturn2;
 const exports = {
   parse(arg0) {
     const ptr0 = utf8Encode(arg0, realloc0, memory0);
@@ -44037,7 +44036,7 @@ const exports = {
         const base9 = dataView(memory0).getInt32(ret + 4, true);
         const result9 = [];
         for (let i = 0; i < len9; i++) {
-          const base = base9 + i * 28;
+          const base = base9 + i * 36;
           let variant2;
           switch (dataView(memory0).getUint8(base + 0, true)) {
             case 0: {
@@ -44074,8 +44073,8 @@ const exports = {
               throw new TypeError('invalid variant discriminant for ModuleMetaType');
             }
           }
-          const len8 = dataView(memory0).getInt32(base + 24, true);
-          const base8 = dataView(memory0).getInt32(base + 20, true);
+          const len8 = dataView(memory0).getInt32(base + 32, true);
+          const base8 = dataView(memory0).getInt32(base + 28, true);
           const result8 = [];
           for (let i = 0; i < len8; i++) {
             const base = base8 + i * 16;
@@ -44100,6 +44099,7 @@ const exports = {
           result9.push({
             name: variant2,
             metaType: variant3,
+            range: [dataView(memory0).getInt32(base + 20, true) >>> 0, dataView(memory0).getInt32(base + 24, true) >>> 0],
             producers: result8,
           });
         }
@@ -44196,49 +44196,6 @@ const exports = {
     }
     return variant10.val;
   },
-  extractCoreModules(arg0) {
-    const val0 = arg0;
-    const len0 = val0.byteLength;
-    const ptr0 = realloc0(0, 0, 1, len0 * 1);
-    const src0 = new Uint8Array(val0.buffer || val0, val0.byteOffset, len0 * 1);
-    (new Uint8Array(memory0.buffer, ptr0, len0 * 1)).set(src0);
-    const ret = exports1['exports#extract-core-modules'](ptr0, len0);
-    let variant3;
-    switch (dataView(memory0).getUint8(ret + 0, true)) {
-      case 0: {
-        const len1 = dataView(memory0).getInt32(ret + 8, true);
-        const base1 = dataView(memory0).getInt32(ret + 4, true);
-        const result1 = [];
-        for (let i = 0; i < len1; i++) {
-          const base = base1 + i * 8;
-          result1.push([dataView(memory0).getInt32(base + 0, true) >>> 0, dataView(memory0).getInt32(base + 4, true) >>> 0]);
-        }
-        variant3= {
-          tag: 'ok',
-          val: result1
-        };
-        break;
-      }
-      case 1: {
-        const ptr2 = dataView(memory0).getInt32(ret + 4, true);
-        const len2 = dataView(memory0).getInt32(ret + 8, true);
-        const result2 = utf8Decoder.decode(new Uint8Array(memory0.buffer, ptr2, len2));
-        variant3= {
-          tag: 'err',
-          val: result2
-        };
-        break;
-      }
-      default: {
-        throw new TypeError('invalid variant discriminant for expected');
-      }
-    }
-    postReturn2(ret);
-    if (variant3.tag === 'err') {
-      throw new ComponentError(variant3.val);
-    }
-    return variant3.val;
-  },
   
 };
 
@@ -44265,7 +44222,6 @@ const $init = (async() => {
   realloc0 = exports1.cabi_realloc;
   postReturn0 = exports1['cabi_post_exports#component-embed'];
   postReturn1 = exports1['cabi_post_exports#metadata-show'];
-  postReturn2 = exports1['cabi_post_exports#extract-core-modules'];
 })();
 
 await $init;
@@ -44298,7 +44254,7 @@ _obj_wasm_tools_js__WEBPACK_IMPORTED_MODULE_0__ = (__webpack_async_dependencies_
 
 
 
-const { extractCoreModules, print } = _obj_wasm_tools_js__WEBPACK_IMPORTED_MODULE_0__/* .exports */ .I;
+const { metadataShow, print } = _obj_wasm_tools_js__WEBPACK_IMPORTED_MODULE_0__/* .exports */ .I;
 
 let WASM_OPT;
 try {
@@ -44354,7 +44310,7 @@ async function optimizeComponent (componentBytes, opts) {
   const showSpinner = (0,_common_js__WEBPACK_IMPORTED_MODULE_4__/* .getShowSpinner */ .AZ)();
   let spinner;
   try {
-    const coreModules = extractCoreModules(componentBytes);
+    const coreModules = metadataShow(componentBytes).slice(1, -1).map(({ range }) => range);
 
     let completed = 0;
     const spinnerText = () => chalk_template__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z`{cyan ${completed} / ${coreModules.length}} Running Binaryen on WebAssembly Component Internal Core Modules \n`;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bytecodealliance/jco",
   "description": "JavaScript tooling for working with WebAssembly Components",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "exports": "./api.mjs",
   "types": "api.d.ts",
   "author": "Guy Bedford",
@@ -10,7 +10,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/bytecodealliance/js-component-tools.git"
+    "url": "git+https://github.com/bytecodealliance/jco.git"
   },
   "keywords": [
     "Wasm",
@@ -19,7 +19,7 @@
   ],
   "license": "(Apache-2.0 WITH LLVM-exception)",
   "bugs": {
-    "url": "https://github.com/bytecodealliance/js-component-tools/issues"
+    "url": "https://github.com/bytecodealliance/jco/issues"
   },
-  "homepage": "https://github.com/bytecodealliance/js-component-tools#readme"
+  "homepage": "https://github.com/bytecodealliance/jco#readme"
 }