@tybys/wasm-util 0.10.0 → 0.10.2

package/lib/mjs/wasi/path.mjs

@@ -1,6 +1,141 @@
 import { validateString } from "./util.mjs";
 const CHAR_DOT = 46; /* . */
 const CHAR_FORWARD_SLASH = 47; /* / */
+const CHAR_BACKWARD_SLASH = 92; /* \ */
+const CHAR_COLON = 58; /* : */
+const CHAR_UPPERCASE_A = 65; /* A */
+const CHAR_UPPERCASE_Z = 90; /* Z */
+const CHAR_LOWERCASE_A = 97; /* a */
+const CHAR_LOWERCASE_Z = 122; /* z */
+function isPathSeparatorWin(code) {
+    return code === CHAR_FORWARD_SLASH || code === CHAR_BACKWARD_SLASH;
+}
+function isWindowsDeviceRoot(code) {
+    return (code >= CHAR_UPPERCASE_A && code <= CHAR_UPPERCASE_Z) ||
+        (code >= CHAR_LOWERCASE_A && code <= CHAR_LOWERCASE_Z);
+}
+const _isWin32 = typeof process !== 'undefined' && process.platform === 'win32';
+/**
+ * Windows variant of `resolve()`. Mirrors Node's `path.win32.resolve`
+ * semantics enough for the WASI shim's needs (drive-letter absolutes
+ * + UNC paths + per-drive cwd lookups via `process.env`/`process.cwd`).
+ *
+ * Why this is needed: on Windows, `FileDescriptor.realPath` is the
+ * host realpath returned by `fs.realpathSync(realPath, 'utf8')` — the
+ * backslash form `D:\…`. The POSIX-only `resolveImpl` below only
+ * treats `/` as a separator, reads `D` as non-`/`, decides realPath
+ * is "relative", and produces a garbage joined path. Downstream
+ * `fs.openSync(garbage)` then returns `EINVAL` and the WASI caller
+ * sees a permanent failure. This function gives us the correct
+ * Windows-style resolution without taking a Node-only `path` import
+ * (which would break browser bundles of this package).
+ *
+ * Cribbed from Node's `lib/path.js` `win32.resolve()` (MIT-licensed),
+ * trimmed to what WASI realpath resolution actually exercises.
+ */
+function resolveWin32(args) {
+    let resolvedDevice = '';
+    let resolvedTail = '';
+    let resolvedAbsolute = false;
+    for (let i = args.length - 1; i >= -1; i--) {
+        let path;
+        if (i >= 0) {
+            path = args[i];
+            validateString(path, 'path');
+            if (path.length === 0)
+                continue;
+        }
+        else if (resolvedDevice.length === 0) {
+            path = (typeof process !== 'undefined' && typeof process.cwd === 'function')
+                ? process.cwd()
+                : '';
+        }
+        else {
+            // Look up per-drive cwd via the `=X:` env var convention; fall back
+            // to the global cwd if absent.
+            const envKey = `=${resolvedDevice}`;
+            const env = (typeof process !== 'undefined') ? process.env : undefined;
+            path = (env && typeof env[envKey] === 'string')
+                ? env[envKey]
+                : (typeof process !== 'undefined' && typeof process.cwd === 'function')
+                    ? process.cwd()
+                    : '';
+            if (path === undefined ||
+                (path.slice(0, 2).toLowerCase() !== resolvedDevice.toLowerCase() &&
+                    path.charCodeAt(2) === CHAR_BACKWARD_SLASH)) {
+                path = `${resolvedDevice}\\`;
+            }
+        }
+        const len = path.length;
+        let rootEnd = 0;
+        let device = '';
+        let isAbsolute = false;
+        const code = path.charCodeAt(0);
+        if (len === 1) {
+            if (isPathSeparatorWin(code)) {
+                rootEnd = 1;
+                isAbsolute = true;
+            }
+        }
+        else if (isPathSeparatorWin(code)) {
+            isAbsolute = true;
+            if (isPathSeparatorWin(path.charCodeAt(1))) {
+                // UNC path: `\\server\share\…`
+                let j = 2;
+                let last = j;
+                while (j < len && !isPathSeparatorWin(path.charCodeAt(j)))
+                    j++;
+                if (j < len && j !== last) {
+                    const firstPart = path.slice(last, j);
+                    last = j;
+                    while (j < len && isPathSeparatorWin(path.charCodeAt(j)))
+                        j++;
+                    if (j < len && j !== last) {
+                        last = j;
+                        while (j < len && !isPathSeparatorWin(path.charCodeAt(j)))
+                            j++;
+                        if (j === len || j !== last) {
+                            device = `\\\\${firstPart}\\${path.slice(last, j)}`;
+                            rootEnd = j;
+                        }
+                    }
+                }
+            }
+            else {
+                rootEnd = 1;
+            }
+        }
+        else if (isWindowsDeviceRoot(code) && path.charCodeAt(1) === CHAR_COLON) {
+            device = path.slice(0, 2);
+            rootEnd = 2;
+            if (len > 2 && isPathSeparatorWin(path.charCodeAt(2))) {
+                isAbsolute = true;
+                rootEnd = 3;
+            }
+        }
+        if (device.length > 0) {
+            if (resolvedDevice.length > 0) {
+                if (device.toLowerCase() !== resolvedDevice.toLowerCase())
+                    continue;
+            }
+            else {
+                resolvedDevice = device;
+            }
+        }
+        if (resolvedAbsolute) {
+            if (resolvedDevice.length > 0)
+                break;
+        }
+        else {
+            resolvedTail = `${path.slice(rootEnd)}\\${resolvedTail}`;
+            resolvedAbsolute = isAbsolute;
+            if (isAbsolute && resolvedDevice.length > 0)
+                break;
+        }
+    }
+    resolvedTail = normalizeString(resolvedTail, !resolvedAbsolute, '\\', isPathSeparatorWin);
+    return resolvedDevice + (resolvedAbsolute ? '\\' : '') + resolvedTail || '.';
+}
 function isPosixPathSeparator(code) {
     return code === CHAR_FORWARD_SLASH;
 }
