@likec4/generators 1.56.0 → 1.58.0

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { CompositeGeneratorNode, NL, expandToNode, joinToNode, toString } from "langium/generate";
-import { isEmptyish, isNullish, keys, map, pipe, values } from "remeda";
+import { filter, isEmptyish, isNullish, isTruthy, keys, map, pipe, sort, unique, values } from "remeda";
 import { LikeC4Styles, nonexhaustive } from "@likec4/core";
 import { RichText, flattenMarkdownOrString } from "@likec4/core/types";
 import pako from "pako";
@@ -2375,14 +2375,19 @@ function generateMermaid(viewmodel) {
 }
 //#endregion
 //#region src/model/generate-aux.ts
+/**
+* Converts an array of strings or a record keys to a TypeScript union type string
+* Handles empty arrays/records by returning 'never'
+*/
 function toUnion(elements) {
-	if (elements.length === 0) return "never";
-	return elements.sort(compareNatural).map((v) => `  | ${JSON.stringify(v)}`).join("\n").trimStart();
+	if (isEmptyish(elements)) return "never";
+	if (typeof elements === "object" && !Array.isArray(elements)) elements = keys(elements);
+	return pipe(elements, unique(), sort(compareNatural), map((v) => `  | ${JSON.stringify(v)}`)).join("\n").trimStart();
 }
