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

package/dist/merge/merge.js

@@ -0,0 +1,206 @@
+/* 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/. */
+/**
+ * Three-way merge at the op level (02-document-model-and-ops.md §6).
+ *
+ * `base`, `ours` and `theirs` are revisions of one Studio document. Each
+ * side's change set is its semantic diff from `base`; every diff entry is
+ * one change unit with a key (`scopeOf`). Changes on keys only one side
+ * touched merge automatically, identical changes merge once, and the rest
+ * become conflicts:
+ *
+ * - `field`: both sides changed one key differently;
+ * - `deleteEdit`: one side removed a node (or replaced a facet) that the
+ *   other side changed.
+ *
+ * A conflict is resolved by choosing a side (`options.resolutions`); an
+ * unresolved one keeps the base. Order is settled per list (`order.ts`).
+ * The merged change set is turned into primitive ops with `diffToOps`, so
+ * the result is reachable through ops, and those ops can be re-checked by
+ * the grounding gate (`options.gate`). Comment threads merge additively
+ * (`comments.ts`); lint suppressions and test suites merge per record,
+ * the side that changed a record winning (`sidecar.ts`).
+ */
+import { diffDocuments } from '../diff/diff.js';
+import { diffToOps } from '../diff/patch.js';
+import { checkOps } from '../gate/check.js';
+import { canonical } from '../match/cascade.js';
+import { apply } from '../reducer/apply.js';
+import { commentMergeOps } from './comments.js';
+import { sidecarMergeOps } from './sidecar.js';
+import { contentKeyOf, isOrderKey, scopeOf } from './keys.js';
+import { mergeOrder } from './order.js';
+function group(entries) {
+    const out = new Map();
+    for (const e of entries) {
+        const { key } = scopeOf(e);
+        const list = out.get(key) ?? [];
+        list.push(e);
+        out.set(key, list);
+    }
+    return out;
+}
+/** What a change sets, without rendering context (names, indices, sibling fields). */
+function payload(e) {
+    switch (e.kind) {
+        case 'info.changed':
+        case 'spec.changed':
+        case 'requirement.changed':
+            return [e.kind, e.field, e.new];
+        case 'facet.valueChanged':
+            return [e.kind, e.field, e.new];
+        case 'facet.relationChanged':
+        case 'facet.uriChanged':
+            return [e.kind, e.new];
+        case 'facet.moved':
+            return [e.kind, e.to.specId, e.to.section];
+        case 'spec.moved':
+            return [e.kind];
+        case 'facet.added':
+            return [e.kind, e.facet, e.requirement, e.specId, e.section];
+        case 'facet.replaced':
+            return [e.kind, e.facet, e.requirement];
+        case 'spec.added':
+            return [e.kind, e.spec];
+        default:
+            return [e.kind, 'decl' in e ? e.decl : e.specId];
+    }
+}
+function sameChange(a, b) {
+    return canonical((a ?? []).map(payload)) === canonical((b ?? []).map(payload));
+}
+/** Union-find over conflict keys, so overlapping conflicts become one. */
+class Groups {
+    parent = new Map();
+    find(k) {
+        let r = k;
+        while (this.parent.has(r) && this.parent.get(r) !== r)
+            r = this.parent.get(r);
+        return r;
+    }
+    union(a, b) {
+        if (!this.parent.has(a))
+            this.parent.set(a, a);
+        if (!this.parent.has(b))
+            this.parent.set(b, b);
+        const ra = this.find(a);
+        const rb = this.find(b);
+        if (ra !== rb)
+            this.parent.set(rb, ra);
+    }
+    has(k) {
+        return this.parent.has(k);
+    }
+}
+function conflicting(ours, theirs) {
+    const groups = new Groups();
+    for (const [key, list] of ours) {
+        if (isOrderKey(key) || !theirs.has(key))
+            continue;
+        if (!sameChange(list, theirs.get(key)))
+            groups.union(key, key);
+    }
+    // Node-wide changes (removal, facet replacement) against any other change of that node.
+    const nodeWide = (side, other) => {
+        for (const [key, list] of side) {
+            for (const e of list) {
+                const scope = scopeOf(e);
+                const node = scope.deletes ?? (e.kind === 'facet.replaced' ? e.facetId : undefined);
+                if (!node)
+                    continue;
+                for (const [otherKey, otherList] of other) {
+                    if (isOrderKey(otherKey) || (otherKey === key && sameChange(list, otherList)))
+                        continue;
+                    const touches = otherList.some((x) => scopeOf(x).nodes.includes(node));
+                    const sameFacet = e.kind === 'facet.replaced' && contentKeyOf(otherKey) === key;
+                    if (touches || sameFacet)
+                        groups.union(key, otherKey);
+                }
+            }
+        }
+    };
+    nodeWide(ours, theirs);
+    nodeWide(theirs, ours);
+    return groups;
+}
+function conflictOf(id, keys, ours, theirs, resolution) {
+    const o = keys.flatMap((k) => ours.get(k) ?? []);
+    const t = keys.flatMap((k) => theirs.get(k) ?? []);
+    const all = [...o, ...t];
+    const deleting = all.find((e) => scopeOf(e).deletes || e.kind === 'facet.replaced');
+    const facet = all.find((e) => 'facetId' in e);
+    const spec = all.find((e) => 'specId' in e);
+    return {
+        id,
+        kind: deleting ? 'deleteEdit' : 'field',
+        ...(spec ? { specId: spec.specId } : {}),
+        ...(facet ? { facetId: facet.facetId } : {}),
+        ours: o,
+        theirs: t,
+        ...(resolution ? { resolution } : {}),
+    };
+}
+/** Merge `ours` and `theirs`, two revisions derived from `base`. */
+export function mergeDocuments(base, ours, theirs, options = {}) {
+    const dOurs = diffDocuments(base, ours, { byNodeId: true });
+    const dTheirs = diffDocuments(base, theirs, { byNodeId: true });
+    const gOurs = group(dOurs.entries);
+    const gTheirs = group(dTheirs.entries);
+    const groups = conflicting(gOurs, gTheirs);
+    const members = new Map();
+    for (const key of new Set([...gOurs.keys(), ...gTheirs.keys()])) {
+        if (!groups.has(key))
+            continue;
+        const root = groups.find(key);
+        members.set(root, [...(members.get(root) ?? []), key]);
+    }
+    const conflicts = [];
+    const decided = new Map();
+    for (const keys of members.values()) {
+        keys.sort();
+        const id = keys.length === 1 ? keys[0] : `node:${keys[0]}`;
+        const resolution = options.resolutions?.[id];
+        conflicts.push(conflictOf(id, keys, gOurs, gTheirs, resolution));
+        for (const k of keys)
+            decided.set(k, resolution);
+    }
+    const chosen = [];
+    for (const key of new Set([...gOurs.keys(), ...gTheirs.keys()])) {
+        if (decided.has(key)) {
+            const side = decided.get(key);
+            if (side)
+                chosen.push(...((side === 'ours' ? gOurs : gTheirs).get(key) ?? []));
+            continue;
+        }
+        chosen.push(...(gOurs.get(key) ?? gTheirs.get(key) ?? []));
+    }
+    const diagnostics = [];
+    const merged = {
+        identical: chosen.length === 0,
+        byNodeId: true,
+        entries: chosen,
+        specs: [],
+        order: mergeOrder(base, dOurs, dTheirs, chosen, diagnostics),
+    };
+    const seed = options.seed ?? `merge:${base.docId}`;
+    const contentOps = diffToOps(base, merged, { seed });
+    if (options.gate) {
+        const gate = checkOps(contentOps, base, options.gate);
+        for (const issue of gate.issues)
+            diagnostics.push({ code: 'MERGE-GATE-001', message: issue.message, issue });
+    }
+    const content = apply(base, contentOps).doc;
+    const commentOps = commentMergeOps(base, ours, theirs, content, seed);
+    const withComments = apply(content, commentOps).doc;
+    const sidecarOps = sidecarMergeOps(base, ours, theirs, withComments, seed);
+    const ops = [...contentOps, ...commentOps, ...sidecarOps];
+    const doc = apply(withComments, sidecarOps).doc;
+    const unresolved = conflicts.some((c) => !c.resolution);
+    return { doc, ops, conflicts, diagnostics, clean: !unresolved && !diagnostics.some((d) => d.code === 'MERGE-GATE-001') };
+}
+/** Merge two op sequences applied to `base` (e.g. two offline edit sessions). */
+export function mergeOps(base, ours, theirs, options = {}) {
+    return mergeDocuments(base, apply(base, ours).doc, apply(base, theirs).doc, options);
+}
+//# sourceMappingURL=merge.js.map

