@ifc-lite/merge 0.1.0

package/dist/component-state.js

@@ -0,0 +1,305 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+import { ATTR, IFCLITE_ATTR, canonicalStringify } from '@ifc-lite/ifcx';
+import { stableHash } from '@ifc-lite/diff';
+const PSET_RE = /(?:^|::)(Pset_[A-Za-z0-9_]+)(?:::|$)/;
+const QSET_RE = /(?:^|::)(Qto_[A-Za-z0-9_]+)(?:::|$)/;
+/**
+ * Map an IFCX attribute key onto the layer-op componentKey vocabulary.
+ * Diff keys and op keys are deliberately the same words (02 §2.2).
+ */
+export function componentKeyForAttribute(attribute) {
+    if (attribute === ATTR.CLASS)
+        return 'attr:class';
+    if (attribute === ATTR.TRANSFORM)
+        return 'placement';
+    const pset = PSET_RE.exec(attribute);
+    if (pset)
+        return `pset:${pset[1]}`;
+    const qset = QSET_RE.exec(attribute);
+    if (qset)
+        return `qset:${qset[1]}`;
+    if (attribute.startsWith(ATTR.PROP_PREFIX)) {
+        return `attr:prop:${attribute.slice(ATTR.PROP_PREFIX.length)}`;
+    }
+    if (attribute.startsWith('usd::')) {
+        const tier = attribute.split('::').pop() ?? 'usd';
+        return `geometry:${tier}`;
+    }
+    return `attr:${attribute}`;
+}
+/**
+ * Flatten an ordered stack (weakest first) into entity component states.
+ * Later opinions shadow earlier ones per attribute; `null` child values
+ * remove slots; `ifclite::deleted` resolves to the strongest opinion.
+ */
+export function extractStackState(layers) {
+    const state = new Map();
+    const entityFor = (path) => {
+        let entity = state.get(path);
+        if (!entity) {
+            entity = {
+                path,
+                components: new Map(),
+                children: new Map(),
+                inherits: new Map(),
+                deleted: false,
+                explicitDeleted: false,
+            };
+            state.set(path, entity);
+        }
+        return entity;
+    };
+    for (const layer of layers) {
+        for (const node of layer.data) {
+            applyNode(entityFor(node.path), node);
+        }
+    }
+    // Drop empty shells created purely by child references.
+    for (const [path, entity] of state) {
+        if (entity.components.size === 0 &&
+            entity.children.size === 0 &&
+            entity.inherits.size === 0 &&
+            !entity.deleted) {
+            state.delete(path);
+        }
+    }
+    // Entity tombstones shadow child paths: composition removes the whole
+    // subtree, so the merge state must see descendants as deleted too —
+    // otherwise a candidate deleting a parent while the target edits a
+    // descendant would silently miss the delete-vs-modify conflict.
+    const queue = [];
+    for (const entity of state.values()) {
+        if (entity.deleted)
+            queue.push(entity.path);
+    }
+    while (queue.length > 0) {
+        const path = queue.pop();
+        if (path === undefined)
+            break;
+        const entity = state.get(path);
+        if (!entity)
+            continue;
+        for (const childPath of entity.children.values()) {
+            const child = state.get(childPath);
+            if (child && !child.deleted) {
+                child.deleted = true;
+                queue.push(childPath);
+            }
+        }
+    }
+    return state;
+}
+function applyNode(entity, node) {
+    if (node.children) {
+        for (const [name, child] of Object.entries(node.children)) {
+            if (child === null)
+                entity.children.delete(name);
+            else
+                entity.children.set(name, child);
+        }
+    }
+    if (node.inherits) {
+        for (const [role, target] of Object.entries(node.inherits)) {
+            if (target === null)
+                entity.inherits.delete(role);
+            else
+                entity.inherits.set(role, target);
+        }
+    }
+    if (!node.attributes)
+        return;
+    for (const [key, value] of Object.entries(node.attributes)) {
+        if (key === IFCLITE_ATTR.DELETED) {
+            entity.deleted = value === true;
+            entity.explicitDeleted = value === true;
+            continue;
+        }
+        if (key.startsWith(IFCLITE_ATTR.DERIVED))
+            continue;
+        const componentKey = componentKeyForAttribute(key);
+        const component = entity.components.get(componentKey) ?? {};
+        if (value === null) {
+            delete component[key];
+            if (Object.keys(component).length === 0) {
+                entity.components.delete(componentKey);
+                continue;
+            }
+        }
+        else {
+            component[key] = value;
+        }
+        entity.components.set(componentKey, component);
+    }
+}
+/**
+ * Project the three stack states onto the paths actually touched by the
+ * ours/theirs suffixes — when `ours` and `theirs` share `ancestor` as a
+ * prefix, every other path is byte-identical across all three states and
+ * contributes nothing to the merge matrix. Untouched entities/components
+ * keep the SAME object references on every side, so the matrix can skip
+ * hashing them entirely.
+ *
+ * Returns null — caller must use full extraction — whenever any layer
+ * carries an `ifclite::deleted` opinion: tombstones shadow whole subtrees
+ * through the children graph, and that propagation is global, not
+ * per-path. Restricting the fast path to tombstone-free stacks keeps it
+ * provably equivalent to `extractStackState` (see the differential fuzz).
+ */
+export function projectStackStates(ancestor, oursSuffix, theirsSuffix) {
+    const touched = new Set();
+    for (const suffix of [oursSuffix, theirsSuffix]) {
+        for (const layer of suffix) {
+            for (const node of layer.data) {
+                if (node.attributes?.[IFCLITE_ATTR.DELETED] !== undefined)
+                    return null;
+                touched.add(node.path);
+            }
+        }
+    }
+    // Restricted ancestor fold: only touched paths get materialized. The
+    // tombstone scan rides the same pass so a delete-bearing history aborts
+    // before any per-side work.
+    const a = new Map();
+    for (const layer of ancestor) {
+        for (const node of layer.data) {
+            if (node.attributes?.[IFCLITE_ATTR.DELETED] !== undefined)
+                return null;
+            if (!touched.has(node.path))
+                continue;
+            applyNode(entityFor(a, node.path), node);
+        }
+    }
+    dropEmptyShells(a);
+    return {
+        a,
+        o: projectSide(a, oursSuffix),
+        t: projectSide(a, theirsSuffix),
+    };
+}
+/** Clone-on-write side state: ancestor refs shared until a suffix node hits the path. */
+function projectSide(a, suffix) {
+    const state = new Map(a);
+    const cloned = new Set();
+    for (const layer of suffix) {
+        for (const node of layer.data) {
+            let entity = state.get(node.path);
+            if (entity && !cloned.has(node.path)) {
+                entity = {
+                    path: entity.path,
+                    components: new Map(entity.components),
+                    children: new Map(entity.children),
+                    inherits: new Map(entity.inherits),
+                    deleted: entity.deleted,
+                    explicitDeleted: entity.explicitDeleted,
+                };
+                state.set(node.path, entity);
+            }
+            else if (!entity) {
+                entity = entityFor(state, node.path);
+            }
+            cloned.add(node.path);
+            applyNodeCow(entity, node);
+        }
+    }
+    // Shell equivalence: a suffix that nulls every attribute away leaves an
+    // entity the reference extraction would drop — drop it here too. Only
+    // cloned entities can have changed, so only they need the check.
+    for (const path of cloned) {
+        const entity = state.get(path);
+        if (entity && isEmptyShell(entity))
+            state.delete(path);
+    }
+    return state;
+}
+function entityFor(state, path) {
+    let entity = state.get(path);
+    if (!entity) {
+        entity = {
+            path,
+            components: new Map(),
+            children: new Map(),
+            inherits: new Map(),
+            deleted: false,
+            explicitDeleted: false,
+        };
+        state.set(path, entity);
+    }
+    return entity;
+}
+function isEmptyShell(entity) {
+    return (entity.components.size === 0 &&
+        entity.children.size === 0 &&
+        entity.inherits.size === 0 &&
+        !entity.deleted);
+}
+function dropEmptyShells(state) {
+    for (const [path, entity] of state) {
+        if (isEmptyShell(entity))
+            state.delete(path);
+    }
+}
+/**
+ * `applyNode` for cloned side entities: component objects are copied
+ * before mutation so ancestor-shared references are never written through
+ * — reference equality stays a valid "unchanged" signal in the matrix.
+ */
+function applyNodeCow(entity, node) {
+    if (node.children) {
+        for (const [name, child] of Object.entries(node.children)) {
+            if (child === null)
+                entity.children.delete(name);
+            else
+                entity.children.set(name, child);
+        }
+    }
+    if (node.inherits) {
+        for (const [role, target] of Object.entries(node.inherits)) {
+            if (target === null)
+                entity.inherits.delete(role);
+            else
+                entity.inherits.set(role, target);
+        }
+    }
+    if (!node.attributes)
+        return;
+    for (const [key, value] of Object.entries(node.attributes)) {
+        if (key.startsWith(IFCLITE_ATTR.DERIVED))
+            continue;
+        const componentKey = componentKeyForAttribute(key);
+        const component = { ...(entity.components.get(componentKey) ?? {}) };
+        if (value === null) {
+            delete component[key];
+            if (Object.keys(component).length === 0) {
+                entity.components.delete(componentKey);
+                continue;
+            }
+        }
+        else {
+            component[key] = value;
+        }
+        entity.components.set(componentKey, component);
+    }
+}
+/** Hash + value snapshot for conflict records and fold detection. */
+export function snapshotOf(attributes) {
+    return { hash: stableHash(canonicalStringify(attributes)), attributes };
+}
+/**
+ * Unified view used by the matrix: real components plus `child:<name>` /
+ * `inherit:<role>` pseudo-components whose single attribute is the
+ * referenced path. Both are relation edges, so divergent edits surface
+ * as `hierarchy` conflicts.
+ */
+export function componentEntries(entity) {
+    const entries = new Map(entity.components);
+    for (const [name, child] of entity.children) {
+        entries.set(`child:${name}`, { child });
+    }
+    for (const [role, target] of entity.inherits) {
+        entries.set(`inherit:${role}`, { inherit: target });
+    }
+    return entries;
+}
+//# sourceMappingURL=component-state.js.map

