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

package/dist/core/c4/seed/template.js

@@ -0,0 +1,109 @@
+/**
+ * A LikeC4 identifier for a declared name, mechanically: `.` and `-` become
+ * `_`, and the result takes its kind's prefix — `svc_` for a service, `ext_`
+ * for an external.
+ *
+ * The prefix is not decoration, and not only about the digit-initial case
+ * (LikeC4 identifiers are letter/underscore-initial). LikeC4's KEYWORDS are
+ * bare lowercase words — `notes`, `tag`, `view`, `metadata`, `style`, `link`,
+ * `import`, `description`, `size`, `line`, `this` and some thirty more — and a
+ * service legally named `notes` emitted as a bare `notes = softwareSystem`
+ * does not parse. The self-check would catch that, but only to refuse a fleet
+ * whose fault it is not, under `internal`, with no fix to offer. No keyword
+ * contains `_`, so a prefixed identifier is PROVABLY not one — at this LikeC4
+ * version and at every later one. A reserved-word list here would be the same
+ * bug again, rotting the first time the language grew a word.
+ *
+ * The fold is not injective — `a-b` and `a.b` both give `a_b` — so residual
+ * collisions take a deterministic numeric suffix in sorted processing order.
+ * Aesthetics do not matter here: the binding metadata, not the element id, is
+ * the element's identity to loam.
+ */
+function foldName(name, kind) {
+    return `${kind}_${name.replace(/[.-]/g, "_")}`;
+}
+/** Element ids for every declared name (services ∪ externals), collision-suffixed deterministically. */
+function elementIds(seed) {
+    const ids = new Map();
+    const used = new Set();
+    const named = [
+        ...[...seed.services]
+            .map((s) => s.id)
+            .sort()
+            .map((n) => [n, "svc"]),
+        ...[...seed.externals].sort().map((n) => [n, "ext"]),
+    ];
+    for (const [name, kind] of named) {
+        let candidate = foldName(name, kind);
+        for (let n = 2; used.has(candidate); n += 1)
+            candidate = `${foldName(name, kind)}_${n}`;
+        used.add(candidate);
+        ids.set(name, candidate);
+    }
+    return ids;
+}
+/** Render the landscape body (unstamped — `sealLandscape` adds line 1). */
+export function renderLandscape(seed) {
+    const ids = elementIds(seed);
+    // Every name reaching `el` was declared (calls are validated against
+    // services ∪ externals before rendering), so the fallback is unreachable —
+    // it exists so a future caller cannot get a silent `undefined` into the DSL.
+    const el = (name) => ids.get(name) ?? foldName(name, "svc");
+    const lines = [
+        "// Generated from fleet.yaml by `loam seed` — edit fleet.yaml and re-run to",
+        "// regenerate. Hand edits make this file yours: the stamp on line 1 is how",
+        "// seed tells, and it will then refuse to touch the file again.",
+        "//",
+        "// As contracts arrive, give each call the operationId it uses, so",
+        "// requirements, C4 and OpenAPI can be cross-checked:",
+        "//",
+        "//   checkout -> paymentService 'Authorizes' {",
+        "//     metadata { op 'authorizePayment' }",
+        "//   }",
+        "",
+        "specification {",
+        "  element person",
+        "  element softwareSystem",
+        "  element container",
+        "  element database",
+        "",
+        "  // #platform keeps ubiquitous infrastructure out of the fleet view;",
+        "  // #external marks somebody else's system, so validate does not ask for a",
+        "  // services/ directory nobody owes. A tag must be declared before it is",
+        "  // used, so both are declared here whether or not this fleet uses them.",
+        "  tag platform",
+        "  tag external",
+        "}",
+        "",
+        "model {",
+    ];
+    const services = [...seed.services].sort((a, b) => (a.id < b.id ? -1 : 1));
+    for (const s of services) {
+        lines.push(`  ${el(s.id)} = softwareSystem '${s.id}' {`);
+        lines.push(`    metadata { service '${s.id}' }`);
+        lines.push("  }");
+    }
+    const externals = [...seed.externals].sort();
+    for (const x of externals) {
+        lines.push(`  ${el(x)} = softwareSystem '${x}' {`);
+        lines.push("    #external");
+        lines.push("  }");
+    }
+    const calls = [...seed.calls].sort((a, b) => a.from === b.from ? (a.to < b.to ? -1 : 1) : a.from < b.from ? -1 : 1);
+    if (calls.length > 0)
+        lines.push("");
+    for (const c of calls)
+        lines.push(`  ${el(c.from)} -> ${el(c.to)}`);
+    lines.push("}");
+    // The views block below is DUPLICATED from core/docs.ts's LANDSCAPE_STUB
+    // (two copies — extract on a third, per the house rule). The tripwire in
+    // test/seed.test.ts compares the two blocks BYTE FOR BYTE, comments and
+    // wrapping included, so whichever copy drifts fails the suite — a
+    // view-names-only compare let a corrected predicate land in one copy and
+    // leave every seeded fleet map rendering the old one.
+    // The emitted comment speaks to the docs repo's reader, not to loam's:
+    // internal paths mean nothing where this file lands.
+    lines.push("", "// The views are for LikeC4's own tooling — loam reads the model and never", "// a view. Render with `npx likec4 start` from the docs repo root. Tag", "// ubiquitous infrastructure #platform to keep the fleet view readable.", "views {", "  view fleet {", "    include *", "    exclude element.tag = #platform", "  }", "  // The obvious spelling — `include element.tag = #platform` — draws the", "  // platform boxes with NO edges and no consumers. The predicate that works is", "  // the relationship form below.", "  view platform {", "    include * -> element.tag = #platform", "  }", "}");
+    return lines.join("\n") + "\n";
+}
+//# sourceMappingURL=template.js.map

