@bytecodealliance/preview2-shim 0.20.1 → 0.21.0

package/dist/nodejs/filesystem.d.ts

@@ -1,5 +1,5 @@
 import { types as TypesNamespace, preopens as PreopensNamespace } from "../../types/filesystem.js";
-import type { Descriptor as IDescriptor, DirectoryEntryStream as IDirectoryEntryStream } from "../../types/interfaces/wasi-filesystem-types.js";
+import type { Descriptor as IDescriptor, DescriptorType, DirectoryEntryStream as IDirectoryEntryStream } from "../../types/interfaces/wasi-filesystem-types.js";
 declare const symbolDispose: symbol;
 /**
  * @implements {DescriptorProps}
@@ -9,14 +9,14 @@ declare class Descriptor implements IDescriptor {
     [symbolDispose]: () => void;
     private _id;
     static _createPreopen(hostPreopen: any): Descriptor;
-    static _create(fd: any, mode: any, fullPath: any): Descriptor;
+    static _create(fileResourceId: any, mode: any, fullPath: any): Descriptor;
     readViaStream(offset: any): any;
     writeViaStream(offset: any): any;
     appendViaStream(): any;
     advise(_offset: any, _length: any, _advice: any): void;
     syncData(): void;
     getFlags(): any;
-    getType(): TypesNamespace.DescriptorType;
+    getType(): any;
     setSize(size: any): void;
     setTimes(dataAccessTimestamp: any, dataModificationTimestamp: any): void;
     read(length: any, offset: any): [Uint8Array, boolean];
@@ -25,7 +25,7 @@ declare class Descriptor implements IDescriptor {
     sync(): void;
     createDirectoryAt(path: any): void;
     stat(): {
-        type: TypesNamespace.DescriptorType;
+        type: any;
         linkCount: any;
         size: any;
         dataAccessTimestamp: {
@@ -42,7 +42,7 @@ declare class Descriptor implements IDescriptor {
         };
     };
     statAt(pathFlags: any, path: any): {
-        type: TypesNamespace.DescriptorType;
+        type: DescriptorType;
         linkCount: any;
         size: any;
         dataAccessTimestamp: {
@@ -67,10 +67,7 @@ declare class Descriptor implements IDescriptor {
     symlinkAt(target: any, path: any): void;
     unlinkFileAt(path: any): void;
     isSameObject(other: any): boolean;
-    metadataHash(): {
-        upper: bigint;
-        lower: bigint;
-    };
+    metadataHash(): any;
     metadataHashAt(pathFlags: any, path: any): {
         upper: bigint;
         lower: bigint;

package/dist/nodejs/filesystem.js

@@ -1,6 +1,6 @@
 import { earlyDispose, inputStreamCreate, ioCall, outputStreamCreate, registerDispose, } from "../io/worker-io.js";
-import { FILE, INPUT_STREAM_CREATE, OUTPUT_STREAM_CREATE } from "../io/calls.js";
-import { closeSync, constants, fdatasyncSync, fstatSync, fsyncSync, ftruncateSync, futimesSync, linkSync, lstatSync, lutimesSync, mkdirSync, opendirSync, openSync, readlinkSync, readSync, renameSync, rmdirSync, statSync, symlinkSync, unlinkSync, utimesSync, writeSync, } from "node:fs";
+import { FILE, FILESYSTEM_DESCRIPTOR_CLOSE, FILESYSTEM_DESCRIPTOR_GET_TYPE, FILESYSTEM_DESCRIPTOR_METADATA_HASH, FILESYSTEM_DESCRIPTOR_OPEN, FILESYSTEM_DESCRIPTOR_READ, FILESYSTEM_DESCRIPTOR_SET_SIZE, FILESYSTEM_DESCRIPTOR_SET_TIMES, FILESYSTEM_DESCRIPTOR_STAT, FILESYSTEM_DESCRIPTOR_SYNC, FILESYSTEM_DESCRIPTOR_SYNC_DATA, FILESYSTEM_DESCRIPTOR_WRITE, INPUT_STREAM_CREATE, OUTPUT_STREAM_CREATE, } from "../io/calls.js";
+import { constants, linkSync, lstatSync, lutimesSync, mkdirSync, opendirSync, readlinkSync, renameSync, rmdirSync, statSync, symlinkSync, unlinkSync, utimesSync, } from "node:fs";
 import { platform } from "node:process";
 const symbolDispose = Symbol.dispose || Symbol.for("dispose");
 const isWindows = platform === "win32";
@@ -35,6 +35,9 @@ function lookupType(obj) {
     }
     return "unknown";
 }
+function closeFileResource(id) {
+    ioCall(FILESYSTEM_DESCRIPTOR_CLOSE, id);
+}
 // Note: This should implement per-segment semantics of openAt, but we cannot
 //       currently due to the lack of support for openat() in Node.js.
 //       Tracking issue: https://github.com/libuv/libuv/issues/4167
@@ -43,7 +46,7 @@ function lookupType(obj) {
  */
 class Descriptor {
     #hostPreopen;
-    #fd;
+    #fileResourceId;
     #finalizer;
     #mode;
     #fullPath;
@@ -62,10 +65,10 @@ class Descriptor {
         }
         return descriptor;
     }
