@ifc-lite/ids-authoring 0.0.0-stage → 0.2.1

package/dist/match/cascade.js

@@ -0,0 +1,135 @@
+/* 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 { similarity } from '../gate/rank.js';
+/** Default minimum similarity for the last cascade step (0..1). */
+export const DEFAULT_MATCH_THRESHOLD = 0.55;
+function constraintKey(c) {
+    if (!c)
+        return '';
+    switch (c.type) {
+        case 'simpleValue':
+            return c.value.toUpperCase();
+        case 'enumeration':
+            return [...c.values].sort().join('|').toUpperCase();
+        case 'pattern':
+            return `/${c.pattern}/`;
+        case 'bounds':
+            return 'bounds';
+    }
+}
+/** What a facet is "about": stable across value edits. */
+export function facetKey(f) {
+    switch (f.type) {
+        case 'entity':
+            return `entity:${constraintKey(f.name)}`;
+        case 'attribute':
+            return `attribute:${constraintKey(f.name)}`;
+        case 'property':
+            return `property:${constraintKey(f.propertySet)}.${constraintKey(f.baseName)}`;
+        case 'classification':
+            return `classification:${constraintKey(f.system)}`;
+        case 'material':
+            return 'material';
+        case 'partOf':
+            return `partOf:${f.relation}:${constraintKey(f.entity?.name)}`;
+    }
+}
+/** Canonical JSON-like rendering: sorted keys, `undefined` dropped. */
+export function canonical(value) {
+    if (Array.isArray(value))
+        return `[${value.map(canonical).join(',')}]`;
+    if (value && typeof value === 'object') {
+        return `{${Object.entries(value)
+            .filter(([, v]) => v !== undefined)
+            .sort(([a], [b]) => (a < b ? -1 : 1))
+            .map(([k, v]) => `${k}:${canonical(v)}`)
+            .join(',')}}`;
+    }
+    return JSON.stringify(value);
+}
+function applicabilitySignature(s) {
+    return s.applicability.facets.map(canonical).sort().join(';');
+}
+function jaccard(a, b) {
+    const sa = new Set(a);
+    const sb = new Set(b);
+    if (!sa.size && !sb.size)
+        return 1;
+    let inter = 0;
+    for (const x of sa)
+        if (sb.has(x))
+            inter++;
+    return inter / (sa.size + sb.size - inter);
+}
+function specSimilarity(a, b) {
+    const keys = (s) => [...s.applicability.facets, ...s.requirements.map((r) => r.facet)].map(facetKey);
+    return 0.4 * similarity(a.name, b.name) + 0.6 * jaccard(keys(a), keys(b));
+}
+/**
+ * Greedy one-to-one matching over the cascade. `steps` are tried in order;
+ * each returns a score (> 0 means a candidate pair) for unmatched pairs.
+ * `seed` pre-assigns pairs (e.g. matched by node id elsewhere).
+ */
+export function cascade(prev, next, steps, seed) {
+    const pairs = new Map(seed?.pairs);
+    const usedPrev = new Set(seed?.usedPrev);
+    for (const [by, score] of steps) {
+        const candidates = [];
+        next.forEach((b, n) => {
+            if (pairs.has(n))
+                return;
+            prev.forEach((a, p) => {
+                if (usedPrev.has(p))
+                    return;
+                const s = score(a, b);
+                if (s > 0)
+                    candidates.push({ p, n, s });
+            });
+        });
+        // Best score first; ties keep document order (stable for duplicates).
+        candidates.sort((x, y) => y.s - x.s || Math.abs(x.p - x.n) - Math.abs(y.p - y.n) || x.n - y.n);
+        for (const c of candidates) {
+            if (pairs.has(c.n) || usedPrev.has(c.p))
+                continue;
+            pairs.set(c.n, { prev: c.p, by });
+            usedPrev.add(c.p);
+        }
+    }
+    return { pairs, usedPrev };
+}
+/** Pair specifications of `next` with those of `prev`. */
+export function matchSpecs(prev, next, options = {}) {
+    const threshold = options.threshold ?? DEFAULT_MATCH_THRESHOLD;
+    const steps = [
+        ['identifier', (a, b) => (a.identifier && a.identifier === b.identifier ? 1 : 0)],
+        ['signature', (a, b) => (a.name === b.name && applicabilitySignature(a) === applicabilitySignature(b) ? 1 : 0)],
+        ['similarity', (a, b) => {
+                const s = specSimilarity(a, b);
+                return s >= threshold ? s : 0;
+            }],
+    ];
+    // Within one lineage node ids are the truth: a node with a new id is a
+    // new node, even when it resembles a removed one.
+    if (options.byNodeId)
+        return cascade(prev, next, [['nodeId', (a, b) => (a.id === b.id ? 1 : 0)]]);
+    return cascade(prev, next, steps);
+}
+/**
+ * Pair facets of one section. `seed` carries pairs already decided
+ * elsewhere (by node id); the cascade only fills in the rest.
+ */
+export function matchFacetList(prev, next, options = {}) {
+    const threshold = options.threshold ?? DEFAULT_MATCH_THRESHOLD;
+    return cascade(prev, next, [
+        ['exact', (a, b) => (canonical(a) === canonical(b) ? 1 : 0)],
+        ['key', (a, b) => (a.type === b.type && facetKey(a) === facetKey(b) ? 1 : 0)],
+        ['similar', (a, b) => {
+                if (a.type !== b.type)
+                    return 0;
+                const s = similarity(facetKey(a), facetKey(b));
+                return s >= threshold ? s : 0;
+            }],
+    ], options.seed);
+}
+//# sourceMappingURL=cascade.js.map