package/dist/core/c4/seed/template.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"template.js","sourceRoot":"","sources":["../../../../src/core/c4/seed/template.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * FleetSeed → landscape DSL body: a pure, deterministic function — identical\n * fleet.yaml, identical bytes, on any machine — because the stamp\n * (`./stamp.ts`) digests the output and a nondeterministic templater would\n * read as hand-edited on the next run.\n *\n * The DSL shape is deliberately minimal: one bound `softwareSystem` per\n * service (the `metadata { service '<id>' }` binding is what every loam join\n * reads — element ids are cosmetic), `#external` systems for the externals,\n * and PLAIN edges. No operationIds: those arrive with contracts, and a\n * templated guess would be the extractor this command exists not to be.\n */\nimport type { FleetSeed } from \"./fleet-file.js\";\n\n/** Which kind of declared name an element id is being built for. */\ntype ElementKind = \"svc\" | \"ext\";\n\n/**\n * A LikeC4 identifier for a declared name, mechanically: `.` and `-` become\n * `_`, and the result takes its kind's prefix — `svc_` for a service, `ext_`\n * for an external.\n *\n * The prefix is not decoration, and not only about the digit-initial case\n * (LikeC4 identifiers are letter/underscore-initial). LikeC4's KEYWORDS are\n * bare lowercase words — `notes`, `tag`, `view`, `metadata`, `style`, `link`,\n * `import`, `description`, `size`, `line`, `this` and some thirty more — and a\n * service legally named `notes` emitted as a bare `notes = softwareSystem`\n * does not parse. The self-check would catch that, but only to refuse a fleet\n * whose fault it is not, under `internal`, with no fix to offer. No keyword\n * contains `_`, so a prefixed identifier is PROVABLY not one — at this LikeC4\n * version and at every later one. A reserved-word list here would be the same\n * bug again, rotting the first time the language grew a word.\n *\n * The fold is not injective — `a-b` and `a.b` both give `a_b` — so residual\n * collisions take a deterministic numeric suffix in sorted processing order.\n * Aesthetics do not matter here: the binding metadata, not the element id, is\n * the element's identity to loam.\n */\nfunction foldName(name: string, kind: ElementKind): string {\n  return `${kind}_${name.replace(/[.-]/g, \"_\")}`;\n}\n\n/** Element ids for every declared name (services ∪ externals), collision-suffixed deterministically. */\nfunction elementIds(seed: FleetSeed): Map<string, string> {\n  const ids = new Map<string, string>();\n  const used = new Set<string>();\n  const named: Array<readonly [string, ElementKind]> = [\n    ...[...seed.services]\n      .map((s) => s.id as string)\n      .sort()\n      .map((n) => [n, \"svc\"] as const),\n    ...[...seed.externals].sort().map((n) => [n, \"ext\"] as const),\n  ];\n  for (const [name, kind] of named) {\n    let candidate = foldName(name, kind);\n    for (let n = 2; used.has(candidate); n += 1) candidate = `${foldName(name, kind)}_${n}`;\n    used.add(candidate);\n    ids.set(name, candidate);\n  }\n  return ids;\n}\n\n/** Render the landscape body (unstamped — `sealLandscape` adds line 1). */\nexport function renderLandscape(seed: FleetSeed): string {\n  const ids = elementIds(seed);\n  // Every name reaching `el` was declared (calls are validated against\n  // services ∪ externals before rendering), so the fallback is unreachable —\n  // it exists so a future caller cannot get a silent `undefined` into the DSL.\n  const el = (name: string): string => ids.get(name) ?? foldName(name, \"svc\");\n\n  const lines: string[] = [\n    \"// Generated from fleet.yaml by `loam seed` — edit fleet.yaml and re-run to\",\n    \"// regenerate. Hand edits make this file yours: the stamp on line 1 is how\",\n    \"// seed tells, and it will then refuse to touch the file again.\",\n    \"//\",\n    \"// As contracts arrive, give each call the operationId it uses, so\",\n    \"// requirements, C4 and OpenAPI can be cross-checked:\",\n    \"//\",\n    \"//   checkout -> paymentService 'Authorizes' {\",\n    \"//     metadata { op 'authorizePayment' }\",\n    \"//   }\",\n    \"\",\n    \"specification {\",\n    \"  element person\",\n    \"  element softwareSystem\",\n    \"  element container\",\n    \"  element database\",\n    \"\",\n    \"  // #platform keeps ubiquitous infrastructure out of the fleet view;\",\n    \"  // #external marks somebody else's system, so validate does not ask for a\",\n    \"  // services/ directory nobody owes. A tag must be declared before it is\",\n    \"  // used, so both are declared here whether or not this fleet uses them.\",\n    \"  tag platform\",\n    \"  tag external\",\n    \"}\",\n    \"\",\n    \"model {\",\n  ];\n\n  const services = [...seed.services].sort((a, b) => (a.id < b.id ? -1 : 1));\n  for (const s of services) {\n    lines.push(`  ${el(s.id)} = softwareSystem '${s.id}' {`);\n    lines.push(`    metadata { service '${s.id}' }`);\n    lines.push(\"  }\");\n  }\n  const externals = [...seed.externals].sort();\n  for (const x of externals) {\n    lines.push(`  ${el(x)} = softwareSystem '${x}' {`);\n    lines.push(\"    #external\");\n    lines.push(\"  }\");\n  }\n  const calls = [...seed.calls].sort((a, b) =>\n    a.from === b.from ? (a.to < b.to ? -1 : 1) : a.from < b.from ? -1 : 1,\n  );\n  if (calls.length > 0) lines.push(\"\");\n  for (const c of calls) lines.push(`  ${el(c.from)} -> ${el(c.to)}`);\n  lines.push(\"}\");\n\n  // The views block below is DUPLICATED from core/docs.ts's LANDSCAPE_STUB\n  // (two copies — extract on a third, per the house rule). The tripwire in\n  // test/seed.test.ts compares the two blocks BYTE FOR BYTE, comments and\n  // wrapping included, so whichever copy drifts fails the suite — a\n  // view-names-only compare let a corrected predicate land in one copy and\n  // leave every seeded fleet map rendering the old one.\n  // The emitted comment speaks to the docs repo's reader, not to loam's:\n  // internal paths mean nothing where this file lands.\n  lines.push(\n    \"\",\n    \"// The views are for LikeC4's own tooling — loam reads the model and never\",\n    \"// a view. Render with `npx likec4 start` from the docs repo root. Tag\",\n    \"// ubiquitous infrastructure #platform to keep the fleet view readable.\",\n    \"views {\",\n    \"  view fleet {\",\n    \"    include *\",\n    \"    exclude element.tag = #platform\",\n    \"  }\",\n    \"  // The obvious spelling — `include element.tag = #platform` — draws the\",\n    \"  // platform boxes with NO edges and no consumers. The predicate that works is\",\n    \"  // the relationship form below.\",\n    \"  view platform {\",\n    \"    include * -> element.tag = #platform\",\n    \"  }\",\n    \"}\",\n  );\n  return lines.join(\"\\n\") + \"\\n\";\n}\n"]}

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

