@bytecodealliance/preview2-shim 0.17.3 → 0.17.5

package/lib/nodejs/filesystem.js

@@ -220,12 +220,12 @@ class Descriptor {
 
     #getNewTimestamp(newTimestamp, maybeNow) {
         switch (newTimestamp.tag) {
-            case 'no-change':
-                return timestampToMs(maybeNow);
-            case 'now':
-                return Math.floor(Date.now() / 1e3);
-            case 'timestamp':
-                return timestampToMs(newTimestamp.val);
+        case 'no-change':
+            return timestampToMs(maybeNow);
+        case 'now':
+            return Math.floor(Date.now() / 1e3);
+        case 'timestamp':
+            return timestampToMs(newTimestamp.val);
         }
     }
 
@@ -561,8 +561,8 @@ class Descriptor {
                     ? isWindows
                         ? 'access'
                         : isMac
-                          ? 'not-permitted'
-                          : 'is-directory'
+                            ? 'not-permitted'
+                            : 'is-directory'
                     : 'not-directory';
             }
             unlinkSync(fullPath);
@@ -668,8 +668,8 @@ class Descriptor {
                 (descriptor.#hostPreopen.endsWith('/')
                     ? ''
                     : subpath.length > 0
-                      ? '/'
-                      : '') +
+                        ? '/'
+                        : '') +
                 subpath
             );
         }