package/dist/match/cascade.js.map

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

package/dist/match/reidentify.d.ts

@@ -0,0 +1,46 @@
+/**
+ * Re-identification (§2, §6): when an external IDS is imported over an
+ * existing Studio document (a client sends v2), give each incoming node
+ * the id of the node it continues, so comments, provenance and history
+ * survive.
+ *
+ * Specifications match by, in order: the same non-empty `identifier`; the
+ * same name and applicability signature; then the best similarity over
+ * name tokens and facet signatures, above a threshold. Facets match within
+ * a matched spec and section by: identical facet; same type and key (pset
+ * + property, entity name, …); then key similarity. Every cascade step is
+ * one-to-one and greedy by score. Unmatched incoming nodes get fresh ids;
+ * unmatched previous nodes are reported as removed.
+ */
+import type { IDSDocument } from '@ifc-lite/ids';
+import type { StudioDocument } from '../document/types.js';
+import { type Uuid } from '../uuid.js';
+import { type MatchStep } from './cascade.js';
+export type { MatchStep };
+export interface ReidentifyReport {
+    specs: {
+        matched: {
+            index: number;
+            id: Uuid;
+            by: MatchStep;
+        }[];
+        added: number[];
+        removed: Uuid[];
+    };
+    facets: {
+        matched: number;
+        added: number;
+        removed: number;
+    };
+}
+export interface ReidentifyOptions {
+    newId?: () => Uuid;
+    /** Minimum similarity for the last cascade step (0..1). */
+    threshold?: number;
+}
+/** Rebind `incoming` onto the node ids of `previous`. Meta and docId are kept. */
+export declare function reidentify(previous: StudioDocument, incoming: IDSDocument, options?: ReidentifyOptions): {
+    doc: StudioDocument;
+    report: ReidentifyReport;
+};
+//# sourceMappingURL=reidentify.d.ts.map

