@bytecodealliance/jco 0.5.1 → 0.5.3

package/README.md

@@ -70,7 +70,7 @@ Commands:
 To componentize a JS file run:
 
 ```
-jco componentize app.js --world world.wit -o component.wasm
+jco componentize app.js --wit world.wit -o component.wasm
 ```
 
 Creates a component from a JS module implementing a WIT world definition, via a Spidermonkey engine embedding.

package/api.d.ts

@@ -31,6 +31,9 @@ export interface TranspileOpts {
   /// if using optimize, custom optimization options
   /// (defaults to best optimization, but this is very slow)
   optArgs?: string[],
+  /// rewrite WASI imports to the @bytecodealliance/preview2-shim
+  /// defaults to false
+  wasiShim?: boolean
 }
 
 /**

package/api.mjs

@@ -40118,8 +40118,8 @@ const exports = {
 
 const $init = (async() => {
   const module0 = fetchCompile(__nccwpck_require__.ab + "js-component-bindgen-component.core.wasm");
-  const module1 = base64Compile('AGFzbQEAAAABBgFgAn9/AAMCAQAEBQFwAQEBBxACATAAAAgkaW1wb3J0cwEACg0BCwAgACABQQARAAALAC0JcHJvZHVjZXJzAQxwcm9jZXNzZWQtYnkBDXdpdC1jb21wb25lbnQFMC43LjAANQRuYW1lABMSd2l0LWNvbXBvbmVudDpzaGltARkBABZpbmRpcmVjdC1jb25zb2xlLWVycm9y');
-  const module2 = base64Compile('AGFzbQEAAAABBgFgAn9/AAIVAgABMAAAAAgkaW1wb3J0cwFwAQEBCQcBAEEACwEAAC0JcHJvZHVjZXJzAQxwcm9jZXNzZWQtYnkBDXdpdC1jb21wb25lbnQFMC43LjAAHARuYW1lABUUd2l0LWNvbXBvbmVudDpmaXh1cHM=');
+  const module1 = base64Compile('AGFzbQEAAAABBgFgAn9/AAMCAQAEBQFwAQEBBxACATAAAAgkaW1wb3J0cwEACg0BCwAgACABQQARAAALAC0JcHJvZHVjZXJzAQxwcm9jZXNzZWQtYnkBDXdpdC1jb21wb25lbnQFMC43LjQANQRuYW1lABMSd2l0LWNvbXBvbmVudDpzaGltARkBABZpbmRpcmVjdC1jb25zb2xlLWVycm9y');
+  const module2 = base64Compile('AGFzbQEAAAABBgFgAn9/AAIVAgABMAAAAAgkaW1wb3J0cwFwAQEBCQcBAEEACwEAAC0JcHJvZHVjZXJzAQxwcm9jZXNzZWQtYnkBDXdpdC1jb21wb25lbnQFMC43LjQAHARuYW1lABUUd2l0LWNvbXBvbmVudDpmaXh1cHM=');
   Promise.all([module0, module1, module2]).catch(() => {});
   ({ exports: exports0 } = await instantiateCore(await module1));
   ({ exports: exports1 } = await instantiateCore(await module0, {
@@ -40805,8 +40805,8 @@ const exports = {
 
 const $init = (async() => {
   const module0 = fetchCompile(__nccwpck_require__.ab + "wasm-tools.core.wasm");
-  const module1 = base64Compile('AGFzbQEAAAABBgFgAn9/AAMCAQAEBQFwAQEBBxACATAAAAgkaW1wb3J0cwEACg0BCwAgACABQQARAAALAC0JcHJvZHVjZXJzAQxwcm9jZXNzZWQtYnkBDXdpdC1jb21wb25lbnQFMC43LjAANQRuYW1lABMSd2l0LWNvbXBvbmVudDpzaGltARkBABZpbmRpcmVjdC1jb25zb2xlLWVycm9y');
-  const module2 = base64Compile('AGFzbQEAAAABBgFgAn9/AAIVAgABMAAAAAgkaW1wb3J0cwFwAQEBCQcBAEEACwEAAC0JcHJvZHVjZXJzAQxwcm9jZXNzZWQtYnkBDXdpdC1jb21wb25lbnQFMC43LjAAHARuYW1lABUUd2l0LWNvbXBvbmVudDpmaXh1cHM=');
+  const module1 = base64Compile('AGFzbQEAAAABBgFgAn9/AAMCAQAEBQFwAQEBBxACATAAAAgkaW1wb3J0cwEACg0BCwAgACABQQARAAALAC0JcHJvZHVjZXJzAQxwcm9jZXNzZWQtYnkBDXdpdC1jb21wb25lbnQFMC43LjQANQRuYW1lABMSd2l0LWNvbXBvbmVudDpzaGltARkBABZpbmRpcmVjdC1jb25zb2xlLWVycm9y');
+  const module2 = base64Compile('AGFzbQEAAAABBgFgAn9/AAIVAgABMAAAAAgkaW1wb3J0cwFwAQEBCQcBAEEACwEAAC0JcHJvZHVjZXJzAQxwcm9jZXNzZWQtYnkBDXdpdC1jb21wb25lbnQFMC43LjQAHARuYW1lABUUd2l0LWNvbXBvbmVudDpmaXh1cHM=');
   Promise.all([module0, module1, module2]).catch(() => {});
   ({ exports: exports0 } = await instantiateCore(await module1));
   ({ exports: exports1 } = await instantiateCore(await module0, {
@@ -41153,6 +41153,22 @@ async function transpileComponent (component, opts = {}) {
     ({ component } = await (0,_opt_js__WEBPACK_IMPORTED_MODULE_5__/* .optimizeComponent */ .j)(component, opts));
   }
 
