@bytecodealliance/preview2-shim 0.18.1 → 0.20.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytecodealliance/preview2-shim",
-  "version": "0.18.1",
+  "version": "0.20.0",
   "description": "WASI Preview2 shim for JS environments",
   "homepage": "https://github.com/bytecodealliance/jco#readme",
   "bugs": {
@@ -27,34 +27,47 @@
   },
   "files": [
     "types",
-    "lib"
+    "dist"
   ],
   "type": "module",
-  "types": "./types/index.d.ts",
   "exports": {
     ".": {
-      "types": "./types/index.d.ts",
-      "node": "./lib/nodejs/index.js",
-      "default": "./lib/browser/index.js"
+      "types": "./dist/browser/index.d.ts",
+      "node": {
+        "types": "./dist/nodejs/index.d.ts",
+        "default": "./dist/nodejs/index.js"
+      },
+      "default": "./dist/browser/index.js"
     },
     "./*": {
-      "types": "./types/*.d.ts",
-      "node": "./lib/nodejs/*.js",
-      "default": "./lib/browser/*.js"
+      "types": "./dist/browser/*.d.ts",
+      "node": {
+        "types": "./dist/nodejs/*.d.ts",
+        "default": "./dist/nodejs/*.js"
+      },
+      "default": "./dist/browser/*.js"
     },
     "./instantiation": {
-      "types": "./types/instantiation.d.ts",
-      "node": "./lib/common/instantiation.js",
-      "default": "./lib/common/instantiation.js"
+      "types": "./dist/common/*.d.ts",
+      "node": "./dist/common/instantiation.js",
+      "default": "./dist/common/instantiation.js"
+    },
+    "./interfaces/*": {
+      "types": "./types/interfaces/*.d.ts"
     }
   },
   "devDependencies": {
-    "@bytecodealliance/componentize-js": "0.21.0",
-    "@bytecodealliance/jco": "1.15.2",
+    "@bytecodealliance/componentize-js": "0.22.0",
+    "@bytecodealliance/jco": "1.25.2",
+    "@types/node": "^24.12.4",
     "mime": "^4.0.7",
-    "puppeteer": "^25.1.0"
+    "puppeteer": "^25.1.0",
+    "typescript": "^6.0.3",
+    "vitest": "^4.0.8"
   },
   "scripts": {
+    "build": "tsc --project tsconfig.build.json",
+    "build:watch": "tsc --watch",
     "types:check": "tsc --noEmit",
     "fmt": "oxfmt",
     "fmt:check": "oxfmt --check",

package/types/instantiation.d.ts

@@ -56,13 +56,13 @@ type VersionedWASIImportObject<V extends string> = {
 type AppendVersion<
     Key extends string | number | symbol,
     Version extends string,
-> = Version extends `${infer V}`
-    ? Key extends `${infer K}`
-        ? Key extends ''
-            ? `${K}`
-            : `${K}@${V}`
-        : never
-    : never;
+> = Version extends ''
+    ? Key
+    : Version extends `${infer V}`
+      ? Key extends `${infer K}`
+          ? `${K}@${V}`
+          : never
+      : never;
 
 /**
  * Sandbox configuration options for WASIShim

package/lib/browser/cli.js

@@ -1,135 +0,0 @@
-import { streams } from "./io.js";
-const { InputStream, OutputStream } = streams;
-
-export { _setEnv, _setArgs, environment } from "./environment.js";
-export { _setCwd } from "./config.js";
-
-const symbolDispose = Symbol.dispose ?? Symbol.for("dispose");
-
-class ComponentExit extends Error {
-  constructor(code) {
-    super(`Component exited ${code === 0 ? "successfully" : "with error"}`);
-    this.exitError = true;
-    this.code = code;
-  }
-}
-
-export const exit = {
-  exit(status) {
-    throw new ComponentExit(status.tag === "err" ? 1 : 0);
-  },
-  exitWithCode(code) {
-    throw new ComponentExit(code);
-  },
-};
-
-/**
- * @param {import('../common/io.js').InputStreamHandler} handler
- */
-export function _setStdin(handler) {
-  stdinStream.handler = handler;
-}
-/**
- * @param {import('../common/io.js').OutputStreamHandler} handler
- */
-export function _setStderr(handler) {
-  stderrStream.handler = handler;
-}
-/**
- * @param {import('../common/io.js').OutputStreamHandler} handler
- */
-export function _setStdout(handler) {
-  stdoutStream.handler = handler;
-}
-
-const stdinStream = new InputStream({
-  blockingRead(_len) {
-    // TODO
-  },
-  subscribe() {
-    // TODO
-  },
-  [symbolDispose]() {
-    // TODO
-  },
-});
-let textDecoder = new TextDecoder();
-const stdoutStream = new OutputStream({
-  write(contents) {
-    if (contents[contents.length - 1] == 10) {
-      // console.log already appends a new line
-      contents = contents.subarray(0, contents.length - 1);
-    }
-    console.log(textDecoder.decode(contents));
-  },
-  blockingFlush() {},
-  [symbolDispose]() {},
-});
-const stderrStream = new OutputStream({
-  write(contents) {
-    if (contents[contents.length - 1] == 10) {
-      // console.error already appends a new line
-      contents = contents.subarray(0, contents.length - 1);
-    }
-    console.error(textDecoder.decode(contents));
-  },
-  blockingFlush() {},
-  [symbolDispose]() {},
-});
-
-export const stdin = {
-  InputStream,
-  getStdin() {
-    return stdinStream;
-  },
-};
-
-export const stdout = {
-  OutputStream,
-  getStdout() {
-    return stdoutStream;
-  },
-};
-
-export const stderr = {
-  OutputStream,
-  getStderr() {
-    return stderrStream;
-  },
-};
-
-class TerminalInput {}
-class TerminalOutput {}
-
-const terminalStdoutInstance = new TerminalOutput();
-const terminalStderrInstance = new TerminalOutput();
-const terminalStdinInstance = new TerminalInput();
-
-export const terminalInput = {
-  TerminalInput,
-};
-
-export const terminalOutput = {
-  TerminalOutput,
-};
-
-export const terminalStderr = {
-  TerminalOutput,
-  getTerminalStderr() {
-    return terminalStderrInstance;
-  },
-};
-
-export const terminalStdin = {
-  TerminalInput,
-  getTerminalStdin() {
-    return terminalStdinInstance;
-  },
-};
-
-export const terminalStdout = {
-  TerminalOutput,
-  getTerminalStdout() {
-    return terminalStdoutInstance;
-  },
-};

package/lib/browser/clocks.js

@@ -1,39 +0,0 @@
-import { poll } from "./io.js";
-const { Pollable } = poll;
-
-export const monotonicClock = {
-  resolution() {
-    // usually we dont get sub-millisecond accuracy in the browser
-    // Note: is there a better way to determine this?
-    return 1e6;
-  },
-  now() {
-    // performance.now() is in milliseconds, but we want nanoseconds
-    return BigInt(Math.floor(performance.now() * 1e6));
-  },
-  subscribeInstant(instant) {
-    instant = BigInt(instant);
-    const now = monotonicClock.now();
-    if (instant <= now) {
-      return new Pollable(new Promise((resolve) => setTimeout(resolve, 0)));
-    }
-    return monotonicClock.subscribeDuration(instant - now);
-  },
-  subscribeDuration(duration) {
-    duration = BigInt(duration);
-    const ms = duration <= 0n ? 0 : Number(duration / 1_000_000n);
-    return new Pollable(new Promise((resolve) => setTimeout(resolve, ms)));
-  },
-};
-
-export const wallClock = {
-  now() {
-    let now = Date.now(); // in milliseconds
-    const seconds = BigInt(Math.floor(now / 1e3));
-    const nanoseconds = (now % 1e3) * 1e6;
-    return { seconds, nanoseconds };
-  },
-  resolution() {
-    return { seconds: 0n, nanoseconds: 1e6 };
-  },
-};

package/lib/browser/environment.js

@@ -1,29 +0,0 @@
-import { _setCwd as fsSetCwd } from "./config.js";
-
-let _env = [],
-  _args = [],
-  _cwd = "/";
-
-export function _setEnv(envObj) {
-  _env = Object.entries(envObj);
-}
-
-export function _setArgs(args) {
-  _args = args;
-}
-
-export function _setCwd(cwd) {
-  fsSetCwd((_cwd = cwd));
-}
-
-export const environment = {
-  getEnvironment() {
-    return _env;
-  },
-  getArguments() {
-    return _args;
-  },
-  initialCwd() {
-    return _cwd;
-  },
-};