@likec4/core 1.31.0 → 1.32.1

package/src/builder/__snapshots__/Builder-style2.compute-model.json5

@@ -0,0 +1,319 @@
+{
+  "_stage": "computed",
+  "deployments": {
+    "elements": {},
+    "relations": {},
+  },
+  "elements": {
+    "cloud": {
+      "color": "primary",
+      "description": null,
+      "id": "cloud",
+      "kind": "system",
+      "links": null,
+      "shape": "rectangle",
+      "style": {
+        "size": "lg",
+        "textSize": "sm",
+      },
+      "tags": [],
+      "technology": null,
+      "title": "cloud",
+    },
+    "cloud.api": {
+      "color": "primary",
+      "description": null,
+      "id": "cloud.api",
+      "kind": "component",
+      "links": null,
+      "shape": "rectangle",
+      "style": {},
+      "tags": [],
+      "technology": null,
+      "title": "api",
+    },
+    "cloud.ui": {
+      "color": "primary",
+      "description": null,
+      "id": "cloud.ui",
+      "kind": "component",
+      "links": null,
+      "shape": "rectangle",
+      "style": {},
+      "tags": [],
+      "technology": null,
+      "title": "ui",
+    },
+    "customer": {
+      "color": "primary",
+      "description": null,
+      "id": "customer",
+      "kind": "actor",
+      "links": null,
+      "shape": "rectangle",
+      "style": {},
+      "tags": [
+        "tag3",
+      ],
+      "technology": null,
+      "title": "customer",
+    },
+  },
+  "globals": {
+    "dynamicPredicates": {},
+    "predicates": {},
+    "styles": {},
+  },
+  "imports": {},
+  "projectId": "from-builder",
+  "relations": {
+    "rel1": {
+      "id": "rel1",
+      "source": {
+        "model": "customer",
+      },
+      "tags": [
+        "tag1",
+      ],
+      "target": {
+        "model": "cloud.ui",
+      },
+      "title": "uses",
+    },
+    "rel2": {
+      "id": "rel2",
+      "source": {
+        "model": "cloud.ui",
+      },
+      "tags": [
+        "tag2",
+      ],
+      "target": {
+        "model": "cloud.api",
+      },
+      "title": "calls",
+    },
+  },
+  "specification": {
+    "customColors": {},
+    "deployments": {
+      "env": {
+        "style": {
+          "size": "lg",
+        },
+      },
+      "node": {},
+    },
+    "elements": {
+      "actor": {
+        "tags": [
+          "tag3",
+        ],
+      },
+      "component": {},
+      "system": {
+        "style": {
+          "size": "lg",
+          "textSize": "sm",
+        },
+      },
+    },
+    "relationships": {},
+    "tags": {
+      "tag1": {
+        "color": "#FFF",
+      },
+      "tag2": {
+        "color": "primary",
+      },
+      "tag3": {
+        "color": "primary",
+      },
+    },
+  },
+  "views": {
+    "cloudui": {
+      "_stage": "computed",
+      "_type": "element",
+      "autoLayout": {
+        "direction": "TB",
+      },
+      "description": null,
+      "edges": [
+        {
+          "id": "1r2spnx",
+          "label": "uses",
+          "parent": null,
+          "relations": [
+            "rel1",
+          ],
+          "source": "customer",
+          "tags": [
+            "tag1",
+          ],
+          "target": "cloud.ui",
+        },
+        {
+          "id": "9r1z3i",
+          "label": "calls",
+          "parent": null,
+          "relations": [
+            "rel2",
+          ],
+          "source": "cloud.ui",
+          "tags": [
+            "tag2",
+          ],
+          "target": "cloud.api",
+        },
+      ],
+      "hash": "e2efe9f71b40357a84c900d60e5332c97d0af742",
+      "id": "cloudui",
+      "links": null,
+      "nodes": [
+        {
+          "children": [],
+          "color": "primary",
+          "description": null,
+          "id": "customer",
+          "inEdges": [],
+          "kind": "actor",
+          "level": 0,
+          "links": null,
+          "modelRef": "customer",
+          "outEdges": [
+            "1r2spnx",
+          ],
+          "parent": null,
+          "shape": "rectangle",
+          "style": {},
+          "tags": [
+            "tag3",
+          ],
+          "technology": null,
+          "title": "customer",
+        },
+        {
+          "children": [],
+          "color": "primary",
+          "description": null,
+          "id": "cloud.ui",
+          "inEdges": [
+            "1r2spnx",
+          ],
+          "kind": "component",
+          "level": 0,
+          "links": null,
+          "modelRef": "cloud.ui",
+          "outEdges": [
+            "9r1z3i",
+          ],
+          "parent": null,
+          "shape": "rectangle",
+          "style": {},
+          "tags": [],
+          "technology": null,
+          "title": "ui",
+        },
+        {
+          "children": [],
+          "color": "primary",
+          "description": null,
+          "id": "cloud.api",
+          "inEdges": [
+            "9r1z3i",
+          ],
+          "kind": "component",
+          "level": 0,
+          "links": null,
+          "modelRef": "cloud.api",
+          "outEdges": [],
+          "parent": null,
+          "shape": "rectangle",
+          "style": {},
+          "tags": [],
+          "technology": null,
+          "title": "api",
+        },
+      ],
+      "tags": [],
+      "title": null,
+      "viewOf": "cloud.ui",
+    },
+    "index": {
+      "_stage": "computed",
+      "_type": "element",
+      "autoLayout": {
+        "direction": "TB",
+      },
+      "description": null,
+      "edges": [
+        {
+          "id": "kzb1r3",
+          "label": "uses",
+          "parent": null,
+          "relations": [
+            "rel1",
+          ],
+          "source": "customer",
+          "tags": [
+            "tag1",
+          ],
+          "target": "cloud",
+        },
+      ],
+      "hash": "717ea7de18ab0b5f85bb78a612ad1644052ad367",
+      "id": "index",
+      "links": null,
+      "nodes": [
+        {
+          "children": [],
+          "color": "primary",
+          "description": null,
+          "id": "customer",
+          "inEdges": [],
+          "kind": "actor",
+          "level": 0,
+          "links": null,
+          "modelRef": "customer",
+          "outEdges": [
+            "kzb1r3",
+          ],
+          "parent": null,
+          "shape": "rectangle",
+          "style": {},
+          "tags": [
+            "tag3",
+          ],
+          "technology": null,
+          "title": "customer",
+        },
+        {
+          "children": [],
+          "color": "primary",
+          "description": null,
+          "id": "cloud",
+          "inEdges": [
+            "kzb1r3",
+          ],
+          "kind": "system",
+          "level": 0,
+          "links": null,
+          "modelRef": "cloud",
+          "outEdges": [],
+          "parent": null,
+          "shape": "rectangle",
+          "style": {
+            "size": "lg",
+            "textSize": "sm",
+          },
+          "tags": [],
+          "technology": null,
+          "title": "cloud",
+        },
+      ],
+      "tags": [],
+      "title": "Index",
+    },
+  },
+}