@@ -752,95 +752,95 @@ export function _addPreopen(virtualPath, hostPreopen) {
 
 function convertFsError(e) {
     switch (e.code) {
-        case 'EACCES':
-            return 'access';
-        case 'EAGAIN':
-        case 'EWOULDBLOCK':
-            return 'would-block';
-        case 'EALREADY':
-            return 'already';
-        case 'EBADF':
-            return 'bad-descriptor';
-        case 'EBUSY':
-            return 'busy';
-        case 'EDEADLK':
-            return 'deadlock';
-        case 'EDQUOT':
-            return 'quota';
-        case 'EEXIST':
-            return 'exist';
-        case 'EFBIG':
-            return 'file-too-large';
-        case 'EILSEQ':
-            return 'illegal-byte-sequence';
-        case 'EINPROGRESS':
-            return 'in-progress';
-        case 'EINTR':
-            return 'interrupted';
-        case 'EINVAL':
-            return 'invalid';
-        case 'EIO':
-            return 'io';
-        case 'EISDIR':
-            return 'is-directory';
-        case 'ELOOP':
-            return 'loop';
-        case 'EMLINK':
-            return 'too-many-links';
-        case 'EMSGSIZE':
-            return 'message-size';
-        case 'ENAMETOOLONG':
-            return 'name-too-long';
-        case 'ENODEV':
-            return 'no-device';
-        case 'ENOENT':
-            return 'no-entry';
-        case 'ENOLCK':
-            return 'no-lock';
-        case 'ENOMEM':
-            return 'insufficient-memory';
-        case 'ENOSPC':
-            return 'insufficient-space';
-        case 'ENOTDIR':
-        case 'ERR_FS_EISDIR':
-            return 'not-directory';
-        case 'ENOTEMPTY':
-            return 'not-empty';
-        case 'ENOTRECOVERABLE':
-            return 'not-recoverable';
-        case 'ENOTSUP':
-            return 'unsupported';
-        case 'ENOTTY':
-            return 'no-tty';
+    case 'EACCES':
+        return 'access';
+    case 'EAGAIN':
+    case 'EWOULDBLOCK':
+        return 'would-block';
+    case 'EALREADY':
+        return 'already';
+    case 'EBADF':
+        return 'bad-descriptor';
+    case 'EBUSY':
+        return 'busy';
+    case 'EDEADLK':
+        return 'deadlock';
+    case 'EDQUOT':
+        return 'quota';
+    case 'EEXIST':
+        return 'exist';
+    case 'EFBIG':
+        return 'file-too-large';
+    case 'EILSEQ':
+        return 'illegal-byte-sequence';
+    case 'EINPROGRESS':
+        return 'in-progress';
+    case 'EINTR':
+        return 'interrupted';
+    case 'EINVAL':
+        return 'invalid';
+    case 'EIO':
+        return 'io';
+    case 'EISDIR':
+        return 'is-directory';
+    case 'ELOOP':
+        return 'loop';
+    case 'EMLINK':
+        return 'too-many-links';
+    case 'EMSGSIZE':
+        return 'message-size';
+    case 'ENAMETOOLONG':
+        return 'name-too-long';
+    case 'ENODEV':
+        return 'no-device';
+    case 'ENOENT':
+        return 'no-entry';
+    case 'ENOLCK':
+        return 'no-lock';
+    case 'ENOMEM':
+        return 'insufficient-memory';
+    case 'ENOSPC':
+        return 'insufficient-space';
+    case 'ENOTDIR':
+    case 'ERR_FS_EISDIR':
+        return 'not-directory';
+    case 'ENOTEMPTY':
+        return 'not-empty';
+    case 'ENOTRECOVERABLE':
+        return 'not-recoverable';
+    case 'ENOTSUP':
+        return 'unsupported';
+    case 'ENOTTY':
+        return 'no-tty';
         // windows gives this error for badly structured `//` reads
         // this seems like a slightly better error than unknown given
         // that it's a common footgun
+    case -4094:
+    case 'ENXIO':
+        return 'no-such-device';
+    case 'EOVERFLOW':
+        return 'overflow';
+    case 'EPERM':
+        return 'not-permitted';
+    case 'EPIPE':
+        return 'pipe';
+    case 'EROFS':
+        return 'read-only';
+    case 'ESPIPE':
+        return 'invalid-seek';
+    case 'ETXTBSY':
+        return 'text-file-busy';
+    case 'EXDEV':
+        return 'cross-device';
+    case 'UNKNOWN':
+        switch (e.errno) {
         case -4094:
-        case 'ENXIO':
             return 'no-such-device';
-        case 'EOVERFLOW':
-            return 'overflow';
-        case 'EPERM':
-            return 'not-permitted';
-        case 'EPIPE':
-            return 'pipe';
-        case 'EROFS':
-            return 'read-only';
-        case 'ESPIPE':
-            return 'invalid-seek';
-        case 'ETXTBSY':
-            return 'text-file-busy';
-        case 'EXDEV':
-            return 'cross-device';
-        case 'UNKNOWN':
-            switch (e.errno) {
-                case -4094:
-                    return 'no-such-device';
-                default:
-                    throw e;
-            }
         default:
             throw e;
+        }
+    default:
+        throw e;
     }
 }
 

package/lib/nodejs/http.js

@@ -9,6 +9,7 @@ import {
     HTTP_SERVER_SET_OUTGOING_RESPONSE,
     HTTP_SERVER_START,
     HTTP_SERVER_STOP,
+    HTTP_SERVER_GET_ADDRESS,
     OUTPUT_STREAM_CREATE,
     OUTPUT_STREAM_DISPOSE,
 } from '../io/calls.js';
@@ -673,12 +674,12 @@ function schemeString(scheme) {
         return 'https:';
     }
     switch (scheme.tag) {
-        case 'HTTP':
-            return 'http:';
-        case 'HTTPS':
-            return 'https:';
-        case 'other':
-            return scheme.val.toLowerCase() + ':';
+    case 'HTTP':
+        return 'http:';
+    case 'HTTPS':
+        return 'https:';
+    case 'other':
+        return scheme.val.toLowerCase() + ':';
     }
 }
 