@@ -0,0 +1,82 @@
+export function maskSource(text) {
+    const out = text.split("");
+    const literals = [];
+    let state = "code";
+    let litStart = -1;
+    let lit = "";
+    for (let i = 0; i < text.length; i += 1) {
+        const ch = text[i];
+        const next = text[i + 1];
+        switch (state) {
+            case "code":
+                if (ch === "'" || ch === '"') {
+                    state = ch === "'" ? "squote" : "dquote";
+                    litStart = i;
+                    lit = "";
+                    out[i] = " ";
+                }
+                else if (ch === "/" && next === "/") {
+                    state = "lineComment";
+                    out[i] = " ";
+                }
+                else if (ch === "/" && next === "*") {
+                    state = "blockComment";
+                    out[i] = " ";
+                }
+                break;
+            case "squote":
+            case "dquote":
+                if (ch === "\\" && i + 1 < text.length) {
+                    lit += text[i + 1];
+                    out[i] = " ";
+                    out[i + 1] = " ";
+                    i += 1;
+                }
+                else if (ch === (state === "squote" ? "'" : '"')) {
+                    literals.push({ start: litStart, end: i + 1, value: lit });
+                    state = "code";
+                    out[i] = " ";
+                }
+                else {
+                    lit += ch;
+                    if (ch !== "\n")
+                        out[i] = " ";
+                }
+                break;
+            case "lineComment":
+                if (ch === "\n")
+                    state = "code";
+                else
+                    out[i] = " ";
+                break;
+            case "blockComment":
+                if (ch === "*" && next === "/") {
+                    state = "code";
+                    out[i] = " ";
+                    out[i + 1] = " ";
+                    i += 1;
+                }
+                else if (ch !== "\n") {
+                    out[i] = " ";
+                }
+                break;
+        }
+    }
+    return { code: out.join(""), literals };
+}
+/** Index of the `}` matching the `{` at `open`, over MASKED code; -1 when unbalanced. */
+export function matchBrace(code, open) {
+    let depth = 0;
+    for (let i = open; i < code.length; i += 1) {
+        if (code[i] === "{")
+            depth += 1;
+        else if (code[i] === "}") {
+            depth -= 1;
+            if (depth === 0)
+                return i;
+        }
+    }
+    return -1;
+}
+/** An element declaration located in source, under the id the computed model gives it. */
+//# sourceMappingURL=source-mask.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"source-mask.js","sourceRoot":"","sources":["../../../src/core/c4/source-mask.ts"],"names":[],"mappings":"AA2BA,MAAM,UAAU,UAAU,CAAC,IAAY;IACrC,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAC3B,MAAM,QAAQ,GAAoB,EAAE,CAAC;IAErC,IAAI,KAAK,GAAU,MAAM,CAAC;IAC1B,IAAI,QAAQ,GAAG,CAAC,CAAC,CAAC;IAClB,IAAI,GAAG,GAAG,EAAE,CAAC;IACb,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QACxC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC,CAAE,CAAC;QACpB,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QACzB,QAAQ,KAAK,EAAE,CAAC;YACd,KAAK,MAAM;gBACT,IAAI,EAAE,KAAK,GAAG,IAAI,EAAE,KAAK,GAAG,EAAE,CAAC;oBAC7B,KAAK,GAAG,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC;oBACzC,QAAQ,GAAG,CAAC,CAAC;oBACb,GAAG,GAAG,EAAE,CAAC;oBACT,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;gBACf,CAAC;qBAAM,IAAI,EAAE,KAAK,GAAG,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;oBACtC,KAAK,GAAG,aAAa,CAAC;oBACtB,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;gBACf,CAAC;qBAAM,IAAI,EAAE,KAAK,GAAG,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;oBACtC,KAAK,GAAG,cAAc,CAAC;oBACvB,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;gBACf,CAAC;gBACD,MAAM;YACR,KAAK,QAAQ,CAAC;YACd,KAAK,QAAQ;gBACX,IAAI,EAAE,KAAK,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;oBACvC,GAAG,IAAI,IAAI,CAAC,CAAC,GAAG,CAAC,CAAE,CAAC;oBACpB,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;oBACb,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC;oBACjB,CAAC,IAAI,CAAC,CAAC;gBACT,CAAC;qBAAM,IAAI,EAAE,KAAK,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;oBACnD,QAAQ,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;oBAC3D,KAAK,GAAG,MAAM,CAAC;oBACf,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;gBACf,CAAC;qBAAM,CAAC;oBACN,GAAG,IAAI,EAAE,CAAC;oBACV,IAAI,EAAE,KAAK,IAAI;wBAAE,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;gBAChC,CAAC;gBACD,MAAM;YACR,KAAK,aAAa;gBAChB,IAAI,EAAE,KAAK,IAAI;oBAAE,KAAK,GAAG,MAAM,CAAC;;oBAC3B,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;gBAClB,MAAM;YACR,KAAK,cAAc;gBACjB,IAAI,EAAE,KAAK,GAAG,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;oBAC/B,KAAK,GAAG,MAAM,CAAC;oBACf,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;oBACb,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC;oBACjB,CAAC,IAAI,CAAC,CAAC;gBACT,CAAC;qBAAM,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;oBACvB,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;gBACf,CAAC;gBACD,MAAM;QACV,CAAC;IACH,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC;AAC1C,CAAC;AAED,yFAAyF;AACzF,MAAM,UAAU,UAAU,CAAC,IAAY,EAAE,IAAY;IACnD,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,KAAK,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QAC3C,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG;YAAE,KAAK,IAAI,CAAC,CAAC;aAC3B,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;YACzB,KAAK,IAAI,CAAC,CAAC;YACX,IAAI,KAAK,KAAK,CAAC;gBAAE,OAAO,CAAC,CAAC;QAC5B,CAAC;IACH,CAAC;IACD,OAAO,CAAC,CAAC,CAAC;AACZ,CAAC;AAED,0FAA0F","sourcesContent":["/**\n * Masking LikeC4 source, so a brace count can be trusted.\n *\n * Split from `likec4.ts` because it is the one half of the text-level view that\n * knows nothing about the model: it reads bytes and reports spans, and the\n * scanner above it turns those spans into declarations. `archive`'s splice\n * needs both, and needs them to agree — a mask that misses a literal makes\n * `matchBrace` close a block inside a string, and the merge writes into the\n * middle of somebody's description.\n */\nexport interface SourceLiteral {\n  start: number;\n  end: number;\n  value: string;\n}\n\n/**\n * A LikeC4 source with everything that is not code blanked out: string\n * interiors and comments become spaces, newlines survive, and the result is\n * exactly as long as the input — so structure (braces, arrows, `#tags`) can be\n * read with plain string operations at offsets that are valid in the original.\n */\nexport interface MaskedSource {\n  code: string;\n  literals: SourceLiteral[];\n}\n\nexport function maskSource(text: string): MaskedSource {\n  const out = text.split(\"\");\n  const literals: SourceLiteral[] = [];\n  type State = \"code\" | \"squote\" | \"dquote\" | \"lineComment\" | \"blockComment\";\n  let state: State = \"code\";\n  let litStart = -1;\n  let lit = \"\";\n  for (let i = 0; i < text.length; i += 1) {\n    const ch = text[i]!;\n    const next = text[i + 1];\n    switch (state) {\n      case \"code\":\n        if (ch === \"'\" || ch === '\"') {\n          state = ch === \"'\" ? \"squote\" : \"dquote\";\n          litStart = i;\n          lit = \"\";\n          out[i] = \" \";\n        } else if (ch === \"/\" && next === \"/\") {\n          state = \"lineComment\";\n          out[i] = \" \";\n        } else if (ch === \"/\" && next === \"*\") {\n          state = \"blockComment\";\n          out[i] = \" \";\n        }\n        break;\n      case \"squote\":\n      case \"dquote\":\n        if (ch === \"\\\\\" && i + 1 < text.length) {\n          lit += text[i + 1]!;\n          out[i] = \" \";\n          out[i + 1] = \" \";\n          i += 1;\n        } else if (ch === (state === \"squote\" ? \"'\" : '\"')) {\n          literals.push({ start: litStart, end: i + 1, value: lit });\n          state = \"code\";\n          out[i] = \" \";\n        } else {\n          lit += ch;\n          if (ch !== \"\\n\") out[i] = \" \";\n        }\n        break;\n      case \"lineComment\":\n        if (ch === \"\\n\") state = \"code\";\n        else out[i] = \" \";\n        break;\n      case \"blockComment\":\n        if (ch === \"*\" && next === \"/\") {\n          state = \"code\";\n          out[i] = \" \";\n          out[i + 1] = \" \";\n          i += 1;\n        } else if (ch !== \"\\n\") {\n          out[i] = \" \";\n        }\n        break;\n    }\n  }\n  return { code: out.join(\"\"), literals };\n}\n\n/** Index of the `}` matching the `{` at `open`, over MASKED code; -1 when unbalanced. */\nexport function matchBrace(code: string, open: number): number {\n  let depth = 0;\n  for (let i = open; i < code.length; i += 1) {\n    if (code[i] === \"{\") depth += 1;\n    else if (code[i] === \"}\") {\n      depth -= 1;\n      if (depth === 0) return i;\n    }\n  }\n  return -1;\n}\n\n/** An element declaration located in source, under the id the computed model gives it. */\n"]}

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

