@likec4/generators 1.55.1 → 1.57.0

package/dist/_chunks/chunk.mjs

@@ -1,3 +1,4 @@
+//#region \0rolldown/runtime.js
 var __defProp = Object.defineProperty;
 var __exportAll = (all, no_symbols) => {
 	let target = {};
@@ -8,4 +9,5 @@ var __exportAll = (all, no_symbols) => {
 	if (!no_symbols) __defProp(target, Symbol.toStringTag, { value: "Module" });
 	return target;
 };
+//#endregion
 export { __exportAll as t };

package/dist/index.mjs

@@ -5,6 +5,7 @@ import { RichText, flattenMarkdownOrString } from "@likec4/core/types";
 import pako from "pako";
 import JSON5 from "json5";
 import { compareNatural, invariant as invariant$1, sortNaturalByFqn } from "@likec4/core/utils";
+//#region src/d2/generate-d2.ts
 const capitalizeFirstLetter$2 = (value) => value.charAt(0).toLocaleUpperCase() + value.slice(1);
 const fqnName$2 = (nodeId) => nodeId.split(".").map(capitalizeFirstLetter$2).join("");
 const nodeName$2 = (node) => {
@@ -52,6 +53,8 @@ function generateD2(viewmodel) {
 	};
 	return toString(new CompositeGeneratorNode().append("direction: ", d2direction(view), NL, NL).append(joinToNode(nodes.filter((n) => isNullish(n.parent)), (n) => printNode(n), { appendNewLineIfNotEmpty: true })).appendIf(edges.length > 0, NL, joinToNode(edges, (e) => printEdge(e), { appendNewLineIfNotEmpty: true })));
 }
+//#endregion
+//#region src/drawio/constants.ts
 /**
 * DrawIO protocol and layout constants. Single source of truth so export/parse
 * stay in sync and magic numbers are named for readability.
@@ -60,47 +63,19 @@ function generateD2(viewmodel) {
 const DRAWIO_PAGE_LINK_PREFIX = "data:page/id,likec4-";
 /** Diagram (tab) id inside mxfile; we use "likec4-<viewId>" so Draw.io opens the correct tab. */
 const DRAWIO_DIAGRAM_ID_PREFIX = "likec4-";
-/** Fixed canvas size so the diagram opens centered in Draw.io (layout bounds often equal content). */
-const DEFAULT_CANVAS_WIDTH = 800;
-const DEFAULT_CANVAS_HEIGHT = 600;
-/** Default node bbox when layout has no position (used to detect "unlaid" nodes for spread/wrap). */
-const DEFAULT_NODE_WIDTH = 120;
-const DEFAULT_NODE_HEIGHT = 60;
-/** Vertical gap when spreading multiple nodes that share the same default bbox. */
-const NODES_SPREAD_GAP = 24;
 /** First id assigned to container title cells (incremented per container). */
 const CONTAINER_TITLE_CELL_ID_START = 1e4;
-/** Container title text cell: min/max width (px), approximate width per character, height, inset from container edge. */
-const CONTAINER_TITLE_MIN_WIDTH_PX = 60;
-const CONTAINER_TITLE_MAX_WIDTH_PX = 260;
-const CONTAINER_TITLE_CHAR_WIDTH_PX = 8;
-const CONTAINER_TITLE_HEIGHT_PX = 18;
-const CONTAINER_TITLE_INSET_X = 8;
-const CONTAINER_TITLE_INSET_Y = 8;
-/** Max height (px) for container title area when matching title cell to container (parse). */
-const CONTAINER_TITLE_AREA_MAX_HEIGHT_PX = 40;
 /** Ratio of container height used for title area when matching (parse). */
 const CONTAINER_TITLE_AREA_HEIGHT_RATIO = .5;
-/** Tolerance (px) for title cell position inside container bounds (parse). */
-const CONTAINER_TITLE_AREA_TOLERANCE = 2;
-/** Default container fill opacity (0–100) when not set in style. */
-const DEFAULT_CONTAINER_OPACITY = 15;
-/** Default node fill/stroke/font when no theme color (hex). */
-const DEFAULT_NODE_FILL_HEX = "#dae8fc";
-const DEFAULT_NODE_STROKE_HEX = "#2563eb";
-const DEFAULT_NODE_FONT_HEX = "#1e40af";
-/** mxGraphModel page dimensions (draw.io default A4-like). */
-const MXGRAPH_PAGE_WIDTH = 827;
 const MXGRAPH_PAGE_HEIGHT = 1169;
-/** mxGraphModel default grid origin (dx, dy) in mxGraphModel attribute. */
-const MXGRAPH_DEFAULT_DX = 800;
-const MXGRAPH_DEFAULT_DY = 800;
 /** Default filename when exporting all views into one .drawio file (CLI and playground). */
 const DEFAULT_DRAWIO_ALL_FILENAME = "diagrams.drawio";
 /** LikeC4 app font (matches --mantine-font-family / --likec4-app-font-default). Used in generate-drawio for cell text. */
 const LIKEC4_FONT_FAMILY = "'IBM Plex Sans Variable',ui-sans-serif,system-ui,sans-serif";
 /** Container title color in diagram (matches LikeC4 diagram compound title). Used in generate-drawio for container title cell. */
 const CONTAINER_TITLE_COLOR = "#74c0fc";
+//#endregion
+//#region src/drawio/xml-utils.ts
 /**
 * Shared XML escape/decode for DrawIO generate and parse.
 * Single place so escaping rules stay in sync (Clean Code 8.5.2).
@@ -121,6 +96,8 @@ function escapeXml(unsafe) {
 function decodeXmlEntities(s) {
 	return s.replaceAll("&lt;", "<").replaceAll("&gt;", ">").replaceAll("&quot;", "\"").replaceAll("&apos;", "'").replaceAll("&amp;", "&");
 }
+//#endregion
+//#region src/drawio/parse-drawio.ts
 /**
 * Parse DrawIO (mxGraph) XML and generate LikeC4 source code.
 * Extracts vertices as elements and edges as relations; preserves colors, descriptions,
@@ -713,8 +690,8 @@ function computeContainerTitles(vertices) {
 	const containerCells = vertices.filter((v) => v.style?.toLowerCase().includes("container=1") && v.x != null && v.y != null && v.width != null && v.height != null);
 	for (const cont of containerCells) {
 		const cw = cont.width, ch = cont.height;
-		const titleAreaHeight = Math.min(CONTAINER_TITLE_AREA_MAX_HEIGHT_PX, ch * CONTAINER_TITLE_AREA_HEIGHT_RATIO) + CONTAINER_TITLE_AREA_TOLERANCE;
-		const best = vertices.find((v) => v.id !== cont.id && v.parent === cont.id && (v.style?.toLowerCase().includes("shape=text") || v.style?.toLowerCase().includes("text;")) && v.x != null && v.y != null && v.x >= -CONTAINER_TITLE_AREA_TOLERANCE && v.x <= cw + CONTAINER_TITLE_AREA_TOLERANCE && v.y >= -CONTAINER_TITLE_AREA_TOLERANCE && v.y <= titleAreaHeight);
+		const titleAreaHeight = Math.min(40, ch * CONTAINER_TITLE_AREA_HEIGHT_RATIO) + 2;
+		const best = vertices.find((v) => v.id !== cont.id && v.parent === cont.id && (v.style?.toLowerCase().includes("shape=text") || v.style?.toLowerCase().includes("text;")) && v.x != null && v.y != null && v.x >= -2 && v.x <= cw + 2 && v.y >= -2 && v.y <= titleAreaHeight);
 		if (best) {
 			const raw = (best.value ?? "").trim();
 			if (raw) {
@@ -1068,7 +1045,7 @@ function decompressDrawioDiagram(base64Content) {
 function getFirstDiagram(fullXml) {
 	return getAllDiagrams(fullXml)[0] ?? {
 		name: "index",
-		id: `${DRAWIO_DIAGRAM_ID_PREFIX}index`,
+		id: `likec4-index`,
 		content: ""
 	};
 }
@@ -1092,7 +1069,7 @@ function getAllDiagrams(fullXml) {
 		if (closeStart === -1) break;
 		const inner = fullXml.slice(endOpen + 1, closeStart);
 		const name = getAttr(attrs, "name") ?? (results.length === 0 ? "index" : `diagram_${results.length + 1}`);
-		const id = getAttr(attrs, "id") ?? `${DRAWIO_DIAGRAM_ID_PREFIX}${name}`;
+		const id = getAttr(attrs, "id") ?? `likec4-${name}`;
 		let content;
 		if (inner.includes("<mxGraphModel")) content = inner;
 		else if (inner.trim() === "") content = inner;
@@ -1506,6 +1483,8 @@ function parseDrawioRoundtripComments(c4Source) {
 	};
 	return null;
 }
+//#endregion
+//#region src/drawio/generate-drawio.ts
 /**
 * DrawIO diagram generator.
 *
@@ -1615,7 +1594,7 @@ function getDefaultStrokeWidth(borderVal, isContainer) {
 /** Apply stroke color override to base element colors (KISS: named function instead of IIFE). */
 function applyStrokeColorOverride(base, override) {
 	return {
-		fill: base?.fill ?? DEFAULT_NODE_FILL_HEX,
+		fill: base?.fill ?? "#dae8fc",
 		stroke: override,
 		font: base?.font ?? override
 	};
@@ -1662,21 +1641,21 @@ function drawioShape(shape) {
 function getElementColors(viewmodel, color) {
 	const elementColors = getThemeColorValues(viewmodel, color, "primary").elements;
 	return {
-		fill: String(elementColors.fill ?? DEFAULT_NODE_FILL_HEX),
-		stroke: String(elementColors.stroke ?? DEFAULT_NODE_STROKE_HEX),
-		font: String(elementColors.hiContrast ?? elementColors.stroke ?? DEFAULT_NODE_FONT_HEX)
+		fill: String(elementColors.fill ?? "#dae8fc"),
+		stroke: String(elementColors.stroke ?? "#2563eb"),
+		font: String(elementColors.hiContrast ?? elementColors.stroke ?? "#1e40af")
 	};
 }
 /** Edge stroke (line) color from theme RelationshipColorValues.line. */
 function getEdgeStrokeColor(viewmodel, color) {
 	const values = getThemeColorValues(viewmodel, color ?? "gray", "gray");
-	return String(values.relationships?.line ?? DEFAULT_NODE_FONT_HEX);
+	return String(values.relationships?.line ?? "#1e40af");
 }
 /** Edge label font and background from theme (RelationshipColorValues.label, labelBg) for readable connector text. */
 function getEdgeLabelColors(viewmodel, color) {
 	const rel = getThemeColorValues(viewmodel, color ?? "gray", "gray").relationships;
 	return {
-		font: String(rel?.label ?? rel?.line ?? DEFAULT_NODE_FONT_HEX),
+		font: String(rel?.label ?? rel?.line ?? "#1e40af"),
 		background: String(rel?.labelBg ?? "#ffffff")
 	};
 }
@@ -1895,9 +1874,9 @@ function computeNodeStylePartsAndValue(node, layout, options, viewmodel) {
 	const strokeColorOverride = strokeColorByNodeId?.[node.id];
 	const strokeWidthOverride = strokeWidthByNodeId?.[node.id];
 	const elemColors = strokeColorOverride ? applyStrokeColorOverride(getElementColors(viewmodel, node.color), strokeColorOverride) : getElementColors(viewmodel, node.color);
-	const fillHex = elemColors?.fill ?? DEFAULT_NODE_FILL_HEX;
-	const strokeHex = elemColors?.stroke ?? DEFAULT_NODE_STROKE_HEX;
-	const fontHex = elemColors?.font ?? elemColors?.stroke ?? DEFAULT_NODE_FONT_HEX;
+	const fillHex = elemColors?.fill ?? "#dae8fc";
+	const strokeHex = elemColors?.stroke ?? "#2563eb";
+	const fontHex = elemColors?.font ?? elemColors?.stroke ?? "#1e40af";
 	const colorStyle = `fillColor=${fillHex};strokeColor=${strokeHex};fontColor=${fontHex};`;
 	const nodeStyle = node.style;
 	const fontSizePx = effectiveStyles.fontSize(nodeStyle?.textSize);
@@ -1906,7 +1885,7 @@ function computeNodeStylePartsAndValue(node, layout, options, viewmodel) {
 	const strokeWidth = strokeWidthOverride ?? getDefaultStrokeWidth(borderVal, isContainer);
 	const strokeWidthStyle = strokeWidth !== "" ? `strokeWidth=${strokeWidth};` : "";
 	const containerDashed = getContainerDashedStyle(isContainer, borderVal);
-	const containerOpacityNum = isContainer === true ? nodeStyle?.opacity ?? DEFAULT_CONTAINER_OPACITY : void 0;
+	const containerOpacityNum = isContainer === true ? nodeStyle?.opacity ?? 15 : void 0;
 	const fillOpacityStyle = containerOpacityNum != null && isContainer === true ? `fillOpacity=${Math.min(100, Math.max(0, containerOpacityNum))};` : "";
 	const likec4StyleWithBridge = buildLikec4StyleForNode({
 		desc,
@@ -1971,17 +1950,17 @@ function buildNodeCellXml(data) {
 	};
 	return {
 		vertexXml: cellXml,
-		titleCellXml: buildContainerTitleCellXml(data.title ?? "", data.titleCellId ?? data.id, data.navTo, data.id, data.fontFamily, data.containerTitleFontSizePx ?? 12, data.containerTitleColor ?? CONTAINER_TITLE_COLOR),
+		titleCellXml: buildContainerTitleCellXml(data.title ?? "", data.titleCellId ?? data.id, data.navTo, data.id, data.fontFamily, data.containerTitleFontSizePx ?? 12, data.containerTitleColor ?? "#74c0fc"),
 		isContainer: true
 	};
 }
 /** Build container title cell XML (child of container, relative position CONTAINER_TITLE_INSET_*). */
 function buildContainerTitleCellXml(title, titleId, navTo, containerId, fontFamily, fontSizePx, colorHex) {
 	const titleValue = escapeXml(title);
-	const titleWidth = Math.max(CONTAINER_TITLE_MIN_WIDTH_PX, Math.min(CONTAINER_TITLE_MAX_WIDTH_PX, title.length * CONTAINER_TITLE_CHAR_WIDTH_PX));
-	const titleHeight = CONTAINER_TITLE_HEIGHT_PX;
-	const titleX = CONTAINER_TITLE_INSET_X;
-	const titleY = CONTAINER_TITLE_INSET_Y;
+	const titleWidth = Math.max(60, Math.min(260, title.length * 8));
+	const titleHeight = 18;
+	const titleX = 8;
+	const titleY = 8;
 	const navLinkStyle = buildNavLinkStyle(navTo);
 	const titleStyle = `shape=text;html=1;fillColor=none;strokeColor=none;align=left;verticalAlign=top;fontSize=${fontSizePx};fontStyle=1;fontColor=${colorHex};fontFamily=${encodeURIComponent(fontFamily)};${navLinkStyle}`;
 	if (navTo === "") return `<mxCell id="${titleId}" value="${titleValue}" style="${titleStyle}" vertex="1" parent="${containerId}">\n  <mxGeometry x="${Math.round(titleX)}" y="${Math.round(titleY)}" width="${titleWidth}" height="${titleHeight}" as="geometry" />\n</mxCell>`;
@@ -2043,8 +2022,8 @@ function drawioArrow(arrow) {
 const DEFAULT_BBOX = {
 	x: 0,
 	y: 0,
-	width: DEFAULT_NODE_WIDTH,
-	height: DEFAULT_NODE_HEIGHT
+	width: 120,
+	height: 60
 };
 /** True when bbox equals default (unlaid) dimensions. */
 function isDefaultBbox(b) {
@@ -2071,7 +2050,7 @@ function spreadUnlaidNodesOverVertical(bboxes, sortedNodes, containerNodeIds) {
 			bboxes.set(node.id, {
 				...firstBbox,
 				x: firstBbox.x,
-				y: firstBbox.y + i * (firstBbox.height + NODES_SPREAD_GAP)
+				y: firstBbox.y + i * (firstBbox.height + 24)
 			});
 		});
 	}
@@ -2111,15 +2090,15 @@ function computeContentBoundsAndOffsets(bboxes) {
 	}
 	if (contentMinX === Infinity) contentMinX = 0;
 	if (contentMinY === Infinity) contentMinY = 0;
-	if (contentMaxX === -Infinity) contentMaxX = contentMinX + DEFAULT_CANVAS_WIDTH;
-	if (contentMaxY === -Infinity) contentMaxY = contentMinY + DEFAULT_CANVAS_HEIGHT;
+	if (contentMaxX === -Infinity) contentMaxX = contentMinX + 800;
+	if (contentMaxY === -Infinity) contentMaxY = contentMinY + 600;
 	const contentCx = contentMinX + (contentMaxX - contentMinX) / 2;
 	const contentCy = contentMinY + (contentMaxY - contentMinY) / 2;
 	return {
-		offsetX: DEFAULT_CANVAS_WIDTH / 2 - contentCx,
-		offsetY: DEFAULT_CANVAS_HEIGHT / 2 - contentCy,
-		canvasWidth: DEFAULT_CANVAS_WIDTH,
-		canvasHeight: DEFAULT_CANVAS_HEIGHT
+		offsetX: 800 / 2 - contentCx,
+		offsetY: 600 / 2 - contentCy,
+		canvasWidth: 800,
+		canvasHeight: 600
 	};
 }
 /**
@@ -2146,8 +2125,8 @@ function computeDiagramLayout(viewmodel, options) {
 		return {
 			x: typeof d.x === "number" ? d.x : Array.isArray(d.position) ? d.position[0] : 0,
 			y: typeof d.y === "number" ? d.y : Array.isArray(d.position) ? d.position[1] : 0,
-			width: typeof d.width === "number" ? d.width : d.size?.width ?? DEFAULT_NODE_WIDTH,
-			height: typeof d.height === "number" ? d.height : d.size?.height ?? DEFAULT_NODE_HEIGHT
+			width: typeof d.width === "number" ? d.width : d.size?.width ?? 120,
+			height: typeof d.height === "number" ? d.height : d.size?.height ?? 60
 		};
 	};
 	const bboxes = /* @__PURE__ */ new Map();
@@ -2200,7 +2179,7 @@ function generateDiagramContent(viewmodel, options) {
 	const getCellId = (nodeId) => {
 		let id = nodeIds.get(nodeId);
 		if (!id) {
-			if (cellId >= CONTAINER_TITLE_CELL_ID_START) throw new Error("DrawIO cell ID range exhausted");
+			if (cellId >= 1e4) throw new Error("DrawIO cell ID range exhausted");
 			id = String(cellId++);
 			nodeIds.set(nodeId, id);
 		}
@@ -2219,7 +2198,7 @@ function generateDiagramContent(viewmodel, options) {
 		} else vertexCells.push(result.vertexXml);
 	}
 	for (const edge of edges) {
-		if (cellId >= CONTAINER_TITLE_CELL_ID_START) throw new Error("DrawIO cell ID range exhausted");
+		if (cellId >= 1e4) throw new Error("DrawIO cell ID range exhausted");
 		const edgeId = String(cellId++);
 		edgeCells.push(buildEdgeCellXml(edge, layout, options, viewmodel, getCellId, edgeId));
 	}
@@ -2232,7 +2211,7 @@ function generateDiagramContent(viewmodel, options) {
 		...edgeCells
 	].join("\n");
 	const diagramName = (getViewTitle(view) ?? view.id).trim() || view.id;
-	const mxGraphModelXml = `<mxGraphModel dx="${MXGRAPH_DEFAULT_DX}" dy="${MXGRAPH_DEFAULT_DY}" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="${MXGRAPH_PAGE_WIDTH}" pageHeight="${MXGRAPH_PAGE_HEIGHT}" math="0" shadow="0">
+	const mxGraphModelXml = `<mxGraphModel dx="800" dy="800" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="${MXGRAPH_PAGE_HEIGHT}" math="0" shadow="0">
       <root>
         <mxCell id="${rootId}" />
         ${allCells}
@@ -2342,6 +2321,8 @@ function generateDrawioEditUrl(xml) {
 	});
 	return "https://app.diagrams.net/#create=" + encodeURIComponent(createObj);
 }
+//#endregion
+//#region src/mmd/generate-mmd.ts
 const capitalizeFirstLetter$1 = (value) => value.charAt(0).toLocaleUpperCase() + value.slice(1);
 const fqnName$1 = (nodeId) => nodeId.split(".").map(capitalizeFirstLetter$1).join("");
 const nodeName$1 = (node) => {
@@ -2392,6 +2373,8 @@ function generateMermaid(viewmodel) {
 		indentation: 2
 	}));
 }
+//#endregion
+//#region src/model/generate-aux.ts
 function toUnion(elements) {
 	if (elements.length === 0) return "never";
 	return elements.sort(compareNatural).map((v) => `  | ${JSON.stringify(v)}`).join("\n").trimStart();
@@ -2444,6 +2427,8 @@ export type $Tags = readonly $Aux['Tag'][]
 export type $MetadataKey = $Aux['MetadataKey']
 `.trimStart();
 }
+//#endregion
+//#region src/model/generate-likec4-model.ts
 function generateLikeC4Model(model, options = {}) {
 	const aux = generateAux(model, options);
 	const { useCorePackage = false } = options;
@@ -2467,6 +2452,8 @@ export const likec4model: LikeC4Model<$Aux> = new LikeC4Model(${JSON5.stringify(
 /* prettier-ignore-end */
 `.trimStart();
 }
+//#endregion
+//#region src/puml/generate-puml.ts
 const capitalizeFirstLetter = (value) => value.charAt(0).toLocaleUpperCase() + value.slice(1);
 const fqnName = (nodeId) => {
 	return nodeId.split(/[.-]/).map(capitalizeFirstLetter).join("");
@@ -2562,9 +2549,13 @@ function generatePuml(viewmodel) {
 	};
 	return toString(new CompositeGeneratorNode().append("@startuml", NL).append(printHeader(), NL).append(printTheme(), NL).append(joinToNode(nodes.filter((n) => n.children.length == 0), (n) => printStereotypes(n), { appendNewLineIfNotEmpty: true })).append(joinToNode(nodes.filter((n) => isNullish(n.parent)), (n) => n.children.length > 0 ? printBoundary(n) : printNode(n), { appendNewLineIfNotEmpty: true })).appendIf(edges.length > 0, NL, joinToNode(edges, (e) => printEdge(e), { appendNewLineIfNotEmpty: true })).append(`@enduml`, NL));
 }
+//#endregion
+//#region src/views-data-ts/generateViewId.ts
 function generateViewId(views) {
 	return joinToNode(views, (view) => expandToNode`${JSON5.stringify(view.id)}`, { separator: " | " });
 }
+//#endregion
+//#region src/views-data-ts/generate-views-data.ts
 /**
 * Generate *.js file with views data
 */
@@ -2687,6 +2678,8 @@ function generateViewsDataDTs(diagrams) {
   `.append(NL);
 	return toString(out);
 }
+//#endregion
+//#region src/react-next/generate-react-next.ts
 /**
 * @deprecated in favor packages/likec4/src/cli/codegen/react/index.ts
 */
@@ -2790,6 +2783,8 @@ function generateIndex() {
 		dts: toString(dts)
 	};
 }
+//#endregion
+//#region src/react/generate-react-types.ts
 function generateReactTypes(model, options = {}) {
 	const { useCorePackage = false } = options;
 	invariant$1(!model.isParsed(), "can not generate react types for parsed model");
@@ -2852,4 +2847,5 @@ export {
 /* prettier-ignore-end */
 `.trimStart();
 }
+//#endregion
 export { DEFAULT_DRAWIO_ALL_FILENAME, buildDrawioExportOptionsForViews, buildDrawioExportOptionsFromSource, decompressDrawioDiagram, generateD2, generateDrawio, generateDrawioEditUrl, generateDrawioMulti, generateLikeC4Model, generateMermaid, generatePuml, generateReactNext, generateReactTypes, generateViewsDataDTs, generateViewsDataJs, generateViewsDataTs, getAllDiagrams, parseDrawioRoundtripComments, parseDrawioToLikeC4, parseDrawioToLikeC4Multi };

package/dist/likec4/index.d.mts

@@ -8,7 +8,7 @@ import * as z4 from "zod/v4/core";
 
 //#region src/likec4/operators/base.d.ts
 declare namespace base_d_exports {
-  export { AnyCtx, AnyOp, Ctx, CtxOp, InferOp, Op, Ops, Output, body, ctxOf, eachOnFresh, eq, executeOnCtx, executeOnFresh, foreach, foreachNewLine, fresh, guard, indent, inlineText, join, lazy, lines, markdown, markdownOrString, materialize, merge, newline, noop, operation, print$1 as print, printProperty, property, select, separateComma, separateNewLine, separateWith, space, spaceBetween, text, when, withctx, zodOp };
+  export { AnyCtx, AnyOp, Ctx, CtxOp, InferOp, Op, Ops, Output, body, ctxOf, eachOnFresh, eq, executeOnCtx, executeOnFresh, foreach, foreachNewLine, fresh, guard, indent, inlineText, join, lazy, lines, markdown, markdownOrString, materialize, merge, newline, noop, operation, print, printProperty, property, select, separateComma, separateNewLine, separateWith, space, spaceBetween, text, when, withctx, zodOp };
 }
 type Output = CompositeGeneratorNode;
 /**
@@ -90,9 +90,9 @@ declare function operation<A>(name: string, fn: (input: Ctx<A>) => any): Op<A>;
  * // Output: #one
  * ```
  */
-declare function print$1<A extends string | number | boolean>(): Op<A>;
-declare function print$1<A>(format: (value: A) => string): Op<A>;
-declare function print$1(value: string | number | boolean): InferOp;
+declare function print<A extends string | number | boolean>(): Op<A>;
+declare function print<A>(format: (value: A) => string): Op<A>;
+declare function print(value: string | number | boolean): InferOp;
 declare const eq: () => InferOp;
 declare const space: () => InferOp;
 declare function noop(): <A>(input: A) => A;
@@ -6184,7 +6184,7 @@ declare const schema: z$1.ZodObject<{
   }>>>, z$1.ZodPipe<z$1.ZodArray<z$1.ZodPipe<z$1.ZodString, z$1.ZodTransform<any, string>>>, z$1.ZodTransform<Record<any, Record<string, any>>, any[]>>]>>;
 }, z$1.core.$strip>;
 declare namespace views_d_exports$1 {
-  export { ViewRuleGroupInput, ViewRuleGroupOutput, anyView$1 as anyView, autoLayoutDirection, deploymentView$1 as deploymentView, deploymentViewRule$1 as deploymentViewRule, dynamicStep$1 as dynamicStep, dynamicStepsParallel$1 as dynamicStepsParallel, dynamicStepsSeries$1 as dynamicStepsSeries, dynamicView$1 as dynamicView, dynamicViewIncludeRule$1 as dynamicViewIncludeRule, dynamicViewRule$1 as dynamicViewRule, dynamicViewStep$1 as dynamicViewStep, dynamicViewVariant, elementView$1 as elementView, elementViewRule$1 as elementViewRule, viewRuleAutoLayout$1 as viewRuleAutoLayout, viewRuleExclude, viewRuleGlobalPredicate$1 as viewRuleGlobalPredicate, viewRuleGlobalStyle$1 as viewRuleGlobalStyle, viewRuleGroup$1 as viewRuleGroup, viewRuleInclude, viewRulePredicate$1 as viewRulePredicate, viewRuleRank$1 as viewRuleRank, viewRuleStyle$1 as viewRuleStyle, views$1 as views };
+  export { ViewRuleGroupInput, ViewRuleGroupOutput, anyView$1 as anyView, autoLayoutDirection, deploymentView$1 as deploymentView, deploymentViewRule$1 as deploymentViewRule, deploymentViewRuleIncludeAncestors$1 as deploymentViewRuleIncludeAncestors, dynamicStep$1 as dynamicStep, dynamicStepsParallel$1 as dynamicStepsParallel, dynamicStepsSeries$1 as dynamicStepsSeries, dynamicView$1 as dynamicView, dynamicViewIncludeRule$1 as dynamicViewIncludeRule, dynamicViewRule$1 as dynamicViewRule, dynamicViewStep$1 as dynamicViewStep, dynamicViewVariant, elementView$1 as elementView, elementViewRule$1 as elementViewRule, viewRuleAutoLayout$1 as viewRuleAutoLayout, viewRuleExclude, viewRuleGlobalPredicate$1 as viewRuleGlobalPredicate, viewRuleGlobalStyle$1 as viewRuleGlobalStyle, viewRuleGroup$1 as viewRuleGroup, viewRuleInclude, viewRulePredicate$1 as viewRulePredicate, viewRuleRank$1 as viewRuleRank, viewRuleStyle$1 as viewRuleStyle, views$1 as views };
 }
 declare const autoLayoutDirection: z$1.ZodLiteral<"TB" | "BT" | "LR" | "RL">;
 declare const viewRuleAutoLayout$1: z$1.ZodPipe<z$1.ZodObject<{
@@ -6196,6 +6196,9 @@ declare const viewRuleAutoLayout$1: z$1.ZodPipe<z$1.ZodObject<{
   nodeSep?: number | undefined;
   rankSep?: number | undefined;
 }>>;
+declare const deploymentViewRuleIncludeAncestors$1: z$1.ZodObject<{
+  includeAncestors: z$1.ZodBoolean;
+}, z$1.core.$strict>;
 declare const viewRuleInclude: z$1.ZodObject<{
   include: z$1.ZodArray<z$1.ZodUnion<readonly [z$1.ZodUnion<readonly [z$1.ZodObject<{
     wildcard: z$1.ZodLiteral<true>;
@@ -41987,7 +41990,9 @@ declare const deploymentViewRule$1: z$1.ZodUnion<readonly [z$1.ZodPipe<z$1.ZodUn
   predicateId: z$1.ZodString;
 }, z$1.core.$strip>, z$1.ZodTransform<any, {
   predicateId: string;
-}>>]>;
+}>>, z$1.ZodObject<{
+  includeAncestors: z$1.ZodBoolean;
+}, z$1.core.$strict>]>;
 /**
  * Replicates ParsedElementView from the core,
  * less strict, as the generator should be able to handle missing fields and provide defaults.
@@ -50466,7 +50471,9 @@ declare const deploymentView$1: z$1.ZodObject<{
     predicateId: z$1.ZodString;
   }, z$1.core.$strip>, z$1.ZodTransform<any, {
     predicateId: string;
-  }>>]>>>>;
+  }>>, z$1.ZodObject<{
+    includeAncestors: z$1.ZodBoolean;
+  }, z$1.core.$strict>]>>>>;
 }, z$1.core.$strip>;
 declare const dynamicStep$1: z$1.ZodPipe<z$1.ZodReadonly<z$1.ZodObject<{
   source: z$1.ZodPipe<z$1.ZodString, z$1.ZodTransform<any, string>>;
@@ -70577,7 +70584,9 @@ declare const anyView$1: z$1.ZodUnion<readonly [z$1.ZodObject<{
     predicateId: z$1.ZodString;
   }, z$1.core.$strip>, z$1.ZodTransform<any, {
     predicateId: string;
-  }>>]>>>>;
+  }>>, z$1.ZodObject<{
+    includeAncestors: z$1.ZodBoolean;
+  }, z$1.core.$strict>]>>>>;
 }, z$1.core.$strip>, z$1.ZodObject<{
   id: z$1.ZodPipe<z$1.ZodString, z$1.ZodTransform<any, string>>;
   _stage: z$1.ZodDefault<z$1.ZodLiteral<"parsed">>;
@@ -88650,7 +88659,9 @@ declare const views$1: z$1.ZodRecord<z$1.ZodPipe<z$1.ZodString, z$1.ZodTransform
     predicateId: z$1.ZodString;
   }, z$1.core.$strip>, z$1.ZodTransform<any, {
     predicateId: string;
-  }>>]>>>>;
+  }>>, z$1.ZodObject<{
+    includeAncestors: z$1.ZodBoolean;
+  }, z$1.core.$strict>]>>>>;
 }, z$1.core.$strip>, z$1.ZodObject<{
   id: z$1.ZodPipe<z$1.ZodString, z$1.ZodTransform<any, string>>;
   _stage: z$1.ZodDefault<z$1.ZodLiteral<"parsed">>;
@@ -106733,7 +106744,9 @@ declare const schemas: {
         predicateId: z.ZodString;
       }, z.core.$strip>, z.ZodTransform<any, {
         predicateId: string;
-      }>>]>>>>;
+      }>>, z.ZodObject<{
+        includeAncestors: z.ZodBoolean;
+      }, z.core.$strict>]>>>>;
     }, z.core.$strip>, z.ZodObject<{
       id: z.ZodPipe<z.ZodString, z.ZodTransform<any, string>>;
       _stage: z.ZodDefault<z.ZodLiteral<"parsed">>;
@@ -142042,6 +142055,8 @@ declare const likec4data: <A extends Readonly<{
       styleId: string;
     } | {
       predicateId: string;
+    } | {
+      includeAncestors: boolean;
     })[] | undefined;
   } | {
     id: string;
@@ -153296,6 +153311,8 @@ declare const likec4data: <A extends Readonly<{
       styleId: string;
     } | {
       predicateId: string;
+    } | {
+      includeAncestors: boolean;
     })[] | undefined;
   } | {
     id: string;
@@ -156957,7 +156974,7 @@ declare const specification: <A extends {
   }> | undefined;
 }>() => Op<A>;
 declare namespace views_d_exports {
-  export { anyView, deploymentView, deploymentViewRule, dynamicStep, dynamicStepsParallel, dynamicStepsSeries, dynamicView, dynamicViewIncludeRule, dynamicViewRule, dynamicViewStep, elementView, elementViewRule, viewRuleAutoLayout, viewRuleGlobalPredicate, viewRuleGlobalStyle, viewRuleGroup, viewRulePredicate, viewRuleRank, viewRuleStyle, views };
+  export { anyView, deploymentView, deploymentViewRule, deploymentViewRuleIncludeAncestors, dynamicStep, dynamicStepsParallel, dynamicStepsSeries, dynamicView, dynamicViewIncludeRule, dynamicViewRule, dynamicViewStep, elementView, elementViewRule, viewRuleAutoLayout, viewRuleGlobalPredicate, viewRuleGlobalStyle, viewRuleGroup, viewRulePredicate, viewRuleRank, viewRuleStyle, views };
 }
 declare const viewRulePredicate: <A extends {
   include: ({
@@ -167925,6 +167942,11 @@ declare const viewRuleAutoLayout: <A extends {
   nodeSep?: number | undefined;
   rankSep?: number | undefined;
 }>() => Op<A>;
+declare const deploymentViewRuleIncludeAncestors: <A extends {
+  includeAncestors: boolean;
+} = {
+  includeAncestors: boolean;
+}>() => Op<A>;
 declare const viewRuleRank: <A extends {
   targets: ({
     wildcard: true;
@@ -194572,6 +194594,8 @@ declare const deploymentViewRule: <A extends {
   styleId: string;
 } | {
   predicateId: string;
+} | {
+  includeAncestors: boolean;
 } = {
   include: ({
     wildcard: true;
@@ -200052,6 +200076,8 @@ declare const deploymentViewRule: <A extends {
   styleId: string;
 } | {
   predicateId: string;
+} | {
+  includeAncestors: boolean;
 }>() => Op<A>;
 declare const deploymentView: <A extends {
   id: string;
@@ -205092,6 +205118,8 @@ declare const deploymentView: <A extends {
     styleId: string;
   } | {
     predicateId: string;
+  } | {
+    includeAncestors: boolean;
   })[] | undefined;
 } = {
   id: string;
@@ -210132,6 +210160,8 @@ declare const deploymentView: <A extends {
     styleId: string;
   } | {
     predicateId: string;
+  } | {
+    includeAncestors: boolean;
   })[] | undefined;
 }>() => Op<A>;
 declare const dynamicStep: <A extends Readonly<{
@@ -236478,6 +236508,8 @@ declare const anyView: <A extends {
     styleId: string;
   } | {
     predicateId: string;
+  } | {
+    includeAncestors: boolean;
   })[] | undefined;
 } | {
   id: string;
@@ -249160,6 +249192,8 @@ declare const anyView: <A extends {
     styleId: string;
   } | {
     predicateId: string;
+  } | {
+    includeAncestors: boolean;
   })[] | undefined;
 } | {
   id: string;
@@ -261843,6 +261877,8 @@ declare const views: <A extends Record<string, {
     styleId: string;
   } | {
     predicateId: string;
+  } | {
+    includeAncestors: boolean;
   })[] | undefined;
 } | {
   id: string;
@@ -274525,6 +274561,8 @@ declare const views: <A extends Record<string, {
     styleId: string;
   } | {
     predicateId: string;
+  } | {
+    includeAncestors: boolean;
   })[] | undefined;
 } | {
   id: string;
@@ -277119,11 +277157,11 @@ declare function generateLikeC4(input: schemas.likec4data.Input, params?: Params
 /**
  * Prints the result of an operation with the data
  *
- * @see operators
+ * @see ops
  *
  * @example
  * ```ts
- * print(operators.expression, {
+ * printOperation(ops.expression(), {
  *   ref: {
  *     model: 'some.el',
  *   },
@@ -277134,7 +277172,7 @@ declare function generateLikeC4(input: schemas.likec4data.Input, params?: Params
  *
  * @example
  * ```ts
- * print(operators.model, {
+ * printOperation(ops.model(), {
  *   elements: [
  *     {
  *       id: 'cloud',
@@ -277160,10 +277198,12 @@ declare function generateLikeC4(input: schemas.likec4data.Input, params?: Params
  * // }
  * ```
  */
-declare function print<O extends () => AnyOp>(operator: O, data: ctxOf<O>, params?: Params): string;
+declare function printOperation<Operation extends AnyOp>(operation: Operation): string;
+declare function printOperation<Operation extends AnyOp>(operation: Operation, data: ctxOf<Operation>, params?: Params): string;
 /**
- * Same as {@link print} but uses tab indentation
+ * Same as {@link printOperation} but uses tab indentation
  */
-declare function printTabIndent<O extends () => AnyOp>(operator: O, data: ctxOf<O>): string;
+declare function printWithTabIndent<Operation extends AnyOp>(operation: Operation): string;
+declare function printWithTabIndent<Operation extends AnyOp>(operation: Operation, data: ctxOf<Operation>): string;
 //#endregion
-export { AnyCtx, AnyOp, Ctx, CtxOp, InferOp, Op, Ops, Output, body, ctxOf, eachOnFresh, eq, executeOnCtx, executeOnFresh, foreach, foreachNewLine, fresh, generateLikeC4 as generate, guard, indent, inlineText, join, lazy, lines, markdown, markdownOrString, materialize, merge, newline, noop, operation, index_d_exports as operators, print, printProperty, printTabIndent, property, type schemas, select, separateComma, separateNewLine, separateWith, space, spaceBetween, text, when, withctx, zodOp };
+export { AnyCtx, AnyOp, Ctx, CtxOp, InferOp, Op, Ops, Output, body, ctxOf, eachOnFresh, eq, executeOnCtx, executeOnFresh, foreach, foreachNewLine, fresh, generateLikeC4 as generate, guard, indent, inlineText, join, lazy, lines, markdown, markdownOrString, materialize, merge, newline, noop, operation, index_d_exports as ops, print, printOperation, printProperty, printWithTabIndent, property, type schemas, select, separateComma, separateNewLine, separateWith, space, spaceBetween, text, when, withctx, zodOp };