package/src/builder/__snapshots__/Builder-style2.spec.ts.snap

@@ -2,15 +2,16 @@
 
 exports[`Builder (style 2) > should build  1`] = `
 {
+  "_stage": "parsed",
   "deployments": {
     "elements": {
       "dev": {
-        "color": "primary",
         "description": null,
         "id": "dev",
         "kind": "env",
-        "shape": "rectangle",
         "style": {
+          "color": "primary",
+          "shape": "rectangle",
           "size": "lg",
         },
         "tags": null,
@@ -18,23 +19,24 @@ exports[`Builder (style 2) > should build  1`] = `
         "title": "dev",
       },
       "dev.local": {
-        "color": "primary",
         "description": null,
         "id": "dev.local",
         "kind": "node",
-        "shape": "rectangle",
-        "style": {},
+        "style": {
+          "color": "primary",
+          "shape": "rectangle",
+        },
         "tags": null,
         "technology": null,
         "title": "local",
       },
       "prod": {
-        "color": "primary",
         "description": null,
         "id": "prod",
         "kind": "env",
-        "shape": "rectangle",
         "style": {
+          "color": "primary",
+          "shape": "rectangle",
           "size": "lg",
         },
         "tags": null,
@@ -42,12 +44,13 @@ exports[`Builder (style 2) > should build  1`] = `
         "title": "prod",
       },
       "prod.eu": {
-        "color": "primary",
         "description": null,
         "id": "prod.eu",
         "kind": "node",
-        "shape": "rectangle",
-        "style": {},
+        "style": {
+          "color": "primary",
+          "shape": "rectangle",
+        },
         "tags": null,
         "technology": null,
         "title": "eu",
@@ -71,7 +74,7 @@ exports[`Builder (style 2) > should build  1`] = `
         "size": "lg",
         "textSize": "sm",
       },