-function elementIdToUnion(_elements) {
-	const elements = values(_elements);
-	if (elements.length === 0) return "never";
-	return pipe(elements, sortNaturalByFqn, map((v) => `  | ${JSON.stringify(v.id)}`)).join("\n").trimStart();
+function elementIdToUnion(elements) {
+	let union = pipe(elements, values(), filter((i) => !!i && isTruthy(i.id)), sortNaturalByFqn, map((v) => `  | ${JSON.stringify(v.id)}`));
+	if (union.length === 0) return "never";
+	return union.join("\n").trimStart();
 }
 function generateAux(model, options = {}) {
 	const { useCorePackage = false } = options;
@@ -2391,15 +2396,15 @@ import type { Aux, SpecAux } from '${useCorePackage ? "@likec4/core/types" : "li
 
 export type $Specs = SpecAux<
   // Element kinds
-  ${toUnion(keys(model.specification.elements))},
+  ${toUnion(model.specification.elements)},
   // Deployment kinds
-  ${toUnion(keys(model.specification.deployments ?? {}))},
+  ${toUnion(model.specification.deployments)},
   // Relationship kinds
-  ${toUnion(keys(model.specification.relationships ?? {}))},
+  ${toUnion(model.specification.relationships)},
   // Tags
-  ${toUnion(keys(model.specification.tags ?? {}))},
+  ${toUnion(model.specification.tags)},
   // Metadata keys
-  ${toUnion(model.specification.metadataKeys ?? [])}
+  ${toUnion(model.specification.metadataKeys)}
 >
 
 export type $Aux = Aux<
@@ -2409,7 +2414,7 @@ export type $Aux = Aux<
   // Deployments
   ${elementIdToUnion(model.$data.deployments.elements)},
   // Views
-  ${toUnion(keys(model.$data.views))},
+  ${toUnion(model.$data.views)},
   // Project ID
   ${JSON.stringify(model.projectId)},
   $Specs

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">>;
@@ -107817,111 +107830,7 @@ declare const schemas: {
     }, z.core.$strip>]>>>;
     project: z.ZodOptional<z.ZodObject<{
       id: z.ZodString;
-      styles: z.ZodOptional<z.ZodNullable<z.ZodPipe<z.ZodObject<{
-        theme: z.ZodOptional<z.ZodPipe<z.ZodObject<{
-          colors: z.ZodOptional<z.ZodPipe<z.ZodRecord<z.ZodPipe<z.ZodUnion<[z.ZodEnum<{
-            [x: string]: any;
-          }>, z.ZodPipe<z.ZodCustom<string & Record<never, never>, string & Record<never, never>>, z.ZodTransform<any, string & Record<never, never>>>]>, z.ZodTransform<any, any>> & z.core.$partial, z.ZodPipe<z.ZodUnion<[z.ZodPipe<z.ZodObject<{
-            elements: z.ZodUnion<[z.ZodPipe<z.ZodObject<{
-              fill: z.ZodString;
-              stroke: z.ZodString;
-              hiContrast: z.ZodString;
-              loContrast: z.ZodString;
-            }, z.core.$strict>, z.ZodTransform<any, {
-              fill: string;
-              stroke: string;
-              hiContrast: string;
-              loContrast: string;
-            }>>, z.ZodPipe<z.ZodString, z.ZodTransform<any, string>>]>;
-            relationships: z.ZodUnion<[z.ZodPipe<z.ZodObject<{
-              line: z.ZodString;
-              label: z.ZodString;
-              labelBg: z.ZodDefault<z.ZodOptional<z.ZodString>>;
-            }, z.core.$strict>, z.ZodTransform<any, {
-              line: string;
-              label: string;
-              labelBg: string;
-            }>>, z.ZodPipe<z.ZodString, z.ZodTransform<any, string>>]>;
-          }, z.core.$strict>, z.ZodTransform<any, {
-            elements: any;
-            relationships: any;
-          }>>, z.ZodPipe<z.ZodString, z.ZodTransform<any, string>>]>, z.ZodTransform<any, any>>>, z.ZodTransform<Record<ThemeColor, ThemeColorValues>, Partial<Record<any, any>>>>>;
-          sizes: z.ZodOptional<z.ZodRecord<z.ZodEnum<{
-            [x: string]: any;
-          }> & z.core.$partial, z.ZodObject<{
-            width: z.ZodNumber;
-            height: z.ZodNumber;
-          }, z.core.$strict>>>;
-        }, z.core.$strict>, z.ZodTransform<any, {
-          colors?: Record<ThemeColor, ThemeColorValues> | undefined;
-          sizes?: Partial<Record<any, {
-            width: number;
-            height: number;
-          }>> | undefined;
-        }>>>;
-        defaults: z.ZodOptional<z.ZodObject<{
-          color: z.ZodOptional<z.ZodPipe<z.ZodUnion<[z.ZodEnum<{
-            [x: string]: any;
-          }>, z.ZodPipe<z.ZodCustom<string & Record<never, never>, string & Record<never, never>>, z.ZodTransform<any, string & Record<never, never>>>]>, z.ZodTransform<any, any>>>;
-          opacity: z.ZodOptional<z.ZodInt>;
-          border: z.ZodOptional<z.ZodEnum<{
-            [x: string]: any;
-          }>>;
-          size: z.ZodOptional<z.ZodEnum<{
-            [x: string]: any;
-          }>>;
-          shape: z.ZodOptional<z.ZodEnum<{
-            [x: string]: any;
-          }>>;
-          iconPosition: z.ZodOptional<z.ZodEnum<{
-            [x: string]: any;
-          }>>;
-          group: z.ZodOptional<z.ZodObject<{
-            color: z.ZodOptional<z.ZodPipe<z.ZodUnion<[z.ZodEnum<{
-              [x: string]: any;
-            }>, z.ZodPipe<z.ZodCustom<string & Record<never, never>, string & Record<never, never>>, z.ZodTransform<any, string & Record<never, never>>>]>, z.ZodTransform<any, any>>>;
-            opacity: z.ZodOptional<z.ZodInt>;
-            border: z.ZodOptional<z.ZodEnum<{
-              [x: string]: any;
-            }>>;
-          }, z.core.$strict>>;
-          relationship: z.ZodOptional<z.ZodObject<{
-            color: z.ZodOptional<z.ZodPipe<z.ZodUnion<[z.ZodEnum<{
-              [x: string]: any;
-            }>, z.ZodPipe<z.ZodCustom<string & Record<never, never>, string & Record<never, never>>, z.ZodTransform<any, string & Record<never, never>>>]>, z.ZodTransform<any, any>>>;
-            line: z.ZodOptional<z.ZodEnum<{
-              dashed: "dashed";
-              solid: "solid";
-              dotted: "dotted";
-            }>>;
-            arrow: z.ZodOptional<z.ZodEnum<{
-              [x: string]: any;
-            }>>;
-          }, z.core.$strict>>;
-        }, z.core.$strict>>;
-        customCss: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodArray<z.ZodString>]>>;
-      }, z.core.$strict>, z.ZodTransform<any, {
-        theme?: any;
-        defaults?: {
-          color?: any;
-          opacity?: number | undefined;
-          border?: any;
-          size?: any;
-          shape?: any;
-          iconPosition?: any;
-          group?: {
-            color?: any;
-            opacity?: number | undefined;
-            border?: any;
-          } | undefined;
-          relationship?: {
-            color?: any;
-            line?: "dashed" | "solid" | "dotted" | undefined;
-            arrow?: any;
-          } | undefined;
-        } | undefined;
-        customCss?: string | string[] | undefined;
-      }>>>>;
+      styles: any;
     }, z.core.$strip>>;
     deployment: z.ZodOptional<z.ZodObject<{
       elements: z.ZodOptional<z.ZodPipe<z.ZodUnion<readonly [z.ZodRecord<z.ZodPipe<z.ZodString, z.ZodTransform<any, string>>, z.ZodUnion<readonly [z.ZodPipe<z.ZodPipe<z.ZodReadonly<z.ZodObject<{
@@ -109803,8 +109712,8 @@ declare const schemas: {
       rules?: any[] | undefined;
     }> | undefined;
     project?: {
+      [x: string]: any;
       id: string;
-      styles?: any;
     } | undefined;
     deployment?: {
       elements?: Record<any, {
@@ -109888,8 +109797,8 @@ declare const schemas: {
       rules?: any[] | undefined;
     }> | undefined;
     project?: {
+      [x: string]: any;
       id: string;
-      styles?: any;
     } | undefined;
     deployment?: {
       elements?: Record<any, {
@@ -142042,6 +141951,8 @@ declare const likec4data: <A extends Readonly<{
       styleId: string;
     } | {
       predicateId: string;
+    } | {
+      includeAncestors: boolean;
     })[] | undefined;
   } | {
     id: string;
@@ -144193,47 +144104,8 @@ declare const likec4data: <A extends Readonly<{
     })[] | undefined;
   }> | undefined;
   project?: {
+    [x: string]: any;
     id: string;
-    styles?: {
-      theme?: {
-        colors?: Partial<Record<any, string | {
-          elements: string | {
-            fill: string;
-            stroke: string;
-            hiContrast: string;
-            loContrast: string;
-          };
-          relationships: string | {
-            line: string;
-            label: string;
-            labelBg?: string | undefined;
-          };
-        }>> | undefined;
-        sizes?: Partial<Record<any, {
-          width: number;
-          height: number;
-        }>> | undefined;
-      } | undefined;
-      defaults?: {
-        color?: any;
-        opacity?: number | undefined;
-        border?: any;
-        size?: any;
-        shape?: any;
-        iconPosition?: any;
-        group?: {
-          color?: any;
-          opacity?: number | undefined;
-          border?: any;
-        } | undefined;
-        relationship?: {
-          color?: any;
-          line?: "dashed" | "solid" | "dotted" | undefined;
-          arrow?: any;
-        } | undefined;
-      } | undefined;
-      customCss?: string | string[] | undefined;
-    } | null | undefined;
   } | undefined;
   deployment?: {
     elements?: Record<string, Readonly<{
@@ -153296,6 +153168,8 @@ declare const likec4data: <A extends Readonly<{
       styleId: string;
     } | {
       predicateId: string;
+    } | {
+      includeAncestors: boolean;
     })[] | undefined;
   } | {
     id: string;
@@ -155447,47 +155321,8 @@ declare const likec4data: <A extends Readonly<{
     })[] | undefined;
   }> | undefined;
   project?: {
+    [x: string]: any;
     id: string;
-    styles?: {
-      theme?: {
-        colors?: Partial<Record<any, string | {
-          elements: string | {
-            fill: string;
-            stroke: string;
-            hiContrast: string;
-            loContrast: string;
-          };
-          relationships: string | {
-            line: string;
-            label: string;
-            labelBg?: string | undefined;
-          };
-        }>> | undefined;
-        sizes?: Partial<Record<any, {
-          width: number;
-          height: number;
-        }>> | undefined;
-      } | undefined;
-      defaults?: {
-        color?: any;
-        opacity?: number | undefined;
-        border?: any;
-        size?: any;
-        shape?: any;
-        iconPosition?: any;
-        group?: {
-          color?: any;
-          opacity?: number | undefined;
-          border?: any;
-        } | undefined;
-        relationship?: {
-          color?: any;
-          line?: "dashed" | "solid" | "dotted" | undefined;
-          arrow?: any;
-        } | undefined;
-      } | undefined;
-      customCss?: string | string[] | undefined;
-    } | null | undefined;
   } | undefined;
   deployment?: {
     elements?: Record<string, Readonly<{
@@ -156957,7 +156792,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 +167760,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 +194412,8 @@ declare const deploymentViewRule: <A extends {
   styleId: string;
 } | {
   predicateId: string;
+} | {
+  includeAncestors: boolean;
 } = {
   include: ({
     wildcard: true;
@@ -200052,6 +199894,8 @@ declare const deploymentViewRule: <A extends {
   styleId: string;
 } | {
   predicateId: string;
+} | {
+  includeAncestors: boolean;
 }>() => Op<A>;
 declare const deploymentView: <A extends {
   id: string;
@@ -205092,6 +204936,8 @@ declare const deploymentView: <A extends {
     styleId: string;
   } | {
     predicateId: string;
+  } | {
+    includeAncestors: boolean;
   })[] | undefined;
 } = {
   id: string;
@@ -210132,6 +209978,8 @@ declare const deploymentView: <A extends {
     styleId: string;
   } | {
     predicateId: string;
+  } | {
+    includeAncestors: boolean;
   })[] | undefined;
 }>() => Op<A>;
 declare const dynamicStep: <A extends Readonly<{
@@ -236478,6 +236326,8 @@ declare const anyView: <A extends {
     styleId: string;
   } | {
     predicateId: string;
+  } | {
+    includeAncestors: boolean;
   })[] | undefined;
 } | {
   id: string;
@@ -249160,6 +249010,8 @@ declare const anyView: <A extends {
     styleId: string;
   } | {
     predicateId: string;
+  } | {
+    includeAncestors: boolean;
   })[] | undefined;
 } | {
   id: string;
@@ -261843,6 +261695,8 @@ declare const views: <A extends Record<string, {
     styleId: string;
   } | {
     predicateId: string;
+  } | {
+    includeAncestors: boolean;
   })[] | undefined;
 } | {
   id: string;
@@ -274525,6 +274379,8 @@ declare const views: <A extends Record<string, {
     styleId: string;
   } | {
     predicateId: string;
+  } | {
+    includeAncestors: boolean;
   })[] | undefined;
 } | {
   id: string;
@@ -277119,11 +276975,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 +276990,7 @@ declare function generateLikeC4(input: schemas.likec4data.Input, params?: Params
  *
  * @example
  * ```ts
- * print(operators.model, {
+ * printOperation(ops.model(), {
  *   elements: [
  *     {
  *       id: 'cloud',
@@ -277160,10 +277016,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 };

package/dist/likec4/index.mjs

@@ -26,13 +26,13 @@ var base_exports = /* @__PURE__ */ __exportAll({
 	lazy: () => lazy,
 	lines: () => lines,
 	markdown: () => markdown,
-	markdownOrString: () => markdownOrString$1,
+	markdownOrString: () => markdownOrString,
 	materialize: () => materialize,
 	merge: () => merge,
 	newline: () => newline,
 	noop: () => noop,
 	operation: () => operation,
-	print: () => print$1,
+	print: () => print,
 	printProperty: () => printProperty,
 	property: () => property,
 	select: () => select,
@@ -104,7 +104,7 @@ function operation(opOrName, fn) {
 function isPrintable(value) {
 	return typeof value === "string" || typeof value === "number" || typeof value === "boolean";
 }
-function print$1(value) {
+function print(value) {
 	return operation(function printOp({ ctx, out }) {
 		let v = typeof value === "function" ? value(ctx) : value ?? ctx;
 		if (isNullish(v) || v === "") return;
@@ -112,8 +112,8 @@ function print$1(value) {
 		out.append(String(v));
 	});
 }
-const eq = () => print$1("=");
-const space = () => print$1(" ");
+const eq = () => print("=");
+const space = () => print(" ");
 function noop() {
 	return identity();
 }
@@ -179,7 +179,7 @@ function body(...args) {
 	return body("{", "}")(...ops);
 }
 const QUOTE = "'";
-const ESCAPED_QUOTE = "\\" + QUOTE;
+const ESCAPED_QUOTE = "\\'";
 function inlineText(value) {
 	return operation(({ ctx, out }) => {
 		let v = value ?? ctx;
@@ -190,7 +190,7 @@ function inlineText(value) {
 	});
 }
 function multilineText(value, quotes = QUOTE) {
-	return merge(print$1(quotes), indent(value.replaceAll(QUOTE, ESCAPED_QUOTE)), print$1(quotes));
+	return merge(print(quotes), indent(value.replaceAll(QUOTE, ESCAPED_QUOTE)), print(quotes));
 }
 function text(value) {
 	return operation(function text({ ctx, out }) {
@@ -216,7 +216,7 @@ function markdown(value) {
 		return multilineText(v, TRIPLE_QUOTE)(ctx);
 	});
 }
-function markdownOrString$1(value) {
+function markdownOrString(value) {
 	return operation(function markdownOrString(ctx) {
 		let v = value ?? ctx.ctx;
 		if (isNullish(v)) return;
@@ -355,7 +355,7 @@ function property(propertyName, op) {
 * ```
 */
 function printProperty(propertyName) {
-	return property(propertyName, print$1());
+	return property(propertyName, print());
 }
 function foreach(...args) {
 	const [arg1, arg2] = args;
@@ -543,7 +543,7 @@ var common_exports = /* @__PURE__ */ __exportAll({
 	line: () => line,
 	link: () => link,
 	links: () => links,
-	markdownOrString: () => markdownOrString,
+	markdownOrString: () => markdownOrString$1,
 	metadata: () => metadata,
 	metadataValue: () => metadataValue$1,
 	opacity: () => opacity,
@@ -581,7 +581,7 @@ const themeColor = z$1.literal(ThemeColors);
 const customColor = z$1.custom().refine((v) => typeof v === "string", "Custom color name must be a string").transform((value) => value);
 const tag = z$1.string().nonempty("Tag cannot be empty").transform((tag) => tag.startsWith("#") ? tag.slice(1) : tag);
 const tags = z$1.array(tag).readonly();
-const markdownOrString = z$1.union([
+const markdownOrString$1 = z$1.union([
 	z$1.string(),
 	z$1.strictObject({ md: z$1.string() }),
 	z$1.strictObject({ txt: z$1.string() })
@@ -610,8 +610,8 @@ const metadata = z$1.record(z$1.string(), metadataValue$1.or(z$1.array(metadataV
 const props = z$1.object({
 	tags: tags.nullable(),
 	title: z$1.string(),
-	summary: markdownOrString.nullable(),
-	description: markdownOrString.nullable(),
+	summary: markdownOrString$1.nullable(),
+	description: markdownOrString$1.nullable(),
 	notation: z$1.string().nullable(),
 	technology: z$1.string().nullable(),
 	links: links.nullable(),
@@ -737,10 +737,10 @@ const fqnExprOrWhere$1 = z$1.union([fqnExpr$1, fqnExprWhere]);
 */
 const commonCustomProperties = z$1.object({
 	title: z$1.string(),
-	description: markdownOrString,
+	description: markdownOrString$1,
 	technology: z$1.string(),
 	notation: z$1.string(),
-	notes: markdownOrString,
+	notes: markdownOrString$1,
 	navigateTo: viewId,
 	color
 });
@@ -947,8 +947,8 @@ var specification_exports$1 = /* @__PURE__ */ __exportAll({
 const element$1 = z$1.object({
 	tags: tags.nullable(),
 	title: z$1.string().nullable(),
-	summary: markdownOrString.nullable(),
-	description: markdownOrString.nullable(),
+	summary: markdownOrString$1.nullable(),
+	description: markdownOrString$1.nullable(),
 	technology: z$1.string().nullable(),
 	notation: z$1.string().nullable(),
 	links: links.nullable(),
@@ -993,6 +993,7 @@ var views_exports$1 = /* @__PURE__ */ __exportAll({
 	autoLayoutDirection: () => autoLayoutDirection,
 	deploymentView: () => deploymentView$1,
 	deploymentViewRule: () => deploymentViewRule$1,
+	deploymentViewRuleIncludeAncestors: () => deploymentViewRuleIncludeAncestors$1,
 	dynamicStep: () => dynamicStep$1,
 	dynamicStepsParallel: () => dynamicStepsParallel$1,
 	dynamicStepsSeries: () => dynamicStepsSeries$1,
@@ -1025,6 +1026,7 @@ const viewRuleAutoLayout$1 = z$1.object({
 	nodeSep: z$1.number().optional(),
 	rankSep: z$1.number().optional()
 }).transform((v) => v);
+const deploymentViewRuleIncludeAncestors$1 = z$1.strictObject({ includeAncestors: z$1.boolean() });
 const viewRuleInclude = z$1.strictObject({ include: z$1.array(expression$1) });
 const viewRuleExclude = z$1.strictObject({ exclude: z$1.array(expression$1) });
 const viewRulePredicate$1 = z$1.union([viewRuleInclude, viewRuleExclude]).transform((v) => v);
@@ -1070,7 +1072,7 @@ const viewProps = z$1.object({
 	id: viewId,
 	_stage: z$1.literal("parsed").default("parsed"),
 	title: z$1.string().nullish(),
-	description: markdownOrString.nullish(),
+	description: markdownOrString$1.nullish(),
 	tags: tags.nullish(),
 	links: links.nullish()
 });
@@ -1089,7 +1091,8 @@ const deploymentViewRule$1 = z$1.union([
 	viewRuleAutoLayout$1,
 	viewRuleStyle$1,
 	viewRuleGlobalStyle$1,
-	viewRuleGlobalPredicate$1
+	viewRuleGlobalPredicate$1,
+	deploymentViewRuleIncludeAncestors$1
 ]);
 /**
 * Replicates ParsedElementView from the core,
@@ -1104,10 +1107,10 @@ const dynamicStep$1 = z$1.object({
 	target: fqn,
 	title: z$1.string().nullish().default(null),
 	kind: z$1.string().nullish(),
-	description: markdownOrString.nullish(),
+	description: markdownOrString$1.nullish(),
 	technology: z$1.string().nullish(),
 	notation: z$1.string().nullish(),
-	notes: markdownOrString.nullish(),
+	notes: markdownOrString$1.nullish(),
 	color: color.optional(),
 	line: line.optional(),
 	head: arrow.optional(),
@@ -1228,27 +1231,27 @@ var properties_exports = /* @__PURE__ */ __exportAll({
 * Print a property from the context as a text.
 */
 function textProperty(propertyName, keyword) {
-	return select((e) => e[propertyName], spaceBetween(print$1(keyword ?? propertyName), text()));
+	return select((e) => e[propertyName], spaceBetween(print(keyword ?? propertyName), text()));
 }
 /**
 * Print a property from the context as a markdown string.
 */
 function markdownProperty(propertyName, keyword) {
-	return select((e) => e[propertyName], spaceBetween(print$1(keyword ?? propertyName), markdownOrString$1()));
-}
-const titleProperty = () => property("title", spaceBetween(print$1("title"), text()));
-const summaryProperty = () => property("summary", spaceBetween(print$1("summary"), markdownOrString$1()));
-const descriptionProperty = () => property("description", spaceBetween(print$1("description"), markdownOrString$1()));
-const notesProperty = () => property("notes", spaceBetween(print$1("notes"), markdownOrString$1()));
-const technologyProperty = () => property("technology", spaceBetween(print$1("technology"), text()));
-const notationProperty = () => property("notation", spaceBetween(print$1("notation"), text()));
+	return select((e) => e[propertyName], spaceBetween(print(keyword ?? propertyName), markdownOrString()));
+}
+const titleProperty = () => property("title", spaceBetween(print("title"), text()));
+const summaryProperty = () => property("summary", spaceBetween(print("summary"), markdownOrString()));
+const descriptionProperty = () => property("description", spaceBetween(print("description"), markdownOrString()));
+const notesProperty = () => property("notes", spaceBetween(print("notes"), markdownOrString()));
+const technologyProperty = () => property("technology", spaceBetween(print("technology"), text()));
+const notationProperty = () => property("notation", spaceBetween(print("notation"), text()));
 function printMetadataValue() {
 	return operation(({ ctx, out }) => {
 		if (isString(ctx)) return text()({
 			ctx,
 			out
 		});
-		return print$1()({
+		return print()({
 			ctx,
 			out
 		});
@@ -1262,26 +1265,26 @@ function metadataValue() {
 		}
 	}))));
 }
-const metadataProperty = () => select((e) => e.metadata ? entries(e.metadata) : void 0, body("metadata")(foreach(spaceBetween(print$1((v) => v[0]), property("1", metadataValue())), separateNewLine())));
-const tagsProperty = () => property("tags", print$1((v) => v.map((t) => `#${t}`).join(", ")));
+const metadataProperty = () => select((e) => e.metadata ? entries(e.metadata) : void 0, body("metadata")(foreach(spaceBetween(print((v) => v[0]), property("1", metadataValue())), separateNewLine())));
+const tagsProperty = () => property("tags", print((v) => v.map((t) => `#${t}`).join(", ")));
 function linkProperty() {
 	return spaceBetween(select((l) => typeof l === "string" ? { url: l } : exact({
 		url: l.url,
 		title: l.title
-	}), print$1("link"), print$1((v) => v.url), property("title", inlineText())));
+	}), print("link"), print((v) => v.url), property("title", inlineText())));
 }
 const linksProperty = () => property("links", foreachNewLine(linkProperty()));
 function styleBlockProperty() {
 	return select((e) => e.style, body("style")(styleProperties()));
 }
 function colorProperty() {
-	return property("color", spaceBetween(print$1("color"), print$1()));
+	return property("color", spaceBetween(print("color"), print()));
 }
 function opacityProperty() {
-	return property("opacity", spaceBetween(print$1("opacity"), print$1((v) => `${v}%`)));
+	return property("opacity", spaceBetween(print("opacity"), print((v) => `${v}%`)));
 }
 function iconProperty() {
-	return property("icon", spaceBetween(print$1("icon"), print$1()));
+	return property("icon", spaceBetween(print("icon"), print()));
 }
 const styleProperties = zodOp(style)(lines(property("shape"), colorProperty(), iconProperty(), property("iconColor"), property("iconSize"), property("iconPosition"), property("border"), opacityProperty(), property("size"), property("padding"), property("textSize"), property("multiple")));
 //#endregion
@@ -1345,7 +1348,7 @@ const whereMetadataEqual = zodOp(whereMetadata)(function whereMetadataEqualOp({
 	if ("neq" in value) return out.append(`metadata.${key} is not ${quoteMetadataValue(value.neq)}`);
 	nonexhaustive(value);
 });
-const whereNot = zodOp(whereNot$1)(property("not", spaceBetween(print$1("not ("), lazy(() => whereOperator()), print$1(")"))));
+const whereNot = zodOp(whereNot$1)(property("not", spaceBetween(print("not ("), lazy(() => whereOperator()), print(")"))));
 const whereParticipant = zodOp(whereParticipant$1)(function whereParticipantOp({ ctx: { participant, operator }, out }) {
 	out.append(participant, ".");
 	if ("tag" in operator) {
@@ -1437,7 +1440,7 @@ const fqnExprCustom = zodOp(fqnExprCustom$1)(({ ctx: { custom }, exec }) => {
 const fqnExprOrWhere = zodOp(fqnExprOrWhere$1)(({ ctx, exec }) => {
 	if ("where" in ctx) {
 		exec(ctx.where.expr, fqnExpr());
-		exec(ctx.where.condition, indent(print$1("where"), indent(whereOperator())));
+		exec(ctx.where.condition, indent(print("where"), indent(whereOperator())));
 		return;
 	}
 	exec(ctx, fqnExpr());
@@ -1452,10 +1455,10 @@ const fqnExprAny = zodOp(fqnExprAny$1)(({ ctx, out }) => {
 		out
 	});
 });
-const directRelationExpr = zodOp(directRelationExpr$1)(merge(property("source", fqnExpr()), print$1((v) => v.isBidirectional ? " <-> " : " -> "), property("target", fqnExpr())));
-const incomingRelationExpr = zodOp(incomingRelationExpr$1)(merge(print$1("-> "), property("incoming", fqnExpr())));
-const outgoingRelationExpr = zodOp(outgoingRelationExpr$1)(merge(property("outgoing", fqnExpr()), print$1(" ->")));
-const inOutRelationExpr = zodOp(inoutRelationExpr)(merge(print$1("-> "), property("inout", fqnExpr()), print$1(" ->")));
+const directRelationExpr = zodOp(directRelationExpr$1)(merge(property("source", fqnExpr()), print((v) => v.isBidirectional ? " <-> " : " -> "), property("target", fqnExpr())));
+const incomingRelationExpr = zodOp(incomingRelationExpr$1)(merge(print("-> "), property("incoming", fqnExpr())));
+const outgoingRelationExpr = zodOp(outgoingRelationExpr$1)(merge(property("outgoing", fqnExpr()), print(" ->")));
+const inOutRelationExpr = zodOp(inoutRelationExpr)(merge(print("-> "), property("inout", fqnExpr()), print(" ->")));
 const relationExpr = zodOp(relationExpr$1)(({ ctx, exec }) => {
 	if ("source" in ctx) return exec(ctx, directRelationExpr());
 	if ("incoming" in ctx) return exec(ctx, incomingRelationExpr());
@@ -1464,7 +1467,7 @@ const relationExpr = zodOp(relationExpr$1)(({ ctx, exec }) => {
 	nonexhaustive(ctx);
 });
 const relationExprOrWhere = zodOp(relationExprOrWhere$1)(({ ctx, out }) => {
-	if ("where" in ctx) return merge(withctx(ctx.where.expr)(relationExpr()), indent(print$1("where"), indent(withctx(ctx.where.condition)(whereOperator()))))({
+	if ("where" in ctx) return merge(withctx(ctx.where.expr)(relationExpr()), indent(print("where"), indent(withctx(ctx.where.condition)(whereOperator()))))({
 		ctx,
 		out
 	});
@@ -1539,7 +1542,7 @@ function hasElementProps$1(el) {
 	return !!(el.description || el.summary || el.technology || el.notation || el.tags && el.tags.length > 0 || el.links && el.links.length > 0 || !isEmptyish(el.metadata) || hasStyleProps$1(el));
 }
 const elementProperties$1 = zodOp(schemas.deployment.element)(lines(tagsProperty(), technologyProperty(), summaryProperty(), descriptionProperty(), linksProperty(), metadataProperty(), select((e) => hasStyleProps$1(e) ? e.style : void 0, body("style")(styleProperties()))));
-const instance = zodOp(schemas.deployment.instance)(spaceBetween(when((v) => nameFromFqn(v.id) !== nameFromFqn(v.element), print$1((v) => nameFromFqn(v.id)), print$1(" =")), print$1("instanceOf"), printProperty("element"), when((v) => !!v.title && v.title !== nameFromFqn(v.id), property("title", inlineText())), when((e) => hasElementProps$1(e), body(elementProperties$1()))));
+const instance = zodOp(schemas.deployment.instance)(spaceBetween(when((v) => nameFromFqn(v.id) !== nameFromFqn(v.element), print((v) => nameFromFqn(v.id)), print(" =")), print("instanceOf"), printProperty("element"), when((v) => !!v.title && v.title !== nameFromFqn(v.id), property("title", inlineText())), when((e) => hasElementProps$1(e), body(elementProperties$1()))));
 function node() {
 	return function nodeOp({ ctx, out }) {
 		const el = ctx;
@@ -1557,9 +1560,9 @@ function node() {
 		const needsBody = el.children.length > 0 || hasElementProps$1(el);
 		const name = nameFromFqn(el.id);
 		const inline = [
-			print$1(name),
-			print$1("="),
-			print$1(el.kind)
+			print(name),
+			print("="),
+			print(el.kind)
 		];
 		if (el.title && el.title !== name) inline.push(inlineText(el.title));
 		if (needsBody) inline.push(body(lines(2)(withctx(el, elementProperties$1()), ...el.children.map((node) => withctx(node, nodeOp)))));
@@ -1575,7 +1578,7 @@ function hasRelationStyle$1(rel) {
 function hasRelationProps$1(rel) {
 	return !!(rel.description || rel.summary || rel.technology || rel.tags && rel.tags.length > 0 || rel.links && rel.links.length > 0 || !isEmptyish(rel.metadata) || hasRelationStyle$1(rel) || rel.navigateTo);
 }
-const relationship$1 = zodOp(schemas.deployment.relationship)(spaceBetween(property("source", fqnRef()), print$1((rel) => rel.kind ? `-[${rel.kind}]->` : "->"), property("target", fqnRef()), property("title", inlineText()), when(hasRelationProps$1, body(tagsProperty(), technologyProperty(), summaryProperty(), descriptionProperty(), property("navigateTo"), linksProperty(), metadataProperty(), when(hasRelationStyle$1, body("style")(colorProperty(), property("line"), property("head"), property("tail")))))));
+const relationship$1 = zodOp(schemas.deployment.relationship)(spaceBetween(property("source", fqnRef()), print((rel) => rel.kind ? `-[${rel.kind}]->` : "->"), property("target", fqnRef()), property("title", inlineText()), when(hasRelationProps$1, body(tagsProperty(), technologyProperty(), summaryProperty(), descriptionProperty(), property("navigateTo"), linksProperty(), metadataProperty(), when(hasRelationStyle$1, body("style")(colorProperty(), property("line"), property("head"), property("tail")))))));
 const deployment = zodOp(schemas.deployment.schema)(body("deployment")(lines(2)(select((d) => buildTree$1(d.elements ? values(d.elements) : []).roots, lines(2)(foreach(node()))), select((d) => d.relations ? values(d.relations) : void 0, lines(2)(foreach(relationship$1()))))));
 //#endregion
 //#region src/likec4/operators/model.ts
@@ -1618,9 +1621,9 @@ function elementTree() {
 		const needsBody = (ctx.children?.length ?? 0) > 0 || hasElementProps(el);
 		const name = nameFromFqn(el.id);
 		const inline = [
-			print$1(name),
-			print$1("="),
-			print$1(el.kind)
+			print(name),
+			print("="),
+			print(el.kind)
 		];
 		if (el.title && el.title !== name) inline.push(inlineText(el.title));
 		if (needsBody) inline.push(body(lines(2)(withctx(el, elementProperties()), ...(ctx.children ?? []).map((node) => withctx(node, elementTree())))));
@@ -1636,7 +1639,7 @@ function hasRelationStyle(rel) {
 function hasRelationProps(rel) {
 	return !!(rel.description || rel.summary || rel.technology || rel.tags && rel.tags.length > 0 || rel.links && rel.links.length > 0 || !isEmptyish(rel.metadata) || hasRelationStyle(rel) || rel.navigateTo);
 }
-const relationship = zodOp(schemas.model.relationship)(spaceBetween(property("source", fqnRef()), print$1((rel) => rel.kind ? `-[${rel.kind}]->` : "->"), property("target", fqnRef()), property("title", inlineText()), when(hasRelationProps, body(tagsProperty(), technologyProperty(), summaryProperty(), descriptionProperty(), property("navigateTo"), linksProperty(), metadataProperty(), when(hasRelationStyle, body("style")(colorProperty(), property("line"), property("head"), property("tail")))))));
+const relationship = zodOp(schemas.model.relationship)(spaceBetween(property("source", fqnRef()), print((rel) => rel.kind ? `-[${rel.kind}]->` : "->"), property("target", fqnRef()), property("title", inlineText()), when(hasRelationProps, body(tagsProperty(), technologyProperty(), summaryProperty(), descriptionProperty(), property("navigateTo"), linksProperty(), metadataProperty(), when(hasRelationStyle, body("style")(colorProperty(), property("line"), property("head"), property("tail")))))));
 const element = zodOp(schemas.model.element)(elementTree());
 const model = zodOp(schemas.model.schema)(body("model")(lines(2)(select((d) => buildTree(d.elements ? values(d.elements) : []).roots, lines(2)(foreach(elementTree()))), select((d) => d.relations ? values(d.relations) : void 0, lines(2)(foreach(relationship()))))));
 //#endregion
@@ -1647,9 +1650,9 @@ var specification_exports = /* @__PURE__ */ __exportAll({
 	specification: () => specification,
 	tagSpecification: () => tagSpecification
 });
-const tagSpecification = zodOp(z$1.tuple([z$1.string(), tagSpec]))(spaceBetween(print$1("tag"), printProperty("0"), property("1", property("color", body(spaceBetween(print$1("color"), print$1()))))));
-const elementKind = (keyword) => zodOp(z$1.tuple([z$1.string(), element$1]))(spaceBetween(print$1(keyword), printProperty("0"), property("1", body(tagsProperty(), titleProperty(), summaryProperty(), descriptionProperty(), technologyProperty(), notationProperty(), linksProperty(), property("style", body("style")(styleProperties()))))));
-const relationshipKind = zodOp(z$1.tuple([z$1.string(), relationship$2]))(spaceBetween(print$1("relationship"), printProperty("0"), property("1", body(technologyProperty(), notationProperty(), colorProperty(), property("line"), property("head"), property("tail")))));
+const tagSpecification = zodOp(z$1.tuple([z$1.string(), tagSpec]))(spaceBetween(print("tag"), printProperty("0"), property("1", property("color", body(spaceBetween(print("color"), print()))))));
+const elementKind = (keyword) => zodOp(z$1.tuple([z$1.string(), element$1]))(spaceBetween(print(keyword), printProperty("0"), property("1", body(tagsProperty(), titleProperty(), summaryProperty(), descriptionProperty(), technologyProperty(), notationProperty(), linksProperty(), property("style", body("style")(styleProperties()))))));
+const relationshipKind = zodOp(z$1.tuple([z$1.string(), relationship$2]))(spaceBetween(print("relationship"), printProperty("0"), property("1", body(technologyProperty(), notationProperty(), colorProperty(), property("line"), property("head"), property("tail")))));
 const specification = zodOp(schema)(body("specification")(lines(2)(select((c) => c.elements && entries(c.elements), foreachNewLine(elementKind("element")())), select((c) => c.deployments && entries(c.deployments), foreachNewLine(elementKind("deploymentNode")())), select((c) => c.relationships && entries(c.relationships), foreachNewLine(relationshipKind())), select((c) => c.tags && entries(c.tags), foreachNewLine(tagSpecification())))));
 //#endregion
 //#region src/likec4/operators/views.ts
@@ -1657,6 +1660,7 @@ var views_exports = /* @__PURE__ */ __exportAll({
 	anyView: () => anyView,
 	deploymentView: () => deploymentView,
 	deploymentViewRule: () => deploymentViewRule,
+	deploymentViewRuleIncludeAncestors: () => deploymentViewRuleIncludeAncestors,
 	dynamicStep: () => dynamicStep,
 	dynamicStepsParallel: () => dynamicStepsParallel,
 	dynamicStepsSeries: () => dynamicStepsSeries,
@@ -1675,7 +1679,7 @@ var views_exports = /* @__PURE__ */ __exportAll({
 	viewRuleStyle: () => viewRuleStyle,
 	views: () => views
 });
-const viewTitleProperty = () => property("title", spaceBetween(print$1("title"), inlineText()));
+const viewTitleProperty = () => property("title", spaceBetween(print("title"), inlineText()));
 const viewRulePredicate = zodOp(schemas.views.viewRulePredicate)(({ ctx, exec }) => {
 	let exprs;
 	let type;
@@ -1690,9 +1694,9 @@ const viewRulePredicate = zodOp(schemas.views.viewRulePredicate)(({ ctx, exec })
 	if (!hasAtLeast(exprs, 1)) return;
 	const isMultiple = hasAtLeast(exprs, 2);
 	const exprOp = withctx(exprs)(foreach(expression(), separateComma(isMultiple)));
-	exec(ctx, merge(print$1(type), ...isMultiple ? [indent(exprOp)] : [space(), exprOp]));
+	exec(ctx, merge(print(type), ...isMultiple ? [indent(exprOp)] : [space(), exprOp]));
 });
-const viewRuleStyle = zodOp(schemas.views.viewRuleStyle)(spaceBetween(print$1("style"), property("targets", foreach(expression(), separateComma())), body("{", "}")(notationProperty(), property("style", styleProperties()))));
+const viewRuleStyle = zodOp(schemas.views.viewRuleStyle)(spaceBetween(print("style"), property("targets", foreach(expression(), separateComma())), body("{", "}")(notationProperty(), property("style", styleProperties()))));
 const viewRuleGroup = zodOp(schemas.views.viewRuleGroup)(({ ctx, exec }) => {
 	throw new Error("not implemented");
 });
@@ -1708,7 +1712,8 @@ const mapping = {
 	"LR": "LeftRight",
 	"RL": "RightLeft"
 };
-const viewRuleAutoLayout = zodOp(schemas.views.viewRuleAutoLayout)(spaceBetween(print$1("autoLayout"), property("direction", print$1((v) => mapping[v])), guard(hasProp("rankSep"), spaceBetween(printProperty("rankSep"), printProperty("nodeSep")))));
+const viewRuleAutoLayout = zodOp(schemas.views.viewRuleAutoLayout)(spaceBetween(print("autoLayout"), property("direction", print((v) => mapping[v])), guard(hasProp("rankSep"), spaceBetween(printProperty("rankSep"), printProperty("nodeSep")))));
+const deploymentViewRuleIncludeAncestors = zodOp(schemas.views.deploymentViewRuleIncludeAncestors)(spaceBetween(print("includeAncestors"), printProperty("includeAncestors")));
 const viewRuleRank = zodOp(schemas.views.viewRuleRank)(({ ctx, exec }) => {
 	throw new Error("not implemented");
 });
@@ -1722,17 +1727,18 @@ const elementViewRule = zodOp(schemas.views.elementViewRule)(({ ctx, exec }) =>
 	if ("targets" in ctx && "style" in ctx) return exec(ctx, viewRuleStyle());
 	nonexhaustive(ctx);
 });
-const elementView = zodOp(schemas.views.elementView.partial({ _type: true }))(spaceBetween(print$1("view"), print$1((v) => v.id), property("viewOf", spaceBetween(print$1("of"), print$1())), body(lines(2)(lines(tagsProperty(), viewTitleProperty(), descriptionProperty(), linksProperty()), property("rules", foreachNewLine(elementViewRule()))))));
+const elementView = zodOp(schemas.views.elementView.partial({ _type: true }))(spaceBetween(print("view"), print((v) => v.id), property("viewOf", spaceBetween(print("of"), print())), body(lines(2)(lines(tagsProperty(), viewTitleProperty(), descriptionProperty(), linksProperty()), property("rules", foreachNewLine(elementViewRule()))))));
 const deploymentViewRule = zodOp(schemas.views.deploymentViewRule)(({ ctx, exec }) => {
 	if ("include" in ctx || "exclude" in ctx) return exec(ctx, viewRulePredicate());
+	if ("includeAncestors" in ctx) return exec(ctx, deploymentViewRuleIncludeAncestors());
 	if ("direction" in ctx) return exec(ctx, viewRuleAutoLayout());
 	if ("styleId" in ctx) return exec(ctx, viewRuleGlobalStyle());
 	if ("predicateId" in ctx) return exec(ctx, viewRuleGlobalPredicate());
 	if ("targets" in ctx && "style" in ctx) return exec(ctx, viewRuleStyle());
 	nonexhaustive(ctx);
 });
-const deploymentView = zodOp(schemas.views.deploymentView.partial({ _type: true }))(spaceBetween(print$1("deployment view"), print$1((v) => v.id), body(lines(2)(lines(tagsProperty(), viewTitleProperty(), descriptionProperty(), linksProperty()), property("rules", foreachNewLine(deploymentViewRule()))))));
-const dynamicStep = zodOp(schemas.views.dynamicStep)(spaceBetween(print$1((v) => v.source), print$1((v) => v.isBackward ? "<-" : "->"), print$1((v) => v.target), body(lines(titleProperty(), technologyProperty(), descriptionProperty(), notesProperty(), property("navigateTo"), notationProperty(), colorProperty(), property("line"), property("head"), property("tail")))));
+const deploymentView = zodOp(schemas.views.deploymentView.partial({ _type: true }))(spaceBetween(print("deployment view"), print((v) => v.id), body(lines(2)(lines(tagsProperty(), viewTitleProperty(), descriptionProperty(), linksProperty()), property("rules", foreachNewLine(deploymentViewRule()))))));
+const dynamicStep = zodOp(schemas.views.dynamicStep)(spaceBetween(print((v) => v.source), print((v) => v.isBackward ? "<-" : "->"), print((v) => v.target), body(lines(titleProperty(), technologyProperty(), descriptionProperty(), notesProperty(), property("navigateTo"), notationProperty(), colorProperty(), property("line"), property("head"), property("tail")))));
 const dynamicStepsSeries = zodOp(schemas.views.dynamicStepsSeries)(({ ctx, exec }) => {
 	throw new Error("Not implemented");
 });
@@ -1748,7 +1754,7 @@ const dynamicViewIncludeRule = zodOp(schemas.views.dynamicViewIncludeRule)(({ ct
 	if (!hasAtLeast(ctx.include, 1)) return;
 	const isMultiple = hasAtLeast(ctx.include, 2);
 	const exprOp = withctx(ctx.include)(foreach(expression(), separateComma(isMultiple)));
-	exec(ctx, merge(print$1("include"), ...isMultiple ? [indent(exprOp)] : [space(), exprOp]));
+	exec(ctx, merge(print("include"), ...isMultiple ? [indent(exprOp)] : [space(), exprOp]));
 });
 const dynamicViewRule = zodOp(schemas.views.dynamicViewRule)(({ ctx, exec }) => {
 	if ("include" in ctx) return exec(ctx, dynamicViewIncludeRule());
@@ -1758,7 +1764,7 @@ const dynamicViewRule = zodOp(schemas.views.dynamicViewRule)(({ ctx, exec }) =>
 	if ("direction" in ctx) return exec(ctx, viewRuleAutoLayout());
 	nonexhaustive(ctx);
 });
-const dynamicView = zodOp(schemas.views.dynamicView.partial({ _type: true }))(spaceBetween(print$1("dynamic view"), print$1((v) => v.id), body(lines(2)(lines(tagsProperty(), viewTitleProperty(), descriptionProperty(), linksProperty(), property("variant")), property("steps", foreachNewLine(dynamicViewStep())), property("rules", foreachNewLine(dynamicViewRule()))))));
+const dynamicView = zodOp(schemas.views.dynamicView.partial({ _type: true }))(spaceBetween(print("dynamic view"), print((v) => v.id), body(lines(2)(lines(tagsProperty(), viewTitleProperty(), descriptionProperty(), linksProperty(), property("variant")), property("steps", foreachNewLine(dynamicViewStep())), property("rules", foreachNewLine(dynamicViewRule()))))));
 const anyView = zodOp(schemas.views.anyView)(({ ctx, exec }) => {
 	if ("_type" in ctx) {
 		if (ctx._type == "element") return exec(ctx, elementView());
@@ -1803,58 +1809,11 @@ function generateLikeC4(input, params) {
 	};
 	return materialize(withctx(input, likec4data()), params.indentation);
 }
-/**
-* Prints the result of an operation with the data
-*
-* @see operators
-*
-* @example
-* ```ts
-* print(operators.expression, {
-*   ref: {
-*     model: 'some.el',
-*   },
-*   selector: 'descendants',
-* })
-* // "some.el.**"
-* ```
-*
-* @example
-* ```ts
-* print(operators.model, {
-*   elements: [
-*     {
-*       id: 'cloud',
-*       kind: 'system',
-*     },
-*     {
-*       id: 'cloud.mobile',
-*       kind: 'mobileapp',
-*       shape: 'mobile',
-*       color: 'amber',
-*     }
-*   ],
-* })
-* // model {
-* //   cloud = system {
-* //     mobile = mobileapp {
-* //       style {
-* //         shape mobile
-* //         color amber
-* //       }
-* //     }
-* //   }
-* // }
-* ```
-*/
-function print(operator, data, params) {
-	return materialize(withctx(data, operator()), params?.indentation);
+function printOperation(operation, data, params) {
+	return materialize(withctx(data ?? {}, operation), params?.indentation);
 }
-/**
-* Same as {@link print} but uses tab indentation
-*/
-function printTabIndent(operator, data) {
-	return materialize(withctx(data, operator()), "	");
+function printWithTabIndent(operation, data) {
+	return materialize(withctx(data ?? {}, operation), "	");
 }
 //#endregion
-export { generateLikeC4 as generate, operators_exports as operators, print, printTabIndent };
+export { body, eachOnFresh, eq, executeOnCtx, executeOnFresh, foreach, foreachNewLine, fresh, generateLikeC4 as generate, guard, indent, inlineText, join, lazy, lines, markdown, markdownOrString, materialize, merge, newline, noop, operation, operators_exports as ops, print, printOperation, printProperty, printWithTabIndent, property, select, separateComma, separateNewLine, separateWith, space, spaceBetween, text, when, withctx, zodOp };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@likec4/generators",
-  "version": "1.56.0",
+  "version": "1.58.0",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -47,25 +47,25 @@
   "dependencies": {
     "langium": "3.5.0",
     "pako": "^2.1.0",
-    "remeda": "^2.33.7",
-    "immer": "^11.1.4",
+    "remeda": "^2.37.0",
+    "immer": "^11.1.8",
     "json5": "^2.2.3",
     "type-fest": "^4.41.0",
     "indent-string": "^5.0.0",
     "strip-indent": "^4.1.1",
-    "zod": "^4.3.6",
-    "@likec4/core": "1.56.0",
-    "@likec4/config": "1.56.0",
-    "@likec4/log": "1.56.0"
+    "zod": "^4.4.3",
+    "@likec4/config": "1.58.0",
+    "@likec4/log": "1.58.0",
+    "@likec4/core": "1.58.0"
   },
   "devDependencies": {
-    "@types/node": "~22.19.17",
+    "@types/node": "~22.19.19",
     "@types/pako": "^2.0.4",
-    "typescript": "5.9.3",
+    "typescript": "6.0.3",
     "obuild": "0.4.31",
-    "vitest": "4.1.3",
-    "@likec4/devops": "1.42.0",
-    "@likec4/tsconfig": "1.56.0"
+    "vitest": "4.1.8",
+    "@likec4/tsconfig": "1.58.0",
+    "@likec4/devops": "1.58.0"
   },
   "scripts": {
     "typecheck": "tsc -b --verbose",

package/src/likec4/generate-likec4.ts

@@ -1,4 +1,4 @@
-import * as operators from './operators'
+import * as ops from './operators'
 import { type AnyOp, type ctxOf, materialize, withctx } from './operators/base'
 import { schemas } from './schemas'
 
@@ -6,22 +6,24 @@ type Params = {
   indentation?: string | number
 }
 
+export { ops }
+
 export function generateLikeC4(input: schemas.likec4data.Input, params?: Params): string {
   params = {
     indentation: 2,
     ...params,
   }
-  return materialize(withctx(input, operators.likec4data()), params.indentation)
+  return materialize(withctx(input, ops.likec4data()), params.indentation)
 }
 
 /**
  * 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',
  *   },
@@ -32,7 +34,7 @@ export function generateLikeC4(input: schemas.likec4data.Input, params?: Params)
  *
  * @example
  * ```ts
- * print(operators.model, {
+ * printOperation(ops.model(), {
  *   elements: [
  *     {
  *       id: 'cloud',
@@ -58,15 +60,31 @@ export function generateLikeC4(input: schemas.likec4data.Input, params?: Params)
  * // }
  * ```
  */
-export function print<O extends () => AnyOp>(operator: O, data: ctxOf<O>, params?: Params): string {
-  return materialize(withctx(data, operator()), params?.indentation)
+export function printOperation<Operation extends AnyOp>(operation: Operation): string
+export function printOperation<Operation extends AnyOp>(
+  operation: Operation,
+  data: ctxOf<Operation>,
+  params?: Params,
+): string
+export function printOperation<Operation extends AnyOp>(
+  operation: Operation,
+  data?: ctxOf<Operation>,
+  params?: Params,
+): string {
+  return materialize(withctx(data ?? {}, operation), params?.indentation)
 }
 
 /**
- * Same as {@link print} but uses tab indentation
+ * Same as {@link printOperation} but uses tab indentation
  */
-export function printTabIndent<O extends () => AnyOp>(operator: O, data: ctxOf<O>): string {
-  return materialize(withctx(data, operator()), '\t')
+export function printWithTabIndent<Operation extends AnyOp>(operation: Operation): string
+export function printWithTabIndent<Operation extends AnyOp>(
+  operation: Operation,
+  data: ctxOf<Operation>,
+): string
+export function printWithTabIndent<Operation extends AnyOp>(
+  operation: Operation,
+  data?: ctxOf<Operation>,
+): string {
+  return materialize(withctx(data ?? {}, operation), '\t')
 }
-
-export { operators }

package/src/likec4/index.ts

@@ -1,11 +1,11 @@
 export {
   generateLikeC4 as generate,
-  operators,
-  print,
-  printTabIndent,
+  ops,
+  printOperation,
+  printWithTabIndent,
 } from './generate-likec4'
 
-export type * from './operators/base'
+export * from './operators/base'
 
 export type {
   schemas,

package/src/likec4/operators/views.ts

@@ -131,6 +131,13 @@ export const viewRuleAutoLayout = zodOp(schemas.views.viewRuleAutoLayout)(
   ),
 )
 
+export const deploymentViewRuleIncludeAncestors = zodOp(schemas.views.deploymentViewRuleIncludeAncestors)(
+  spaceBetween(
+    print('includeAncestors'),
+    printProperty('includeAncestors'),
+  ),
+)
+
 export const viewRuleRank = zodOp(schemas.views.viewRuleRank)(({ ctx, exec }) => {
   throw new Error('not implemented')
 })
@@ -200,6 +207,9 @@ export const deploymentViewRule = zodOp(schemas.views.deploymentViewRule)(
     if ('include' in ctx || 'exclude' in ctx) {
       return exec(ctx, viewRulePredicate())
     }
+    if ('includeAncestors' in ctx) {
+      return exec(ctx, deploymentViewRuleIncludeAncestors())
+    }
     if ('direction' in ctx) {
       return exec(ctx, viewRuleAutoLayout())
     }

package/src/likec4/schemas/views.ts

@@ -27,6 +27,11 @@ export const viewRuleAutoLayout = z
   })
   .transform(v => v as ViewAutoLayout)
 
+export const deploymentViewRuleIncludeAncestors = z
+  .strictObject({
+    includeAncestors: z.boolean(),
+  })
+
 export const viewRuleInclude = z.strictObject({ include: z.array(schemas.expression) })
 export const viewRuleExclude = z.strictObject({ exclude: z.array(schemas.expression) })
 
@@ -146,6 +151,7 @@ export const deploymentViewRule = z
     viewRuleStyle,
     viewRuleGlobalStyle,
     viewRuleGlobalPredicate,
+    deploymentViewRuleIncludeAncestors,
   ])
 
 /**

package/src/model/generate-aux.ts

@@ -3,28 +3,39 @@ import {
   compareNatural,
   sortNaturalByFqn,
 } from '@likec4/core/utils'
-import { keys, map, pipe, values } from 'remeda'
+import { filter, isEmptyish, isTruthy, keys, map, pipe, sort, unique, values } from 'remeda'
 
-function toUnion(elements: string[]) {
-  if (elements.length === 0) {
+/**
+ * Converts an array of strings or a record keys to a TypeScript union type string
+ * Handles empty arrays/records by returning 'never'
+ */
+function toUnion(elements: string[] | Record<string, unknown> | undefined) {
+  if (isEmptyish(elements)) {
     return 'never'
   }
-  let union = elements
-    .sort(compareNatural)
-    .map(v => `  | ${JSON.stringify(v)}`)
+  if (typeof elements === 'object' && !Array.isArray(elements)) {
+    elements = keys(elements)
+  }
+  let union = pipe(
+    elements,
+    unique(),
+    sort(compareNatural),
+    map(v => `  | ${JSON.stringify(v)}`),
+  )
   return union.join('\n').trimStart()
 }
 
-function elementIdToUnion(_elements: Record<string, { id: string }>) {
-  const elements = values(_elements)
-  if (elements.length === 0) {
-    return 'never'
-  }
+function elementIdToUnion(elements: Record<string, { id: string }>) {
   let union = pipe(
     elements,
+    values(),
+    filter(i => !!i && isTruthy(i.id)),
     sortNaturalByFqn,
     map(v => `  | ${JSON.stringify(v.id)}`),
   )
+  if (union.length === 0) {
+    return 'never'
+  }
   return union.join('\n').trimStart()
 }
 
@@ -35,15 +46,15 @@ import type { Aux, SpecAux } from '${useCorePackage ? '@likec4/core/types' : 'li
 
 export type $Specs = SpecAux<
   // Element kinds
-  ${toUnion(keys(model.specification.elements))},
+  ${toUnion(model.specification.elements)},
   // Deployment kinds
-  ${toUnion(keys(model.specification.deployments ?? {}))},
+  ${toUnion(model.specification.deployments)},
   // Relationship kinds
-  ${toUnion(keys(model.specification.relationships ?? {}))},
+  ${toUnion(model.specification.relationships)},
   // Tags
-  ${toUnion(keys(model.specification.tags ?? {}))},
+  ${toUnion(model.specification.tags)},
   // Metadata keys
-  ${toUnion(model.specification.metadataKeys ?? [])}
+  ${toUnion(model.specification.metadataKeys)}
 >
 
 export type $Aux = Aux<
@@ -53,7 +64,7 @@ export type $Aux = Aux<
   // Deployments
   ${elementIdToUnion(model.$data.deployments.elements)},
   // Views
-  ${toUnion(keys(model.$data.views))},
+  ${toUnion(model.$data.views)},
   // Project ID
   ${JSON.stringify(model.projectId)},
   $Specs