@bytecodealliance/jco 1.16.0 → 1.17.0

package/src/cmd/types.d.ts

@@ -16,18 +16,21 @@ export function guestTypes(witPath: any, opts: any): Promise<void>;
  * }} opts
  * @returns {Promise<{ [filename: string]: Uint8Array }>}
  */
-export function typesComponent(witPath: string, opts: {
-    name?: string;
-    worldName?: string;
-    instantiation?: "async" | "sync";
-    tlaCompat?: boolean;
-    asyncMode?: string;
-    asyncImports?: string[];
-    asyncExports?: string[];
-    outDir?: string;
-    features?: string[] | "all";
-    guest?: boolean;
-}): Promise<{
+export function typesComponent(
+    witPath: string,
+    opts: {
+        name?: string;
+        worldName?: string;
+        instantiation?: "async" | "sync";
+        tlaCompat?: boolean;
+        asyncMode?: string;
+        asyncImports?: string[];
+        asyncExports?: string[];
+        outDir?: string;
+        features?: string[] | "all";
+        guest?: boolean;
+    },
+): Promise<{
     [filename: string]: Uint8Array;
 }>;
 //# sourceMappingURL=types.d.ts.map

package/src/cmd/types.js

@@ -1,10 +1,7 @@
-import { stat, mkdir } from 'node:fs/promises';
-import { extname, basename, resolve } from 'node:path';
+import { stat, mkdir } from "node:fs/promises";
+import { extname, basename, resolve } from "node:path";
 
-import {
-    $init,
-    generateTypes,
-} from '../../obj/js-component-bindgen-component.js';
+import { $init, generateTypes } from "../../obj/js-component-bindgen-component.js";
 
 import {
     isWindows,
@@ -14,13 +11,13 @@ import {
     ASYNC_WASI_IMPORTS,
     ASYNC_WASI_EXPORTS,
     DEFAULT_ASYNC_MODE,
-} from '../common.js';
+} from "../common.js";
 
 /** Default relative path for guest type declaration generation */
-const DEFAULT_GUEST_TYPES_OUTPUT_DIR_PATH = './types/generated/wit/guest';
+const DEFAULT_GUEST_TYPES_OUTPUT_DIR_PATH = "./types/generated/wit/guest";
 
 /** Default relative path for host type declaration generation */
-const DEFAULT_HOST_TYPES_OUTPUT_DIR_PATH = './types/generated/wit/host';
+const DEFAULT_HOST_TYPES_OUTPUT_DIR_PATH = "./types/generated/wit/host";
 
 export async function types(witPath, opts) {
     witPath = await resolveDefaultWITPath(witPath);
@@ -30,13 +27,13 @@ export async function types(witPath, opts) {
         await mkdir(DEFAULT_HOST_TYPES_OUTPUT_DIR_PATH, { recursive: true });
         opts.outDir = resolve(DEFAULT_HOST_TYPES_OUTPUT_DIR_PATH);
         console.error(
-            `no output directory specified for host type declarations, using [${DEFAULT_HOST_TYPES_OUTPUT_DIR_PATH}]`
+            `no output directory specified for host type declarations, using [${DEFAULT_HOST_TYPES_OUTPUT_DIR_PATH}]`,
         );
     }
 
     const files = await typesComponent(witPath, opts);
 
-    await writeFiles(files, opts.quiet ? false : 'Generated Type Files');
+    await writeFiles(files, opts.quiet ? false : "Generated Type Files");
 }
 
 export async function guestTypes(witPath, opts) {
@@ -47,17 +44,12 @@ export async function guestTypes(witPath, opts) {
         await mkdir(DEFAULT_GUEST_TYPES_OUTPUT_DIR_PATH, { recursive: true });
         opts.outDir = resolve(DEFAULT_GUEST_TYPES_OUTPUT_DIR_PATH);
         console.error(
-            `no output directory specified for guest type declarations, using [${DEFAULT_GUEST_TYPES_OUTPUT_DIR_PATH}]`
+            `no output directory specified for guest type declarations, using [${DEFAULT_GUEST_TYPES_OUTPUT_DIR_PATH}]`,
         );
     }
 
     const files = await typesComponent(witPath, { ...opts, guest: true });
-    await writeFiles(
-        files,
-        opts.quiet
-            ? false
-            : 'Generated Guest Typescript Definition Files (.d.ts)'
-    );
+    await writeFiles(files, opts.quiet ? false : "Generated Guest Typescript Definition Files (.d.ts)");
 }
 
 /**
@@ -87,25 +79,25 @@ export async function typesComponent(witPath, opts) {
     const name =
         opts.name ||
         (opts.worldName
-            ? opts.worldName.split(':').pop().split('/').pop()
+            ? opts.worldName.split(":").pop().split("/").pop()
             : basename(witPath.slice(0, -extname(witPath).length || Infinity)));
     let instantiation;
     if (opts.instantiation) {
         instantiation = { tag: opts.instantiation };
     }
-    let outDir = (opts.outDir ?? '').replace(/\\/g, '/');
-    if (!outDir.endsWith('/') && outDir !== '') {
-        outDir += '/';
+    let outDir = (opts.outDir ?? "").replace(/\\/g, "/");
+    if (!outDir.endsWith("/") && outDir !== "") {
+        outDir += "/";
     }
 
     // Bulid list of enabled features
     let features = null;
     if (opts.allFeatures) {
-        features = { tag: 'all' };
+        features = { tag: "all" };
     } else if (Array.isArray(opts.feature)) {
-        features = { tag: 'list', val: opts.feature };
+        features = { tag: "list", val: opts.feature };
     } else if (Array.isArray(opts.features)) {
-        features = { tag: 'list', val: opts.features };
+        features = { tag: "list", val: opts.features };
     }
 
     // Build list of async imports/exports
@@ -123,15 +115,15 @@ export async function typesComponent(witPath, opts) {
     // be used to generate a guest that is never transpiled).
     let asyncMode = opts.asyncMode ?? DEFAULT_ASYNC_MODE;
     let asyncModeObj;
-    if (asyncMode === 'jspi' || asyncExports.size > 0) {
+    if (asyncMode === "jspi" || asyncExports.size > 0) {
         asyncModeObj = {
-            tag: 'jspi',
+            tag: "jspi",
             val: {
                 imports: [...asyncImports],
                 exports: [...asyncExports],
             },
         };
-    } else if (asyncMode === 'sync') {
+    } else if (asyncMode === "sync") {
         asyncModeObj = null;
     } else {
         throw new Error(`invalid/unrecognized async mode [${asyncMode}]`);
@@ -142,7 +134,7 @@ export async function typesComponent(witPath, opts) {
     const absWitPath = resolve(witPath);
     try {
         types = generateTypes(name, {
-            wit: { tag: 'path', val: (isWindows ? '//?/' : '') + absWitPath },
+            wit: { tag: "path", val: (isWindows ? "//?/" : "") + absWitPath },
             instantiation,
             tlaCompat: opts.tlaCompat ?? false,
             world: opts.worldName,
@@ -151,7 +143,7 @@ export async function typesComponent(witPath, opts) {
             asyncMode: asyncModeObj,
         }).map(([name, file]) => [`${outDir}${name}`, file]);
     } catch (err) {
-        if (err.toString().includes('does not match previous package name')) {
+        if (err.toString().includes("does not match previous package name")) {
             const hint = await printWITLayoutHint(absWitPath);
             if (err.message) {
                 err.message += `\n${hint}`;
@@ -170,14 +162,14 @@ export async function typesComponent(witPath, opts) {
  * @param {(string, any) => void} consoleFn
  */
 async function printWITLayoutHint(witPath) {
-    const warningPrefix = styleText(['yellow', 'bold'], 'warning');
+    const warningPrefix = styleText(["yellow", "bold"], "warning");
     const pathMeta = await stat(witPath);
-    let output = '\n';
+    let output = "\n";
     if (!pathMeta.isFile() && !pathMeta.isDirectory()) {
         output += `${warningPrefix} The supplited WIT path [${witPath}] is neither a file or directory.\n`;
         return output;
     }
-    const ftype = pathMeta.isDirectory() ? 'directory' : 'file';
+    const ftype = pathMeta.isDirectory() ? "directory" : "file";
     output += `${warningPrefix} Your WIT ${ftype} [${witPath}] may be laid out incorrectly\n`;
     output += `${warningPrefix} Keep in mind the following rules:\n`;
     output += `${warningPrefix}     - Top level WIT files are in the same package (i.e. "ns:pkg" in "wit/*.wit")\n`;
@@ -186,7 +178,6 @@ async function printWITLayoutHint(witPath) {
 }
 
 // see: https://github.com/vitest-dev/vitest/issues/6953#issuecomment-2505310022
-if (typeof __vite_ssr_import_meta__ !== 'undefined') {
-    __vite_ssr_import_meta__.resolve = (path) =>
-        'file://' + globalCreateRequire(import.meta.url).resolve(path);
+if (typeof __vite_ssr_import_meta__ !== "undefined") {
+    __vite_ssr_import_meta__.resolve = (path) => "file://" + globalCreateRequire(import.meta.url).resolve(path);
 }

package/src/cmd/wasm-tools.d.ts

@@ -5,4 +5,4 @@ export function componentNew(file: any, opts: any): Promise<void>;
 export function componentEmbed(file: any, opts: any): Promise<void>;
 export function metadataAdd(file: any, opts: any): Promise<void>;
 export function metadataShow(file: any, opts: any): Promise<void>;
-//# sourceMappingURL=wasm-tools.d.ts.map
+//# sourceMappingURL=wasm-tools.d.ts.map

package/src/cmd/wasm-tools.js

@@ -1,8 +1,8 @@
-import { resolve, basename, extname } from 'node:path';
-import { writeFile } from 'node:fs/promises';
+import { resolve, basename, extname } from "node:path";
+import { writeFile } from "node:fs/promises";
 
-import { readFile, isWindows, styleText } from '../common.js';
-import { $init, tools } from '../../obj/wasm-tools.js';
+import { readFile, isWindows, styleText } from "../common.js";
+import { $init, tools } from "../../obj/wasm-tools.js";
 const {
     print: printFn,
     parse: parseFn,
@@ -47,34 +47,20 @@ export async function componentNew(file, opts) {
     const source = file ? await readFile(file) : null;
     let adapters = [];
     if (opts.wasiReactor && opts.wasiCommand) {
-        throw new Error('Must select one of --wasi-command or --wasi-reactor');
+        throw new Error("Must select one of --wasi-command or --wasi-reactor");
     }
     if (opts.wasiReactor) {
         adapters = [
             [
-                'wasi_snapshot_preview1',
-                (
-                    await readFile(
-                        new URL(
-                            '../../lib/wasi_snapshot_preview1.reactor.wasm',
-                            import.meta.url
-                        )
-                    )
-                ).buffer,
+                "wasi_snapshot_preview1",
+                (await readFile(new URL("../../lib/wasi_snapshot_preview1.reactor.wasm", import.meta.url))).buffer,
             ],
         ];
     } else if (opts.wasiCommand) {
         adapters = [
             [
-                'wasi_snapshot_preview1',
-                (
-                    await readFile(
-                        new URL(
-                            '../../lib/wasi_snapshot_preview1.command.wasm',
-                            import.meta.url
-                        )
-                    )
-                ).buffer,
+                "wasi_snapshot_preview1",
+                (await readFile(new URL("../../lib/wasi_snapshot_preview1.command.wasm", import.meta.url))).buffer,
             ],
         ];
     }
@@ -83,18 +69,15 @@ export async function componentNew(file, opts) {
             await Promise.all(
                 opts.adapt.map(async (adapt) => {
                     let adapter;
-                    if (adapt.includes('=')) {
-                        adapter = adapt.split('=');
+                    if (adapt.includes("=")) {
+                        adapter = adapt.split("=");
                     } else {
-                        adapter = [
-                            basename(adapt).slice(0, -extname(adapt).length),
-                            adapt,
-                        ];
+                        adapter = [basename(adapt).slice(0, -extname(adapt).length), adapt];
                     }
                     adapter[1] = await readFile(adapter[1]);
                     return adapter;
-                })
-            )
+                }),
+            ),
         );
     }
     const output = componentNewFn(source, adapters);
@@ -105,14 +88,14 @@ export async function componentEmbed(file, opts) {
     await $init;
     if (opts.metadata) {
         opts.metadata = opts.metadata.map((meta) => {
-            const [field, data = ''] = meta.split('=');
-            const [name, version = ''] = data.split('@');
+            const [field, data = ""] = meta.split("=");
+            const [name, version = ""] = data.split("@");
             return [field, [[name, version]]];
         });
     }
     const source = file ? await readFile(file) : null;
     opts.binary = source;
-    opts.witPath = (isWindows ? '//?/' : '') + resolve(opts.wit);
+    opts.witPath = (isWindows ? "//?/" : "") + resolve(opts.wit);
     const output = componentEmbedFn(opts);
     await writeFile(opts.output, output);
 }
@@ -120,8 +103,8 @@ export async function componentEmbed(file, opts) {
 export async function metadataAdd(file, opts) {
     await $init;
     const metadata = opts.metadata.map((meta) => {
-        const [field, data = ''] = meta.split('=');
-        const [name, version = ''] = data.split('@');
+        const [field, data = ""] = meta.split("=");
+        const [name, version = ""] = data.split("@");
         return [field, [[name, version]]];
     });
     const source = await readFile(file);
@@ -132,32 +115,32 @@ export async function metadataAdd(file, opts) {
 export async function metadataShow(file, opts) {
     await $init;
     const source = await readFile(file);
-    let output = '',
+    let output = "",
         stack = [1];
     const meta = metadataShowFn(source);
     if (opts.json) {
         console.log(JSON.stringify(meta, null, 2));
     } else {
         for (const { name, metaType, producers } of meta) {
-            output += '  '.repeat(stack.length - 1);
-            const indent = '  '.repeat(stack.length);
-            if (metaType.tag === 'component') {
-                output += `${styleText('bold', `[component${name ? ' ' + name : ''}]`)}\n`;
+            output += "  ".repeat(stack.length - 1);
+            const indent = "  ".repeat(stack.length);
+            if (metaType.tag === "component") {
+                output += `${styleText("bold", `[component${name ? " " + name : ""}]`)}\n`;
                 if (metaType.val > 0) {
                     stack.push(metaType.val);
                 }
             } else {
-                output += `${styleText('bold', `[module${name ? ' ' + name : ''}]`)}\n`;
+                output += `${styleText("bold", `[module${name ? " " + name : ""}]`)}\n`;
             }
             if (producers.length === 0) {
                 output += `${indent}(no metadata)\n`;
             }
             for (const [field, items] of producers) {
                 for (const [name, version] of items) {
-                    output += `${indent}${(field + ':').padEnd(13, ' ')} ${name}${version ? `${styleText('cyan', version)}` : ''}\n`;
+                    output += `${indent}${(field + ":").padEnd(13, " ")} ${name}${version ? `${styleText("cyan", version)}` : ""}\n`;
                 }
             }
-            output += '\n';
+            output += "\n";
             if (stack[stack.length - 1] === 0) {
                 stack.pop();
             }

package/src/common.js

@@ -1,40 +1,30 @@
-import { normalize, resolve, sep, dirname } from 'node:path';
-import { tmpdir } from 'node:os';
-import {
-    readFile,
-    writeFile,
-    rm,
-    mkdtemp,
-    mkdir,
-    stat,
-} from 'node:fs/promises';
-import { spawn } from 'node:child_process';
-import { argv0 } from 'node:process';
-import { platform } from 'node:process';
-import * as nodeUtils from 'node:util';
-
-export const isWindows = platform === 'win32';
+import { normalize, resolve, sep, dirname } from "node:path";
+import { tmpdir } from "node:os";
+import { readFile, writeFile, rm, mkdtemp, mkdir, stat } from "node:fs/promises";
+import { spawn } from "node:child_process";
+import { argv0 } from "node:process";
+import { platform } from "node:process";
+import * as nodeUtils from "node:util";
+
+export const isWindows = platform === "win32";
 
 export const ASYNC_WASI_IMPORTS = [
-    'wasi:io/poll#poll',
-    'wasi:io/poll#[method]pollable.block',
-    'wasi:io/streams#[method]input-stream.blocking-read',
-    'wasi:io/streams#[method]input-stream.blocking-skip',
-    'wasi:io/streams#[method]output-stream.blocking-flush',
-    'wasi:io/streams#[method]output-stream.blocking-write-and-flush',
-    'wasi:io/streams#[method]output-stream.blocking-write-zeroes-and-flush',
-    'wasi:io/streams#[method]output-stream.blocking-splice',
+    "wasi:io/poll#poll",
+    "wasi:io/poll#[method]pollable.block",
+    "wasi:io/streams#[method]input-stream.blocking-read",
+    "wasi:io/streams#[method]input-stream.blocking-skip",
+    "wasi:io/streams#[method]output-stream.blocking-flush",
+    "wasi:io/streams#[method]output-stream.blocking-write-and-flush",
+    "wasi:io/streams#[method]output-stream.blocking-write-zeroes-and-flush",
+    "wasi:io/streams#[method]output-stream.blocking-splice",
 ];
 
-export const ASYNC_WASI_EXPORTS = [
-    'wasi:cli/run#run',
-    'wasi:http/incoming-handler#handle',
-];
+export const ASYNC_WASI_EXPORTS = ["wasi:cli/run#run", "wasi:http/incoming-handler#handle"];
 
-export const DEFAULT_ASYNC_MODE = 'sync';
+export const DEFAULT_ASYNC_MODE = "sync";
 
 /** Path of WIT files by default when one is not specified */
-export const DEFAULT_WIT_PATH = './wit';
+export const DEFAULT_WIT_PATH = "./wit";
 
 let _showSpinner = false;
 export function setShowSpinner(val) {
@@ -58,7 +48,7 @@ export function sizeStr(num) {
 }
 
 export function fixedDigitDisplay(num, maxChars) {
-    const significantDigits = String(num).split('.')[0].length;
+    const significantDigits = String(num).split(".")[0].length;
     let str;
     if (significantDigits >= maxChars - 1) {
         str = String(Math.round(num));
@@ -70,7 +60,7 @@ export function fixedDigitDisplay(num, maxChars) {
     if (maxChars - str.length < 0) {
         return str;
     }
-    return ' '.repeat(maxChars - str.length) + str;
+    return " ".repeat(maxChars - str.length) + str;
 }
 
 /**
@@ -82,22 +72,22 @@ export function fixedDigitDisplay(num, maxChars) {
  */
 export function table(rows, align = []) {
     if (rows.length === 0) {
-        return '';
+        return "";
     }
     const colLens = rows.reduce(
         (maxLens, cur) => maxLens.map((len, i) => Math.max(len, cur[i].length)),
-        rows[0].map((cell) => cell.length)
+        rows[0].map((cell) => cell.length),
     );
-    let outTable = '';
+    let outTable = "";
     for (const row of rows) {
         for (const [i, cell] of row.entries()) {
-            if (align[i] === 'right') {
-                outTable += ' '.repeat(colLens[i] - cell.length) + cell;
+            if (align[i] === "right") {
+                outTable += " ".repeat(colLens[i] - cell.length) + cell;
             } else {
-                outTable += cell + ' '.repeat(colLens[i] - cell.length);
+                outTable += cell + " ".repeat(colLens[i] - cell.length);
             }
         }
-        outTable += '\n';
+        outTable += "\n";
     }
     return outTable;
 }
@@ -124,7 +114,7 @@ async function readFileCli(filePath, encoding) {
     try {
         return await readFile(filePath, encoding);
     } catch {
-        throw `Unable to read file ${styleText('bold', filePath)}`;
+        throw `Unable to read file ${styleText("bold", filePath)}`;
     }
 }
 export { readFileCli as readFile };
@@ -148,22 +138,22 @@ export { readFileCli as readFile };
 export async function spawnIOTmp(cmd, inputWasmBytes, args) {
     const tmpDir = await getTmpDir();
     try {
-        const inFile = resolve(tmpDir, 'in.wasm');
-        let outFile = resolve(tmpDir, 'out.wasm');
+        const inFile = resolve(tmpDir, "in.wasm");
+        let outFile = resolve(tmpDir, "out.wasm");
 
         await writeFile(inFile, inputWasmBytes);
 
         const cp = spawn(argv0, [cmd, inFile, ...args, outFile], {
-            stdio: 'pipe',
+            stdio: "pipe",
         });
 
-        let stderr = '';
+        let stderr = "";
         const p = new Promise((resolve, reject) => {
-            cp.stderr.on('data', (data) => (stderr += data.toString()));
-            cp.on('error', (e) => {
+            cp.stderr.on("data", (data) => (stderr += data.toString()));
+            cp.on("error", (e) => {
                 reject(e);
             });
-            cp.on('exit', (code) => {
+            cp.on("exit", (code) => {
                 if (code === 0) {
                     resolve();
                 } else {
@@ -196,18 +186,18 @@ export async function writeFiles(files, summaryTitle) {
         Object.entries(files).map(async ([filePath, contents]) => {
             await mkdir(dirname(filePath), { recursive: true });
             await writeFile(filePath, contents);
-        })
+        }),
     );
     if (!summaryTitle) {
         return;
     }
 
     let rows = Object.entries(files).map(([name, source]) => [
-        ` - ${styleText('italic', name)}  `,
-        `${styleText(['black', 'italic'], sizeStr(source.length))}`,
+        ` - ${styleText("italic", name)}  `,
+        `${styleText(["black", "italic"], sizeStr(source.length))}`,
     ]);
     console.log(`
-  ${styleText('bold', summaryTitle + ":")}
+  ${styleText("bold", summaryTitle + ":")}
 
 ${table(rows)}`);
 }
@@ -228,14 +218,10 @@ export async function resolveDefaultWITPath(witPath) {
         .then((p) => p.isDirectory())
         .catch(() => false);
     if (!witDirExists) {
-        throw new Error(
-            'Failed to determine WIT directory, please specify WIT directory argument'
-        );
+        throw new Error("Failed to determine WIT directory, please specify WIT directory argument");
     }
     witPath = resolve(DEFAULT_WIT_PATH);
-    console.error(
-        `no WIT directory specified, using detected WIT directory @ [${DEFAULT_WIT_PATH}]`
-    );
+    console.error(`no WIT directory specified, using detected WIT directory @ [${DEFAULT_WIT_PATH}]`);
     return witPath;
 }