-      "tags": null,
+      "tags": [],
       "technology": null,
       "title": "cloud",
     },
@@ -83,7 +86,7 @@ exports[`Builder (style 2) > should build  1`] = `
       "links": null,
       "shape": "rectangle",
       "style": {},
-      "tags": null,
+      "tags": [],
       "technology": null,
       "title": "ui",
     },
@@ -95,7 +98,9 @@ exports[`Builder (style 2) > should build  1`] = `
       "links": null,
       "shape": "rectangle",
       "style": {},
-      "tags": null,
+      "tags": [
+        "tag3",
+      ],
       "technology": null,
       "title": "customer",
     },
@@ -106,8 +111,10 @@ exports[`Builder (style 2) > should build  1`] = `
     "styles": {},
   },
   "imports": {},
+  "projectId": "from-builder",
   "relations": {},
   "specification": {
+    "customColors": {},
     "deployments": {
       "env": {
         "style": {
@@ -117,7 +124,11 @@ exports[`Builder (style 2) > should build  1`] = `
       "node": {},
     },
     "elements": {
-      "actor": {},
+      "actor": {
+        "tags": [
+          "tag3",
+        ],
+      },
       "component": {},
       "system": {
         "style": {
@@ -127,12 +138,22 @@ exports[`Builder (style 2) > should build  1`] = `
       },
     },
     "relationships": {},
-    "tags": [],
+    "tags": {
+      "tag1": {
+        "color": "#FFF",
+      },
+      "tag2": {
+        "color": "primary",
+      },
+      "tag3": {
+        "color": "primary",
+      },
+    },
   },
   "views": {
     "cloud": {
-      "__": "element",
-      "customColorDefinitions": {},
+      "_stage": "parsed",
+      "_type": "element",
       "description": null,
       "id": "cloud",
       "links": null,
@@ -153,13 +174,13 @@ exports[`Builder (style 2) > should build  1`] = `
           ],
         },
       ],
-      "tags": null,
+      "tags": [],
       "title": null,
       "viewOf": "cloud.ui",
     },
     "deployment": {
-      "__": "deployment",
-      "customColorDefinitions": {},
+      "_stage": "parsed",
+      "_type": "deployment",
       "description": null,
       "id": "deployment",
       "links": null,
@@ -175,12 +196,12 @@ exports[`Builder (style 2) > should build  1`] = `
           ],
         },
       ],
-      "tags": null,
+      "tags": [],
       "title": "Deployment",
     },
     "index": {
-      "__": "element",
-      "customColorDefinitions": {},
+      "_stage": "parsed",
+      "_type": "element",
       "description": null,
       "id": "index",
       "links": null,
@@ -196,7 +217,7 @@ exports[`Builder (style 2) > should build  1`] = `
           ],
         },
       ],
-      "tags": null,
+      "tags": [],
       "title": "Index",
     },
   },

package/src/builder/_types.ts

