@elaraai/east 0.0.1-beta.8 → 1.0.0

package/dist/src/patch/index.js

@@ -0,0 +1,48 @@
+/**
+ * Copyright (c) 2025 Elara AI Pty Ltd
+ * Dual-licensed under AGPL-3.0 and commercial license. See LICENSE for details.
+ */
+/**
+ * Patch system for computing and applying differences between East values.
+ *
+ * Provides core operations:
+ * - `diffFor(type)` — Compute the difference between two values
+ * - `applyFor(type)` — Apply a patch to a value
+ * - `composeFor(type)` — Combine two sequential patches
+ * - `invertFor(type)` — Invert a patch
+ *
+ * Plus 3-way merge primitives:
+ * - `detectConflictsFor(type)` — Identify overlapping leaves between two patches
+ * - `mergePatchFor(type)`     — Merge two patches; throws on conflict
+ * - `mergeWithResolutionsFor(type)` — Merge with caller-supplied conflict resolutions
+ *
+ * @module
+ */
+// Re-export types for public API
+export { ConflictError, } from "./types.js";
+// Re-export PatchType constructor
+export { PatchType } from "./type_of_patch.js";
+// Re-export merge primitives
+export { mergeFor, detectConflictsFor, mergeWithResolutionsFor, } from "./merge.js";
+// Re-export path utilities — typed segments + bidirectional string conversion
+// for the documented `Conflict.path` format.
+export { field, index, dictKey, variantTag, pathToString, pathFromString, pathDisplay, } from "./path.js";
+// Re-export walk visitor — type-driven traversal of a PatchTypeOf<T> tree
+// with re-diffing of container `replace` ops so consumers see leaf-level
+// changes everywhere.
+export { walkPatch, } from "./walk.js";
+// Re-export prune utility — drop leaves from a patch by path predicate,
+// cascading empty-container collapse up the tree.
+export { prunePatchFor, } from "./prune.js";
+// Promote core patch operations to public — long available via
+// `@elaraai/east/internal`, the diff/apply/compose/invert primitives are
+// stable and useful directly (e.g. for building diff-review UIs).
+export { diffFor } from "./diff.js";
+export { applyFor } from "./apply.js";
+export { composeFor } from "./compose.js";
+export { invertFor } from "./invert.js";
+// `validatePatchFor` — non-throwing variant of apply that returns per-leaf
+// disagreements as data. Sits beside `applyFor` (strict, throws) for UI
+// flows that need to preview a patch's compatibility before commit.
+export { validatePatchFor } from "./validate.js";
+//# sourceMappingURL=index.js.map

package/dist/src/patch/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/patch/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH;;;;;;;;;;;;;;;GAeG;AAEH,iCAAiC;AACjC,OAAO,EAIL,aAAa,GACd,MAAM,YAAY,CAAC;AAEpB,kCAAkC;AAClC,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C,6BAA6B;AAC7B,OAAO,EACL,QAAQ,EACR,kBAAkB,EAClB,uBAAuB,GACxB,MAAM,YAAY,CAAC;AAEpB,8EAA8E;AAC9E,6CAA6C;AAC7C,OAAO,EAGL,KAAK,EACL,KAAK,EACL,OAAO,EACP,UAAU,EACV,YAAY,EACZ,cAAc,EACd,WAAW,GACZ,MAAM,WAAW,CAAC;AAEnB,0EAA0E;AAC1E,yEAAyE;AACzE,sBAAsB;AACtB,OAAO,EAIL,SAAS,GACV,MAAM,WAAW,CAAC;AAEnB,wEAAwE;AACxE,kDAAkD;AAClD,OAAO,EAEL,aAAa,GACd,MAAM,YAAY,CAAC;AAEpB,+DAA+D;AAC/D,yEAAyE;AACzE,kEAAkE;AAClE,OAAO,EAAE,OAAO,EAAE,MAAS,WAAW,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAQ,YAAY,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAO,aAAa,CAAC;AAEzC,2EAA2E;AAC3E,wEAAwE;AACxE,oEAAoE;AACpE,OAAO,EAAE,gBAAgB,EAAsB,MAAM,eAAe,CAAC"}

package/dist/src/patch/invert.d.ts

@@ -0,0 +1,15 @@
+/**
+ * Copyright (c) 2025 Elara AI Pty Ltd
+ * Dual-licensed under AGPL-3.0 and commercial license. See LICENSE for details.
+ */
+/**
+ * invertFor - Invert a patch.
+ *
+ * @module
+ */
+import { type EastTypeValue } from "../type_of_type.js";
+import type { EastType } from "../types.js";
+import { type InvertContext } from "./types.js";
+export declare function invertFor(type: EastTypeValue, ctx?: InvertContext): (patch: any) => any;
+export declare function invertFor<T extends EastType>(type: T): (patch: any) => any;
+//# sourceMappingURL=invert.d.ts.map

