@bytecodealliance/jco 1.13.3 → 1.15.0

package/src/cmd/opt.js

@@ -1,8 +1,8 @@
+import { writeFile } from 'node:fs/promises';
+
 import { $init, tools } from '../../obj/wasm-tools.js';
 const { metadataShow, print } = tools;
-import { writeFile } from 'fs/promises';
 import { fileURLToPath } from 'url';
-import c from 'chalk-template';
 import {
     readFile,
     sizeStr,
@@ -14,6 +14,8 @@ import {
 } 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('--');
@@ -34,33 +36,35 @@ export async function opt(componentPath, opts, program) {
         totalAfterBytes = 0;
 
     if (!opts.quiet) {
-        console.log(c`
-{bold Optimized WebAssembly Component Internal Core Modules:}
+        const tableContent =  table(
+            [
+                ...compressionInfo.map(({ beforeBytes, afterBytes }, i) => {
+                    totalBeforeBytes += beforeBytes;
+                    totalAfterBytes += afterBytes;
+                    return [
+                        ` - Core Module ${i + 1}:  `,
+                        sizeStr(beforeBytes),
+                        ' -> ',
+                        `${styleText('cyan', sizeStr(afterBytes))} `,
+                        `(${fixedDigitDisplay((afterBytes / beforeBytes) * 100, 2)}%)`,
+                    ];
+                }),
+                ['', '', '', '', ''],
+                [
+                    ` = Total:  `,
+                    `${sizeStr(totalBeforeBytes)}`,
+                    ` => `,
+                    `${styleText('cyan', sizeStr(totalAfterBytes))} `,
+                    `(${fixedDigitDisplay((totalAfterBytes / totalBeforeBytes) * 100, 2)}%)`,
+                ],
+            ],
+            [, , , , 'right']
+        );
 
-${table(
-    [
-        ...compressionInfo.map(({ beforeBytes, afterBytes }, i) => {
-            totalBeforeBytes += beforeBytes;
-            totalAfterBytes += afterBytes;
-            return [
-                ` - Core Module ${i + 1}:  `,
-                sizeStr(beforeBytes),
-                ' -> ',
-                c`{cyan ${sizeStr(afterBytes)}} `,
-                `(${fixedDigitDisplay((afterBytes / beforeBytes) * 100, 2)}%)`,
-            ];
-        }),
-        ['', '', '', '', ''],
-        [
-            ` = Total:  `,
-            `${sizeStr(totalBeforeBytes)}`,
-            ` => `,
-            c`{cyan ${sizeStr(totalAfterBytes)}} `,
-            `(${fixedDigitDisplay((totalAfterBytes / totalBeforeBytes) * 100, 2)}%)`,
-        ],
-    ],
-    [, , , , 'right']
-)}`);
+        console.log(`
+${styleText('bold', "Optimized WebAssembly Component Internal Core Modules:")}
+
+${tableContent}`);
     }
 }
 
@@ -104,7 +108,7 @@ export async function optimizeComponent(componentBytes, opts) {
         // log number of core Wasm modules to be run with wasm-opt
         let completed = 0;
         const spinnerText = () =>
-            c`{cyan ${completed} / ${coreModules.length}} Running Binaryen on WebAssembly Component Internal Core Modules \n`;
+            `${styleText('cyan', `${completed} / ${coreModules.length}`)} Running Binaryen on WebAssembly Component Internal Core Modules \n`;
         if (showSpinner) {
             spinner = ora({
                 color: 'cyan',
@@ -117,11 +121,11 @@ export async function optimizeComponent(componentBytes, opts) {
         const args = opts?.optArgs
             ? [...opts.optArgs]
             : [
-                  '-Oz',
-                  '--low-memory-unused',
-                  '--enable-bulk-memory',
-                  '--strip-debug',
-              ];
+                '-Oz',
+                '--low-memory-unused',
+                '--enable-bulk-memory',
+                '--strip-debug',
+            ];
         if (opts?.asyncify) {
             args.push('--asyncify');
         }
@@ -136,7 +140,8 @@ export async function optimizeComponent(componentBytes, opts) {
                             metadata.range[0],
                             metadata.range[1]
                         ),
-                        args
+                        args,
+                        opts
                     );
 
                     // compute the size change, including the change to
@@ -280,13 +285,13 @@ export async function optimizeComponent(componentBytes, opts) {
  * @param {Array<string>} args
  * @returns {Promise<Uint8Array>}
  */
-async function wasmOpt(source, args) {
-    const wasmOptPath = fileURLToPath(
-        import.meta.resolve('binaryen/bin/wasm-opt')
-    );
+async function wasmOpt(source, args, transpileOpts) {
+    const wasmOptBin =
+        transpileOpts?.wasmOptBin ??
+        fileURLToPath(import.meta.resolve('binaryen/bin/wasm-opt'));
 
     try {
-        return await spawnIOTmp(wasmOptPath, source, [...args, '-o']);
+        return await spawnIOTmp(wasmOptBin, source, [...args, '-o']);
     } catch (e) {
         if (e.toString().includes('BasicBlock requested')) {
             return wasmOpt(source, args);

package/src/cmd/run.js

@@ -1,11 +1,11 @@
-import { getTmpDir } from '../common.js';
-import { transpile } from './transpile.js';
 import { rm, mkdir, writeFile, symlink } from 'node:fs/promises';
 import { basename, resolve, extname } from 'node:path';
 import { spawn } from 'node:child_process';
 import process from 'node:process';
 import { fileURLToPath, pathToFileURL } from 'node:url';
-import c from 'chalk-template';
+
+import { getTmpDir, styleText } from '../common.js';
+import { transpile } from './transpile.js';
 
 const DEFAULT_SERVE_HOST = 'localhost';
 
@@ -54,8 +54,8 @@ export async function serve(componentPath, args, opts) {
     const server = new HTTPServer(mod.incomingHandler);
     let port = ${port};
     ${
-        tryFindPort
-            ? `
+    tryFindPort
+        ? `
     while (true) {
       try {
         server.listen(port, ${JSON.stringify(host)});
@@ -67,8 +67,8 @@ export async function serve(componentPath, args, opts) {
       port++;
     }
     `
-            : `server.listen(port, ${JSON.stringify(host)})`
-    }
+        : `server.listen(port, ${JSON.stringify(host)})`
+}
     console.error(\`Server listening @ ${host}:${port}...\`);
   `
     );
@@ -117,7 +117,7 @@ async function runComponent(componentPath, args, opts, executor) {
                 '../../../'
             );
         } catch (err) {
-            let msg = c`{red.bold error} Failed to resolve {bold @bytecodealliance/preview2-shim}, ensure it is installed.`;
+            let msg = `${styleText(['red', 'bold'], 'error')} Failed to resolve ${styleText('bold', '@bytecodealliance/preview2-shim')}, ensure it is installed.`;
             msg += `\nERROR:\n${err.toString()}`;
             throw new Error(msg);
         }