package/dist/match/reidentify.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"reidentify.d.ts","sourceRoot":"","sources":["../../src/match/reidentify.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EAAE,WAAW,EAA8B,MAAM,eAAe,CAAC;AAG7E,OAAO,KAAK,EAAyB,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAClF,OAAO,EAAU,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAuD,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAEnG,YAAY,EAAE,SAAS,EAAE,CAAC;AAE1B,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE;QAAE,OAAO,EAAE;YAAE,KAAK,EAAE,MAAM,CAAC;YAAC,EAAE,EAAE,IAAI,CAAC;YAAC,EAAE,EAAE,SAAS,CAAA;SAAE,EAAE,CAAC;QAAC,KAAK,EAAE,MAAM,EAAE,CAAC;QAAC,OAAO,EAAE,IAAI,EAAE,CAAA;KAAE,CAAC;IACnG,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;CAC7D;AAED,MAAM,WAAW,iBAAiB;IAChC,KAAK,CAAC,EAAE,MAAM,IAAI,CAAC;IACnB,2DAA2D;IAC3D,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AA2BD,kFAAkF;AAClF,wBAAgB,UAAU,CACxB,QAAQ,EAAE,cAAc,EACxB,QAAQ,EAAE,WAAW,EACrB,OAAO,GAAE,iBAAsB,GAC9B;IAAE,GAAG,EAAE,cAAc,CAAC;IAAC,MAAM,EAAE,gBAAgB,CAAA;CAAE,CAuCnD"}

package/dist/match/reidentify.js

@@ -0,0 +1,67 @@
+/* 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 { presentFields } from '../document/fields.js';
+import { mintFacetNodes } from '../document/from-ids.js';
+import { uuidv7 } from '../uuid.js';
+import { DEFAULT_MATCH_THRESHOLD, matchFacetList, matchSpecs } from './cascade.js';
+function matchFacets(prev, next, threshold, newId, report) {
+    const { pairs, usedPrev } = matchFacetList(prev.map((p) => p.facet), next, { threshold });
+    report.facets.matched += pairs.size;
+    report.facets.added += next.length - pairs.size;
+    report.facets.removed += prev.length - usedPrev.size;
+    return next.map((facet, n) => {
+        const hit = pairs.get(n);
+        if (!hit)
+            return mintFacetNodes(facet, newId);
+        const old = prev[hit.prev].nodes;
+        const constraints = {};
+        for (const field of presentFields(facet))
+            constraints[field] = old.constraints[field] ?? newId();
+        return { id: old.id, constraints };
+    });
+}
+/** Rebind `incoming` onto the node ids of `previous`. Meta and docId are kept. */
+export function reidentify(previous, incoming, options = {}) {
+    const newId = options.newId ?? (() => uuidv7());
+    const threshold = options.threshold ?? DEFAULT_MATCH_THRESHOLD;
+    const prevSpecs = previous.ids.specifications;
+    const report = { specs: { matched: [], added: [], removed: [] }, facets: { matched: 0, added: 0, removed: 0 } };
+    const { pairs, usedPrev } = matchSpecs(prevSpecs, incoming.specifications, { threshold });
+    const specs = [];
+    const nodes = [];
+    incoming.specifications.forEach((spec, n) => {
+        const hit = pairs.get(n);
+        const prevNodes = hit ? previous.nodes.specs[hit.prev] : undefined;
+        const prevSpec = hit ? prevSpecs[hit.prev] : undefined;
+        const specId = prevNodes?.id ?? newId();
+        if (hit)
+            report.specs.matched.push({ index: n, id: specId, by: hit.by });
+        else
+            report.specs.added.push(n);
+        const items = (section) => prevSpec && prevNodes
+            ? section === 'applicability'
+                ? prevSpec.applicability.facets.map((facet, j) => ({ facet, nodes: prevNodes.applicability[j] }))
+                : prevSpec.requirements.map((r, j) => ({ facet: r.facet, nodes: prevNodes.requirements[j] }))
+            : [];
+        const applicability = matchFacets(items('applicability'), spec.applicability.facets, threshold, newId, report);
+        const requirements = matchFacets(items('requirements'), spec.requirements.map((r) => r.facet), threshold, newId, report);
+        specs.push({ ...spec, id: specId, requirements: spec.requirements.map((r, j) => ({ ...r, id: requirements[j].id })) });
+        nodes.push({ id: specId, applicability, requirements });
+    });
+    prevSpecs.forEach((s, p) => {
+        if (usedPrev.has(p))
+            return;
+        report.specs.removed.push(s.id);
+        report.facets.removed += s.applicability.facets.length + s.requirements.length;
+    });
+    return {
+        doc: {
+            ...previous,
+            ids: { ...incoming, specifications: specs },
+            nodes: { document: previous.nodes.document, specs: nodes },
+        },
+        report,
+    };
+}
+//# sourceMappingURL=reidentify.js.map