-    static _create(fd, mode, fullPath) {
+    static _create(fileResourceId, mode, fullPath) {
         const descriptor = new Descriptor();
-        descriptor.#fd = fd;
-        descriptor.#finalizer = registerDispose(descriptor, null, fd, closeSync);
+        descriptor.#fileResourceId = fileResourceId;
+        descriptor.#finalizer = registerDispose(descriptor, null, fileResourceId, closeFileResource);
         descriptor.#mode = mode;
         descriptor.#fullPath = fullPath;
         return descriptor;
@@ -81,7 +84,7 @@ class Descriptor {
             throw "is-directory";
         }
         return inputStreamCreate(FILE, ioCall(INPUT_STREAM_CREATE | FILE, null, {
-            fd: this.#fd,
+            descriptorId: this.#fileResourceId,
             offset,
         }));
     }
@@ -89,7 +92,10 @@ class Descriptor {
         if (this.#hostPreopen) {
             throw "is-directory";
         }
-        return outputStreamCreate(FILE, ioCall(OUTPUT_STREAM_CREATE | FILE, null, { fd: this.#fd, offset }));
+        return outputStreamCreate(FILE, ioCall(OUTPUT_STREAM_CREATE | FILE, null, {
+            descriptorId: this.#fileResourceId,
+            offset,
+        }));
     }
     appendViaStream() {
         return this.writeViaStream(this.stat().size);
@@ -104,7 +110,7 @@ class Descriptor {
             throw "invalid";
         }
         try {
-            fdatasyncSync(this.#fd);
+            ioCall(FILESYSTEM_DESCRIPTOR_SYNC_DATA, this.#fileResourceId);
         }
         catch (e) {
             if (e.code === "EPERM") {
@@ -120,15 +126,14 @@ class Descriptor {
         if (this.#hostPreopen) {
             return "directory";
         }
-        const stats = fstatSync(this.#fd);
-        return lookupType(stats);
+        return ioCall(FILESYSTEM_DESCRIPTOR_GET_TYPE, this.#fileResourceId);
     }
     setSize(size) {
         if (this.#hostPreopen) {
             throw "is-directory";
         }
         try {
-            ftruncateSync(this.#fd, Number(size));
+            ioCall(FILESYSTEM_DESCRIPTOR_SET_SIZE, this.#fileResourceId, Number(size));
         }
         catch (e) {
             if (isWindows && e.code === "EPERM") {
@@ -149,7 +154,7 @@ class Descriptor {
         const atime = this.#getNewTimestamp(dataAccessTimestamp, dataAccessTimestamp.tag === "no-change" && stats.dataAccessTimestamp);
         const mtime = this.#getNewTimestamp(dataModificationTimestamp, dataModificationTimestamp.tag === "no-change" && stats.dataModificationTimestamp);
         try {
-            futimesSync(this.#fd, atime, mtime);
+            ioCall(FILESYSTEM_DESCRIPTOR_SET_TIMES, this.#fileResourceId, { atime, mtime });
         }
         catch (e) {
             throw convertFsError(e);
@@ -169,16 +174,20 @@ class Descriptor {
         if (!this.#fullPath) {
             throw "bad-descriptor";
         }
-        const buf = new Uint8Array(Number(length));
-        const bytesRead = readSync(this.#fd, buf, 0, Number(length), Number(offset));
-        const out = new Uint8Array(buf.buffer, 0, bytesRead);
-        return [out, bytesRead === 0];
+        const { bytes, eof } = ioCall(FILESYSTEM_DESCRIPTOR_READ, this.#fileResourceId, {
+            length: Number(length),
+            offset: Number(offset),
+        });
+        return [bytes, eof];
     }
     write(buffer, offset) {
         if (!this.#fullPath) {
             throw "bad-descriptor";
         }
-        return BigInt(writeSync(this.#fd, buffer, 0, buffer.byteLength, Number(offset)));
+        return BigInt(ioCall(FILESYSTEM_DESCRIPTOR_WRITE, this.#fileResourceId, {
+            buffer,
+            offset: Number(offset),
+        }));
     }
     readDirectory() {
         if (!this.#fullPath) {
@@ -197,7 +206,7 @@ class Descriptor {
             throw "invalid";
         }
         try {
-            fsyncSync(this.#fd);
+            ioCall(FILESYSTEM_DESCRIPTOR_SYNC, this.#fileResourceId);
         }
         catch (e) {
             if (e.code === "EPERM") {
@@ -221,12 +230,12 @@ class Descriptor {
         }
         let stats;
         try {
-            stats = fstatSync(this.#fd, { bigint: true });
+            stats = ioCall(FILESYSTEM_DESCRIPTOR_STAT, this.#fileResourceId);
         }
         catch (e) {
             throw convertFsError(e);
         }
-        const type = lookupType(stats);
+        const type = stats.type;
         return {
             type,
             linkCount: stats.nlink,
@@ -361,9 +370,12 @@ class Descriptor {
             }
         }
         try {
-            const fd = openSync(fullPath.endsWith("/") ? fullPath.slice(0, -1) : fullPath, fsOpenFlags);
-            const descriptor = descriptorCreate(fd, descriptorFlags, fullPath);
-            if (fullPath.endsWith("/") && descriptor.getType() !== "directory") {
+            const { id, type } = ioCall(FILESYSTEM_DESCRIPTOR_OPEN, null, {
+                path: fullPath.endsWith("/") ? fullPath.slice(0, -1) : fullPath,
+                flags: fsOpenFlags,
+            });
+            const descriptor = descriptorCreate(id, descriptorFlags, fullPath);
+            if (fullPath.endsWith("/") && type !== "directory") {
                 descriptor[symbolDispose]();
                 throw "not-directory";
             }
@@ -475,8 +487,7 @@ class Descriptor {
             return { upper: 0n, lower: BigInt(this._id) };
         }
         try {
-            const stats = fstatSync(this.#fd, { bigint: true });
-            return { upper: stats.mtimeNs, lower: stats.ino };
+            return ioCall(FILESYSTEM_DESCRIPTOR_METADATA_HASH, this.#fileResourceId);
         }
         catch (e) {
             throw convertFsError(e);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytecodealliance/preview2-shim",
-  "version": "0.20.1",
+  "version": "0.21.0",
   "description": "WASI Preview2 shim for JS environments",
   "homepage": "https://github.com/bytecodealliance/jco#readme",
   "bugs": {
@@ -62,9 +62,9 @@
     "@types/node": "^24.12.4",
     "mime": "^4.0.7",
     "puppeteer": "^25.1.0",
-    "rolldown": "^1.2.0",
-    "typescript": "^6.0.3",
-    "vitest": "^4.0.8"
+    "rolldown": "^1.2.4",
+    "typescript": "7.0.2",
+    "vitest": "^4.1.10"
   },
   "scripts": {
     "build": "tsc --project tsconfig.build.json && node scripts/build-worker.mjs",
@@ -74,6 +74,7 @@
     "fmt:check": "oxfmt --check",
     "lint": "oxlint",
     "lint:fix": "oxlint --fix",
-    "test": "vitest run -c test/vitest.ts"
+    "test": "vitest run -c test/vitest.ts",
+    "test:deno": "deno test --no-check -A test/deno/*.mjs"
   }
 }