@ybotok/loam 0.2.0-alpha.6 → 0.2.0-alpha.9

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

@@ -8,15 +8,19 @@
  * 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 } from "./source-mask.js";
+import { maskSource, matchBrace, statementEnd, statementHead, topLevelBlocks } from "./source-mask.js";
 /**
  * Locate every element and relationship declaration inside the top-level
- * `model { ... }` block of a LikeC4 source, with the byte range each one
+ * `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. Relationship endpoints are resolved the way LikeC4 reads them:
@@ -25,27 +29,42 @@ import { maskSource, matchBrace } from "./source-mask.js";
  * 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. Callers only hand in documents
+ * 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) {
-    const { code, literals } = maskSource(text);
-    const m = /\bmodel\s*\{/.exec(code);
-    if (!m)
-        return null;
-    const open = m.index + m[0].length - 1;
-    const close = matchBrace(code, open);
-    if (close === -1)
+    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 = new Set();
+    const relKinds = new Set();
     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(/\belement\s+([A-Za-z_][\w-]*)/g)) {
-            kinds.add(em[1]);
+        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]);
         }
     }
     const indentOf = (at) => {
@@ -54,157 +73,171 @@ export function scanModel(text) {
         return /^[ \t]*$/.test(ws) ? ws : "";
     };
     const literalIn = (from, to) => literals.find((l) => l.start >= from && l.end <= to);
-    const keyedLiteral = (key, from, to) => {
-        if (from === -1)
+    // 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(`\\b${key}\\b`, "g");
-        re.lastIndex = from;
+        const re = new RegExp(`(?<![\\w-])${key}(?![\\w-])`, "g");
+        re.lastIndex = range.from;
         const km = re.exec(code);
-        if (km === null || km.index >= to)
+        if (km === null || km.index >= range.to)
             return undefined;
-        return literalIn(km.index, to)?.value;
+        return literalIn(km.index, range.to)?.value;
     };
-    const trimmedEnd = (from, to) => {
-        let e = to;
-        while (e > from && /\s/.test(text[e - 1]))
-            e -= 1;
-        return e;
+    // 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 = [];
-    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.
-        const stmtStart = i;
-        let headEnd = close;
-        let opener = -1;
-        for (let j = i; j < close; j += 1) {
-            const c = code[j];
-            if (c === "\n" || c === "}") {
-                headEnd = j;
-                break;
-            }
-            if (c === "{") {
-                opener = j;
-                headEnd = j;
-                break;
+    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;
             }
-        }
-        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),
-                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 (ch === "}") {
+                const frame = stack.pop();
+                if (frame !== undefined) {
+                    frame.el.bodyClose = i;
+                    frame.el.end = i + 1;
+                    elements.push(frame.el);
+                }
+                i += 1;
+                continue;
             }
-        }
-        if (localName !== null) {
-            const id = parentId === "" ? localName : `${parentId}.${localName}`;
-            const el = {
-                id,
-                start: stmtStart,
-                end: headEnd,
-                bodyOpen: opener,
-                bodyClose: -1,
-                indent: indentOf(stmtStart),
-            };
-            const titled = literalIn(stmtStart, headEnd)?.value;
-            if (titled !== undefined)
-                el.title = titled;
-            if (opener !== -1) {
+            // 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;
             }
-            else {
-                el.end = trimmedEnd(stmtStart, headEnd);
-                elements.push(el);
-                i = headEnd;
+            // 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];
             }
-            continue;
-        }
-        if (head.includes("->")) {
-            const bClose = opener === -1 ? -1 : matchBrace(code, opener);
-            const stmtEnd = opener === -1 ? trimmedEnd(stmtStart, headEnd) : bClose === -1 ? close : bClose + 1;
-            const am = /^([A-Za-z_][\w.]*)?\s*(?:-\[[^\]]*\])?->\s*([A-Za-z_][\w.]*)/.exec(head);
-            if (am !== null) {
-                const arrowEnd = stmtStart + am[0].length;
-                const bodyFrom = opener === -1 ? -1 : opener + 1;
-                const bodyTo = opener === -1 ? -1 : stmtEnd - 1;
-                const title = literalIn(arrowEnd, headEnd)?.value ?? keyedLiteral("title", bodyFrom, bodyTo);
-                const tags = [];
-                for (const tm of code.slice(stmtStart, stmtEnd).matchAll(/#([\w-]+)/g))
-                    tags.push(tm[1]);
-                raw.push({
-                    srcLit: am[1],
-                    tgtLit: am[2],
-                    parent: parentId,
+            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: stmtEnd,
+                    end: headEnd,
+                    bodyOpen: opener,
+                    bodyClose: -1,
                     indent: indentOf(stmtStart),
-                    title,
-                    op: keyedLiteral("op", bodyFrom, bodyTo),
-                    publishes: keyedLiteral("publishes", bodyFrom, bodyTo),
-                    consumes: keyedLiteral("consumes", bodyFrom, bodyTo),
-                    tags,
-                });
+                    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,
+                    });
+                }
+                i = Math.max(stmtEnd, headEnd);
+                continue;
+            }
+            if (opener !== -1) {
+                const bClose = matchBrace(code, opener);
+                i = bClose === -1 ? close : bClose + 1;
+            }
+            else {
+                i = headEnd;
             }
-            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
@@ -246,8 +279,31 @@ export function scanModel(text) {
         start: r.start,
         end: r.end,
         indent: r.indent,
+        block: r.block,
     }));
     elements.sort((a, b) => a.start - b.start);
-    return { open, close, elements, rels };
+    return { blocks, elements, rels };
+}
+/**
+ * A relationship head's endpoints as written, 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*([A-Za-z_][\w.-]*)/.exec(head);
+    if (arrow !== null)
+        return { src: arrow[1], tgt: arrow[2], 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], length: dotted[0].length };
 }
 //# sourceMappingURL=source-scan.js.map

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

@@ -1 +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,EAAsB,MAAM,kBAAkB,CAAC;AA4D9E;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,UAAU,SAAS,CAAC,IAAY;IACpC,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;IAC5C,MAAM,CAAC,GAAG,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACpC,IAAI,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC;IACpB,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;IACvC,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACrC,IAAI,KAAK,KAAK,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC;IAE9B,qEAAqE;IACrE,yEAAyE;IACzE,MAAM,KAAK,GAAG,IAAI,GAAG,EAAU,CAAC;IAChC,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,gCAAgC,CAAC,EAAE,CAAC;YACzF,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAE,CAAC,CAAC;QACpB,CAAC;IACH,CAAC;IAED,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,MAAM,YAAY,GAAG,CAAC,GAAW,EAAE,IAAY,EAAE,EAAU,EAAsB,EAAE;QACjF,IAAI,IAAI,KAAK,CAAC,CAAC;YAAE,OAAO,SAAS,CAAC;QAClC,MAAM,EAAE,GAAG,IAAI,MAAM,CAAC,MAAM,GAAG,KAAK,EAAE,GAAG,CAAC,CAAC;QAC3C,EAAE,CAAC,SAAS,GAAG,IAAI,CAAC;QACpB,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzB,IAAI,EAAE,KAAK,IAAI,IAAI,EAAE,CAAC,KAAK,IAAI,EAAE;YAAE,OAAO,SAAS,CAAC;QACpD,OAAO,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC;IACxC,CAAC,CAAC;IACF,MAAM,UAAU,GAAG,CAAC,IAAY,EAAE,EAAU,EAAU,EAAE;QACtD,IAAI,CAAC,GAAG,EAAE,CAAC;QACX,OAAO,CAAC,GAAG,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAE,CAAC;YAAE,CAAC,IAAI,CAAC,CAAC;QACnD,OAAO,CAAC,CAAC;IACX,CAAC,CAAC;IAEF,MAAM,QAAQ,GAAqB,EAAE,CAAC;IActC,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,MAAM,KAAK,GAA8C,EAAE,CAAC;IAE5D,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC;IACjB,OAAO,CAAC,GAAG,KAAK,EAAE,CAAC;QACjB,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC,CAAE,CAAC;QACpB,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;YAClB,CAAC,IAAI,CAAC,CAAC;YACP,SAAS;QACX,CAAC;QACD,IAAI,EAAE,KAAK,GAAG,EAAE,CAAC;YACf,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC;YAC1B,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBACxB,KAAK,CAAC,EAAE,CAAC,SAAS,GAAG,CAAC,CAAC;gBACvB,KAAK,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;gBACrB,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAC1B,CAAC;YACD,CAAC,IAAI,CAAC,CAAC;YACP,SAAS;QACX,CAAC;QAED,qEAAqE;QACrE,kEAAkE;QAClE,MAAM,SAAS,GAAG,CAAC,CAAC;QACpB,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,IAAI,MAAM,GAAG,CAAC,CAAC,CAAC;QAChB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;YAClC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,CAAE,CAAC;YACnB,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;gBAC5B,OAAO,GAAG,CAAC,CAAC;gBACZ,MAAM;YACR,CAAC;YACD,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;gBACd,MAAM,GAAG,CAAC,CAAC;gBACX,OAAO,GAAG,CAAC,CAAC;gBACZ,MAAM;YACR,CAAC;QACH,CAAC;QACD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC5C,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;QAErE,2EAA2E;QAC3E,0EAA0E;QAC1E,6EAA6E;QAC7E,0EAA0E;QAC1E,uEAAuE;QACvE,4EAA4E;QAC5E,6CAA6C;QAC7C,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,kCAAkC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtF,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;YACtB,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;YAC1E,MAAM,EAAE,GAAmB;gBACzB,EAAE;gBACF,KAAK,EAAE,SAAS;gBAChB,GAAG,EAAE,OAAO;gBACZ,QAAQ,EAAE,MAAM;gBAChB,SAAS,EAAE,CAAC,CAAC;gBACb,MAAM,EAAE,QAAQ,CAAC,SAAS,CAAC;gBAC3B,MAAM,EAAE,IAAI;aACb,CAAC;YACF,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;YACvB,CAAC,GAAG,MAAM,GAAG,CAAC,CAAC;YACf,SAAS;QACX,CAAC;QAED,4EAA4E;QAC5E,uEAAuE;QACvE,mEAAmE;QACnE,IAAI,SAAS,GAAkB,IAAI,CAAC;QACpC,MAAM,MAAM,GAAG,iCAAiC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5D,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;YACpB,SAAS,GAAG,MAAM,CAAC,CAAC,CAAE,CAAC;QACzB,CAAC;aAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YAChC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACtC,IAAI,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC,IAAI,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC,EAAE,CAAC;gBAC/E,SAAS,GAAG,IAAI,CAAC,CAAC,CAAE,CAAC;YACvB,CAAC;QACH,CAAC;QAED,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;YACvB,MAAM,EAAE,GAAG,QAAQ,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,QAAQ,IAAI,SAAS,EAAE,CAAC;YACpE,MAAM,EAAE,GAAmB;gBACzB,EAAE;gBACF,KAAK,EAAE,SAAS;gBAChB,GAAG,EAAE,OAAO;gBACZ,QAAQ,EAAE,MAAM;gBAChB,SAAS,EAAE,CAAC,CAAC;gBACb,MAAM,EAAE,QAAQ,CAAC,SAAS,CAAC;aAC5B,CAAC;YACF,MAAM,MAAM,GAAG,SAAS,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,KAAK,CAAC;YACpD,IAAI,MAAM,KAAK,SAAS;gBAAE,EAAE,CAAC,KAAK,GAAG,MAAM,CAAC;YAC5C,IAAI,MAAM,KAAK,CAAC,CAAC,EAAE,CAAC;gBAClB,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;gBACvB,CAAC,GAAG,MAAM,GAAG,CAAC,CAAC;YACjB,CAAC;iBAAM,CAAC;gBACN,EAAE,CAAC,GAAG,GAAG,UAAU,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;gBACxC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBAClB,CAAC,GAAG,OAAO,CAAC;YACd,CAAC;YACD,SAAS;QACX,CAAC;QAED,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YACxB,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YAC7D,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;YACpG,MAAM,EAAE,GAAG,8DAA8D,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACrF,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;gBAChB,MAAM,QAAQ,GAAG,SAAS,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;gBAC1C,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;gBACjD,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC;gBAChD,MAAM,KAAK,GAAG,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,KAAK,IAAI,YAAY,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;gBAC7F,MAAM,IAAI,GAAa,EAAE,CAAC;gBAC1B,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC;oBAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAE,CAAC,CAAC;gBAC1F,GAAG,CAAC,IAAI,CAAC;oBACP,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC;oBACb,MAAM,EAAE,EAAE,CAAC,CAAC,CAAE;oBACd,MAAM,EAAE,QAAQ;oBAChB,KAAK,EAAE,SAAS;oBAChB,GAAG,EAAE,OAAO;oBACZ,MAAM,EAAE,QAAQ,CAAC,SAAS,CAAC;oBAC3B,KAAK;oBACL,EAAE,EAAE,YAAY,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC;oBACxC,SAAS,EAAE,YAAY,CAAC,WAAW,EAAE,QAAQ,EAAE,MAAM,CAAC;oBACtD,QAAQ,EAAE,YAAY,CAAC,UAAU,EAAE,QAAQ,EAAE,MAAM,CAAC;oBACpD,IAAI;iBACL,CAAC,CAAC;YACL,CAAC;YACD,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAC/B,SAAS;QACX,CAAC;QAED,IAAI,MAAM,KAAK,CAAC,CAAC,EAAE,CAAC;YAClB,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YACxC,CAAC,GAAG,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;QACzC,CAAC;aAAM,CAAC;YACN,CAAC,GAAG,OAAO,CAAC;QACd,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,CAAC,EAAE,EAAE,CAAC,CAAC;QACzC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC;QACnC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC;QACnC,KAAK,EAAE,CAAC,CAAC,KAAK;QACd,EAAE,EAAE,CAAC,CAAC,EAAE;QACR,SAAS,EAAE,CAAC,CAAC,SAAS;QACtB,QAAQ,EAAE,CAAC,CAAC,QAAQ;QACpB,IAAI,EAAE,CAAC,CAAC,IAAI;QACZ,KAAK,EAAE,CAAC,CAAC,KAAK;QACd,GAAG,EAAE,CAAC,CAAC,GAAG;QACV,MAAM,EAAE,CAAC,CAAC,MAAM;KACjB,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,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;AACzC,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, 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  /**\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  tags: string[];\n  start: number;\n  end: number;\n  indent: string;\n}\n\nexport interface ScannedModel {\n  /** The `model` block's own braces. */\n  open: number;\n  close: number;\n  /** In document order. A nested declaration's span lies inside its parent's. */\n  elements: ScannedElement[];\n  rels: ScannedRel[];\n}\n\n/**\n * Locate every element and relationship declaration inside the top-level\n * `model { ... }` block 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 * Both declaration forms are recognised — `name = kind ...` always, and\n * `kind name ...` for any kind the document's own `specification` block\n * declares. 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. Callers only hand in documents\n * LikeC4 has already parsed, so the scan can trust balanced braces.\n */\nexport function scanModel(text: string): ScannedModel | null {\n  const { code, literals } = maskSource(text);\n  const m = /\\bmodel\\s*\\{/.exec(code);\n  if (!m) return null;\n  const open = m.index + m[0].length - 1;\n  const close = matchBrace(code, open);\n  if (close === -1) 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  const kinds = new Set<string>();\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(/\\belement\\s+([A-Za-z_][\\w-]*)/g)) {\n      kinds.add(em[1]!);\n    }\n  }\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  const keyedLiteral = (key: string, from: number, to: number): string | undefined => {\n    if (from === -1) return undefined;\n    const re = new RegExp(`\\\\b${key}\\\\b`, \"g\");\n    re.lastIndex = from;\n    const km = re.exec(code);\n    if (km === null || km.index >= to) return undefined;\n    return literalIn(km.index, to)?.value;\n  };\n  const trimmedEnd = (from: number, to: number): number => {\n    let e = to;\n    while (e > from && /\\s/.test(text[e - 1]!)) e -= 1;\n    return e;\n  };\n\n  const elements: ScannedElement[] = [];\n  interface RawRel {\n    srcLit?: string;\n    tgtLit: string;\n    parent: string;\n    start: number;\n    end: number;\n    indent: string;\n    title?: string;\n    op?: string;\n    publishes?: string;\n    consumes?: string;\n    tags: string[];\n  }\n  const raw: RawRel[] = [];\n  const stack: Array<{ id: string; el: ScannedElement }> = [];\n\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.\n    const stmtStart = i;\n    let headEnd = close;\n    let opener = -1;\n    for (let j = i; j < close; j += 1) {\n      const c = code[j]!;\n      if (c === \"\\n\" || c === \"}\") {\n        headEnd = j;\n        break;\n      }\n      if (c === \"{\") {\n        opener = j;\n        headEnd = j;\n        break;\n      }\n    }\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        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      };\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 = trimmedEnd(stmtStart, headEnd);\n        elements.push(el);\n        i = headEnd;\n      }\n      continue;\n    }\n\n    if (head.includes(\"->\")) {\n      const bClose = opener === -1 ? -1 : matchBrace(code, opener);\n      const stmtEnd = opener === -1 ? trimmedEnd(stmtStart, headEnd) : bClose === -1 ? close : bClose + 1;\n      const am = /^([A-Za-z_][\\w.]*)?\\s*(?:-\\[[^\\]]*\\])?->\\s*([A-Za-z_][\\w.]*)/.exec(head);\n      if (am !== null) {\n        const arrowEnd = stmtStart + am[0].length;\n        const bodyFrom = opener === -1 ? -1 : opener + 1;\n        const bodyTo = opener === -1 ? -1 : stmtEnd - 1;\n        const title = literalIn(arrowEnd, headEnd)?.value ?? keyedLiteral(\"title\", bodyFrom, bodyTo);\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[1],\n          tgtLit: am[2]!,\n          parent: parentId,\n          start: stmtStart,\n          end: stmtEnd,\n          indent: indentOf(stmtStart),\n          title,\n          op: keyedLiteral(\"op\", bodyFrom, bodyTo),\n          publishes: keyedLiteral(\"publishes\", bodyFrom, bodyTo),\n          consumes: keyedLiteral(\"consumes\", bodyFrom, bodyTo),\n          tags,\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  // 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((r) => ({\n    source: resolve(r.srcLit, r.parent),\n    target: resolve(r.tgtLit, r.parent),\n    title: r.title,\n    op: r.op,\n    publishes: r.publishes,\n    consumes: r.consumes,\n    tags: r.tags,\n    start: r.start,\n    end: r.end,\n    indent: r.indent,\n  }));\n\n  elements.sort((a, b) => a.start - b.start);\n  return { open, close, elements, rels };\n}\n"]}
+{"version":3,"file":"source-scan.js","sourceRoot":"","sources":["../../../src/core/c4/source-scan.ts"],"names":[],"mappings":"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","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  tags: 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 * 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. 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): 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 = new Set<string>();\n  const relKinds = new Set<string>();\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\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  interface RawRel {\n    srcLit?: string;\n    tgtLit: string;\n    parent: string;\n    start: number;\n    end: number;\n    indent: string;\n    block: number;\n    title?: string;\n    op?: string;\n    publishes?: string;\n    consumes?: string;\n    tags: string[];\n  }\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          });\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((r) => ({\n    source: resolve(r.srcLit, r.parent),\n    target: resolve(r.tgtLit, r.parent),\n    title: r.title,\n    op: r.op,\n    publishes: r.publishes,\n    consumes: r.consumes,\n    tags: r.tags,\n    start: r.start,\n    end: r.end,\n    indent: r.indent,\n    block: r.block,\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, 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; length: number } | null {\n  const arrow = /^([A-Za-z_][\\w.-]*)?\\s*(?:-\\[[^\\]]*\\])?->\\s*([A-Za-z_][\\w.-]*)/.exec(head);\n  if (arrow !== null) return { src: arrow[1], tgt: arrow[2]!, 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]!, length: dotted[0].length };\n}\n"]}

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

@@ -60,6 +60,25 @@ function stripFeatureTag(block, featureId, cuts) {
             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.