package/dist/match/reidentify.js.map

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

package/dist/merge/comments.d.ts

@@ -0,0 +1,13 @@
+/**
+ * Comment threads in a three-way merge. Discussion is additive, so it
+ * merges without conflicts: new threads from both sides are kept, replies
+ * from both sides are appended (ours first), and the resolved flag follows
+ * the side that changed it (theirs when both did). A thread removed on one
+ * side survives when the other side replied to it. Replies removed on one
+ * side stay removed unless the other side replied.
+ */
+import type { StudioDocument } from '../document/types.js';
+import type { PrimitiveOp } from '../ops/types.js';
+/** Ops that add both sides' comment changes to `merged` (which carries the base threads). */
+export declare function commentMergeOps(base: StudioDocument, ours: StudioDocument, theirs: StudioDocument, merged: StudioDocument, seed: string): PrimitiveOp[];
+//# sourceMappingURL=comments.d.ts.map

package/dist/merge/comments.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"comments.d.ts","sourceRoot":"","sources":["../../src/merge/comments.ts"],"names":[],"mappings":"AAIA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAiB,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC1E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAkBnD,6FAA6F;AAC7F,wBAAgB,eAAe,CAAC,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,GAAG,WAAW,EAAE,CAsCvJ"}

package/dist/merge/comments.js

@@ -0,0 +1,61 @@
+/* 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 { applyPrimitive } from '../reducer/apply.js';
+import { findThread } from '../reducer/comment-ops.js';
+import { deriveId } from '../uuid.js';
+function threads(doc) {
+    const out = new Map();
+    for (const [nodeId, list] of Object.entries(doc.meta.comments))
+        for (const thread of list)
+            out.set(thread.id, { nodeId, thread });
+    return out;
+}
+const key = (c) => `${c.author}\u0000${c.at}\u0000${c.text}`;
+/** Ops that add both sides' comment changes to `merged` (which carries the base threads). */
+export function commentMergeOps(base, ours, theirs, merged, seed) {
+    const ops = [];
+    let doc = merged;
+    const push = (kind, payload) => {
+        const op = { kind, opId: deriveId(seed, `comments:${ops.length}`), payload };
+        doc = applyPrimitive(doc, op).doc;
+        ops.push(op);
+    };
+    const b = threads(base);
+    const o = threads(ours);
+    const t = threads(theirs);
+    for (const id of new Set([...b.keys(), ...o.keys(), ...t.keys()])) {
+        const bs = b.get(id);
+        const os = o.get(id);
+        const ts = t.get(id);
+        if (!bs) {
+            // New on one side (thread ids are fresh UUIDs, so never on both).
+            const site = os ?? ts;
+            if (site && !findThread(doc, id))
+                push('meta.comment.restoreThread', { nodeId: site.nodeId, index: (doc.meta.comments[site.nodeId] ?? []).length, thread: site.thread });
+            continue;
+        }
+        const n = bs.thread.comments.length;
+        const extra = (s) => (s ? s.thread.comments.slice(n) : []);
+        const added = [...extra(os)];
+        for (const c of extra(ts))
+            if (!added.some((x) => key(x) === key(c)))
+                added.push(c);
+        if ((!os || !ts) && !added.length) {
+            push('meta.comment.removeThread', { threadId: id });
+            continue;
+        }
+        if (!added.length) {
+            const keep = Math.min(os?.thread.comments.length ?? n, ts?.thread.comments.length ?? n);
+            for (let k = n; k > Math.max(keep, 1); k--)
+                push('meta.comment.removeReply', { threadId: id });
+        }
+        for (const c of added)
+            push('meta.comment.reply', { threadId: id, ...c });
+        const resolved = ts && ts.thread.resolved !== bs.thread.resolved ? ts.thread.resolved : os && os.thread.resolved !== bs.thread.resolved ? os.thread.resolved : bs.thread.resolved;
+        if (resolved !== bs.thread.resolved)
+            push('meta.comment.resolve', { threadId: id, resolved });
+    }
+    return ops;
+}
+//# sourceMappingURL=comments.js.map