@@ -78,6 +213,13 @@ function normalizeString(path, allowAboveRoot, separator, isPathSeparator) {
     return res;
 }
 export function resolve(...args) {
+    // On Windows, host paths are `D:\…` style. The POSIX-only resolver
+    // below treats `D` as a non-`/` character and produces garbage; route
+    // to the Windows-aware variant. POSIX hosts (Linux/macOS/browser)
+    // run the original code path unchanged — `_isWin32` is constant-folded
+    // away on those targets.
+    if (_isWin32)
+        return resolveWin32(args);
     let resolvedPath = '';
     let resolvedAbsolute = false;
     for (let i = args.length - 1; i >= -1 && !resolvedAbsolute; i--) {

package/lib/mjs/wasi/preview1.mjs

@@ -1,5 +1,25 @@
 import { _WebAssembly } from "../webassembly.mjs";
 import { resolve } from "./path.mjs";
+// Linux fcntl flag bits ↔ Windows libuv flag bits. `pathOpen()` builds
+// `flagsRes` using Linux constants (O_CREAT=0x40, O_EXCL=0x80,
+// O_APPEND=0x400). Windows libuv expects different bits (O_CREAT=0x100,
+// O_EXCL=0x400, O_APPEND=0x8). Without translation,
+// `fs.openSync(path, 0x241 /* L:WRONLY|CREAT|TRUNC */)` is rejected
+// with EINVAL because Linux's 0x40 happens to mean O_TEMPORARY on
+// Windows — and O_TEMPORARY without O_CREAT is invalid.
+const _isWin32Flags = typeof process !== 'undefined' && process.platform === 'win32';
+function _toWinOpenFlags(f) {
+    let r = f & 3; // RDONLY/WRONLY/RDWR — same on both
+    if ((f & 0x40) !== 0)
+        r |= 0x100; // O_CREAT:  Linux 0x40  -> Windows 0x100
+    if ((f & 0x80) !== 0)
+        r |= 0x400; // O_EXCL:   Linux 0x80  -> Windows 0x400
+    if ((f & 0x200) !== 0)
+        r |= 0x200; // O_TRUNC:  same value on both
+    if ((f & 0x400) !== 0)
+        r |= 0x8; // O_APPEND: Linux 0x400 -> Windows 0x8
+    return r;
+}
 import { WasiErrno, WasiRights, FileControlFlag, WasiFileControlFlag, WasiFdFlag, WasiFileType, WasiClockid, WasiFstFlag, WasiEventType, WasiSubclockflags } from "./types.mjs";
 import { concatBuffer, toFileStat, AsyncTable, SyncTable } from "./fd.mjs";
 import { WasiError } from "./error.mjs";
@@ -65,26 +85,43 @@ function defineName(name, f) {
     Object.defineProperty(f, 'name', { value: name });
     return f;
 }
+function tryCall(f, wasi, args) {
+    let r;
+    try {
+        r = f.apply(wasi, args);
+    }
+    catch (err) {
+        return handleError(err);
+    }
+    if (isPromiseLike(r)) {
+        return r.then(_ => _, handleError);
+    }
+    return r;
+}
 function syscallWrap(self, name, f) {
-    return defineName(name, function () {
-        if (process.env.NODE_DEBUG_NATIVE === 'wasi') {
+    let debug = false;
+    const NODE_DEBUG_NATIVE = (() => {
+        try {
+            return process.env.NODE_DEBUG_NATIVE;
+        }
+        catch (_) {
+            return undefined;
+        }
+    })();
+    if (typeof NODE_DEBUG_NATIVE === 'string' && NODE_DEBUG_NATIVE.split(',').includes('wasi')) {
+        debug = true;
+    }
+    return debug
+        ? defineName(name, function () {
             const args = Array.prototype.slice.call(arguments);
             let debugArgs = [`${name}(${Array.from({ length: arguments.length }).map(() => '%d').join(', ')})`];
             debugArgs = debugArgs.concat(args);
             console.debug.apply(console, debugArgs);
-        }
-        let r;
-        try {
-            r = f.apply(self, arguments);
-        }
-        catch (err) {
-            return handleError(err);
-        }
-        if (isPromiseLike(r)) {
-            return r.then(_ => _, handleError);
-        }
-        return r;
-    });
+            return tryCall(f, self, args);
+        })
+        : defineName(name, function () {
+            return tryCall(f, self, arguments);
+        });
 }
 function resolvePathSync(fs, fileDescriptor, path, flags) {
     let resolvedPath = resolve(fileDescriptor.realPath, path);
@@ -1246,7 +1283,7 @@ export class WASI {
             const pathString = decoder.decode(unsharedSlice(HEAPU8, path, path + path_len));
             const fs = getFs(this);
             const resolved_path = resolvePathSync(fs, fileDescriptor, pathString, dirflags);
-            const r = fs.openSync(resolved_path, flagsRes, 0o666);
+            const r = fs.openSync(resolved_path, _isWin32Flags ? _toWinOpenFlags(flagsRes) : flagsRes, 0o666);
             const filetype = wasi.fds.getFileTypeByFd(r);
             if ((filetype !== WasiFileType.DIRECTORY) &&
                 ((o_flags & WasiFileControlFlag.O_DIRECTORY) !== 0 ||
@@ -1282,7 +1319,7 @@ export class WASI {
             const pathString = decoder.decode(unsharedSlice(HEAPU8, path, path + path_len));
             const fs = getFs(this);
             const resolved_path = await resolvePathAsync(fs, fileDescriptor, pathString, dirflags);
-            const r = await fs.promises.open(resolved_path, flagsRes, 0o666);
+            const r = await fs.promises.open(resolved_path, _isWin32Flags ? _toWinOpenFlags(flagsRes) : flagsRes, 0o666);
             const filetype = await wasi.fds.getFileTypeByFd(r);
             if ((o_flags & WasiFileControlFlag.O_DIRECTORY) !== 0 && filetype !== WasiFileType.DIRECTORY) {
                 return WasiErrno.ENOTDIR;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tybys/wasm-util",
-  "version": "0.10.0",
+  "version": "0.10.2",
   "description": "WASI polyfill for browser and some wasm util",
   "main": "./lib/cjs/index.js",
   "module": "./dist/wasm-util.esm-bundler.js",