@ybotok/loam 0.1.0-beta.3 → 0.2.0-alpha.13

package/dist/core/c4/source-scan.js

@@ -0,0 +1,308 @@
+/**
+ * The text-level view of a LikeC4 document: which bytes each declaration owns.
+ *
+ * loam's archive merges the landscape by SPLICING authored text, not by
+ * re-rendering a parsed model — a re-render would reformat every line somebody
+ * wrote. So the merge needs both views of the same file: the parsed one
+ * (`likec4.ts`) for what the model MEANS, and this one for where each
+ * declaration physically is. A key only one of them reads is a key the merge
+ * silently drops, which is why `metadata` handling is spelled out in both.
+ */
+import { maskSource, matchBrace, statementEnd, statementHead, topLevelBlocks } from "./source-mask.js";
+/** The element and relationship kinds the `specification` blocks of `text` declare — with `also`'s, when given. */
+export function kindsDeclared(text, also) {
+    const { code } = maskSource(text);
+    const kinds = new Set(also?.kinds);
+    const relKinds = new Set(also?.relKinds);
+    for (const sm of code.matchAll(/\bspecification\s*\{/g)) {
+        const sClose = matchBrace(code, sm.index + sm[0].length - 1);
+        if (sClose === -1)
+            continue;
+        for (const em of code.slice(sm.index, sClose).matchAll(/\b(element|relationship)\s+([A-Za-z_][\w-]*)/g)) {
+            (em[1] === "element" ? kinds : relKinds).add(em[2]);
+        }
+    }
+    return { kinds, relKinds };
+}
+/**
+ * Locate every element and relationship declaration inside the top-level
+ * `model { ... }` blocks of a LikeC4 source, with the byte range each one
+ * occupies. This is the splice map `loam archive` merges the landscape with:
+ * the parsed model says WHAT exists, this says WHERE its authored text is —
+ * verbatim, so nothing the parser does not model (technology, style, links)
+ * can be lost by rebuilding it.
+ *
+ * Every block is read, in document order, and each declaration records which
+ * one it sits in (`block`); ids, endpoints and nesting are one namespace
+ * across all of them, because that is how LikeC4 merges them.
+ *
+ * Both declaration forms are recognised — `name = kind ...` always, and
+ * `kind name ...` for any kind the document's own `specification` block
+ * declares, or `borrowed` names. Relationship endpoints are resolved the way LikeC4 reads them:
+ * innermost enclosing scope outward, then the top level, then a unique leaf
+ * name anywhere; `it`/`this` (and an omitted source) mean the enclosing
+ * element. A name that resolves nowhere is left as written — the caller's
+ * match against the parsed model then fails loudly instead of guessing.
+ *
+ * Returns null when there is no model block at all. Callers only hand in documents
+ * LikeC4 has already parsed, so the scan can trust balanced braces.
+ */
+export function scanModel(text, borrowed) {
+    const masked = maskSource(text);
+    const { code, literals } = masked;
+    // EVERY top-level `model { }` block, and only those (`topLevelBlocks`): a
+    // document may hold any number, and LikeC4 reads them as one model. The
+    // scan used to stop at the FIRST match, so every declaration in a later
+    // block was invisible — the landscape parsed, `validate --all` was green,
+    // and archive refused with a message about two declarations sharing a line
+    // (a fleet on 0.2.0-alpha.7, 2026-10). Depth zero is the other half of the
+    // same fix: the bare first match also took a nested `model {` — a kind or a
+    // view NAMED model (`element model { … }`), written above the real block —
+    // for the model.
+    const blocks = [];
+    for (const { match } of topLevelBlocks(code, /\bmodel\s*\{/g)) {
+        const open = match.index + match[0].length - 1;
+        const close = matchBrace(code, open);
+        if (close === -1)
+            break;
+        blocks.push({ open, close });
+    }
+    if (blocks.length === 0)
+        return null;
+    // Element kinds from the specification block(s): the `<kind> <name>`
+    // declaration form is recognisable only by its first token being a kind.
+    // Relationship kinds likewise, for the `source .kind target` edge form.
+    const { kinds, relKinds } = kindsDeclared(text, borrowed);
+    const indentOf = (at) => {
+        const nl = text.lastIndexOf("\n", at - 1);
+        const ws = text.slice(nl + 1, at);
+        return /^[ \t]*$/.test(ws) ? ws : "";
+    };
+    const literalIn = (from, to) => literals.find((l) => l.start >= from && l.end <= to);
+    // A key is a whole identifier, and LikeC4's identifiers carry hyphens. `\b`
+    // took the `-` for a boundary, so `op-version 'v2'` above `op 'cancelOrdr'`
+    // was read as op `'v2'`, a `#op-critical` tag as the key `op` naming the
+    // literal after it — the next property's — and `validate --all --base`
+    // graded neither op the branch wrote: the scanned edge matched no parsed one,
+    // so the misspelt `cancelOrdr` went green where the plain run reports
+    // `spine.op-undefined` (probed on main at 171555d; 57b33ad fixed the same
+    // hyphen for ids and not here).
+    const keyedLiteral = (key, range) => {
+        if (range === null)
+            return undefined;
+        const re = new RegExp(`(?<![\\w-])${key}(?![\\w-])`, "g");
+        re.lastIndex = range.from;
+        const km = re.exec(code);
+        if (km === null || km.index >= range.to)
+            return undefined;
+        return literalIn(km.index, range.to)?.value;
+    };
+    // The spine keys are METADATA keys — the parsed `Rel` reads them out of
+    // `metadata { }` and nowhere else (`likec4.ts`) — so the scan reads them only
+    // there. Read from the whole body, a bare `#op` tag (a legal tag name) above a
+    // `description` was the key `op` once more, whatever the boundary rule.
+    const metadataOf = (body) => {
+        if (body === null)
+            return null;
+        const re = /(?<![\w-])metadata\s*\{/g;
+        re.lastIndex = body.from;
+        const mm = re.exec(code);
+        if (mm === null || mm.index >= body.to)
+            return null;
+        const open = mm.index + mm[0].length - 1;
+        const shut = matchBrace(code, open);
+        return shut === -1 || shut > body.to ? null : { from: open + 1, to: shut };
+    };
+    // A bodyless statement's end — its trailing comment included, unless that
+    // comment runs on past the line (`statementEnd` says why).
+    const bodylessEnd = (from, to) => statementEnd(text, masked, { start: from, end: to });
+    const elements = [];
+    const raw = [];
+    const stack = [];
+    for (const [block, { open, close }] of blocks.entries()) {
+        let i = open + 1;
+        while (i < close) {
+            const ch = code[i];
+            if (/\s/.test(ch)) {
+                i += 1;
+                continue;
+            }
+            if (ch === "}") {
+                const frame = stack.pop();
+                if (frame !== undefined) {
+                    frame.el.bodyClose = i;
+                    frame.el.end = i + 1;
+                    elements.push(frame.el);
+                }
+                i += 1;
+                continue;
+            }
+            // A statement's head: up to its own `{`, the end of the line, or the
+            // enclosing block's `}` on the same line — whichever comes first, unless
+            // LikeC4 reads on past the newline (`statementHead` says when it does).
+            const stmtStart = i;
+            const { end: headEnd, opener } = statementHead(masked, i, close);
+            const head = code.slice(stmtStart, headEnd);
+            const parentId = stack.length > 0 ? stack[stack.length - 1].id : "";
+            // `extend <fqn> { … }` — the extending model's one construct, and the only
+            // frame here whose id is not minted from the enclosing scope: it names an
+            // element the fleet map already declares, so its children are `<fqn>.<name>`
+            // and a reference inside it resolves against that scope. Without this the
+            // block fell through to the property-line arm and everything in it was
+            // invisible, which is why the archive spliced a service's interior into the
+            // map instead (verification 2026-09-04, E1).
+            const extended = opener === -1 ? null : /^extend\s+([A-Za-z_][\w.-]*)\s*$/.exec(head);
+            if (extended !== null) {
+                const id = parentId === "" ? extended[1] : `${parentId}.${extended[1]}`;
+                const el = {
+                    id,
+                    start: stmtStart,
+                    end: headEnd,
+                    bodyOpen: opener,
+                    bodyClose: -1,
+                    indent: indentOf(stmtStart),
+                    block,
+                    extend: true,
+                };
+                stack.push({ id, el });
+                i = opener + 1;
+                continue;
+            }
+            // Classify: `name = kind` first, then a relationship (the arrow cannot hide
+            // in a string — the head is masked), then the `kind name` form, else a
+            // property/tag line that is consumed whole, nested block included.
+            let localName = null;
+            const assign = /^([A-Za-z_][\w-]*)\s*=\s*[A-Za-z_]/.exec(head);
+            if (assign !== null) {
+                localName = assign[1];
+            }
+            else if (!head.includes("->")) {
+                const toks = head.trim().split(/\s+/);
+                if (toks.length >= 2 && kinds.has(toks[0]) && /^[A-Za-z_][\w-]*$/.test(toks[1])) {
+                    localName = toks[1];
+                }
+            }
+            if (localName !== null) {
+                const id = parentId === "" ? localName : `${parentId}.${localName}`;
+                const el = {
+                    id,
+                    start: stmtStart,
+                    end: headEnd,
+                    bodyOpen: opener,
+                    bodyClose: -1,
+                    indent: indentOf(stmtStart),
+                    block,
+                };
+                const titled = literalIn(stmtStart, headEnd)?.value;
+                if (titled !== undefined)
+                    el.title = titled;
+                if (opener !== -1) {
+                    stack.push({ id, el });
+                    i = opener + 1;
+                }
+                else {
+                    el.end = bodylessEnd(stmtStart, headEnd);
+                    elements.push(el);
+                    i = headEnd;
+                }
+                continue;
+            }
+            const am = relationHead(head, relKinds);
+            if (am !== null || head.includes("->")) {
+                const bClose = opener === -1 ? -1 : matchBrace(code, opener);
+                const stmtEnd = opener === -1 ? bodylessEnd(stmtStart, headEnd) : bClose === -1 ? close : bClose + 1;
+                if (am !== null) {
+                    const arrowEnd = stmtStart + am.length;
+                    const body = opener === -1 ? null : { from: opener + 1, to: stmtEnd - 1 };
+                    const meta = metadataOf(body);
+                    const title = literalIn(arrowEnd, headEnd)?.value ?? keyedLiteral("title", body);
+                    const tags = [];
+                    for (const tm of code.slice(stmtStart, stmtEnd).matchAll(/#([\w-]+)/g))
+                        tags.push(tm[1]);
+                    raw.push({
+                        srcLit: am.src,
+                        tgtLit: am.tgt,
+                        parent: parentId,
+                        start: stmtStart,
+                        end: stmtEnd,
+                        indent: indentOf(stmtStart),
+                        block,
+                        title,
+                        op: keyedLiteral("op", meta),
+                        publishes: keyedLiteral("publishes", meta),
+                        consumes: keyedLiteral("consumes", meta),
+                        tags,
+                        kind: am.kind,
+                    });
+                }
+                i = Math.max(stmtEnd, headEnd);
+                continue;
+            }
+            if (opener !== -1) {
+                const bClose = matchBrace(code, opener);
+                i = bClose === -1 ? close : bClose + 1;
+            }
+            else {
+                i = headEnd;
+            }
+        }
+    }
+    // Resolve relationship endpoints against everything declared anywhere in the
+    // model — LikeC4 resolution is not order-dependent, so neither is this.
+    const ids = new Set(elements.map((e) => e.id));
+    const byLeaf = new Map();
+    for (const e of elements) {
+        const leaf = e.id.slice(e.id.lastIndexOf(".") + 1);
+        byLeaf.set(leaf, [...(byLeaf.get(leaf) ?? []), e.id]);
+    }
+    const resolve = (lit, enclosing) => {
+        if (lit === undefined || lit === "it" || lit === "this")
+            return enclosing;
+        const segs = lit.split(".");
+        let base;
+        for (let scope = enclosing; scope !== "" && base === undefined;) {
+            if (ids.has(`${scope}.${segs[0]}`))
+                base = `${scope}.${segs[0]}`;
+            const dot = scope.lastIndexOf(".");
+            scope = dot === -1 ? "" : scope.slice(0, dot);
+        }
+        if (base === undefined && ids.has(segs[0]))
+            base = segs[0];
+        if (base === undefined) {
+            const leafed = byLeaf.get(segs[0]);
+            if (leafed !== undefined && leafed.length === 1)
+                base = leafed[0];
+        }
+        return [base ?? segs[0], ...segs.slice(1)].join(".");
+    };
+    const rels = raw.map(({ srcLit, tgtLit, parent, ...r }) => ({
+        ...r,
+        source: resolve(srcLit, parent),
+        target: resolve(tgtLit, parent),
+    }));
+    elements.sort((a, b) => a.start - b.start);
+    return { blocks, elements, rels };
+}
+/**
+ * A relationship head's endpoints as written, its kind, and where its arrow form ends —
+ * null for any other head. Three forms, each with the source omittable inside
+ * an element: `a -> b`, `a -[kind]-> b`, and `a .kind b` for a relationship
+ * kind the specification declares, which the scan used to skip as a property
+ * line, so archive refused a valid map on a relationship count.
+ *
+ * Ids carry hyphens (`entity-service`): LikeC4's identifier is
+ * `[a-zA-Z_][-\w]*`, and the `\w`-only spelling here made such an element, or
+ * an edge naming one, invisible. The lexer's greed is why `a->b` without a
+ * space is not a form worth reading — LikeC4 takes `a-` for the id and rejects
+ * the document.
+ */
+function relationHead(head, relKinds) {
+    const arrow = /^([A-Za-z_][\w.-]*)?\s*(?:-\[\s*([^\]]*?)\s*\])?->\s*([A-Za-z_][\w.-]*)/.exec(head);
+    if (arrow !== null)
+        return { src: arrow[1], tgt: arrow[3], kind: arrow[2] || undefined, length: arrow[0].length };
+    const dotted = /^(?:([A-Za-z_][\w.-]*)\s+)?\.([A-Za-z_][\w-]*)\s+([A-Za-z_][\w.-]*)/.exec(head);
+    if (dotted === null || !relKinds.has(dotted[2]))
+        return null;
+    return { src: dotted[1], tgt: dotted[3], kind: dotted[2], length: dotted[0].length };
+}
+//# sourceMappingURL=source-scan.js.map

package/dist/core/c4/source-scan.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"source-scan.js","sourceRoot":"","sources":["../../../src/core/c4/source-scan.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,YAAY,EAAE,aAAa,EAAE,cAAc,EAAsB,MAAM,kBAAkB,CAAC;AA8F3H,mHAAmH;AACnH,MAAM,UAAU,aAAa,CAAC,IAAY,EAAE,IAAgB;IAC1D,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;IAClC,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACnC,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IACzC,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,QAAQ,CAAC,uBAAuB,CAAC,EAAE,CAAC;QACxD,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAC7D,IAAI,MAAM,KAAK,CAAC,CAAC;YAAE,SAAS;QAC5B,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,+CAA+C,CAAC,EAAE,CAAC;YACxG,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAE,CAAC,CAAC;QACvD,CAAC;IACH,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;AAC7B,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,UAAU,SAAS,CAAC,IAAY,EAAE,QAAoB;IAC1D,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;IAChC,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IAClC,0EAA0E;IAC1E,wEAAwE;IACxE,wEAAwE;IACxE,0EAA0E;IAC1E,2EAA2E;IAC3E,2EAA2E;IAC3E,4EAA4E;IAC5E,2EAA2E;IAC3E,iBAAiB;IACjB,MAAM,MAAM,GAAmB,EAAE,CAAC;IAClC,KAAK,MAAM,EAAE,KAAK,EAAE,IAAI,cAAc,CAAC,IAAI,EAAE,eAAe,CAAC,EAAE,CAAC;QAC9D,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;QAC/C,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACrC,IAAI,KAAK,KAAK,CAAC,CAAC;YAAE,MAAM;QACxB,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IAC/B,CAAC;IACD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAErC,qEAAqE;IACrE,yEAAyE;IACzE,wEAAwE;IACxE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,aAAa,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAE1D,MAAM,QAAQ,GAAG,CAAC,EAAU,EAAU,EAAE;QACtC,MAAM,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC;QAC1C,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;QAClC,OAAO,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACvC,CAAC,CAAC;IACF,MAAM,SAAS,GAAG,CAAC,IAAY,EAAE,EAAU,EAA6B,EAAE,CACxE,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,IAAI,CAAC,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC;IACvD,4EAA4E;IAC5E,4EAA4E;IAC5E,yEAAyE;IACzE,uEAAuE;IACvE,8EAA8E;IAC9E,sEAAsE;IACtE,0EAA0E;IAC1E,gCAAgC;IAChC,MAAM,YAAY,GAAG,CAAC,GAAW,EAAE,KAAuB,EAAsB,EAAE;QAChF,IAAI,KAAK,KAAK,IAAI;YAAE,OAAO,SAAS,CAAC;QACrC,MAAM,EAAE,GAAG,IAAI,MAAM,CAAC,cAAc,GAAG,YAAY,EAAE,GAAG,CAAC,CAAC;QAC1D,EAAE,CAAC,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC;QAC1B,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzB,IAAI,EAAE,KAAK,IAAI,IAAI,EAAE,CAAC,KAAK,IAAI,KAAK,CAAC,EAAE;YAAE,OAAO,SAAS,CAAC;QAC1D,OAAO,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC;IAC9C,CAAC,CAAC;IACF,wEAAwE;IACxE,8EAA8E;IAC9E,+EAA+E;IAC/E,wEAAwE;IACxE,MAAM,UAAU,GAAG,CAAC,IAAsB,EAAoB,EAAE;QAC9D,IAAI,IAAI,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC;QAC/B,MAAM,EAAE,GAAG,0BAA0B,CAAC;QACtC,EAAE,CAAC,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC;QACzB,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzB,IAAI,EAAE,KAAK,IAAI,IAAI,EAAE,CAAC,KAAK,IAAI,IAAI,CAAC,EAAE;YAAE,OAAO,IAAI,CAAC;QACpD,MAAM,IAAI,GAAG,EAAE,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;QACzC,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACpC,OAAO,IAAI,KAAK,CAAC,CAAC,IAAI,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,GAAG,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;IAC7E,CAAC,CAAC;IACF,0EAA0E;IAC1E,2DAA2D;IAC3D,MAAM,WAAW,GAAG,CAAC,IAAY,EAAE,EAAU,EAAU,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC;IAE/G,MAAM,QAAQ,GAAqB,EAAE,CAAC;IAGtC,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,MAAM,KAAK,GAA8C,EAAE,CAAC;IAE5D,KAAK,MAAM,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,IAAI,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC;QACxD,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC;QACjB,OAAO,CAAC,GAAG,KAAK,EAAE,CAAC;YACjB,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC,CAAE,CAAC;YACpB,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;gBAClB,CAAC,IAAI,CAAC,CAAC;gBACP,SAAS;YACX,CAAC;YACD,IAAI,EAAE,KAAK,GAAG,EAAE,CAAC;gBACf,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC;gBAC1B,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;oBACxB,KAAK,CAAC,EAAE,CAAC,SAAS,GAAG,CAAC,CAAC;oBACvB,KAAK,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;oBACrB,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBAC1B,CAAC;gBACD,CAAC,IAAI,CAAC,CAAC;gBACP,SAAS;YACX,CAAC;YAED,qEAAqE;YACrE,yEAAyE;YACzE,wEAAwE;YACxE,MAAM,SAAS,GAAG,CAAC,CAAC;YACpB,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;YACjE,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC5C,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAErE,2EAA2E;YAC3E,0EAA0E;YAC1E,6EAA6E;YAC7E,0EAA0E;YAC1E,uEAAuE;YACvE,4EAA4E;YAC5E,6CAA6C;YAC7C,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,kCAAkC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACtF,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;gBACtB,MAAM,EAAE,GAAG,QAAQ,KAAK,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAE,CAAC,CAAC,CAAC,GAAG,QAAQ,IAAI,QAAQ,CAAC,CAAC,CAAE,EAAE,CAAC;gBAC1E,MAAM,EAAE,GAAmB;oBACzB,EAAE;oBACF,KAAK,EAAE,SAAS;oBAChB,GAAG,EAAE,OAAO;oBACZ,QAAQ,EAAE,MAAM;oBAChB,SAAS,EAAE,CAAC,CAAC;oBACb,MAAM,EAAE,QAAQ,CAAC,SAAS,CAAC;oBAC3B,KAAK;oBACL,MAAM,EAAE,IAAI;iBACb,CAAC;gBACF,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;gBACvB,CAAC,GAAG,MAAM,GAAG,CAAC,CAAC;gBACf,SAAS;YACX,CAAC;YAED,4EAA4E;YAC5E,uEAAuE;YACvE,mEAAmE;YACnE,IAAI,SAAS,GAAkB,IAAI,CAAC;YACpC,MAAM,MAAM,GAAG,oCAAoC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC/D,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;gBACpB,SAAS,GAAG,MAAM,CAAC,CAAC,CAAE,CAAC;YACzB,CAAC;iBAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;gBAChC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBACtC,IAAI,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC,EAAE,CAAC;oBAClF,SAAS,GAAG,IAAI,CAAC,CAAC,CAAE,CAAC;gBACvB,CAAC;YACH,CAAC;YAED,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;gBACvB,MAAM,EAAE,GAAG,QAAQ,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,QAAQ,IAAI,SAAS,EAAE,CAAC;gBACpE,MAAM,EAAE,GAAmB;oBACzB,EAAE;oBACF,KAAK,EAAE,SAAS;oBAChB,GAAG,EAAE,OAAO;oBACZ,QAAQ,EAAE,MAAM;oBAChB,SAAS,EAAE,CAAC,CAAC;oBACb,MAAM,EAAE,QAAQ,CAAC,SAAS,CAAC;oBAC3B,KAAK;iBACN,CAAC;gBACF,MAAM,MAAM,GAAG,SAAS,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,KAAK,CAAC;gBACpD,IAAI,MAAM,KAAK,SAAS;oBAAE,EAAE,CAAC,KAAK,GAAG,MAAM,CAAC;gBAC5C,IAAI,MAAM,KAAK,CAAC,CAAC,EAAE,CAAC;oBAClB,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;oBACvB,CAAC,GAAG,MAAM,GAAG,CAAC,CAAC;gBACjB,CAAC;qBAAM,CAAC;oBACN,EAAE,CAAC,GAAG,GAAG,WAAW,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;oBACzC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;oBAClB,CAAC,GAAG,OAAO,CAAC;gBACd,CAAC;gBACD,SAAS;YACX,CAAC;YAED,MAAM,EAAE,GAAG,YAAY,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YACxC,IAAI,EAAE,KAAK,IAAI,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;gBACvC,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;gBAC7D,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;gBACrG,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;oBAChB,MAAM,QAAQ,GAAG,SAAS,GAAG,EAAE,CAAC,MAAM,CAAC;oBACvC,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,CAAC,EAAE,EAAE,EAAE,OAAO,GAAG,CAAC,EAAE,CAAC;oBAC1E,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;oBAC9B,MAAM,KAAK,GAAG,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,KAAK,IAAI,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;oBACjF,MAAM,IAAI,GAAa,EAAE,CAAC;oBAC1B,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC;wBAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAE,CAAC,CAAC;oBAC1F,GAAG,CAAC,IAAI,CAAC;wBACP,MAAM,EAAE,EAAE,CAAC,GAAG;wBACd,MAAM,EAAE,EAAE,CAAC,GAAG;wBACd,MAAM,EAAE,QAAQ;wBAChB,KAAK,EAAE,SAAS;wBAChB,GAAG,EAAE,OAAO;wBACZ,MAAM,EAAE,QAAQ,CAAC,SAAS,CAAC;wBAC3B,KAAK;wBACL,KAAK;wBACL,EAAE,EAAE,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC;wBAC5B,SAAS,EAAE,YAAY,CAAC,WAAW,EAAE,IAAI,CAAC;wBAC1C,QAAQ,EAAE,YAAY,CAAC,UAAU,EAAE,IAAI,CAAC;wBACxC,IAAI;wBACJ,IAAI,EAAE,EAAE,CAAC,IAAI;qBACd,CAAC,CAAC;gBACL,CAAC;gBACD,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;gBAC/B,SAAS;YACX,CAAC;YAED,IAAI,MAAM,KAAK,CAAC,CAAC,EAAE,CAAC;gBAClB,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;gBACxC,CAAC,GAAG,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;YACzC,CAAC;iBAAM,CAAC;gBACN,CAAC,GAAG,OAAO,CAAC;YACd,CAAC;QACH,CAAC;IACH,CAAC;IAED,6EAA6E;IAC7E,wEAAwE;IACxE,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC/C,MAAM,MAAM,GAAG,IAAI,GAAG,EAAoB,CAAC;IAC3C,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;QACzB,MAAM,IAAI,GAAG,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QACnD,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACxD,CAAC;IACD,MAAM,OAAO,GAAG,CAAC,GAAuB,EAAE,SAAiB,EAAU,EAAE;QACrE,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,IAAI,IAAI,GAAG,KAAK,MAAM;YAAE,OAAO,SAAS,CAAC;QAC1E,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC5B,IAAI,IAAwB,CAAC;QAC7B,KAAK,IAAI,KAAK,GAAG,SAAS,EAAE,KAAK,KAAK,EAAE,IAAI,IAAI,KAAK,SAAS,GAAI,CAAC;YACjE,IAAI,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,IAAI,IAAI,CAAC,CAAC,CAAE,EAAE,CAAC;gBAAE,IAAI,GAAG,GAAG,KAAK,IAAI,IAAI,CAAC,CAAC,CAAE,EAAE,CAAC;YACnE,MAAM,GAAG,GAAG,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;YACnC,KAAK,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QAChD,CAAC;QACD,IAAI,IAAI,KAAK,SAAS,IAAI,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC;YAAE,IAAI,GAAG,IAAI,CAAC,CAAC,CAAE,CAAC;QAC7D,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACvB,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC,CAAC;YACpC,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;gBAAE,IAAI,GAAG,MAAM,CAAC,CAAC,CAAE,CAAC;QACrE,CAAC;QACD,OAAO,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC,CAAE,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACxD,CAAC,CAAC;IAEF,MAAM,IAAI,GAAiB,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QACxE,GAAG,CAAC;QACJ,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC;QAC/B,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC;KAChC,CAAC,CAAC,CAAC;IAEJ,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC;IAC3C,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;AACpC,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,SAAS,YAAY,CAAC,IAAY,EAAE,QAA6B;IAC/D,MAAM,KAAK,GAAG,yEAAyE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACnG,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC,CAAE,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IACnH,MAAM,MAAM,GAAG,qEAAqE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChG,IAAI,MAAM,KAAK,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAE,CAAC;QAAE,OAAO,IAAI,CAAC;IAC9D,OAAO,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC,CAAE,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;AACxF,CAAC","sourcesContent":["/**\n * The text-level view of a LikeC4 document: which bytes each declaration owns.\n *\n * loam's archive merges the landscape by SPLICING authored text, not by\n * re-rendering a parsed model — a re-render would reformat every line somebody\n * wrote. So the merge needs both views of the same file: the parsed one\n * (`likec4.ts`) for what the model MEANS, and this one for where each\n * declaration physically is. A key only one of them reads is a key the merge\n * silently drops, which is why `metadata` handling is spelled out in both.\n */\nimport { maskSource, matchBrace, statementEnd, statementHead, topLevelBlocks, type SourceLiteral } from \"./source-mask.js\";\n\nexport interface ScannedElement {\n  /** Full dotted id — `parent.child` for a nested declaration. */\n  id: string;\n  /** Span of the whole declaration: first head character to one past its end. */\n  start: number;\n  end: number;\n  /** Its own body braces; -1 when the declaration has no body. */\n  bodyOpen: number;\n  bodyClose: number;\n  /** Leading whitespace of the declaration's first line. */\n  indent: string;\n  /** Index into `ScannedModel.blocks` of the `model { }` block it is written in. */\n  block: number;\n  /**\n   * The title the declaration's HEAD names — the first string literal before\n   * its body, which is where both declaration forms write it (pinned against\n   * the parser by `test/likec4-scan-parity.test.ts`).\n   *\n   * Absent when the head names none: LikeC4 then titles the element after its\n   * own name, and a default title is one the archive's title join must not\n   * match on — `splice/identity/declared.ts` says why, and why losing it costs\n   * that join nothing.\n   */\n  title?: string;\n  /**\n   * True for an `extend <fqn> { … }` frame — a block that DECLARES nothing and\n   * reopens an element another document owns. Its id is the fqn as written, and\n   * its children hang off that, which is what lets the archive splice a\n   * service's interior into the model that owns it. Placement must skip it: it\n   * is not a top-level declaration of this document, so anchoring beside it\n   * would group additions around a box that lives somewhere else.\n   */\n  extend?: true;\n}\n\n/** A relationship statement located in source, endpoints resolved to full ids (best effort). */\nexport interface ScannedRel {\n  source: string;\n  target: string;\n  title?: string;\n  op?: string;\n  /** `metadata { publishes '...' }` — see `Rel.publishes`. */\n  publishes?: string;\n  /** `metadata { consumes '...' }` — see `Rel.consumes`. */\n  consumes?: string;\n  /** The tags WRITTEN in the statement — never its kind's, which LikeC4 adds to the parsed `Rel` (`splice/identity/edges.ts`). */\n  tags: string[];\n  /** The relationship kind the head names — `-[kind]->` or `.kind` — absent for a plain `->`. */\n  kind?: string;\n  start: number;\n  end: number;\n  indent: string;\n  /** Index into `ScannedModel.blocks` of the `model { }` block it is written in. */\n  block: number;\n}\n\n/** A half-open `[from, to)` run of the masked code — a body, or the metadata block inside one. */\ninterface CodeRange {\n  from: number;\n  to: number;\n}\n\n/** One top-level `model { }` block: its own braces. */\nexport interface ScannedBlock {\n  open: number;\n  close: number;\n}\n\nexport interface ScannedModel {\n  /**\n   * Every top-level `model { }` block, in document order — never empty. LikeC4\n   * merges them into one model, so an id or an endpoint resolves across all of\n   * them; which block a NEW declaration is written into is placement's choice\n   * (`splice/placement.ts`, `HOME_BLOCK`), never the scan's.\n   */\n  blocks: ScannedBlock[];\n  /** In document order. A nested declaration's span lies inside its parent's. */\n  elements: ScannedElement[];\n  rels: ScannedRel[];\n}\n\n/**\n * Kinds a document uses without declaring them, because its project does: an EXTENDING model has no\n * `specification` and borrows the map's. Without them its `kind name` declarations and `a .kind b` edges read\n * as property lines — archive spliced around such an edge, duplicated it, and refused a child of such a\n * container as nesting under nothing (2026-10). `kindsDeclared` reads them off the map's text.\n */\nexport interface ScanKinds {\n  kinds: ReadonlySet<string>;\n  relKinds: ReadonlySet<string>;\n}\n\n/** The element and relationship kinds the `specification` blocks of `text` declare — with `also`'s, when given. */\nexport function kindsDeclared(text: string, also?: ScanKinds): ScanKinds {\n  const { code } = maskSource(text);\n  const kinds = new Set(also?.kinds);\n  const relKinds = new Set(also?.relKinds);\n  for (const sm of code.matchAll(/\\bspecification\\s*\\{/g)) {\n    const sClose = matchBrace(code, sm.index + sm[0].length - 1);\n    if (sClose === -1) continue;\n    for (const em of code.slice(sm.index, sClose).matchAll(/\\b(element|relationship)\\s+([A-Za-z_][\\w-]*)/g)) {\n      (em[1] === \"element\" ? kinds : relKinds).add(em[2]!);\n    }\n  }\n  return { kinds, relKinds };\n}\n\n/**\n * Locate every element and relationship declaration inside the top-level\n * `model { ... }` blocks of a LikeC4 source, with the byte range each one\n * occupies. This is the splice map `loam archive` merges the landscape with:\n * the parsed model says WHAT exists, this says WHERE its authored text is —\n * verbatim, so nothing the parser does not model (technology, style, links)\n * can be lost by rebuilding it.\n *\n * Every block is read, in document order, and each declaration records which\n * one it sits in (`block`); ids, endpoints and nesting are one namespace\n * across all of them, because that is how LikeC4 merges them.\n *\n * Both declaration forms are recognised — `name = kind ...` always, and\n * `kind name ...` for any kind the document's own `specification` block\n * declares, or `borrowed` names. Relationship endpoints are resolved the way LikeC4 reads them:\n * innermost enclosing scope outward, then the top level, then a unique leaf\n * name anywhere; `it`/`this` (and an omitted source) mean the enclosing\n * element. A name that resolves nowhere is left as written — the caller's\n * match against the parsed model then fails loudly instead of guessing.\n *\n * Returns null when there is no model block at all. Callers only hand in documents\n * LikeC4 has already parsed, so the scan can trust balanced braces.\n */\nexport function scanModel(text: string, borrowed?: ScanKinds): ScannedModel | null {\n  const masked = maskSource(text);\n  const { code, literals } = masked;\n  // EVERY top-level `model { }` block, and only those (`topLevelBlocks`): a\n  // document may hold any number, and LikeC4 reads them as one model. The\n  // scan used to stop at the FIRST match, so every declaration in a later\n  // block was invisible — the landscape parsed, `validate --all` was green,\n  // and archive refused with a message about two declarations sharing a line\n  // (a fleet on 0.2.0-alpha.7, 2026-10). Depth zero is the other half of the\n  // same fix: the bare first match also took a nested `model {` — a kind or a\n  // view NAMED model (`element model { … }`), written above the real block —\n  // for the model.\n  const blocks: ScannedBlock[] = [];\n  for (const { match } of topLevelBlocks(code, /\\bmodel\\s*\\{/g)) {\n    const open = match.index + match[0].length - 1;\n    const close = matchBrace(code, open);\n    if (close === -1) break;\n    blocks.push({ open, close });\n  }\n  if (blocks.length === 0) return null;\n\n  // Element kinds from the specification block(s): the `<kind> <name>`\n  // declaration form is recognisable only by its first token being a kind.\n  // Relationship kinds likewise, for the `source .kind target` edge form.\n  const { kinds, relKinds } = kindsDeclared(text, borrowed);\n\n  const indentOf = (at: number): string => {\n    const nl = text.lastIndexOf(\"\\n\", at - 1);\n    const ws = text.slice(nl + 1, at);\n    return /^[ \\t]*$/.test(ws) ? ws : \"\";\n  };\n  const literalIn = (from: number, to: number): SourceLiteral | undefined =>\n    literals.find((l) => l.start >= from && l.end <= to);\n  // A key is a whole identifier, and LikeC4's identifiers carry hyphens. `\\b`\n  // took the `-` for a boundary, so `op-version 'v2'` above `op 'cancelOrdr'`\n  // was read as op `'v2'`, a `#op-critical` tag as the key `op` naming the\n  // literal after it — the next property's — and `validate --all --base`\n  // graded neither op the branch wrote: the scanned edge matched no parsed one,\n  // so the misspelt `cancelOrdr` went green where the plain run reports\n  // `spine.op-undefined` (probed on main at 171555d; 57b33ad fixed the same\n  // hyphen for ids and not here).\n  const keyedLiteral = (key: string, range: CodeRange | null): string | undefined => {\n    if (range === null) return undefined;\n    const re = new RegExp(`(?<![\\\\w-])${key}(?![\\\\w-])`, \"g\");\n    re.lastIndex = range.from;\n    const km = re.exec(code);\n    if (km === null || km.index >= range.to) return undefined;\n    return literalIn(km.index, range.to)?.value;\n  };\n  // The spine keys are METADATA keys — the parsed `Rel` reads them out of\n  // `metadata { }` and nowhere else (`likec4.ts`) — so the scan reads them only\n  // there. Read from the whole body, a bare `#op` tag (a legal tag name) above a\n  // `description` was the key `op` once more, whatever the boundary rule.\n  const metadataOf = (body: CodeRange | null): CodeRange | null => {\n    if (body === null) return null;\n    const re = /(?<![\\w-])metadata\\s*\\{/g;\n    re.lastIndex = body.from;\n    const mm = re.exec(code);\n    if (mm === null || mm.index >= body.to) return null;\n    const open = mm.index + mm[0].length - 1;\n    const shut = matchBrace(code, open);\n    return shut === -1 || shut > body.to ? null : { from: open + 1, to: shut };\n  };\n  // A bodyless statement's end — its trailing comment included, unless that\n  // comment runs on past the line (`statementEnd` says why).\n  const bodylessEnd = (from: number, to: number): number => statementEnd(text, masked, { start: from, end: to });\n\n  const elements: ScannedElement[] = [];\n  // A relationship as the walk meets it: endpoints as written, resolved below once every declaration is known.\n  type RawRel = Omit<ScannedRel, \"source\" | \"target\"> & { srcLit?: string; tgtLit: string; parent: string };\n  const raw: RawRel[] = [];\n  const stack: Array<{ id: string; el: ScannedElement }> = [];\n\n  for (const [block, { open, close }] of blocks.entries()) {\n    let i = open + 1;\n    while (i < close) {\n      const ch = code[i]!;\n      if (/\\s/.test(ch)) {\n        i += 1;\n        continue;\n      }\n      if (ch === \"}\") {\n        const frame = stack.pop();\n        if (frame !== undefined) {\n          frame.el.bodyClose = i;\n          frame.el.end = i + 1;\n          elements.push(frame.el);\n        }\n        i += 1;\n        continue;\n      }\n\n      // A statement's head: up to its own `{`, the end of the line, or the\n      // enclosing block's `}` on the same line — whichever comes first, unless\n      // LikeC4 reads on past the newline (`statementHead` says when it does).\n      const stmtStart = i;\n      const { end: headEnd, opener } = statementHead(masked, i, close);\n      const head = code.slice(stmtStart, headEnd);\n      const parentId = stack.length > 0 ? stack[stack.length - 1]!.id : \"\";\n\n      // `extend <fqn> { … }` — the extending model's one construct, and the only\n      // frame here whose id is not minted from the enclosing scope: it names an\n      // element the fleet map already declares, so its children are `<fqn>.<name>`\n      // and a reference inside it resolves against that scope. Without this the\n      // block fell through to the property-line arm and everything in it was\n      // invisible, which is why the archive spliced a service's interior into the\n      // map instead (verification 2026-09-04, E1).\n      const extended = opener === -1 ? null : /^extend\\s+([A-Za-z_][\\w.-]*)\\s*$/.exec(head);\n      if (extended !== null) {\n        const id = parentId === \"\" ? extended[1]! : `${parentId}.${extended[1]!}`;\n        const el: ScannedElement = {\n          id,\n          start: stmtStart,\n          end: headEnd,\n          bodyOpen: opener,\n          bodyClose: -1,\n          indent: indentOf(stmtStart),\n          block,\n          extend: true,\n        };\n        stack.push({ id, el });\n        i = opener + 1;\n        continue;\n      }\n\n      // Classify: `name = kind` first, then a relationship (the arrow cannot hide\n      // in a string — the head is masked), then the `kind name` form, else a\n      // property/tag line that is consumed whole, nested block included.\n      let localName: string | null = null;\n      const assign = /^([A-Za-z_][\\w-]*)\\s*=\\s*[A-Za-z_]/.exec(head);\n      if (assign !== null) {\n        localName = assign[1]!;\n      } else if (!head.includes(\"->\")) {\n        const toks = head.trim().split(/\\s+/);\n        if (toks.length >= 2 && kinds.has(toks[0]!) && /^[A-Za-z_][\\w-]*$/.test(toks[1]!)) {\n          localName = toks[1]!;\n        }\n      }\n\n      if (localName !== null) {\n        const id = parentId === \"\" ? localName : `${parentId}.${localName}`;\n        const el: ScannedElement = {\n          id,\n          start: stmtStart,\n          end: headEnd,\n          bodyOpen: opener,\n          bodyClose: -1,\n          indent: indentOf(stmtStart),\n          block,\n        };\n        const titled = literalIn(stmtStart, headEnd)?.value;\n        if (titled !== undefined) el.title = titled;\n        if (opener !== -1) {\n          stack.push({ id, el });\n          i = opener + 1;\n        } else {\n          el.end = bodylessEnd(stmtStart, headEnd);\n          elements.push(el);\n          i = headEnd;\n        }\n        continue;\n      }\n\n      const am = relationHead(head, relKinds);\n      if (am !== null || head.includes(\"->\")) {\n        const bClose = opener === -1 ? -1 : matchBrace(code, opener);\n        const stmtEnd = opener === -1 ? bodylessEnd(stmtStart, headEnd) : bClose === -1 ? close : bClose + 1;\n        if (am !== null) {\n          const arrowEnd = stmtStart + am.length;\n          const body = opener === -1 ? null : { from: opener + 1, to: stmtEnd - 1 };\n          const meta = metadataOf(body);\n          const title = literalIn(arrowEnd, headEnd)?.value ?? keyedLiteral(\"title\", body);\n          const tags: string[] = [];\n          for (const tm of code.slice(stmtStart, stmtEnd).matchAll(/#([\\w-]+)/g)) tags.push(tm[1]!);\n          raw.push({\n            srcLit: am.src,\n            tgtLit: am.tgt,\n            parent: parentId,\n            start: stmtStart,\n            end: stmtEnd,\n            indent: indentOf(stmtStart),\n            block,\n            title,\n            op: keyedLiteral(\"op\", meta),\n            publishes: keyedLiteral(\"publishes\", meta),\n            consumes: keyedLiteral(\"consumes\", meta),\n            tags,\n            kind: am.kind,\n          });\n        }\n        i = Math.max(stmtEnd, headEnd);\n        continue;\n      }\n\n      if (opener !== -1) {\n        const bClose = matchBrace(code, opener);\n        i = bClose === -1 ? close : bClose + 1;\n      } else {\n        i = headEnd;\n      }\n    }\n  }\n\n  // Resolve relationship endpoints against everything declared anywhere in the\n  // model — LikeC4 resolution is not order-dependent, so neither is this.\n  const ids = new Set(elements.map((e) => e.id));\n  const byLeaf = new Map<string, string[]>();\n  for (const e of elements) {\n    const leaf = e.id.slice(e.id.lastIndexOf(\".\") + 1);\n    byLeaf.set(leaf, [...(byLeaf.get(leaf) ?? []), e.id]);\n  }\n  const resolve = (lit: string | undefined, enclosing: string): string => {\n    if (lit === undefined || lit === \"it\" || lit === \"this\") return enclosing;\n    const segs = lit.split(\".\");\n    let base: string | undefined;\n    for (let scope = enclosing; scope !== \"\" && base === undefined; ) {\n      if (ids.has(`${scope}.${segs[0]!}`)) base = `${scope}.${segs[0]!}`;\n      const dot = scope.lastIndexOf(\".\");\n      scope = dot === -1 ? \"\" : scope.slice(0, dot);\n    }\n    if (base === undefined && ids.has(segs[0]!)) base = segs[0]!;\n    if (base === undefined) {\n      const leafed = byLeaf.get(segs[0]!);\n      if (leafed !== undefined && leafed.length === 1) base = leafed[0]!;\n    }\n    return [base ?? segs[0]!, ...segs.slice(1)].join(\".\");\n  };\n\n  const rels: ScannedRel[] = raw.map(({ srcLit, tgtLit, parent, ...r }) => ({\n    ...r,\n    source: resolve(srcLit, parent),\n    target: resolve(tgtLit, parent),\n  }));\n\n  elements.sort((a, b) => a.start - b.start);\n  return { blocks, elements, rels };\n}\n\n/**\n * A relationship head's endpoints as written, its kind, and where its arrow form ends —\n * null for any other head. Three forms, each with the source omittable inside\n * an element: `a -> b`, `a -[kind]-> b`, and `a .kind b` for a relationship\n * kind the specification declares, which the scan used to skip as a property\n * line, so archive refused a valid map on a relationship count.\n *\n * Ids carry hyphens (`entity-service`): LikeC4's identifier is\n * `[a-zA-Z_][-\\w]*`, and the `\\w`-only spelling here made such an element, or\n * an edge naming one, invisible. The lexer's greed is why `a->b` without a\n * space is not a form worth reading — LikeC4 takes `a-` for the id and rejects\n * the document.\n */\nfunction relationHead(head: string, relKinds: ReadonlySet<string>): { src: string | undefined; tgt: string; kind?: string; length: number } | null {\n  const arrow = /^([A-Za-z_][\\w.-]*)?\\s*(?:-\\[\\s*([^\\]]*?)\\s*\\])?->\\s*([A-Za-z_][\\w.-]*)/.exec(head);\n  if (arrow !== null) return { src: arrow[1], tgt: arrow[3]!, kind: arrow[2] || undefined, length: arrow[0].length };\n  const dotted = /^(?:([A-Za-z_][\\w.-]*)\\s+)?\\.([A-Za-z_][\\w-]*)\\s+([A-Za-z_][\\w.-]*)/.exec(head);\n  if (dotted === null || !relKinds.has(dotted[2]!)) return null;\n  return { src: dotted[1], tgt: dotted[3]!, kind: dotted[2], length: dotted[0].length };\n}\n"]}

package/dist/core/c4/splice/authored-source.js

@@ -0,0 +1,167 @@
+import { maskSource, matchBrace } from "../source-mask.js";
+export function spliceSource(deltaText, decl, carry) {
+    const { featureId, indent: targetIndent, omit = [] } = carry;
+    const block = deltaText.slice(decl.start, decl.end);
+    const cuts = omit
+        .filter((r) => r.start >= decl.start && r.end <= decl.end)
+        .map((r) => wholeLines(block, r.start - decl.start, r.end - decl.start));
+    return reindent(stripFeatureTag(block, featureId, cuts), decl.indent, targetIndent);
+}
+/**
+ * Widen a cut to the whole lines it sits on, when it has them to itself.
+ *
+ * A scanned declaration's span starts at its first character and ends one past
+ * its last brace, so cutting it verbatim would leave the leading indent and the
+ * trailing newline behind as a blank line — and the emptied-line rule below only
+ * fires on a removal a line contains. A cut sharing its line with other code is
+ * left exactly as asked.
+ */
+function wholeLines(block, start, end) {
+    const lineStart = block.lastIndexOf("\n", start - 1) + 1;
+    if (!/^[ \t]*$/.test(block.slice(lineStart, start)))
+        return [start, end];
+    const nl = block.indexOf("\n", end);
+    const to = nl === -1 ? block.length : nl;
+    if (!/^[ \t\r]*$/.test(block.slice(end, to)))
+        return [start, end];
+    return [lineStart, nl === -1 ? block.length : nl + 1];
+}
+/**
+ * Rewrite the line endings a merge INSERTED to the ones the document already
+ * uses.
+ *
+ * Splicing composes bytes from two files, and the delta's newlines are not
+ * necessarily the living document's: on a repository without `core.autocrlf`
+ * normalisation a CRLF landscape or model came back with a handful of bare-LF
+ * lines in the spliced region — two conventions in one file, noisy in an editor
+ * and in every diff (verification 2026-09-04, W-CRLF). One helper for both
+ * merges, because both had it.
+ *
+ * Only a document with ONE convention is corrected, and then in whichever
+ * direction it uses: a file that is already mixed has no convention to match, and
+ * guessing one would rewrite lines nobody touched.
+ */
+export function matchLineEndings(document, merged) {
+    const crlf = (document.match(/\r\n/g) ?? []).length;
+    const bare = (document.match(/(?<!\r)\n/g) ?? []).length;
+    if (crlf > 0 && bare === 0)
+        return merged.replace(/(?<!\r)\n/g, "\r\n");
+    if (bare > 0 && crlf === 0)
+        return merged.replace(/\r\n/g, "\n");
+    return merged;
+}
+function stripFeatureTag(block, featureId, cuts) {
+    const { code } = maskSource(block);
+    const esc = featureId.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    const removals = cuts.map(([s, e]) => [s, e]);
+    for (const m of block.matchAll(new RegExp(`#${esc}(?![\\w-])`, "g"))) {
+        // Only tags in CODE count — a description quoting "#FEAT-1" is content.
+        if (code.slice(m.index, m.index + m[0].length) !== m[0])
+            continue;
+        let s = m.index;
+        let e = s + m[0].length;
+        // A tag list's separators go with the tag they separate. LikeC4 reads a
+        // list as `#a #b, #c;` — one or more tags first, then `,` groups, then an
+        // optional `;` — so `#FEAT-1, #x` stripped to `, #x` and `#FEAT-1;` to a
+        // bare `;`, and the parse net refused a delta LikeC4 accepts. The comma
+        // after the tag goes with it, else the comma before it; the `;` only when
+        // no tag is left in front of it.
+        const commaAfter = /^[ \t]*,[ \t]*/.exec(code.slice(e));
+        const commaBefore = /,[ \t]*$/.exec(code.slice(0, s));
+        const semi = /^[ \t]*;/.exec(code.slice(e));
+        if (commaAfter !== null) {
+            removals.push([s, e + commaAfter[0].length]);
+            continue;
+        }
+        if (commaBefore !== null) {
+            removals.push([commaBefore.index, e]);
+            continue;
+        }
+        if (semi !== null && !/#[\w-]+\s*$/.test(code.slice(0, s)))
+            e += semi[0].length;
+        // Take the whitespace on ONE side with the token — trailing first, so
+        // `#FEAT-1 #critical` leaves `#critical` at its own indent, and a token at
+        // the end of a line does not leave a trailing space behind.
+        if (block[e] === " " || block[e] === "\t") {
+            while (block[e] === " " || block[e] === "\t")
+                e += 1;
+        }
+        else {
+            while (s > 0 && (block[s - 1] === " " || block[s - 1] === "\t"))
+                s -= 1;
+        }
+        removals.push([s, e]);
+    }
+    if (removals.length === 0)
+        return block;
+    // A line the strip emptied disappears whole, newline included.
+    for (let lineStart = 0; lineStart < block.length;) {
+        const nl = block.indexOf("\n", lineStart);
+        const lineEnd = nl === -1 ? block.length : nl + 1;
+        if (removals.some(([s, e]) => s >= lineStart && e <= lineEnd) &&
+            /^\s*$/.test(residual(block, lineStart, nl === -1 ? block.length : nl, removals))) {
+            removals.push([lineStart, lineEnd]);
+        }
+        lineStart = lineEnd;
+    }
+    // A body the strip emptied goes too, braces and all — but only one the strip
+    // emptied: braces that were authored empty are authored bytes and survive.
+    for (let at = code.indexOf("{"); at !== -1; at = code.indexOf("{", at + 1)) {
+        const closeAt = matchBrace(code, at);
+        if (closeAt === -1)
+            continue;
+        if (!removals.some(([s, e]) => s > at && e <= closeAt))
+            continue;
+        if (!/^\s*$/.test(residual(block, at + 1, closeAt, removals)))
+            continue;
+        let s = at;
+        while (s > 0 && /\s/.test(block[s - 1]))
+            s -= 1;
+        removals.push([s, closeAt + 1]);
+    }
+    return applyRemovals(block, removals);
+}
+/** The text of [from, to) with the removal ranges cut out. */
+function residual(text, from, to, removals) {
+    let out = "";
+    for (let i = from; i < to; i += 1) {
+        if (!removals.some(([s, e]) => i >= s && i < e))
+            out += text[i];
+    }
+    return out;
+}
+function applyRemovals(text, removals) {
+    const sorted = [...removals].sort((a, b) => a[0] - b[0] || b[1] - a[1]);
+    let out = "";
+    let i = 0;
+    for (const [s, e] of sorted) {
+        if (s > i)
+            out += text.slice(i, s);
+        if (e > i)
+            i = e;
+    }
+    return out + text.slice(i);
+}
+/**
+ * Rebase a block's indentation: the `base` its lines carried in the delta
+ * becomes `target`. The first line arrives with no leading whitespace (the
+ * scanner's span starts at the declaration itself), so it only gains `target`.
+ *
+ * A CRLF delta's blank line is `"\r"`, not `""`, so splitting on `\n` alone used
+ * to hand a non-empty body to the rule below and every blank line inside a
+ * spliced block came out carrying the target indent as trailing whitespace. The
+ * carriage return is set aside and put back, which leaves the line's own ending
+ * exactly as authored for `matchLineEndings` to reconcile.
+ */
+function reindent(block, base, target) {
+    return block
+        .split("\n")
+        .map((line, k) => {
+        const cr = line.endsWith("\r");
+        const raw = cr ? line.slice(0, -1) : line;
+        const body = k === 0 ? raw : raw.startsWith(base) ? raw.slice(base.length) : raw;
+        return (body.length === 0 ? "" : target + body) + (cr ? "\r" : "");
+    })
+        .join("\n");
+}
+//# sourceMappingURL=authored-source.js.map

package/dist/core/c4/splice/authored-source.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"authored-source.js","sourceRoot":"","sources":["../../../../src/core/c4/splice/authored-source.ts"],"names":[],"mappings":"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","sourcesContent":["import { maskSource, matchBrace } from \"../source-mask.js\";\n\n/** A half-open byte range of `deltaText`, as the source scan reports one. */\nexport interface SourceRange {\n  start: number;\n  end: number;\n}\n\n/**\n * A declaration's authored source, ready to land in the living landscape:\n * byte-verbatim except that the feature's own tag is stripped (with the `,` or\n * `;` that set it apart in a tag list, which would otherwise be left stray) and\n * the indentation is rebased from where the block sat in the delta to where it\n * lands. A construct the strip leaves empty goes too — a line that held only\n * the tag disappears whole, and `x = kind 'y' { #FEAT-1 }` lands as\n * `x = kind 'y'`, not as a pair of empty braces.\n *\n * `omit` cuts named ranges of the delta out on the way over, and it exists for\n * one caller: a NEW service element whose interior belongs to that service's\n * extending model. The children come along in the parent's bytes — they carry no\n * feature tag of their own, because LikeC4 does not inherit tags, so nothing in\n * the addition set can see them — and the map must take the box without them or\n * the model can never declare them (verification 2026-09-04, refutation of E1).\n * The ranges join the tag's removals, so a body they empty collapses the same\n * way `#FEAT-1`-only braces do.\n */\n/** How a declaration is carried over: whose tag to drop, where it lands, and what to leave behind. */\nexport interface Carry {\n  featureId: string;\n  /** The indent of the position the block lands at. */\n  indent: string;\n  /** Delta ranges cut out on the way over — see the banner; `[]` when nothing rides separately. */\n  omit?: readonly SourceRange[];\n}\n\nexport function spliceSource(\n  deltaText: string,\n  decl: { start: number; end: number; indent: string },\n  carry: Carry,\n): string {\n  const { featureId, indent: targetIndent, omit = [] } = carry;\n  const block = deltaText.slice(decl.start, decl.end);\n  const cuts = omit\n    .filter((r) => r.start >= decl.start && r.end <= decl.end)\n    .map((r) => wholeLines(block, r.start - decl.start, r.end - decl.start));\n  return reindent(stripFeatureTag(block, featureId, cuts), decl.indent, targetIndent);\n}\n\n/**\n * Widen a cut to the whole lines it sits on, when it has them to itself.\n *\n * A scanned declaration's span starts at its first character and ends one past\n * its last brace, so cutting it verbatim would leave the leading indent and the\n * trailing newline behind as a blank line — and the emptied-line rule below only\n * fires on a removal a line contains. A cut sharing its line with other code is\n * left exactly as asked.\n */\nfunction wholeLines(block: string, start: number, end: number): [number, number] {\n  const lineStart = block.lastIndexOf(\"\\n\", start - 1) + 1;\n  if (!/^[ \\t]*$/.test(block.slice(lineStart, start))) return [start, end];\n  const nl = block.indexOf(\"\\n\", end);\n  const to = nl === -1 ? block.length : nl;\n  if (!/^[ \\t\\r]*$/.test(block.slice(end, to))) return [start, end];\n  return [lineStart, nl === -1 ? block.length : nl + 1];\n}\n\n/**\n * Rewrite the line endings a merge INSERTED to the ones the document already\n * uses.\n *\n * Splicing composes bytes from two files, and the delta's newlines are not\n * necessarily the living document's: on a repository without `core.autocrlf`\n * normalisation a CRLF landscape or model came back with a handful of bare-LF\n * lines in the spliced region — two conventions in one file, noisy in an editor\n * and in every diff (verification 2026-09-04, W-CRLF). One helper for both\n * merges, because both had it.\n *\n * Only a document with ONE convention is corrected, and then in whichever\n * direction it uses: a file that is already mixed has no convention to match, and\n * guessing one would rewrite lines nobody touched.\n */\nexport function matchLineEndings(document: string, merged: string): string {\n  const crlf = (document.match(/\\r\\n/g) ?? []).length;\n  const bare = (document.match(/(?<!\\r)\\n/g) ?? []).length;\n  if (crlf > 0 && bare === 0) return merged.replace(/(?<!\\r)\\n/g, \"\\r\\n\");\n  if (bare > 0 && crlf === 0) return merged.replace(/\\r\\n/g, \"\\n\");\n  return merged;\n}\n\nfunction stripFeatureTag(block: string, featureId: string, cuts: ReadonlyArray<[number, number]>): string {\n  const { code } = maskSource(block);\n  const esc = featureId.replace(/[.*+?^${}()|[\\]\\\\]/g, \"\\\\$&\");\n  const removals: Array<[number, number]> = cuts.map(([s, e]) => [s, e]);\n  for (const m of block.matchAll(new RegExp(`#${esc}(?![\\\\w-])`, \"g\"))) {\n    // Only tags in CODE count — a description quoting \"#FEAT-1\" is content.\n    if (code.slice(m.index, m.index + m[0].length) !== m[0]) continue;\n    let s = m.index;\n    let e = s + m[0].length;\n    // A tag list's separators go with the tag they separate. LikeC4 reads a\n    // list as `#a #b, #c;` — one or more tags first, then `,` groups, then an\n    // optional `;` — so `#FEAT-1, #x` stripped to `, #x` and `#FEAT-1;` to a\n    // bare `;`, and the parse net refused a delta LikeC4 accepts. The comma\n    // after the tag goes with it, else the comma before it; the `;` only when\n    // no tag is left in front of it.\n    const commaAfter = /^[ \\t]*,[ \\t]*/.exec(code.slice(e));\n    const commaBefore = /,[ \\t]*$/.exec(code.slice(0, s));\n    const semi = /^[ \\t]*;/.exec(code.slice(e));\n    if (commaAfter !== null) {\n      removals.push([s, e + commaAfter[0].length]);\n      continue;\n    }\n    if (commaBefore !== null) {\n      removals.push([commaBefore.index, e]);\n      continue;\n    }\n    if (semi !== null && !/#[\\w-]+\\s*$/.test(code.slice(0, s))) e += semi[0].length;\n    // Take the whitespace on ONE side with the token — trailing first, so\n    // `#FEAT-1 #critical` leaves `#critical` at its own indent, and a token at\n    // the end of a line does not leave a trailing space behind.\n    if (block[e] === \" \" || block[e] === \"\\t\") {\n      while (block[e] === \" \" || block[e] === \"\\t\") e += 1;\n    } else {\n      while (s > 0 && (block[s - 1] === \" \" || block[s - 1] === \"\\t\")) s -= 1;\n    }\n    removals.push([s, e]);\n  }\n  if (removals.length === 0) return block;\n\n  // A line the strip emptied disappears whole, newline included.\n  for (let lineStart = 0; lineStart < block.length; ) {\n    const nl = block.indexOf(\"\\n\", lineStart);\n    const lineEnd = nl === -1 ? block.length : nl + 1;\n    if (\n      removals.some(([s, e]) => s >= lineStart && e <= lineEnd) &&\n      /^\\s*$/.test(residual(block, lineStart, nl === -1 ? block.length : nl, removals))\n    ) {\n      removals.push([lineStart, lineEnd]);\n    }\n    lineStart = lineEnd;\n  }\n\n  // A body the strip emptied goes too, braces and all — but only one the strip\n  // emptied: braces that were authored empty are authored bytes and survive.\n  for (let at = code.indexOf(\"{\"); at !== -1; at = code.indexOf(\"{\", at + 1)) {\n    const closeAt = matchBrace(code, at);\n    if (closeAt === -1) continue;\n    if (!removals.some(([s, e]) => s > at && e <= closeAt)) continue;\n    if (!/^\\s*$/.test(residual(block, at + 1, closeAt, removals))) continue;\n    let s = at;\n    while (s > 0 && /\\s/.test(block[s - 1]!)) s -= 1;\n    removals.push([s, closeAt + 1]);\n  }\n  return applyRemovals(block, removals);\n}\n\n/** The text of [from, to) with the removal ranges cut out. */\nfunction residual(text: string, from: number, to: number, removals: Array<[number, number]>): string {\n  let out = \"\";\n  for (let i = from; i < to; i += 1) {\n    if (!removals.some(([s, e]) => i >= s && i < e)) out += text[i];\n  }\n  return out;\n}\n\nfunction applyRemovals(text: string, removals: Array<[number, number]>): string {\n  const sorted = [...removals].sort((a, b) => a[0] - b[0] || b[1] - a[1]);\n  let out = \"\";\n  let i = 0;\n  for (const [s, e] of sorted) {\n    if (s > i) out += text.slice(i, s);\n    if (e > i) i = e;\n  }\n  return out + text.slice(i);\n}\n\n/**\n * Rebase a block's indentation: the `base` its lines carried in the delta\n * becomes `target`. The first line arrives with no leading whitespace (the\n * scanner's span starts at the declaration itself), so it only gains `target`.\n *\n * A CRLF delta's blank line is `\"\\r\"`, not `\"\"`, so splitting on `\\n` alone used\n * to hand a non-empty body to the rule below and every blank line inside a\n * spliced block came out carrying the target indent as trailing whitespace. The\n * carriage return is set aside and put back, which leaves the line's own ending\n * exactly as authored for `matchLineEndings` to reconcile.\n */\nfunction reindent(block: string, base: string, target: string): string {\n  return block\n    .split(\"\\n\")\n    .map((line, k) => {\n      const cr = line.endsWith(\"\\r\");\n      const raw = cr ? line.slice(0, -1) : line;\n      const body = k === 0 ? raw : raw.startsWith(base) ? raw.slice(base.length) : raw;\n      return (body.length === 0 ? \"\" : target + body) + (cr ? \"\\r\" : \"\");\n    })\n    .join(\"\\n\");\n}\n"]}

package/dist/core/c4/splice/contract.js

@@ -0,0 +1,30 @@
+/**
+ * A landscape merge the splicer could not compute. Every one is mechanical —
+ * the input cannot be spliced as authored, never a judgment `--approve` may
+ * override — and it is thrown at plan time, so nothing has been written.
+ * `archiveErrorCode` (commands/archive/archive.ts) owns the mapping to `merge-failed`;
+ * the splicer itself never names a CLI code.
+ */
+export class LandscapeSpliceError extends Error {
+}
+/**
+ * Refuse a splice the splice map cannot see once it has landed — the document
+ * scanned the same number of statements after the insert as before it.
+ *
+ * Every insert adds at least one declaration or edge, so an unchanged count
+ * means the bytes went somewhere the scan reads as nothing: inside a comment or
+ * a string. LikeC4 reads it the same way, so the parse net passes a document
+ * that simply lacks the addition, and the archive printed "+1 relationship(s)"
+ * over an edge that was never there (review, 2026-10-22, on a block comment
+ * whose last line starts with `//`). Placement is meant never to do this; this
+ * is what turns a placement bug into `merge-failed` instead of silent loss.
+ */
+export function assertSpliceVisible(before, after, what) {
+    const count = (s) => (s === null ? 0 : s.elements.length + s.rels.length);
+    if (count(after) > count(before))
+        return;
+    throw new LandscapeSpliceError(`placing '${what}' would land it where neither the splice map nor LikeC4 reads it — inside a comment or a string — ` +
+        `so the merge would lose it while reporting it merged; nothing was written. Move the comment it would land in, ` +
+        `then re-run, and report the shape`);
+}
+//# sourceMappingURL=contract.js.map

package/dist/core/c4/splice/contract.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"contract.js","sourceRoot":"","sources":["../../../../src/core/c4/splice/contract.ts"],"names":[],"mappings":"AAGA;;;;;;GAMG;AACH,MAAM,OAAO,oBAAqB,SAAQ,KAAK;CAAG;AAElD;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,mBAAmB,CAAC,MAA2B,EAAE,KAA0B,EAAE,IAAY;IACvG,MAAM,KAAK,GAAG,CAAC,CAAsB,EAAU,EAAE,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACvG,IAAI,KAAK,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC;QAAE,OAAO;IACzC,MAAM,IAAI,oBAAoB,CAC5B,YAAY,IAAI,oGAAoG;QAClH,gHAAgH;QAChH,mCAAmC,CACtC,CAAC;AACJ,CAAC","sourcesContent":["import type { Elem, Rel } from \"../likec4.js\";\nimport type { ScanKinds, ScannedModel } from \"../source-scan.js\";\n\n/**\n * A landscape merge the splicer could not compute. Every one is mechanical —\n * the input cannot be spliced as authored, never a judgment `--approve` may\n * override — and it is thrown at plan time, so nothing has been written.\n * `archiveErrorCode` (commands/archive/archive.ts) owns the mapping to `merge-failed`;\n * the splicer itself never names a CLI code.\n */\nexport class LandscapeSpliceError extends Error {}\n\n/**\n * Refuse a splice the splice map cannot see once it has landed — the document\n * scanned the same number of statements after the insert as before it.\n *\n * Every insert adds at least one declaration or edge, so an unchanged count\n * means the bytes went somewhere the scan reads as nothing: inside a comment or\n * a string. LikeC4 reads it the same way, so the parse net passes a document\n * that simply lacks the addition, and the archive printed \"+1 relationship(s)\"\n * over an edge that was never there (review, 2026-10-22, on a block comment\n * whose last line starts with `//`). Placement is meant never to do this; this\n * is what turns a placement bug into `merge-failed` instead of silent loss.\n */\nexport function assertSpliceVisible(before: ScannedModel | null, after: ScannedModel | null, what: string): void {\n  const count = (s: ScannedModel | null): number => (s === null ? 0 : s.elements.length + s.rels.length);\n  if (count(after) > count(before)) return;\n  throw new LandscapeSpliceError(\n    `placing '${what}' would land it where neither the splice map nor LikeC4 reads it — inside a comment or a string — ` +\n      `so the merge would lose it while reporting it merged; nothing was written. Move the comment it would land in, ` +\n      `then re-run, and report the shape`,\n  );\n}\n\n/**\n * A service whose `model.likec4` EXTENDS the fleet map — the document that owns\n * that service's interior, and therefore the one a nested addition belongs in.\n *\n * The merge takes these as TEXT already in hand, exactly as it takes the\n * landscape: reading the fleet and writing the result stay with the caller.\n * A service with a standalone model, or none, is simply absent from the list,\n * and the merge then behaves as it did before the extending shape existed.\n */\nexport interface ExtendingModel {\n  /** The `services/<…>/<svc>` directory name — what an element's binding resolves to. */\n  service: string;\n  /** Repo-relative and `/`-separated: what a message names and where the caller writes. */\n  path: string;\n  /** The living model source, as authored. */\n  text: string;\n}\n\n/** What one extending model owes this feature — routed, not yet spliced. */\nexport interface ModelAdditions {\n  model: ExtendingModel;\n  els: Elem[];\n  rels: Rel[];\n  /**\n   * The kinds the model borrows from the map it extends, read off the landscape\n   * this merge spliced: a model declares none of its own, and its scan cannot\n   * see a `kind name` declaration or an `a .kind b` edge without them.\n   */\n  borrowed: ScanKinds;\n}\n\n/**\n * The tags each relationship kind of the DELTA gives every edge of that kind —\n * its `specification.relationshipKindTags`. The parsed additions carry them and\n * the delta's statements do not, so the splice needs the table to match one to\n * the other (`./identity/edges.ts`, `scannedStatementKey`).\n */\nexport type KindTags = Readonly<Record<string, readonly string[]>>;\n\nexport interface LandscapePlan {\n  /** The merged landscape source, or null when everything was already there. */\n  content: string | null;\n  addedEls: Elem[];\n  addedRels: Rel[];\n  /**\n   * The additions this merge routed AWAY from the map, per model that owns\n   * them. Empty when the request named no extending models — the shape every\n   * caller had before the routing existed. `./model/merge.ts` turns each entry\n   * into that model's merged text.\n   */\n  models: ModelAdditions[];\n}\n\n/**\n * Everything the landscape splicer reads, as text and parsed views already in\n * hand. The merge is a pure text-to-text computation — reading the two files\n * (and deciding to write the result) stays with the caller, which is also what\n * keeps the splicer free of the staging layer.\n */\nexport interface LandscapeMergeRequest {\n  /** The living landscape.likec4, decoded by the caller's readUtf8. */\n  landscapeText: string;\n  /** delta.likec4 as authored — the bytes the additions are spliced from. */\n  deltaText: string;\n  /** EVERY element the delta declares — the title join and the parent lookup read past the tagged ones. */\n  deltaElements: Elem[];\n  /** The delta's elements tagged with the feature: the candidate additions. */\n  newEls: Elem[];\n  /** The delta's relationships tagged with the feature. */\n  newRels: Rel[];\n  featureId: string;\n  /** The delta's relationship kinds' tags. Omitted reads as a delta whose kinds carry none. */\n  deltaKindTags?: KindTags;\n  /**\n   * The fleet's extending models. Omitted (or empty) is the pre-extending\n   * behaviour byte for byte: every addition lands on the map.\n   */\n  models?: readonly ExtendingModel[];\n}\n"]}