@bytecodealliance/jco 1.14.0 → 1.15.1

package/src/cmd/transpile.js

@@ -2,7 +2,6 @@
 
 import { extname, basename, resolve } from 'node:path';
 
-import c from 'chalk-template';
 import { minify } from 'terser';
 import { fileURLToPath } from 'url';
 
@@ -15,6 +14,7 @@ import {
     setShowSpinner,
     getShowSpinner,
     writeFiles,
+    styleText,
     ASYNC_WASI_IMPORTS,
     ASYNC_WASI_EXPORTS,
     DEFAULT_ASYNC_MODE,
@@ -176,7 +176,7 @@ export async function transpileComponent(component, opts = {}) {
     let asyncMode = opts.asyncMode ?? DEFAULT_ASYNC_MODE;
     if (asyncMode === 'sync' && asyncExports.size > 0) {
         throw new Error(
-            'async exports cannot be specified in sync mode (consider removing --async-mode=jspi)'
+            'async exports cannot be specified in sync mode (consider adding --async-mode=jspi)'
         );
     }
     let asyncModeObj;
@@ -291,7 +291,7 @@ export async function transpileComponent(component, opts = {}) {
         // Configure the spinner.
         let completed = 0;
         const spinnerText = () =>
-            c`{cyan ${completed} / ${wasmFiles.length}} Running Binaryen wasm2js on Wasm core modules (this takes a while)...\n`;
+            `${styleText("cyan", `${completed} / ${wasmFiles.length}`)} Running Binaryen wasm2js on Wasm core modules (this takes a while)...\n`;
         if (showSpinner) {
             spinner = ora({
                 color: 'cyan',
@@ -317,16 +317,16 @@ export async function transpileComponent(component, opts = {}) {
                 .map(
                     (asm, nth) => `function asm${nth}(imports) {
   ${
-      // strip and replace the asm instantiation wrapper
-      asm
-          .replace(/import \* as [^ ]+ from '[^']*';/g, '')
-          .replace('function asmFunc(imports) {', '')
-          .replace(/export var ([^ ]+) = ([^. ]+)\.([^ ]+);/g, '')
-          .replace(/var retasmFunc = [\s\S]*$/, '')
-          .replace(/var memasmFunc = new ArrayBuffer\(0\);/g, '')
-          .replace('memory.grow = __wasm_memory_grow;', '')
-          .trim()
-  }`
+    // strip and replace the asm instantiation wrapper
+    asm
+        .replace(/import \* as [^ ]+ from '[^']*';/g, '')
+        .replace('function asmFunc(imports) {', '')
+        .replace(/export var ([^ ]+) = ([^. ]+)\.([^ ]+);/g, '')
+        .replace(/var retasmFunc = [\s\S]*$/, '')
+        .replace(/var memasmFunc = new ArrayBuffer\(0\);/g, '')
+        .replace('memory.grow = __wasm_memory_grow;', '')
+        .trim()
+}`
                 )
                 .join(',\n');
 
@@ -367,14 +367,14 @@ ${
     // Exporting `$init` must come first to not break the transpiling tests.
     opts.tlaCompat ? '  $init,\n' : ''
 }${exports
-                        .map(([name]) => {
-                            if (name === asmMangle(name)) {
-                                return `  ${name},`;
-                            } else {
-                                return `  ${asmMangle(name)} as '${name}',`;
-                            }
-                        })
-                        .join('\n')}
+    .map(([name]) => {
+        if (name === asmMangle(name)) {
+            return `  ${name},`;
+        } else {
+            return `  ${asmMangle(name)} as '${name}',`;
+        }
+    })
+    .join('\n')}
 }`;
                 }
 
@@ -383,35 +383,35 @@ ${
                     .map(([name]) => `_${asmMangle(name)}`)
                     .join(', ')};
 ${exports
-    .map(([name, ty]) => {
-        if (ty === 'function') {
-            return `\nfunction ${asmMangle(name)} () {
+        .map(([name, ty]) => {
+            if (ty === 'function') {
+                return `\nfunction ${asmMangle(name)} () {
   return _${asmMangle(name)}.apply(this, arguments);
 }`;
-        } else {
-            return `\nlet ${asmMangle(name)};`;
-        }
-    })
-    .join('\n')}`;
+            } else {
+                return `\nlet ${asmMangle(name)};`;
+            }
+        })
+        .join('\n')}`;
 
                 autoInstantiate = `${async_}function $init() {
   ( {
 ${exports
-    .map(([name, ty]) => {
-        if (ty === 'function') {
-            return `    '${name}': _${asmMangle(name)},`;
-        } else if (asmMangle(name) === name) {
-            return `    ${name},`;
-        } else {
-            return `    '${name}': ${asmMangle(name)},`;
-        }
-    })
-    .join('\n')}
+        .map(([name, ty]) => {
+            if (ty === 'function') {
+                return `    '${name}': _${asmMangle(name)},`;
+            } else if (asmMangle(name) === name) {
+                return `    ${name},`;
+            } else {
+                return `    '${name}': ${asmMangle(name)},`;
+            }
+        })
+        .join('\n')}
   } = ${await_}instantiate(
     {
 ${imports
-    .map((import_file, nth) => `      '${import_file}': import${nth},`)
-    .join('\n')}
+        .map((import_file, nth) => `      '${import_file}': import${nth},`)
+        .join('\n')}
     }
   ) )
 }
@@ -480,6 +480,41 @@ function asmMangle(name) {
 
     // Names must start with a character, $ or _
     switch (name[0]) {
+    case '0':
+    case '1':
+    case '2':
+    case '3':
+    case '4':
+    case '5':
+    case '6':
+    case '7':
+    case '8':
+    case '9': {
+        name = '$' + name;
+        i = 2;
+        // fallthrough
+    }
+    case '$':
+    case '_': {
+        mightBeKeyword = false;
+        break;
+    }
+    default: {
+        let chNum = name.charCodeAt(0);
+        if (
+            !(chNum >= 97 && chNum <= 122) &&
+                !(chNum >= 65 && chNum <= 90)
+        ) {
+            name = '$' + name.substr(1);
+            mightBeKeyword = false;
+        }
+    }
+    }
+
+    // Names must contain only characters, digits, $ or _
+    let len = name.length;
+    for (; i < len; ++i) {
+        switch (name[i]) {
         case '0':
         case '1':
         case '2':
@@ -489,194 +524,159 @@ function asmMangle(name) {
         case '6':
         case '7':
         case '8':
-        case '9': {
-            name = '$' + name;
-            i = 2;
-            // fallthrough
-        }
+        case '9':
         case '$':
         case '_': {
             mightBeKeyword = false;
             break;
         }
         default: {
-            let chNum = name.charCodeAt(0);
+            let chNum = name.charCodeAt(i);
             if (
                 !(chNum >= 97 && chNum <= 122) &&
-                !(chNum >= 65 && chNum <= 90)
+                    !(chNum >= 65 && chNum <= 90)
             ) {
-                name = '$' + name.substr(1);
+                name = name.substr(0, i) + '_' + name.substr(i + 1);
                 mightBeKeyword = false;
             }
         }
-    }
-
-    // Names must contain only characters, digits, $ or _
-    let len = name.length;
-    for (; i < len; ++i) {
-        switch (name[i]) {
-            case '0':
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-            case '5':
-            case '6':
-            case '7':
-            case '8':
-            case '9':
-            case '$':
-            case '_': {
-                mightBeKeyword = false;
-                break;
-            }
-            default: {
-                let chNum = name.charCodeAt(i);
-                if (
-                    !(chNum >= 97 && chNum <= 122) &&
-                    !(chNum >= 65 && chNum <= 90)
-                ) {
-                    name = name.substr(0, i) + '_' + name.substr(i + 1);
-                    mightBeKeyword = false;
-                }
-            }
         }
     }
 
     // Names must not collide with keywords
     if (mightBeKeyword && len >= 2 && len <= 10) {
         switch (name[0]) {
-            case 'a': {
-                if (name == 'arguments') {
-                    return name + '_';
-                }
-                break;
+        case 'a': {
+            if (name == 'arguments') {
+                return name + '_';
             }
-            case 'b': {
-                if (name == 'break') {
-                    return name + '_';
-                }
-                break;
+            break;
+        }
+        case 'b': {
+            if (name == 'break') {
+                return name + '_';
             }
-            case 'c': {
-                if (
-                    name == 'case' ||
+            break;
+        }
+        case 'c': {
+            if (
+                name == 'case' ||
                     name == 'continue' ||
                     name == 'catch' ||
                     name == 'const' ||
                     name == 'class'
-                ) {
-                    return name + '_';
-                }
-                break;
+            ) {
+                return name + '_';
             }
-            case 'd': {
-                if (name == 'do' || name == 'default' || name == 'debugger') {
-                    return name + '_';
-                }
-                break;
+            break;
+        }
+        case 'd': {
+            if (name == 'do' || name == 'default' || name == 'debugger') {
+                return name + '_';
             }
-            case 'e': {
-                if (
-                    name == 'else' ||
+            break;
+        }
+        case 'e': {
+            if (
+                name == 'else' ||
                     name == 'enum' ||
                     name == 'eval' || // to be sure
                     name == 'export' ||
                     name == 'extends'
-                ) {
-                    return name + '_';
-                }
-                break;
+            ) {
+                return name + '_';
             }
-            case 'f': {
-                if (
-                    name == 'for' ||
+            break;
+        }
+        case 'f': {
+            if (
+                name == 'for' ||
                     name == 'false' ||
                     name == 'finally' ||
                     name == 'function'
-                ) {
-                    return name + '_';
-                }
-                break;
+            ) {
+                return name + '_';
             }
-            case 'i': {
-                if (
-                    name == 'if' ||
+            break;
+        }
+        case 'i': {
+            if (
+                name == 'if' ||
                     name == 'in' ||
                     name == 'import' ||
                     name == 'interface' ||
                     name == 'implements' ||
                     name == 'instanceof'
-                ) {
-                    return name + '_';
-                }
-                break;
+            ) {
+                return name + '_';
             }
-            case 'l': {
-                if (name == 'let') {
-                    return name + '_';
-                }
-                break;
+            break;
+        }
+        case 'l': {
+            if (name == 'let') {
+                return name + '_';
             }
-            case 'n': {
-                if (name == 'new' || name == 'null') {
-                    return name + '_';
-                }
-                break;
+            break;
+        }
+        case 'n': {
+            if (name == 'new' || name == 'null') {
+                return name + '_';
             }
-            case 'p': {
-                if (
-                    name == 'public' ||
+            break;
+        }
+        case 'p': {
+            if (
+                name == 'public' ||
                     name == 'package' ||
                     name == 'private' ||
                     name == 'protected'
-                ) {
-                    return name + '_';
-                }
-                break;
+            ) {
+                return name + '_';
             }
-            case 'r': {
-                if (name == 'return') {
-                    return name + '_';
-                }
-                break;
+            break;
+        }
+        case 'r': {
+            if (name == 'return') {
+                return name + '_';
             }
-            case 's': {
-                if (name == 'super' || name == 'static' || name == 'switch') {
-                    return name + '_';
-                }
-                break;
+            break;
+        }
+        case 's': {
+            if (name == 'super' || name == 'static' || name == 'switch') {
+                return name + '_';
             }
-            case 't': {
-                if (
-                    name == 'try' ||
+            break;
+        }
+        case 't': {
+            if (
+                name == 'try' ||
                     name == 'this' ||
                     name == 'true' ||
                     name == 'throw' ||
                     name == 'typeof'
-                ) {
-                    return name + '_';
-                }
-                break;
+            ) {
+                return name + '_';
             }
-            case 'v': {
-                if (name == 'var' || name == 'void') {
-                    return name + '_';
-                }
-                break;
+            break;
+        }
+        case 'v': {
+            if (name == 'var' || name == 'void') {
+                return name + '_';
             }
-            case 'w': {
-                if (name == 'with' || name == 'while') {
-                    return name + '_';
-                }
-                break;
+            break;
+        }
+        case 'w': {
+            if (name == 'with' || name == 'while') {
+                return name + '_';
             }
-            case 'y': {
-                if (name == 'yield') {
-                    return name + '_';
-                }
-                break;
+            break;
+        }
+        case 'y': {
+            if (name == 'yield') {
+                return name + '_';
             }
+            break;
+        }
         }
     }
     return name;

package/src/cmd/types.js

@@ -1,26 +1,56 @@
-import { stat } from 'node:fs/promises';
+import { stat, mkdir } from 'node:fs/promises';
 import { extname, basename, resolve } from 'node:path';
 
-import c from 'chalk-template';
-
 import {
     $init,
     generateTypes,
 } from '../../obj/js-component-bindgen-component.js';
+
 import {
     isWindows,
     writeFiles,
+    resolveDefaultWITPath,
+    styleText,
     ASYNC_WASI_IMPORTS,
     ASYNC_WASI_EXPORTS,
     DEFAULT_ASYNC_MODE,
 } from '../common.js';
 
+/** Default relative path for guest type declaration generation */
+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';
+
 export async function types(witPath, opts) {
+    witPath = await resolveDefaultWITPath(witPath);
+
+    // Use the default output directory if one was not provided
+    if (!opts.outDir) {
+        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}]`
+        );
+    }
+
     const files = await typesComponent(witPath, opts);
+
     await writeFiles(files, opts.quiet ? false : 'Generated Type Files');
 }
 
 export async function guestTypes(witPath, opts) {
+    witPath = await resolveDefaultWITPath(witPath);
+
+    // Use the default output directory if one was not provided
+    if (!opts.outDir) {
+        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}]`
+        );
+    }
+
     const files = await typesComponent(witPath, { ...opts, guest: true });
     await writeFiles(
         files,
@@ -140,17 +170,18 @@ export async function typesComponent(witPath, opts) {
  * @param {(string, any) => void} consoleFn
  */
 async function printWITLayoutHint(witPath) {
+    const warningPrefix = styleText(['yellow', 'bold'], 'warning');
     const pathMeta = await stat(witPath);
     let output = '\n';
     if (!pathMeta.isFile() && !pathMeta.isDirectory()) {
-        output += c`{yellow.bold warning} The supplited WIT path [${witPath}] is neither a file or directory.\n`;
+        output += `${warningPrefix} The supplited WIT path [${witPath}] is neither a file or directory.\n`;
         return output;
     }
     const ftype = pathMeta.isDirectory() ? 'directory' : 'file';
-    output += c`{yellow.bold warning} Your WIT ${ftype} [${witPath}] may be laid out incorrectly\n`;
-    output += c`{yellow.bold warning} Keep in mind the following rules:\n`;
-    output += c`{yellow.bold warning}     - Top level WIT files are in the same package (i.e. "ns:pkg" in "wit/*.wit")\n`;
-    output += c`{yellow.bold warning}     - All package dependencies should be in "wit/deps" (i.e. "some:dep" in "wit/deps/some-dep.wit"\n`;
+    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`;
+    output += `${warningPrefix}     - All package dependencies should be in "wit/deps" (i.e. "some:dep" in "wit/deps/some-dep.wit"\n`;
     return output;
 }
 

package/src/cmd/wasm-tools.js

@@ -1,5 +1,7 @@
+import { resolve, basename, extname } from 'node:path';
 import { writeFile } from 'node:fs/promises';
-import { readFile, isWindows } from '../common.js';
+
+import { readFile, isWindows, styleText } from '../common.js';
 import { $init, tools } from '../../obj/wasm-tools.js';
 const {
     print: printFn,
@@ -10,8 +12,6 @@ const {
     metadataAdd: metadataAddFn,
     metadataShow: metadataShowFn,
 } = tools;
-import { resolve, basename, extname } from 'node:path';
-import c from 'chalk-template';
 
 export async function parse(file, opts) {
     await $init;
@@ -142,19 +142,19 @@ export async function metadataShow(file, opts) {
             output += '  '.repeat(stack.length - 1);
             const indent = '  '.repeat(stack.length);
             if (metaType.tag === 'component') {
-                output += c`{bold [component${name ? ' ' + name : ''}]}\n`;
+                output += `${styleText('bold', `[component${name ? ' ' + name : ''}]`)}\n`;
                 if (metaType.val > 0) {
                     stack.push(metaType.val);
                 }
             } else {
-                output += c`{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 ? c`{cyan  ${version}}` : ''}\n`;
+                    output += `${indent}${(field + ':').padEnd(13, ' ')} ${name}${version ? `${styleText('cyan', version)}` : ''}\n`;
                 }
             }
             output += '\n';