@likec4/core 1.30.0 → 1.32.0

package/src/builder/Builder.view-deployment.ts

@@ -1,5 +1,5 @@
 import { isString } from 'remeda'
-import { type ExpressionV2, type Fqn } from '../types'
+import { type DeploymentFqn, type Expression } from '../types'
 import type { AnyTypes, Types } from './_types'
 import type { LikeC4ViewBuilder, ViewPredicate } from './Builder.view-common'
 import type { ViewsBuilder } from './Builder.views'
@@ -10,7 +10,7 @@ export interface DeploymentViewBuilder<T extends AnyTypes>
 }
 
 export type DeploymentRulesBuilderOp<Types extends AnyTypes> = (
-  b: DeploymentViewBuilder<Types>
+  b: DeploymentViewBuilder<Types>,
 ) => DeploymentViewBuilder<Types>
 
 export interface AddDeploymentViewRules<Id extends string> {
@@ -25,48 +25,48 @@ export interface AddDeploymentViewRules<Id extends string> {
 export interface AddDeploymentViewHelper {
   <
     const Id extends string,
-    T extends AnyTypes
+    T extends AnyTypes,
   >(
-    id: Id
+    id: Id,
   ): AddDeploymentViewRules<Id> & {
     (builder: ViewsBuilder<T>): ViewsBuilder<Types.AddView<T, Id>>
   }
 
   <
     const Id extends string,
-    T extends AnyTypes
+    T extends AnyTypes,
   >(
     id: Id,
-    bulder: (b: DeploymentViewBuilder<T>) => DeploymentViewBuilder<T>
+    bulder: (b: DeploymentViewBuilder<T>) => DeploymentViewBuilder<T>,
   ): (builder: ViewsBuilder<T>) => ViewsBuilder<Types.AddView<T, Id>>
 
   <
     const Id extends string,
-    T extends AnyTypes
+    T extends AnyTypes,
   >(
     id: Id,
-    propsOrTitle: T['NewViewProps'] | string
+    propsOrTitle: T['NewViewProps'] | string,
   ): AddDeploymentViewRules<Id> & {
     (builder: ViewsBuilder<T>): ViewsBuilder<Types.AddView<T, Id>>
   }
 
   <
     const Id extends string,
-    T extends AnyTypes
+    T extends AnyTypes,
   >(
     id: Id,
     propsOrTitle: T['NewViewProps'] | string,
-    bulder: (b: DeploymentViewBuilder<T>) => DeploymentViewBuilder<T>
+    bulder: (b: DeploymentViewBuilder<T>) => DeploymentViewBuilder<T>,
   ): (builder: ViewsBuilder<T>) => ViewsBuilder<Types.AddView<T, Id>>
 }
 
 export function $deploymentExpr<T extends AnyTypes>(
-  expr: ViewPredicate.DeploymentExpression<T> | ExpressionV2
+  expr: ViewPredicate.DeploymentExpression<T> | Expression,
 ): Types.ToExpression<T> {
   if (!isString(expr)) {
     return expr as any
   }
-  const asTypedDeploymentExpression = (expr: ExpressionV2): Types.ToExpression<T> => {
+  const asTypedDeploymentExpression = (expr: Expression): Types.ToExpression<T> => {
     return expr as any
   }
 
@@ -76,16 +76,16 @@ export function $deploymentExpr<T extends AnyTypes>(
   if (expr.startsWith('->')) {
     if (expr.endsWith('->')) {
       return asTypedDeploymentExpression({
-        inout: $deploymentExpr(expr.replace(/->/g, '').trim()) as any
+        inout: $deploymentExpr(expr.replace(/->/g, '').trim()) as any,
       })
     }
     return asTypedDeploymentExpression({
-      incoming: $deploymentExpr(expr.replace('-> ', '')) as any
+      incoming: $deploymentExpr(expr.replace('-> ', '')) as any,
     })
   }
   if (expr.endsWith(' ->')) {
     return asTypedDeploymentExpression({
-      outgoing: $deploymentExpr(expr.replace(' ->', '')) as any
+      outgoing: $deploymentExpr(expr.replace(' ->', '')) as any,
     })
   }
   if (expr.includes(' <-> ')) {
@@ -93,43 +93,43 @@ export function $deploymentExpr<T extends AnyTypes>(
     return asTypedDeploymentExpression({
       source: $deploymentExpr(source) as any,
       target: $deploymentExpr(target) as any,
-      isBidirectional: true
+      isBidirectional: true,
     })
   }
   if (expr.includes(' -> ')) {
     const [source, target] = expr.split(' -> ')
     return asTypedDeploymentExpression({
       source: $deploymentExpr(source) as any,
-      target: $deploymentExpr(target) as any
+      target: $deploymentExpr(target) as any,
     })
   }
   if (expr.endsWith('._')) {
     return asTypedDeploymentExpression({
       ref: {
-        deployment: expr.replace('._', '') as Fqn
+        deployment: expr.replace('._', '') as DeploymentFqn,
       },
-      selector: 'expanded'
+      selector: 'expanded',
     })
   }
   if (expr.endsWith('.**')) {
     return asTypedDeploymentExpression({
       ref: {
-        deployment: expr.replace('.**', '') as Fqn
+        deployment: expr.replace('.**', '') as DeploymentFqn,
       },
-      selector: 'descendants'
+      selector: 'descendants',
     })
   }
   if (expr.endsWith('.*')) {
     return asTypedDeploymentExpression({
       ref: {
-        deployment: expr.replace('.*', '') as Fqn
+        deployment: expr.replace('.*', '') as DeploymentFqn,
       },
-      selector: 'children'
+      selector: 'children',
     })
   }
   return asTypedDeploymentExpression({
     ref: {
-      deployment: expr as any as Fqn
-    }
+      deployment: expr as DeploymentFqn,
+    },
   })
 }

package/src/builder/Builder.view-element.ts

@@ -1,12 +1,13 @@
 import { isString } from 'remeda'
-import type { IsStringLiteral } from 'type-fest/source/is-literal'
-import { type ExpressionV2 } from '../types/expression-v2'
-import { type Fqn } from '../types/scalars'
+import type { IsLiteral } from 'type-fest'
+import { type Expression, type Fqn } from '../types'
 import type { AnyTypes, Invalid, Types } from './_types'
 import type { LikeC4ViewBuilder, ViewPredicate } from './Builder.view-common'
 import type { ViewsBuilder } from './Builder.views'
 
-export interface ElementViewBuilder<T extends AnyTypes> extends LikeC4ViewBuilder<T, T['Fqn'], Types.ToExpression<T>> {
+export interface ElementViewBuilder<T extends AnyTypes>
+  extends LikeC4ViewBuilder<T, T['Fqn'], Expression<Types.ToAux<T>>>
+{
 }
 
 export type ElementViewRulesBuilder<T extends AnyTypes> = (b: ElementViewBuilder<T>) => ElementViewBuilder<T>
@@ -59,8 +60,8 @@ export interface AddViewHelper {
   }
 }
 
-type ValidFqn<T extends AnyTypes> = IsStringLiteral<T['Fqn']> extends true ? T['Fqn']
-  : Invalid<'Fqn must be from known'>
+type ValidFqn<T extends AnyTypes> = IsLiteral<T['Fqn']> extends true ? T['Fqn']
+  : Invalid<'Fqn must be a literal'>
 
 export interface AddViewOfHelper {
   <
@@ -126,15 +127,15 @@ export interface TypedAddViewOfHelper<A extends AnyTypes> {
   }
 }
 // To hook types
-const asTypedExpr = (expr: ExpressionV2): ExpressionV2 => {
-  return expr as ExpressionV2
+const asTypedExpr = <T extends AnyTypes>(expr: Expression): Expression<Types.ToAux<T>> => {
+  return expr as Expression<Types.ToAux<T>>
 }
 
-export function $expr<Types extends AnyTypes>(
-  expr: ViewPredicate.Expression<Types> | ExpressionV2,
-): ExpressionV2 {
+export function $expr<T extends AnyTypes>(
+  expr: ViewPredicate.Expression<T> | Expression,
+): Expression<Types.ToAux<T>> {
   if (!isString(expr)) {
-    return expr as ExpressionV2
+    return expr as Expression<Types.ToAux<T>>
   }
   if (expr === '*') {
     return asTypedExpr({ wildcard: true })

package/src/builder/Builder.views.ts

@@ -1,15 +1,20 @@
 import type { Simplify, Writable } from 'type-fest'
-import type { DeploymentView, ElementView, LikeC4View } from '../types'
+import {
+  type LikeC4View,
+  type ParsedDeploymentView as DeploymentView,
+  type ParsedElementView as ElementView,
+  _type,
+} from '../types'
 import type { AnyTypes } from './_types'
 import type { Builder } from './Builder'
 import type { $autoLayout, $exclude, $include, $rules, $style } from './Builder.view-common'
-import { $deploymentExpr, type AddDeploymentViewHelper, type DeploymentViewBuilder } from './Builder.view-deployment'
+import { type AddDeploymentViewHelper, type DeploymentViewBuilder, $deploymentExpr } from './Builder.view-deployment'
 import {
-  $expr,
   type AddViewHelper,
   type AddViewOfHelper,
   type ElementViewBuilder,
   type TypedAddViewOfHelper,
+  $expr,
 } from './Builder.view-element'
 
 export interface ViewsBuilder<T extends AnyTypes> extends Builder<T> {
@@ -352,13 +357,13 @@ export type ViewsBuilderFunction<A extends AnyTypes, B extends AnyTypes> = (
   | ((builder: ViewsBuilder<A>) => ViewsBuilder<B>)
   | ((builder: Builder<A>) => Builder<B>)
 
-export function mkViewBuilder(view: Writable<DeploymentView>): DeploymentViewBuilder<AnyTypes>
-export function mkViewBuilder(view: Writable<ElementView>): ElementViewBuilder<AnyTypes>
+export function mkViewBuilder(view: Writable<DeploymentView<any>>): DeploymentViewBuilder<AnyTypes>
+export function mkViewBuilder(view: Writable<ElementView<any>>): ElementViewBuilder<AnyTypes>
 export function mkViewBuilder(
-  view: Writable<ElementView | DeploymentView>,
+  view: Writable<ElementView<any> | DeploymentView<any>>,
 ): DeploymentViewBuilder<AnyTypes> | ElementViewBuilder<AnyTypes> {
   const viewBuilder = {
-    $expr: view.__ === 'deployment' ? $deploymentExpr : $expr,
+    $expr: view[_type] === 'deployment' ? $deploymentExpr : $expr,
     autoLayout(autoLayout: unknown) {
       view.rules.push({
         direction: autoLayout,

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

@@ -2,6 +2,7 @@
 
 exports[`Builder (style1) > should build nested elements and relTo 1`] = `
 {
+  "_stage": "parsed",
   "deployments": {
     "elements": {},
     "relations": {},
@@ -18,7 +19,7 @@ exports[`Builder (style1) > should build nested elements and relTo 1`] = `
         "opacity": 10,
         "size": "lg",
       },
-      "tags": null,
+      "tags": [],
       "technology": null,
       "title": "s1",
     },
@@ -32,7 +33,7 @@ exports[`Builder (style1) > should build nested elements and relTo 1`] = `
       "style": {
         "textSize": "sm",
       },
-      "tags": null,
+      "tags": [],
       "technology": null,
       "title": "c1",
     },
@@ -47,7 +48,7 @@ exports[`Builder (style1) > should build nested elements and relTo 1`] = `
         "opacity": 10,
         "size": "lg",
       },
-      "tags": null,
+      "tags": [],
       "technology": null,
       "title": "s2",
     },
@@ -61,7 +62,7 @@ exports[`Builder (style1) > should build nested elements and relTo 1`] = `
       "style": {
         "textSize": "sm",
       },
-      "tags": null,
+      "tags": [],
       "technology": null,
       "title": "Component s2.1",
     },
@@ -75,7 +76,7 @@ exports[`Builder (style1) > should build nested elements and relTo 1`] = `
       "style": {
         "textSize": "sm",
       },
-      "tags": null,
+      "tags": [],
       "technology": null,
       "title": "Component s2.1.2",
     },
@@ -89,7 +90,7 @@ exports[`Builder (style1) > should build nested elements and relTo 1`] = `
       "style": {
         "textSize": "sm",
       },
-      "tags": null,
+      "tags": [],
       "technology": null,
       "title": "c3",
     },
@@ -100,27 +101,41 @@ exports[`Builder (style1) > should build nested elements and relTo 1`] = `
     "styles": {},
   },
   "imports": {},
+  "projectId": "from-builder",
   "relations": {
     "rel1": {
       "id": "rel1",
-      "source": "s2.c1.c2.c3",
-      "target": "s1.c1",
+      "source": {
+        "model": "s2.c1.c2.c3",
+      },
+      "target": {
+        "model": "s1.c1",
+      },
       "title": "relation from s2.1.2.3 to s1.1",
     },
     "rel2": {
       "id": "rel2",
-      "source": "s2.c1",
-      "target": "s1.c1",
+      "source": {
+        "model": "s2.c1",
+      },
+      "target": {
+        "model": "s1.c1",
+      },
       "title": "relation from s2.1 to s1.1",
     },
     "rel3": {
       "id": "rel3",
-      "source": "s1.c1",
-      "target": "s2.c1.c2",
+      "source": {
+        "model": "s1.c1",
+      },
+      "target": {
+        "model": "s2.c1.c2",
+      },
       "title": "relation from s1.1 to s2.1.2",
     },
   },
   "specification": {
+    "customColors": {},
     "deployments": {},
     "elements": {
       "component": {
@@ -138,7 +153,14 @@ exports[`Builder (style1) > should build nested elements and relTo 1`] = `
       },
     },
     "relationships": {},
-    "tags": [],
+    "tags": {
+      "tag1": {
+        "color": "#FFF",
+      },
+      "tag2": {
+        "color": "primary",
+      },
+    },
   },
   "views": {},
 }
@@ -146,6 +168,7 @@ exports[`Builder (style1) > should build nested elements and relTo 1`] = `
 
 exports[`Builder (style1) > should build view  1`] = `
 {
+  "_stage": "parsed",
   "deployments": {
     "elements": {},
     "relations": {},
@@ -159,7 +182,7 @@ exports[`Builder (style1) > should build view  1`] = `
       "links": null,
       "shape": "rectangle",
       "style": {},
-      "tags": null,
+      "tags": [],
       "technology": null,
       "title": "c1",
     },
@@ -171,7 +194,7 @@ exports[`Builder (style1) > should build view  1`] = `
       "links": null,
       "shape": "rectangle",
       "style": {},
-      "tags": null,
+      "tags": [],
       "technology": null,
       "title": "c2",
     },
@@ -183,7 +206,7 @@ exports[`Builder (style1) > should build view  1`] = `
       "links": null,
       "shape": "rectangle",
       "style": {},
-      "tags": null,
+      "tags": [],
       "technology": null,
       "title": "c3",
     },
@@ -194,19 +217,21 @@ exports[`Builder (style1) > should build view  1`] = `
     "styles": {},
   },
   "imports": {},
+  "projectId": "from-builder",
   "relations": {},
   "specification": {
+    "customColors": {},
     "deployments": {},
     "elements": {
       "component": {},
     },
     "relationships": {},
-    "tags": [],
+    "tags": {},
   },
   "views": {
     "1": {
-      "__": "element",
-      "customColorDefinitions": {},
+      "_stage": "parsed",
+      "_type": "element",
       "description": null,
       "id": "1",
       "links": null,
@@ -219,12 +244,12 @@ exports[`Builder (style1) > should build view  1`] = `
           ],
         },
       ],
-      "tags": null,
+      "tags": [],
       "title": "View 1",
     },
     "2": {
-      "__": "element",
-      "customColorDefinitions": {},
+      "_stage": "parsed",
+      "_type": "element",
       "description": null,
       "id": "2",
       "links": null,
@@ -247,12 +272,12 @@ exports[`Builder (style1) > should build view  1`] = `
           ],
         },
       ],
-      "tags": null,
+      "tags": [],
       "title": "view 2",
     },
     "3": {
-      "__": "element",
-      "customColorDefinitions": {},
+      "_stage": "parsed",
+      "_type": "element",
       "description": null,
       "id": "3",
       "links": null,
@@ -268,7 +293,7 @@ exports[`Builder (style1) > should build view  1`] = `
           ],
         },
       ],
-      "tags": null,
+      "tags": [],
       "title": "",
     },
   },
@@ -277,6 +302,7 @@ exports[`Builder (style1) > should build view  1`] = `
 
 exports[`Builder (style1) > should build viewOf  1`] = `
 {
+  "_stage": "parsed",
   "deployments": {
     "elements": {},
     "relations": {},
@@ -290,7 +316,7 @@ exports[`Builder (style1) > should build viewOf  1`] = `
       "links": null,
       "shape": "rectangle",
       "style": {},
-      "tags": null,
+      "tags": [],
       "technology": null,
       "title": "c1",
     },
@@ -302,7 +328,7 @@ exports[`Builder (style1) > should build viewOf  1`] = `
       "links": null,
       "shape": "rectangle",
       "style": {},
-      "tags": null,
+      "tags": [],
       "technology": null,
       "title": "c2",
     },
@@ -314,7 +340,7 @@ exports[`Builder (style1) > should build viewOf  1`] = `
       "links": null,
       "shape": "rectangle",
       "style": {},
-      "tags": null,
+      "tags": [],
       "technology": null,
       "title": "c3",
     },
@@ -326,7 +352,7 @@ exports[`Builder (style1) > should build viewOf  1`] = `
       "links": null,
       "shape": "rectangle",
       "style": {},
-      "tags": null,
+      "tags": [],
       "technology": null,
       "title": "c4",
     },
@@ -337,19 +363,21 @@ exports[`Builder (style1) > should build viewOf  1`] = `
     "styles": {},
   },
   "imports": {},
+  "projectId": "from-builder",
   "relations": {},
   "specification": {
+    "customColors": {},
     "deployments": {},
     "elements": {
       "component": {},
     },
     "relationships": {},
-    "tags": [],
+    "tags": {},
   },
   "views": {
     "1": {
-      "__": "element",
-      "customColorDefinitions": {},
+      "_stage": "parsed",
+      "_type": "element",
       "description": null,
       "id": "1",
       "links": null,
@@ -392,7 +420,7 @@ exports[`Builder (style1) > should build viewOf  1`] = `
           ],
         },
       ],
-      "tags": null,
+      "tags": [],
       "title": "View 1",
       "viewOf": "c1",
     },