@likec4/generators 1.57.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

@@ -107830,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<{
@@ -109816,8 +109712,8 @@ declare const schemas: {
       rules?: any[] | undefined;
     }> | undefined;
     project?: {
+      [x: string]: any;
       id: string;
-      styles?: any;
     } | undefined;
     deployment?: {
       elements?: Record<any, {
@@ -109901,8 +109797,8 @@ declare const schemas: {
       rules?: any[] | undefined;
     }> | undefined;
     project?: {
+      [x: string]: any;
       id: string;
-      styles?: any;
     } | undefined;
     deployment?: {
       elements?: Record<any, {
@@ -144208,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<{
@@ -155464,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<{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@likec4/generators",
-  "version": "1.57.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.57.0",
-    "@likec4/config": "1.57.0",
-    "@likec4/log": "1.57.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.19",
     "@types/pako": "^2.0.4",
-    "typescript": "5.9.3",
+    "typescript": "6.0.3",
     "obuild": "0.4.31",
-    "vitest": "4.1.3",
-    "@likec4/tsconfig": "1.57.0",
-    "@likec4/devops": "1.57.0"
+    "vitest": "4.1.8",
+    "@likec4/tsconfig": "1.58.0",
+    "@likec4/devops": "1.58.0"
   },
   "scripts": {
     "typecheck": "tsc -b --verbose",

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