package/dist/component-state.js.map

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

package/dist/index.d.ts

@@ -0,0 +1,20 @@
+/**
+ * `@ifc-lite/merge` — three-way merge engine for IFCX layers.
+ *
+ * Built on two runs of the two-way comparison joined on entity identity:
+ * emits a {@link MergePlan} (auto-merged ops + explicit conflict records),
+ * applies reviewer resolutions, publishes content-addressed merge layers
+ * with `manifest.merge` filled, and derives revert and rebase from the
+ * same state-based op model.
+ *
+ * Spec: docs/architecture/layer-prs/05-merge.md.
+ */
+export type { ComponentAttributes, ComponentKey, ComponentSnapshot, MergeConflict, MergeConflictKind, MergeOp, MergePlan, MergePlanStats, ResolutionInput, } from './types.js';
+export { componentKeyForAttribute, componentEntries, extractStackState, snapshotOf, type EntityState, type StackState, } from './component-state.js';
+export { planThreeWayMerge, planFromStates, opsForComponentChange, type ThreeWayInputs, } from './three-way.js';
+export { applyResolutions, buildMergeLayer, opsToNodes, type AppliedResolutions, type MergeLayerInit, type PublishedMergeLayer, } from './merge-layer.js';
+export { buildInverseOps, buildRevertLayer, type RevertLayerInit, type RevertLayerResult, } from './inverse.js';
+export { planRebase, type RebaseInputs, type RebaseResult } from './rebase.js';
+export { diffLayerStacks, diffStackStates, type ModifiedEntity, type StackDiff, } from './state-diff.js';
+export { checkRefPolicy, mergeIntoRef, resolveAncestor, type AncestorResolution, type LayerRefStore, type MergeInit, type MergeOutcome, type RefEntry, type RefPolicy, type Waiver, } from './ref-flow.js';
+//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;GAUG;AAEH,YAAY,EACV,mBAAmB,EACnB,YAAY,EACZ,iBAAiB,EACjB,aAAa,EACb,iBAAiB,EACjB,OAAO,EACP,SAAS,EACT,cAAc,EACd,eAAe,GAChB,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,wBAAwB,EACxB,gBAAgB,EAChB,iBAAiB,EACjB,UAAU,EACV,KAAK,WAAW,EAChB,KAAK,UAAU,GAChB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,iBAAiB,EACjB,cAAc,EACd,qBAAqB,EACrB,KAAK,cAAc,GACpB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,gBAAgB,EAChB,eAAe,EACf,UAAU,EACV,KAAK,kBAAkB,EACvB,KAAK,cAAc,EACnB,KAAK,mBAAmB,GACzB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,eAAe,EACf,gBAAgB,EAChB,KAAK,eAAe,EACpB,KAAK,iBAAiB,GACvB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,UAAU,EAAE,KAAK,YAAY,EAAE,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AAC/E,OAAO,EACL,eAAe,EACf,eAAe,EACf,KAAK,cAAc,EACnB,KAAK,SAAS,GACf,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,cAAc,EACd,YAAY,EACZ,eAAe,EACf,KAAK,kBAAkB,EACvB,KAAK,aAAa,EAClB,KAAK,SAAS,EACd,KAAK,YAAY,EACjB,KAAK,QAAQ,EACb,KAAK,SAAS,EACd,KAAK,MAAM,GACZ,MAAM,eAAe,CAAC"}