+  if (opts.wasiShim) {
+    opts.map = Object.assign({
+      'environment-preopens': '@bytecodealliance/preview2-shim/environment-preopens',
+      'instance-wall-clock': '@bytecodealliance/preview2-shim/instance-wall-clock',
+      'instance-monotonic-clock': '@bytecodealliance/preview2-shim/instance-monotonic-clock',
+      'streams': '@bytecodealliance/preview2-shim/streams',
+      'monotonic-clock': '@bytecodealliance/preview2-shim/monotonic-clock',
+      'filesystem': '@bytecodealliance/preview2-shim/filesystem',
+      'wall-clock': '@bytecodealliance/preview2-shim/wall-clock',
+      'environment': '@bytecodealliance/preview2-shim/environment',
+      'random': '@bytecodealliance/preview2-shim/random',
+      'exit': '@bytecodealliance/preview2-shim/exit',
+      'stderr': '@bytecodealliance/preview2-shim/stderr'
+    }, opts.map || {});
+  }
+
   let { files, imports, exports } = generate(component, {
     name: opts.name ?? 'component',
     map: Object.entries(opts.map ?? {}),

package/cli.mjs

@@ -1,5 +1,4 @@
 #!/usr/bin/env node
-import * as __WEBPACK_EXTERNAL_MODULE__bytecodealliance_componentize_js_a7e85369__ from "@bytecodealliance/componentize-js";
 import { createRequire as __WEBPACK_EXTERNAL_createRequire } from "module";
 /******/ var __webpack_modules__ = ({
 
@@ -6550,15 +6549,6 @@ function bisearch(ucs) {
 }
 
 
-/***/ }),
-
-/***/ 9291:
-/***/ ((module) => {
-
-var x = y => { var x = {}; __nccwpck_require__.d(x, y); return x; }
-var y = x => () => x
-module.exports = __WEBPACK_EXTERNAL_MODULE__bytecodealliance_componentize_js_a7e85369__;
-
 /***/ }),
 
 /***/ 9491:
@@ -43526,8 +43516,8 @@ const exports = {
 
 const $init = (async() => {
   const module0 = fetchCompile(__nccwpck_require__.ab + "js-component-bindgen-component.core.wasm");
-  const module1 = base64Compile('AGFzbQEAAAABBgFgAn9/AAMCAQAEBQFwAQEBBxACATAAAAgkaW1wb3J0cwEACg0BCwAgACABQQARAAALAC0JcHJvZHVjZXJzAQxwcm9jZXNzZWQtYnkBDXdpdC1jb21wb25lbnQFMC43LjAANQRuYW1lABMSd2l0LWNvbXBvbmVudDpzaGltARkBABZpbmRpcmVjdC1jb25zb2xlLWVycm9y');
-  const module2 = base64Compile('AGFzbQEAAAABBgFgAn9/AAIVAgABMAAAAAgkaW1wb3J0cwFwAQEBCQcBAEEACwEAAC0JcHJvZHVjZXJzAQxwcm9jZXNzZWQtYnkBDXdpdC1jb21wb25lbnQFMC43LjAAHARuYW1lABUUd2l0LWNvbXBvbmVudDpmaXh1cHM=');
+  const module1 = base64Compile('AGFzbQEAAAABBgFgAn9/AAMCAQAEBQFwAQEBBxACATAAAAgkaW1wb3J0cwEACg0BCwAgACABQQARAAALAC0JcHJvZHVjZXJzAQxwcm9jZXNzZWQtYnkBDXdpdC1jb21wb25lbnQFMC43LjQANQRuYW1lABMSd2l0LWNvbXBvbmVudDpzaGltARkBABZpbmRpcmVjdC1jb25zb2xlLWVycm9y');
+  const module2 = base64Compile('AGFzbQEAAAABBgFgAn9/AAIVAgABMAAAAAgkaW1wb3J0cwFwAQEBCQcBAEEACwEAAC0JcHJvZHVjZXJzAQxwcm9jZXNzZWQtYnkBDXdpdC1jb21wb25lbnQFMC43LjQAHARuYW1lABUUd2l0LWNvbXBvbmVudDpmaXh1cHM=');
   Promise.all([module0, module1, module2]).catch(() => {});
   ({ exports: exports0 } = await instantiateCore(await module1));
   ({ exports: exports1 } = await instantiateCore(await module0, {
@@ -44213,8 +44203,8 @@ const exports = {
 
 const $init = (async() => {
   const module0 = fetchCompile(__nccwpck_require__.ab + "wasm-tools.core.wasm");
-  const module1 = base64Compile('AGFzbQEAAAABBgFgAn9/AAMCAQAEBQFwAQEBBxACATAAAAgkaW1wb3J0cwEACg0BCwAgACABQQARAAALAC0JcHJvZHVjZXJzAQxwcm9jZXNzZWQtYnkBDXdpdC1jb21wb25lbnQFMC43LjAANQRuYW1lABMSd2l0LWNvbXBvbmVudDpzaGltARkBABZpbmRpcmVjdC1jb25zb2xlLWVycm9y');
-  const module2 = base64Compile('AGFzbQEAAAABBgFgAn9/AAIVAgABMAAAAAgkaW1wb3J0cwFwAQEBCQcBAEEACwEAAC0JcHJvZHVjZXJzAQxwcm9jZXNzZWQtYnkBDXdpdC1jb21wb25lbnQFMC43LjAAHARuYW1lABUUd2l0LWNvbXBvbmVudDpmaXh1cHM=');
+  const module1 = base64Compile('AGFzbQEAAAABBgFgAn9/AAMCAQAEBQFwAQEBBxACATAAAAgkaW1wb3J0cwEACg0BCwAgACABQQARAAALAC0JcHJvZHVjZXJzAQxwcm9jZXNzZWQtYnkBDXdpdC1jb21wb25lbnQFMC43LjQANQRuYW1lABMSd2l0LWNvbXBvbmVudDpzaGltARkBABZpbmRpcmVjdC1jb25zb2xlLWVycm9y');
+  const module2 = base64Compile('AGFzbQEAAAABBgFgAn9/AAIVAgABMAAAAAgkaW1wb3J0cwFwAQEBCQcBAEEACwEAAC0JcHJvZHVjZXJzAQxwcm9jZXNzZWQtYnkBDXdpdC1jb21wb25lbnQFMC43LjQAHARuYW1lABUUd2l0LWNvbXBvbmVudDpmaXh1cHM=');
   Promise.all([module0, module1, module2]).catch(() => {});
   ({ exports: exports0 } = await instantiateCore(await module1));
   ({ exports: exports1 } = await instantiateCore(await module0, {
@@ -44255,7 +44245,7 @@ __webpack_async_result__();
 async function componentize (jsSource, opts) {
   let componentizeFn;
   try {
-    ({ componentize: componentizeFn } = await Promise.resolve(/* import() */).then(__nccwpck_require__.bind(__nccwpck_require__, 9291)));
+    ({ componentize: componentizeFn } = await eval('import("@bytecodealliance/componentize-js")'));
   } catch (e) {
     throw new Error(`componentize-js must first be installed separately via "npm install @bytecodealliance/componentize-js".`);
   }
@@ -44551,6 +44541,22 @@ async function transpileComponent (component, opts = {}) {
     ({ component } = await (0,_opt_js__WEBPACK_IMPORTED_MODULE_5__/* .optimizeComponent */ .j)(component, opts));
   }
 
+  if (opts.wasiShim) {
+    opts.map = Object.assign({
+      'environment-preopens': '@bytecodealliance/preview2-shim/environment-preopens',
+      'instance-wall-clock': '@bytecodealliance/preview2-shim/instance-wall-clock',
+      'instance-monotonic-clock': '@bytecodealliance/preview2-shim/instance-monotonic-clock',
+      'streams': '@bytecodealliance/preview2-shim/streams',
+      'monotonic-clock': '@bytecodealliance/preview2-shim/monotonic-clock',
+      'filesystem': '@bytecodealliance/preview2-shim/filesystem',
+      'wall-clock': '@bytecodealliance/preview2-shim/wall-clock',
+      'environment': '@bytecodealliance/preview2-shim/environment',
+      'random': '@bytecodealliance/preview2-shim/random',
+      'exit': '@bytecodealliance/preview2-shim/exit',
+      'stderr': '@bytecodealliance/preview2-shim/stderr'
+    }, opts.map || {});
+  }
+
   let { files, imports, exports } = generate(component, {
     name: opts.name ?? 'component',
     map: Object.entries(opts.map ?? {}),
@@ -45131,7 +45137,7 @@ var __webpack_async_dependencies__ = __webpack_handle_async_dependencies__([_cmd
 commander__WEBPACK_IMPORTED_MODULE_0__/* .program.name */ .Nx.name('jco')
   .description(chalk_template__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z`{bold jco - WebAssembly JS Component Tools}\n      JS Component Transpilation Bindgen & Wasm Tools for JS`)
   .usage('<command> [options]')
-  .version('0.5.1');
+  .version('0.5.3');
 
 function myParseInt(value) {
   return parseInt(value, 10);
@@ -45159,6 +45165,7 @@ commander__WEBPACK_IMPORTED_MODULE_0__/* .program.command */ .Nx.command('transp
   .option('--tla-compat', 'enables compatibility for JS environments without top-level await support via an async $init promise export')
   .option('--no-nodejs-compat', 'disables compatibility in Node.js without a fetch global')
   .option('-M, --map <mappings...>', 'specifier=./output custom mappings for the component imports')
+  .option('-w, --wasi-shim', 'automatically rewrite WASI imports to use @bytecodealliance/preview2-shim')
   .option('--js', 'output JS instead of core WebAssembly')
   .option('-I, --instantiation', 'output for custom module instantiation')
   .option('-q, --quiet', 'disable logging')
@@ -45235,7 +45242,7 @@ function asyncAction (cmd) {
         await cmd.apply(null, args);
       }
       catch (e) {
-        process.stdout.write(`(jsct ${cmd.name}) `);
+        process.stdout.write(`(jco ${cmd.name}) `);
         if (typeof e === 'string') {
           console.error(chalk_template__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z`{red.bold Error}: ${e}\n`);
         } else {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bytecodealliance/jco",
   "description": "JavaScript tooling for working with WebAssembly Components",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "exports": "./api.mjs",
   "types": "api.d.ts",
   "author": "Guy Bedford",