@openclaw/fs-safe 0.5.1 → 0.5.3

package/dist/file-store.js

@@ -1,49 +1,52 @@
-import { randomUUID } from "node:crypto";
 import syncFs from "node:fs";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { readFileDescriptorBoundedSync } from "./bounded-read.js";
-import { createSyncDirectoryGuard } from "./directory-guard.js";
 import { FsSafeError } from "./errors.js";
-import { pruneExpiredStoreEntries, } from "./file-store-prune.js";
-import { assertSyncDirectoryGuard, ensureParentInRoot, ensureParentSync, openWritableStoreRoot, writeStreamToTempSource, } from "./file-store-boundary.js";
-import { readFileStoreCopySource } from "./file-store-source.js";
+import { pruneExpiredStoreEntries } from "./file-store-prune.js";
+import { ensureParentInRoot, openWritableStoreRoot, writeStreamToTempSource, } from "./file-store-boundary.js";
+import { writeFileSyncAtomic } from "./file-store-sync-write.js";
 import { createJsonStore } from "./json-document-store.js";
 import { stringifyJsonDocument } from "./json-stringify.js";
-import { isPathInside, resolveSafeRelativePath } from "./path.js";
+import { isNotFoundPathError, resolveSafeRelativePath } from "./path.js";
+import { throwFsSafeReadError } from "./read-error.js";
 import { root } from "./root.js";
 import { DEFAULT_ROOT_MAX_BYTES } from "./root-impl.js";
+import { readRegularFile } from "./regular-file.js";
 import { matchRootFileOpenFailure, openRootFileSync } from "./root-file.js";
+import { assertNoDriveRelativePathSegments } from "./safe-path-segment.js";
 import { writeSecretFileAtomic } from "./secret-file.js";