package/dist/index.js

@@ -0,0 +1,11 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+export { componentKeyForAttribute, componentEntries, extractStackState, snapshotOf, } from './component-state.js';
+export { planThreeWayMerge, planFromStates, opsForComponentChange, } from './three-way.js';
+export { applyResolutions, buildMergeLayer, opsToNodes, } from './merge-layer.js';
+export { buildInverseOps, buildRevertLayer, } from './inverse.js';
+export { planRebase } from './rebase.js';
+export { diffLayerStacks, diffStackStates, } from './state-diff.js';
+export { checkRefPolicy, mergeIntoRef, resolveAncestor, } from './ref-flow.js';
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;+DAE+D;AAyB/D,OAAO,EACL,wBAAwB,EACxB,gBAAgB,EAChB,iBAAiB,EACjB,UAAU,GAGX,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,iBAAiB,EACjB,cAAc,EACd,qBAAqB,GAEtB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,gBAAgB,EAChB,eAAe,EACf,UAAU,GAIX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,eAAe,EACf,gBAAgB,GAGjB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,UAAU,EAAwC,MAAM,aAAa,CAAC;AAC/E,OAAO,EACL,eAAe,EACf,eAAe,GAGhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,cAAc,EACd,YAAY,EACZ,eAAe,GAQhB,MAAM,eAAe,CAAC"}