package/dist/src/patch/invert.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"invert.d.ts","sourceRoot":"","sources":["../../../src/patch/invert.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH;;;;GAIG;AAEH,OAAO,EAAmB,KAAK,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACzE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAI5C,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,YAAY,CAAC;AAEhD,wBAAgB,SAAS,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,CAAC,EAAE,aAAa,GAAG,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,CAAC;AACzF,wBAAgB,SAAS,CAAC,CAAC,SAAS,QAAQ,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,CAAC"}

package/dist/src/patch/invert.js

@@ -0,0 +1,284 @@
+/**
+ * Copyright (c) 2025 Elara AI Pty Ltd
+ * Dual-licensed under AGPL-3.0 and commercial license. See LICENSE for details.
+ */
+/**
+ * invertFor - Invert a patch.
+ *
+ * @module
+ */
+import { toEastTypeValue } from "../type_of_type.js";
+import { isVariant, variant } from "../containers/variant.js";
+import { compareFor } from "../comparison.js";
+import { SortedMap } from "../containers/sortedmap.js";
+import {} from "./types.js";
+export function invertFor(type, ctx = { invert: [], types: [], equal: new Map() }) {
+    // Convert to EastTypeValue and use a properly typed variable
+    const t = isVariant(type) ? type : toEastTypeValue(type);
+    if (t.type === "Never") {
+        return (_patch) => {
+            throw new Error("Cannot invert patches for type Never");
+        };
+    }
+    else if (t.type === "Null" ||
+        t.type === "Boolean" ||
+        t.type === "Integer" ||
+        t.type === "Float" ||
+        t.type === "String" ||
+        t.type === "DateTime" ||
+        t.type === "Blob" ||
+        t.type === "Vector" ||
+        t.type === "Matrix") {
+        return (patch) => {
+            if (patch.type === "unchanged") {
+                return patch;
+            }
+            else if (patch.type === "replace") {
+                return variant("replace", { before: patch.value.after, after: patch.value.before });
+            }
+            else {
+                throw new Error(`Invalid patch type for primitive inversion: ${patch.type}`);
+            }
+        };
+    }
+    else if (t.type === "Array") {
+        let elementInvert;
+        const ret = (patch) => {
+            if (patch.type === "unchanged") {
+                return patch;
+            }
+            else if (patch.type === "replace") {
+                return variant("replace", { before: patch.value.after, after: patch.value.before });
+            }
+            else if (patch.type === "patch") {
+                const operations = patch.value;
+                const inverted = [];
+                for (let i = operations.length - 1; i >= 0; i--) {
+                    const op = operations[i];
+                    if (op.operation.type === "delete") {
+                        // Delete becomes insert at same position
+                        inverted.push({
+                            key: op.key,
+                            offset: 0n,
+                            operation: variant("insert", op.operation.value),
+                        });
+                    }
+                    else if (op.operation.type === "insert") {
+                        // Insert becomes delete at same position
+                        inverted.push({
+                            key: op.key,
+                            offset: 0n,
+                            operation: variant("delete", op.operation.value),
+                        });
+                    }
+                    else if (op.operation.type === "update") {
+                        inverted.push({
+                            key: op.key,
+                            offset: 0n,
+                            operation: variant("update", elementInvert(op.operation.value)),
+                        });
+                    }
+                }
+                return variant("patch", inverted);
+            }
+            else {
+                throw new Error(`Invalid patch type for array inversion: ${patch.type}`);
+            }
+        };
+        ctx.invert.push(ret);
+        ctx.types.push(t);
+        elementInvert = invertFor(t.value, ctx);
+        ctx.invert.pop();
+        ctx.types.pop();
+        return ret;
+    }
+    else if (t.type === "Set") {
+        const keyCompare = compareFor(t.value);
+        return (patch) => {
+            if (patch.type === "unchanged") {
+                return patch;
+            }
+            else if (patch.type === "replace") {
+                return variant("replace", { before: patch.value.after, after: patch.value.before });
+            }
+            else if (patch.type === "patch") {
+                const operations = patch.value;
+                const inverted = new SortedMap(undefined, keyCompare);
+                for (const [key, op] of operations) {
+                    if (op.type === "delete") {
+                        inverted.set(key, variant("insert", null));
+                    }
+                    else if (op.type === "insert") {
+                        inverted.set(key, variant("delete", null));
+                    }
+                }
+                return variant("patch", inverted);
+            }
+            else {
+                throw new Error(`Invalid patch type for set inversion: ${patch.type}`);
+            }
+        };
+    }
+    else if (t.type === "Dict") {
+        let valueInvert;
+        const keyCompare = compareFor(t.value.key);
+        const ret = (patch) => {
+            if (patch.type === "unchanged") {
+                return patch;
+            }
+            else if (patch.type === "replace") {
+                return variant("replace", { before: patch.value.after, after: patch.value.before });
+            }
+            else if (patch.type === "patch") {
+                const operations = patch.value;
+                const inverted = new SortedMap(undefined, keyCompare);
+                for (const [key, op] of operations) {
+                    if (op.type === "delete") {
+                        inverted.set(key, variant("insert", op.value));
+                    }
+                    else if (op.type === "insert") {
+                        inverted.set(key, variant("delete", op.value));
+                    }
+                    else if (op.type === "update") {
+                        inverted.set(key, variant("update", valueInvert(op.value)));
+                    }
+                }
+                return variant("patch", inverted);
+            }
+            else {
+                throw new Error(`Invalid patch type for dict inversion: ${patch.type}`);
+            }
+        };
+        ctx.invert.push(ret);
+        ctx.types.push(t);
+        valueInvert = invertFor(t.value.value, ctx);
+        ctx.invert.pop();
+        ctx.types.pop();
+        return ret;
+    }
+    else if (t.type === "Struct") {
+        const fieldInverts = {};
+        const ret = (patch) => {
+            if (patch.type === "unchanged") {
+                return patch;
+            }
+            else if (patch.type === "replace") {
+                return variant("replace", { before: patch.value.after, after: patch.value.before });
+            }
+            else if (patch.type === "patch") {
+                const result = {};
+                let allUnchanged = true;
+                for (const { name } of t.value) {
+                    const inverted = fieldInverts[name](patch.value[name]);
+                    result[name] = inverted;
+                    if (inverted.type !== "unchanged") {
+                        allUnchanged = false;
+                    }
+                }
+                if (allUnchanged) {
+                    return variant("unchanged", null);
+                }
+                return variant("patch", result);
+            }
+            else {
+                throw new Error(`Invalid patch type for struct inversion: ${patch.type}`);
+            }
+        };
+        ctx.invert.push(ret);
+        ctx.types.push(t);
+        for (const { name, type: fieldType } of t.value) {
+            fieldInverts[name] = invertFor(fieldType, ctx);
+        }
+        ctx.invert.pop();
+        ctx.types.pop();
+        return ret;
+    }
+    else if (t.type === "Variant") {
+        const caseInverts = {};
+        const ret = (patch) => {
+            if (patch.type === "unchanged") {
+                return patch;
+            }
+            else if (patch.type === "replace") {
+                return variant("replace", { before: patch.value.after, after: patch.value.before });
+            }
+            else if (patch.type === "patch") {
+                const caseName = patch.value.type;
+                const inverted = caseInverts[caseName](patch.value.value);
+                if (inverted.type === "unchanged") {
+                    return variant("unchanged", null);
+                }
+                return variant("patch", variant(caseName, inverted));
+            }
+            else {
+                throw new Error(`Invalid patch type for variant inversion: ${patch.type}`);
+            }
+        };
+        ctx.invert.push(ret);
+        ctx.types.push(t);
+        for (const { name, type: caseType } of t.value) {
+            caseInverts[name] = invertFor(caseType, ctx);
+        }
+        ctx.invert.pop();
+        ctx.types.pop();
+        return ret;
+    }
+    else if (t.type === "Ref") {
+        let innerInvert;
+        const ret = (patch) => {
+            if (patch.type === "unchanged") {
+                return patch;
+            }
+            else if (patch.type === "replace") {
+                return variant("replace", { before: patch.value.after, after: patch.value.before });
+            }
+            else if (patch.type === "patch") {
+                const inverted = innerInvert(patch.value);
+                if (inverted.type === "unchanged") {
+                    return variant("unchanged", null);
+                }
+                return variant("patch", inverted);
+            }
+            else {
+                throw new Error(`Invalid patch type for ref inversion: ${patch.type}`);
+            }
+        };
+        ctx.invert.push(ret);
+        ctx.types.push(t);
+        innerInvert = invertFor(t.value, ctx);
+        ctx.invert.pop();
+        ctx.types.pop();
+        return ret;
+    }
+    else if (t.type === "Recursive") {
+        // Recursive types use replace-only semantics - only unchanged and replace patches
+        return (patch) => {
+            if (patch.type === "unchanged") {
+                return patch;
+            }
+            else if (patch.type === "replace") {
+                return variant("replace", { before: patch.value.after, after: patch.value.before });
+            }
+            else {
+                throw new Error(`Invalid patch type for recursive type inversion: ${patch.type}`);
+            }
+        };
+    }
+    else if (t.type === "Function" || t.type === "AsyncFunction") {
+        return (patch) => {
+            if (patch.type === "unchanged") {
+                return patch;
+            }
+            else if (patch.type === "replace") {
+                return variant("replace", { before: patch.value.after, after: patch.value.before });
+            }
+            else {
+                throw new Error(`Invalid patch type for function inversion: ${patch.type}`);
+            }
+        };
+    }
+    else {
+        throw new Error(`Unhandled type in invertFor: ${t.type}`);
+    }
+}
+//# sourceMappingURL=invert.js.map

