@effect-vfs/core 0.6.0 → 0.7.0

package/dist/internal/snapshotDelta.js

@@ -1,6 +1,8 @@
 import * as ByteSize from "effect/ByteSize";
 import * as Effect from "effect/Effect";
 import * as Encoding from "effect/Encoding";
+import * as Match from "effect/Match";
+import * as Order from "effect/Order";
 import * as Result from "effect/Result";
 import * as Schema from "effect/Schema";
 import { SnapshotChange, SnapshotDifference, SnapshotNodeKind } from "../SnapshotDelta.js";
@@ -261,17 +263,9 @@ const deltaNode = (target, path, node, withPayload) => {
         return DeltaNode.cases.link.make({ to: CanonicalBase64.encode(first) }, UNCHECKED);
     }
     const metadata = storedMetadata(node.metadata);
-    if (node.kind === "directory")
-        return DeltaNode.cases.directory.make({ metadata }, UNCHECKED);
-    if (!withPayload) {
-        return node.kind === "file"
-            ? DeltaNode.cases.file.make({ metadata }, UNCHECKED)
-            : DeltaNode.cases.symlink.make({ metadata }, UNCHECKED);
-    }
-    const bytes = CanonicalBase64.encode(payloadOf(node));
-    return node.kind === "file"
-        ? DeltaNode.cases.file.make({ metadata, content: InlineContent.make({ bytes }, UNCHECKED) }, UNCHECKED)
-        : DeltaNode.cases.symlink.make({ metadata, target: bytes }, UNCHECKED);
+    return Match.value(node).pipe(Match.discriminator("kind")("directory", () => DeltaNode.cases.directory.make({ metadata }, UNCHECKED)), Match.discriminator("kind")("file", (file) => DeltaNode.cases.file.make(withPayload
+        ? { metadata, content: InlineContent.make({ bytes: CanonicalBase64.encode(file.data) }, UNCHECKED) }
+        : { metadata }, UNCHECKED)), Match.discriminator("kind")("symlink", (symlink) => DeltaNode.cases.symlink.make(withPayload ? { metadata, target: CanonicalBase64.encode(symlink.target) } : { metadata }, UNCHECKED)), Match.exhaustive);
 };
 const lookup = (get, entriesOf, path) => {
     let parent = ROOT_INO;
@@ -365,7 +359,7 @@ const compare = (base, target) => {
             }
         }
     }
