@bytecodealliance/jco 1.10.2 → 1.11.0

package/src/cmd/wasm-tools.js

@@ -1,121 +1,156 @@
-import { writeFile } from "node:fs/promises";
+import { writeFile } from 'node:fs/promises';
 import { readFile, isWindows } from '../common.js';
-import { $init, tools } from "../../obj/wasm-tools.js";
-const { print: printFn, parse: parseFn, componentWit: componentWitFn, componentNew: componentNewFn, componentEmbed: componentEmbedFn, metadataAdd: metadataAddFn, metadataShow: metadataShowFn } = tools;
+import { $init, tools } from '../../obj/wasm-tools.js';
+const {
+    print: printFn,
+    parse: parseFn,
+    componentWit: componentWitFn,
+    componentNew: componentNewFn,
+    componentEmbed: componentEmbedFn,
+    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;
-  const source = (await readFile(file)).toString();
-  const output = parseFn(source);
-  await writeFile(opts.output, output);
+    await $init;
+    const source = (await readFile(file)).toString();
+    const output = parseFn(source);
+    await writeFile(opts.output, output);
 }
 
 export async function print(file, opts) {
-  await $init;
-  const source = await readFile(file);
-  const output = printFn(source);
-  if (opts.output) {
-    await writeFile(opts.output, output);
-  } else {
-    console.log(output);
-  }
+    await $init;
+    const source = await readFile(file);
+    const output = printFn(source);
+    if (opts.output) {
+        await writeFile(opts.output, output);
+    } else {
+        console.log(output);
+    }
 }
 
 export async function componentWit(file, opts) {
-  await $init;
-  const source = await readFile(file);
-  const output = componentWitFn(source, opts.document);
-  if (opts.output) {
-    await writeFile(opts.output, output);
-  } else {
-    console.log(output);
-  }
+    await $init;
+    const source = await readFile(file);
+    const output = componentWitFn(source, opts.document);
+    if (opts.output) {
+        await writeFile(opts.output, output);
+    } else {
+        console.log(output);
+    }
 }
 
 export async function componentNew(file, opts) {
-  await $init;
-  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');
-  if (opts.wasiReactor)
-    adapters = [['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]];
-  if (opts.adapt)
-    adapters = adapters.concat(await Promise.all(opts.adapt.map(async adapt => {
-      let adapter;
-      if (adapt.includes('='))
-        adapter = adapt.split('=');
-      else 
-        adapter = [basename(adapt).slice(0, -extname(adapt).length), adapt];
-      adapter[1] = await readFile(adapter[1]);
-      return adapter;
-    })));
-  const output = componentNewFn(source, adapters);
-  await writeFile(opts.output, output);
+    await $init;
+    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');
+    if (opts.wasiReactor)
+        adapters = [
+            [
+                '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,
+            ],
+        ];
+    if (opts.adapt)
+        adapters = adapters.concat(
+            await Promise.all(
+                opts.adapt.map(async (adapt) => {
+                    let adapter;
+                    if (adapt.includes('=')) adapter = adapt.split('=');
+                    else
+                        adapter = [
+                            basename(adapt).slice(0, -extname(adapt).length),
+                            adapt,
+                        ];
+                    adapter[1] = await readFile(adapter[1]);
+                    return adapter;
+                })
+            )
+        );
+    const output = componentNewFn(source, adapters);
+    await writeFile(opts.output, output);
 }
 
 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('@');
-      return [field, [[name, version]]];
-    });
-  const source = file ? await readFile(file) : null;
-  opts.binary = source;
-  opts.witPath = (isWindows ? '//?/' : '') + resolve(opts.wit);
-  const output = componentEmbedFn(opts);
-  await writeFile(opts.output, output);
+    await $init;
+    if (opts.metadata)
+        opts.metadata = opts.metadata.map((meta) => {
+            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);
+    const output = componentEmbedFn(opts);
+    await writeFile(opts.output, output);
 }
 
 export async function metadataAdd(file, opts) {
-  await $init;
-  const metadata = opts.metadata.map(meta => {
-    const [field, data = ''] = meta.split('=');
-    const [name, version = ''] = data.split('@');
-    return [field, [[name, version]]];
-  });
-  const source = await readFile(file);
-  const output = metadataAddFn(source, metadata);
-  await writeFile(opts.output, output);
+    await $init;
+    const metadata = opts.metadata.map((meta) => {
+        const [field, data = ''] = meta.split('=');
+        const [name, version = ''] = data.split('@');
+        return [field, [[name, version]]];
+    });
+    const source = await readFile(file);
+    const output = metadataAddFn(source, metadata);
+    await writeFile(opts.output, output);
 }
 
 export async function metadataShow(file, opts) {
-  await $init;
-  const source = await readFile(file);
-  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 += c`{bold [component${name ? ' ' + name : ''}]}\n`;
-        if (metaType.val > 0)
-          stack.push(metaType.val);
-      } else {
-        output += c`{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`;
+    await $init;
+    const source = await readFile(file);
+    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 += c`{bold [component${name ? ' ' + name : ''}]}\n`;
+                if (metaType.val > 0) stack.push(metaType.val);
+            } else {
+                output += c`{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 += '\n';
+            if (stack[stack.length - 1] === 0) stack.pop();
+            stack[stack.length - 1]--;
         }
-      }
-      output += '\n';
-      if (stack[stack.length - 1] === 0)
-        stack.pop();
-      stack[stack.length - 1]--;
+        process.stdout.write(output);
     }
-    process.stdout.write(output);
-  }
 }

package/src/jco.js

@@ -1,11 +1,13 @@
 #!/usr/bin/env node
+
+import c from 'chalk-template';
 import { program, Option } from 'commander';
+
 import { opt } from './cmd/opt.js';
 import { transpile, types, guestTypes } from './cmd/transpile.js';
 import { run as runCmd, serve as serveCmd } from './cmd/run.js';
 import { parse, print, componentNew, componentEmbed, metadataAdd, metadataShow, componentWit } from './cmd/wasm-tools.js';
 import { componentize } from './cmd/componentize.js';
-import c from 'chalk-template';
 
 program
   .name('jco')
@@ -34,10 +36,12 @@ program.command('componentize')
   .requiredOption('-w, --wit <path>', 'WIT path to build with')
   .option('-n, --world-name <name>', 'WIT world to build')
   .option('--aot', 'Enable Weval AOT compilation of JS')
+  .option('--aot-min-stack-size-bytes <number>', 'Set the min stack size to be used during AOT')
   .option('--weval-bin <path>', 'Specify a custom weval binary to use')
   .addOption(new Option('-d, --disable <feature...>', 'disable WASI features').choices(['clocks', 'http', 'random', 'stdio', 'all']))
   // .addOption(new Option('-e, --enable <feature...>', 'enable WASI features').choices(['http']))
   .option('--preview2-adapter <adapter>', 'provide a custom preview2 adapter path')
+  .option('--debug-starlingmonkey-build', 'use a debug build of StarlingMonkey')
   .requiredOption('-o, --out <out>', 'output component file')
   .action(asyncAction(componentize));
 

package/obj/interfaces/local-wasm-tools-tools.d.ts

@@ -1,52 +0,0 @@
-/** @module Interface local:wasm-tools/tools **/
-export function parse(wat: string): Uint8Array;
-export function print(binary: Uint8Array): string;
-export function componentNew(binary: Uint8Array, adapters: Array<[string, Uint8Array]> | undefined): Uint8Array;
-export function componentWit(binary: Uint8Array): string;
-export function componentEmbed(embedOpts: EmbedOpts): Uint8Array;
-export function metadataShow(binary: Uint8Array): Array<ModuleMetadata>;
-export function metadataAdd(binary: Uint8Array, metadata: ProducersFields): Uint8Array;
-/**
- * # Variants
- * 
- * ## `"utf8"`
- * 
- * ## `"utf16"`
- * 
- * ## `"compact-utf16"`
- */
-export type StringEncoding = 'utf8' | 'utf16' | 'compact-utf16';
-export type ProducersFields = Array<[string, Array<[string, string]>]>;
-export type EnabledFeatureSet = EnabledFeatureSetList | EnabledFeatureSetAll;
-export interface EnabledFeatureSetList {
-  tag: 'list',
-  val: Array<string>,
-}
-export interface EnabledFeatureSetAll {
-  tag: 'all',
-}
-export interface EmbedOpts {
-  binary?: Uint8Array,
-  witSource?: string,
-  witPath?: string,
-  stringEncoding?: StringEncoding,
-  dummy?: boolean,
-  world?: string,
-  metadata?: ProducersFields,
-  features?: EnabledFeatureSet,
-}
-export type ModuleMetaType = ModuleMetaTypeModule | ModuleMetaTypeComponent;
-export interface ModuleMetaTypeModule {
-  tag: 'module',
-}
-export interface ModuleMetaTypeComponent {
-  tag: 'component',
-  val: number,
-}
-export interface ModuleMetadata {
-  parentIndex?: number,
-  name?: string,
-  metaType: ModuleMetaType,
-  range: [number, number],
-  producers: ProducersFields,
-}

package/obj/interfaces/wasi-cli-environment.d.ts

@@ -1,2 +0,0 @@
-/** @module Interface wasi:cli/environment@0.2.3 **/
-export function getEnvironment(): Array<[string, string]>;

package/obj/interfaces/wasi-cli-exit.d.ts

@@ -1,3 +0,0 @@
-/** @module Interface wasi:cli/exit@0.2.3 **/
-export function exit(status: Result<void, void>): void;
-export type Result<T, E> = { tag: 'ok', val: T } | { tag: 'err', val: E };

package/obj/interfaces/wasi-cli-stderr.d.ts

@@ -1,3 +0,0 @@
-/** @module Interface wasi:cli/stderr@0.2.3 **/
-export function getStderr(): OutputStream;
-export type OutputStream = import('./wasi-io-streams.js').OutputStream;

package/obj/interfaces/wasi-cli-stdin.d.ts

@@ -1,3 +0,0 @@
-/** @module Interface wasi:cli/stdin@0.2.3 **/
-export function getStdin(): InputStream;
-export type InputStream = import('./wasi-io-streams.js').InputStream;

package/obj/interfaces/wasi-cli-stdout.d.ts

@@ -1,3 +0,0 @@
-/** @module Interface wasi:cli/stdout@0.2.3 **/
-export function getStdout(): OutputStream;
-export type OutputStream = import('./wasi-io-streams.js').OutputStream;

package/obj/interfaces/wasi-cli-terminal-input.d.ts

@@ -1,8 +0,0 @@
-/** @module Interface wasi:cli/terminal-input@0.2.3 **/
-
-export class TerminalInput {
-  /**
-   * This type does not have a public constructor.
-   */
-  private constructor();
-}

package/obj/interfaces/wasi-cli-terminal-output.d.ts

@@ -1,8 +0,0 @@
-/** @module Interface wasi:cli/terminal-output@0.2.3 **/
-
-export class TerminalOutput {
-  /**
-   * This type does not have a public constructor.
-   */
-  private constructor();
-}

package/obj/interfaces/wasi-cli-terminal-stderr.d.ts

@@ -1,3 +0,0 @@
-/** @module Interface wasi:cli/terminal-stderr@0.2.3 **/
-export function getTerminalStderr(): TerminalOutput | undefined;
-export type TerminalOutput = import('./wasi-cli-terminal-output.js').TerminalOutput;

package/obj/interfaces/wasi-cli-terminal-stdin.d.ts

@@ -1,3 +0,0 @@
-/** @module Interface wasi:cli/terminal-stdin@0.2.3 **/
-export function getTerminalStdin(): TerminalInput | undefined;
-export type TerminalInput = import('./wasi-cli-terminal-input.js').TerminalInput;

package/obj/interfaces/wasi-cli-terminal-stdout.d.ts

@@ -1,3 +0,0 @@
-/** @module Interface wasi:cli/terminal-stdout@0.2.3 **/
-export function getTerminalStdout(): TerminalOutput | undefined;
-export type TerminalOutput = import('./wasi-cli-terminal-output.js').TerminalOutput;

package/obj/interfaces/wasi-clocks-wall-clock.d.ts

@@ -1,5 +0,0 @@
-/** @module Interface wasi:clocks/wall-clock@0.2.3 **/
-export interface Datetime {
-  seconds: bigint,
-  nanoseconds: number,
-}

package/obj/interfaces/wasi-filesystem-preopens.d.ts

@@ -1,3 +0,0 @@
-/** @module Interface wasi:filesystem/preopens@0.2.3 **/
-export function getDirectories(): Array<[Descriptor, string]>;
-export type Descriptor = import('./wasi-filesystem-types.js').Descriptor;

package/obj/interfaces/wasi-filesystem-types.d.ts

@@ -1,164 +0,0 @@
-/** @module Interface wasi:filesystem/types@0.2.3 **/
-export function filesystemErrorCode(err: Error): ErrorCode | undefined;
-export type Filesize = bigint;
-export type InputStream = import('./wasi-io-streams.js').InputStream;
-/**
- * # Variants
- * 
- * ## `"access"`
- * 
- * ## `"would-block"`
- * 
- * ## `"already"`
- * 
- * ## `"bad-descriptor"`
- * 
- * ## `"busy"`
- * 
- * ## `"deadlock"`
- * 
- * ## `"quota"`
- * 
- * ## `"exist"`
- * 
- * ## `"file-too-large"`
- * 
- * ## `"illegal-byte-sequence"`
- * 
- * ## `"in-progress"`
- * 
- * ## `"interrupted"`
- * 
- * ## `"invalid"`
- * 
- * ## `"io"`
- * 
- * ## `"is-directory"`
- * 
- * ## `"loop"`
- * 
- * ## `"too-many-links"`
- * 
- * ## `"message-size"`
- * 
- * ## `"name-too-long"`
- * 
- * ## `"no-device"`
- * 
- * ## `"no-entry"`
- * 
- * ## `"no-lock"`
- * 
- * ## `"insufficient-memory"`
- * 
- * ## `"insufficient-space"`
- * 
- * ## `"not-directory"`
- * 
- * ## `"not-empty"`
- * 
- * ## `"not-recoverable"`
- * 
- * ## `"unsupported"`
- * 
- * ## `"no-tty"`
- * 
- * ## `"no-such-device"`
- * 
- * ## `"overflow"`
- * 
- * ## `"not-permitted"`
- * 
- * ## `"pipe"`
- * 
- * ## `"read-only"`
- * 
- * ## `"invalid-seek"`
- * 
- * ## `"text-file-busy"`
- * 
- * ## `"cross-device"`
- */
-export type ErrorCode = 'access' | 'would-block' | 'already' | 'bad-descriptor' | 'busy' | 'deadlock' | 'quota' | 'exist' | 'file-too-large' | 'illegal-byte-sequence' | 'in-progress' | 'interrupted' | 'invalid' | 'io' | 'is-directory' | 'loop' | 'too-many-links' | 'message-size' | 'name-too-long' | 'no-device' | 'no-entry' | 'no-lock' | 'insufficient-memory' | 'insufficient-space' | 'not-directory' | 'not-empty' | 'not-recoverable' | 'unsupported' | 'no-tty' | 'no-such-device' | 'overflow' | 'not-permitted' | 'pipe' | 'read-only' | 'invalid-seek' | 'text-file-busy' | 'cross-device';
-export type OutputStream = import('./wasi-io-streams.js').OutputStream;
-/**
- * # Variants
- * 
- * ## `"unknown"`
- * 
- * ## `"block-device"`
- * 
- * ## `"character-device"`
- * 
- * ## `"directory"`
- * 
- * ## `"fifo"`
- * 
- * ## `"symbolic-link"`
- * 
- * ## `"regular-file"`
- * 
- * ## `"socket"`
- */
-export type DescriptorType = 'unknown' | 'block-device' | 'character-device' | 'directory' | 'fifo' | 'symbolic-link' | 'regular-file' | 'socket';
-export type LinkCount = bigint;
-export type Datetime = import('./wasi-clocks-wall-clock.js').Datetime;
-export interface DescriptorStat {
-  type: DescriptorType,
-  linkCount: LinkCount,
-  size: Filesize,
-  dataAccessTimestamp?: Datetime,
-  dataModificationTimestamp?: Datetime,
-  statusChangeTimestamp?: Datetime,
-}
-export interface PathFlags {
-  symlinkFollow?: boolean,
-}
-export interface OpenFlags {
-  create?: boolean,
-  directory?: boolean,
-  exclusive?: boolean,
-  truncate?: boolean,
-}
-export interface DescriptorFlags {
-  read?: boolean,
-  write?: boolean,
-  fileIntegritySync?: boolean,
-  dataIntegritySync?: boolean,
-  requestedWriteSync?: boolean,
-  mutateDirectory?: boolean,
-}
-export interface MetadataHashValue {
-  lower: bigint,
-  upper: bigint,
-}
-export interface DirectoryEntry {
-  type: DescriptorType,
-  name: string,
-}
-export type Error = import('./wasi-io-streams.js').Error;
-
-export class Descriptor {
-  /**
-   * This type does not have a public constructor.
-   */
-  private constructor();
-  readViaStream(offset: Filesize): InputStream;
-  writeViaStream(offset: Filesize): OutputStream;
-  appendViaStream(): OutputStream;
-  getType(): DescriptorType;
-  readDirectory(): DirectoryEntryStream;
-  stat(): DescriptorStat;
-  statAt(pathFlags: PathFlags, path: string): DescriptorStat;
-  openAt(pathFlags: PathFlags, path: string, openFlags: OpenFlags, flags: DescriptorFlags): Descriptor;
-  metadataHash(): MetadataHashValue;
-  metadataHashAt(pathFlags: PathFlags, path: string): MetadataHashValue;
-}
-
-export class DirectoryEntryStream {
-  /**
-   * This type does not have a public constructor.
-   */
-  private constructor();
-  readDirectoryEntry(): DirectoryEntry | undefined;
-}

package/obj/interfaces/wasi-io-error.d.ts

@@ -1,8 +0,0 @@
-/** @module Interface wasi:io/error@0.2.3 **/
-
-export class Error {
-  /**
-   * This type does not have a public constructor.
-   */
-  private constructor();
-}

package/obj/interfaces/wasi-io-streams.d.ts

@@ -1,30 +0,0 @@
-/** @module Interface wasi:io/streams@0.2.3 **/
-export type Error = import('./wasi-io-error.js').Error;
-export type StreamError = StreamErrorLastOperationFailed | StreamErrorClosed;
-export interface StreamErrorLastOperationFailed {
-  tag: 'last-operation-failed',
-  val: Error,
-}
-export interface StreamErrorClosed {
-  tag: 'closed',
-}
-
-export class InputStream {
-  /**
-   * This type does not have a public constructor.
-   */
-  private constructor();
-  read(len: bigint): Uint8Array;
-  blockingRead(len: bigint): Uint8Array;
-}
-
-export class OutputStream {
-  /**
-   * This type does not have a public constructor.
-   */
-  private constructor();
-  checkWrite(): bigint;
-  write(contents: Uint8Array): void;
-  blockingWriteAndFlush(contents: Uint8Array): void;
-  blockingFlush(): void;
-}

package/obj/interfaces/wasi-random-random.d.ts

@@ -1,2 +0,0 @@
-/** @module Interface wasi:random/random@0.2.3 **/
-export function getRandomBytes(len: bigint): Uint8Array;