package/dist/inverse.d.ts

@@ -0,0 +1,30 @@
+/**
+ * Revert: a layer of inverse ops. Composing `[base, L, revert(L)]`
+ * yields the same component state as `base` alone — additions are
+ * tombstoned, deletions resurrected, edited components restored to their
+ * base values. History stays append-only.
+ */
+import type { IfcxFile, ProvenanceAuthor } from '@ifc-lite/ifcx';
+import type { MergeOp } from './types.js';
+import type { StackState } from './component-state.js';
+/** Ops that transform `after` back into `before` (state-based, per component). */
+export declare function buildInverseOps(before: StackState, after: StackState): MergeOp[];
+export interface RevertLayerInit {
+    /** The layer to revert. */
+    layer: IfcxFile;
+    /** The stack the layer was applied on, ordered weakest first. */
+    base: readonly IfcxFile[];
+    author: ProvenanceAuthor;
+    intent?: string;
+    /** Layer id of the reverted layer (recorded as parent). */
+    layerId?: string;
+    created?: string;
+}
+export interface RevertLayerResult {
+    file: IfcxFile;
+    layerId: string;
+    ops: MergeOp[];
+}
+/** Emit an inverse-op layer that undoes `layer` on top of `base + layer`. */
+export declare function buildRevertLayer(init: RevertLayerInit): RevertLayerResult;
+//# sourceMappingURL=inverse.d.ts.map

package/dist/inverse.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"inverse.d.ts","sourceRoot":"","sources":["../src/inverse.ts"],"names":[],"mappings":"AAIA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAEjE,OAAO,KAAK,EAAuB,OAAO,EAAE,MAAM,YAAY,CAAC;AAC/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAKvD,kFAAkF;AAClF,wBAAgB,eAAe,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,EAAE,CAgDhF;AAED,MAAM,WAAW,eAAe;IAC9B,2BAA2B;IAC3B,KAAK,EAAE,QAAQ,CAAC;IAChB,iEAAiE;IACjE,IAAI,EAAE,SAAS,QAAQ,EAAE,CAAC;IAC1B,MAAM,EAAE,gBAAgB,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,2DAA2D;IAC3D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,QAAQ,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,OAAO,EAAE,CAAC;CAChB;AAED,6EAA6E;AAC7E,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,eAAe,GAAG,iBAAiB,CAgCzE"}