package/dist/merge/merge.js.map

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

package/dist/merge/order.d.ts

@@ -0,0 +1,11 @@
+import type { DiffEntry, DiffOrder, DocumentDiff } from '../diff/types.js';
+import type { StudioDocument } from '../document/types.js';
+import type { Uuid } from '../uuid.js';
+import type { MergeDiagnostic } from './types.js';
+/** Common elements of `side`, in `side` order, differ from `base` order. */
+export declare function reordered(base: readonly Uuid[], side: readonly Uuid[]): boolean;
+/** `primary` filtered to `members`, plus members only `secondary` holds, placed after their predecessor there. */
+export declare function mergeList(primary: readonly Uuid[], secondary: readonly Uuid[], members: ReadonlySet<Uuid>): Uuid[];
+/** The target order of the merged document, given the entries the merge applies. */
+export declare function mergeOrder(base: StudioDocument, ours: DocumentDiff, theirs: DocumentDiff, chosen: readonly DiffEntry[], diagnostics: MergeDiagnostic[]): DiffOrder;
+//# sourceMappingURL=order.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"order.d.ts","sourceRoot":"","sources":["../../src/merge/order.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAC3E,OAAO,KAAK,EAAW,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACpE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAElD,4EAA4E;AAC5E,wBAAgB,SAAS,CAAC,IAAI,EAAE,SAAS,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,IAAI,EAAE,GAAG,OAAO,CAM/E;AAED,kHAAkH;AAClH,wBAAgB,SAAS,CAAC,OAAO,EAAE,SAAS,IAAI,EAAE,EAAE,SAAS,EAAE,SAAS,IAAI,EAAE,EAAE,OAAO,EAAE,WAAW,CAAC,IAAI,CAAC,GAAG,IAAI,EAAE,CAkBlH;AAwCD,oFAAoF;AACpF,wBAAgB,UAAU,CAAC,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,SAAS,EAAE,EAAE,WAAW,EAAE,eAAe,EAAE,GAAG,SAAS,CA6ClK"}