package/dist/merge/comments.js.map

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

package/dist/merge/index.d.ts

@@ -0,0 +1,4 @@
+export { mergeDocuments, mergeOps } from './merge.js';
+export type { MergeConflict, MergeDiagnostic, MergeOptions, MergeResult, MergeSide } from './types.js';
+export { conflictView, resolveConflict, type ConflictCard, type ConflictView } from './view.js';
+//# sourceMappingURL=index.d.ts.map

package/dist/merge/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/merge/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtD,YAAY,EAAE,aAAa,EAAE,eAAe,EAAE,YAAY,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvG,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,KAAK,YAAY,EAAE,KAAK,YAAY,EAAE,MAAM,WAAW,CAAC"}

package/dist/merge/index.js

@@ -0,0 +1,6 @@
+/* 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 { mergeDocuments, mergeOps } from './merge.js';
+export { conflictView, resolveConflict } from './view.js';
+//# sourceMappingURL=index.js.map

package/dist/merge/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/merge/index.ts"],"names":[],"mappings":"AAAA;;+DAE+D;AAE/D,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtD,OAAO,EAAE,YAAY,EAAE,eAAe,EAAwC,MAAM,WAAW,CAAC"}

package/dist/merge/keys.d.ts

@@ -0,0 +1,22 @@
+/**
+ * What a diff entry changes, for the three-way merge. Each entry has one
+ * KEY (the unit two sides can disagree on: a field of a node, a node's
+ * existence, a node's place) and the node ids it lives under. Two sides
+ * conflict when they change one key differently, or when one deletes a
+ * node the other edits.
+ */
+import type { DiffEntry } from '../diff/types.js';
+import type { Uuid } from '../uuid.js';
+export interface EntryScope {
+    key: string;
+    /** Node ids the change lives under (spec, facet). */
+    nodes: Uuid[];
+    /** The node this entry deletes, if it is a removal. */
+    deletes?: Uuid;
+}
+export declare function scopeOf(e: DiffEntry): EntryScope;
+/** Keys whose disagreement is settled by last-writer-wins (theirs) with a diagnostic. */
+export declare function isOrderKey(key: string): boolean;
+/** A replaced facet conflicts with any other edit of that facet. */
+export declare function contentKeyOf(key: string): string | undefined;
+//# sourceMappingURL=keys.d.ts.map

package/dist/merge/keys.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"keys.d.ts","sourceRoot":"","sources":["../../src/merge/keys.ts"],"names":[],"mappings":"AAIA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAEvC,MAAM,WAAW,UAAU;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,qDAAqD;IACrD,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,uDAAuD;IACvD,OAAO,CAAC,EAAE,IAAI,CAAC;CAChB;AAED,wBAAgB,OAAO,CAAC,CAAC,EAAE,SAAS,GAAG,UAAU,CAwChD;AAED,yFAAyF;AACzF,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAE/C;AAED,oEAAoE;AACpE,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAG5D"}

package/dist/merge/keys.js

