@poe-platform/safe-fs 0.1.732 → 0.1.734

package/dist/safe-fs/fs/capabilities.js

@@ -1,6 +1,44 @@
 import { FsError, toFsError } from "../contracts/errors.js";
 import { finishCleanup } from "../contracts/cleanup.js";
 import { inspectStagingBindings } from "./staging-ancestry.js";
+const signalWaiters = new WeakMap();
+function getSignalWaiters(signal) {
+    let entry = signalWaiters.get(signal);
+    if (!entry) {
+        const waiters = new Set();
+        const listener = () => {
+            signalWaiters.delete(signal);
+            signal.removeEventListener("abort", listener);
+            const pending = [...waiters];
+            waiters.clear();
+            for (const fn of pending)
+                fn();
+        };
+        entry = { waiters, listener };
+        signalWaiters.set(signal, entry);
+        signal.addEventListener("abort", listener, { once: true });
+    }
+    return entry;
+}
+function releaseSignalWaiter(signal, entry, abort) {
+    entry.waiters.delete(abort);
+    if (entry.waiters.size === 0 && signalWaiters.get(signal) === entry) {
+        signalWaiters.delete(signal);
+        signal.removeEventListener("abort", entry.listener);
+    }
+}
+function awaitWithSignal(promise, signal) {
+    if (!signal)
+        return promise;
+    return new Promise((resolve, reject) => {
+        const entry = getSignalWaiters(signal);
+        const abort = () => { releaseSignalWaiter(signal, entry, abort); reject(signal.reason); };
+        entry.waiters.add(abort);
+        promise.then(value => { releaseSignalWaiter(signal, entry, abort); resolve(value); }, error => { releaseSignalWaiter(signal, entry, abort); reject(error); });
+        if (signal.aborted)
+            abort();
+    });
+}
 export function retainedReadCapabilities(filesystem, capabilities = filesystem.capabilities) {
     return typeof filesystem.openReadFile === "function" ? capabilities : { ...capabilities, retainedRead: false };
 }
@@ -16,13 +54,7 @@ export async function openRetainedReadFile(filesystem, path, options) {
         const query = filesystem.capabilitiesFor;
         signal?.throwIfAborted();
         const metadata = Promise.resolve(query == null ? undefined : Reflect.apply(query, filesystem, [path, options]));
-        const queried = await (signal ? new Promise((resolve, reject) => {
-            const abort = () => { signal.removeEventListener("abort", abort); reject(signal.reason); };
-            signal.addEventListener("abort", abort, { once: true });
-            metadata.then(value => { signal.removeEventListener("abort", abort); resolve(value); }, error => { signal.removeEventListener("abort", abort); reject(error); });
-            if (signal.aborted)
-                abort();
-        }) : metadata);
+        const queried = await awaitWithSignal(metadata, signal);
         signal?.throwIfAborted();
         const capabilities = queried ?? filesystem.capabilities;
         signal?.throwIfAborted();
@@ -68,13 +100,7 @@ export async function openRetainedResizeFile(filesystem, path, options) {
         const intent = { ...(signal === undefined ? {} : { signal }), create: options.create === true };
         signal?.throwIfAborted();
         const metadata = Promise.resolve(query === undefined ? filesystem.capabilities : Reflect.apply(query, filesystem, [path, intent]));
-        const capabilities = await (signal ? new Promise((resolve, reject) => {
-            const abort = () => { signal.removeEventListener("abort", abort); reject(signal.reason); };
-            signal.addEventListener("abort", abort, { once: true });
-            metadata.then(value => { signal.removeEventListener("abort", abort); resolve(value); }, error => { signal.removeEventListener("abort", abort); reject(error); });
-            if (signal.aborted)
-                abort();
-        }) : metadata);
+        const capabilities = await awaitWithSignal(metadata, signal);
         signal?.throwIfAborted();
         const readOnly = capabilities.readOnly;
         signal?.throwIfAborted();

package/dist/safe-fs/fs/memory/index.js

@@ -257,8 +257,8 @@ class FastDirectoryEntriesMap {
                 table[slot] = -2;
                 keys[idx] = "";
                 this._vals[idx] = DUMMY_POOL_FILE_NODE;
-                if (idx === this._next - 1)
-                    this._next--;
+                // Keep deleted indices until compaction: reusing the tail would let
+                // tombstones fill the table without reaching set()'s rebuild threshold.
                 this.size--;
                 return true;
             }

package/dist/safe-fs/fs/scoped.js

@@ -81,9 +81,20 @@ export function scopeFileSystem(filesystem, charge, signal, cleanupCharge = char
             close() { closed = true; return close(); },
         };
     };
+    let cachedCallerSignal;
+    let cachedCombinedSignal;
+    const combineSignal = (callerSignal) => {
+        if (!callerSignal || callerSignal === signal)
+            return signal;
+        if (callerSignal === cachedCallerSignal && cachedCombinedSignal)
+            return cachedCombinedSignal;
+        cachedCallerSignal = callerSignal;
+        cachedCombinedSignal = AbortSignal.any([signal, callerSignal]);
+        return cachedCombinedSignal;
+    };
     const resizeOptions = (options) => {
         const scopedOptions = {
-            ...options, signal: options.signal ? AbortSignal.any([signal, options.signal]) : signal,
+            ...options, signal: combineSignal(options.signal),
         };
         scopedOptions.signal.throwIfAborted();
         return scopedOptions;
@@ -253,7 +264,7 @@ export function scopeFileSystem(filesystem, charge, signal, cleanupCharge = char
                     if (property === "createStagedFile")
                         args[3] = snapshotStagingCreation(args[3], args[0]);
                     const callerSignal = args[property === "createStagedFile" ? 3 : 2]?.signal;
-                    stagingSignal = callerSignal && callerSignal !== signal ? AbortSignal.any([signal, callerSignal]) : signal;
+                    stagingSignal = combineSignal(callerSignal);
                     stagingSignal.throwIfAborted();
                 }
                 if (operations.has(property)) {
@@ -496,6 +507,10 @@ export function scopeFileSystem(filesystem, charge, signal, cleanupCharge = char
     originals.set(view, originalRecord);
     retargeters.set(view, (nextCharge, nextSignal, nextCleanupCharge, nextMaxPathComponents) => {
         charge = nextCharge;
+        if (signal !== nextSignal) {
+            cachedCallerSignal = undefined;
+            cachedCombinedSignal = undefined;
+        }
         signal = nextSignal;
         cleanupCharge = nextCleanupCharge;
         maxPathComponents = nextMaxPathComponents ?? originals.get(filesystem)?.maxPathComponents;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@poe-platform/safe-fs",
-  "version": "0.1.732",
+  "version": "0.1.734",
   "description": "Composable filesystem with a portable core and explicit Node adapters",
   "type": "module",
   "license": "MIT",