package/dist/merge/order.js

@@ -0,0 +1,117 @@
+/* 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/. */
+/**
+ * Order and placement for the merged document. Order is not a field two
+ * sides can agree on piecewise, so it is settled per list: the side that
+ * reordered the list wins; when both reordered it differently, theirs
+ * wins (last writer) and the merge reports MERGE-ORDER-001. Nodes the
+ * winning list does not hold (added on the other side) are inserted after
+ * their nearest predecessor in the other side's list.
+ */
+import { SECTIONS } from '../diff/align.js';
+/** Common elements of `side`, in `side` order, differ from `base` order. */
+export function reordered(base, side) {
+    const inSide = new Set(side);
+    const inBase = new Set(base);
+    const b = base.filter((x) => inSide.has(x));
+    const s = side.filter((x) => inBase.has(x));
+    return b.some((x, i) => s[i] !== x);
+}
+/** `primary` filtered to `members`, plus members only `secondary` holds, placed after their predecessor there. */
+export function mergeList(primary, secondary, members) {
+    const out = primary.filter((x) => members.has(x));
+    const placed = new Set(out);
+    secondary.forEach((id, i) => {
+        if (!members.has(id) || placed.has(id))
+            return;
+        let at = 0;
+        for (let k = i - 1; k >= 0; k--) {
+            const pos = out.indexOf(secondary[k]);
+            if (pos >= 0) {
+                at = pos + 1;
+                break;
+            }
+        }
+        out.splice(at, 0, id);
+        placed.add(id);
+    });
+    for (const id of members)
+        if (!placed.has(id))
+            out.push(id);
+    return out;
+}
+function pickList(base, ours, theirs, members, diagnose) {
+    const o = reordered(base, ours);
+    const t = reordered(base, theirs);
+    if (o && t) {
+        const common = (l) => l.filter((x) => members.has(x) && ours.includes(x) && theirs.includes(x));
+        if (common(ours).join() !== common(theirs).join())
+            diagnose();
+        return mergeList(theirs, ours, members);
+    }
+    return o ? mergeList(ours, theirs, members) : mergeList(theirs, ours, members);
+}
+function basePlaces(doc) {
+    const places = new Map();
+    doc.nodes.specs.forEach((spec) => {
+        for (const section of SECTIONS) {
+            for (const f of section === 'applicability' ? spec.applicability : spec.requirements)
+                places.set(f.id, { specId: spec.id, section });
+        }
+    });
+    return places;
+}
+function baseOrder(doc) {
+    const order = { specs: [], sections: {} };
+    doc.nodes.specs.forEach((spec) => {
+        order.specs.push(spec.id);
+        order.sections[spec.id] = { applicability: spec.applicability.map((f) => f.id), requirements: spec.requirements.map((f) => f.id) };
+    });
+    return order;
+}
+/** The target order of the merged document, given the entries the merge applies. */
+export function mergeOrder(base, ours, theirs, chosen, diagnostics) {
+    const specs = new Set(base.nodes.specs.map((s) => s.id));
+    const places = basePlaces(base);
+    for (const e of chosen) {
+        if (e.kind === 'spec.added') {
+            specs.add(e.specId);
+            e.nodes.applicability.forEach((f) => places.set(f.id, { specId: e.specId, section: 'applicability' }));
+            e.nodes.requirements.forEach((f) => places.set(f.id, { specId: e.specId, section: 'requirements' }));
+        }
+    }
+    for (const e of chosen) {
+        if (e.kind === 'facet.added')
+            places.set(e.facetId, { specId: e.specId, section: e.section });
+        if (e.kind === 'facet.moved')
+            places.set(e.facetId, { specId: e.to.specId, section: e.to.section });
+        if (e.kind === 'facet.removed')
+            places.delete(e.facetId);
+    }
+    for (const e of chosen) {
+        if (e.kind !== 'spec.removed')
+            continue;
+        specs.delete(e.specId);
+        for (const [id, p] of places)
+            if (p.specId === e.specId)
+                places.delete(id);
+    }
+    const b = baseOrder(base);
+    const order = { specs: [], sections: {} };
+    order.specs = pickList(b.specs, ours.order.specs, theirs.order.specs, specs, () => diagnostics.push({ code: 'MERGE-ORDER-001', message: 'Both sides reordered the specifications; their order was kept.' }));
+    for (const specId of order.specs) {
+        const lists = { applicability: [], requirements: [] };
+        for (const section of SECTIONS) {
+            const members = new Set([...places].filter(([, p]) => p.specId === specId && p.section === section).map(([id]) => id));
+            lists[section] = pickList(b.sections[specId]?.[section] ?? [], ours.order.sections[specId]?.[section] ?? [], theirs.order.sections[specId]?.[section] ?? [], members, () => diagnostics.push({
+                code: 'MERGE-ORDER-001',
+                message: `Both sides reordered the ${section} of a specification; their order was kept.`,
+                specId,
+            }));
+        }
+        order.sections[specId] = lists;
+    }
+    return order;
+}
+//# sourceMappingURL=order.js.map