@@ -1,37 +1,44 @@
-import type { IfNever, IsLiteral, IsStringLiteral, Tagged, TupleToUnion } from 'type-fest'
-import type { LikeC4Model } from '../model/LikeC4Model'
+import type { IfNever, IsLiteral, Tagged, TupleToUnion } from 'type-fest'
 import type {
+  AnyAux,
+  Aux,
   BorderStyle,
-  Color,
-  DeploymentNodeKindSpecification,
-  ElementKindSpecification,
   ElementShape,
+  ElementSpecification as ElementKindSpecification,
+  Expression,
   KeysOf,
   NonEmptyArray,
-  ParsedLikeC4ModelData,
   RelationshipArrowType,
-  RelationshipKindSpecification,
   RelationshipLineType,
+  RelationshipSpecification as RelationshipKindSpecification,
   ShapeSize,
   SpacingSize,
+  SpecAux,
+  TagSpecification,
   TextSize,
+  ThemeColor as Color,
 } from '../types'
-import type { ExpressionV2 } from '../types/expression-v2'
 import type { Builder } from './Builder'
 import type { DeploymentRulesBuilderOp } from './Builder.view-deployment'
 
+type ElementSpecification = Omit<ElementKindSpecification, 'tags'> & {
+  tags?: string[]
+}
+
 export type BuilderSpecification = {
   elements: {
-    [kind: string]: Partial<ElementKindSpecification>
+    [kind: string]: Partial<ElementSpecification>
   }
   relationships?: {
     [kind: string]: Partial<RelationshipKindSpecification>
   }
   deployments?: {
-    [kind: string]: Partial<DeploymentNodeKindSpecification>
+    [kind: string]: Partial<ElementSpecification>
   }
-  tags?: [string, ...string[]]
-  metadataKeys?: [string, ...string[]]
+  tags?: {
+    [kind: string]: Partial<TagSpecification>
+  }
+  metadataKeys?: string[]
 }
 
 export type Metadata<MetadataKey extends string> = IfNever<MetadataKey, never, Record<MetadataKey, string>>
@@ -104,7 +111,7 @@ export type Warn<Id, Existing> = IsLiteral<Existing> extends true ? Id extends E
 export type ValidId<Id> =
   // Id extends `${string}.${string}` ? Invalid<'Id must not contain dot'>
   Id extends `${number}${string}` ? Invalid<'Id must not start with number'>
-    : IsStringLiteral<Id> extends true ? Id
+    : IsLiteral<Id> extends true ? Id
     : Invalid<'Id must be a literal'>
 
 /**
@@ -196,7 +203,7 @@ export namespace Types {
       never,
       never,
       KeysOf<Spec['relationships']>,
-      TupleToUnion<Spec['tags']>,
+      KeysOf<Spec['tags']>,
       TupleToUnion<Spec['metadataKeys']>,
       KeysOf<Spec['deployments']>,
       never
@@ -275,23 +282,23 @@ export namespace Types {
       >
     : never
 
-  export type ToParsedLikeC4Model<T> = T extends AnyTypes ? ParsedLikeC4ModelData<
-      T['ElementKind'],
-      T['RelationshipKind'],
-      T['Tag'],
+  export type ToAux<T> = T extends AnyTypes ? Aux<
+      'parsed',
       T['Fqn'],
+      T['DeploymentFqn'],
       T['ViewId'],
-      T['DeploymentFqn']
+      'from-builder',
+      SpecAux<
+        T['ElementKind'],
+        T['DeploymentKind'],
+        T['RelationshipKind'],
+        T['Tag'],
+        T['MetadataKey']
+      >
     >
-    : never
-
-  export type ToLikeC4Model<T extends AnyTypes> = LikeC4Model.Computed<
-    T['Fqn'],
-    T['DeploymentFqn'],
-    T['ViewId']
-  >
+    : AnyAux
 
-  export type ToExpression<T> = T extends AnyTypes ? ExpressionV2<T['DeploymentFqn'], T['Fqn']> : never
+  export type ToExpression<T> = T extends AnyTypes ? Expression<ToAux<T>> : never
 
   export type From<B> = B extends Builder<infer T> ? B['Types'] extends AnyTypes ? T : AnyTypes : never