-    return changes.sort((a, b) => bytesOrder(a.path, b.path)).map(({ change }) => change);
+    return changes.sort(Order.mapInput(bytesOrder, (entry) => entry.path)).map(({ change }) => change);
 };
 const getDocument = (delta) => Effect.suspend(() => {
     const value = SnapshotDeltaModel.value(delta);
@@ -622,7 +616,7 @@ const foldedIdentity = Effect.fnUntraced(function* (base, folded, identity, limi
     // Digest children before their directories.
     const ordered = [
         ...nodes.filter((node) => node.kind !== "directory"),
-        ...directories.sort((a, b) => depth(b) - depth(a))
+        ...directories.sort(Order.flip(Order.mapInput(Order.Number, depth)))
     ];
     for (const node of ordered)
         digests.set(node.ino, yield* Merkle.nodeDigest(node, digestOf, measure));

package/dist/internal/tree.d.ts.map

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

package/dist/internal/tree.js

@@ -1,6 +1,7 @@
 // Validate each tree line as it arrives; check cross-node graph rules after the final line.
 import * as Effect from "effect/Effect";
 import * as Encoding from "effect/Encoding";
+import * as Match from "effect/Match";
 import * as Predicate from "effect/Predicate";
 import * as Result from "effect/Result";
 import * as Schema from "effect/Schema";
@@ -323,18 +324,17 @@ export const UNCHECKED = { disableChecks: true };
 /** @internal */
 export const treeNode = (node) => {
     const metadata = storedMetadata(node.metadata);
-    if (node.kind === "directory") {
-        return TreeNode.cases.directory.make({ ino: node.ino, parent: node.parent, name: encodeName(node.name), metadata }, UNCHECKED);
-    }
-    const named = node.links.map((link) => ({ parent: link.parent, name: encodeName(link.name) }));
-    return node.kind === "file"
-        ? TreeNode.cases.file.make({
-            ino: node.ino,
-            links: named,
-            content: TreeContent.cases.Inline.make({ bytes: CanonicalBase64.encode(node.data) }, UNCHECKED),
-            metadata
-        }, UNCHECKED)
-        : TreeNode.cases.symlink.make({ ino: node.ino, links: named, target: CanonicalBase64.encode(node.target), metadata }, UNCHECKED);
+    return Match.value(node).pipe(Match.discriminator("kind")("directory", (directory) => TreeNode.cases.directory.make({ ino: directory.ino, parent: directory.parent, name: encodeName(directory.name), metadata }, UNCHECKED)), Match.discriminator("kind")("file", (file) => TreeNode.cases.file.make({
+        ino: file.ino,
+        links: file.links.map((link) => ({ parent: link.parent, name: encodeName(link.name) })),
+        content: TreeContent.cases.Inline.make({ bytes: CanonicalBase64.encode(file.data) }, UNCHECKED),
+        metadata
+    }, UNCHECKED)), Match.discriminator("kind")("symlink", (symlink) => TreeNode.cases.symlink.make({
+        ino: symlink.ino,
+        links: symlink.links.map((link) => ({ parent: link.parent, name: encodeName(link.name) })),
+        target: CanonicalBase64.encode(symlink.target),
+        metadata
+    }, UNCHECKED)), Match.exhaustive);
 };
 /** @internal */
 export const treeNodes = Effect.fnUntraced(function* (value, extra = []) {

package/dist/internal/virtualFileSystem.d.ts

@@ -1,4 +1,5 @@
 import * as ByteSize from "effect/ByteSize";
+import * as Crypto from "effect/Crypto";
 import * as Data from "effect/Data";
 import * as Effect from "effect/Effect";
 import type { Snapshot } from "../Snapshot.js";
@@ -6,8 +7,13 @@ import { type FsFailure, type ImageFailure } from "../VfsError.js";
 import type { OverlayVolume, Volume, VolumeLimits } from "../VirtualFileSystem.js";
 import * as LiveImage from "./liveImage.js";
 import { type ObservationEntry } from "./overlayDiff.js";
-import { type CommitProvider } from "./stagedState.js";
 import { type VolumeState } from "./volumeState.js";
+type CommitOutcome = "committed" | "rejected" | "unknown";
+interface CommitProvider<State> {
+    /** Preparation failures leave the volume available. */
+    readonly prepare?: (candidate: State) => Effect.Effect<void, FsFailure>;
+    readonly commit: (candidate: State) => Effect.Effect<CommitOutcome>;
+}
 type VolumeSource = {
     readonly _tag: "Empty";
 } | {
@@ -74,7 +80,7 @@ export declare const makeVolume: (source: VolumeSource, options?: {
             observation: ObservationEntry[];
         }, FsFailure, never>;
     }>;
-}>, import("../VfsError.js").ArgumentFailure | ImageFailure, never>;
+}>, import("../VfsError.js").ArgumentFailure | ImageFailure, Crypto.Crypto>;
 /** @internal */
 export declare const make: (options?: {
     readonly identity?: string & import("effect/Brand").Brand<"@effect-vfs/core/VolumeIdentity">;
@@ -84,7 +90,7 @@ export declare const make: (options?: {
     readonly maxBytes?: ByteSize.ByteSize;
     readonly maxFileBytes?: ByteSize.ByteSize;
     readonly maxPathBytes?: ByteSize.ByteSize;
-} | undefined) => Effect.Effect<Volume, import("../VfsError.js").ArgumentFailure, never>;
+} | undefined) => Effect.Effect<Volume, import("../VfsError.js").ArgumentFailure, Crypto.Crypto>;
 /** @internal */
 export declare const prepareEmptyLiveImage: (options?: {
     readonly identity?: string & import("effect/Brand").Brand<"@effect-vfs/core/VolumeIdentity">;
@@ -94,12 +100,12 @@ export declare const prepareEmptyLiveImage: (options?: {
     readonly maxBytes?: ByteSize.ByteSize;
     readonly maxFileBytes?: ByteSize.ByteSize;
     readonly maxPathBytes?: ByteSize.ByteSize;
-} | undefined) => Effect.Effect<Uint8Array<ArrayBufferLike>, import("../VfsError.js").ArgumentFailure | ImageFailure, never>;
+} | undefined) => Effect.Effect<Uint8Array<ArrayBufferLike>, import("../VfsError.js").ArgumentFailure | ImageFailure, Crypto.Crypto>;
 /** @internal */
 export declare const openImageVolume: (image: Uint8Array<ArrayBufferLike>, maxImageBytes: ByteSize.ByteSize, commit: (image: Uint8Array) => Effect.Effect<"committed" | "rejected" | "unknown">, durability?: "memory-only" | "survives-operating-system-crash" | "survives-power-loss" | "survives-process-crash" | undefined) => Effect.Effect<Readonly<{
     volume: Volume;
     shutdown: Effect.Effect<void, never, never>;
-}>, import("../VfsError.js").ArgumentFailure | ImageFailure, never>;
+}>, import("../VfsError.js").ArgumentFailure | ImageFailure, Crypto.Crypto>;
 /** @internal */
 export declare const fromSnapshot: (snapshot: Snapshot, options?: {
     readonly identity?: string & import("effect/Brand").Brand<"@effect-vfs/core/VolumeIdentity">;
@@ -109,7 +115,7 @@ export declare const fromSnapshot: (snapshot: Snapshot, options?: {
     readonly maxBytes?: ByteSize.ByteSize;
     readonly maxFileBytes?: ByteSize.ByteSize;
     readonly maxPathBytes?: ByteSize.ByteSize;
-} | undefined) => Effect.Effect<Volume, import("../VfsError.js").ArgumentFailure | ImageFailure, never>;
+} | undefined) => Effect.Effect<Volume, import("../VfsError.js").ArgumentFailure | ImageFailure, Crypto.Crypto>;
 /** @internal */
 export declare const makeOverlay: (base: Snapshot, options?: {
     readonly identity?: string & import("effect/Brand").Brand<"@effect-vfs/core/VolumeIdentity">;
@@ -119,6 +125,6 @@ export declare const makeOverlay: (base: Snapshot, options?: {
     readonly maxBytes?: ByteSize.ByteSize;
     readonly maxFileBytes?: ByteSize.ByteSize;
     readonly maxPathBytes?: ByteSize.ByteSize;
-} | undefined) => Effect.Effect<OverlayVolume, import("../VfsError.js").ArgumentFailure | ImageFailure, never>;
+} | undefined) => Effect.Effect<OverlayVolume, import("../VfsError.js").ArgumentFailure | ImageFailure, Crypto.Crypto>;
 export {};
 //# sourceMappingURL=virtualFileSystem.d.ts.map

package/dist/internal/virtualFileSystem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"virtualFileSystem.d.ts","sourceRoot":"","sources":["../../src/internal/virtualFileSystem.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAA;AAG3C,OAAO,KAAK,IAAI,MAAM,aAAa,CAAA;AACnC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AA4BvC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAE9C,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,YAAY,EAAqB,MAAM,gBAAgB,CAAA;AACrF,OAAO,KAAK,EAMV,aAAa,EAEb,MAAM,EACN,YAAY,EAIb,MAAM,yBAAyB,CAAA;AA2BhC,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAA;AAE3C,OAAO,EAAkB,KAAK,gBAAgB,EAAyB,MAAM,kBAAkB,CAAA;AAmB/F,OAAO,EAAE,KAAK,cAAc,EAAe,MAAM,kBAAkB,CAAA;AAGnE,OAAO,EAeL,KAAK,WAAW,EAEjB,MAAM,kBAAkB,CAAA;AA+RzB,KAAK,YAAY,GACb;IAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAA;CAAE,GAC1B;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC,QAAQ,CAAA;CAAE,GAChE;IAAE,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAA;CAAE,CAAA;AAE9D,gBAAgB;AAChB,eAAO,MAAM,YAAY;;uBALJ,OAAO;;;;uBACP,MAAM;2BAAqB,SAAS,CAAC,QAAQ;;;;uBAC7C,UAAU;wBAAkB,WAAW;;;;;;;;;;;;;uBAFvC,OAAO;;;uBACP,MAAM;2BAAqB,SAAS,CAAC,QAAQ;;;uBAC7C,UAAU;wBAAkB,WAAW;;CAGD,CAAA;AA4E3D,gBAAgB;AAChB,eAAO,MAAM,UAAU;;;;;;;;mGAMV,WAAW,UACV,SAAS,CAAC,MAAM,UAChB,YAAY,KACjB,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,YAAY,CAAC;;;;;;;;;;;mEAkmG/C,CAAA;AAED,gBAAgB;AAChB,eAAO,MAAM,IAAI;;;;;;;;wFAIf,CAAA;AAEF,gBAAgB;AAChB,eAAO,MAAM,qBAAqB;;;;;;;;4HAShC,CAAA;AAEF,gBAAgB;AAChB,eAAO,MAAM,eAAe,yFAGV,UAAU,KAAK,MAAM,CAAC,MAAM,CAAC,WAAW,GAAG,UAAU,GAAG,SAAS,CAAC;;;mEA+ClF,CAAA;AAeF,gBAAgB;AAChB,eAAO,MAAM,YAAY;;;;;;;;uGAKxB,CAAA;AAED,gBAAgB;AAChB,eAAO,MAAM,WAAW;;;;;;;;8GAkCvB,CAAA"}
+{"version":3,"file":"virtualFileSystem.d.ts","sourceRoot":"","sources":["../../src/internal/virtualFileSystem.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAA;AAE3C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,IAAI,MAAM,aAAa,CAAA;AACnC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AA4BvC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAE9C,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,YAAY,EAAqB,MAAM,gBAAgB,CAAA;AACrF,OAAO,KAAK,EAMV,aAAa,EAEb,MAAM,EACN,YAAY,EAIb,MAAM,yBAAyB,CAAA;AA2BhC,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAA;AAE3C,OAAO,EAAkB,KAAK,gBAAgB,EAAyB,MAAM,kBAAkB,CAAA;AAqB/F,OAAO,EAgBL,KAAK,WAAW,EAEjB,MAAM,kBAAkB,CAAA;AAWzB,KAAK,aAAa,GAAG,WAAW,GAAG,UAAU,GAAG,SAAS,CAAA;AAEzD,UAAU,cAAc,CAAC,KAAK;IAC5B,uDAAuD;IACvD,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;IACvE,QAAQ,CAAC,MAAM,EAAE,CAAC,SAAS,EAAE,KAAK,KAAK,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;CACpE;AAwTD,KAAK,YAAY,GACb;IAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAA;CAAE,GAC1B;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC,QAAQ,CAAA;CAAE,GAChE;IAAE,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAA;CAAE,CAAA;AAE9D,gBAAgB;AAChB,eAAO,MAAM,YAAY;;uBALJ,OAAO;;;;uBACP,MAAM;2BAAqB,SAAS,CAAC,QAAQ;;;;uBAC7C,UAAU;wBAAkB,WAAW;;;;;;;;;;;;;uBAFvC,OAAO;;;uBACP,MAAM;2BAAqB,SAAS,CAAC,QAAQ;;;uBAC7C,UAAU;wBAAkB,WAAW;;CAGD,CAAA;AAsD3D,gBAAgB;AAChB,eAAO,MAAM,UAAU;;;;;;;;mGAMV,WAAW,UACV,SAAS,CAAC,MAAM,UAChB,YAAY,KACjB,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,YAAY,CAAC;;;;;;;;;;;2EAmmG/C,CAAA;AAED,gBAAgB;AAChB,eAAO,MAAM,IAAI;;;;;;;;gGAIf,CAAA;AAEF,gBAAgB;AAChB,eAAO,MAAM,qBAAqB;;;;;;;;oIAShC,CAAA;AAEF,gBAAgB;AAChB,eAAO,MAAM,eAAe,yFAGV,UAAU,KAAK,MAAM,CAAC,MAAM,CAAC,WAAW,GAAG,UAAU,GAAG,SAAS,CAAC;;;2EA+ClF,CAAA;AAeF,gBAAgB;AAChB,eAAO,MAAM,YAAY;;;;;;;;+GAKxB,CAAA;AAED,gBAAgB;AAChB,eAAO,MAAM,WAAW;;;;;;;;sHAkCvB,CAAA"}

package/dist/internal/virtualFileSystem.js

@@ -1,3 +1,4 @@
+import * as Arr from "effect/Array";
 import * as ByteSize from "effect/ByteSize";
 import * as Clock from "effect/Clock";
 import * as Crypto from "effect/Crypto";
@@ -5,9 +6,9 @@ import * as Data from "effect/Data";
 import * as Effect from "effect/Effect";
 import * as Encoding from "effect/Encoding";
 import * as Exit from "effect/Exit";
+import * as Match from "effect/Match";
 import * as Option from "effect/Option";
 import * as Predicate from "effect/Predicate";
-import * as Random from "effect/Random";
 import * as Result from "effect/Result";
 import * as Schema from "effect/Schema";
 import * as Scope from "effect/Scope";
@@ -31,10 +32,9 @@ import * as LiveImage from "./liveImage.js";
 import * as MetadataDomain from "./metadata.js";
 import { compareOverlay } from "./overlayDiff.js";
 import { DOT_DOT_HEX, DOT_HEX, inputBytes, isAttachedBytes, isDotComponent, isWellFormed, joinPath, MAX_NAME_BYTES, MAX_SYMLINK_TRAVERSALS, nameBytes, ownedPath, preparePath, ROOT_PATH, SLASH_BYTE, SLASH_HEX } from "./path.js";
-import { offerCommit } from "./stagedState.js";
 import { VolumeTestSeams } from "./testSeams.js";
 import { makeTurnstile } from "./turnstile.js";
-import { directoryMetadata, emptyRoot, getNode, Ino, MAX_FILE_BYTES, reachableValue, ROOT_INO, storedMetadata, WALK_YIELD_INTERVAL } from "./volumeState.js";
+import { byEntryName, directoryMetadata, emptyRoot, getNode, Ino, MAX_FILE_BYTES, reachableValue, ROOT_INO, storedMetadata, WALK_YIELD_INTERVAL } from "./volumeState.js";
 import * as WatchHub from "./watchHub.js";
 const EXECUTE = 0o1;
 const WRITE = 0o2;
@@ -43,6 +43,20 @@ const ANY_EXECUTE = 0o111;
 const SET_ID_BITS = 0o6000;
 const STICKY_BIT = 0o1000;
 const RELATIME_INTERVAL_NS = 86400000000000n; // relatime, as Linux mounts by default: a read refreshes an access time at least this old, 24 hours.
+// An unknown commit outcome stops the volume; definite rejection stops it only during cleanup.
+const offerCommit = (provider, operation, candidate, cleanup) => Effect.map(Effect.exit(Effect.suspend(() => provider.commit(candidate))), (committed) => {
+    // TODO(#186): Preserve the cause of a provider defect or interruption.
+    if (Exit.isFailure(committed)) {
+        return { available: false, failure: fsFailure("OutcomeUnknown", operation) };
+    }
+    if (committed.value === "rejected") {
+        return { available: !cleanup, failure: fsFailure("StorageRejected", operation) };
+    }
+    if (committed.value === "unknown") {
+        return { available: false, failure: fsFailure("OutcomeUnknown", operation) };
+    }
+    return { available: true, failure: undefined };
+});
 const WALK_CHUNK_ENTRIES = 128;
 const MAX_FILE_OFFSET = 0x7fffffffffffffffn;
 const isMode = Schema.is(Mode);
@@ -55,7 +69,7 @@ const decodeOwnerUpdate = Schema.decodeEffect(OwnerUpdate, { onExcessProperty: "
 const decodeTimes = Schema.decodeEffect(Times, { onExcessProperty: "error" });
 const decodeExpected = Schema.decodeEffect(SetattrOptions.fields.expected.schema, { onExcessProperty: "error" });
 const SETATTR_FIELDS = Object.keys(SetattrOptions.fields);
-const timeAt = (update, value, now) => update === undefined || update.kind === "omit" ? value : update.kind === "now" ? now : update.nanoseconds;
+const timeAt = (update, value, now) => update === undefined ? value : Match.value(update).pipe(Match.discriminator("kind")("omit", () => value), Match.discriminator("kind")("now", () => now), Match.discriminator("kind")("value", ({ nanoseconds }) => nanoseconds), Match.exhaustive);
 const decodeWriteFileOptions = Schema.decodeEffect(WriteFileOptions, { onExcessProperty: "error" });
 const decodeOpenOptions = Schema.decodeEffect(OpenOptions, { onExcessProperty: "error" });
 const decodeMkdirOptions = Schema.decodeEffect(MkdirOptions, { onExcessProperty: "error" });
@@ -212,28 +226,14 @@ const observeChanges = Effect.fnUntraced(function* (captured) {
     return observation;
 });
 const randomHex128 = Effect.gen(function* () {
-    const crypto = yield* Effect.serviceOption(Crypto.Crypto);
-    if (Option.isSome(crypto))
-        return Encoding.encodeHex(yield* Effect.orDie(crypto.value.randomBytes(16)));
-    let hex = "";
-    for (let draw = 0; draw < 4; draw++) {
-        hex += (yield* Random.nextIntBetween(0, 0x100000000, { halfOpen: true })).toString(16).padStart(8, "0");
-    }
-    return hex;
-});
-// The 128-bit secret behind every key's tag, always from the platform's cryptographically secure generator. Unlike an
-// identity or an epoch it must not follow a seedable Random: every key hands out the identity and epoch, so a
-// reproducible secret would let one key forge the tag of any other inode. Web Crypto is global in every supported
-// runtime, so reading it adds no service requirement; a runtime without it is a defect, not a recoverable failure.
-const randomKeySecret = Effect.sync(() => {
-    const webCrypto = globalThis.crypto;
-    if (webCrypto === undefined) {
-        throw new Error("globalThis.crypto is unavailable, so a volume cannot draw its reference-key secret");
-    }
-    return Encoding.encodeHex(webCrypto.getRandomValues(new Uint8Array(16)));
-});
+    const crypto = yield* Crypto.Crypto;
+    return Encoding.encodeHex(yield* crypto.randomBytes(16));
+}).pipe(Effect.orDie);
 /** @internal */
 export const makeVolume = Effect.fnUntraced(function* (source, options, commitProvider, captureInitial, durability = "memory-only") {
+    const services = yield* Effect.context();
+    // These accessors run inside synchronous transition callbacks. The runner is reached only when an invariant fails.
+    const dieInvariant = (message) => Effect.runSyncWith(services)(Effect.die(message));
     const live = Predicate.isTagged("Live")(source) ? source.restored : undefined;
     let restoredOptions = options;
     if (live !== undefined) {
@@ -255,7 +255,7 @@ export const makeVolume = Effect.fnUntraced(function* (source, options, commitPr
         : VolumeIdentity.make(settings.identity);
     const incarnation = VolumeIncarnation.make(yield* randomHex128);
     const epoch = live === undefined ? VolumeEpoch.make(yield* randomHex128) : live.epoch;
-    const keySecret = live === undefined ? KeySecret.make(yield* randomKeySecret) : live.keySecret;
+    const keySecret = live === undefined ? KeySecret.make(yield* randomHex128) : live.keySecret;
     const identityBytes = Result.getOrThrow(Encoding.decodeHex(identity));
     const epochBytes = Result.getOrThrow(Encoding.decodeHex(epoch));
     const keySecretBytes = Result.getOrThrow(Encoding.decodeHex(keySecret));
@@ -421,7 +421,7 @@ export const makeVolume = Effect.fnUntraced(function* (source, options, commitPr
     }));
     const current = () => {
         if (draft === undefined)
-            throw new Error("Volume mutation outside a transition");
+            return dieInvariant("Volume mutation outside a transition");
         return draft;
     };
     const pathOf = (get, ino) => {
@@ -913,14 +913,15 @@ export const makeVolume = Effect.fnUntraced(function* (source, options, commitPr
         };
         const directoryNow = (ino) => {
             const node = view(ino);
-            if (node?.kind !== "directory")
-                throw new Error("Directory left the inode table during a transition");
+            if (node?.kind !== "directory") {
+                return dieInvariant("Directory left the inode table during a transition");
+            }
             return node;
         };
         const nodeNow = (ino) => {
             const node = view(ino);
             if (node === undefined)
-                throw new Error("Inode left the table during a transition");
+                return dieInvariant("Inode left the table during a transition");
             return node;
         };
         const creationTimes = (times, now) => ({
@@ -1740,29 +1741,26 @@ export const makeVolume = Effect.fnUntraced(function* (source, options, commitPr
         });
         const walkChildren = (directory, path, depth, up) => {
             const listed = referenceFor(directory.ino);
-            const frames = [];
-            for (const name of [...directory.entries.keys()].sort()) {
-                const childIno = directory.entries.get(name);
-                const child = childIno === undefined ? undefined : view(childIno);
+            return Arr.flatMap(Arr.sort(directory.entries, byEntryName), ([name, childIno]) => {
+                const child = view(childIno);
                 if (child === undefined)
-                    continue;
+                    return [];
                 const bytes = nameBytes(name);
-                frames.push({
-                    ino: child.ino,
-                    kind: child.kind,
-                    name: bytes,
-                    key: name,
-                    path: joinPath(path, bytes),
-                    parent: directory.ino,
-                    up,
-                    depth: depth + 1,
-                    bytes: child.kind === "directory" ? 0n : child.metadata.size,
-                    reference: referenceFor(child.ino),
-                    directory: listed,
-                    listed: false
-                });
-            }
-            return frames;
+                return [{
+                        ino: child.ino,
+                        kind: child.kind,
+                        name: bytes,
+                        key: name,
+                        path: joinPath(path, bytes),
+                        parent: directory.ino,
+                        up,
+                        depth: depth + 1,
+                        bytes: child.kind === "directory" ? 0n : child.metadata.size,
+                        reference: referenceFor(child.ino),
+                        directory: listed,
+                        listed: false
+                    }];
+            });
         };
         const anchorFrame = (parent, key, root) => ({
             ino: root.ino,

package/dist/internal/volumeState.d.ts

@@ -1,5 +1,6 @@
 import * as Brand from "effect/Brand";
 import * as Effect from "effect/Effect";
+import * as Order from "effect/Order";
 import type { Metadata } from "../Metadata.js";
 import * as InodeTable from "./inodeTable.js";
 import type { StoredMetadata } from "./metadata.js";
@@ -64,9 +65,9 @@ export interface VolumeState {
 /** @internal */
 export declare const getNode: (state: VolumeState, ino: Ino) => Node | undefined;
 /** @internal */
-export declare const byIno: (a: Node, b: Node) => number;
+export declare const byIno: Order.Order<Node>;
 /** @internal */
-export declare const byEntryName: ([a]: readonly [string, Ino], [b]: readonly [string, Ino]) => -1 | 0 | 1;
+export declare const byEntryName: Order.Order<readonly [string, Ino]>;
 /** @internal */
 export declare const payloadOf: (node: Node) => Uint8Array | undefined;
 /** @internal */

package/dist/internal/volumeState.d.ts.map

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

package/dist/internal/volumeState.js

@@ -1,5 +1,7 @@
 import * as Brand from "effect/Brand";
 import * as Effect from "effect/Effect";
+import * as Match from "effect/Match";
+import * as Order from "effect/Order";
 import * as InodeTable from "./inodeTable.js";
 /** @internal */
 export const Ino = Brand.nominal();
@@ -19,9 +21,9 @@ export const WALK_YIELD_INTERVAL = 128;
 /** @internal */
 export const getNode = (state, ino) => InodeTable.get(state.inodes, ino);
 /** @internal */
-export const byIno = (a, b) => a.ino - b.ino;
+export const byIno = Order.mapInput(Order.Number, (node) => node.ino);
 /** @internal */
-export const byEntryName = ([a], [b]) => (a < b ? -1 : a > b ? 1 : 0);
+export const byEntryName = Order.mapInput(Order.String, ([name]) => name);
 const inNameOrder = (entries) => {
     let previous;
     for (const name of entries.keys()) {
@@ -170,34 +172,30 @@ export const assemble = (specs) => {
     const owner = Symbol();
     let inodes = InodeTable.empty();
     for (const spec of specs) {
-        const base = { ...spec.metadata, kind: spec.kind, ino: BigInt(spec.ino) };
-        const node = spec.kind === "directory"
-            ? {
-                kind: "directory",
-                ino: spec.ino,
-                parent: spec.parent,
-                name: spec.name,
-                entries: new Map((edges.get(spec.ino) ?? []).sort(byEntryName)),
-                metadata: { ...base, nlink: 2 + (subdirectories.get(spec.ino) ?? 0), size: 0n },
-                revision: spec.revision
-            }
-            : spec.kind === "file"
-                ? {
-                    kind: "file",
-                    ino: spec.ino,
-                    data: spec.data,
-                    links: spec.links,
-                    metadata: { ...base, nlink: spec.links.length, size: BigInt(spec.data.length) },
-                    revision: spec.revision
-                }
-                : {
-                    kind: "symlink",
-                    ino: spec.ino,
-                    target: spec.target,
-                    links: spec.links,
-                    metadata: { ...base, nlink: spec.links.length, size: BigInt(spec.target.length) },
-                    revision: spec.revision
-                };
+        const base = { ...spec.metadata, ino: BigInt(spec.ino) };
+        const node = Match.value(spec).pipe(Match.discriminator("kind")("directory", (directory) => ({
+            kind: "directory",
+            ino: directory.ino,
+            parent: directory.parent,
+            name: directory.name,
+            entries: new Map((edges.get(directory.ino) ?? []).sort(byEntryName)),
+            metadata: { ...base, kind: "directory", nlink: 2 + (subdirectories.get(directory.ino) ?? 0), size: 0n },
+            revision: directory.revision
+        })), Match.discriminator("kind")("file", (file) => ({
+            kind: "file",
+            ino: file.ino,
+            data: file.data,
+            links: file.links,
+            metadata: { ...base, kind: "file", nlink: file.links.length, size: BigInt(file.data.length) },
+            revision: file.revision
+        })), Match.discriminator("kind")("symlink", (symlink) => ({
+            kind: "symlink",
+            ino: symlink.ino,
+            target: symlink.target,
+            links: symlink.links,
+            metadata: { ...base, kind: "symlink", nlink: symlink.links.length, size: BigInt(symlink.target.length) },
+            revision: symlink.revision
+        })), Match.exhaustive);
         inodes = InodeTable.set(inodes, spec.ino, node, owner);
     }
     return { inodes, open: new Map(), nextInode, revision, entries, usedBytes };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-vfs/core",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "A runtime-neutral virtual filesystem core for Effect.",
   "homepage": "https://github.com/lloydrichards/effect-virtual-fs#readme",
   "bugs": {
@@ -21,18 +21,18 @@
   "scripts": {
     "build": "tsc --project tsconfig.build.json && tsc --project compatibility/node-next/tsconfig.json",
     "clean": "git clean -xdf .cache .turbo dist docs node_modules tsconfig.tsbuildinfo",
-    "test": "vitest run",
+    "test": "bun --bun run vitest run --config ../../vitest.config.ts --project core",
     "type-check": "tsc --noEmit && tsc --project contracts/tsconfig.json"
   },
   "peerDependencies": {
-    "effect": "4.0.0-rc.115"
+    "effect": "4.0.0-rc.117"
   },
   "devDependencies": {
-    "@effect/platform-bun": "4.0.0-rc.115",
-    "@effect/platform-node-shared": "4.0.0-rc.115",
-    "@effect/vitest": "4.0.0-rc.115",
+    "@effect/platform-bun": "4.0.0-rc.117",
+    "@effect/platform-node-shared": "4.0.0-rc.117",
+    "@effect/vitest": "4.0.0-rc.117",
     "@repo/config-typescript": "workspace:*",
-    "effect": "4.0.0-rc.115"
+    "effect": "4.0.0-rc.117"
   },
   "exports": {
     ".": {

package/dist/internal/stagedState.d.ts

@@ -1,18 +0,0 @@
-import * as Effect from "effect/Effect";
-import type { FsFailure } from "../VfsError.js";
-type CommitOutcome = "committed" | "rejected" | "unknown";
-/** @internal */
-export interface CommitProvider<State> {
-    /** Preparation failures leave the volume available. */
-    readonly prepare?: (candidate: State) => Effect.Effect<void, FsFailure>;
-    readonly commit: (candidate: State) => Effect.Effect<CommitOutcome>;
-}
-/** @internal */
-export interface Classified {
-    readonly available: boolean;
-    readonly failure: FsFailure | undefined;
-}
-/** @internal */
-export declare const offerCommit: <State>(provider: CommitProvider<State>, operation: string, candidate: State, cleanup: boolean) => Effect.Effect<Classified>;
-export {};
-//# sourceMappingURL=stagedState.d.ts.map

package/dist/internal/stagedState.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"stagedState.d.ts","sourceRoot":"","sources":["../../src/internal/stagedState.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAEvC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAG/C,KAAK,aAAa,GAAG,WAAW,GAAG,UAAU,GAAG,SAAS,CAAA;AAEzD,gBAAgB;AAChB,MAAM,WAAW,cAAc,CAAC,KAAK;IACnC,uDAAuD;IACvD,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;IACvE,QAAQ,CAAC,MAAM,EAAE,CAAC,SAAS,EAAE,KAAK,KAAK,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;CACpE;AAED,gBAAgB;AAChB,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAA;IAC3B,QAAQ,CAAC,OAAO,EAAE,SAAS,GAAG,SAAS,CAAA;CACxC;AAGD,gBAAgB;AAChB,eAAO,MAAM,WAAW,GAAI,KAAK,YACrB,cAAc,CAAC,KAAK,CAAC,aACpB,MAAM,aACN,KAAK,WACP,OAAO,KACf,MAAM,CAAC,MAAM,CAAC,UAAU,CAgBvB,CAAA"}

package/dist/internal/stagedState.js

@@ -1,18 +0,0 @@
-import * as Effect from "effect/Effect";
-import * as Exit from "effect/Exit";
-import { fsFailure } from "./errors.js";
-// An unknown commit outcome stops the volume; definite rejection stops it only during cleanup.
-/** @internal */
-export const offerCommit = (provider, operation, candidate, cleanup) => Effect.map(Effect.exit(Effect.suspend(() => provider.commit(candidate))), (committed) => {
-    // TODO(#186): Preserve the cause of a provider defect or interruption.
-    if (Exit.isFailure(committed)) {
-        return { available: false, failure: fsFailure("OutcomeUnknown", operation) };
-    }
-    if (committed.value === "rejected") {
-        return { available: !cleanup, failure: fsFailure("StorageRejected", operation) };
-    }
-    if (committed.value === "unknown") {
-        return { available: false, failure: fsFailure("OutcomeUnknown", operation) };
-    }
-    return { available: true, failure: undefined };
-});