package/dist/merge/order.js.map

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

package/dist/merge/sidecar.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Lint suppressions and test suites in a three-way merge. Both are sidecar
+ * records with a natural key: a suppression is keyed by node and rule, a
+ * test case by its id. Per key, the side that changed it relative to the
+ * base wins (theirs when both did, like a reorder); an unchanged key keeps
+ * the base. They never raise content conflicts.
+ */
+import type { StudioDocument } from '../document/types.js';
+import type { PrimitiveOp } from '../ops/types.js';
+/** Ops that bring both sides' suppression and test-suite changes into `merged` (which carries the base records). */
+export declare function sidecarMergeOps(base: StudioDocument, ours: StudioDocument, theirs: StudioDocument, merged: StudioDocument, seed: string): PrimitiveOp[];
+//# sourceMappingURL=sidecar.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"sidecar.d.ts","sourceRoot":"","sources":["../../src/merge/sidecar.ts"],"names":[],"mappings":"AAIA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAe,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAExE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAmCnD,oHAAoH;AACpH,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,CAgCvJ"}

package/dist/merge/sidecar.js

@@ -0,0 +1,64 @@
+/* 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 { canonical } from '../match/cascade.js';
+import { applyPrimitive } from '../reducer/apply.js';
+import { findTestCase } from '../reducer/test-ops.js';
+import { deriveId } from '../uuid.js';
+function suppressions(doc) {
+    const out = new Map();
+    for (const [nodeId, list] of Object.entries(doc.meta.suppressions)) {
+        for (const suppression of list)
+            out.set(`${nodeId}\u0000${suppression.rule}`, { nodeId, suppression });
+    }
+    return out;
+}
+function cases(doc) {
+    const out = new Map();
+    for (const [specId, suite] of Object.entries(doc.meta.tests))
+        for (const testCase of suite.cases)
+            out.set(testCase.id, { specId, testCase });
+    return out;
+}
+/** The value a key takes: theirs if theirs changed it, else ours. */
+function pick(b, o, t) {
+    return canonical(t ?? null) !== canonical(b ?? null) ? t : o;
+}
+/** Ops that bring both sides' suppression and test-suite changes into `merged` (which carries the base records). */
+export function sidecarMergeOps(base, ours, theirs, merged, seed) {
+    const ops = [];
+    let doc = merged;
+    const push = (kind, payload) => {
+        const op = { kind, opId: deriveId(seed, `sidecar:${ops.length}`), payload };
+        doc = applyPrimitive(doc, op).doc;
+        ops.push(op);
+    };
+    const [bs, os, ts] = [suppressions(base), suppressions(ours), suppressions(theirs)];
+    for (const key of new Set([...bs.keys(), ...os.keys(), ...ts.keys()])) {
+        const want = pick(bs.get(key), os.get(key), ts.get(key));
+        const have = suppressions(doc).get(key);
+        if (canonical(want ?? null) === canonical(have ?? null))
+            continue;
+        if (want)
+            push('meta.suppress', { nodeId: want.nodeId, suppression: want.suppression });
+        else if (have)
+            push('meta.unsuppress', { nodeId: have.nodeId, rule: have.suppression.rule });
+    }
+    const [bc, oc, tc] = [cases(base), cases(ours), cases(theirs)];
+    for (const id of new Set([...bc.keys(), ...oc.keys(), ...tc.keys()])) {
+        const want = pick(bc.get(id), oc.get(id), tc.get(id));
+        const have = findTestCase(doc, id);
+        if (canonical(want ?? null) === canonical(have ? { specId: have.specId, testCase: have.testCase } : null))
+            continue;
+        if (have)
+            push('meta.test.remove', { testId: id });
+        if (want) {
+            // Keep the case's place when it stays in its suite; otherwise append. Suites outlive their specification.
+            const length = doc.meta.tests[want.specId]?.cases.length ?? 0;
+            const index = have && have.specId === want.specId ? Math.min(have.index, length) : length;
+            push('meta.test.restore', { specId: want.specId, index, testCase: want.testCase });
+        }
+    }
+    return ops;
+}
+//# sourceMappingURL=sidecar.js.map