package/dist/inverse.js

@@ -0,0 +1,87 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+import { computeLayerId, createProvenanceManifest, setProvenance } from '@ifc-lite/ifcx';
+import { componentEntries, extractStackState, snapshotOf } from './component-state.js';
+import { opsForComponentChange } from './three-way.js';
+import { opsToNodes } from './merge-layer.js';
+/** Ops that transform `after` back into `before` (state-based, per component). */
+export function buildInverseOps(before, after) {
+    const ops = [];
+    const paths = new Set([...before.keys(), ...after.keys()]);
+    for (const path of paths) {
+        const beforeEntity = before.get(path);
+        const afterEntity = after.get(path);
+        const beforeAlive = beforeEntity !== undefined && !beforeEntity.deleted;
+        const afterAlive = afterEntity !== undefined && !afterEntity.deleted;
+        // Dead on both sides: invisible either way, nothing to undo.
+        if (!beforeAlive && !afterAlive)
+            continue;
+        if (!beforeAlive && afterAlive) {
+            // L added or resurrected the entity: re-tombstone it. When it was
+            // resurrected AND edited, the tombstone alone is not enough — L's
+            // component opinions stay in the stack and would shine through a
+            // later resurrect, so the component loop below also restores the
+            // before values (a dead entity's components stay visible to the
+            // merge matrix).
+            ops.push({ op: 'tombstone-entity', path });
+        }
+        if (beforeAlive && !afterAlive) {
+            // L deleted it: resurrect. Keys L added before (or while)
+            // tombstoning are still opinions in the stack — the component loop
+            // reads the after-state's under-tombstone components so those keys
+            // land in the union and get nulled, not just the pre-delete edits.
+            ops.push({ op: 'resurrect-entity', path });
+        }
+        const beforeComponents = beforeEntity
+            ? componentEntries(beforeEntity)
+            : new Map();
+        const afterComponents = afterEntity
+            ? componentEntries(afterEntity)
+            : new Map();
+        const keys = new Set([...beforeComponents.keys(), ...afterComponents.keys()]);
+        for (const key of keys) {
+            const beforeAttrs = beforeComponents.get(key);
+            const afterAttrs = afterComponents.get(key);
+            const beforeHash = beforeAttrs ? snapshotOf(beforeAttrs).hash : undefined;
+            const afterHash = afterAttrs ? snapshotOf(afterAttrs).hash : undefined;
+            if (beforeHash === afterHash)
+                continue;
+            ops.push(...opsForComponentChange(path, key, afterAttrs, beforeAttrs));
+        }
+    }
+    return ops;
+}
+/** Emit an inverse-op layer that undoes `layer` on top of `base + layer`. */
+export function buildRevertLayer(init) {
+    const before = extractStackState(init.base);
+    const after = extractStackState([...init.base, init.layer]);
+    const ops = buildInverseOps(before, after);
+    const manifest = createProvenanceManifest({
+        author: init.author,
+        intent: init.intent ?? `Revert layer ${init.layerId ?? init.layer.header.id}`,
+        base: null,
+        created: init.created,
+        parents: init.layerId ? [init.layerId] : [],
+    });
+    const bare = {
+        header: {
+            id: '',
+            ifcxVersion: init.layer.header.ifcxVersion,
+            dataVersion: init.layer.header.dataVersion,
+            author: init.author.principal,
+            timestamp: manifest.created,
+        },
+        imports: [],
+        schemas: {},
+        data: opsToNodes(ops),
+    };
+    const withManifest = setProvenance(bare, manifest);
+    const layerId = computeLayerId(withManifest);
+    return {
+        file: { ...withManifest, header: { ...withManifest.header, id: layerId } },
+        layerId,
+        ops,
+    };
+}
+//# sourceMappingURL=inverse.js.map

package/dist/inverse.js.map

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

package/dist/merge-layer.d.ts