@@ -0,0 +1,227 @@
+/**
+ * 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 } 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
+ * 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.
+ *
+ * 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:
+ * 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. 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)
+        return null;
+    // Element kinds from the specification block(s): the `<kind> <name>`
+    // declaration form is recognisable only by its first token being a kind.
+    const kinds = 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]);
+        }
+    }
+    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);
+    const keyedLiteral = (key, from, to) => {
+        if (from === -1)
+            return undefined;
+        const re = new RegExp(`\\b${key}\\b`, "g");
+        re.lastIndex = from;
+        const km = re.exec(code);
+        if (km === null || km.index >= to)
+            return undefined;
+        return literalIn(km.index, to)?.value;
+    };
+    const trimmedEnd = (from, to) => {
+        let e = to;
+        while (e > from && /\s/.test(text[e - 1]))
+            e -= 1;
+        return e;
+    };
+    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;
+            }
+        }
+        const head = code.slice(stmtStart, headEnd);
+        const parentId = stack.length > 0 ? stack[stack.length - 1].id : "";
+        // 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),
+            };
+            if (opener !== -1) {
+                stack.push({ id, el });
+                i = opener + 1;
+            }
+            else {
+                el.end = trimmedEnd(stmtStart, headEnd);
+                elements.push(el);
+                i = headEnd;
+            }
+            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,
+                    start: stmtStart,
+                    end: stmtEnd,
+                    indent: indentOf(stmtStart),
+                    title,
+                    op: keyedLiteral("op", bodyFrom, bodyTo),
+                    publishes: keyedLiteral("publishes", bodyFrom, bodyTo),
+                    consumes: keyedLiteral("consumes", bodyFrom, bodyTo),
+                    tags,
+                });
+            }
+            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((r) => ({
+        source: resolve(r.srcLit, r.parent),
+        target: resolve(r.tgtLit, r.parent),
+        title: r.title,
+        op: r.op,
+        publishes: r.publishes,
+        consumes: r.consumes,
+        tags: r.tags,
+        start: r.start,
+        end: r.end,
+        indent: r.indent,
+    }));
+    elements.sort((a, b) => a.start - b.start);
+    return { open, close, elements, rels };
+}
+//# 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,EAAsB,MAAM,kBAAkB,CAAC;AAwC9E;;;;;;;;;;;;;;;;;;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,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,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\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    // 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      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"]}

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

@@ -0,0 +1,101 @@
+import { maskSource, matchBrace } from "../source-mask.js";
+/**
+ * A declaration's authored source, ready to land in the living landscape:
+ * byte-verbatim except that the feature's own tag is stripped and the
+ * indentation is rebased from where the block sat in the delta to where it
+ * lands. A construct the strip leaves empty goes too — a line that held only
+ * the tag disappears whole, and `x = kind 'y' { #FEAT-1 }` lands as
+ * `x = kind 'y'`, not as a pair of empty braces.
+ */
+export function spliceSource(deltaText, decl, featureId, targetIndent) {
+    const block = deltaText.slice(decl.start, decl.end);
+    return reindent(stripFeatureTag(block, featureId), decl.indent, targetIndent);
+}
+function stripFeatureTag(block, featureId) {
+    const { code } = maskSource(block);
+    const esc = featureId.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    const removals = [];
+    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;
+        // 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`.
+ */
+function reindent(block, base, target) {
+    return block
+        .split("\n")
+        .map((line, k) => {
+        const body = k === 0 ? line : line.startsWith(base) ? line.slice(base.length) : line;
+        return body.length === 0 ? "" : target + body;
+    })
+        .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/**\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 and the\n * 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 */\nexport function spliceSource(\n  deltaText: string,\n  decl: { start: number; end: number; indent: string },\n  featureId: string,\n  targetIndent: string,\n): string {\n  const block = deltaText.slice(decl.start, decl.end);\n  return reindent(stripFeatureTag(block, featureId), decl.indent, targetIndent);\n}\n\nfunction stripFeatureTag(block: string, featureId: string): string {\n  const { code } = maskSource(block);\n  const esc = featureId.replace(/[.*+?^${}()|[\\]\\\\]/g, \"\\\\$&\");\n  const removals: Array<[number, number]> = [];\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    // 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 */\nfunction reindent(block: string, base: string, target: string): string {\n  return block\n    .split(\"\\n\")\n    .map((line, k) => {\n      const body = k === 0 ? line : line.startsWith(base) ? line.slice(base.length) : line;\n      return body.length === 0 ? \"\" : target + body;\n    })\n    .join(\"\\n\");\n}\n"]}

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

@@ -0,0 +1,10 @@
+/**
+ * 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 {
+}
+//# 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":"AAEA;;;;;;GAMG;AACH,MAAM,OAAO,oBAAqB,SAAQ,KAAK;CAAG","sourcesContent":["import type { Elem, Rel } from \"../likec4.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\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\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}\n"]}