package/dist/merge/sidecar.js.map

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

package/dist/merge/types.d.ts

@@ -0,0 +1,50 @@
+/** Three-way merge data model (02-document-model-and-ops.md §6). */
+import type { DiffEntry } from '../diff/types.js';
+import type { StudioDocument } from '../document/types.js';
+import type { GateContext } from '../gate/context.js';
+import type { GateIssue } from '../gate/types.js';
+import type { PrimitiveOp } from '../ops/types.js';
+import type { Uuid } from '../uuid.js';
+export type MergeSide = 'ours' | 'theirs';
+export interface MergeConflict {
+    /** Stable id: the conflicting key (`facet:<id>:property.value`, …). */
+    id: string;
+    /**
+     * `field`: both sides set one field differently.
+     * `deleteEdit`: one side removed a node the other changed.
+     */
+    kind: 'field' | 'deleteEdit';
+    /** The node the conflict is about. */
+    specId?: Uuid;
+    facetId?: Uuid;
+    ours: DiffEntry[];
+    theirs: DiffEntry[];
+    /** The side applied, or `undefined` when unresolved (base kept). */
+    resolution?: MergeSide;
+}
+export interface MergeDiagnostic {
+    code: 'MERGE-ORDER-001' | 'MERGE-GATE-001';
+    message: string;
+    /** For MERGE-ORDER-001: the specification whose order was decided (absent = specification order). */
+    specId?: Uuid;
+    /** For MERGE-GATE-001: the gate's issue on the merged ops. */
+    issue?: GateIssue;
+}
+export interface MergeOptions {
+    /** Conflict id → the side to apply. Unresolved conflicts keep the base value. */
+    resolutions?: Readonly<Record<string, MergeSide>>;
+    /** Re-check the merged ops with the grounding gate. */
+    gate?: GateContext;
+    /** Seed for deterministic op ids. */
+    seed?: string;
+}
+export interface MergeResult {
+    doc: StudioDocument;
+    /** Primitive ops that turn `base` into `doc`. */
+    ops: PrimitiveOp[];
+    conflicts: MergeConflict[];
+    diagnostics: MergeDiagnostic[];
+    /** No unresolved conflict and no gate issue. */
+    clean: boolean;
+}
+//# sourceMappingURL=types.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/merge/types.ts"],"names":[],"mappings":"AAIA,oEAAoE;AAEpE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAEvC,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,QAAQ,CAAC;AAE1C,MAAM,WAAW,aAAa;IAC5B,uEAAuE;IACvE,EAAE,EAAE,MAAM,CAAC;IACX;;;OAGG;IACH,IAAI,EAAE,OAAO,GAAG,YAAY,CAAC;IAC7B,sCAAsC;IACtC,MAAM,CAAC,EAAE,IAAI,CAAC;IACd,OAAO,CAAC,EAAE,IAAI,CAAC;IACf,IAAI,EAAE,SAAS,EAAE,CAAC;IAClB,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB,oEAAoE;IACpE,UAAU,CAAC,EAAE,SAAS,CAAC;CACxB;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,iBAAiB,GAAG,gBAAgB,CAAC;IAC3C,OAAO,EAAE,MAAM,CAAC;IAChB,qGAAqG;IACrG,MAAM,CAAC,EAAE,IAAI,CAAC;IACd,8DAA8D;IAC9D,KAAK,CAAC,EAAE,SAAS,CAAC;CACnB;AAED,MAAM,WAAW,YAAY;IAC3B,iFAAiF;IACjF,WAAW,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;IAClD,uDAAuD;IACvD,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,qCAAqC;IACrC,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,cAAc,CAAC;IACpB,iDAAiD;IACjD,GAAG,EAAE,WAAW,EAAE,CAAC;IACnB,SAAS,EAAE,aAAa,EAAE,CAAC;IAC3B,WAAW,EAAE,eAAe,EAAE,CAAC;IAC/B,gDAAgD;IAChD,KAAK,EAAE,OAAO,CAAC;CAChB"}