@@ -0,0 +1,58 @@
+/**
+ * Resolution application and merge-layer emission.
+ *
+ * Resolutions (ours/theirs/edited per conflict) append as ops; the result
+ * publishes as a merge layer with `manifest.merge` filled. The candidate
+ * layer is never mutated; history is append-only.
+ */
+import type { IfcxFile, IfcxNode, MergeResolution, ProvenanceAuthor, ProvenanceBase, ProvenanceCheck, WaivedCheck } from '@ifc-lite/ifcx';
+import type { MergeConflict, MergeOp, MergePlan, ResolutionInput } from './types.js';
+export interface AppliedResolutions {
+    /** Ops produced by `theirs`/`edited` choices, in conflict order. */
+    ops: MergeOp[];
+    /** Resolution records for the merge manifest (includes `ours` picks). */
+    resolutions: MergeResolution[];
+    /** Conflicts no resolution addressed. */
+    unresolved: MergeConflict[];
+}
+/**
+ * Turn reviewer decisions into ops. `ours` keeps the target state (no op),
+ * `theirs` adopts the candidate value, `edited` takes the supplied
+ * replacement component value (component-scoped conflicts only).
+ */
+export declare function applyResolutions(plan: MergePlan, inputs: readonly ResolutionInput[]): AppliedResolutions;
+/** Serialize ops as ordinary IFCX node opinions, one node per path. */
+export declare function opsToNodes(ops: readonly MergeOp[]): IfcxNode[];
+export interface MergeLayerInit {
+    /** Auto ops plus resolution ops, in application order. */
+    ops: readonly MergeOp[];
+    author: ProvenanceAuthor;
+    intent: string;
+    /** The state the merge layer applies on top of (the target ref's stack). */
+    base: ProvenanceBase | null;
+    merge: {
+        /** Candidate layer id that was merged. */
+        candidate: string;
+        /** Target ref name or stack hash. */
+        into: string;
+        resolutions: MergeResolution[];
+        waived_checks?: WaivedCheck[];
+        /** Principal who resolved the merge. */
+        resolver: string;
+    };
+    parents?: string[];
+    checks?: ProvenanceCheck[];
+    created?: string;
+    ifcxVersion?: string;
+    dataVersion?: string;
+}
+export interface PublishedMergeLayer {
+    file: IfcxFile;
+    layerId: string;
+}
+/**
+ * Emit an immutable merge layer: ops as IFCX nodes plus a provenance
+ * manifest with `merge` filled, content-addressed by canonical blake3.
+ */
+export declare function buildMergeLayer(init: MergeLayerInit): PublishedMergeLayer;
+//# sourceMappingURL=merge-layer.d.ts.map

package/dist/merge-layer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-layer.d.ts","sourceRoot":"","sources":["../src/merge-layer.ts"],"names":[],"mappings":"AAIA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAe,eAAe,EAAE,gBAAgB,EAAE,cAAc,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAEvJ,OAAO,KAAK,EAAuB,aAAa,EAAE,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAG1G,MAAM,WAAW,kBAAkB;IACjC,oEAAoE;IACpE,GAAG,EAAE,OAAO,EAAE,CAAC;IACf,yEAAyE;IACzE,WAAW,EAAE,eAAe,EAAE,CAAC;IAC/B,yCAAyC;IACzC,UAAU,EAAE,aAAa,EAAE,CAAC;CAC7B;AAMD;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,SAAS,eAAe,EAAE,GACjC,kBAAkB,CAiDpB;AAmED,uEAAuE;AACvE,wBAAgB,UAAU,CAAC,GAAG,EAAE,SAAS,OAAO,EAAE,GAAG,QAAQ,EAAE,CAwC9D;AAED,MAAM,WAAW,cAAc;IAC7B,0DAA0D;IAC1D,GAAG,EAAE,SAAS,OAAO,EAAE,CAAC;IACxB,MAAM,EAAE,gBAAgB,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,4EAA4E;IAC5E,IAAI,EAAE,cAAc,GAAG,IAAI,CAAC;IAC5B,KAAK,EAAE;QACL,0CAA0C;QAC1C,SAAS,EAAE,MAAM,CAAC;QAClB,qCAAqC;QACrC,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,EAAE,eAAe,EAAE,CAAC;QAC/B,aAAa,CAAC,EAAE,WAAW,EAAE,CAAC;QAC9B,wCAAwC;QACxC,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;IACF,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,MAAM,CAAC,EAAE,eAAe,EAAE,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,QAAQ,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,cAAc,GAAG,mBAAmB,CAoCzE"}