@likec4/core 1.30.0 → 1.32.0

package/dist/builder/index.mjs

@@ -1,9 +1,13 @@
-import { a as i, l, d, L as LikeC4Model } from '../shared/core.CAcZ6_cP.mjs';
-import { m, l as l$1, i as i$1 } from '../shared/core.Cu-UdkSl.mjs';
-import { f as t, n as nameFromFqn, g as isSameHierarchy, p as parentFqn, h as t$1 } from '../shared/core.CQXU9DF7.mjs';
-import { o, M as ModelLayer, D as DefaultElementShape, b as DefaultThemeColor, n as n$1, c as DeploymentElement, d as isScopedElementView } from '../shared/core.DgfwjBtu.mjs';
+import { i, l, d, c as computeLikeC4Model } from '../shared/core.CBpKAlhj.mjs';
+import { m, i as i$1 } from '../shared/core.DoK86JEe.mjs';
+import { _ as _type, D as DefaultElementShape, a as DefaultThemeColor, n as n$1, b as _stage, i as isDeployedInstance, F as FqnRef } from '../shared/core.CUYDgv2-.mjs';
+import { n as nameFromFqn, d as isSameHierarchy, p as parentFqn, t as t$2 } from '../shared/core.rmvsy0n3.mjs';
+import { l as l$1 } from '../shared/core.CpXlRyE5.mjs';
 import { u } from '../shared/core.DbRvwARP.mjs';
-import { i as invariant } from '../shared/core.C-YXI-43.mjs';
+import { t as t$1 } from '../shared/core.cbA9VZ02.mjs';
+import { t, i as invariant } from '../shared/core.Cy9smucx.mjs';
+import { o, M as ModelFqnExpr, a as isElementView } from '../shared/core.Bk7wEZFG.mjs';
+import '../shared/core.BrCnZFTn.mjs';
 
 function n(...r){return u(Object.fromEntries,r)}
 
@@ -93,12 +97,16 @@ function parseWhere(where) {
         };
       case op.startsWith("source."):
         return {
-          operator: parseWhere(op.replace("source.", "")),
+          operator: parseWhere(
+            op.replace("source.", "")
+          ),
           participant: "source"
         };
       case op.startsWith("target."):
         return {
-          operator: parseWhere(op.replace("target.", "")),
+          operator: parseWhere(
+            op.replace("target.", "")
+          ),
           participant: "target"
         };
       default:
@@ -137,7 +145,7 @@ function $include(...args) {
       }
       const custom = args[1].with;
       if (custom) {
-        const isElement = ModelLayer.FqnExpr.is(expr);
+        const isElement = ModelFqnExpr.is(expr);
         if (isElement) {
           expr = {
             custom: {
@@ -335,7 +343,7 @@ function $expr(expr) {
 
 function mkViewBuilder(view) {
   const viewBuilder = {
-    $expr: view.__ === "deployment" ? $deploymentExpr : $expr,
+    $expr: view[_type] === "deployment" ? $deploymentExpr : $expr,
     autoLayout(autoLayout) {
       view.rules.push({
         direction: autoLayout
@@ -370,23 +378,52 @@ function mkViewBuilder(view) {
   return viewBuilder;
 }
 
+function validateSpec(specification) {
+  for (const [kind, spec] of t$1(specification.elements)) {
+    if (spec.tags) {
+      for (const tag of spec.tags) {
+        invariant(specification.tags?.[tag], `Invalid specification for element kind "${kind}": tag "${tag}" not found`);
+      }
+    }
+  }
+  if (specification.deployments) {
+    for (const [kind, spec] of t$1(specification.deployments)) {
+      if (spec.tags) {
+        for (const tag of spec.tags) {
+          invariant(
+            specification.tags?.[tag],
+            `Invalid specification for deployment kind "${kind}": tag "${tag}" not found`
+          );
+        }
+      }
+    }
+  }
+}
 function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _views = /* @__PURE__ */ new Map(), _globals = {
   predicates: {},
   dynamicPredicates: {},
   styles: {}
 }, _deployments = /* @__PURE__ */ new Map(), _deploymentRelations = []) {
-  const toLikeC4Specification = () => ({
-    elements: {
-      ...structuredClone(spec.elements)
-    },
-    deployments: {
-      ...structuredClone(spec.deployments)
-    },
-    relationships: {
-      ...structuredClone(spec.relationships)
-    },
-    tags: spec.tags ?? []
-  });
+  const toLikeC4Specification = () => {
+    validateSpec(spec);
+    return {
+      elements: {
+        ...structuredClone(spec.elements)
+      },
+      deployments: {
+        ...structuredClone(spec.deployments)
+      },
+      relationships: {
+        ...structuredClone(spec.relationships)
+      },
+      tags: i(spec.tags ?? {}, (tagSpec) => ({
+        color: DefaultThemeColor,
+        ...tagSpec
+      })),
+      ...!!spec.metadataKeys ? { metadataKeys: spec.metadataKeys } : {},
+      customColors: {}
+    };
+  };
   const mapLinks = (links) => {
     if (!links || !i$1(links, 1)) {
       return null;
@@ -394,7 +431,7 @@ function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _
     return m(links, (l) => typeof l === "string" ? { url: l } : l);
   };
   const createGenericView = (id, _props, builder2) => {
-    if (t$1(_props)) {
+    if (t$2(_props)) {
       builder2 = _props;
       _props = {};
     }
@@ -403,7 +440,7 @@ function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _
       links: _links = [],
       title = null,
       description = null,
-      tags = null,
+      tags = [],
       ...props
     } = typeof _props === "string" ? { title: _props } : { ..._props };
     const links = mapLinks(_links);
@@ -413,7 +450,8 @@ function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _
       description,
       tags,
       links,
-      customColorDefinitions: {},
+      _stage: "parsed",
+      // customColorDefinitions: {},
       ...props
     }, builder2];
   };
@@ -447,9 +485,9 @@ function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _
       return self;
     },
     __addRelation(relation) {
-      const sourceEl = _elements.get(relation.source);
+      const sourceEl = _elements.get(FqnRef.flatten(relation.source));
       invariant(sourceEl, `Element with id "${relation.source}" not found`);
-      const targetEl = _elements.get(relation.target);
+      const targetEl = _elements.get(FqnRef.flatten(relation.target));
       invariant(targetEl, `Element with id "${relation.target}" not found`);
       invariant(
         !isSameHierarchy(sourceEl, targetEl),
@@ -461,13 +499,14 @@ function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _
       });
       return self;
     },
-    /**
-     * Fully qualified name for nested elements
-     */
     __fqn(id) {
       invariant(id.trim() !== "", "Id must be non-empty");
       return id;
     },
+    __deploymentFqn(id) {
+      invariant(id.trim() !== "", "Id must be non-empty");
+      return id;
+    },
     __addSourcelessRelation() {
       throw new Error("Can be called only in nested model");
     },
@@ -475,7 +514,7 @@ function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _
       if (_views.has(view.id)) {
         throw new Error(`View with id "${view.id}" already exists`);
       }
-      if (isScopedElementView(view)) {
+      if (isElementView(view) && "viewOf" in view) {
         invariant(
           _elements.get(view.viewOf),
           `Invalid scoped view ${view.id}, wlement with id "${view.viewOf}" not found`
@@ -495,7 +534,7 @@ function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _
           `Parent element with id "${parent}" not found for node with id "${node.id}"`
         );
       }
-      if (DeploymentElement.isInstance(node)) {
+      if (isDeployedInstance(node)) {
         invariant(parent, `Instance ${node.id} of ${node.element} must be deployed under a parent node`);
         invariant(
           _elements.get(node.element),
@@ -507,16 +546,16 @@ function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _
     },
     __addDeploymentRelation: (relation) => {
       invariant(
-        !isSameHierarchy(relation.source.id, relation.target.id),
+        !isSameHierarchy(relation.source.deployment, relation.target.deployment),
         "Cannot create relationship between elements in the same hierarchy"
       );
       invariant(
-        _deployments.has(relation.source.id),
-        `Relation "${relation.source.id} -> ${relation.target.id}" references non-existing source`
+        _deployments.has(relation.source.deployment),
+        `Relation "${relation.source.deployment} -> ${relation.target.deployment}" references non-existing source`
       );
       invariant(
-        _deployments.has(relation.target.id),
-        `Relation "${relation.source.id} -> ${relation.target.id}" references non-existing target`
+        _deployments.has(relation.target.deployment),
+        `Relation "${relation.source.deployment} -> ${relation.target.deployment}" references non-existing target`
       );
       _deploymentRelations.push({
         id: `deploy_rel${_deploymentRelations.length + 1}`,
@@ -525,6 +564,8 @@ function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _
       return self;
     },
     build: () => ({
+      [_stage]: "parsed",
+      projectId: "from-builder",
       specification: toLikeC4Specification(),
       elements: n(
         structuredClone(
@@ -550,7 +591,7 @@ function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _
     }),
     toLikeC4Model: () => {
       const parsed = self.build();
-      return LikeC4Model.compute(parsed);
+      return computeLikeC4Model(parsed);
     },
     helpers: () => ({
       model: {
@@ -571,8 +612,12 @@ function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _
             );
             const links = mapLinks(_links);
             b.__addRelation({
-              source,
-              target,
+              source: {
+                model: source
+              },
+              target: {
+                model: target
+              },
               title,
               ...links && { links },
               ...props
@@ -592,7 +637,9 @@ function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _
             );
             const links = mapLinks(_links);
             b.__addSourcelessRelation({
-              target,
+              target: {
+                model: target
+              },
               title,
               ...links && { links },
               ...props
@@ -620,7 +667,7 @@ function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _
                 title: title ?? nameFromFqn(_id),
                 description: null,
                 technology: null,
-                tags: null,
+                tags: [],
                 color: specStyle?.color ?? DefaultThemeColor,
                 shape: specStyle?.shape ?? DefaultElementShape,
                 style: d({
@@ -646,7 +693,9 @@ function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _
                 b.__addSourcelessRelation = (relation) => {
                   return b.__addRelation({
                     ...relation,
-                    source: __fqn(id)
+                    source: {
+                      model: __fqn(id)
+                    }
                   });
                 };
                 ops.reduce((b2, op) => op(b2), b);
@@ -670,7 +719,7 @@ function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _
           const [generic, builder2] = createGenericView(id, _props, _builder);
           const view = {
             ...generic,
-            __: "element",
+            [_type]: "element",
             rules: []
           };
           const add = (b) => {
@@ -695,7 +744,7 @@ function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _
           const view = {
             ...generic,
             viewOf,
-            __: "element",
+            [_type]: "element",
             rules: []
           };
           const add = (b) => {
@@ -719,7 +768,7 @@ function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _
           const [generic, builder2] = createGenericView(id, _props, _builder);
           const view = {
             ...generic,
-            __: "deployment",
+            [_type]: "deployment",
             rules: []
           };
           const add = (b) => {
@@ -768,7 +817,7 @@ function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _
               title,
               ...props
             } = typeof _props === "string" ? { title: _props } : { ..._props };
-            const _id = b.__fqn(id);
+            const _id = b.__deploymentFqn(id);
             invariant(_elements.has(target), `Target element with id "${target}" not found`);
             b.__addDeployment({
               id: _id,
@@ -783,18 +832,18 @@ function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _
         rel: (source, target, _props) => {
           return (b) => {
             const {
-              title,
+              title = null,
               links,
               ...props
             } = typeof _props === "string" ? { title: _props } : { ..._props };
             b.__addDeploymentRelation({
               source: {
-                id: source
+                deployment: source
               },
               target: {
-                id: target
+                deployment: target
               },
-              ...title && { title },
+              title,
               ...links && { links: mapLinks(links) },
               ...props
             });
@@ -813,7 +862,7 @@ function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _
                 ...props
               } = typeof _props === "string" ? { title: _props } : { ..._props };
               const icon = _icon ?? specStyle?.icon;
-              const _id = b.__fqn(id);
+              const _id = b.__deploymentFqn(id);
               b.__addDeployment({
                 id: _id,
                 kind,
@@ -821,18 +870,20 @@ function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _
                 description: null,
                 technology: null,
                 tags: null,
-                color: specStyle?.color ?? DefaultThemeColor,
-                shape: specStyle?.shape ?? DefaultElementShape,
-                style: d({
-                  border: specStyle?.border,
-                  opacity: specStyle?.opacity,
-                  size: specStyle?.size,
-                  padding: specStyle?.padding,
-                  textSize: specStyle?.textSize,
-                  ...style
-                }, l$1),
+                style: {
+                  ...icon && { icon },
+                  color: specStyle?.color ?? DefaultThemeColor,
+                  shape: specStyle?.shape ?? DefaultElementShape,
+                  ...d({
+                    border: specStyle?.border,
+                    opacity: specStyle?.opacity,
+                    size: specStyle?.size,
+                    padding: specStyle?.padding,
+                    textSize: specStyle?.textSize,
+                    ...style
+                  }, l$1)
+                },
                 ...links && { links: mapLinks(links) },
-                ...icon && { icon },
                 ...spec2,
                 ...props
               });
@@ -840,12 +891,12 @@ function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _
             };
             add.with = (...ops) => (b) => {
               add(b);
-              const { __fqn } = b;
+              const { __deploymentFqn } = b;
               try {
-                b.__fqn = (child) => `${__fqn(id)}.${child}`;
+                b.__deploymentFqn = (child) => `${__deploymentFqn(id)}.${child}`;
                 ops.reduce((b2, op) => op(b2), b);
               } finally {
-                b.__fqn = __fqn;
+                b.__deploymentFqn = __deploymentFqn;
               }
               return b;
             };
@@ -883,6 +934,7 @@ function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _
 var Builder;
 ((Builder2) => {
   function forSpecification(spec) {
+    validateSpec(spec);
     const b = builder(spec);
     return {
       ...b.helpers(),
@@ -891,6 +943,7 @@ var Builder;
   }
   Builder2.forSpecification = forSpecification;
   function specification(spec) {
+    validateSpec(spec);
     return builder(spec);
   }
   Builder2.specification = specification;

package/dist/compute-view/index.d.mts

@@ -1,22 +1,38 @@
-export { C as ComputeViewResult, c as computeView, a as computeViews, u as unsafeComputeView } from '../shared/core.CiFKryGW.mjs';
-import { L as LikeC4View, C as ComputedLikeC4ModelData, a as ComputedView } from '../shared/core.DJvmfnEi.mjs';
+import { A as Any } from '../shared/core.BaYE_r29.mjs';
+import { L as LikeC4Model } from '../shared/core.CCWXGc6G.mjs';
+import { k as ParsedLikeC4ModelData, l as ComputedLikeC4ModelData, aF as ParsedView, aI as ComputedView } from '../shared/core.Dpq3P3YJ.mjs';
 import 'type-fest';
-import '../shared/core.SjLhMA7a.mjs';
+import '../shared/core.BuO4ncfY.mjs';
+import '../shared/core.CywrQs86.mjs';
+
+type ComputeViewResult<V> = {
+    isSuccess: true;
+    error?: undefined;
+    view: V;
+} | {
+    isSuccess: false;
+    error: Error;
+    view: undefined;
+};
+declare function unsafeComputeView<A extends Any>(viewsource: ParsedView<A>, likec4model: LikeC4Model<any>): ComputedView<A>;
+declare function computeView<A extends Any>(viewsource: ParsedView<A>, likec4model: LikeC4Model<A>): ComputeViewResult<ComputedView<A>>;
+declare function computeParsedModelData<A extends Any>(parsed: ParsedLikeC4ModelData<A>): ComputedLikeC4ModelData<A>;
+declare function computeLikeC4Model<A extends Any>(parsed: ParsedLikeC4ModelData<A>): LikeC4Model.Computed<A>;
 
 /**
  * Resolve rules of extended views
  * (Removes invalid views)
  */
-declare function resolveRulesExtendedViews<V extends Record<any, LikeC4View>>(unresolvedViews: V): V;
+declare function resolveRulesExtendedViews<A extends Any, V extends Record<any, ParsedView<A>>>(unresolvedViews: V): V;
 
 /**
  * Convert hashed edge ids to human-readable
  * Mostly for testing purposes
  */
-declare function withReadableEdges<T extends ComputedView>({ edges, nodes, ...view }: T, separator?: string): T & {
+declare function withReadableEdges<V extends ComputedView<any>>({ edges, nodes, ...view }: V, separator?: string): V & {
     nodeIds: string[];
     edgeIds: string[];
 };
-declare function viewsWithReadableEdges<M extends ComputedLikeC4ModelData>({ views, ...model }: M): M;
+declare function viewsWithReadableEdges<A extends Any>({ views, ...model }: ComputedLikeC4ModelData<A>): ComputedLikeC4ModelData<A>;
 
-export { resolveRulesExtendedViews, viewsWithReadableEdges, withReadableEdges };
+export { type ComputeViewResult, computeLikeC4Model, computeParsedModelData, computeView, resolveRulesExtendedViews, unsafeComputeView, viewsWithReadableEdges, withReadableEdges };

package/dist/compute-view/index.mjs

@@ -1,9 +1,14 @@
-import { G as Graph, r, w as willCreateCycle, t as topologicalSortExports, i as i$1, a as i$2, l } from '../shared/core.CAcZ6_cP.mjs';
-export { c as computeView, b as computeViews, u as unsafeComputeView } from '../shared/core.CAcZ6_cP.mjs';
-import { i as isExtendsElementView, a as isElementView } from '../shared/core.DgfwjBtu.mjs';
-import { e as isNonEmptyArray } from '../shared/core.CQXU9DF7.mjs';
-import { i, m } from '../shared/core.Cu-UdkSl.mjs';
+import { G as Graph, w as willCreateCycle, t as topologicalSortExports, i as i$2, l } from '../shared/core.CBpKAlhj.mjs';
+export { c as computeLikeC4Model, a as computeParsedModelData, b as computeView, u as unsafeComputeView } from '../shared/core.CBpKAlhj.mjs';
+import { r, i as i$1 } from '../shared/core.cbA9VZ02.mjs';
+import { i as isExtendsElementView, a as isElementView } from '../shared/core.Bk7wEZFG.mjs';
+import { c as isNonEmptyArray } from '../shared/core.rmvsy0n3.mjs';
+import { i, m } from '../shared/core.DoK86JEe.mjs';
 import { u } from '../shared/core.DbRvwARP.mjs';
+import '../shared/core.CpXlRyE5.mjs';
+import '../shared/core.Cy9smucx.mjs';
+import '../shared/core.CUYDgv2-.mjs';
+import '../shared/core.BrCnZFTn.mjs';
 
 function y(...t){return u(f,t)}function f(t,e){if(!i(e,1))return {...t};if(!i(e,2)){let{[e[0]]:r,...m}=t;return m}let o={...t};for(let r of e)delete o[r];return o}
 
@@ -56,7 +61,7 @@ function resolveRulesExtendedViews(unresolvedViews) {
       ...view,
       title: view.title ?? extendsFrom.title ?? null,
       description: view.description ?? extendsFrom.description ?? null,
-      tags: isNonEmptyArray(tags) ? tags : null,
+      tags,
       links: isNonEmptyArray(links) ? links : null,
       rules: [...extendsFrom.rules, ...view.rules]
     };

package/dist/compute-view/relationships-view/index.d.mts

@@ -1,9 +1,11 @@
-import { A as AnyAux, E as ElementModel, R as RelationshipModel, L as LikeC4Model } from '../../shared/core.CiFKryGW.mjs';
+import { A as Any, U as Unknown, g as ElementId, V as ViewId } from '../../shared/core.BaYE_r29.mjs';
+import { E as ElementModel, R as RelationshipModel, L as LikeC4Model } from '../../shared/core.CCWXGc6G.mjs';
 import 'type-fest';
-import '../../shared/core.SjLhMA7a.mjs';
-import '../../shared/core.DJvmfnEi.mjs';
+import '../../shared/core.BuO4ncfY.mjs';
+import '../../shared/core.CywrQs86.mjs';
+import '../../shared/core.Dpq3P3YJ.mjs';
 
-type RelationshipsViewData<M extends AnyAux = AnyAux> = {
+type RelationshipsViewData<M extends Any = Unknown> = {
     incomers: ReadonlySet<ElementModel<M>>;
     incoming: ReadonlySet<RelationshipModel<M>>;
     subjects: ReadonlySet<ElementModel<M>>;
@@ -11,11 +13,11 @@ type RelationshipsViewData<M extends AnyAux = AnyAux> = {
     outgoers: ReadonlySet<ElementModel<M>>;
 };
 
-declare function computeRelationshipsView<const M extends AnyAux>(subjectId: NoInfer<M['Element']>, likec4model: LikeC4Model<M>, scopeViewId: NoInfer<M['View']> | null, scope?: 'global' | 'view'): RelationshipsViewData<M>;
+declare function computeRelationshipsView<M extends Any>(subjectId: ElementId<M>, likec4model: LikeC4Model<M>, scopeViewId: ViewId<M> | null, scope?: 'global' | 'view'): RelationshipsViewData<M>;
 
-declare function treeFromElements<const M extends AnyAux>(elements: Iterable<ElementModel<M>>): {
+declare function treeFromElements<M extends Any>(elements: Iterable<ElementModel<M>>): {
     sorted: readonly ElementModel<M>[];
-    byId: (id: M["Element"]) => ElementModel<M>;
+    byId: (id: ElementId<M>) => ElementModel<M>;
     root: ReadonlySet<ElementModel<M>>;
     parent: (el: ElementModel<M>) => ElementModel<M> | null;
     children: (el: ElementModel<M>) => ReadonlyArray<ElementModel<M>>;

package/dist/compute-view/relationships-view/index.mjs

@@ -1,5 +1,6 @@
-import { s as sortParentsFirst, D as DefaultMap, i as isDescendantOf, a as isAncestor, t as toSet, b as toArray, c as ifilter, C, d as imap } from '../../shared/core.CQXU9DF7.mjs';
-import { n as nonNullable, i as invariant } from '../../shared/core.C-YXI-43.mjs';
+import { s as sortParentsFirst, D as DefaultMap, i as isDescendantOf, a as isAncestor, b as ifilter, C } from '../../shared/core.rmvsy0n3.mjs';
+import { n as nonNullable, i as invariant } from '../../shared/core.Cy9smucx.mjs';
+import { t as toSet, a as toArray, i as imap } from '../../shared/core.BrCnZFTn.mjs';
 
 function treeFromElements(elements) {
   const sorted = sortParentsFirst([...elements]);

package/dist/index.d.mts

@@ -1,11 +1,11 @@
-import { H as HexColorLiteral, T as ThemeColorValues, b as LikeC4Theme } from './shared/core.DJvmfnEi.mjs';
-export { ag as AbstractRelation, a1 as AllNever, a2 as AndOperator, O as AnyParsedLikeC4ModelData, aT as AutoLayoutDirection, aW as BBox, aU as BasicElementView, aV as BasicView, p as BorderStyle, B as BorderStyles, ap as Color, aq as ColorLiteral, aX as ComputedDeploymentView, aY as ComputedDynamicView, aZ as ComputedEdge, a_ as ComputedElementView, C as ComputedLikeC4ModelData, az as ComputedNode, a as ComputedView, a$ as CustomColorDefinitions, ad as DefaultArrowType, j as DefaultElementShape, ae as DefaultLineStyle, k as DefaultPaddingSize, af as DefaultRelationshipColor, l as DefaultShapeSize, m as DefaultTextSize, n as DefaultThemeColor, c as DeployedInstance, D as DeploymentElement, d as DeploymentElementStyle, e as DeploymentNode, f as DeploymentNodeKind, g as DeploymentNodeKindSpecification, h as DeploymentRef, i as DeploymentRelation, b0 as DeploymentView, b1 as DeploymentViewRule, b2 as DeploymentViewRulePredicate, b3 as DeploymentViewRuleStyle, b4 as DiagramEdge, aA as DiagramNode, b5 as DiagramView, b6 as DynamicView, b7 as DynamicViewIncludeRule, b8 as DynamicViewParallelSteps, b9 as DynamicViewRule, ba as DynamicViewStep, bb as DynamicViewStepOrParallel, bc as EdgeId, q as Element, E as ElementKind, r as ElementKindSpecification, s as ElementKindSpecificationStyle, bw as ElementNotation, t as ElementShape, o as ElementShapes, u as ElementStyle, as as ElementThemeColorValues, ar as ElementThemeColors, bd as ElementView, a3 as EqualOperator, y as ExpressionV2, be as ExtendsElementView, a4 as Filterable, F as FqnExpr, z as FqnRef, Q as GenericLikeC4ModelData, G as GlobalDynamicPredicates, A as GlobalPredicateId, I as GlobalPredicates, J as GlobalStyleID, K as GlobalStyles, a5 as KindEqual, S as LayoutedLikeC4ModelData, U as LikeC4ModelDump, L as LikeC4View, v as Link, N as ModelGlobals, M as ModelLayer, ah as ModelRelation, bf as NodeId, a6 as NotOperator, a7 as OperatorPredicate, a8 as OrOperator, V as ParsedLikeC4ModelData, a9 as Participant, aa as ParticipantOperator, P as PredicateSelector, R as RelationExpr, ai as RelationId, aj as RelationshipArrowType, ak as RelationshipKind, al as RelationshipKindSpecification, am as RelationshipLineType, au as RelationshipThemeColorValues, at as RelationshipThemeColors, bg as ScopedElementView, av as ShapeSize, aw as SpacingSize, bh as StepEdgeId, bi as StepEdgeIdLiteral, ab as TagEqual, w as TagSpec, ax as TextSize, ay as ThemeColor, ao as ThemeColors, x as TypedElement, bj as ViewAutoLayout, bk as ViewId, bl as ViewManualLayout, bm as ViewRule, bn as ViewRuleAutoLayout, bo as ViewRuleGlobalPredicateRef, bp as ViewRuleGlobalStyle, bq as ViewRuleGroup, br as ViewRulePredicate, bs as ViewRuleStyle, bt as ViewRuleStyleOrGlobalRef, bu as ViewWithHash, bv as ViewWithNotation, ac as WhereOperator, aB as extractStep, aC as getBBoxCenter, aD as getParallelStepsPrefix, W as isAndOperator, aE as isAutoLayoutDirection, aF as isDeploymentView, aG as isDynamicView, aH as isDynamicViewParallelSteps, aI as isElementView, aJ as isExtendsElementView, X as isKindEqual, Y as isNotOperator, Z as isOrOperator, _ as isParticipantOperator, aK as isScopedElementView, aL as isStepEdgeId, $ as isTagEqual, an as isThemeColor, aM as isViewRuleAutoLayout, aN as isViewRuleGlobalPredicateRef, aO as isViewRuleGlobalStyle, aP as isViewRuleGroup, aQ as isViewRulePredicate, aR as isViewRuleStyle, aS as stepEdgeId, a0 as whereOperatorAsPredicate } from './shared/core.DJvmfnEi.mjs';
-export { BiMap, DefaultMap, DefaultWeakMap, LinkedList, MultiMap, Queue, Stack, commonHead, compareNatural, compareRelations, delay, difference, equalsSet, getOrCreate, hasAtLeast, ifilter, ifind, iflat, imap, intersection, ireduce, isIterable, isNonEmptyArray, isString, isome, iunique, objectHash, stringHash, symmetricDifference, toArray, toSet, union } from './utils/index.mjs';
-export { A as AnyAux, b as Aux, C as ComputeViewResult, D as DeployedInstanceModel, d as DeploymentElementModel, e as DeploymentNodeModel, f as DeploymentRelationModel, g as EdgeModel, E as ElementModel, h as LikeC4DeploymentModel, L as LikeC4Model, i as LikeC4ViewModel, N as NodeModel, R as RelationshipModel, c as computeView, a as computeViews, u as unsafeComputeView } from './shared/core.CiFKryGW.mjs';
-export { C as Connection, a as ConnectionModel, D as DeploymentConnectionModel } from './shared/core.CZR9J1Qx.mjs';
-export { A as AsFqn, C as CustomColor, E as ExclusiveUnion, F as Fqn, G as GlobalFqn, d as IconUrl, I as IteratorLike, K as KeysOf, b as NTuple, N as NonEmptyArray, a as NonEmptyReadonlyArray, P as Point, c as Predicate, e as ProjectId, T as Tag, X as XYPoint, i as isGlobalFqn, s as splitGlobalFqn } from './shared/core.SjLhMA7a.mjs';
-export { OverviewGraph, ViewChange } from './types/index.mjs';
-export { I as IterableContainer, R as ReorderedArray, a as ancestorsFqn, c as commonAncestor, b as compareByFqnHierarchically, d as compareFqnHierarchically, h as hierarchyDistance, e as hierarchyLevel, i as isAncestor, f as isDescendantOf, g as isSameHierarchy, n as nameFromFqn, p as parentFqn, s as sortByFqnHierarchically, j as sortNaturalByFqn, k as sortParentsFirst } from './shared/core.D2830qgg.mjs';
+import { C as ColorLiteral, T as ThemeColorValues, L as LikeC4Theme } from './shared/core.Dpq3P3YJ.mjs';
+export { W as AbstractRelationship, ad as AndOperator, aY as AnyExcludePredicate, aX as AnyIncludePredicate, aK as AnyView, aZ as AnyViewRuleStyle, b2 as AutoLayoutDirection, y as AuxFromDump, A as AuxFromLikeC4ModelData, B as BBox, ba as BaseParsedViewProperties, b9 as BaseViewProperties, ap as BorderStyle, ao as BorderStyles, az as Color, bh as ComputedDeploymentView, bi as ComputedDynamicView, bf as ComputedEdge, bg as ComputedElementView, l as ComputedLikeC4ModelData, be as ComputedNode, aI as ComputedView, at as CustomColor, au as CustomColorDefinitions, U as DefaultArrowType, H as DefaultElementShape, Q as DefaultLineStyle, J as DefaultPaddingSize, V as DefaultRelationshipColor, I as DefaultShapeSize, K as DefaultTextSize, z as DefaultThemeColor, p as DeployedInstance, q as DeploymentElement, r as DeploymentElementRef, D as DeploymentElementStyle, o as DeploymentNode, v as DeploymentRelation, u as DeploymentRelationship, bp as DeploymentViewExcludePredicate, bo as DeploymentViewIncludePredicate, bq as DeploymentViewPredicate, bs as DeploymentViewRule, br as DeploymentViewRuleStyle, bk as DiagramEdge, bj as DiagramNode, aG as DiagramView, by as DynamicViewIncludeRule, bv as DynamicViewParallelSteps, bz as DynamicViewRule, bu as DynamicViewStep, bx as DynamicViewStepOrParallel, O as Element, ar as ElementShape, aq as ElementShapes, _ as ElementSpecification, N as ElementStyle, aB as ElementThemeColorValues, aC as ElementThemeColors, bD as ElementViewExcludePredicate, bC as ElementViewIncludePredicate, bE as ElementViewPredicate, bI as ElementViewRule, bF as ElementViewRuleGroup, bH as ElementViewRuleStyle, a3 as EqualOperator, E as Expression, ai as Filterable, F as FqnExpr, c as FqnRef, g as GlobalDynamicPredicates, G as GlobalPredicateId, f as GlobalPredicates, h as GlobalStyleID, i as GlobalStyles, as as HexColor, a6 as KindEqual, bm as LayoutedDeploymentView, bn as LayoutedDynamicView, bl as LayoutedElementView, m as LayoutedLikeC4ModelData, aG as LayoutedView, n as LikeC4ModelData, x as LikeC4ModelDump, aF as LikeC4View, b as ModelExpression, M as ModelFqnExpr, j as ModelGlobals, Z as ModelRelation, a as ModelRelationExpr, bb as NodeNotation, ab as NotOperator, aj as OperatorPredicate, af as OrOperator, bt as ParsedDeploymentView, bA as ParsedDynamicView, bJ as ParsedElementView, k as ParsedLikeC4ModelData, aF as ParsedView, a8 as Participant, a9 as ParticipantOperator, d as Point, P as PredicateSelector, aJ as ProcessedView, e as RectBox, R as RelationExpr, Y as Relationship, aw as RelationshipArrowType, av as RelationshipLineType, a1 as RelationshipSpecification, aD as RelationshipThemeColorValues, aE as RelationshipThemeColors, an as ShapeSize, al as SpacingSize, w as SpecTypesFromDump, a2 as Specification, S as SpecificationDump, a4 as TagEqual, $ as TagSpecification, am as TextSize, ay as ThemeColor, ax as ThemeColors, b6 as ViewAutoLayout, b7 as ViewManualLayout, aL as ViewOnStage, aN as ViewRule, b4 as ViewRuleAutoLayout, b0 as ViewRuleGlobalPredicateRef, a_ as ViewRuleGlobalStyle, aO as ViewRulePredicate, b8 as ViewType, bd as ViewWithHash, bc as ViewWithNotation, aM as ViewWithType, ah as WhereOperator, X as XYPoint, bw as getParallelStepsPrefix, ae as isAndOperator, b3 as isAutoLayoutDirection, aR as isComputedView, t as isDeployedInstance, s as isDeploymentNode, aV as isDeploymentView, aH as isDiagramView, aW as isDynamicView, bB as isDynamicViewParallelSteps, aS as isElementView, aU as isExtendsElementView, a7 as isKindEqual, aH as isLayoutedView, ac as isNotOperator, ag as isOrOperator, aa as isParticipantOperator, aT as isScopedElementView, a0 as isTagColorSpecified, a5 as isTagEqual, aA as isThemeColor, b5 as isViewRuleAutoLayout, b1 as isViewRuleGlobalPredicateRef, a$ as isViewRuleGlobalStyle, bG as isViewRuleGroup, aP as isViewRulePredicate, aQ as isViewRuleStyle, ak as whereOperatorAsPredicate } from './shared/core.Dpq3P3YJ.mjs';
+export { BiMap, DefaultWeakMap, LinkedList, MultiMap, Queue, Stack, commonHead, compareNatural, compareNaturalHierarchically, compareRelations, delay, difference, equalsSet, getOrCreate, hasAtLeast, ifilter, ifind, iflat, ihead, imap, intersection, invariant, ireduce, isIterable, isNonEmptyArray, isString, isome, iunique, memoizeProp, nonNullable, nonexhaustive, objectHash, stringHash, symmetricDifference, toArray, toSet, union } from './utils/index.mjs';
+export { D as DefaultMap } from './shared/core.CywrQs86.mjs';
+export { A as Any, A as AnyAux, b as Aux, E as ExtractOnStage, M as ModelStage, S as SpecAux, U as Unknown, c as UnknownComputed, d as UnknownLayouted, e as UnknownParsed, _ as _stage, f as _type, a as aux, i as isOnStage } from './shared/core.BaYE_r29.mjs';
+export { A as AnyFqn, B as BuiltInIcon, C as Coalesce, D as DeploymentFqn, b as DeploymentKind, E as EdgeId, a as ElementKind, f as ExclusiveUnion, F as Fqn, m as GlobalFqn, G as GroupElementKind, i as Icon, j as IconUrl, I as IteratorLike, K as KeysOf, L as Link, g as NTuple, N as NodeId, d as NonEmptyArray, e as NonEmptyReadonlyArray, h as Predicate, P as ProjectId, R as RelationId, l as RelationKind, c as RelationshipKind, p as StepEdgeId, S as StepEdgeIdLiteral, r as StepEdgeKind, T as Tag, V as ViewId, u as extractStep, n as isGlobalFqn, k as isGroupElementKind, t as isStepEdgeId, s as scalar, o as splitGlobalFqn, q as stepEdgeId } from './shared/core.BuO4ncfY.mjs';
+export { ViewChange } from './types/index.mjs';
+export { I as IterableContainer, R as ReorderedArray, a as ancestorsFqn, c as commonAncestor, b as compareByFqnHierarchically, d as compareFqnHierarchically, h as hierarchyDistance, e as hierarchyLevel, i as isAncestor, f as isDescendantOf, g as isSameHierarchy, n as nameFromFqn, p as parentFqn, s as sortByFqnHierarchically, j as sortNaturalByFqn, k as sortParentsFirst } from './shared/core.Pf5I9o0e.mjs';
 import 'type-fest';
 
 declare const ElementColors: {
@@ -136,10 +136,6 @@ declare const RelationshipColors: {
 };
 
 declare const defaultTheme: LikeC4Theme;
-declare function computeColorValues(color: HexColorLiteral): ThemeColorValues;
+declare function computeColorValues(color: ColorLiteral): ThemeColorValues;
 
-declare function nonNullable<T>(value: T, message?: string | (() => string)): NonNullable<T>;
-declare function invariant(condition: any, message?: string): asserts condition;
-declare function nonexhaustive(value: never): never;
-
-export { ElementColors, HexColorLiteral, LikeC4Theme, RelationshipColors, ThemeColorValues, computeColorValues, defaultTheme, invariant, nonNullable, nonexhaustive };
+export { ColorLiteral, ElementColors, LikeC4Theme, RelationshipColors, ThemeColorValues, computeColorValues, defaultTheme };

package/dist/index.mjs

@@ -1,10 +1,13 @@
-export { i as invariant, n as nonNullable, a as nonexhaustive } from './shared/core.C-YXI-43.mjs';
-export { C as Connection, e as ConnectionModel, D as DeployedInstanceModel, f as DeploymentConnectionModel, g as DeploymentNodeModel, h as DeploymentRelationModel, E as EdgeModel, j as ElementModel, k as LikeC4DeploymentModel, L as LikeC4Model, m as LikeC4ViewModel, N as NodeModel, R as RelationshipModel, c as computeView, b as computeViews, u as unsafeComputeView } from './shared/core.CAcZ6_cP.mjs';
-export { A as AsFqn, B as BorderStyles, C as ComputedNode, z as ComputedView, v as DefaultArrowType, D as DefaultElementShape, x as DefaultLineStyle, f as DefaultPaddingSize, y as DefaultRelationshipColor, g as DefaultShapeSize, h as DefaultTextSize, b as DefaultThemeColor, c as DeploymentElement, H as DiagramNode, E as ElementKind, j as ElementShapes, k as ExpressionV2, F as FqnExpr, l as FqnRef, G as GlobalFqn, M as ModelLayer, R as RelationExpr, I as extractStep, J as getBBoxCenter, K as getParallelStepsPrefix, m as isAndOperator, L as isAutoLayoutDirection, N as isDeploymentView, O as isDynamicView, P as isDynamicViewParallelSteps, a as isElementView, i as isExtendsElementView, e as isGlobalFqn, p as isKindEqual, q as isNotOperator, r as isOrOperator, t as isParticipantOperator, d as isScopedElementView, Q as isStepEdgeId, u as isTagEqual, S as isViewRuleAutoLayout, T as isViewRuleGlobalPredicateRef, U as isViewRuleGlobalStyle, V as isViewRuleGroup, W as isViewRulePredicate, X as isViewRuleStyle, s as splitGlobalFqn, Y as stepEdgeId, w as whereOperatorAsPredicate } from './shared/core.DgfwjBtu.mjs';
-export { ThemeColors, isThemeColor } from './types/index.mjs';
+export { f as DefaultArrowType, D as DefaultElementShape, g as DefaultLineStyle, m as DefaultPaddingSize, h as DefaultRelationshipColor, l as DefaultShapeSize, p as DefaultTextSize, a as DefaultThemeColor, A as DeploymentFqn, H as EdgeId, z as Fqn, F as FqnRef, B as GlobalFqn, G as GroupElementKind, N as NodeId, R as RelationId, S as StepEdgeKind, V as ViewId, b as _stage, _ as _type, I as extractStep, v as isAndOperator, i as isDeployedInstance, k as isDeploymentNode, C as isGlobalFqn, e as isGroupElementKind, r as isKindEqual, u as isNotOperator, j as isOnStage, x as isOrOperator, t as isParticipantOperator, d as isStepEdgeId, q as isTagEqual, E as splitGlobalFqn, s as stepEdgeId, w as whereOperatorAsPredicate } from './shared/core.CUYDgv2-.mjs';
+export { E as Expression, F as FqnExpr, k as ModelExpression, M as ModelFqnExpr, j as ModelRelationExpr, R as RelationExpr, s as getParallelStepsPrefix, r as isAutoLayoutDirection, n as isComputedView, m as isDeploymentView, p as isDiagramView, l as isDynamicView, h as isDynamicViewParallelSteps, a as isElementView, i as isExtendsElementView, p as isLayoutedView, q as isScopedElementView, d as isViewRuleAutoLayout, f as isViewRuleGlobalPredicateRef, g as isViewRuleGlobalStyle, e as isViewRuleGroup, c as isViewRulePredicate, b as isViewRuleStyle } from './shared/core.Bk7wEZFG.mjs';
+export { BBox, BorderStyles, ElementShapes, RectBox, ThemeColors, isTagColorSpecified, isThemeColor } from './types/index.mjs';
 export { BiMap, DefaultWeakMap, LinkedList, MultiMap, Queue, compareRelations, delay, ireduce } from './utils/index.mjs';
-export { D as DefaultMap, l as ancestorsFqn, m as commonAncestor, o as compareByFqnHierarchically, q as compareFqnHierarchically, k as compareNatural, r as hierarchyDistance, u as hierarchyLevel, c as ifilter, d as imap, a as isAncestor, i as isDescendantOf, e as isNonEmptyArray, g as isSameHierarchy, x as isString, n as nameFromFqn, p as parentFqn, v as sortByFqnHierarchically, w as sortNaturalByFqn, s as sortParentsFirst, b as toArray, t as toSet } from './shared/core.CQXU9DF7.mjs';
-export { S as Stack, c as commonHead, h as difference, j as equalsSet, g as getOrCreate, i as hasAtLeast, a as ifind, b as iflat, k as intersection, d as isIterable, e as isome, f as iunique, o as objectHash, n as stringHash, s as symmetricDifference, u as union } from './shared/core.Cu-UdkSl.mjs';
+export { D as DefaultMap, l as ancestorsFqn, k as commonAncestor, h as compareByFqnHierarchically, q as compareFqnHierarchically, m as compareNatural, o as compareNaturalHierarchically, r as hierarchyDistance, u as hierarchyLevel, b as ifilter, a as isAncestor, i as isDescendantOf, c as isNonEmptyArray, d as isSameHierarchy, w as isString, n as nameFromFqn, p as parentFqn, j as sortByFqnHierarchically, v as sortNaturalByFqn, s as sortParentsFirst } from './shared/core.rmvsy0n3.mjs';
+export { S as Stack, c as commonHead, e as iflat, i as isIterable, b as iunique, o as objectHash } from './shared/core.CpXlRyE5.mjs';
+export { i as invariant, n as nonNullable, a as nonexhaustive } from './shared/core.Cy9smucx.mjs';
+export { d as difference, j as equalsSet, g as getOrCreate, i as hasAtLeast, c as ifind, e as ihead, a as intersection, b as isome, f as memoizeProp, k as stringHash, s as symmetricDifference, u as union } from './shared/core.DoK86JEe.mjs';
+export { i as imap, a as toArray, t as toSet } from './shared/core.BrCnZFTn.mjs';
+import './shared/core.DbRvwARP.mjs';
 
 const { min: min$4, max: max$4 } = Math;
 
@@ -3488,6 +3491,7 @@ function generateColorsMap(color) {
     const saturationDelta = SATURATION_MAP[i] - SATURATION_MAP[baseColorIndex];
     return saturationDelta >= 0 ? c.saturate(saturationDelta) : c.desaturate(saturationDelta * -1);
   });
+  colors[baseColorIndex] = chroma(color);
   return { baseColorIndex, colors };
 }
 function generateColors(color) {