package/dist/merge/types.js

@@ -0,0 +1,5 @@
+/* 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 {};
+//# sourceMappingURL=types.js.map

package/dist/merge/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/merge/types.ts"],"names":[],"mappings":"AAAA;;+DAE+D"}

package/dist/merge/view.d.ts

@@ -0,0 +1,28 @@
+/**
+ * Framework-free view model for the conflict UI ("accept ours / theirs"
+ * per conflict). A host renders `cards`, collects choices into
+ * `resolutions` and calls `mergeDocuments` again with them.
+ */
+import type { SupportedLocale } from '@ifc-lite/ids';
+import type { MergeConflict, MergeResult, MergeSide } from './types.js';
+export interface ConflictCard {
+    id: string;
+    kind: MergeConflict['kind'];
+    /** The specification the conflict is about, by name. */
+    title: string;
+    ours: string[];
+    theirs: string[];
+    resolution?: MergeSide;
+}
+export interface ConflictView {
+    cards: ConflictCard[];
+    unresolved: number;
+    /** Order and gate notices, as sentences. */
+    notices: string[];
+    /** Resolutions as chosen so far (feed back into `mergeDocuments`). */
+    resolutions: Record<string, MergeSide>;
+}
+export declare function conflictView(result: MergeResult, locale?: SupportedLocale): ConflictView;
+/** Choose a side for one conflict; returns the next resolutions record. */
+export declare function resolveConflict(resolutions: Readonly<Record<string, MergeSide>>, id: string, side: MergeSide): Record<string, MergeSide>;
+//# sourceMappingURL=view.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"view.d.ts","sourceRoot":"","sources":["../../src/merge/view.ts"],"names":[],"mappings":"AAIA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAErD,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAExE,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IAC5B,wDAAwD;IACxD,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,UAAU,CAAC,EAAE,SAAS,CAAC;CACxB;AAED,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,YAAY,EAAE,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,4CAA4C;IAC5C,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,sEAAsE;IACtE,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CACxC;AAOD,wBAAgB,YAAY,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,GAAE,eAAsB,GAAG,YAAY,CAiB9F;AAED,2EAA2E;AAC3E,wBAAgB,eAAe,CAAC,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAExI"}

