@openclaw/fs-safe 0.16.0 → 0.17.0

package/dist/publish-file.d.ts

@@ -1,4 +1,4 @@
-import { type Stats } from "node:fs";
+import { type BigIntStats, type Stats } from "node:fs";
 import { type DirectoryReceipt, type DirectorySyncOutcome } from "./directory-durability.js";
 import { type FileIdentityStat } from "./file-identity.js";
 import { type PublishFileExclusiveSyncFailurePolicy } from "./publish-file-failure.js";
@@ -16,6 +16,6 @@ export declare function publishFileExclusive(params: {
     expectedSourceIdentity?: FileIdentityStat;
     strategy: PublishFileExclusiveStrategy;
     onSyncFailure?: PublishFileExclusiveSyncFailurePolicy;
-    parentReceipt?: DirectoryReceipt;
+    parentReceipt?: DirectoryReceipt<Stats | BigIntStats>;
 }): Promise<PublishFileExclusiveResult>;
 //# sourceMappingURL=publish-file.d.ts.map

package/dist/publish-file.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"publish-file.d.ts","sourceRoot":"","sources":["../src/publish-file.ts"],"names":[],"mappings":"AACA,OAAe,EAAoB,KAAK,KAAK,EAAE,MAAM,SAAS,CAAC;AAG/D,OAAO,EAEL,KAAK,gBAAgB,EACrB,KAAK,oBAAoB,EAC1B,MAAM,2BAA2B,CAAC;AAInC,OAAO,EAGL,KAAK,gBAAgB,EACtB,MAAM,oBAAoB,CAAC;AAK5B,OAAO,EAML,KAAK,qCAAqC,EAC3C,MAAM,2BAA2B,CAAC;AAKnC,YAAY,EACV,2BAA2B,EAC3B,wCAAwC,EACxC,kCAAkC,EAClC,gCAAgC,EAChC,qCAAqC,GACtC,MAAM,2BAA2B,CAAC;AAEnC,MAAM,MAAM,4BAA4B,GAAG,cAAc,GAAG,eAAe,GAAG,kBAAkB,CAAC;AAEjG,MAAM,MAAM,0BAA0B,GAAG;IACvC,MAAM,EAAE,UAAU,GAAG,gBAAgB,GAAG,kBAAkB,CAAC;IAC3D,QAAQ,EAAE,KAAK,CAAC;IAChB,aAAa,EAAE,oBAAoB,CAAC;CACrC,CAAC;AAIF,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAE/D;AA0ND,wBAAsB,oBAAoB,CAAC,MAAM,EAAE;IACjD,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,sBAAsB,CAAC,EAAE,gBAAgB,CAAC;IAC1C,QAAQ,EAAE,4BAA4B,CAAC;IACvC,aAAa,CAAC,EAAE,qCAAqC,CAAC;IACtD,aAAa,CAAC,EAAE,gBAAgB,CAAC;CAClC,GAAG,OAAO,CAAC,0BAA0B,CAAC,CA4NtC"}
+{"version":3,"file":"publish-file.d.ts","sourceRoot":"","sources":["../src/publish-file.ts"],"names":[],"mappings":"AACA,OAAe,EAAE,KAAK,WAAW,EAAE,KAAK,KAAK,EAAE,MAAM,SAAS,CAAC;AAG/D,OAAO,EAEL,KAAK,gBAAgB,EACrB,KAAK,oBAAoB,EAC1B,MAAM,2BAA2B,CAAC;AAInC,OAAO,EAGL,KAAK,gBAAgB,EACtB,MAAM,oBAAoB,CAAC;AAK5B,OAAO,EAML,KAAK,qCAAqC,EAC3C,MAAM,2BAA2B,CAAC;AAOnC,YAAY,EACV,2BAA2B,EAC3B,wCAAwC,EACxC,kCAAkC,EAClC,gCAAgC,EAChC,qCAAqC,GACtC,MAAM,2BAA2B,CAAC;AAEnC,MAAM,MAAM,4BAA4B,GAAG,cAAc,GAAG,eAAe,GAAG,kBAAkB,CAAC;AAEjG,MAAM,MAAM,0BAA0B,GAAG;IACvC,MAAM,EAAE,UAAU,GAAG,gBAAgB,GAAG,kBAAkB,CAAC;IAC3D,QAAQ,EAAE,KAAK,CAAC;IAChB,aAAa,EAAE,oBAAoB,CAAC;CACrC,CAAC;AAIF,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAE/D;AAgOD,wBAAsB,oBAAoB,CAAC,MAAM,EAAE;IACjD,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,sBAAsB,CAAC,EAAE,gBAAgB,CAAC;IAC1C,QAAQ,EAAE,4BAA4B,CAAC;IACvC,aAAa,CAAC,EAAE,qCAAqC,CAAC;IACtD,aAAa,CAAC,EAAE,gBAAgB,CAAC,KAAK,GAAG,WAAW,CAAC,CAAC;CACvD,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAsKtC"}

package/dist/publish-file.js

@@ -15,6 +15,8 @@ import { directorySyncFailure, publicationFailure, rememberCreatedTarget, } from
 import { admitStandalonePublicationPath } from "./standalone-publication-path.js";
 import { getFsSafeTestHooks } from "./test-hooks.js";
 import { assertNoWindowsPathAlias } from "./windows-path-alias.js";
+import { hasErrorCode } from "./file-cleanup.js";
+import { writeAllToFile } from "./write-file-handle.js";
 const HARDLINK_FALLBACK_CODES = new Set(["EPERM", "EXDEV", "ENOTSUP", "EOPNOTSUPP", "ENOSYS"]);
 const NATIVE_COPY_FALLBACK_CODES = new Set(["EINVAL", "ENOSYS", "ENOTSUP", "EOPNOTSUPP", "EPERM", "EXDEV"]);
 export function isHardlinkFallbackError(error) {
@@ -41,7 +43,7 @@ async function openNativeParent(filePath) {
         throw error;
     }
 }