@@ -0,0 +1,54 @@
+/* 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 function scopeOf(e) {
+    switch (e.kind) {
+        case 'info.changed':
+            return { key: `info:${e.field}`, nodes: [] };
+        case 'custom.psetDeclared':
+        case 'custom.psetRemoved':
+            return { key: `pset:${e.decl.name}`, nodes: [] };
+        case 'custom.userDefinedTypeDeclared':
+        case 'custom.userDefinedTypeRemoved':
+            return { key: `udt:${e.decl.entity.toUpperCase()}:${e.decl.value.toUpperCase()}`, nodes: [] };
+        case 'spec.added':
+            return { key: `spec:${e.specId}:exists`, nodes: [e.specId] };
+        case 'spec.removed':
+            return { key: `spec:${e.specId}:exists`, nodes: [e.specId], deletes: e.specId };
+        case 'spec.moved':
+            return { key: `spec:${e.specId}:order`, nodes: [e.specId] };
+        case 'spec.changed': {
+            // min/max occurrences are one decision (the cardinality).
+            const field = e.field === 'minOccurs' || e.field === 'maxOccurs' ? 'occurs' : e.field;
+            return { key: `spec:${e.specId}:${field}`, nodes: [e.specId] };
+        }
+        case 'facet.added':
+            return { key: `facet:${e.facetId}:exists`, nodes: [e.specId, e.facetId] };
+        case 'facet.removed':
+            return { key: `facet:${e.facetId}:exists`, nodes: [e.specId, e.facetId], deletes: e.facetId };
+        case 'facet.moved': {
+            const across = e.from.specId !== e.to.specId || e.from.section !== e.to.section;
+            return { key: `facet:${e.facetId}:${across ? 'place' : 'order'}`, nodes: [e.from.specId, e.to.specId, e.facetId] };
+        }
+        case 'facet.replaced':
+            return { key: `facet:${e.facetId}:content`, nodes: [e.specId, e.facetId] };
+        case 'facet.valueChanged':
+            return { key: `facet:${e.facetId}:${e.field}`, nodes: [e.specId, e.facetId] };
+        case 'facet.relationChanged':
+            return { key: `facet:${e.facetId}:relation`, nodes: [e.specId, e.facetId] };
+        case 'facet.uriChanged':
+            return { key: `facet:${e.facetId}:uri`, nodes: [e.specId, e.facetId] };
+        case 'requirement.changed':
+            return { key: `facet:${e.facetId}:req.${e.field}`, nodes: [e.specId, e.facetId] };
+    }
+}
+/** Keys whose disagreement is settled by last-writer-wins (theirs) with a diagnostic. */
+export function isOrderKey(key) {
+    return key.endsWith(':order');
+}
+/** A replaced facet conflicts with any other edit of that facet. */
+export function contentKeyOf(key) {
+    const m = /^facet:([^:]+):/.exec(key);
+    return m ? `facet:${m[1]}:content` : undefined;
+}
+//# sourceMappingURL=keys.js.map

package/dist/merge/keys.js.map

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

package/dist/merge/merge.d.ts

@@ -0,0 +1,8 @@
+import type { StudioDocument } from '../document/types.js';
+import type { StudioOp } from '../ops/types.js';
+import type { MergeOptions, MergeResult } from './types.js';
+/** Merge `ours` and `theirs`, two revisions derived from `base`. */
+export declare function mergeDocuments(base: StudioDocument, ours: StudioDocument, theirs: StudioDocument, options?: MergeOptions): MergeResult;
+/** Merge two op sequences applied to `base` (e.g. two offline edit sessions). */
+export declare function mergeOps(base: StudioDocument, ours: readonly StudioOp[], theirs: readonly StudioOp[], options?: MergeOptions): MergeResult;
+//# sourceMappingURL=merge.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../src/merge/merge.ts"],"names":[],"mappings":"AA6BA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAG3D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAMhD,OAAO,KAAK,EAAkC,YAAY,EAAE,WAAW,EAAa,MAAM,YAAY,CAAC;AA+GvG,oEAAoE;AACpE,wBAAgB,cAAc,CAAC,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO,GAAE,YAAiB,GAAG,WAAW,CAoD1I;AAED,iFAAiF;AACjF,wBAAgB,QAAQ,CAAC,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,SAAS,QAAQ,EAAE,EAAE,MAAM,EAAE,SAAS,QAAQ,EAAE,EAAE,OAAO,GAAE,YAAiB,GAAG,WAAW,CAE9I"}