package/dist/merge/view.js

@@ -0,0 +1,35 @@
+/* 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 { describeChange } from '../diff/changelog.js';
+function title(c) {
+    for (const e of [...c.ours, ...c.theirs])
+        if ('specName' in e)
+            return e.specName;
+    return 'Document';
+}
+export function conflictView(result, locale = 'en') {
+    const cards = result.conflicts.map((c) => ({
+        id: c.id,
+        kind: c.kind,
+        title: title(c),
+        ours: c.ours.map((e) => describeChange(e, locale)),
+        theirs: c.theirs.map((e) => describeChange(e, locale)),
+        ...(c.resolution ? { resolution: c.resolution } : {}),
+    }));
+    const resolutions = {};
+    for (const c of result.conflicts)
+        if (c.resolution)
+            resolutions[c.id] = c.resolution;
+    return {
+        cards,
+        unresolved: cards.filter((c) => !c.resolution).length,
+        notices: result.diagnostics.map((d) => d.message),
+        resolutions,
+    };
+}
+/** Choose a side for one conflict; returns the next resolutions record. */
+export function resolveConflict(resolutions, id, side) {
+    return { ...resolutions, [id]: side };
+}
+//# sourceMappingURL=view.js.map

package/dist/merge/view.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"view.js","sourceRoot":"","sources":["../../src/merge/view.ts"],"names":[],"mappings":"AAAA;;+DAE+D;AAS/D,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAsBtD,SAAS,KAAK,CAAC,CAAgB;IAC7B,KAAK,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,MAAM,CAAC;QAAE,IAAI,UAAU,IAAI,CAAC;YAAE,OAAO,CAAC,CAAC,QAAQ,CAAC;IACjF,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,MAAmB,EAAE,SAA0B,IAAI;IAC9E,MAAM,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACzC,EAAE,EAAE,CAAC,CAAC,EAAE;QACR,IAAI,EAAE,CAAC,CAAC,IAAI;QACZ,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;QACf,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;QAClD,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;QACtD,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACtD,CAAC,CAAC,CAAC;IACJ,MAAM,WAAW,GAA8B,EAAE,CAAC;IAClD,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,SAAS;QAAE,IAAI,CAAC,CAAC,UAAU;YAAE,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC;IACrF,OAAO;QACL,KAAK;QACL,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,MAAM;QACrD,OAAO,EAAE,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QACjD,WAAW;KACZ,CAAC;AACJ,CAAC;AAED,2EAA2E;AAC3E,MAAM,UAAU,eAAe,CAAC,WAAgD,EAAE,EAAU,EAAE,IAAe;IAC3G,OAAO,EAAE,GAAG,WAAW,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC;AACxC,CAAC"}