@@ -776,6 +777,9 @@ export class HTTPServer {
         this.#liveEventLoopInterval = setInterval(() => {}, 10_000);
         ioCall(HTTP_SERVER_START, this.#id, { port, host });
     }
+    address() {
+        return ioCall(HTTP_SERVER_GET_ADDRESS, this.#id);
+    }
     stop() {
         if (this.#stopped) {
             return;

package/package.json

@@ -1,10 +1,36 @@
 {
   "name": "@bytecodealliance/preview2-shim",
-  "version": "0.17.3",
+  "version": "0.17.5",
   "description": "WASI Preview2 shim for JS environments",
   "author": "Guy Bedford, Eduardo Rodrigues<16357187+eduardomourar@users.noreply.github.com>",
+  "contributors": [
+    {
+      "name": "Guy Bedford"
+    },
+    {
+      "name": "Eduardo Rodrigues",
+      "email": "16357187+eduardomourar@users.noreply.github.com"
+    },
+    {
+      "name": "Victor Adossi",
+      "email": "vadossi@cosmonic.com"
+    }
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/bytecodealliance/jco.git"
+  },
+  "license": "(Apache-2.0 WITH LLVM-exception)",
+  "bugs": {
+    "url": "https://github.com/bytecodealliance/jco/issues"
+  },
+  "homepage": "https://github.com/bytecodealliance/jco#readme",
   "type": "module",
   "types": "./types/index.d.ts",
+  "files": [
+    "types",
+    "lib"
+  ],
   "exports": {
     ".": {
       "types": "./types/index.d.ts",
@@ -23,21 +49,16 @@
     }
   },
   "scripts": {
+    "types:check": "tsc --noEmit",
+    "fmt": "npm run lint:fix",
     "lint": "eslint -c ../../eslint.config.mjs ./lib/**/*.js",
     "lint:fix": "npm run lint -- --fix",
     "test": "vitest run -c test/vitest.ts"
   },
-  "files": [
-    "types",
-    "lib"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/bytecodealliance/jco.git"
-  },
-  "license": "(Apache-2.0 WITH LLVM-exception)",
-  "bugs": {
-    "url": "https://github.com/bytecodealliance/jco/issues"
-  },
-  "homepage": "https://github.com/bytecodealliance/jco#readme"
+  "devDependencies": {
+    "@bytecodealliance/componentize-js": "0.19.3",
+    "@bytecodealliance/jco": "1.15.2",
+    "mime": "^4.0.7",
+    "puppeteer": "^24.16.2"
+  }
 }

package/types/instantiation.d.ts

@@ -8,7 +8,7 @@
  * While the feature can be disabled when building with `jco componentize` or `componentize-js`,
  * by default it is enabled, and as such included here (practically, the implementations can be no-ops).
  */
-type WASIImportObject = {
+type _WASIImportObject = {
     'wasi:cli/environment': typeof import('./interfaces/wasi-cli-environment.d.ts');
     'wasi:cli/exit': typeof import('./interfaces/wasi-cli-exit.d.ts');
     'wasi:cli/stderr': typeof import('./interfaces/wasi-cli-stderr.d.ts');
@@ -40,13 +40,30 @@ type WASIImportObject = {
     'wasi:random/insecure-seed': typeof import('./interfaces/wasi-random-insecure-seed.d.ts');
 
     'wasi:clocks/monotonic-clock': typeof import('./interfaces/wasi-clocks-monotonic-clock.d.ts');
-    'wasi:clocks/timezone': typeof import('./interfaces/wasi-clocks-timezone.d.ts');
     'wasi:clocks/wall-clock': typeof import('./interfaces/wasi-clocks-wall-clock.d.ts');
 
     'wasi:http/types': typeof import('./interfaces/wasi-http-types.d.ts');
     'wasi:http/outgoing-handler': typeof import('./interfaces/wasi-http-outgoing-handler.d.ts');
 };
 
+type WASIImportObject = VersionedWASIImportObject<''>;
+
+type VersionedWASIImportObject<V extends string> = {
+    [K in keyof _WASIImportObject as AppendVersion<K, V>]: _WASIImportObject[K];
+};
+
+/** Used to append versions to generated WASI import objects */
+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;
+
 /**
  * (EXPERIMENTAL) A class that holds WASI shims and can be used to configure
  * an instantiation of a WebAssembly component transpiled with jco
@@ -106,7 +123,14 @@ export class WASIShim {
      * functions like `instantiate` that are exposed from a transpiled
      * WebAssembly component.
      *
+     * @param {options} [opt]
      * @returns {object}
      */
-    getImportObject(): WASIImportObject;
+    getImportObject<V extends string = ''>(
+        opts?: GetImportObjectArgs
+    ): VersionedWASIImportObject<V>;
+}
+
+interface GetImportObjectArgs {
+    asVersion?: string;
 }