package/dist/src/patch/invert.js.map

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

package/dist/src/patch/merge.d.ts

@@ -0,0 +1,56 @@
+/**
+ * Copyright (c) 2025 Elara AI Pty Ltd
+ * Dual-licensed under AGPL-3.0 and commercial license. See LICENSE for details.
+ */
+/**
+ * Patch merge — 3-way merge of two patches against the same base.
+ *
+ * Given a snapshot S and two patches P_A, P_B both diffed against S, produce
+ * a single patch P_merged that captures the intent of both A and B. Where the
+ * two patches touch the same leaf with different intents, that is a conflict.
+ *
+ * Three operation modes:
+ *   - {@link mergeFor}                — throws ConflictError on any conflict
+ *   - {@link detectConflictsFor}      — returns the list of conflicts (no throw)
+ *   - {@link mergeWithResolutionsFor} — applies caller-supplied per-path
+ *     resolutions (`keepA` / `keepB` / `manual`); throws if any unresolved
+ *
+ * @module
+ */
+import { type EastTypeValue } from "../type_of_type.js";
+import type { EastType } from "../types.js";
+import { type MergeContext, type Conflict, type Resolution } from "./types.js";
+/**
+ * Build a merge function for a given East type. Returns a closure
+ * `(patchA, patchB) => merged`. Throws {@link ConflictError} if any leaf in
+ * the two patches conflicts (i.e. both patches touch the same leaf with
+ * incompatible operations).
+ *
+ * For conflict-tolerant merging, use {@link detectConflictsFor} or
+ * {@link mergeWithResolutionsFor}.
+ */
+export declare function mergeFor(type: EastTypeValue, ctx?: MergeContext): (a: any, b: any) => any;
+export declare function mergeFor<T extends EastType>(type: T): (a: any, b: any) => any;
+/**
+ * Build a function that detects conflicts between two patches without
+ * attempting to merge. Pure observation — never throws.
+ *
+ * Returns the list of {@link Conflict} descriptors, each carrying the
+ * dot/bracket-encoded `path` to the conflicting leaf and both `valueA` /
+ * `valueB` patch arms at that path.
+ */
+export declare function detectConflictsFor(type: EastTypeValue, ctx?: MergeContext): (a: any, b: any) => Conflict[];
+export declare function detectConflictsFor<T extends EastType>(type: T): (a: any, b: any) => Conflict[];
+/**
+ * Build a merge function that consumes caller-supplied per-conflict
+ * resolutions. The `resolutions` map is keyed on `Conflict.path` strings; for
+ * each conflict, the corresponding {@link Resolution} dictates whether
+ * patchA's value, patchB's value, or a manual replacement is used.
+ *
+ * Throws {@link ConflictError} if any conflict has no matching resolution
+ * (or if a `manual` resolution targets a non-leaf where no `before` is
+ * available — see `applyResolution` JSDoc in the source).
+ */
+export declare function mergeWithResolutionsFor(type: EastTypeValue, ctx?: MergeContext): (a: any, b: any, resolutions: Map<string, Resolution>) => any;
+export declare function mergeWithResolutionsFor<T extends EastType>(type: T): (a: any, b: any, resolutions: Map<string, Resolution>) => any;
+//# sourceMappingURL=merge.d.ts.map

package/dist/src/patch/merge.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../../src/patch/merge.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAmB,KAAK,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACzE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAK5C,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,QAAQ,EAAE,KAAK,UAAU,EAAiB,MAAM,YAAY,CAAC;AAiiB9F;;;;;;;;GAQG;AACH,wBAAgB,QAAQ,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,CAAC,EAAE,YAAY,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,KAAK,GAAG,CAAC;AAC3F,wBAAgB,QAAQ,CAAC,CAAC,SAAS,QAAQ,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,KAAK,GAAG,CAAC;AAiB/E;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,CAAC,EAAE,YAAY,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,KAAK,QAAQ,EAAE,CAAC;AAC5G,wBAAgB,kBAAkB,CAAC,CAAC,SAAS,QAAQ,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,KAAK,QAAQ,EAAE,CAAC;AAchG;;;;;;;;;GASG;AACH,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,aAAa,EACnB,GAAG,CAAC,EAAE,YAAY,GACjB,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,KAAK,GAAG,CAAC;AACjE,wBAAgB,uBAAuB,CAAC,CAAC,SAAS,QAAQ,EACxD,IAAI,EAAE,CAAC,GACN,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,KAAK,GAAG,CAAC"}