@likec4/generators 1.55.1 → 1.57.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@likec4/generators",
-  "version": "1.55.1",
+  "version": "1.57.0",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -54,18 +54,18 @@
     "indent-string": "^5.0.0",
     "strip-indent": "^4.1.1",
     "zod": "^4.3.6",
-    "@likec4/core": "1.55.1",
-    "@likec4/config": "1.55.1",
-    "@likec4/log": "1.55.1"
+    "@likec4/core": "1.57.0",
+    "@likec4/config": "1.57.0",
+    "@likec4/log": "1.57.0"
   },
   "devDependencies": {
-    "@types/node": "~22.19.15",
+    "@types/node": "~22.19.19",
     "@types/pako": "^2.0.4",
     "typescript": "5.9.3",
     "obuild": "0.4.31",
     "vitest": "4.1.3",
-    "@likec4/tsconfig": "1.55.1",
-    "@likec4/devops": "1.42.0"
+    "@likec4/tsconfig": "1.57.0",
+    "@likec4/devops": "1.57.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,
   ])
 
 /**