package/dist/ops/draft.d.ts

@@ -0,0 +1,33 @@
+/**
+ * `ConstraintDraft` → `IDSConstraint` normalisation (§3.4) and
+ * `FacetDraft` → `IDSFacet`.
+ *
+ * Rules:
+ * - `any` means "no value check": the field is removed (IDS expresses "any
+ *   value" by omitting the constraint). Required fields cannot be `any`.
+ * - `equals` → `simpleValue`; booleans become `true`/`false`.
+ * - `oneOf` → `enumeration`; an all-number list gets base `xs:double`, an
+ *   all-boolean list `xs:boolean`, unless `base` is given.
+ * - `range` → `bounds` (in/exclusive per flag, inclusive by default), the
+ *   unit converted to SI.
+ * - `length` / `digits` → `bounds` length / digit facets.
+ * - `all` → one restriction: bounds merge into one family, the first family
+ *   is primary and the rest hang off `and` (the `@ifc-lite/ids` shape).
+ * - Literal entity names and dataTypes are stored UPPERCASE, as in IDS XML.
+ */
+import type { IDSConstraint, IDSFacet } from '@ifc-lite/ids';
+import type { FacetFieldName } from '../document/fields.js';
+import type { FacetDraft, ValueInput } from './types.js';
+/** A draft that cannot be normalised. Surfaces as gate code `GATE-VAL-001`. */
+export declare class DraftError extends Error {
+    readonly code = "GATE-VAL-001";
+    constructor(message: string);
+}
+/**
+ * Normalise a value input for `field`. Returns `undefined` for `any`
+ * (remove the constraint). Raw constraints pass through unchanged.
+ */
+export declare function normaliseValue(input: ValueInput, field?: FacetFieldName): IDSConstraint | undefined;
+/** Build the IDS facet a draft describes. Throws `DraftError`. */
+export declare function facetFromDraft(draft: FacetDraft): IDSFacet;
+//# sourceMappingURL=draft.d.ts.map

package/dist/ops/draft.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"draft.d.ts","sourceRoot":"","sources":["../../src/ops/draft.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAuB,aAAa,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAClF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,KAAK,EAAmB,UAAU,EAAU,UAAU,EAAE,MAAM,YAAY,CAAC;AAGlF,+EAA+E;AAC/E,qBAAa,UAAW,SAAQ,KAAK;IACnC,QAAQ,CAAC,IAAI,kBAAkB;gBACnB,OAAO,EAAE,MAAM;CAI5B;AAuJD;;;GAGG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,CAAC,EAAE,cAAc,GAAG,aAAa,GAAG,SAAS,CAInG;AAqBD,kEAAkE;AAClE,wBAAgB,cAAc,CAAC,KAAK,EAAE,UAAU,GAAG,QAAQ,CA6C1D"}