-import { getFsSafeTestHooks } from "./test-hooks.js";
 function assertRelativePath(relativePath) {
     const raw = relativePath.trim();
-    if (!raw) {
-        throw new FsSafeError("invalid-path", "relative path must be non-empty");
+    if (!raw || raw !== relativePath) {
+        throw new FsSafeError("invalid-path", "store key must be non-empty and unpadded");
     }
-    return raw.replaceAll("\\", "/");
+    assertNoDriveRelativePathSegments(raw.replaceAll("\\", "/"), "store key");
+    const segments = raw.split("/");
+    const delegated = segments.includes("..") || raw.includes("\\") ||
+        path.posix.isAbsolute(raw) || path.win32.isAbsolute(raw) || raw.startsWith("//");
+    if (delegated)
+        return raw;
+    if (segments.every((segment) => segment.length === 0 || segment === ".") ||
+        segments.some((segment) => segment.length === 0 || segment === ".") ||
+        raw.normalize("NFC") !== raw ||
+        segments.some((segment) => /[ .]$/u.test(segment))) {
+        throw new FsSafeError("invalid-path", "store key must use one canonical relative spelling");
+    }
+    return raw;
 }
 function resolveStorePath(rootDir, relativePath) {
     return resolveSafeRelativePath(rootDir, assertRelativePath(relativePath));
 }
-function assertStoreFilePath(rootDir, filePath) {
-    if (!isPathInside(rootDir, filePath)) {
-        throw new FsSafeError("outside-workspace", "file path escapes store root");
-    }
-}
 function assertMaxBytes(size, maxBytes) {
     if (maxBytes !== undefined && size > maxBytes) {
         throw new FsSafeError("too-large", `file exceeds maximum size of ${maxBytes} bytes`);
     }
 }
 function isNotFound(error) {
-    if (!error) {
-        return false;
-    }
     return error instanceof FsSafeError
         ? error.code === "not-found"
-        : error.code === "ENOENT" ||
-            error.code === "ENOTDIR";
+        : isNotFoundPathError(error);
 }
 function handleSyncStoreReadOpenFailure(opened) {
     return matchRootFileOpenFailure(opened, {
@@ -56,12 +59,16 @@ function handleSyncStoreReadOpenFailure(opened) {
             });
         },
         validation: (failure) => {
+            if (failure.error instanceof FsSafeError) {
+                throw failure.error;
+            }
             // Validation failures mean the path existed but violated store policy
             // (directory, hardlink, symlink race). Do not report them as missing.
             throw new FsSafeError("path-mismatch", "store target failed read validation", {
                 cause: failure.error instanceof Error ? failure.error : undefined,
             });
         },
+        io: (failure) => throwFsSafeReadError(failure.error, "store"),
         fallback: (failure) => {
             throw new FsSafeError("path-mismatch", "store target changed during read", {
                 cause: failure.error instanceof Error ? failure.error : undefined,
@@ -69,6 +76,31 @@ function handleSyncStoreReadOpenFailure(opened) {
         },
     });
 }
+async function readFileStoreCopySource(params) {
+    const sourceStat = await fs.lstat(params.sourcePath);
+    if (sourceStat.isSymbolicLink() || !sourceStat.isFile()) {
+        throw new FsSafeError("not-file", "source path is not a file");
+    }
+    assertMaxBytes(sourceStat.size, params.maxBytes);
+    try {
+        return (await readRegularFile({ filePath: params.sourcePath, maxBytes: params.maxBytes }))
+            .buffer;
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        if (message.includes("regular file") || message.includes("not a regular file")) {
+            throw new FsSafeError("not-file", "source path is not a file", {
+                cause: error instanceof Error ? error : undefined,
+            });
+        }
+        if (params.maxBytes !== undefined && message.includes(`exceeds ${params.maxBytes} bytes`)) {
+            throw new FsSafeError("too-large", `file exceeds maximum size of ${params.maxBytes} bytes`, {
+                cause: error instanceof Error ? error : undefined,
+            });
+        }
+        throw error;
+    }
+}
 async function copyIntoRoot(params) {
     const relativePath = assertRelativePath(params.relativePath);
     const destination = resolveStorePath(params.rootDir, relativePath);
@@ -209,7 +241,7 @@ export function fileStore(options) {
                 if (isNotFound(error)) {
                     return null;
                 }
-                throw error;
+                throwFsSafeReadError(error, "store");
             }
         },
         readJson: async (relativePath, readOptions) => {
@@ -225,7 +257,7 @@ export function fileStore(options) {
                 if (isNotFound(error)) {
                     return null;
                 }
-                throw error;
+                throwFsSafeReadError(error, "store");
             }
         },
         remove: async (relativePath) => {
@@ -264,119 +296,6 @@ export function fileStore(options) {
         },
     };
 }
-function ensurePrivateDirectorySync(rootDir, targetDir, mode) {
-    const root = path.resolve(rootDir);
-    const target = path.resolve(targetDir);
-    assertStoreFilePath(root, target);
-    let current = root;
-    syncFs.mkdirSync(current, { recursive: true, mode });
-    const rootStat = syncFs.lstatSync(current);
-    if (rootStat.isSymbolicLink() || !rootStat.isDirectory()) {
-        throw new FsSafeError("not-file", `private store root must be a directory: ${current}`);
-    }
-    try {
-        syncFs.chmodSync(current, mode);
-    }
-    catch {
-        // Best-effort on platforms that do not enforce POSIX modes.
-    }
-    for (const segment of path.relative(root, target).split(path.sep).filter(Boolean)) {
-        current = path.join(current, segment);
-        try {
-            const stat = syncFs.lstatSync(current);
-            if (stat.isSymbolicLink() || !stat.isDirectory()) {
-                throw new FsSafeError("not-file", `private store directory component must be a directory: ${current}`);
-            }
-        }
-        catch (error) {
-            if (error.code !== "ENOENT") {
-                throw error;
-            }
-            syncFs.mkdirSync(current, { mode });
-        }
-        const rootReal = syncFs.realpathSync(root);
-        const currentReal = syncFs.realpathSync(current);
-        if (!isPathInside(rootReal, currentReal)) {
-            throw new FsSafeError("outside-workspace", "private store directory escapes root");
-        }
-        try {
-            syncFs.chmodSync(current, mode);
-        }
-        catch {
-            // Best-effort on platforms that do not enforce POSIX modes.
-        }
-    }
-    const guard = createSyncDirectoryGuard(target);
-    assertSyncDirectoryGuard(guard);
-    return guard;
-}
-function writeFileSyncAtomic(params) {
-    const filePath = path.resolve(params.filePath);
-    assertStoreFilePath(params.rootDir, filePath);
-    let parentGuard;
-    if (params.privateMode) {
-        parentGuard = ensurePrivateDirectorySync(params.rootDir, path.dirname(filePath), params.dirMode);
-        try {
-            const stat = syncFs.lstatSync(filePath);
-            if (stat.isSymbolicLink() || !stat.isFile()) {
-                throw new FsSafeError("not-file", `private store target must be a regular file: ${filePath}`);
-            }
-        }
-        catch (error) {
-            if (error.code !== "ENOENT") {
-                throw error;
-            }
-        }
-    }
-    else {
-        parentGuard = ensureParentSync({
-            rootDir: params.rootDir,
-            filePath,
-            mode: params.dirMode,
-        });
-    }
-    const tempPath = path.join(parentGuard?.dir ?? path.dirname(filePath), `.fs-safe-${process.pid}-${randomUUID()}.tmp`);
-    let tempExists = false;
-    try {
-        getFsSafeTestHooks()?.beforeFileStoreSyncPrivateWrite?.(filePath);
-        if (parentGuard) {
-            assertSyncDirectoryGuard(parentGuard);
-        }
-        syncFs.writeFileSync(tempPath, params.content, { flag: "wx", mode: params.mode });
-        tempExists = true;
-        try {
-            syncFs.chmodSync(tempPath, params.mode);
-        }
-        catch {
-            // Best-effort on platforms that do not enforce POSIX modes.
-        }
-        if (parentGuard) {
-            assertSyncDirectoryGuard(parentGuard);
-        }
-        syncFs.renameSync(tempPath, filePath);
-        tempExists = false;
-        if (parentGuard) {
-            assertSyncDirectoryGuard(parentGuard);
-        }
-        try {
-            syncFs.chmodSync(filePath, params.mode);
-        }
-        catch {
-            // Best-effort on platforms that do not enforce POSIX modes.
-        }
-        return filePath;
-    }
-    finally {
-        if (tempExists) {
-            try {
-                syncFs.unlinkSync(tempPath);
-            }
-            catch {
-                // Best-effort cleanup after write failure.
-            }
-        }
-    }
-}
 export function fileStoreSync(options) {
     const rootDir = path.resolve(options.rootDir);
     const privateMode = options.private ?? false;
@@ -413,10 +332,14 @@ export function fileStoreSync(options) {
             try {
                 assertMaxBytes(opened.stat.size, readOptions?.maxBytes ?? maxBytes);
                 const limit = readOptions?.maxBytes ?? maxBytes;
-                const raw = limit === undefined
-                    ? syncFs.readFileSync(opened.fd, "utf8")
-                    : readFileDescriptorBoundedSync(opened.fd, limit).toString("utf8");
-                return raw;
+                try {
+                    return limit === undefined
+                        ? syncFs.readFileSync(opened.fd, "utf8")
+                        : readFileDescriptorBoundedSync(opened.fd, limit).toString("utf8");
+                }
+                catch (error) {
+                    throwFsSafeReadError(error, "store");
+                }
             }
             finally {
                 syncFs.closeSync(opened.fd);

package/dist/filename.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filename.d.ts","sourceRoot":"","sources":["../src/filename.ts"],"names":[],"mappings":"AAIA,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,CA2BxF"}
+{"version":3,"file":"filename.d.ts","sourceRoot":"","sources":["../src/filename.ts"],"names":[],"mappings":"AA4BA,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,CAgCxF"}

package/dist/filename.js

@@ -1,5 +1,27 @@
 import path from "node:path";
+import { WINDOWS_RESERVED_DEVICE_NAMES } from "./device-path.js";
 const WINDOWS_INVALID_FILE_NAME_CHARACTERS = new Set('<>:"/\\|?*');
+function trimWindowsIgnoredSuffix(value) {
+    let end = value.length;
+    while (end > 0) {
+        const character = value.charCodeAt(end - 1);
+        if (character !== 0x20 && character !== 0x2e) {
+            break;
+        }
+        end -= 1;
+    }
+    return end === value.length ? value : value.slice(0, end);
+}
+function suffixWindowsReservedDeviceName(fileName) {
+    const extensionIndex = fileName.indexOf(".");
+    const baseNameEnd = extensionIndex < 0 ? fileName.length : extensionIndex;
+    const baseName = fileName.slice(0, baseNameEnd);
+    const deviceBaseName = trimWindowsIgnoredSuffix(baseName);
+    if (!WINDOWS_RESERVED_DEVICE_NAMES.has(deviceBaseName.toUpperCase())) {
+        return fileName;
+    }
+    return `${baseName}_${fileName.slice(baseNameEnd)}`;
+}
 export function sanitizeUntrustedFileName(fileName, fallbackName) {
     const trimmed = typeof fileName === "string" ? fileName.trim() : "";
     if (!trimmed) {
@@ -21,8 +43,13 @@ export function sanitizeUntrustedFileName(fileName, fallbackName) {
     if (!base || base === "." || base === "..") {
         return fallbackName;
     }
+    base = suffixWindowsReservedDeviceName(base);
     if (base.length > 200) {
         base = base.slice(0, 200);
+        const trailingCodeUnit = base.charCodeAt(base.length - 1);
+        if (trailingCodeUnit >= 0xd800 && trailingCodeUnit <= 0xdbff) {
+            base = base.slice(0, -1);
+        }
     }
     return base;
 }

package/dist/guarded-mkdir.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"guarded-mkdir.d.ts","sourceRoot":"","sources":["../src/guarded-mkdir.ts"],"names":[],"mappings":"AA0BA;;;;;GAKG;AACH,wBAAsB,6BAA6B,CAAC,MAAM,EAAE;IAC1D,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,CAAC,aAAa,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;CACnE,GAAG,OAAO,CAAC,MAAM,CAAC,CAuDlB"}
+{"version":3,"file":"guarded-mkdir.d.ts","sourceRoot":"","sources":["../src/guarded-mkdir.ts"],"names":[],"mappings":"AAyBA;;;;;GAKG;AACH,wBAAsB,6BAA6B,CAAC,MAAM,EAAE;IAC1D,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,CAAC,aAAa,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;CACnE,GAAG,OAAO,CAAC,MAAM,CAAC,CAuDlB"}

package/dist/guarded-mkdir.js

@@ -3,6 +3,7 @@ import path from "node:path";
 import { assertAsyncDirectoryGuard, createAsyncDirectoryGuard } from "./directory-guard.js";
 import { FsSafeError } from "./errors.js";
 import { isNotFoundPathError, isPathRelativeEscape } from "./path.js";
+import { directoryComponentNotDirectoryError } from "./root-errors.js";
 function isSameOrChildPath(candidate, parent) {
     const parentPrefix = parent.endsWith(path.sep) ? parent : `${parent}${path.sep}`;
     return candidate === parent || candidate.startsWith(parentPrefix);
@@ -15,9 +16,7 @@ async function realpathOrThrowNotFile(target) {
         if (isNotFoundPathError(error)) {
             // A dangling symlink (or a component removed between lstat and
             // realpath) is not a usable directory component.
-            throw new FsSafeError("not-file", "directory component must be a directory", {
-                cause: error instanceof Error ? error : undefined,
-            });
+            throw directoryComponentNotDirectoryError(error instanceof Error ? error : undefined);
         }
         throw error;
     }
@@ -40,8 +39,8 @@ export async function mkdirPathComponentsWithGuards(params) {
     for (const part of relative.split(path.sep).filter(Boolean)) {
         const next = path.join(current, part);
         const parentGuard = await createAsyncDirectoryGuard(current);
-        await params.beforeComponent?.(next);
         await assertAsyncDirectoryGuard(parentGuard);
+        await params.beforeComponent?.(next);
         try {
             await fs.mkdir(next);
         }
@@ -52,7 +51,7 @@ export async function mkdirPathComponentsWithGuards(params) {
         }
         const stat = await fs.lstat(next);
         if (!stat.isSymbolicLink() && !stat.isDirectory()) {
-            throw new FsSafeError("not-file", "directory component must be a directory");
+            throw directoryComponentNotDirectoryError();
         }
         // Node's recursive mkdir follows symlinks in missing components. Build one
         // segment at a time and realpath-check each segment before descending.
@@ -72,7 +71,7 @@ export async function mkdirPathComponentsWithGuards(params) {
             // the returned resolved path, not their own lexical parent path.
             const targetStat = await fs.stat(nextReal);
             if (!targetStat.isDirectory()) {
-                throw new FsSafeError("not-file", "directory component must be a directory");
+                throw directoryComponentNotDirectoryError();
             }
             await createAsyncDirectoryGuard(nextReal);
             await assertAsyncDirectoryGuard(parentGuard);

package/dist/install-path.js

@@ -41,7 +41,7 @@ export function resolveSafeInstallDir(params) {
         path.isAbsolute(relative)) {
         return { ok: false, error: params.invalidNameMessage };
     }
-    return { ok: true, path: targetDir };
+    return { ok: true, path: resolvedTarget };
 }
 export async function assertCanonicalPathWithinBase(params) {
     const baseDir = path.resolve(params.baseDir);

package/dist/json-document-store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"json-document-store.d.ts","sourceRoot":"","sources":["../src/json-document-store.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAG3D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAKlE,MAAM,MAAM,oBAAoB,GAAG;IACjC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,oBAAoB,CAAC;IAC7B,aAAa,CAAC,EAAE,wBAAwB,CAAC;IACzC,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,IAAI,CAAC,EAAE,OAAO,GAAG,oBAAoB,CAAC;CACvC,CAAC;AAEF,MAAM,MAAM,SAAS,CAAC,CAAC,IAAI;IACzB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,IAAI,IAAI,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;IAC/B,MAAM,CAAC,QAAQ,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAChC,YAAY,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;IAC3B,KAAK,CAAC,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/B,MAAM,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,SAAS,KAAK,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IACpE,QAAQ,CAAC,QAAQ,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;CACxE,CAAC;AAEF,MAAM,MAAM,gBAAgB,CAAC,CAAC,IAAI;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,IAAI,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;IACvC,YAAY,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;IAC3B,KAAK,CAAC,KAAK,EAAE,CAAC,EAAE,OAAO,CAAC,EAAE;QAAE,eAAe,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACzE,CAAC;AA2BF,wBAAgB,eAAe,CAAC,CAAC,EAC/B,OAAO,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAC5B,OAAO,GAAE,oBAAyB,GACjC,SAAS,CAAC,CAAC,CAAC,CA0Ed"}
+{"version":3,"file":"json-document-store.d.ts","sourceRoot":"","sources":["../src/json-document-store.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAG3D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AASlE,MAAM,MAAM,oBAAoB,GAAG;IACjC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,oBAAoB,CAAC;IAC7B,aAAa,CAAC,EAAE,wBAAwB,CAAC;IACzC,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,IAAI,CAAC,EAAE,OAAO,GAAG,oBAAoB,CAAC;CACvC,CAAC;AAEF,MAAM,MAAM,SAAS,CAAC,CAAC,IAAI;IACzB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,IAAI,IAAI,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;IAC/B,MAAM,CAAC,QAAQ,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAChC,YAAY,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;IAC3B,KAAK,CAAC,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/B,MAAM,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,SAAS,KAAK,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IACpE,QAAQ,CAAC,QAAQ,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;CACxE,CAAC;AAEF,MAAM,MAAM,gBAAgB,CAAC,CAAC,IAAI;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,IAAI,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;IACvC,YAAY,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;IAC3B,KAAK,CAAC,KAAK,EAAE,CAAC,EAAE,OAAO,CAAC,EAAE;QAAE,eAAe,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACzE,CAAC;AA2BF,wBAAgB,eAAe,CAAC,CAAC,EAC/B,OAAO,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAC5B,OAAO,GAAE,oBAAyB,GACjC,SAAS,CAAC,CAAC,CAAC,CAiFd"}

package/dist/json-document-store.js

@@ -43,24 +43,30 @@ export function createJsonStore(adapter, options = {}) {
     async function withSerializedMutation(run) {
         const canonicalPath = await canonicalPathFromExistingAncestor(adapter.filePath);
         const activePaths = activeStoreMutations.getStore();
-        if (activePaths?.has(canonicalPath)) {
+        if (activePaths?.get(canonicalPath)?.active) {
             throw new FsSafeError("store-reentrant-update", `jsonStore cannot write or update ${canonicalPath} from inside its active update callback; return the complete next value from the outer update instead`);
         }
         return await serializePathWrite(`json-store:${canonicalPath}`, async () => {
-            const mutationPaths = new Set(activePaths);
-            mutationPaths.add(canonicalPath);
+            const mutationPaths = new Map([...(activePaths ?? [])].filter(([, token]) => token.active));
+            const token = { active: true };
+            mutationPaths.set(canonicalPath, token);
             return await activeStoreMutations.run(mutationPaths, async () => {
-                if (!locks || !lockOptions) {
-                    return await run();
+                try {
+                    if (!locks || !lockOptions) {
+                        return await run();
+                    }
+                    return await locks.withLock({
+                        targetPath: adapter.filePath,
+                        staleMs: lockOptions.staleMs,
+                        timeoutMs: lockOptions.timeoutMs,
+                        retry: lockOptions.retry,
+                        staleRecovery: lockOptions.staleRecovery,
+                        payload: () => ({ pid: process.pid, createdAt: new Date().toISOString() }),
+                    }, run);
+                }
+                finally {
+                    token.active = false;
                 }
-                return await locks.withLock({
-                    targetPath: adapter.filePath,
-                    staleMs: lockOptions.staleMs,
-                    timeoutMs: lockOptions.timeoutMs,
-                    retry: lockOptions.retry,
-                    staleRecovery: lockOptions.staleRecovery,
-                    payload: () => ({ pid: process.pid, createdAt: new Date().toISOString() }),
-                }, run);
             });
         });
     }

package/dist/json.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"json.d.ts","sourceRoot":"","sources":["../src/json.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"json.d.ts","sourceRoot":"","sources":["../src/json.ts"],"names":[],"mappings":"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"}

package/dist/json.js

@@ -7,6 +7,7 @@ import { stringifyJsonDocument } from "./json-stringify.js";
 import { readRegularFile, readRegularFileSync, statRegularFile } from "./regular-file.js";
 import { openRootFileSync } from "./root-file.js";
 import { writeTextAtomic } from "./text-atomic.js";
+import { sleep } from "./timing.js";
 const READ_RETRY_MAX_ATTEMPTS = 5;
 const READ_RETRY_BASE_DELAY_MS = 50;
 function isRetryableReadError(err, options) {
@@ -19,9 +20,6 @@ function isRetryableReadError(err, options) {
     const code = getErrorCode(err);
     return code === "ENOENT" || code === "EPERM";
 }
-function sleep(ms) {
-    return new Promise((resolve) => setTimeout(resolve, ms));
-}
 async function readRegularFileWithRetry(filePath, options = {}) {
     let lastErr;
     for (let attempt = 0; attempt < READ_RETRY_MAX_ATTEMPTS; attempt++) {

package/dist/local-file-access.d.ts

@@ -1,8 +1,9 @@
+export declare function isFileUrl(input: string): boolean;
 export declare function hasEncodedFileUrlSeparator(pathname: string): boolean;
 export declare function isWindowsNetworkPath(filePath: string, platform?: NodeJS.Platform): boolean;
 export declare function isWindowsDriveLetterPath(filePath: string, platform?: NodeJS.Platform): boolean;
 export declare function assertNoWindowsNetworkPath(filePath: string, label?: string): void;
-export declare function safeFileURLToPath(fileUrl: string): string;
-export declare function trySafeFileURLToPath(fileUrl: string): string | undefined;
+export declare function safeFileURLToPath(fileUrl: string, platform?: NodeJS.Platform): string;
+export declare function trySafeFileURLToPath(fileUrl: string, platform?: NodeJS.Platform): string | undefined;
 export declare function basenameFromMediaSource(source?: string): string | undefined;
 //# sourceMappingURL=local-file-access.d.ts.map

package/dist/local-file-access.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"local-file-access.d.ts","sourceRoot":"","sources":["../src/local-file-access.ts"],"names":[],"mappings":"AAWA,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAEpE;AAED,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,MAAM,EAChB,QAAQ,GAAE,MAAM,CAAC,QAA2B,GAC3C,OAAO,CAeT;AAED,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,MAAM,EAChB,QAAQ,GAAE,MAAM,CAAC,QAA2B,GAC3C,OAAO,CAET;AAED,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,SAAS,GAAG,IAAI,CAIjF;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAmBzD;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAMxE;AAED,wBAAgB,uBAAuB,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAgB3E"}
+{"version":3,"file":"local-file-access.d.ts","sourceRoot":"","sources":["../src/local-file-access.ts"],"names":[],"mappings":"AAOA,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAEhD;AAOD,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAEpE;AAED,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,MAAM,EAChB,QAAQ,GAAE,MAAM,CAAC,QAA2B,GAC3C,OAAO,CAeT;AAED,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,MAAM,EAChB,QAAQ,GAAE,MAAM,CAAC,QAA2B,GAC3C,OAAO,CAET;AAED,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,SAAS,GAAG,IAAI,CAIjF;AAED,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,MAAM,EACf,QAAQ,GAAE,MAAM,CAAC,QAA2B,GAC3C,MAAM,CAqBR;AAED,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,MAAM,EACf,QAAQ,GAAE,MAAM,CAAC,QAA2B,GAC3C,MAAM,GAAG,SAAS,CAMpB;AAED,wBAAgB,uBAAuB,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAgB3E"}

package/dist/local-file-access.js

@@ -2,6 +2,10 @@ import path from "node:path";
 import { fileURLToPath, URL } from "node:url";
 import { normalizeLowercaseStringOrEmpty } from "./string-coerce.js";
 const ENCODED_FILE_URL_SEPARATOR_RE = /%(?:2f|5c)/i;
+const FILE_URL_PREFIX_RE = /^file:\/\//i;
+export function isFileUrl(input) {
+    return FILE_URL_PREFIX_RE.test(input);
+}
 function isLocalFileUrlHost(hostname) {
     const normalized = normalizeLowercaseStringOrEmpty(hostname);
     return normalized === "" || normalized === "localhost";
@@ -32,7 +36,7 @@ export function assertNoWindowsNetworkPath(filePath, label = "Path") {
         throw new Error(`${label} cannot use Windows network paths: ${filePath}`);
     }
 }
-export function safeFileURLToPath(fileUrl) {
+export function safeFileURLToPath(fileUrl, platform = process.platform) {
     let parsed;
     try {
         parsed = new URL(fileUrl);
@@ -49,13 +53,15 @@ export function safeFileURLToPath(fileUrl) {
     if (hasEncodedFileUrlSeparator(parsed.pathname)) {
         throw new Error(`file:// URLs cannot encode path separators: ${fileUrl}`);
     }
-    const filePath = fileURLToPath(parsed);
-    assertNoWindowsNetworkPath(filePath, "Local file URL");
+    const filePath = fileURLToPath(parsed, { windows: platform === "win32" });
+    if (isWindowsNetworkPath(filePath, platform)) {
+        throw new Error(`Local file URL cannot use Windows network paths: ${filePath}`);
+    }
     return filePath;
 }
-export function trySafeFileURLToPath(fileUrl) {
+export function trySafeFileURLToPath(fileUrl, platform = process.platform) {
     try {
-        return safeFileURLToPath(fileUrl);
+        return safeFileURLToPath(fileUrl, platform);
     }
     catch {
         return undefined;
@@ -65,7 +71,7 @@ export function basenameFromMediaSource(source) {
     if (!source) {
         return undefined;
     }
-    if (source.startsWith("file://")) {
+    if (isFileUrl(source)) {
         const filePath = trySafeFileURLToPath(source);
         return filePath ? path.basename(filePath) || undefined : undefined;
     }

package/dist/local-roots.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"local-roots.d.ts","sourceRoot":"","sources":["../src/local-roots.ts"],"names":[],"mappings":"AAMA,OAAO,EAAQ,KAAK,cAAc,EAAE,KAAK,UAAU,EAAE,KAAK,aAAa,EAAE,MAAM,WAAW,CAAC;AAE3F,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,UAAU,GAAG;IAC9C,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,oCAAoC,GAAG,sBAAsB,GAAG;IAC1E,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG,sBAAsB,GAAG;IACnE,SAAS,CAAC,EAAE,cAAc,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,EAAE,aAAa,CAAC;CAC1B,CAAC;AAmGF,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE,oCAAoC,GAC5C,oBAAoB,GAAG,IAAI,CA6B7B;AAED,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,6BAA6B,GACrC,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC,CA0CtC"}
+{"version":3,"file":"local-roots.d.ts","sourceRoot":"","sources":["../src/local-roots.ts"],"names":[],"mappings":"AAMA,OAAO,EAAQ,KAAK,cAAc,EAAE,KAAK,UAAU,EAAE,KAAK,aAAa,EAAE,MAAM,WAAW,CAAC;AAE3F,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,UAAU,GAAG;IAC9C,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,oCAAoC,GAAG,sBAAsB,GAAG;IAC1E,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG,sBAAsB,GAAG;IACnE,SAAS,CAAC,EAAE,cAAc,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,EAAE,aAAa,CAAC;CAC1B,CAAC;AAqGF,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE,oCAAoC,GAC5C,oBAAoB,GAAG,IAAI,CA6B7B;AAED,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,6BAA6B,GACrC,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC,CA2CtC"}