-async function assertPinnedSourceCurrent(params) {
+function assertPinnedSourceCurrent(params) {
     // Windows file indexes can exceed Number.MAX_SAFE_INTEGER, so publication
     // fences must compare bigint stats instead of rounded numeric identities.
     const opened = fsSync.fstatSync(params.handle.fd, { bigint: true });
@@ -54,6 +56,23 @@ async function assertPinnedSourceCurrent(params) {
         throw new FsSafeError("path-mismatch", "publication source changed during operation");
     }
 }
+function assertPublishedTargetCurrent(targetPath, identity, message) {
+    const current = fsSync.lstatSync(targetPath, { bigint: true });
+    if (current.isSymbolicLink() || !current.isFile() || !sameFileIdentity(current, identity)) {
+        throw new FsSafeError("path-mismatch", message);
+    }
+}
+function assertRenamedSourceAbsent(sourcePath) {
+    try {
+        fsSync.lstatSync(sourcePath);
+    }
+    catch (error) {
+        if (hasErrorCode(error, "ENOENT"))
+            return;
+        throw error;
+    }
+    throw new FsSafeError("path-mismatch", "no-replace publication source still exists");
+}
 async function copyPinnedSource(params) {
     if (params.native && params.targetNativeParent) {
         const closeFd = captureNativeFdClose(params.native);
@@ -131,15 +150,9 @@ async function copyPinnedSource(params) {
             if (bytesRead === 0) {
                 break;
             }
-            hash.update(buffer.subarray(0, bytesRead));
-            let written = 0;
-            while (written < bytesRead) {
-                const result = await target.write(buffer, written, bytesRead - written, position + written);
-                if (result.bytesWritten <= 0) {
-                    throw new FsSafeError("helper-failed", "exclusive publication copy made no progress");
-                }
-                written += result.bytesWritten;
-            }
+            const chunk = buffer.subarray(0, bytesRead);
+            hash.update(chunk);
+            await writeAllToFile(target, chunk, { position });
             position += bytesRead;
         }
         await target.sync();
@@ -208,6 +221,7 @@ export async function publishFileExclusive(params) {
     let parent;
     let sourceNativeParent;
     let targetNativeParent;
+    let copiedTarget;
     const strategy = params.strategy;
     const failure = {
         phase: strategy === "rename-noreplace" ? "rename-create" : "hardlink-create",
@@ -232,8 +246,20 @@ export async function publishFileExclusive(params) {
                     : sourceIdentity))) {
             throw new FsSafeError("path-mismatch", "publication source identity did not match");
         }
+        const assertSourceCurrent = () => assertPinnedSourceCurrent({ sourcePath, handle: source, identity: sourceExactIdentity });
+        const finishPublication = async (method, handle, identity) => {
+            const verifyPhase = failure.phase;
+            const directorySync = await syncPublishedParent({ parent: parent, failure, method, targetPath });
+            failure.phase = verifyPhase;
+            if (method === "rename-noreplace")
+                assertRenamedSourceAbsent(sourcePath);
+            else
+                assertSourceCurrent();
+            assertPublishedTargetCurrent(targetPath, identity, "publication target changed during directory sync");
+            return { method, identity: fsSync.fstatSync(handle.fd), directorySync };
+        };
         await parent.assertCurrent();
-        await assertPinnedSourceCurrent({ sourcePath, handle: source, identity: sourceExactIdentity });
+        assertSourceCurrent();
         const native = strategy === "rename-noreplace"
             ? requireNativeBinding()
             : getNativeBinding();
@@ -248,33 +274,10 @@ export async function publishFileExclusive(params) {
             // A failed post-rename fence must not delete the only remaining name.
             failure.preserveTarget = true;
             await getFsSafeTestHooks()?.afterPublishTargetCreated?.("rename-noreplace", targetPath, sourceExactIdentity);
-            const targetExactIdentity = fsSync.lstatSync(targetPath, { bigint: true });
-            if (targetExactIdentity.isSymbolicLink() ||
-                !targetExactIdentity.isFile() ||
-                !sameFileIdentity(targetExactIdentity, sourceExactIdentity)) {
-                throw new FsSafeError("path-mismatch", "no-replace publication target changed");
-            }
-            try {
-                fsSync.lstatSync(sourcePath);
-                throw new FsSafeError("path-mismatch", "no-replace publication source still exists");
-            }
-            catch (error) {
-                if (error.code !== "ENOENT") {
-                    throw error;
-                }
-            }
+            assertPublishedTargetCurrent(targetPath, sourceExactIdentity, "no-replace publication target changed");
+            assertRenamedSourceAbsent(sourcePath);
             syncFileBestEffortSync(sourceNativeParent.handle.fd);
-            const targetIdentity = fsSync.lstatSync(targetPath);
-            return {
-                method: "rename-noreplace",
-                identity: targetIdentity,
-                directorySync: await syncPublishedParent({
-                    parent,
-                    failure,
-                    method: "rename-noreplace",
-                    targetPath,
-                }),
-            };
+            return await finishPublication("rename-noreplace", source, sourceExactIdentity);
         }
         try {
             if (native) {
@@ -285,24 +288,9 @@ export async function publishFileExclusive(params) {
             }
             rememberCreatedTarget(failure, sourceExactIdentity, "hardlink-verify");
             await getFsSafeTestHooks()?.afterPublishTargetCreated?.("hardlink", targetPath, sourceExactIdentity);
-            const targetExactIdentity = fsSync.lstatSync(targetPath, { bigint: true });
-            if (targetExactIdentity.isSymbolicLink() ||
-                !targetExactIdentity.isFile() ||
-                !sameFileIdentity(targetExactIdentity, sourceExactIdentity)) {
-                throw new FsSafeError("path-mismatch", "hardlink publication target changed");
-            }
-            await assertPinnedSourceCurrent({ sourcePath, handle: source, identity: sourceExactIdentity });
-            const targetIdentity = fsSync.lstatSync(targetPath);
-            return {
-                method: "hardlink",
-                identity: targetIdentity,
-                directorySync: await syncPublishedParent({
-                    parent,
-                    failure,
-                    method: "hardlink",
-                    targetPath,
-                }),
-            };
+            assertPublishedTargetCurrent(targetPath, sourceExactIdentity, "hardlink publication target changed");
+            assertSourceCurrent();
+            return await finishPublication("hardlink", source, sourceExactIdentity);
         }
         catch (error) {
             if (failure.targetCreated ||
@@ -312,48 +300,19 @@ export async function publishFileExclusive(params) {
             }
         }
         failure.phase = "copy-create";
-        let target;
-        let targetIdentity;
-        try {
-            const copied = await copyPinnedSource({
-                source,
-                targetPath,
-                native,
-                targetNativeParent,
-                failure,
-            });
-            target = copied.handle;
-            targetIdentity = fsSync.fstatSync(target.fd);
-            const targetPathStat = fsSync.lstatSync(targetPath);
-            const targetPathExactStat = fsSync.lstatSync(targetPath, { bigint: true });
-            const copiedBack = await hashFileHandle(target, native);
-            const sourceAfter = await hashFileHandle(source, native);
-            if (targetPathStat.isSymbolicLink() ||
-                targetPathExactStat.isSymbolicLink() ||
-                !sameFileIdentity(targetPathExactStat, copied.exactIdentity) ||
-                copiedBack.bytes !== copied.bytes ||
-                copiedBack.digest !== copied.digest ||
-                sourceAfter.bytes !== copied.bytes ||
-                sourceAfter.digest !== copied.digest) {
-                throw new FsSafeError("path-mismatch", "exclusive publication copy failed content fencing");
-            }
-            await assertPinnedSourceCurrent({ sourcePath, handle: source, identity: sourceExactIdentity });
-            const directorySync = await syncPublishedParent({
-                parent,
-                failure,
-                method: "exclusive-copy",
-                targetPath,
-            });
-            return { method: "exclusive-copy", identity: targetPathStat, directorySync };
-        }
-        catch (error) {
-            await target?.close().catch(() => undefined);
-            target = undefined;
-            throw error;
-        }
-        finally {
-            await target?.close().catch(() => undefined);
+        const copied = await copyPinnedSource({ source, targetPath, native, targetNativeParent, failure });
+        copiedTarget = copied.handle;
+        const copiedBack = await hashFileHandle(copiedTarget, native);
+        const sourceAfter = await hashFileHandle(source, native);
+        assertPublishedTargetCurrent(targetPath, copied.exactIdentity, "exclusive publication copy failed content fencing");
+        if (copiedBack.bytes !== copied.bytes ||
+            copiedBack.digest !== copied.digest ||
+            sourceAfter.bytes !== copied.bytes ||
+            sourceAfter.digest !== copied.digest) {
+            throw new FsSafeError("path-mismatch", "exclusive publication copy failed content fencing");
         }
+        assertSourceCurrent();
+        return await finishPublication("exclusive-copy", copiedTarget, copied.exactIdentity);
     }
     catch (error) {
         if (!failure.targetCreated)
@@ -365,6 +324,7 @@ export async function publishFileExclusive(params) {
         throw publicationFailure(error, failure, cleanup);
     }
     finally {
+        await copiedTarget?.close().catch(() => undefined);
         await sourceNativeParent?.handle.close().catch(() => undefined);
         await targetNativeParent?.handle.close().catch(() => undefined);
         await source.close().catch(() => undefined);

package/dist/regular-file.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"regular-file.d.ts","sourceRoot":"","sources":["../src/regular-file.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAe,KAAK,EAAE,MAAM,SAAS,CAAC;AAClD,OAAO,MAAM,MAAM,SAAS,CAAC;AAuB7B,MAAM,MAAM,qBAAqB,GAAG;IAAE,OAAO,EAAE,IAAI,CAAA;CAAE,GAAG;IAAE,OAAO,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,KAAK,CAAA;CAAE,CAAC;AAExF,KAAK,8BAA8B,GAAG,IAAI,CACxC,OAAO,MAAM,CAAC,SAAS,EACvB,UAAU,GAAG,SAAS,GAAG,UAAU,CACpC,GACC,OAAO,CAAC,IAAI,CAAC,OAAO,MAAM,CAAC,SAAS,EAAE,YAAY,GAAG,YAAY,CAAC,CAAC,CAAC;AAEtE,MAAM,MAAM,wBAAwB,GAAG;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,GAAG,UAAU,CAAC;IAC7B,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAEF,wBAAgB,6BAA6B,CAC3C,SAAS,GAAE,8BAAiD,GAC3D,MAAM,CASR;AAaD,wBAAsB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAEtF;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,qBAAqB,CAe3E;AAED,wBAAsB,eAAe,CAAC,MAAM,EAAE;IAC5C,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,KAAK,CAAA;CAAE,CAAC,CA+D3C;AA2DD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG;IACpF,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,KAAK,CAAC;CACb,CAsCA;AAmBD,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC,CAkFxF;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,wBAAwB,GAAG,IAAI,CAkF7E"}
+{"version":3,"file":"regular-file.d.ts","sourceRoot":"","sources":["../src/regular-file.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAe,KAAK,EAAE,MAAM,SAAS,CAAC;AAClD,OAAO,MAAM,MAAM,SAAS,CAAC;AAuB7B,MAAM,MAAM,qBAAqB,GAAG;IAAE,OAAO,EAAE,IAAI,CAAA;CAAE,GAAG;IAAE,OAAO,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,KAAK,CAAA;CAAE,CAAC;AAExF,KAAK,8BAA8B,GAAG,IAAI,CACxC,OAAO,MAAM,CAAC,SAAS,EACvB,UAAU,GAAG,SAAS,GAAG,UAAU,CACpC,GACC,OAAO,CAAC,IAAI,CAAC,OAAO,MAAM,CAAC,SAAS,EAAE,YAAY,GAAG,YAAY,CAAC,CAAC,CAAC;AAEtE,MAAM,MAAM,wBAAwB,GAAG;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,GAAG,UAAU,CAAC;IAC7B,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAEF,wBAAgB,6BAA6B,CAC3C,SAAS,GAAE,8BAAiD,GAC3D,MAAM,CASR;AAaD,wBAAsB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAEtF;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,qBAAqB,CAe3E;AAED,wBAAsB,eAAe,CAAC,MAAM,EAAE;IAC5C,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,KAAK,CAAA;CAAE,CAAC,CA+D3C;AA2DD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG;IACpF,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,KAAK,CAAC;CACb,CAsCA;AAoCD,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC,CAqExF;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,wBAAwB,GAAG,IAAI,CAqE7E"}

package/dist/regular-file.js

@@ -223,10 +223,26 @@ function throwAppendIdentityError(error, filePath) {
     }
     throw error;
 }
-export async function appendRegularFile(options) {
+function captureAppendOptions(options) {
     const filePath = options.filePath;
     assertNoWindowsPathAlias(filePath, "filesystem", "file path uses a Windows filesystem namespace alias");
-    if (options.rejectSymlinkParents === true) {
+    return {
+        filePath, content: options.content, encoding: options.encoding ?? "utf8",
+        mode: options.mode ?? 0o600, maxFileBytes: options.maxFileBytes,
+        rejectSymlinkParents: options.rejectSymlinkParents,
+    };
+}
+function inspectAppendPath(filePath) {
+    const stat = fsSync.lstatSync(filePath, { bigint: true });
+    if (stat.isSymbolicLink())
+        throw new Error(`Refusing to append through symlink: ${filePath}`);
+    if (!stat.isFile())
+        throw new Error(`Refusing to append to non-file: ${filePath}`);
+    return stat;
+}
+export async function appendRegularFile(options) {
+    const { filePath, content, encoding, mode, maxFileBytes, rejectSymlinkParents } = captureAppendOptions(options);
+    if (rejectSymlinkParents === true) {
         const resolvedDir = resolvePathPreservingWindowsRoot(path.dirname(filePath));
         await assertNoSymlinkParents({
             rootDir: path.parse(resolvedDir).root,
@@ -239,33 +255,22 @@ export async function appendRegularFile(options) {
     }
     let preOpenStat;
     try {
-        preOpenStat = await inspectFileIdentity(async () => {
-            const stat = fsSync.lstatSync(filePath, { bigint: true });
-            if (stat.isSymbolicLink()) {
-                throw new Error(`Refusing to append through symlink: ${filePath}`);
-            }
-            if (!stat.isFile()) {
-                throw new Error(`Refusing to append to non-file: ${filePath}`);
-            }
-            return stat;
-        });
+        preOpenStat = await inspectFileIdentity(async () => inspectAppendPath(filePath));
     }
     catch (error) {
         if (!isNotFoundPathError(error))
             throw error;
     }
-    const contentBytes = Buffer.isBuffer(options.content)
-        ? options.content.byteLength
-        : Buffer.byteLength(options.content, options.encoding ?? "utf8");
-    if (options.maxFileBytes !== undefined &&
-        Number(preOpenStat?.size ?? 0n) + contentBytes > options.maxFileBytes) {
+    const contentBytes = Buffer.isBuffer(content) ? content.byteLength : Buffer.byteLength(content, encoding);
+    if (maxFileBytes !== undefined &&
+        Number(preOpenStat?.size ?? 0n) + contentBytes > maxFileBytes) {
         return;
     }
     await getFsSafeTestHooks()?.beforeRegularFileAppendOpen?.(filePath);
     const flags = resolveRegularFileAppendFlags();
     let handle;
     try {
-        handle = await fs.open(filePath, flags, options.mode ?? 0o600);
+        handle = await fs.open(filePath, flags, mode);
     }
     catch (error) {
         if (await isNonRegularWriteOpenError(error, filePath, flags)) {
@@ -290,14 +295,13 @@ export async function appendRegularFile(options) {
         catch (error) {
             throwAppendIdentityError(error, filePath);
         }
-        if (options.maxFileBytes !== undefined &&
-            Number(identity.size) + contentBytes > options.maxFileBytes) {
+        if (maxFileBytes !== undefined &&
+            Number(identity.size) + contentBytes > maxFileBytes) {
             return;
         }
-        const mode = options.mode ?? 0o600;
         // Tighten before writing; restore explicit special bits only after content is complete.
         await handle.chmod(mode);
-        await handle.appendFile(options.content, options.encoding ?? "utf8");
+        await handle.appendFile(content, encoding);
         if (mode & 0o7000)
             await handle.chmod(mode);
     }
@@ -306,9 +310,8 @@ export async function appendRegularFile(options) {
     }
 }
 export function appendRegularFileSync(options) {
-    const filePath = options.filePath;
-    assertNoWindowsPathAlias(filePath, "filesystem", "file path uses a Windows filesystem namespace alias");
-    if (options.rejectSymlinkParents === true) {
+    const { filePath, content, encoding, mode, maxFileBytes, rejectSymlinkParents } = captureAppendOptions(options);
+    if (rejectSymlinkParents === true) {
         const resolvedDir = resolvePathPreservingWindowsRoot(path.dirname(filePath));
         assertNoSymlinkParentsSync({
             rootDir: path.parse(resolvedDir).root,
@@ -321,33 +324,22 @@ export function appendRegularFileSync(options) {
     }
     let preOpenStat;
     try {
-        preOpenStat = inspectFileIdentitySync(() => {
-            const stat = fsSync.lstatSync(filePath, { bigint: true });
-            if (stat.isSymbolicLink()) {
-                throw new Error(`Refusing to append through symlink: ${filePath}`);
-            }
-            if (!stat.isFile()) {
-                throw new Error(`Refusing to append to non-file: ${filePath}`);
-            }
-            return stat;
-        });
+        preOpenStat = inspectFileIdentitySync(() => inspectAppendPath(filePath));
     }
     catch (error) {
         if (!isNotFoundPathError(error))
             throw error;
     }
-    const contentBuffer = typeof options.content === "string"
-        ? Buffer.from(options.content, options.encoding ?? "utf8")
-        : Buffer.from(options.content);
-    if (options.maxFileBytes !== undefined &&
-        Number(preOpenStat?.size ?? 0n) + contentBuffer.byteLength > options.maxFileBytes) {
+    const contentBuffer = typeof content === "string" ? Buffer.from(content, encoding) : Buffer.from(content);
+    if (maxFileBytes !== undefined &&
+        Number(preOpenStat?.size ?? 0n) + contentBuffer.byteLength > maxFileBytes) {
         return;
     }
     getFsSafeTestHooks()?.beforeRegularFileAppendOpenSync?.(filePath);
     const flags = resolveRegularFileAppendFlags();
     let fd;
     try {
-        fd = fsSync.openSync(filePath, flags, options.mode ?? 0o600);
+        fd = fsSync.openSync(filePath, flags, mode);
     }
     catch (error) {
         if (isNonRegularWriteOpenErrorSync(error, filePath, flags)) {
@@ -372,11 +364,10 @@ export function appendRegularFileSync(options) {
         catch (error) {
             throwAppendIdentityError(error, filePath);
         }
-        if (options.maxFileBytes !== undefined &&
-            Number(identity.size) + contentBuffer.byteLength > options.maxFileBytes) {
+        if (maxFileBytes !== undefined &&
+            Number(identity.size) + contentBuffer.byteLength > maxFileBytes) {
             return;
         }
-        const mode = options.mode ?? 0o600;
         fsSync.fchmodSync(fd, mode);
         fsSync.appendFileSync(fd, contentBuffer);
         if (mode & 0o7000)

package/dist/replace-file-copy-fallback.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"replace-file-copy-fallback.d.ts","sourceRoot":"","sources":["../src/replace-file-copy-fallback.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,EAAE,EAAE,KAAK,WAAW,EAAc,MAAM,SAAS,CAAC;AAQ/D,MAAM,MAAM,oCAAoC,GAAG,QAAQ,CAAC;AAC5D,MAAM,MAAM,oCAAoC,GAAG,kBAAkB,GAAG,MAAM,CAAC;AAC/E,MAAM,MAAM,+BAA+B,GAAG,UAAU,GAAG,gBAAgB,CAAC;AAC5E,MAAM,MAAM,sCAAsC,GAAG;IACnD,OAAO,EAAE,+BAA+B,CAAC;CAC1C,CAAC;AAEF,KAAK,eAAe,GAAG;IACrB,KAAK,EAAE,cAAc,kBAAkB,EAAE,KAAK,CAAC;IAC/C,IAAI,EAAE,cAAc,kBAAkB,EAAE,IAAI,CAAC;IAC7C,EAAE,EAAE,cAAc,kBAAkB,EAAE,EAAE,CAAC;IACzC,MAAM,EAAE,cAAc,kBAAkB,EAAE,MAAM,CAAC;CAClD,CAAC;AAEF,KAAK,cAAc,GAAG,IAAI,CACxB,OAAO,MAAM,EACX,WAAW,GACX,WAAW,GACX,WAAW,GACX,eAAe,GACf,WAAW,GACX,UAAU,GACV,UAAU,GACV,QAAQ,GACR,YAAY,GACZ,WAAW,CACd,CAAC;AAqHF,wBAAsB,+BAA+B,CACnD,QAAQ,EAAE,eAAe,EACzB,IAAI,EAAE,MAAM,EACZ,MAAM,CAAC,EAAE,oCAAoC,GAC5C,OAAO,CAAC,IAAI,CAAC,CAIf;AAED,wBAAgB,mCAAmC,CACjD,QAAQ,EAAE,cAAc,EACxB,IAAI,EAAE,MAAM,EACZ,MAAM,CAAC,EAAE,oCAAoC,GAC5C,IAAI,CAIN;AA+HD,wBAAsB,mBAAmB,CAAC,MAAM,EAAE;IAChD,QAAQ,EAAE,eAAe,CAAC;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,oBAAoB,CAAC,EAAE,oCAAoC,CAAC;IAC5D,OAAO,EAAE,oCAAoC,CAAC;IAC9C,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,sBAAsB,CAAC,EAAE,WAAW,CAAC;IACrC,IAAI,EAAE,OAAO,CAAC;CACf,GAAG,OAAO,CAAC,IAAI,CAAC,CAuEhB;AAED,wBAAgB,uBAAuB,CAAC,MAAM,EAAE;IAC9C,QAAQ,EAAE,cAAc,CAAC;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,oBAAoB,CAAC,EAAE,oCAAoC,CAAC;IAC5D,OAAO,EAAE,oCAAoC,CAAC;IAC9C,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,sBAAsB,CAAC,EAAE,WAAW,CAAC;IACrC,UAAU,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAChD,IAAI,EAAE,OAAO,CAAC;CACf,GAAG,IAAI,CAuEP"}
+{"version":3,"file":"replace-file-copy-fallback.d.ts","sourceRoot":"","sources":["../src/replace-file-copy-fallback.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,EAAE,EAAE,KAAK,WAAW,EAAc,MAAM,SAAS,CAAC;AAS/D,MAAM,MAAM,oCAAoC,GAAG,QAAQ,CAAC;AAC5D,MAAM,MAAM,oCAAoC,GAAG,kBAAkB,GAAG,MAAM,CAAC;AAC/E,MAAM,MAAM,+BAA+B,GAAG,UAAU,GAAG,gBAAgB,CAAC;AAC5E,MAAM,MAAM,sCAAsC,GAAG;IACnD,OAAO,EAAE,+BAA+B,CAAC;CAC1C,CAAC;AAEF,KAAK,eAAe,GAAG;IACrB,KAAK,EAAE,cAAc,kBAAkB,EAAE,KAAK,CAAC;IAC/C,IAAI,EAAE,cAAc,kBAAkB,EAAE,IAAI,CAAC;IAC7C,EAAE,EAAE,cAAc,kBAAkB,EAAE,EAAE,CAAC;IACzC,MAAM,EAAE,cAAc,kBAAkB,EAAE,MAAM,CAAC;CAClD,CAAC;AAEF,KAAK,cAAc,GAAG,IAAI,CACxB,OAAO,MAAM,EACX,WAAW,GACX,WAAW,GACX,WAAW,GACX,eAAe,GACf,WAAW,GACX,UAAU,GACV,UAAU,GACV,QAAQ,GACR,YAAY,GACZ,WAAW,CACd,CAAC;AAqHF,wBAAsB,+BAA+B,CACnD,QAAQ,EAAE,eAAe,EACzB,IAAI,EAAE,MAAM,EACZ,MAAM,CAAC,EAAE,oCAAoC,GAC5C,OAAO,CAAC,IAAI,CAAC,CAIf;AAED,wBAAgB,mCAAmC,CACjD,QAAQ,EAAE,cAAc,EACxB,IAAI,EAAE,MAAM,EACZ,MAAM,CAAC,EAAE,oCAAoC,GAC5C,IAAI,CAIN;AA+HD,wBAAsB,mBAAmB,CAAC,MAAM,EAAE;IAChD,QAAQ,EAAE,eAAe,CAAC;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,oBAAoB,CAAC,EAAE,oCAAoC,CAAC;IAC5D,OAAO,EAAE,oCAAoC,CAAC;IAC9C,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,sBAAsB,CAAC,EAAE,WAAW,CAAC;IACrC,IAAI,EAAE,OAAO,CAAC;CACf,GAAG,OAAO,CAAC,IAAI,CAAC,CAuEhB;AAED,wBAAgB,uBAAuB,CAAC,MAAM,EAAE;IAC9C,QAAQ,EAAE,cAAc,CAAC;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,oBAAoB,CAAC,EAAE,oCAAoC,CAAC;IAC5D,OAAO,EAAE,oCAAoC,CAAC;IAC9C,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,sBAAsB,CAAC,EAAE,WAAW,CAAC;IACrC,UAAU,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAChD,IAAI,EAAE,OAAO,CAAC;CACf,GAAG,IAAI,CAuEP"}

package/dist/replace-file-copy-fallback.js

@@ -2,9 +2,10 @@ import syncFs, {} from "node:fs";
 import fs, {} from "node:fs/promises";
 import { readBoundedAsync, readBoundedSync } from "./bounded-read.js";
 import { FsSafeError } from "./errors.js";
-import { sameFileIdentity } from "./file-identity.js";
+import { inspectFileIdentity, inspectFileIdentitySync } from "./strict-file-identity.js";
 import { readOwnedCopySource, readOwnedCopySourceSync } from "./replace-file-copy-source.js";
 import { resolveReadOpenFlags } from "./read-open-flags.js";
+import { hasErrorCode } from "./file-cleanup.js";
 const SUPPORTS_NOFOLLOW = process.platform !== "win32" && "O_NOFOLLOW" in syncFs.constants;
 const NOFOLLOW = SUPPORTS_NOFOLLOW ? syncFs.constants.O_NOFOLLOW : 0;
 const OPEN_READ_FLAGS = resolveReadOpenFlags();
@@ -19,39 +20,37 @@ function closeSyncAfterAdmissionFailure(fsModule, fd, error) {
     }
     throw error;
 }
-function notFound(error) {
-    return error.code === "ENOENT";
-}
-function assertPinnedDestination(pathname, opened, dest, hardlinks, admission) {
+function admitDestinationKind(pathname, opened, dest, admission) {
     if (admission === "hardlinks") {
-        if (pathname.isSymbolicLink() || !pathname.isFile() || !sameFileIdentity(pathname, opened)) {
+        if (pathname.isSymbolicLink() || !pathname.isFile()) {
             throw new FsSafeError("path-mismatch", `Atomic replace destination changed while opening: ${dest}`);
         }
-        if (opened.nlink > 1) {
-            throw new FsSafeError("hardlink", `Hardlinked atomic replace destination not allowed: ${dest}`);
-        }
-        return;
     }
-    if (pathname.isSymbolicLink()) {
+    else if (pathname.isSymbolicLink()) {
         throw new FsSafeError("symlink", `Refusing copy fallback through symlink destination: ${dest}`);
     }
-    if (!pathname.isFile() || !opened.isFile()) {
+    else if (!pathname.isFile() || !opened.isFile()) {
         throw new FsSafeError("not-file", `Copy fallback destination must be a regular file: ${dest}`);
     }
-    if (!sameFileIdentity(pathname, opened)) {
-        throw new FsSafeError("path-mismatch", `Copy fallback destination changed while opening: ${dest}`);
-    }
-    if (hardlinks === "reject" && opened.nlink > 1) {
-        throw new FsSafeError("hardlink", `Hardlinked copy fallback destination not allowed: ${dest}`);
+    return pathname;
+}
+function assertDestinationLinks(opened, dest, admission, hardlinks) {
+    if ((admission === "hardlinks" || hardlinks === "reject") && opened.nlink > 1n) {
+        throw new FsSafeError("hardlink", `Hardlinked ${admission === "hardlinks" ? "atomic replace" : "copy fallback"} destination not allowed: ${dest}`);
     }
 }
+function inspectPinnedDestinationSync(fsModule, fd, dest, admission, hardlinks) {
+    const opened = inspectFileIdentitySync(() => fsModule.fstatSync(fd, { bigint: true }));
+    inspectFileIdentitySync(() => admitDestinationKind(fsModule.lstatSync(dest, { bigint: true }), opened, dest, admission), opened);
+    assertDestinationLinks(opened, dest, admission, hardlinks);
+}
 async function openPinnedDestination(fsModule, dest, admission, hardlinks) {
     let preview;
     try {
         preview = fsModule === fs ? syncFs.lstatSync(dest) : await fsModule.lstat(dest);
     }
     catch (error) {
-        if (notFound(error))
+        if (hasErrorCode(error, "ENOENT"))
             return null;
         throw error;
     }
@@ -64,9 +63,13 @@ async function openPinnedDestination(fsModule, dest, admission, hardlinks) {
     }
     const handle = await fsModule.open(dest, admission === "restore" ? OPEN_READ_WRITE_FLAGS : OPEN_READ_FLAGS);
     try {
-        const opened = fsModule === fs ? syncFs.fstatSync(handle.fd) : await handle.stat();
-        const current = fsModule === fs ? syncFs.lstatSync(dest) : await fsModule.lstat(dest);
-        assertPinnedDestination(current, opened, dest, hardlinks, admission);
+        if (fsModule === fs)
+            inspectPinnedDestinationSync(syncFs, handle.fd, dest, admission, hardlinks);
+        else {
+            const opened = await inspectFileIdentity(() => handle.stat({ bigint: true }));
+            await inspectFileIdentity(async () => admitDestinationKind(await fsModule.lstat(dest, { bigint: true }), opened, dest, admission), opened);
+            assertDestinationLinks(opened, dest, admission, hardlinks);
+        }
         return handle;
     }
     catch (error) {
@@ -80,7 +83,7 @@ function openPinnedDestinationSync(fsModule, dest, admission, hardlinks) {
         preview = fsModule.lstatSync(dest);
     }
     catch (error) {
-        if (notFound(error))
+        if (hasErrorCode(error, "ENOENT"))
             return null;
         throw error;
     }
@@ -91,8 +94,7 @@ function openPinnedDestinationSync(fsModule, dest, admission, hardlinks) {
     }
     const fd = fsModule.openSync(dest, admission === "restore" ? OPEN_READ_WRITE_FLAGS : OPEN_READ_FLAGS);
     try {
-        const opened = fsModule.fstatSync(fd);
-        assertPinnedDestination(fsModule.lstatSync(dest), opened, dest, hardlinks, admission);
+        inspectPinnedDestinationSync(fsModule, fd, dest, admission, hardlinks);
         return fd;
     }
     catch (error) {
@@ -239,7 +241,7 @@ export async function copyFallbackReplace(params) {
                     ? syncFs.lstatSync(params.dest) : await params.fsModule.lstat(params.dest);
             }
             catch (error) {
-                if (!notFound(error))
+                if (!hasErrorCode(error, "ENOENT"))
                     throw error;
             }
             if (destStat?.isSymbolicLink()) {
@@ -294,7 +296,7 @@ export function copyFallbackReplaceSync(params) {
                 destStat = params.fsModule.lstatSync(params.dest);
             }
             catch (error) {
-                if (!notFound(error))
+                if (!hasErrorCode(error, "ENOENT"))
                     throw error;
             }
             if (destStat?.isSymbolicLink()) {

package/dist/replace-file-copy-source.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"replace-file-copy-source.d.ts","sourceRoot":"","sources":["../src/replace-file-copy-source.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,EAAE,EAAE,KAAK,WAAW,EAAc,MAAM,SAAS,CAAC;AAQ/D,KAAK,qBAAqB,GAAG,IAAI,CAAC,cAAc,kBAAkB,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC,CAAC;AACvF,KAAK,oBAAoB,GAAG,IAAI,CAC9B,OAAO,MAAM,EACb,WAAW,GAAG,WAAW,GAAG,WAAW,GAAG,UAAU,GAAG,UAAU,CAClE,CAAC;AA8DF,wBAAsB,mBAAmB,CAAC,MAAM,EAAE;IAChD,QAAQ,EAAE,qBAAqB,CAAC;IAChC,GAAG,EAAE,MAAM,CAAC;IACZ,gBAAgB,CAAC,EAAE,WAAW,CAAC;CAChC,GAAG,OAAO,CAAC;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAyBjD;AAED,wBAAgB,uBAAuB,CAAC,MAAM,EAAE;IAC9C,QAAQ,EAAE,oBAAoB,CAAC;IAC/B,GAAG,EAAE,MAAM,CAAC;IACZ,gBAAgB,CAAC,EAAE,WAAW,CAAC;CAChC,GAAG;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAyBxC"}
+{"version":3,"file":"replace-file-copy-source.d.ts","sourceRoot":"","sources":["../src/replace-file-copy-source.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,EAAE,EAAE,KAAK,WAAW,EAAc,MAAM,SAAS,CAAC;AAQ/D,KAAK,qBAAqB,GAAG,IAAI,CAAC,cAAc,kBAAkB,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC,CAAC;AACvF,KAAK,oBAAoB,GAAG,IAAI,CAC9B,OAAO,MAAM,EACb,WAAW,GAAG,WAAW,GAAG,WAAW,GAAG,UAAU,GAAG,UAAU,CAClE,CAAC;AA8DF,wBAAsB,mBAAmB,CAAC,MAAM,EAAE;IAChD,QAAQ,EAAE,qBAAqB,CAAC;IAChC,GAAG,EAAE,MAAM,CAAC;IACZ,gBAAgB,CAAC,EAAE,WAAW,CAAC;CAChC,GAAG,OAAO,CAAC;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAoBjD;AAED,wBAAgB,uBAAuB,CAAC,MAAM,EAAE;IAC9C,QAAQ,EAAE,oBAAoB,CAAC;IAC/B,GAAG,EAAE,MAAM,CAAC;IACZ,gBAAgB,CAAC,EAAE,WAAW,CAAC;CAChC,GAAG;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAqBxC"}

package/dist/replace-file-copy-source.js

@@ -3,8 +3,8 @@ import fs, {} from "node:fs/promises";
 import { readBoundedSync } from "./bounded-read.js";
 import { resolveReadOpenFlags } from "./read-open-flags.js";
 import { FsSafeError } from "./errors.js";
-import { sameFileIdentity } from "./file-identity.js";
 import { inspectFileIdentity, inspectFileIdentitySync } from "./strict-file-identity.js";
+import { hasErrorCode } from "./file-cleanup.js";
 const OPEN_READ_FLAGS = resolveReadOpenFlags();
 function assertSourcePreview(source, src) {
     if (source.isSymbolicLink()) {
@@ -18,10 +18,10 @@ function assertSourcePreview(source, src) {
     }
 }
 function assertOpenedSource(opened, current, src) {
-    if (!opened.isFile() || current.isSymbolicLink() || !sameFileIdentity(opened, current)) {
+    if (!opened.isFile() || current.isSymbolicLink()) {
         throw new FsSafeError("path-mismatch", `Copy fallback source changed while opening: ${src}`);
     }
-    if (opened.nlink !== 1) {
+    if (opened.nlink !== 1n) {
         throw new FsSafeError("hardlink", `Hardlinked copy fallback source not allowed: ${src}`);
     }
 }
@@ -35,7 +35,7 @@ async function openSource(fsModule, src) {
         return await fsModule.open(src, OPEN_READ_FLAGS);
     }
     catch (error) {
-        if (error.code === "ELOOP") {
+        if (hasErrorCode(error, "ELOOP")) {
             throw sourceSymlinkError(src, error);
         }
         throw error;
@@ -46,7 +46,7 @@ function openSourceSync(fsModule, src) {
         return fsModule.openSync(src, OPEN_READ_FLAGS);
     }
     catch (error) {
-        if (error.code === "ELOOP") {
+        if (hasErrorCode(error, "ELOOP")) {
             throw sourceSymlinkError(src, error);
         }
         throw error;
@@ -65,17 +65,12 @@ export async function readOwnedCopySource(params) {
         ? syncFs.lstatSync(params.src) : await params.fsModule.lstat(params.src), params.src);
     const handle = await openSource(params.fsModule, params.src);
     try {
-        if (params.expectedIdentity) {
-            const exact = await inspectFileIdentity(() => params.fsModule === fs
-                ? syncFs.fstatSync(handle.fd, { bigint: true }) : handle.stat({ bigint: true }), params.expectedIdentity);
-            await inspectFileIdentity(() => params.fsModule === fs
-                ? syncFs.lstatSync(params.src, { bigint: true }) : params.fsModule.lstat(params.src, { bigint: true }), exact);
-        }
-        const opened = params.fsModule === fs ? syncFs.fstatSync(handle.fd) : await handle.stat();
-        const current = params.fsModule === fs
-            ? syncFs.lstatSync(params.src) : await params.fsModule.lstat(params.src);
+        const opened = await inspectFileIdentity(() => params.fsModule === fs
+            ? syncFs.fstatSync(handle.fd, { bigint: true }) : handle.stat({ bigint: true }), params.expectedIdentity);
+        const current = await inspectFileIdentity(() => params.fsModule === fs
+            ? syncFs.lstatSync(params.src, { bigint: true }) : params.fsModule.lstat(params.src, { bigint: true }), opened);
         assertOpenedSource(opened, current, params.src);
-        return { replacement: await handle.readFile(), mode: opened.mode };
+        return { replacement: await handle.readFile(), mode: Number(opened.mode) };
     }
     finally {
         await handle.close().catch(() => undefined);
@@ -85,14 +80,10 @@ export function readOwnedCopySourceSync(params) {
     assertSourcePreview(params.fsModule.lstatSync(params.src), params.src);
     const fd = openSourceSync(params.fsModule, params.src);
     try {
-        if (params.expectedIdentity) {
-            const exact = inspectFileIdentitySync(() => params.fsModule.fstatSync(fd, { bigint: true }), params.expectedIdentity);
-            inspectFileIdentitySync(() => params.fsModule.lstatSync(params.src, { bigint: true }), exact);
-        }
-        const opened = params.fsModule.fstatSync(fd);
-        const current = params.fsModule.lstatSync(params.src);
+        const opened = inspectFileIdentitySync(() => params.fsModule.fstatSync(fd, { bigint: true }), params.expectedIdentity);
+        const current = inspectFileIdentitySync(() => params.fsModule.lstatSync(params.src, { bigint: true }), opened);
         assertOpenedSource(opened, current, params.src);
-        return { replacement: readAllSync(params.fsModule, fd, opened.size), mode: opened.mode };
+        return { replacement: readAllSync(params.fsModule, fd, Number(opened.size)), mode: Number(opened.mode) };
     }
     finally {
         try {

package/dist/replace-file-descriptor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"replace-file-descriptor.d.ts","sourceRoot":"","sources":["../src/replace-file-descriptor.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,EAAE,EAAE,KAAK,WAAW,EAAc,MAAM,SAAS,CAAC;AAC/D,OAAO,EAAE,EAAE,EAAE,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAIvD,OAAO,EAA0C,KAAK,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAE5G,KAAK,mBAAmB,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,OAAO,GAAG,MAAM,GAAG,WAAW,CAAC,CAAC;AAC3E,KAAK,kBAAkB,GAAG,IAAI,CAC5B,OAAO,MAAM,EACb,WAAW,GAAG,WAAW,GAAG,WAAW,GAAG,WAAW,GAAG,UAAU,GAAG,eAAe,CACrF,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;AAE5D,wBAAsB,uBAAuB,CAC3C,QAAQ,EAAE,IAAI,CAAC,OAAO,EAAE,EAAE,MAAM,CAAC,EACjC,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC,CAUf;AAED,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,IAAI,CAAC,OAAO,MAAM,EAAE,UAAU,GAAG,WAAW,GAAG,WAAW,CAAC,EACrE,OAAO,EAAE,MAAM,GACd,IAAI,CAgBN;AA2BD,wBAAsB,mBAAmB,CAAC,MAAM,EAAE;IAChD,QAAQ,EAAE,mBAAmB,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,4FAA4F;IAC5F,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,GAAG,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC,CA6B1C;AAED,wBAAsB,kBAAkB,CAAC,MAAM,EAAE;IAC/C,QAAQ,EAAE,mBAAmB,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,GAAG,OAAO,CAAC,IAAI,CAAC,CAOhB;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE;IAC7C,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB,GAAG,IAAI,CAeP;AAED,wBAAsB,aAAa,CAAC,MAAM,EAAE;IAC1C,QAAQ,EAAE,mBAAmB,CAAC;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,GAAG,UAAU,CAAC;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,OAAO,CAAC;IACd,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,WAAW,KAAK,IAAI,CAAC;CAC9C,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,UAAU,CAAC;IAAC,QAAQ,EAAE,WAAW,CAAA;CAAE,CAAC,CAuBzD;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE;IACxC,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,GAAG,UAAU,CAAC;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,IAAI,EAAE,OAAO,CAAC;IACd,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,WAAW,KAAK,IAAI,CAAC;CAC9C,GAAG;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,WAAW,CAAA;CAAE,CAoBxC"}
+{"version":3,"file":"replace-file-descriptor.d.ts","sourceRoot":"","sources":["../src/replace-file-descriptor.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,EAAE,EAAE,KAAK,WAAW,EAAc,MAAM,SAAS,CAAC;AAC/D,OAAO,EAAE,EAAE,EAAE,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAGvD,OAAO,EAAoB,KAAK,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAEtF,KAAK,mBAAmB,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,OAAO,GAAG,MAAM,GAAG,WAAW,CAAC,CAAC;AAC3E,KAAK,kBAAkB,GAAG,IAAI,CAC5B,OAAO,MAAM,EACb,WAAW,GAAG,WAAW,GAAG,WAAW,GAAG,WAAW,GAAG,UAAU,GAAG,eAAe,CACrF,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;AAE5D,wBAAsB,uBAAuB,CAC3C,QAAQ,EAAE,IAAI,CAAC,OAAO,EAAE,EAAE,MAAM,CAAC,EACjC,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC,CAUf;AAED,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,IAAI,CAAC,OAAO,MAAM,EAAE,UAAU,GAAG,WAAW,GAAG,WAAW,CAAC,EACrE,OAAO,EAAE,MAAM,GACd,IAAI,CAgBN;AAkBD,wBAAsB,mBAAmB,CAAC,MAAM,EAAE;IAChD,QAAQ,EAAE,mBAAmB,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,4FAA4F;IAC5F,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,GAAG,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC,CA8B1C;AAED,wBAAsB,kBAAkB,CAAC,MAAM,EAAE;IAC/C,QAAQ,EAAE,mBAAmB,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,GAAG,OAAO,CAAC,IAAI,CAAC,CAOhB;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE;IAC7C,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB,GAAG,IAAI,CAcP;AAED,wBAAsB,aAAa,CAAC,MAAM,EAAE;IAC1C,QAAQ,EAAE,mBAAmB,CAAC;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,GAAG,UAAU,CAAC;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,OAAO,CAAC;IACd,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,WAAW,KAAK,IAAI,CAAC;CAC9C,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,UAAU,CAAC;IAAC,QAAQ,EAAE,WAAW,CAAA;CAAE,CAAC,CAuBzD;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE;IACxC,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,GAAG,UAAU,CAAC;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,IAAI,EAAE,OAAO,CAAC;IACd,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,WAAW,KAAK,IAAI,CAAC;CAC9C,GAAG;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,WAAW,CAAA;CAAE,CAoBxC"}