@likec4/core 1.15.1 → 1.17.0

package/dist/index.cjs

@@ -1,13 +1,13 @@
 'use strict';
 
-const types_index = require('./shared/core.Cq_6j35U.cjs');
+const types_index = require('./shared/core.zN6ZscFQ.cjs');
 const defu = require('defu');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 
 const defu__default = /*#__PURE__*/_interopDefaultCompat(defu);
 
-function d$1(...e){return types_index.u(a,e,o$3)}var a=(e,n)=>e.length<n.length?e.map((t,r)=>[t,n[r]]):n.map((t,r)=>[e[r],t]),o$3=e=>(n,t)=>({hasNext:!0,next:[n,e[t]],done:t>=e.length-1});
+function d$1(...e){return types_index.u(a,e,o$4)}var a=(e,n)=>e.length<n.length?e.map((t,r)=>[t,n[r]]):n.map((t,r)=>[e[r],t]),o$4=e=>(n,t)=>({hasNext:!0,next:[n,e[t]],done:t>=e.length-1});
 
 var s={done:!1,hasNext:!1};
 
@@ -19,6 +19,8 @@ function i$3(...e){return types_index.u(r,e)}var r=(e,t)=>e.length>=t;
 
 function u$1(...e){return types_index.u(i$2,e)}function i$2(e,a){let n=[];for(let[o,r]of e.entries()){if(!a(r,o,e))break;n.push(r);}return n}
 
+function m$1(...r){return types_index.u(o$3,r)}function o$3(r,t){let e=[...r];return e.sort(t),e}
+
 function o$2(r,n){let e=Math.ceil(r),t=Math.floor(n);if(t<e)throw new RangeError(`randomInteger: The range [${r.toString()},${n.toString()}] contains no integer`);return Math.floor(Math.random()*(t-e+1)+e)}
 
 function i$1(...e){return types_index.u(u,e)}function u(e,o){let t={};for(let[r,n]of Object.entries(e))o(n,r,e)&&(t[r]=n);return t}
@@ -408,7 +410,11 @@ function $rules(...rules) {
   return (b) => rules.reduce((b2, rule) => rule(b2), b);
 }
 
-function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _globals = { styles: [] }, _views = /* @__PURE__ */ new Map()) {
+function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _views = /* @__PURE__ */ new Map(), _globals = {
+  predicates: {},
+  dynamicPredicates: {},
+  styles: {}
+}) {
   const toLikeC4Specification = () => ({
     tags: spec.tags ?? [],
     elements: {
@@ -467,8 +473,8 @@ function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _
       structuredClone(spec),
       structuredClone(_elements),
       structuredClone(_relations),
-      structuredClone(_globals),
-      structuredClone(_views)
+      structuredClone(_views),
+      structuredClone(_globals)
     ),
     __model: () => ({
       addElement: (element) => {
@@ -523,9 +529,7 @@ function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _
       specification: toLikeC4Specification(),
       elements: n(Array.from(_elements.entries())),
       relations: l$1(_relations, (r) => [r.id, r]),
-      globals: {
-        styles: l$1(_globals.styles, (s) => [s.id, s])
-      },
+      globals: structuredClone(_globals),
       views: n(Array.from(_views.entries()))
     }),
     helpers: () => ({
@@ -4871,7 +4875,11 @@ class LikeC4Model {
       this.addRelation(rel);
     }
     this._views = new Map(
-      r$1(views).map((view) => [view.id, new ViewModelClass(view, this)])
+      x(
+        r$1(views),
+        m$1((a, b) => compareNatural(a.title ?? "untitled", b.title ?? "untitled")),
+        m((view) => [view.id, new ViewModelClass(view, this)])
+      )
     );
   }
   _elements = /* @__PURE__ */ new Map();
@@ -5253,6 +5261,12 @@ class LikeC4Model {
     children() {
       return this.model.children(this);
     }
+    /**
+     * First 'view of' current element
+     */
+    viewOf() {
+      return this.model.views().find((v) => v.viewOf?.id === this.id) ?? null;
+    }
     /**
      * All views 'view of' current element
      */
@@ -5400,6 +5414,7 @@ exports.isStepEdgeId = types_index.isStepEdgeId;
 exports.isTagEqual = types_index.isTagEqual;
 exports.isThemeColor = types_index.isThemeColor;
 exports.isViewRuleAutoLayout = types_index.isViewRuleAutoLayout;
+exports.isViewRuleGlobalPredicateRef = types_index.isViewRuleGlobalPredicateRef;
 exports.isViewRuleGlobalStyle = types_index.isViewRuleGlobalStyle;
 exports.isViewRuleGroup = types_index.isViewRuleGroup;
 exports.isViewRulePredicate = types_index.isViewRulePredicate;

package/dist/index.d.cts

@@ -1,6 +1,6 @@
 import { IfNever, TupleToUnion, Tagged, Simplify, LiteralUnion, Class, IsNumericLiteral } from 'type-fest';
-import { E as ElementKindSpecification, R as RelationshipKindSpecification, P as ParsedLikeC4Model, a as ElementShape, C as Color, B as BorderStyle, b as RelationshipArrowType, c as RelationshipLineType, d as Element, e as Relation, F as Fqn$1, L as LikeC4View, f as Expression, V as ViewRuleStyle, A as AutoLayoutDirection, N as NonEmptyArray, g as CustomElementExpr, h as CustomRelationExpr, H as HexColorLiteral, T as ThemeColorValues, i as RelationID$1, j as ViewID$1, k as EdgeId$1, l as ComputedView, m as Tag, n as ComputedNode, o as NodeId, p as ElementKind, q as ComputedEdge, r as ComputedLikeC4Model, s as LayoutedLikeC4Model, t as RelationshipKind, D as DiagramView, u as DiagramNode, v as DiagramEdge } from './shared/core.CpdWcGpN.cjs';
-export { aC as AndOperator, G as AsFqn, bz as BBox, b6 as BasicElementView, b5 as BasicView, J as BorderStyles, aO as ColorLiteral, bw as ComputedDynamicView, bv as ComputedElementView, y as CustomColor, bi as CustomColorDefinitions, aL as DefaultArrowType, O as DefaultElementShape, aK as DefaultLineStyle, aM as DefaultRelationshipColor, M as DefaultThemeColor, bg as DynamicView, bd as DynamicViewIncludeRule, bb as DynamicViewParallelSteps, bf as DynamicViewRule, ba as DynamicViewStep, bc as DynamicViewStepOrParallel, a8 as ElementExpression, a4 as ElementKindExpr, Y as ElementKindSpecificationStyle, bD as ElementNotation, ac as ElementPredicateExpression, Z as ElementRefExpr, K as ElementShapes, Q as ElementStyle, a6 as ElementTagExpr, aQ as ElementThemeColorValues, aR as ElementThemeColors, b9 as ElementView, aa as ElementWhereExpr, av as EqualOperator, $ as ExpandedElementExpr, w as Expr, b8 as ExtendsElementView, aH as Filterable, au as GlobalStyle, at as GlobalStyleID, I as IconUrl, ag as InOutExpr, ai as IncomingExpr, ay as KindEqual, aU as LikeC4Theme, U as Link, x as NonEmptyReadonlyArray, aA as NotOperator, aE as OrOperator, ak as OutgoingExpr, aJ as OverviewGraph, z as Point, ae as RelationExpr, am as RelationExpression, ar as RelationPredicateExpression, ao as RelationWhereExpr, aS as RelationshipThemeColorValues, aT as RelationshipThemeColors, b7 as ScopedElementView, bo as StepEdgeId, bn as StepEdgeIdLiteral, aw as TagEqual, S as TagSpec, aN as ThemeColor, W as TypedElement, bu as ViewAutoLayout, bC as ViewChange, bB as ViewManualLayout, b4 as ViewRule, b0 as ViewRuleAutoLayout, aY as ViewRuleGlobalStyle, b2 as ViewRuleGroup, aV as ViewRulePredicate, a_ as ViewRuleStyleOrGlobalRef, bs as ViewWithHash, bt as ViewWithNotation, aG as WhereOperator, a2 as WildcardExpr, X as XYPoint, bq as extractStep, bA as getBBoxCenter, br as getParallelStepsPrefix, aD as isAndOperator, a$ as isAutoLayoutDirection, bx as isComputedDynamicView, by as isComputedElementView, a1 as isCustomElement, aq as isCustomRelationExpr, bj as isDynamicView, be as isDynamicViewIncludeRule, bh as isDynamicViewParallelSteps, a9 as isElement, a5 as isElementKindExpr, ad as isElementPredicateExpr, _ as isElementRef, a7 as isElementTagExpr, bk as isElementView, ab as isElementWhere, a0 as isExpandedElementExpr, bl as isExtendsElementView, ah as isInOut, aj as isIncoming, az as isKindEqual, aB as isNotOperator, aF as isOrOperator, al as isOutgoing, af as isRelation, an as isRelationExpression, as as isRelationPredicateExpr, ap as isRelationWhere, bm as isScopedElementView, bp as isStepEdgeId, ax as isTagEqual, aP as isThemeColor, b1 as isViewRuleAutoLayout, aZ as isViewRuleGlobalStyle, b3 as isViewRuleGroup, aW as isViewRulePredicate, aX as isViewRuleStyle, a3 as isWildcard, aI as whereOperatorAsPredicate } from './shared/core.CpdWcGpN.cjs';
+import { E as ElementKindSpecification, R as RelationshipKindSpecification, P as ParsedLikeC4Model, a as ElementShape, C as Color, B as BorderStyle, b as RelationshipArrowType, c as RelationshipLineType, d as Element, e as Relation, F as Fqn$1, L as LikeC4View, f as Expression, V as ViewRuleStyle, A as AutoLayoutDirection, N as NonEmptyArray, g as CustomElementExpr, h as CustomRelationExpr, H as HexColorLiteral, T as ThemeColorValues, i as RelationID$1, j as ViewID$1, k as EdgeId$1, l as ComputedView, m as Tag, n as ComputedNode, o as NodeId, p as ElementKind, q as ComputedEdge, r as ComputedLikeC4Model, s as LayoutedLikeC4Model, t as RelationshipKind, D as DiagramView, u as DiagramNode, v as DiagramEdge } from './shared/core.CoLQkcYL.cjs';
+export { aG as AndOperator, G as AsFqn, bF as BBox, bc as BasicElementView, bb as BasicView, J as BorderStyles, aS as ColorLiteral, bC as ComputedDynamicView, bB as ComputedElementView, y as CustomColor, bo as CustomColorDefinitions, aP as DefaultArrowType, O as DefaultElementShape, aO as DefaultLineStyle, aQ as DefaultRelationshipColor, M as DefaultThemeColor, bm as DynamicView, bj as DynamicViewIncludeRule, bh as DynamicViewParallelSteps, bl as DynamicViewRule, bg as DynamicViewStep, bi as DynamicViewStepOrParallel, a8 as ElementExpression, a4 as ElementKindExpr, Y as ElementKindSpecificationStyle, bJ as ElementNotation, ac as ElementPredicateExpression, Z as ElementRefExpr, K as ElementShapes, Q as ElementStyle, a6 as ElementTagExpr, aU as ElementThemeColorValues, aV as ElementThemeColors, bf as ElementView, aa as ElementWhereExpr, az as EqualOperator, $ as ExpandedElementExpr, w as Expr, be as ExtendsElementView, aL as Filterable, av as GlobalDynamicPredicates, at as GlobalPredicateId, au as GlobalPredicates, aw as GlobalStyleID, ax as GlobalStyles, I as IconUrl, ag as InOutExpr, ai as IncomingExpr, aC as KindEqual, aY as LikeC4Theme, U as Link, ay as ModelGlobals, x as NonEmptyReadonlyArray, aE as NotOperator, aI as OrOperator, ak as OutgoingExpr, aN as OverviewGraph, z as Point, ae as RelationExpr, am as RelationExpression, ar as RelationPredicateExpression, ao as RelationWhereExpr, aW as RelationshipThemeColorValues, aX as RelationshipThemeColors, bd as ScopedElementView, bu as StepEdgeId, bt as StepEdgeIdLiteral, aA as TagEqual, S as TagSpec, aR as ThemeColor, W as TypedElement, bA as ViewAutoLayout, bI as ViewChange, bH as ViewManualLayout, ba as ViewRule, b6 as ViewRuleAutoLayout, a$ as ViewRuleGlobalPredicateRef, b2 as ViewRuleGlobalStyle, b8 as ViewRuleGroup, aZ as ViewRulePredicate, b4 as ViewRuleStyleOrGlobalRef, by as ViewWithHash, bz as ViewWithNotation, aK as WhereOperator, a2 as WildcardExpr, X as XYPoint, bw as extractStep, bG as getBBoxCenter, bx as getParallelStepsPrefix, aH as isAndOperator, b5 as isAutoLayoutDirection, bD as isComputedDynamicView, bE as isComputedElementView, a1 as isCustomElement, aq as isCustomRelationExpr, bp as isDynamicView, bk as isDynamicViewIncludeRule, bn as isDynamicViewParallelSteps, a9 as isElement, a5 as isElementKindExpr, ad as isElementPredicateExpr, _ as isElementRef, a7 as isElementTagExpr, bq as isElementView, ab as isElementWhere, a0 as isExpandedElementExpr, br as isExtendsElementView, ah as isInOut, aj as isIncoming, aD as isKindEqual, aF as isNotOperator, aJ as isOrOperator, al as isOutgoing, af as isRelation, an as isRelationExpression, as as isRelationPredicateExpr, ap as isRelationWhere, bs as isScopedElementView, bv as isStepEdgeId, aB as isTagEqual, aT as isThemeColor, b7 as isViewRuleAutoLayout, b0 as isViewRuleGlobalPredicateRef, b3 as isViewRuleGlobalStyle, b9 as isViewRuleGroup, a_ as isViewRulePredicate, b1 as isViewRuleStyle, a3 as isWildcard, aM as whereOperatorAsPredicate } from './shared/core.CoLQkcYL.cjs';
 
 type KeysOf<T> = keyof T extends infer K extends string ? K : never;
 type BuilderSpecification = {
@@ -784,6 +784,10 @@ declare namespace LikeC4Model {
         siblings(): readonly ElementModel<M>[];
         descendants(): readonly ElementModel<M>[];
         children(): readonly ElementModel<M>[];
+        /**
+         * First 'view of' current element
+         */
+        viewOf(): M;
         /**
          * All views 'view of' current element
          */

package/dist/index.d.mts

@@ -1,6 +1,6 @@
 import { IfNever, TupleToUnion, Tagged, Simplify, LiteralUnion, Class, IsNumericLiteral } from 'type-fest';
-import { E as ElementKindSpecification, R as RelationshipKindSpecification, P as ParsedLikeC4Model, a as ElementShape, C as Color, B as BorderStyle, b as RelationshipArrowType, c as RelationshipLineType, d as Element, e as Relation, F as Fqn$1, L as LikeC4View, f as Expression, V as ViewRuleStyle, A as AutoLayoutDirection, N as NonEmptyArray, g as CustomElementExpr, h as CustomRelationExpr, H as HexColorLiteral, T as ThemeColorValues, i as RelationID$1, j as ViewID$1, k as EdgeId$1, l as ComputedView, m as Tag, n as ComputedNode, o as NodeId, p as ElementKind, q as ComputedEdge, r as ComputedLikeC4Model, s as LayoutedLikeC4Model, t as RelationshipKind, D as DiagramView, u as DiagramNode, v as DiagramEdge } from './shared/core.CpdWcGpN.mjs';
-export { aC as AndOperator, G as AsFqn, bz as BBox, b6 as BasicElementView, b5 as BasicView, J as BorderStyles, aO as ColorLiteral, bw as ComputedDynamicView, bv as ComputedElementView, y as CustomColor, bi as CustomColorDefinitions, aL as DefaultArrowType, O as DefaultElementShape, aK as DefaultLineStyle, aM as DefaultRelationshipColor, M as DefaultThemeColor, bg as DynamicView, bd as DynamicViewIncludeRule, bb as DynamicViewParallelSteps, bf as DynamicViewRule, ba as DynamicViewStep, bc as DynamicViewStepOrParallel, a8 as ElementExpression, a4 as ElementKindExpr, Y as ElementKindSpecificationStyle, bD as ElementNotation, ac as ElementPredicateExpression, Z as ElementRefExpr, K as ElementShapes, Q as ElementStyle, a6 as ElementTagExpr, aQ as ElementThemeColorValues, aR as ElementThemeColors, b9 as ElementView, aa as ElementWhereExpr, av as EqualOperator, $ as ExpandedElementExpr, w as Expr, b8 as ExtendsElementView, aH as Filterable, au as GlobalStyle, at as GlobalStyleID, I as IconUrl, ag as InOutExpr, ai as IncomingExpr, ay as KindEqual, aU as LikeC4Theme, U as Link, x as NonEmptyReadonlyArray, aA as NotOperator, aE as OrOperator, ak as OutgoingExpr, aJ as OverviewGraph, z as Point, ae as RelationExpr, am as RelationExpression, ar as RelationPredicateExpression, ao as RelationWhereExpr, aS as RelationshipThemeColorValues, aT as RelationshipThemeColors, b7 as ScopedElementView, bo as StepEdgeId, bn as StepEdgeIdLiteral, aw as TagEqual, S as TagSpec, aN as ThemeColor, W as TypedElement, bu as ViewAutoLayout, bC as ViewChange, bB as ViewManualLayout, b4 as ViewRule, b0 as ViewRuleAutoLayout, aY as ViewRuleGlobalStyle, b2 as ViewRuleGroup, aV as ViewRulePredicate, a_ as ViewRuleStyleOrGlobalRef, bs as ViewWithHash, bt as ViewWithNotation, aG as WhereOperator, a2 as WildcardExpr, X as XYPoint, bq as extractStep, bA as getBBoxCenter, br as getParallelStepsPrefix, aD as isAndOperator, a$ as isAutoLayoutDirection, bx as isComputedDynamicView, by as isComputedElementView, a1 as isCustomElement, aq as isCustomRelationExpr, bj as isDynamicView, be as isDynamicViewIncludeRule, bh as isDynamicViewParallelSteps, a9 as isElement, a5 as isElementKindExpr, ad as isElementPredicateExpr, _ as isElementRef, a7 as isElementTagExpr, bk as isElementView, ab as isElementWhere, a0 as isExpandedElementExpr, bl as isExtendsElementView, ah as isInOut, aj as isIncoming, az as isKindEqual, aB as isNotOperator, aF as isOrOperator, al as isOutgoing, af as isRelation, an as isRelationExpression, as as isRelationPredicateExpr, ap as isRelationWhere, bm as isScopedElementView, bp as isStepEdgeId, ax as isTagEqual, aP as isThemeColor, b1 as isViewRuleAutoLayout, aZ as isViewRuleGlobalStyle, b3 as isViewRuleGroup, aW as isViewRulePredicate, aX as isViewRuleStyle, a3 as isWildcard, aI as whereOperatorAsPredicate } from './shared/core.CpdWcGpN.mjs';
+import { E as ElementKindSpecification, R as RelationshipKindSpecification, P as ParsedLikeC4Model, a as ElementShape, C as Color, B as BorderStyle, b as RelationshipArrowType, c as RelationshipLineType, d as Element, e as Relation, F as Fqn$1, L as LikeC4View, f as Expression, V as ViewRuleStyle, A as AutoLayoutDirection, N as NonEmptyArray, g as CustomElementExpr, h as CustomRelationExpr, H as HexColorLiteral, T as ThemeColorValues, i as RelationID$1, j as ViewID$1, k as EdgeId$1, l as ComputedView, m as Tag, n as ComputedNode, o as NodeId, p as ElementKind, q as ComputedEdge, r as ComputedLikeC4Model, s as LayoutedLikeC4Model, t as RelationshipKind, D as DiagramView, u as DiagramNode, v as DiagramEdge } from './shared/core.CoLQkcYL.mjs';
+export { aG as AndOperator, G as AsFqn, bF as BBox, bc as BasicElementView, bb as BasicView, J as BorderStyles, aS as ColorLiteral, bC as ComputedDynamicView, bB as ComputedElementView, y as CustomColor, bo as CustomColorDefinitions, aP as DefaultArrowType, O as DefaultElementShape, aO as DefaultLineStyle, aQ as DefaultRelationshipColor, M as DefaultThemeColor, bm as DynamicView, bj as DynamicViewIncludeRule, bh as DynamicViewParallelSteps, bl as DynamicViewRule, bg as DynamicViewStep, bi as DynamicViewStepOrParallel, a8 as ElementExpression, a4 as ElementKindExpr, Y as ElementKindSpecificationStyle, bJ as ElementNotation, ac as ElementPredicateExpression, Z as ElementRefExpr, K as ElementShapes, Q as ElementStyle, a6 as ElementTagExpr, aU as ElementThemeColorValues, aV as ElementThemeColors, bf as ElementView, aa as ElementWhereExpr, az as EqualOperator, $ as ExpandedElementExpr, w as Expr, be as ExtendsElementView, aL as Filterable, av as GlobalDynamicPredicates, at as GlobalPredicateId, au as GlobalPredicates, aw as GlobalStyleID, ax as GlobalStyles, I as IconUrl, ag as InOutExpr, ai as IncomingExpr, aC as KindEqual, aY as LikeC4Theme, U as Link, ay as ModelGlobals, x as NonEmptyReadonlyArray, aE as NotOperator, aI as OrOperator, ak as OutgoingExpr, aN as OverviewGraph, z as Point, ae as RelationExpr, am as RelationExpression, ar as RelationPredicateExpression, ao as RelationWhereExpr, aW as RelationshipThemeColorValues, aX as RelationshipThemeColors, bd as ScopedElementView, bu as StepEdgeId, bt as StepEdgeIdLiteral, aA as TagEqual, S as TagSpec, aR as ThemeColor, W as TypedElement, bA as ViewAutoLayout, bI as ViewChange, bH as ViewManualLayout, ba as ViewRule, b6 as ViewRuleAutoLayout, a$ as ViewRuleGlobalPredicateRef, b2 as ViewRuleGlobalStyle, b8 as ViewRuleGroup, aZ as ViewRulePredicate, b4 as ViewRuleStyleOrGlobalRef, by as ViewWithHash, bz as ViewWithNotation, aK as WhereOperator, a2 as WildcardExpr, X as XYPoint, bw as extractStep, bG as getBBoxCenter, bx as getParallelStepsPrefix, aH as isAndOperator, b5 as isAutoLayoutDirection, bD as isComputedDynamicView, bE as isComputedElementView, a1 as isCustomElement, aq as isCustomRelationExpr, bp as isDynamicView, bk as isDynamicViewIncludeRule, bn as isDynamicViewParallelSteps, a9 as isElement, a5 as isElementKindExpr, ad as isElementPredicateExpr, _ as isElementRef, a7 as isElementTagExpr, bq as isElementView, ab as isElementWhere, a0 as isExpandedElementExpr, br as isExtendsElementView, ah as isInOut, aj as isIncoming, aD as isKindEqual, aF as isNotOperator, aJ as isOrOperator, al as isOutgoing, af as isRelation, an as isRelationExpression, as as isRelationPredicateExpr, ap as isRelationWhere, bs as isScopedElementView, bv as isStepEdgeId, aB as isTagEqual, aT as isThemeColor, b7 as isViewRuleAutoLayout, b0 as isViewRuleGlobalPredicateRef, b3 as isViewRuleGlobalStyle, b9 as isViewRuleGroup, a_ as isViewRulePredicate, b1 as isViewRuleStyle, a3 as isWildcard, aM as whereOperatorAsPredicate } from './shared/core.CoLQkcYL.mjs';
 
 type KeysOf<T> = keyof T extends infer K extends string ? K : never;
 type BuilderSpecification = {
@@ -784,6 +784,10 @@ declare namespace LikeC4Model {
         siblings(): readonly ElementModel<M>[];
         descendants(): readonly ElementModel<M>[];
         children(): readonly ElementModel<M>[];
+        /**
+         * First 'view of' current element
+         */
+        viewOf(): M;
         /**
          * All views 'view of' current element
          */

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { IfNever, TupleToUnion, Tagged, Simplify, LiteralUnion, Class, IsNumericLiteral } from 'type-fest';
-import { E as ElementKindSpecification, R as RelationshipKindSpecification, P as ParsedLikeC4Model, a as ElementShape, C as Color, B as BorderStyle, b as RelationshipArrowType, c as RelationshipLineType, d as Element, e as Relation, F as Fqn$1, L as LikeC4View, f as Expression, V as ViewRuleStyle, A as AutoLayoutDirection, N as NonEmptyArray, g as CustomElementExpr, h as CustomRelationExpr, H as HexColorLiteral, T as ThemeColorValues, i as RelationID$1, j as ViewID$1, k as EdgeId$1, l as ComputedView, m as Tag, n as ComputedNode, o as NodeId, p as ElementKind, q as ComputedEdge, r as ComputedLikeC4Model, s as LayoutedLikeC4Model, t as RelationshipKind, D as DiagramView, u as DiagramNode, v as DiagramEdge } from './shared/core.CpdWcGpN.js';
-export { aC as AndOperator, G as AsFqn, bz as BBox, b6 as BasicElementView, b5 as BasicView, J as BorderStyles, aO as ColorLiteral, bw as ComputedDynamicView, bv as ComputedElementView, y as CustomColor, bi as CustomColorDefinitions, aL as DefaultArrowType, O as DefaultElementShape, aK as DefaultLineStyle, aM as DefaultRelationshipColor, M as DefaultThemeColor, bg as DynamicView, bd as DynamicViewIncludeRule, bb as DynamicViewParallelSteps, bf as DynamicViewRule, ba as DynamicViewStep, bc as DynamicViewStepOrParallel, a8 as ElementExpression, a4 as ElementKindExpr, Y as ElementKindSpecificationStyle, bD as ElementNotation, ac as ElementPredicateExpression, Z as ElementRefExpr, K as ElementShapes, Q as ElementStyle, a6 as ElementTagExpr, aQ as ElementThemeColorValues, aR as ElementThemeColors, b9 as ElementView, aa as ElementWhereExpr, av as EqualOperator, $ as ExpandedElementExpr, w as Expr, b8 as ExtendsElementView, aH as Filterable, au as GlobalStyle, at as GlobalStyleID, I as IconUrl, ag as InOutExpr, ai as IncomingExpr, ay as KindEqual, aU as LikeC4Theme, U as Link, x as NonEmptyReadonlyArray, aA as NotOperator, aE as OrOperator, ak as OutgoingExpr, aJ as OverviewGraph, z as Point, ae as RelationExpr, am as RelationExpression, ar as RelationPredicateExpression, ao as RelationWhereExpr, aS as RelationshipThemeColorValues, aT as RelationshipThemeColors, b7 as ScopedElementView, bo as StepEdgeId, bn as StepEdgeIdLiteral, aw as TagEqual, S as TagSpec, aN as ThemeColor, W as TypedElement, bu as ViewAutoLayout, bC as ViewChange, bB as ViewManualLayout, b4 as ViewRule, b0 as ViewRuleAutoLayout, aY as ViewRuleGlobalStyle, b2 as ViewRuleGroup, aV as ViewRulePredicate, a_ as ViewRuleStyleOrGlobalRef, bs as ViewWithHash, bt as ViewWithNotation, aG as WhereOperator, a2 as WildcardExpr, X as XYPoint, bq as extractStep, bA as getBBoxCenter, br as getParallelStepsPrefix, aD as isAndOperator, a$ as isAutoLayoutDirection, bx as isComputedDynamicView, by as isComputedElementView, a1 as isCustomElement, aq as isCustomRelationExpr, bj as isDynamicView, be as isDynamicViewIncludeRule, bh as isDynamicViewParallelSteps, a9 as isElement, a5 as isElementKindExpr, ad as isElementPredicateExpr, _ as isElementRef, a7 as isElementTagExpr, bk as isElementView, ab as isElementWhere, a0 as isExpandedElementExpr, bl as isExtendsElementView, ah as isInOut, aj as isIncoming, az as isKindEqual, aB as isNotOperator, aF as isOrOperator, al as isOutgoing, af as isRelation, an as isRelationExpression, as as isRelationPredicateExpr, ap as isRelationWhere, bm as isScopedElementView, bp as isStepEdgeId, ax as isTagEqual, aP as isThemeColor, b1 as isViewRuleAutoLayout, aZ as isViewRuleGlobalStyle, b3 as isViewRuleGroup, aW as isViewRulePredicate, aX as isViewRuleStyle, a3 as isWildcard, aI as whereOperatorAsPredicate } from './shared/core.CpdWcGpN.js';
+import { E as ElementKindSpecification, R as RelationshipKindSpecification, P as ParsedLikeC4Model, a as ElementShape, C as Color, B as BorderStyle, b as RelationshipArrowType, c as RelationshipLineType, d as Element, e as Relation, F as Fqn$1, L as LikeC4View, f as Expression, V as ViewRuleStyle, A as AutoLayoutDirection, N as NonEmptyArray, g as CustomElementExpr, h as CustomRelationExpr, H as HexColorLiteral, T as ThemeColorValues, i as RelationID$1, j as ViewID$1, k as EdgeId$1, l as ComputedView, m as Tag, n as ComputedNode, o as NodeId, p as ElementKind, q as ComputedEdge, r as ComputedLikeC4Model, s as LayoutedLikeC4Model, t as RelationshipKind, D as DiagramView, u as DiagramNode, v as DiagramEdge } from './shared/core.CoLQkcYL.js';
+export { aG as AndOperator, G as AsFqn, bF as BBox, bc as BasicElementView, bb as BasicView, J as BorderStyles, aS as ColorLiteral, bC as ComputedDynamicView, bB as ComputedElementView, y as CustomColor, bo as CustomColorDefinitions, aP as DefaultArrowType, O as DefaultElementShape, aO as DefaultLineStyle, aQ as DefaultRelationshipColor, M as DefaultThemeColor, bm as DynamicView, bj as DynamicViewIncludeRule, bh as DynamicViewParallelSteps, bl as DynamicViewRule, bg as DynamicViewStep, bi as DynamicViewStepOrParallel, a8 as ElementExpression, a4 as ElementKindExpr, Y as ElementKindSpecificationStyle, bJ as ElementNotation, ac as ElementPredicateExpression, Z as ElementRefExpr, K as ElementShapes, Q as ElementStyle, a6 as ElementTagExpr, aU as ElementThemeColorValues, aV as ElementThemeColors, bf as ElementView, aa as ElementWhereExpr, az as EqualOperator, $ as ExpandedElementExpr, w as Expr, be as ExtendsElementView, aL as Filterable, av as GlobalDynamicPredicates, at as GlobalPredicateId, au as GlobalPredicates, aw as GlobalStyleID, ax as GlobalStyles, I as IconUrl, ag as InOutExpr, ai as IncomingExpr, aC as KindEqual, aY as LikeC4Theme, U as Link, ay as ModelGlobals, x as NonEmptyReadonlyArray, aE as NotOperator, aI as OrOperator, ak as OutgoingExpr, aN as OverviewGraph, z as Point, ae as RelationExpr, am as RelationExpression, ar as RelationPredicateExpression, ao as RelationWhereExpr, aW as RelationshipThemeColorValues, aX as RelationshipThemeColors, bd as ScopedElementView, bu as StepEdgeId, bt as StepEdgeIdLiteral, aA as TagEqual, S as TagSpec, aR as ThemeColor, W as TypedElement, bA as ViewAutoLayout, bI as ViewChange, bH as ViewManualLayout, ba as ViewRule, b6 as ViewRuleAutoLayout, a$ as ViewRuleGlobalPredicateRef, b2 as ViewRuleGlobalStyle, b8 as ViewRuleGroup, aZ as ViewRulePredicate, b4 as ViewRuleStyleOrGlobalRef, by as ViewWithHash, bz as ViewWithNotation, aK as WhereOperator, a2 as WildcardExpr, X as XYPoint, bw as extractStep, bG as getBBoxCenter, bx as getParallelStepsPrefix, aH as isAndOperator, b5 as isAutoLayoutDirection, bD as isComputedDynamicView, bE as isComputedElementView, a1 as isCustomElement, aq as isCustomRelationExpr, bp as isDynamicView, bk as isDynamicViewIncludeRule, bn as isDynamicViewParallelSteps, a9 as isElement, a5 as isElementKindExpr, ad as isElementPredicateExpr, _ as isElementRef, a7 as isElementTagExpr, bq as isElementView, ab as isElementWhere, a0 as isExpandedElementExpr, br as isExtendsElementView, ah as isInOut, aj as isIncoming, aD as isKindEqual, aF as isNotOperator, aJ as isOrOperator, al as isOutgoing, af as isRelation, an as isRelationExpression, as as isRelationPredicateExpr, ap as isRelationWhere, bs as isScopedElementView, bv as isStepEdgeId, aB as isTagEqual, aT as isThemeColor, b7 as isViewRuleAutoLayout, b0 as isViewRuleGlobalPredicateRef, b3 as isViewRuleGlobalStyle, b9 as isViewRuleGroup, a_ as isViewRulePredicate, b1 as isViewRuleStyle, a3 as isWildcard, aM as whereOperatorAsPredicate } from './shared/core.CoLQkcYL.js';
 
 type KeysOf<T> = keyof T extends infer K extends string ? K : never;
 type BuilderSpecification = {
@@ -784,6 +784,10 @@ declare namespace LikeC4Model {
         siblings(): readonly ElementModel<M>[];
         descendants(): readonly ElementModel<M>[];
         children(): readonly ElementModel<M>[];
+        /**
+         * First 'view of' current element
+         */
+        viewOf(): M;
         /**
          * All views 'view of' current element
          */

package/dist/index.mjs

@@ -1,8 +1,8 @@
-import { u as u$2, i as isElementPredicateExpr, n as n$2, a as invariant, b as isScopedElementView, D as DefaultThemeColor, c as DefaultElementShape, e, d as nonNullable, f as DefaultRelationshipColor } from './shared/core.zYtlWYjW.mjs';
-export { A as AsFqn, B as BorderStyles, a2 as ComputedNode, N as DefaultArrowType, M as DefaultLineStyle, a6 as DiagramNode, E as ElementKind, j as ElementShapes, g as Expr, _ as StepEdgeId, a0 as extractStep, a5 as getBBoxCenter, a1 as getParallelStepsPrefix, J as isAndOperator, S as isAutoLayoutDirection, a3 as isComputedDynamicView, a4 as isComputedElementView, m as isCustomElement, C as isCustomRelationExpr, X as isDynamicView, V as isDynamicViewIncludeRule, W as isDynamicViewParallelSteps, r as isElement, p as isElementKindExpr, k as isElementRef, q as isElementTagExpr, Y as isElementView, s as isElementWhere, l as isExpandedElementExpr, Z as isExtendsElementView, v as isInOut, w as isIncoming, H as isKindEqual, I as isNotOperator, K as isOrOperator, x as isOutgoing, t as isRelation, y as isRelationExpression, F as isRelationPredicateExpr, z as isRelationWhere, $ as isStepEdgeId, G as isTagEqual, O as isThemeColor, T as isViewRuleAutoLayout, R as isViewRuleGlobalStyle, U as isViewRuleGroup, P as isViewRulePredicate, Q as isViewRuleStyle, o as isWildcard, h as nonexhaustive, L as whereOperatorAsPredicate } from './shared/core.zYtlWYjW.mjs';
+import { u as u$2, i as isElementPredicateExpr, n as n$2, a as invariant, b as isScopedElementView, D as DefaultThemeColor, c as DefaultElementShape, e, d as nonNullable, f as DefaultRelationshipColor } from './shared/core.v5DxGcX6.mjs';
+export { A as AsFqn, B as BorderStyles, a3 as ComputedNode, N as DefaultArrowType, M as DefaultLineStyle, a7 as DiagramNode, E as ElementKind, j as ElementShapes, g as Expr, $ as StepEdgeId, a1 as extractStep, a6 as getBBoxCenter, a2 as getParallelStepsPrefix, J as isAndOperator, T as isAutoLayoutDirection, a4 as isComputedDynamicView, a5 as isComputedElementView, m as isCustomElement, C as isCustomRelationExpr, Y as isDynamicView, W as isDynamicViewIncludeRule, X as isDynamicViewParallelSteps, r as isElement, p as isElementKindExpr, k as isElementRef, q as isElementTagExpr, Z as isElementView, s as isElementWhere, l as isExpandedElementExpr, _ as isExtendsElementView, v as isInOut, w as isIncoming, H as isKindEqual, I as isNotOperator, K as isOrOperator, x as isOutgoing, t as isRelation, y as isRelationExpression, F as isRelationPredicateExpr, z as isRelationWhere, a0 as isStepEdgeId, G as isTagEqual, O as isThemeColor, U as isViewRuleAutoLayout, Q as isViewRuleGlobalPredicateRef, S as isViewRuleGlobalStyle, V as isViewRuleGroup, P as isViewRulePredicate, R as isViewRuleStyle, o as isWildcard, h as nonexhaustive, L as whereOperatorAsPredicate } from './shared/core.v5DxGcX6.mjs';
 import defu from 'defu';
 
-function d$1(...e){return u$2(a,e,o$3)}var a=(e,n)=>e.length<n.length?e.map((t,r)=>[t,n[r]]):n.map((t,r)=>[e[r],t]),o$3=e=>(n,t)=>({hasNext:!0,next:[n,e[t]],done:t>=e.length-1});
+function d$1(...e){return u$2(a,e,o$4)}var a=(e,n)=>e.length<n.length?e.map((t,r)=>[t,n[r]]):n.map((t,r)=>[e[r],t]),o$4=e=>(n,t)=>({hasNext:!0,next:[n,e[t]],done:t>=e.length-1});
 
 var s={done:!1,hasNext:!1};
 
@@ -14,6 +14,8 @@ function i$3(...e){return u$2(r,e)}var r=(e,t)=>e.length>=t;
 
 function u$1(...e){return u$2(i$2,e)}function i$2(e,a){let n=[];for(let[o,r]of e.entries()){if(!a(r,o,e))break;n.push(r);}return n}
 
+function m$1(...r){return u$2(o$3,r)}function o$3(r,t){let e=[...r];return e.sort(t),e}
+
 function o$2(r,n){let e=Math.ceil(r),t=Math.floor(n);if(t<e)throw new RangeError(`randomInteger: The range [${r.toString()},${n.toString()}] contains no integer`);return Math.floor(Math.random()*(t-e+1)+e)}
 
 function i$1(...e){return u$2(u,e)}function u(e,o){let t={};for(let[r,n]of Object.entries(e))o(n,r,e)&&(t[r]=n);return t}
@@ -403,7 +405,11 @@ function $rules(...rules) {
   return (b) => rules.reduce((b2, rule) => rule(b2), b);
 }
 
-function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _globals = { styles: [] }, _views = /* @__PURE__ */ new Map()) {
+function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _views = /* @__PURE__ */ new Map(), _globals = {
+  predicates: {},
+  dynamicPredicates: {},
+  styles: {}
+}) {
   const toLikeC4Specification = () => ({
     tags: spec.tags ?? [],
     elements: {
@@ -462,8 +468,8 @@ function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _
       structuredClone(spec),
       structuredClone(_elements),
       structuredClone(_relations),
-      structuredClone(_globals),
-      structuredClone(_views)
+      structuredClone(_views),
+      structuredClone(_globals)
     ),
     __model: () => ({
       addElement: (element) => {
@@ -518,9 +524,7 @@ function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _
       specification: toLikeC4Specification(),
       elements: n(Array.from(_elements.entries())),
       relations: l$1(_relations, (r) => [r.id, r]),
-      globals: {
-        styles: l$1(_globals.styles, (s) => [s.id, s])
-      },
+      globals: structuredClone(_globals),
       views: n(Array.from(_views.entries()))
     }),
     helpers: () => ({
@@ -4866,7 +4870,11 @@ class LikeC4Model {
       this.addRelation(rel);
     }
     this._views = new Map(
-      r$1(views).map((view) => [view.id, new ViewModelClass(view, this)])
+      x(
+        r$1(views),
+        m$1((a, b) => compareNatural(a.title ?? "untitled", b.title ?? "untitled")),
+        m((view) => [view.id, new ViewModelClass(view, this)])
+      )
     );
   }
   _elements = /* @__PURE__ */ new Map();
@@ -5248,6 +5256,12 @@ class LikeC4Model {
     children() {
       return this.model.children(this);
     }
+    /**
+     * First 'view of' current element
+     */
+    viewOf() {
+      return this.model.views().find((v) => v.viewOf?.id === this.id) ?? null;
+    }
     /**
      * All views 'view of' current element
      */

package/dist/shared/{core.CpdWcGpN.d.cts → core.CoLQkcYL.d.cts}

@@ -1,8 +1,8 @@
-import { Tagged, LiteralUnion, TupleToUnion } from 'type-fest';
+import { Tagged, LiteralUnion, TupleToUnion, NonEmptyTuple } from 'type-fest';
 
 type NonEmptyArray<T> = [T, ...T[]];
 type NonEmptyReadonlyArray<T> = readonly [T, ...T[]];
-type IconUrl = Tagged<string, 'IconUrl'>;
+type IconUrl = Tagged<string, 'IconUrl'> | 'none';
 type CustomColor = string;
 type Point = readonly [x: number, y: number];
 interface XYPoint {
@@ -142,10 +142,15 @@ type Filterable<FTag extends string = string, FKind extends string = string> = {
 type OperatorPredicate<V extends Filterable> = (value: V) => boolean;
 declare function whereOperatorAsPredicate<FTag extends string = string, FKind extends string = string>(operator: WhereOperator<FTag, FKind>): OperatorPredicate<Filterable<FTag, FKind>>;
 
+type GlobalPredicateId = Tagged<string, 'GlobalPredicateId'>;
+type GlobalPredicates = NonEmptyArray<ViewRulePredicate>;
+type GlobalDynamicPredicates = NonEmptyArray<DynamicViewIncludeRule>;
 type GlobalStyleID = Tagged<string, 'GlobalStyleID'>;
-interface GlobalStyle {
-    readonly id: GlobalStyleID;
-    readonly styles: NonEmptyArray<ViewRuleStyle>;
+type GlobalStyles = NonEmptyTuple<ViewRuleStyle>;
+interface ModelGlobals {
+    predicates: Record<GlobalPredicateId, GlobalPredicates>;
+    dynamicPredicates: Record<GlobalPredicateId, GlobalDynamicPredicates>;
+    styles: Record<GlobalStyleID, GlobalStyles>;
 }
 
 type ElementNotation = {
@@ -164,6 +169,10 @@ type ViewRulePredicate = {
     exclude: Expression[];
 };
 declare function isViewRulePredicate(rule: ViewRule): rule is ViewRulePredicate;
+interface ViewRuleGlobalPredicateRef {
+    predicateId: GlobalPredicateId;
+}
+declare function isViewRuleGlobalPredicateRef(rule: ViewRule): rule is ViewRuleGlobalPredicateRef;
 interface ViewRuleStyle {
     targets: ElementExpression[];
     notation?: string;
@@ -195,7 +204,7 @@ interface ViewRuleGroup {
     opacity?: number;
 }
 declare function isViewRuleGroup(rule: ViewRule): rule is ViewRuleGroup;
-type ViewRule = ViewRulePredicate | ViewRuleGroup | ViewRuleStyle | ViewRuleGlobalStyle | ViewRuleAutoLayout;
+type ViewRule = ViewRulePredicate | ViewRuleGlobalPredicateRef | ViewRuleGroup | ViewRuleStyle | ViewRuleGlobalStyle | ViewRuleAutoLayout;
 interface BasicView<ViewType extends 'element' | 'dynamic', ViewIDs extends string, Tags extends string> {
     readonly __?: ViewType;
     readonly id: ViewID<ViewIDs>;
@@ -258,7 +267,7 @@ type DynamicViewIncludeRule = {
     include: ElementPredicateExpression[];
 };
 declare function isDynamicViewIncludeRule(rule: DynamicViewRule): rule is DynamicViewIncludeRule;
-type DynamicViewRule = DynamicViewIncludeRule | ViewRuleStyle | ViewRuleGlobalStyle | ViewRuleAutoLayout;
+type DynamicViewRule = DynamicViewIncludeRule | ViewRuleGlobalPredicateRef | ViewRuleStyle | ViewRuleGlobalStyle | ViewRuleAutoLayout;
 interface DynamicView<ViewIDs extends string = string, Tags extends string = string> extends BasicView<'dynamic', ViewIDs, Tags> {
     readonly __: 'dynamic';
     readonly steps: DynamicViewStepOrParallel[];
@@ -639,9 +648,7 @@ interface ParsedLikeC4Model<ElementKinds extends string = string, RelationKinds
     };
     elements: Record<Fqns, TypedElement<Fqns, ElementKinds, Tags>>;
     relations: Record<RelationID, Relation>;
-    globals: {
-        styles: Record<GlobalStyleID, GlobalStyle>;
-    };
+    globals: ModelGlobals;
     views: Record<Views, LikeC4View<Views, Tags>>;
 }
 /**
@@ -724,4 +731,4 @@ declare namespace ViewChange {
 }
 type ViewChange = ViewChange.ChangeElementStyle | ViewChange.SaveManualLayout | ViewChange.ChangeAutoLayout;
 
-export { type ExpandedElementExpr as $, type AutoLayoutDirection as A, type BorderStyle as B, type Color as C, type DiagramView as D, type ElementKindSpecification as E, type Fqn as F, AsFqn as G, type HexColorLiteral as H, type IconUrl as I, BorderStyles as J, ElementShapes as K, type LikeC4View as L, DefaultThemeColor as M, type NonEmptyArray as N, DefaultElementShape as O, type ParsedLikeC4Model as P, type ElementStyle as Q, type RelationshipKindSpecification as R, type TagSpec as S, type ThemeColorValues as T, type Link as U, type ViewRuleStyle as V, type TypedElement as W, type XYPoint as X, type ElementKindSpecificationStyle as Y, type ElementRefExpr as Z, isElementRef as _, type ElementShape as a, isAutoLayoutDirection as a$, isExpandedElementExpr as a0, isCustomElement as a1, type WildcardExpr as a2, isWildcard as a3, type ElementKindExpr as a4, isElementKindExpr as a5, type ElementTagExpr as a6, isElementTagExpr as a7, type ElementExpression as a8, isElement as a9, type NotOperator as aA, isNotOperator as aB, type AndOperator as aC, isAndOperator as aD, type OrOperator as aE, isOrOperator as aF, type WhereOperator as aG, type Filterable as aH, whereOperatorAsPredicate as aI, OverviewGraph as aJ, DefaultLineStyle as aK, DefaultArrowType as aL, DefaultRelationshipColor as aM, type ThemeColor as aN, type ColorLiteral as aO, isThemeColor as aP, type ElementThemeColorValues as aQ, type ElementThemeColors as aR, type RelationshipThemeColorValues as aS, type RelationshipThemeColors as aT, type LikeC4Theme as aU, type ViewRulePredicate as aV, isViewRulePredicate as aW, isViewRuleStyle as aX, type ViewRuleGlobalStyle as aY, isViewRuleGlobalStyle as aZ, type ViewRuleStyleOrGlobalRef as a_, type ElementWhereExpr as aa, isElementWhere as ab, type ElementPredicateExpression as ac, isElementPredicateExpr as ad, type RelationExpr as ae, isRelation as af, type InOutExpr as ag, isInOut as ah, type IncomingExpr as ai, isIncoming as aj, type OutgoingExpr as ak, isOutgoing as al, type RelationExpression as am, isRelationExpression as an, type RelationWhereExpr as ao, isRelationWhere as ap, isCustomRelationExpr as aq, type RelationPredicateExpression as ar, isRelationPredicateExpr as as, type GlobalStyleID as at, type GlobalStyle as au, type EqualOperator as av, type TagEqual as aw, isTagEqual as ax, type KindEqual as ay, isKindEqual as az, type RelationshipArrowType as b, type ViewRuleAutoLayout as b0, isViewRuleAutoLayout as b1, type ViewRuleGroup as b2, isViewRuleGroup as b3, type ViewRule as b4, type BasicView as b5, type BasicElementView as b6, type ScopedElementView as b7, type ExtendsElementView as b8, type ElementView as b9, getBBoxCenter as bA, type ViewManualLayout as bB, ViewChange as bC, type ElementNotation as bD, type DynamicViewStep as ba, type DynamicViewParallelSteps as bb, type DynamicViewStepOrParallel as bc, type DynamicViewIncludeRule as bd, isDynamicViewIncludeRule as be, type DynamicViewRule as bf, type DynamicView as bg, isDynamicViewParallelSteps as bh, type CustomColorDefinitions as bi, isDynamicView as bj, isElementView as bk, isExtendsElementView as bl, isScopedElementView as bm, type StepEdgeIdLiteral as bn, StepEdgeId as bo, isStepEdgeId as bp, extractStep as bq, getParallelStepsPrefix as br, type ViewWithHash as bs, type ViewWithNotation as bt, type ViewAutoLayout as bu, type ComputedElementView as bv, type ComputedDynamicView as bw, isComputedDynamicView as bx, isComputedElementView as by, type BBox as bz, type RelationshipLineType as c, type Element as d, type Relation as e, type Expression as f, type CustomElementExpr as g, type CustomRelationExpr as h, type RelationID as i, type ViewID as j, type EdgeId as k, type ComputedView as l, type Tag as m, ComputedNode as n, type NodeId as o, ElementKind as p, type ComputedEdge as q, type ComputedLikeC4Model as r, type LayoutedLikeC4Model as s, type RelationshipKind as t, DiagramNode as u, type DiagramEdge as v, expression as w, type NonEmptyReadonlyArray as x, type CustomColor as y, type Point as z };
+export { type ExpandedElementExpr as $, type AutoLayoutDirection as A, type BorderStyle as B, type Color as C, type DiagramView as D, type ElementKindSpecification as E, type Fqn as F, AsFqn as G, type HexColorLiteral as H, type IconUrl as I, BorderStyles as J, ElementShapes as K, type LikeC4View as L, DefaultThemeColor as M, type NonEmptyArray as N, DefaultElementShape as O, type ParsedLikeC4Model as P, type ElementStyle as Q, type RelationshipKindSpecification as R, type TagSpec as S, type ThemeColorValues as T, type Link as U, type ViewRuleStyle as V, type TypedElement as W, type XYPoint as X, type ElementKindSpecificationStyle as Y, type ElementRefExpr as Z, isElementRef as _, type ElementShape as a, type ViewRuleGlobalPredicateRef as a$, isExpandedElementExpr as a0, isCustomElement as a1, type WildcardExpr as a2, isWildcard as a3, type ElementKindExpr as a4, isElementKindExpr as a5, type ElementTagExpr as a6, isElementTagExpr as a7, type ElementExpression as a8, isElement as a9, type TagEqual as aA, isTagEqual as aB, type KindEqual as aC, isKindEqual as aD, type NotOperator as aE, isNotOperator as aF, type AndOperator as aG, isAndOperator as aH, type OrOperator as aI, isOrOperator as aJ, type WhereOperator as aK, type Filterable as aL, whereOperatorAsPredicate as aM, OverviewGraph as aN, DefaultLineStyle as aO, DefaultArrowType as aP, DefaultRelationshipColor as aQ, type ThemeColor as aR, type ColorLiteral as aS, isThemeColor as aT, type ElementThemeColorValues as aU, type ElementThemeColors as aV, type RelationshipThemeColorValues as aW, type RelationshipThemeColors as aX, type LikeC4Theme as aY, type ViewRulePredicate as aZ, isViewRulePredicate as a_, type ElementWhereExpr as aa, isElementWhere as ab, type ElementPredicateExpression as ac, isElementPredicateExpr as ad, type RelationExpr as ae, isRelation as af, type InOutExpr as ag, isInOut as ah, type IncomingExpr as ai, isIncoming as aj, type OutgoingExpr as ak, isOutgoing as al, type RelationExpression as am, isRelationExpression as an, type RelationWhereExpr as ao, isRelationWhere as ap, isCustomRelationExpr as aq, type RelationPredicateExpression as ar, isRelationPredicateExpr as as, type GlobalPredicateId as at, type GlobalPredicates as au, type GlobalDynamicPredicates as av, type GlobalStyleID as aw, type GlobalStyles as ax, type ModelGlobals as ay, type EqualOperator as az, type RelationshipArrowType as b, isViewRuleGlobalPredicateRef as b0, isViewRuleStyle as b1, type ViewRuleGlobalStyle as b2, isViewRuleGlobalStyle as b3, type ViewRuleStyleOrGlobalRef as b4, isAutoLayoutDirection as b5, type ViewRuleAutoLayout as b6, isViewRuleAutoLayout as b7, type ViewRuleGroup as b8, isViewRuleGroup as b9, type ViewAutoLayout as bA, type ComputedElementView as bB, type ComputedDynamicView as bC, isComputedDynamicView as bD, isComputedElementView as bE, type BBox as bF, getBBoxCenter as bG, type ViewManualLayout as bH, ViewChange as bI, type ElementNotation as bJ, type ViewRule as ba, type BasicView as bb, type BasicElementView as bc, type ScopedElementView as bd, type ExtendsElementView as be, type ElementView as bf, type DynamicViewStep as bg, type DynamicViewParallelSteps as bh, type DynamicViewStepOrParallel as bi, type DynamicViewIncludeRule as bj, isDynamicViewIncludeRule as bk, type DynamicViewRule as bl, type DynamicView as bm, isDynamicViewParallelSteps as bn, type CustomColorDefinitions as bo, isDynamicView as bp, isElementView as bq, isExtendsElementView as br, isScopedElementView as bs, type StepEdgeIdLiteral as bt, StepEdgeId as bu, isStepEdgeId as bv, extractStep as bw, getParallelStepsPrefix as bx, type ViewWithHash as by, type ViewWithNotation as bz, type RelationshipLineType as c, type Element as d, type Relation as e, type Expression as f, type CustomElementExpr as g, type CustomRelationExpr as h, type RelationID as i, type ViewID as j, type EdgeId as k, type ComputedView as l, type Tag as m, ComputedNode as n, type NodeId as o, ElementKind as p, type ComputedEdge as q, type ComputedLikeC4Model as r, type LayoutedLikeC4Model as s, type RelationshipKind as t, DiagramNode as u, type DiagramEdge as v, expression as w, type NonEmptyReadonlyArray as x, type CustomColor as y, type Point as z };

package/dist/shared/{core.CpdWcGpN.d.mts → core.CoLQkcYL.d.mts}

@@ -1,8 +1,8 @@
-import { Tagged, LiteralUnion, TupleToUnion } from 'type-fest';
+import { Tagged, LiteralUnion, TupleToUnion, NonEmptyTuple } from 'type-fest';
 
 type NonEmptyArray<T> = [T, ...T[]];
 type NonEmptyReadonlyArray<T> = readonly [T, ...T[]];
-type IconUrl = Tagged<string, 'IconUrl'>;
+type IconUrl = Tagged<string, 'IconUrl'> | 'none';
 type CustomColor = string;
 type Point = readonly [x: number, y: number];
 interface XYPoint {
@@ -142,10 +142,15 @@ type Filterable<FTag extends string = string, FKind extends string = string> = {
 type OperatorPredicate<V extends Filterable> = (value: V) => boolean;
 declare function whereOperatorAsPredicate<FTag extends string = string, FKind extends string = string>(operator: WhereOperator<FTag, FKind>): OperatorPredicate<Filterable<FTag, FKind>>;
 
+type GlobalPredicateId = Tagged<string, 'GlobalPredicateId'>;
+type GlobalPredicates = NonEmptyArray<ViewRulePredicate>;
+type GlobalDynamicPredicates = NonEmptyArray<DynamicViewIncludeRule>;
 type GlobalStyleID = Tagged<string, 'GlobalStyleID'>;
-interface GlobalStyle {
-    readonly id: GlobalStyleID;
-    readonly styles: NonEmptyArray<ViewRuleStyle>;
+type GlobalStyles = NonEmptyTuple<ViewRuleStyle>;
+interface ModelGlobals {
+    predicates: Record<GlobalPredicateId, GlobalPredicates>;
+    dynamicPredicates: Record<GlobalPredicateId, GlobalDynamicPredicates>;
+    styles: Record<GlobalStyleID, GlobalStyles>;
 }
 
 type ElementNotation = {
@@ -164,6 +169,10 @@ type ViewRulePredicate = {
     exclude: Expression[];
 };
 declare function isViewRulePredicate(rule: ViewRule): rule is ViewRulePredicate;
+interface ViewRuleGlobalPredicateRef {
+    predicateId: GlobalPredicateId;
+}
+declare function isViewRuleGlobalPredicateRef(rule: ViewRule): rule is ViewRuleGlobalPredicateRef;
 interface ViewRuleStyle {
     targets: ElementExpression[];
     notation?: string;
@@ -195,7 +204,7 @@ interface ViewRuleGroup {
     opacity?: number;
 }
 declare function isViewRuleGroup(rule: ViewRule): rule is ViewRuleGroup;
-type ViewRule = ViewRulePredicate | ViewRuleGroup | ViewRuleStyle | ViewRuleGlobalStyle | ViewRuleAutoLayout;
+type ViewRule = ViewRulePredicate | ViewRuleGlobalPredicateRef | ViewRuleGroup | ViewRuleStyle | ViewRuleGlobalStyle | ViewRuleAutoLayout;
 interface BasicView<ViewType extends 'element' | 'dynamic', ViewIDs extends string, Tags extends string> {
     readonly __?: ViewType;
     readonly id: ViewID<ViewIDs>;
@@ -258,7 +267,7 @@ type DynamicViewIncludeRule = {
     include: ElementPredicateExpression[];
 };
 declare function isDynamicViewIncludeRule(rule: DynamicViewRule): rule is DynamicViewIncludeRule;
-type DynamicViewRule = DynamicViewIncludeRule | ViewRuleStyle | ViewRuleGlobalStyle | ViewRuleAutoLayout;
+type DynamicViewRule = DynamicViewIncludeRule | ViewRuleGlobalPredicateRef | ViewRuleStyle | ViewRuleGlobalStyle | ViewRuleAutoLayout;
 interface DynamicView<ViewIDs extends string = string, Tags extends string = string> extends BasicView<'dynamic', ViewIDs, Tags> {
     readonly __: 'dynamic';
     readonly steps: DynamicViewStepOrParallel[];
@@ -639,9 +648,7 @@ interface ParsedLikeC4Model<ElementKinds extends string = string, RelationKinds
     };
     elements: Record<Fqns, TypedElement<Fqns, ElementKinds, Tags>>;
     relations: Record<RelationID, Relation>;
-    globals: {
-        styles: Record<GlobalStyleID, GlobalStyle>;
-    };
+    globals: ModelGlobals;
     views: Record<Views, LikeC4View<Views, Tags>>;
 }
 /**
@@ -724,4 +731,4 @@ declare namespace ViewChange {
 }
 type ViewChange = ViewChange.ChangeElementStyle | ViewChange.SaveManualLayout | ViewChange.ChangeAutoLayout;
 
-export { type ExpandedElementExpr as $, type AutoLayoutDirection as A, type BorderStyle as B, type Color as C, type DiagramView as D, type ElementKindSpecification as E, type Fqn as F, AsFqn as G, type HexColorLiteral as H, type IconUrl as I, BorderStyles as J, ElementShapes as K, type LikeC4View as L, DefaultThemeColor as M, type NonEmptyArray as N, DefaultElementShape as O, type ParsedLikeC4Model as P, type ElementStyle as Q, type RelationshipKindSpecification as R, type TagSpec as S, type ThemeColorValues as T, type Link as U, type ViewRuleStyle as V, type TypedElement as W, type XYPoint as X, type ElementKindSpecificationStyle as Y, type ElementRefExpr as Z, isElementRef as _, type ElementShape as a, isAutoLayoutDirection as a$, isExpandedElementExpr as a0, isCustomElement as a1, type WildcardExpr as a2, isWildcard as a3, type ElementKindExpr as a4, isElementKindExpr as a5, type ElementTagExpr as a6, isElementTagExpr as a7, type ElementExpression as a8, isElement as a9, type NotOperator as aA, isNotOperator as aB, type AndOperator as aC, isAndOperator as aD, type OrOperator as aE, isOrOperator as aF, type WhereOperator as aG, type Filterable as aH, whereOperatorAsPredicate as aI, OverviewGraph as aJ, DefaultLineStyle as aK, DefaultArrowType as aL, DefaultRelationshipColor as aM, type ThemeColor as aN, type ColorLiteral as aO, isThemeColor as aP, type ElementThemeColorValues as aQ, type ElementThemeColors as aR, type RelationshipThemeColorValues as aS, type RelationshipThemeColors as aT, type LikeC4Theme as aU, type ViewRulePredicate as aV, isViewRulePredicate as aW, isViewRuleStyle as aX, type ViewRuleGlobalStyle as aY, isViewRuleGlobalStyle as aZ, type ViewRuleStyleOrGlobalRef as a_, type ElementWhereExpr as aa, isElementWhere as ab, type ElementPredicateExpression as ac, isElementPredicateExpr as ad, type RelationExpr as ae, isRelation as af, type InOutExpr as ag, isInOut as ah, type IncomingExpr as ai, isIncoming as aj, type OutgoingExpr as ak, isOutgoing as al, type RelationExpression as am, isRelationExpression as an, type RelationWhereExpr as ao, isRelationWhere as ap, isCustomRelationExpr as aq, type RelationPredicateExpression as ar, isRelationPredicateExpr as as, type GlobalStyleID as at, type GlobalStyle as au, type EqualOperator as av, type TagEqual as aw, isTagEqual as ax, type KindEqual as ay, isKindEqual as az, type RelationshipArrowType as b, type ViewRuleAutoLayout as b0, isViewRuleAutoLayout as b1, type ViewRuleGroup as b2, isViewRuleGroup as b3, type ViewRule as b4, type BasicView as b5, type BasicElementView as b6, type ScopedElementView as b7, type ExtendsElementView as b8, type ElementView as b9, getBBoxCenter as bA, type ViewManualLayout as bB, ViewChange as bC, type ElementNotation as bD, type DynamicViewStep as ba, type DynamicViewParallelSteps as bb, type DynamicViewStepOrParallel as bc, type DynamicViewIncludeRule as bd, isDynamicViewIncludeRule as be, type DynamicViewRule as bf, type DynamicView as bg, isDynamicViewParallelSteps as bh, type CustomColorDefinitions as bi, isDynamicView as bj, isElementView as bk, isExtendsElementView as bl, isScopedElementView as bm, type StepEdgeIdLiteral as bn, StepEdgeId as bo, isStepEdgeId as bp, extractStep as bq, getParallelStepsPrefix as br, type ViewWithHash as bs, type ViewWithNotation as bt, type ViewAutoLayout as bu, type ComputedElementView as bv, type ComputedDynamicView as bw, isComputedDynamicView as bx, isComputedElementView as by, type BBox as bz, type RelationshipLineType as c, type Element as d, type Relation as e, type Expression as f, type CustomElementExpr as g, type CustomRelationExpr as h, type RelationID as i, type ViewID as j, type EdgeId as k, type ComputedView as l, type Tag as m, ComputedNode as n, type NodeId as o, ElementKind as p, type ComputedEdge as q, type ComputedLikeC4Model as r, type LayoutedLikeC4Model as s, type RelationshipKind as t, DiagramNode as u, type DiagramEdge as v, expression as w, type NonEmptyReadonlyArray as x, type CustomColor as y, type Point as z };
+export { type ExpandedElementExpr as $, type AutoLayoutDirection as A, type BorderStyle as B, type Color as C, type DiagramView as D, type ElementKindSpecification as E, type Fqn as F, AsFqn as G, type HexColorLiteral as H, type IconUrl as I, BorderStyles as J, ElementShapes as K, type LikeC4View as L, DefaultThemeColor as M, type NonEmptyArray as N, DefaultElementShape as O, type ParsedLikeC4Model as P, type ElementStyle as Q, type RelationshipKindSpecification as R, type TagSpec as S, type ThemeColorValues as T, type Link as U, type ViewRuleStyle as V, type TypedElement as W, type XYPoint as X, type ElementKindSpecificationStyle as Y, type ElementRefExpr as Z, isElementRef as _, type ElementShape as a, type ViewRuleGlobalPredicateRef as a$, isExpandedElementExpr as a0, isCustomElement as a1, type WildcardExpr as a2, isWildcard as a3, type ElementKindExpr as a4, isElementKindExpr as a5, type ElementTagExpr as a6, isElementTagExpr as a7, type ElementExpression as a8, isElement as a9, type TagEqual as aA, isTagEqual as aB, type KindEqual as aC, isKindEqual as aD, type NotOperator as aE, isNotOperator as aF, type AndOperator as aG, isAndOperator as aH, type OrOperator as aI, isOrOperator as aJ, type WhereOperator as aK, type Filterable as aL, whereOperatorAsPredicate as aM, OverviewGraph as aN, DefaultLineStyle as aO, DefaultArrowType as aP, DefaultRelationshipColor as aQ, type ThemeColor as aR, type ColorLiteral as aS, isThemeColor as aT, type ElementThemeColorValues as aU, type ElementThemeColors as aV, type RelationshipThemeColorValues as aW, type RelationshipThemeColors as aX, type LikeC4Theme as aY, type ViewRulePredicate as aZ, isViewRulePredicate as a_, type ElementWhereExpr as aa, isElementWhere as ab, type ElementPredicateExpression as ac, isElementPredicateExpr as ad, type RelationExpr as ae, isRelation as af, type InOutExpr as ag, isInOut as ah, type IncomingExpr as ai, isIncoming as aj, type OutgoingExpr as ak, isOutgoing as al, type RelationExpression as am, isRelationExpression as an, type RelationWhereExpr as ao, isRelationWhere as ap, isCustomRelationExpr as aq, type RelationPredicateExpression as ar, isRelationPredicateExpr as as, type GlobalPredicateId as at, type GlobalPredicates as au, type GlobalDynamicPredicates as av, type GlobalStyleID as aw, type GlobalStyles as ax, type ModelGlobals as ay, type EqualOperator as az, type RelationshipArrowType as b, isViewRuleGlobalPredicateRef as b0, isViewRuleStyle as b1, type ViewRuleGlobalStyle as b2, isViewRuleGlobalStyle as b3, type ViewRuleStyleOrGlobalRef as b4, isAutoLayoutDirection as b5, type ViewRuleAutoLayout as b6, isViewRuleAutoLayout as b7, type ViewRuleGroup as b8, isViewRuleGroup as b9, type ViewAutoLayout as bA, type ComputedElementView as bB, type ComputedDynamicView as bC, isComputedDynamicView as bD, isComputedElementView as bE, type BBox as bF, getBBoxCenter as bG, type ViewManualLayout as bH, ViewChange as bI, type ElementNotation as bJ, type ViewRule as ba, type BasicView as bb, type BasicElementView as bc, type ScopedElementView as bd, type ExtendsElementView as be, type ElementView as bf, type DynamicViewStep as bg, type DynamicViewParallelSteps as bh, type DynamicViewStepOrParallel as bi, type DynamicViewIncludeRule as bj, isDynamicViewIncludeRule as bk, type DynamicViewRule as bl, type DynamicView as bm, isDynamicViewParallelSteps as bn, type CustomColorDefinitions as bo, isDynamicView as bp, isElementView as bq, isExtendsElementView as br, isScopedElementView as bs, type StepEdgeIdLiteral as bt, StepEdgeId as bu, isStepEdgeId as bv, extractStep as bw, getParallelStepsPrefix as bx, type ViewWithHash as by, type ViewWithNotation as bz, type RelationshipLineType as c, type Element as d, type Relation as e, type Expression as f, type CustomElementExpr as g, type CustomRelationExpr as h, type RelationID as i, type ViewID as j, type EdgeId as k, type ComputedView as l, type Tag as m, ComputedNode as n, type NodeId as o, ElementKind as p, type ComputedEdge as q, type ComputedLikeC4Model as r, type LayoutedLikeC4Model as s, type RelationshipKind as t, DiagramNode as u, type DiagramEdge as v, expression as w, type NonEmptyReadonlyArray as x, type CustomColor as y, type Point as z };

package/dist/shared/{core.CpdWcGpN.d.ts → core.CoLQkcYL.d.ts}

@@ -1,8 +1,8 @@
-import { Tagged, LiteralUnion, TupleToUnion } from 'type-fest';
+import { Tagged, LiteralUnion, TupleToUnion, NonEmptyTuple } from 'type-fest';
 
 type NonEmptyArray<T> = [T, ...T[]];
 type NonEmptyReadonlyArray<T> = readonly [T, ...T[]];
-type IconUrl = Tagged<string, 'IconUrl'>;
+type IconUrl = Tagged<string, 'IconUrl'> | 'none';
 type CustomColor = string;
 type Point = readonly [x: number, y: number];
 interface XYPoint {
@@ -142,10 +142,15 @@ type Filterable<FTag extends string = string, FKind extends string = string> = {
 type OperatorPredicate<V extends Filterable> = (value: V) => boolean;
 declare function whereOperatorAsPredicate<FTag extends string = string, FKind extends string = string>(operator: WhereOperator<FTag, FKind>): OperatorPredicate<Filterable<FTag, FKind>>;
 
+type GlobalPredicateId = Tagged<string, 'GlobalPredicateId'>;
+type GlobalPredicates = NonEmptyArray<ViewRulePredicate>;
+type GlobalDynamicPredicates = NonEmptyArray<DynamicViewIncludeRule>;
 type GlobalStyleID = Tagged<string, 'GlobalStyleID'>;
-interface GlobalStyle {
-    readonly id: GlobalStyleID;
-    readonly styles: NonEmptyArray<ViewRuleStyle>;
+type GlobalStyles = NonEmptyTuple<ViewRuleStyle>;
+interface ModelGlobals {
+    predicates: Record<GlobalPredicateId, GlobalPredicates>;
+    dynamicPredicates: Record<GlobalPredicateId, GlobalDynamicPredicates>;
+    styles: Record<GlobalStyleID, GlobalStyles>;
 }
 
 type ElementNotation = {
@@ -164,6 +169,10 @@ type ViewRulePredicate = {
     exclude: Expression[];
 };
 declare function isViewRulePredicate(rule: ViewRule): rule is ViewRulePredicate;
+interface ViewRuleGlobalPredicateRef {
+    predicateId: GlobalPredicateId;
+}
+declare function isViewRuleGlobalPredicateRef(rule: ViewRule): rule is ViewRuleGlobalPredicateRef;
 interface ViewRuleStyle {
     targets: ElementExpression[];
     notation?: string;
@@ -195,7 +204,7 @@ interface ViewRuleGroup {
     opacity?: number;
 }
 declare function isViewRuleGroup(rule: ViewRule): rule is ViewRuleGroup;
-type ViewRule = ViewRulePredicate | ViewRuleGroup | ViewRuleStyle | ViewRuleGlobalStyle | ViewRuleAutoLayout;
+type ViewRule = ViewRulePredicate | ViewRuleGlobalPredicateRef | ViewRuleGroup | ViewRuleStyle | ViewRuleGlobalStyle | ViewRuleAutoLayout;
 interface BasicView<ViewType extends 'element' | 'dynamic', ViewIDs extends string, Tags extends string> {
     readonly __?: ViewType;
     readonly id: ViewID<ViewIDs>;
@@ -258,7 +267,7 @@ type DynamicViewIncludeRule = {
     include: ElementPredicateExpression[];
 };
 declare function isDynamicViewIncludeRule(rule: DynamicViewRule): rule is DynamicViewIncludeRule;
-type DynamicViewRule = DynamicViewIncludeRule | ViewRuleStyle | ViewRuleGlobalStyle | ViewRuleAutoLayout;
+type DynamicViewRule = DynamicViewIncludeRule | ViewRuleGlobalPredicateRef | ViewRuleStyle | ViewRuleGlobalStyle | ViewRuleAutoLayout;
 interface DynamicView<ViewIDs extends string = string, Tags extends string = string> extends BasicView<'dynamic', ViewIDs, Tags> {
     readonly __: 'dynamic';
     readonly steps: DynamicViewStepOrParallel[];
@@ -639,9 +648,7 @@ interface ParsedLikeC4Model<ElementKinds extends string = string, RelationKinds
     };
     elements: Record<Fqns, TypedElement<Fqns, ElementKinds, Tags>>;
     relations: Record<RelationID, Relation>;
-    globals: {
-        styles: Record<GlobalStyleID, GlobalStyle>;
-    };
+    globals: ModelGlobals;
     views: Record<Views, LikeC4View<Views, Tags>>;
 }
 /**
@@ -724,4 +731,4 @@ declare namespace ViewChange {
 }
 type ViewChange = ViewChange.ChangeElementStyle | ViewChange.SaveManualLayout | ViewChange.ChangeAutoLayout;
 
-export { type ExpandedElementExpr as $, type AutoLayoutDirection as A, type BorderStyle as B, type Color as C, type DiagramView as D, type ElementKindSpecification as E, type Fqn as F, AsFqn as G, type HexColorLiteral as H, type IconUrl as I, BorderStyles as J, ElementShapes as K, type LikeC4View as L, DefaultThemeColor as M, type NonEmptyArray as N, DefaultElementShape as O, type ParsedLikeC4Model as P, type ElementStyle as Q, type RelationshipKindSpecification as R, type TagSpec as S, type ThemeColorValues as T, type Link as U, type ViewRuleStyle as V, type TypedElement as W, type XYPoint as X, type ElementKindSpecificationStyle as Y, type ElementRefExpr as Z, isElementRef as _, type ElementShape as a, isAutoLayoutDirection as a$, isExpandedElementExpr as a0, isCustomElement as a1, type WildcardExpr as a2, isWildcard as a3, type ElementKindExpr as a4, isElementKindExpr as a5, type ElementTagExpr as a6, isElementTagExpr as a7, type ElementExpression as a8, isElement as a9, type NotOperator as aA, isNotOperator as aB, type AndOperator as aC, isAndOperator as aD, type OrOperator as aE, isOrOperator as aF, type WhereOperator as aG, type Filterable as aH, whereOperatorAsPredicate as aI, OverviewGraph as aJ, DefaultLineStyle as aK, DefaultArrowType as aL, DefaultRelationshipColor as aM, type ThemeColor as aN, type ColorLiteral as aO, isThemeColor as aP, type ElementThemeColorValues as aQ, type ElementThemeColors as aR, type RelationshipThemeColorValues as aS, type RelationshipThemeColors as aT, type LikeC4Theme as aU, type ViewRulePredicate as aV, isViewRulePredicate as aW, isViewRuleStyle as aX, type ViewRuleGlobalStyle as aY, isViewRuleGlobalStyle as aZ, type ViewRuleStyleOrGlobalRef as a_, type ElementWhereExpr as aa, isElementWhere as ab, type ElementPredicateExpression as ac, isElementPredicateExpr as ad, type RelationExpr as ae, isRelation as af, type InOutExpr as ag, isInOut as ah, type IncomingExpr as ai, isIncoming as aj, type OutgoingExpr as ak, isOutgoing as al, type RelationExpression as am, isRelationExpression as an, type RelationWhereExpr as ao, isRelationWhere as ap, isCustomRelationExpr as aq, type RelationPredicateExpression as ar, isRelationPredicateExpr as as, type GlobalStyleID as at, type GlobalStyle as au, type EqualOperator as av, type TagEqual as aw, isTagEqual as ax, type KindEqual as ay, isKindEqual as az, type RelationshipArrowType as b, type ViewRuleAutoLayout as b0, isViewRuleAutoLayout as b1, type ViewRuleGroup as b2, isViewRuleGroup as b3, type ViewRule as b4, type BasicView as b5, type BasicElementView as b6, type ScopedElementView as b7, type ExtendsElementView as b8, type ElementView as b9, getBBoxCenter as bA, type ViewManualLayout as bB, ViewChange as bC, type ElementNotation as bD, type DynamicViewStep as ba, type DynamicViewParallelSteps as bb, type DynamicViewStepOrParallel as bc, type DynamicViewIncludeRule as bd, isDynamicViewIncludeRule as be, type DynamicViewRule as bf, type DynamicView as bg, isDynamicViewParallelSteps as bh, type CustomColorDefinitions as bi, isDynamicView as bj, isElementView as bk, isExtendsElementView as bl, isScopedElementView as bm, type StepEdgeIdLiteral as bn, StepEdgeId as bo, isStepEdgeId as bp, extractStep as bq, getParallelStepsPrefix as br, type ViewWithHash as bs, type ViewWithNotation as bt, type ViewAutoLayout as bu, type ComputedElementView as bv, type ComputedDynamicView as bw, isComputedDynamicView as bx, isComputedElementView as by, type BBox as bz, type RelationshipLineType as c, type Element as d, type Relation as e, type Expression as f, type CustomElementExpr as g, type CustomRelationExpr as h, type RelationID as i, type ViewID as j, type EdgeId as k, type ComputedView as l, type Tag as m, ComputedNode as n, type NodeId as o, ElementKind as p, type ComputedEdge as q, type ComputedLikeC4Model as r, type LayoutedLikeC4Model as s, type RelationshipKind as t, DiagramNode as u, type DiagramEdge as v, expression as w, type NonEmptyReadonlyArray as x, type CustomColor as y, type Point as z };
+export { type ExpandedElementExpr as $, type AutoLayoutDirection as A, type BorderStyle as B, type Color as C, type DiagramView as D, type ElementKindSpecification as E, type Fqn as F, AsFqn as G, type HexColorLiteral as H, type IconUrl as I, BorderStyles as J, ElementShapes as K, type LikeC4View as L, DefaultThemeColor as M, type NonEmptyArray as N, DefaultElementShape as O, type ParsedLikeC4Model as P, type ElementStyle as Q, type RelationshipKindSpecification as R, type TagSpec as S, type ThemeColorValues as T, type Link as U, type ViewRuleStyle as V, type TypedElement as W, type XYPoint as X, type ElementKindSpecificationStyle as Y, type ElementRefExpr as Z, isElementRef as _, type ElementShape as a, type ViewRuleGlobalPredicateRef as a$, isExpandedElementExpr as a0, isCustomElement as a1, type WildcardExpr as a2, isWildcard as a3, type ElementKindExpr as a4, isElementKindExpr as a5, type ElementTagExpr as a6, isElementTagExpr as a7, type ElementExpression as a8, isElement as a9, type TagEqual as aA, isTagEqual as aB, type KindEqual as aC, isKindEqual as aD, type NotOperator as aE, isNotOperator as aF, type AndOperator as aG, isAndOperator as aH, type OrOperator as aI, isOrOperator as aJ, type WhereOperator as aK, type Filterable as aL, whereOperatorAsPredicate as aM, OverviewGraph as aN, DefaultLineStyle as aO, DefaultArrowType as aP, DefaultRelationshipColor as aQ, type ThemeColor as aR, type ColorLiteral as aS, isThemeColor as aT, type ElementThemeColorValues as aU, type ElementThemeColors as aV, type RelationshipThemeColorValues as aW, type RelationshipThemeColors as aX, type LikeC4Theme as aY, type ViewRulePredicate as aZ, isViewRulePredicate as a_, type ElementWhereExpr as aa, isElementWhere as ab, type ElementPredicateExpression as ac, isElementPredicateExpr as ad, type RelationExpr as ae, isRelation as af, type InOutExpr as ag, isInOut as ah, type IncomingExpr as ai, isIncoming as aj, type OutgoingExpr as ak, isOutgoing as al, type RelationExpression as am, isRelationExpression as an, type RelationWhereExpr as ao, isRelationWhere as ap, isCustomRelationExpr as aq, type RelationPredicateExpression as ar, isRelationPredicateExpr as as, type GlobalPredicateId as at, type GlobalPredicates as au, type GlobalDynamicPredicates as av, type GlobalStyleID as aw, type GlobalStyles as ax, type ModelGlobals as ay, type EqualOperator as az, type RelationshipArrowType as b, isViewRuleGlobalPredicateRef as b0, isViewRuleStyle as b1, type ViewRuleGlobalStyle as b2, isViewRuleGlobalStyle as b3, type ViewRuleStyleOrGlobalRef as b4, isAutoLayoutDirection as b5, type ViewRuleAutoLayout as b6, isViewRuleAutoLayout as b7, type ViewRuleGroup as b8, isViewRuleGroup as b9, type ViewAutoLayout as bA, type ComputedElementView as bB, type ComputedDynamicView as bC, isComputedDynamicView as bD, isComputedElementView as bE, type BBox as bF, getBBoxCenter as bG, type ViewManualLayout as bH, ViewChange as bI, type ElementNotation as bJ, type ViewRule as ba, type BasicView as bb, type BasicElementView as bc, type ScopedElementView as bd, type ExtendsElementView as be, type ElementView as bf, type DynamicViewStep as bg, type DynamicViewParallelSteps as bh, type DynamicViewStepOrParallel as bi, type DynamicViewIncludeRule as bj, isDynamicViewIncludeRule as bk, type DynamicViewRule as bl, type DynamicView as bm, isDynamicViewParallelSteps as bn, type CustomColorDefinitions as bo, isDynamicView as bp, isElementView as bq, isExtendsElementView as br, isScopedElementView as bs, type StepEdgeIdLiteral as bt, StepEdgeId as bu, isStepEdgeId as bv, extractStep as bw, getParallelStepsPrefix as bx, type ViewWithHash as by, type ViewWithNotation as bz, type RelationshipLineType as c, type Element as d, type Relation as e, type Expression as f, type CustomElementExpr as g, type CustomRelationExpr as h, type RelationID as i, type ViewID as j, type EdgeId as k, type ComputedView as l, type Tag as m, ComputedNode as n, type NodeId as o, ElementKind as p, type ComputedEdge as q, type ComputedLikeC4Model as r, type LayoutedLikeC4Model as s, type RelationshipKind as t, DiagramNode as u, type DiagramEdge as v, expression as w, type NonEmptyReadonlyArray as x, type CustomColor as y, type Point as z };

package/dist/shared/{core.zYtlWYjW.mjs → core.v5DxGcX6.mjs}

@@ -203,6 +203,9 @@ function isThemeColor(color) {
 function isViewRulePredicate(rule) {
   return "include" in rule && Array.isArray(rule.include) || "exclude" in rule && Array.isArray(rule.exclude);
 }
+function isViewRuleGlobalPredicateRef(rule) {
+  return "predicateId" in rule;
+}
 function isViewRuleStyle(rule) {
   return "style" in rule && "targets" in rule;
 }
@@ -287,4 +290,4 @@ var DiagramNode;
   DiagramNode2.isNodesGroup = isNodesGroup;
 })(DiagramNode || (DiagramNode = {}));
 
-export { isStepEdgeId as $, AsFqn as A, BorderStyles as B, isCustomRelationExpr as C, DefaultThemeColor as D, ElementKind as E, isRelationPredicateExpr as F, isTagEqual as G, isKindEqual as H, isNotOperator as I, isAndOperator as J, isOrOperator as K, whereOperatorAsPredicate as L, DefaultLineStyle as M, DefaultArrowType as N, isThemeColor as O, isViewRulePredicate as P, isViewRuleStyle as Q, isViewRuleGlobalStyle as R, isAutoLayoutDirection as S, isViewRuleAutoLayout as T, isViewRuleGroup as U, isDynamicViewIncludeRule as V, isDynamicViewParallelSteps as W, isDynamicView as X, isElementView as Y, isExtendsElementView as Z, StepEdgeId as _, invariant as a, extractStep as a0, getParallelStepsPrefix as a1, ComputedNode as a2, isComputedDynamicView as a3, isComputedElementView as a4, getBBoxCenter as a5, DiagramNode as a6, isScopedElementView as b, DefaultElementShape as c, nonNullable as d, e$1 as e, DefaultRelationshipColor as f, expression as g, nonexhaustive as h, isElementPredicateExpr as i, ElementShapes as j, isElementRef as k, isExpandedElementExpr as l, isCustomElement as m, n, isWildcard as o, isElementKindExpr as p, isElementTagExpr as q, isElement as r, isElementWhere as s, isRelation as t, u, isInOut as v, isIncoming as w, isOutgoing as x, isRelationExpression as y, isRelationWhere as z };
+export { StepEdgeId as $, AsFqn as A, BorderStyles as B, isCustomRelationExpr as C, DefaultThemeColor as D, ElementKind as E, isRelationPredicateExpr as F, isTagEqual as G, isKindEqual as H, isNotOperator as I, isAndOperator as J, isOrOperator as K, whereOperatorAsPredicate as L, DefaultLineStyle as M, DefaultArrowType as N, isThemeColor as O, isViewRulePredicate as P, isViewRuleGlobalPredicateRef as Q, isViewRuleStyle as R, isViewRuleGlobalStyle as S, isAutoLayoutDirection as T, isViewRuleAutoLayout as U, isViewRuleGroup as V, isDynamicViewIncludeRule as W, isDynamicViewParallelSteps as X, isDynamicView as Y, isElementView as Z, isExtendsElementView as _, invariant as a, isStepEdgeId as a0, extractStep as a1, getParallelStepsPrefix as a2, ComputedNode as a3, isComputedDynamicView as a4, isComputedElementView as a5, getBBoxCenter as a6, DiagramNode as a7, isScopedElementView as b, DefaultElementShape as c, nonNullable as d, e$1 as e, DefaultRelationshipColor as f, expression as g, nonexhaustive as h, isElementPredicateExpr as i, ElementShapes as j, isElementRef as k, isExpandedElementExpr as l, isCustomElement as m, n, isWildcard as o, isElementKindExpr as p, isElementTagExpr as q, isElement as r, isElementWhere as s, isRelation as t, u, isInOut as v, isIncoming as w, isOutgoing as x, isRelationExpression as y, isRelationWhere as z };

package/dist/shared/{core.Cq_6j35U.cjs → core.zN6ZscFQ.cjs}

@@ -205,6 +205,9 @@ function isThemeColor(color) {
 function isViewRulePredicate(rule) {
   return "include" in rule && Array.isArray(rule.include) || "exclude" in rule && Array.isArray(rule.exclude);
 }
+function isViewRuleGlobalPredicateRef(rule) {
+  return "predicateId" in rule;
+}
 function isViewRuleStyle(rule) {
   return "style" in rule && "targets" in rule;
 }
@@ -337,6 +340,7 @@ exports.isStepEdgeId = isStepEdgeId;
 exports.isTagEqual = isTagEqual;
 exports.isThemeColor = isThemeColor;
 exports.isViewRuleAutoLayout = isViewRuleAutoLayout;
+exports.isViewRuleGlobalPredicateRef = isViewRuleGlobalPredicateRef;
 exports.isViewRuleGlobalStyle = isViewRuleGlobalStyle;
 exports.isViewRuleGroup = isViewRuleGroup;
 exports.isViewRulePredicate = isViewRulePredicate;

package/dist/types/index.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const types_index = require('../shared/core.Cq_6j35U.cjs');
+const types_index = require('../shared/core.zN6ZscFQ.cjs');
 
 
 
@@ -61,6 +61,7 @@ exports.isStepEdgeId = types_index.isStepEdgeId;
 exports.isTagEqual = types_index.isTagEqual;
 exports.isThemeColor = types_index.isThemeColor;
 exports.isViewRuleAutoLayout = types_index.isViewRuleAutoLayout;
+exports.isViewRuleGlobalPredicateRef = types_index.isViewRuleGlobalPredicateRef;
 exports.isViewRuleGlobalStyle = types_index.isViewRuleGlobalStyle;
 exports.isViewRuleGroup = types_index.isViewRuleGroup;
 exports.isViewRulePredicate = types_index.isViewRulePredicate;

package/dist/types/index.d.cts

@@ -1,2 +1,2 @@
-export { aC as AndOperator, G as AsFqn, A as AutoLayoutDirection, bz as BBox, b6 as BasicElementView, b5 as BasicView, B as BorderStyle, J as BorderStyles, C as Color, aO as ColorLiteral, bw as ComputedDynamicView, q as ComputedEdge, bv as ComputedElementView, r as ComputedLikeC4Model, n as ComputedNode, l as ComputedView, y as CustomColor, bi as CustomColorDefinitions, g as CustomElementExpr, h as CustomRelationExpr, aL as DefaultArrowType, O as DefaultElementShape, aK as DefaultLineStyle, aM as DefaultRelationshipColor, M as DefaultThemeColor, v as DiagramEdge, u as DiagramNode, D as DiagramView, bg as DynamicView, bd as DynamicViewIncludeRule, bb as DynamicViewParallelSteps, bf as DynamicViewRule, ba as DynamicViewStep, bc as DynamicViewStepOrParallel, k as EdgeId, d as Element, a8 as ElementExpression, p as ElementKind, a4 as ElementKindExpr, E as ElementKindSpecification, Y as ElementKindSpecificationStyle, bD as ElementNotation, ac as ElementPredicateExpression, Z as ElementRefExpr, a as ElementShape, K as ElementShapes, Q as ElementStyle, a6 as ElementTagExpr, aQ as ElementThemeColorValues, aR as ElementThemeColors, b9 as ElementView, aa as ElementWhereExpr, av as EqualOperator, $ as ExpandedElementExpr, f as Expression, b8 as ExtendsElementView, aH as Filterable, F as Fqn, au as GlobalStyle, at as GlobalStyleID, H as HexColorLiteral, I as IconUrl, ag as InOutExpr, ai as IncomingExpr, ay as KindEqual, s as LayoutedLikeC4Model, aU as LikeC4Theme, L as LikeC4View, U as Link, o as NodeId, N as NonEmptyArray, x as NonEmptyReadonlyArray, aA as NotOperator, aE as OrOperator, ak as OutgoingExpr, aJ as OverviewGraph, P as ParsedLikeC4Model, z as Point, e as Relation, ae as RelationExpr, am as RelationExpression, i as RelationID, ar as RelationPredicateExpression, ao as RelationWhereExpr, b as RelationshipArrowType, t as RelationshipKind, R as RelationshipKindSpecification, c as RelationshipLineType, aS as RelationshipThemeColorValues, aT as RelationshipThemeColors, b7 as ScopedElementView, bo as StepEdgeId, bn as StepEdgeIdLiteral, m as Tag, aw as TagEqual, S as TagSpec, aN as ThemeColor, T as ThemeColorValues, W as TypedElement, bu as ViewAutoLayout, bC as ViewChange, j as ViewID, bB as ViewManualLayout, b4 as ViewRule, b0 as ViewRuleAutoLayout, aY as ViewRuleGlobalStyle, b2 as ViewRuleGroup, aV as ViewRulePredicate, V as ViewRuleStyle, a_ as ViewRuleStyleOrGlobalRef, bs as ViewWithHash, bt as ViewWithNotation, aG as WhereOperator, a2 as WildcardExpr, X as XYPoint, bq as extractStep, bA as getBBoxCenter, br as getParallelStepsPrefix, aD as isAndOperator, a$ as isAutoLayoutDirection, bx as isComputedDynamicView, by as isComputedElementView, a1 as isCustomElement, aq as isCustomRelationExpr, bj as isDynamicView, be as isDynamicViewIncludeRule, bh as isDynamicViewParallelSteps, a9 as isElement, a5 as isElementKindExpr, ad as isElementPredicateExpr, _ as isElementRef, a7 as isElementTagExpr, bk as isElementView, ab as isElementWhere, a0 as isExpandedElementExpr, bl as isExtendsElementView, ah as isInOut, aj as isIncoming, az as isKindEqual, aB as isNotOperator, aF as isOrOperator, al as isOutgoing, af as isRelation, an as isRelationExpression, as as isRelationPredicateExpr, ap as isRelationWhere, bm as isScopedElementView, bp as isStepEdgeId, ax as isTagEqual, aP as isThemeColor, b1 as isViewRuleAutoLayout, aZ as isViewRuleGlobalStyle, b3 as isViewRuleGroup, aW as isViewRulePredicate, aX as isViewRuleStyle, a3 as isWildcard, aI as whereOperatorAsPredicate } from '../shared/core.CpdWcGpN.cjs';
+export { aG as AndOperator, G as AsFqn, A as AutoLayoutDirection, bF as BBox, bc as BasicElementView, bb as BasicView, B as BorderStyle, J as BorderStyles, C as Color, aS as ColorLiteral, bC as ComputedDynamicView, q as ComputedEdge, bB as ComputedElementView, r as ComputedLikeC4Model, n as ComputedNode, l as ComputedView, y as CustomColor, bo as CustomColorDefinitions, g as CustomElementExpr, h as CustomRelationExpr, aP as DefaultArrowType, O as DefaultElementShape, aO as DefaultLineStyle, aQ as DefaultRelationshipColor, M as DefaultThemeColor, v as DiagramEdge, u as DiagramNode, D as DiagramView, bm as DynamicView, bj as DynamicViewIncludeRule, bh as DynamicViewParallelSteps, bl as DynamicViewRule, bg as DynamicViewStep, bi as DynamicViewStepOrParallel, k as EdgeId, d as Element, a8 as ElementExpression, p as ElementKind, a4 as ElementKindExpr, E as ElementKindSpecification, Y as ElementKindSpecificationStyle, bJ as ElementNotation, ac as ElementPredicateExpression, Z as ElementRefExpr, a as ElementShape, K as ElementShapes, Q as ElementStyle, a6 as ElementTagExpr, aU as ElementThemeColorValues, aV as ElementThemeColors, bf as ElementView, aa as ElementWhereExpr, az as EqualOperator, $ as ExpandedElementExpr, f as Expression, be as ExtendsElementView, aL as Filterable, F as Fqn, av as GlobalDynamicPredicates, at as GlobalPredicateId, au as GlobalPredicates, aw as GlobalStyleID, ax as GlobalStyles, H as HexColorLiteral, I as IconUrl, ag as InOutExpr, ai as IncomingExpr, aC as KindEqual, s as LayoutedLikeC4Model, aY as LikeC4Theme, L as LikeC4View, U as Link, ay as ModelGlobals, o as NodeId, N as NonEmptyArray, x as NonEmptyReadonlyArray, aE as NotOperator, aI as OrOperator, ak as OutgoingExpr, aN as OverviewGraph, P as ParsedLikeC4Model, z as Point, e as Relation, ae as RelationExpr, am as RelationExpression, i as RelationID, ar as RelationPredicateExpression, ao as RelationWhereExpr, b as RelationshipArrowType, t as RelationshipKind, R as RelationshipKindSpecification, c as RelationshipLineType, aW as RelationshipThemeColorValues, aX as RelationshipThemeColors, bd as ScopedElementView, bu as StepEdgeId, bt as StepEdgeIdLiteral, m as Tag, aA as TagEqual, S as TagSpec, aR as ThemeColor, T as ThemeColorValues, W as TypedElement, bA as ViewAutoLayout, bI as ViewChange, j as ViewID, bH as ViewManualLayout, ba as ViewRule, b6 as ViewRuleAutoLayout, a$ as ViewRuleGlobalPredicateRef, b2 as ViewRuleGlobalStyle, b8 as ViewRuleGroup, aZ as ViewRulePredicate, V as ViewRuleStyle, b4 as ViewRuleStyleOrGlobalRef, by as ViewWithHash, bz as ViewWithNotation, aK as WhereOperator, a2 as WildcardExpr, X as XYPoint, bw as extractStep, bG as getBBoxCenter, bx as getParallelStepsPrefix, aH as isAndOperator, b5 as isAutoLayoutDirection, bD as isComputedDynamicView, bE as isComputedElementView, a1 as isCustomElement, aq as isCustomRelationExpr, bp as isDynamicView, bk as isDynamicViewIncludeRule, bn as isDynamicViewParallelSteps, a9 as isElement, a5 as isElementKindExpr, ad as isElementPredicateExpr, _ as isElementRef, a7 as isElementTagExpr, bq as isElementView, ab as isElementWhere, a0 as isExpandedElementExpr, br as isExtendsElementView, ah as isInOut, aj as isIncoming, aD as isKindEqual, aF as isNotOperator, aJ as isOrOperator, al as isOutgoing, af as isRelation, an as isRelationExpression, as as isRelationPredicateExpr, ap as isRelationWhere, bs as isScopedElementView, bv as isStepEdgeId, aB as isTagEqual, aT as isThemeColor, b7 as isViewRuleAutoLayout, b0 as isViewRuleGlobalPredicateRef, b3 as isViewRuleGlobalStyle, b9 as isViewRuleGroup, a_ as isViewRulePredicate, b1 as isViewRuleStyle, a3 as isWildcard, aM as whereOperatorAsPredicate } from '../shared/core.CoLQkcYL.cjs';
 import 'type-fest';

package/dist/types/index.d.mts

@@ -1,2 +1,2 @@
-export { aC as AndOperator, G as AsFqn, A as AutoLayoutDirection, bz as BBox, b6 as BasicElementView, b5 as BasicView, B as BorderStyle, J as BorderStyles, C as Color, aO as ColorLiteral, bw as ComputedDynamicView, q as ComputedEdge, bv as ComputedElementView, r as ComputedLikeC4Model, n as ComputedNode, l as ComputedView, y as CustomColor, bi as CustomColorDefinitions, g as CustomElementExpr, h as CustomRelationExpr, aL as DefaultArrowType, O as DefaultElementShape, aK as DefaultLineStyle, aM as DefaultRelationshipColor, M as DefaultThemeColor, v as DiagramEdge, u as DiagramNode, D as DiagramView, bg as DynamicView, bd as DynamicViewIncludeRule, bb as DynamicViewParallelSteps, bf as DynamicViewRule, ba as DynamicViewStep, bc as DynamicViewStepOrParallel, k as EdgeId, d as Element, a8 as ElementExpression, p as ElementKind, a4 as ElementKindExpr, E as ElementKindSpecification, Y as ElementKindSpecificationStyle, bD as ElementNotation, ac as ElementPredicateExpression, Z as ElementRefExpr, a as ElementShape, K as ElementShapes, Q as ElementStyle, a6 as ElementTagExpr, aQ as ElementThemeColorValues, aR as ElementThemeColors, b9 as ElementView, aa as ElementWhereExpr, av as EqualOperator, $ as ExpandedElementExpr, f as Expression, b8 as ExtendsElementView, aH as Filterable, F as Fqn, au as GlobalStyle, at as GlobalStyleID, H as HexColorLiteral, I as IconUrl, ag as InOutExpr, ai as IncomingExpr, ay as KindEqual, s as LayoutedLikeC4Model, aU as LikeC4Theme, L as LikeC4View, U as Link, o as NodeId, N as NonEmptyArray, x as NonEmptyReadonlyArray, aA as NotOperator, aE as OrOperator, ak as OutgoingExpr, aJ as OverviewGraph, P as ParsedLikeC4Model, z as Point, e as Relation, ae as RelationExpr, am as RelationExpression, i as RelationID, ar as RelationPredicateExpression, ao as RelationWhereExpr, b as RelationshipArrowType, t as RelationshipKind, R as RelationshipKindSpecification, c as RelationshipLineType, aS as RelationshipThemeColorValues, aT as RelationshipThemeColors, b7 as ScopedElementView, bo as StepEdgeId, bn as StepEdgeIdLiteral, m as Tag, aw as TagEqual, S as TagSpec, aN as ThemeColor, T as ThemeColorValues, W as TypedElement, bu as ViewAutoLayout, bC as ViewChange, j as ViewID, bB as ViewManualLayout, b4 as ViewRule, b0 as ViewRuleAutoLayout, aY as ViewRuleGlobalStyle, b2 as ViewRuleGroup, aV as ViewRulePredicate, V as ViewRuleStyle, a_ as ViewRuleStyleOrGlobalRef, bs as ViewWithHash, bt as ViewWithNotation, aG as WhereOperator, a2 as WildcardExpr, X as XYPoint, bq as extractStep, bA as getBBoxCenter, br as getParallelStepsPrefix, aD as isAndOperator, a$ as isAutoLayoutDirection, bx as isComputedDynamicView, by as isComputedElementView, a1 as isCustomElement, aq as isCustomRelationExpr, bj as isDynamicView, be as isDynamicViewIncludeRule, bh as isDynamicViewParallelSteps, a9 as isElement, a5 as isElementKindExpr, ad as isElementPredicateExpr, _ as isElementRef, a7 as isElementTagExpr, bk as isElementView, ab as isElementWhere, a0 as isExpandedElementExpr, bl as isExtendsElementView, ah as isInOut, aj as isIncoming, az as isKindEqual, aB as isNotOperator, aF as isOrOperator, al as isOutgoing, af as isRelation, an as isRelationExpression, as as isRelationPredicateExpr, ap as isRelationWhere, bm as isScopedElementView, bp as isStepEdgeId, ax as isTagEqual, aP as isThemeColor, b1 as isViewRuleAutoLayout, aZ as isViewRuleGlobalStyle, b3 as isViewRuleGroup, aW as isViewRulePredicate, aX as isViewRuleStyle, a3 as isWildcard, aI as whereOperatorAsPredicate } from '../shared/core.CpdWcGpN.mjs';
+export { aG as AndOperator, G as AsFqn, A as AutoLayoutDirection, bF as BBox, bc as BasicElementView, bb as BasicView, B as BorderStyle, J as BorderStyles, C as Color, aS as ColorLiteral, bC as ComputedDynamicView, q as ComputedEdge, bB as ComputedElementView, r as ComputedLikeC4Model, n as ComputedNode, l as ComputedView, y as CustomColor, bo as CustomColorDefinitions, g as CustomElementExpr, h as CustomRelationExpr, aP as DefaultArrowType, O as DefaultElementShape, aO as DefaultLineStyle, aQ as DefaultRelationshipColor, M as DefaultThemeColor, v as DiagramEdge, u as DiagramNode, D as DiagramView, bm as DynamicView, bj as DynamicViewIncludeRule, bh as DynamicViewParallelSteps, bl as DynamicViewRule, bg as DynamicViewStep, bi as DynamicViewStepOrParallel, k as EdgeId, d as Element, a8 as ElementExpression, p as ElementKind, a4 as ElementKindExpr, E as ElementKindSpecification, Y as ElementKindSpecificationStyle, bJ as ElementNotation, ac as ElementPredicateExpression, Z as ElementRefExpr, a as ElementShape, K as ElementShapes, Q as ElementStyle, a6 as ElementTagExpr, aU as ElementThemeColorValues, aV as ElementThemeColors, bf as ElementView, aa as ElementWhereExpr, az as EqualOperator, $ as ExpandedElementExpr, f as Expression, be as ExtendsElementView, aL as Filterable, F as Fqn, av as GlobalDynamicPredicates, at as GlobalPredicateId, au as GlobalPredicates, aw as GlobalStyleID, ax as GlobalStyles, H as HexColorLiteral, I as IconUrl, ag as InOutExpr, ai as IncomingExpr, aC as KindEqual, s as LayoutedLikeC4Model, aY as LikeC4Theme, L as LikeC4View, U as Link, ay as ModelGlobals, o as NodeId, N as NonEmptyArray, x as NonEmptyReadonlyArray, aE as NotOperator, aI as OrOperator, ak as OutgoingExpr, aN as OverviewGraph, P as ParsedLikeC4Model, z as Point, e as Relation, ae as RelationExpr, am as RelationExpression, i as RelationID, ar as RelationPredicateExpression, ao as RelationWhereExpr, b as RelationshipArrowType, t as RelationshipKind, R as RelationshipKindSpecification, c as RelationshipLineType, aW as RelationshipThemeColorValues, aX as RelationshipThemeColors, bd as ScopedElementView, bu as StepEdgeId, bt as StepEdgeIdLiteral, m as Tag, aA as TagEqual, S as TagSpec, aR as ThemeColor, T as ThemeColorValues, W as TypedElement, bA as ViewAutoLayout, bI as ViewChange, j as ViewID, bH as ViewManualLayout, ba as ViewRule, b6 as ViewRuleAutoLayout, a$ as ViewRuleGlobalPredicateRef, b2 as ViewRuleGlobalStyle, b8 as ViewRuleGroup, aZ as ViewRulePredicate, V as ViewRuleStyle, b4 as ViewRuleStyleOrGlobalRef, by as ViewWithHash, bz as ViewWithNotation, aK as WhereOperator, a2 as WildcardExpr, X as XYPoint, bw as extractStep, bG as getBBoxCenter, bx as getParallelStepsPrefix, aH as isAndOperator, b5 as isAutoLayoutDirection, bD as isComputedDynamicView, bE as isComputedElementView, a1 as isCustomElement, aq as isCustomRelationExpr, bp as isDynamicView, bk as isDynamicViewIncludeRule, bn as isDynamicViewParallelSteps, a9 as isElement, a5 as isElementKindExpr, ad as isElementPredicateExpr, _ as isElementRef, a7 as isElementTagExpr, bq as isElementView, ab as isElementWhere, a0 as isExpandedElementExpr, br as isExtendsElementView, ah as isInOut, aj as isIncoming, aD as isKindEqual, aF as isNotOperator, aJ as isOrOperator, al as isOutgoing, af as isRelation, an as isRelationExpression, as as isRelationPredicateExpr, ap as isRelationWhere, bs as isScopedElementView, bv as isStepEdgeId, aB as isTagEqual, aT as isThemeColor, b7 as isViewRuleAutoLayout, b0 as isViewRuleGlobalPredicateRef, b3 as isViewRuleGlobalStyle, b9 as isViewRuleGroup, a_ as isViewRulePredicate, b1 as isViewRuleStyle, a3 as isWildcard, aM as whereOperatorAsPredicate } from '../shared/core.CoLQkcYL.mjs';
 import 'type-fest';

package/dist/types/index.d.ts

@@ -1,2 +1,2 @@
-export { aC as AndOperator, G as AsFqn, A as AutoLayoutDirection, bz as BBox, b6 as BasicElementView, b5 as BasicView, B as BorderStyle, J as BorderStyles, C as Color, aO as ColorLiteral, bw as ComputedDynamicView, q as ComputedEdge, bv as ComputedElementView, r as ComputedLikeC4Model, n as ComputedNode, l as ComputedView, y as CustomColor, bi as CustomColorDefinitions, g as CustomElementExpr, h as CustomRelationExpr, aL as DefaultArrowType, O as DefaultElementShape, aK as DefaultLineStyle, aM as DefaultRelationshipColor, M as DefaultThemeColor, v as DiagramEdge, u as DiagramNode, D as DiagramView, bg as DynamicView, bd as DynamicViewIncludeRule, bb as DynamicViewParallelSteps, bf as DynamicViewRule, ba as DynamicViewStep, bc as DynamicViewStepOrParallel, k as EdgeId, d as Element, a8 as ElementExpression, p as ElementKind, a4 as ElementKindExpr, E as ElementKindSpecification, Y as ElementKindSpecificationStyle, bD as ElementNotation, ac as ElementPredicateExpression, Z as ElementRefExpr, a as ElementShape, K as ElementShapes, Q as ElementStyle, a6 as ElementTagExpr, aQ as ElementThemeColorValues, aR as ElementThemeColors, b9 as ElementView, aa as ElementWhereExpr, av as EqualOperator, $ as ExpandedElementExpr, f as Expression, b8 as ExtendsElementView, aH as Filterable, F as Fqn, au as GlobalStyle, at as GlobalStyleID, H as HexColorLiteral, I as IconUrl, ag as InOutExpr, ai as IncomingExpr, ay as KindEqual, s as LayoutedLikeC4Model, aU as LikeC4Theme, L as LikeC4View, U as Link, o as NodeId, N as NonEmptyArray, x as NonEmptyReadonlyArray, aA as NotOperator, aE as OrOperator, ak as OutgoingExpr, aJ as OverviewGraph, P as ParsedLikeC4Model, z as Point, e as Relation, ae as RelationExpr, am as RelationExpression, i as RelationID, ar as RelationPredicateExpression, ao as RelationWhereExpr, b as RelationshipArrowType, t as RelationshipKind, R as RelationshipKindSpecification, c as RelationshipLineType, aS as RelationshipThemeColorValues, aT as RelationshipThemeColors, b7 as ScopedElementView, bo as StepEdgeId, bn as StepEdgeIdLiteral, m as Tag, aw as TagEqual, S as TagSpec, aN as ThemeColor, T as ThemeColorValues, W as TypedElement, bu as ViewAutoLayout, bC as ViewChange, j as ViewID, bB as ViewManualLayout, b4 as ViewRule, b0 as ViewRuleAutoLayout, aY as ViewRuleGlobalStyle, b2 as ViewRuleGroup, aV as ViewRulePredicate, V as ViewRuleStyle, a_ as ViewRuleStyleOrGlobalRef, bs as ViewWithHash, bt as ViewWithNotation, aG as WhereOperator, a2 as WildcardExpr, X as XYPoint, bq as extractStep, bA as getBBoxCenter, br as getParallelStepsPrefix, aD as isAndOperator, a$ as isAutoLayoutDirection, bx as isComputedDynamicView, by as isComputedElementView, a1 as isCustomElement, aq as isCustomRelationExpr, bj as isDynamicView, be as isDynamicViewIncludeRule, bh as isDynamicViewParallelSteps, a9 as isElement, a5 as isElementKindExpr, ad as isElementPredicateExpr, _ as isElementRef, a7 as isElementTagExpr, bk as isElementView, ab as isElementWhere, a0 as isExpandedElementExpr, bl as isExtendsElementView, ah as isInOut, aj as isIncoming, az as isKindEqual, aB as isNotOperator, aF as isOrOperator, al as isOutgoing, af as isRelation, an as isRelationExpression, as as isRelationPredicateExpr, ap as isRelationWhere, bm as isScopedElementView, bp as isStepEdgeId, ax as isTagEqual, aP as isThemeColor, b1 as isViewRuleAutoLayout, aZ as isViewRuleGlobalStyle, b3 as isViewRuleGroup, aW as isViewRulePredicate, aX as isViewRuleStyle, a3 as isWildcard, aI as whereOperatorAsPredicate } from '../shared/core.CpdWcGpN.js';
+export { aG as AndOperator, G as AsFqn, A as AutoLayoutDirection, bF as BBox, bc as BasicElementView, bb as BasicView, B as BorderStyle, J as BorderStyles, C as Color, aS as ColorLiteral, bC as ComputedDynamicView, q as ComputedEdge, bB as ComputedElementView, r as ComputedLikeC4Model, n as ComputedNode, l as ComputedView, y as CustomColor, bo as CustomColorDefinitions, g as CustomElementExpr, h as CustomRelationExpr, aP as DefaultArrowType, O as DefaultElementShape, aO as DefaultLineStyle, aQ as DefaultRelationshipColor, M as DefaultThemeColor, v as DiagramEdge, u as DiagramNode, D as DiagramView, bm as DynamicView, bj as DynamicViewIncludeRule, bh as DynamicViewParallelSteps, bl as DynamicViewRule, bg as DynamicViewStep, bi as DynamicViewStepOrParallel, k as EdgeId, d as Element, a8 as ElementExpression, p as ElementKind, a4 as ElementKindExpr, E as ElementKindSpecification, Y as ElementKindSpecificationStyle, bJ as ElementNotation, ac as ElementPredicateExpression, Z as ElementRefExpr, a as ElementShape, K as ElementShapes, Q as ElementStyle, a6 as ElementTagExpr, aU as ElementThemeColorValues, aV as ElementThemeColors, bf as ElementView, aa as ElementWhereExpr, az as EqualOperator, $ as ExpandedElementExpr, f as Expression, be as ExtendsElementView, aL as Filterable, F as Fqn, av as GlobalDynamicPredicates, at as GlobalPredicateId, au as GlobalPredicates, aw as GlobalStyleID, ax as GlobalStyles, H as HexColorLiteral, I as IconUrl, ag as InOutExpr, ai as IncomingExpr, aC as KindEqual, s as LayoutedLikeC4Model, aY as LikeC4Theme, L as LikeC4View, U as Link, ay as ModelGlobals, o as NodeId, N as NonEmptyArray, x as NonEmptyReadonlyArray, aE as NotOperator, aI as OrOperator, ak as OutgoingExpr, aN as OverviewGraph, P as ParsedLikeC4Model, z as Point, e as Relation, ae as RelationExpr, am as RelationExpression, i as RelationID, ar as RelationPredicateExpression, ao as RelationWhereExpr, b as RelationshipArrowType, t as RelationshipKind, R as RelationshipKindSpecification, c as RelationshipLineType, aW as RelationshipThemeColorValues, aX as RelationshipThemeColors, bd as ScopedElementView, bu as StepEdgeId, bt as StepEdgeIdLiteral, m as Tag, aA as TagEqual, S as TagSpec, aR as ThemeColor, T as ThemeColorValues, W as TypedElement, bA as ViewAutoLayout, bI as ViewChange, j as ViewID, bH as ViewManualLayout, ba as ViewRule, b6 as ViewRuleAutoLayout, a$ as ViewRuleGlobalPredicateRef, b2 as ViewRuleGlobalStyle, b8 as ViewRuleGroup, aZ as ViewRulePredicate, V as ViewRuleStyle, b4 as ViewRuleStyleOrGlobalRef, by as ViewWithHash, bz as ViewWithNotation, aK as WhereOperator, a2 as WildcardExpr, X as XYPoint, bw as extractStep, bG as getBBoxCenter, bx as getParallelStepsPrefix, aH as isAndOperator, b5 as isAutoLayoutDirection, bD as isComputedDynamicView, bE as isComputedElementView, a1 as isCustomElement, aq as isCustomRelationExpr, bp as isDynamicView, bk as isDynamicViewIncludeRule, bn as isDynamicViewParallelSteps, a9 as isElement, a5 as isElementKindExpr, ad as isElementPredicateExpr, _ as isElementRef, a7 as isElementTagExpr, bq as isElementView, ab as isElementWhere, a0 as isExpandedElementExpr, br as isExtendsElementView, ah as isInOut, aj as isIncoming, aD as isKindEqual, aF as isNotOperator, aJ as isOrOperator, al as isOutgoing, af as isRelation, an as isRelationExpression, as as isRelationPredicateExpr, ap as isRelationWhere, bs as isScopedElementView, bv as isStepEdgeId, aB as isTagEqual, aT as isThemeColor, b7 as isViewRuleAutoLayout, b0 as isViewRuleGlobalPredicateRef, b3 as isViewRuleGlobalStyle, b9 as isViewRuleGroup, a_ as isViewRulePredicate, b1 as isViewRuleStyle, a3 as isWildcard, aM as whereOperatorAsPredicate } from '../shared/core.CoLQkcYL.js';
 import 'type-fest';

package/dist/types/index.mjs

@@ -1 +1 @@
-export { A as AsFqn, B as BorderStyles, a2 as ComputedNode, N as DefaultArrowType, c as DefaultElementShape, M as DefaultLineStyle, f as DefaultRelationshipColor, D as DefaultThemeColor, a6 as DiagramNode, E as ElementKind, j as ElementShapes, _ as StepEdgeId, a0 as extractStep, a5 as getBBoxCenter, a1 as getParallelStepsPrefix, J as isAndOperator, S as isAutoLayoutDirection, a3 as isComputedDynamicView, a4 as isComputedElementView, m as isCustomElement, C as isCustomRelationExpr, X as isDynamicView, V as isDynamicViewIncludeRule, W as isDynamicViewParallelSteps, r as isElement, p as isElementKindExpr, i as isElementPredicateExpr, k as isElementRef, q as isElementTagExpr, Y as isElementView, s as isElementWhere, l as isExpandedElementExpr, Z as isExtendsElementView, v as isInOut, w as isIncoming, H as isKindEqual, I as isNotOperator, K as isOrOperator, x as isOutgoing, t as isRelation, y as isRelationExpression, F as isRelationPredicateExpr, z as isRelationWhere, b as isScopedElementView, $ as isStepEdgeId, G as isTagEqual, O as isThemeColor, T as isViewRuleAutoLayout, R as isViewRuleGlobalStyle, U as isViewRuleGroup, P as isViewRulePredicate, Q as isViewRuleStyle, o as isWildcard, L as whereOperatorAsPredicate } from '../shared/core.zYtlWYjW.mjs';
+export { A as AsFqn, B as BorderStyles, a3 as ComputedNode, N as DefaultArrowType, c as DefaultElementShape, M as DefaultLineStyle, f as DefaultRelationshipColor, D as DefaultThemeColor, a7 as DiagramNode, E as ElementKind, j as ElementShapes, $ as StepEdgeId, a1 as extractStep, a6 as getBBoxCenter, a2 as getParallelStepsPrefix, J as isAndOperator, T as isAutoLayoutDirection, a4 as isComputedDynamicView, a5 as isComputedElementView, m as isCustomElement, C as isCustomRelationExpr, Y as isDynamicView, W as isDynamicViewIncludeRule, X as isDynamicViewParallelSteps, r as isElement, p as isElementKindExpr, i as isElementPredicateExpr, k as isElementRef, q as isElementTagExpr, Z as isElementView, s as isElementWhere, l as isExpandedElementExpr, _ as isExtendsElementView, v as isInOut, w as isIncoming, H as isKindEqual, I as isNotOperator, K as isOrOperator, x as isOutgoing, t as isRelation, y as isRelationExpression, F as isRelationPredicateExpr, z as isRelationWhere, b as isScopedElementView, a0 as isStepEdgeId, G as isTagEqual, O as isThemeColor, U as isViewRuleAutoLayout, Q as isViewRuleGlobalPredicateRef, S as isViewRuleGlobalStyle, V as isViewRuleGroup, P as isViewRulePredicate, R as isViewRuleStyle, o as isWildcard, L as whereOperatorAsPredicate } from '../shared/core.v5DxGcX6.mjs';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@likec4/core",
-  "version": "1.15.1",
+  "version": "1.17.0",
   "license": "MIT",
   "homepage": "https://likec4.dev",
   "author": "Denis Davydkov <denis@davydkov.com>",
@@ -80,7 +80,7 @@
     "type-fest": "4.26.1"
   },
   "devDependencies": {
-    "@likec4/tsconfig": "1.15.1",
+    "@likec4/tsconfig": "1.17.0",
     "@mantine/colors-generator": "7.13.4",
     "@types/natural-compare-lite": "^1.4.2",
     "chroma-js": "^3.1.2",
@@ -90,7 +90,7 @@
     "turbo": "^2.2.3",
     "typescript": "^5.6.3",
     "unbuild": "^3.0.0-rc.11",
-    "vitest": "^2.1.3"
+    "vitest": "^2.1.5"
   },
   "packageManager": "yarn@4.5.1"
 }

package/src/builder/Builder.ts

@@ -10,11 +10,11 @@ import {
   type ElementShape,
   type ElementView,
   type Fqn,
-  type GlobalStyle,
   type IconUrl,
   isScopedElementView,
   type LikeC4View,
   type Link,
+  type ModelGlobals,
   type NonEmptyArray,
   type Relation,
   type RelationID,
@@ -220,10 +220,12 @@ function builder<Spec extends BuilderSpecification, T extends AnyTypes>(
   spec: Spec,
   _elements = new Map<string, Element>(),
   _relations = [] as Relation[],
-  _globals = { styles: [] } as {
-    styles: GlobalStyle[]
-  },
-  _views = new Map<string, LikeC4View>()
+  _views = new Map<string, LikeC4View>(),
+  _globals = {
+    predicates: {},
+    dynamicPredicates: {},
+    styles: {}
+  } as ModelGlobals
 ): Builder<T> {
   const toLikeC4Specification = (): Types.ToParsedLikeC4Model<T>['specification'] => ({
     tags: (spec.tags ?? []) as Tag<T['Tag']>[],
@@ -287,8 +289,8 @@ function builder<Spec extends BuilderSpecification, T extends AnyTypes>(
         structuredClone(spec),
         structuredClone(_elements),
         structuredClone(_relations),
-        structuredClone(_globals),
-        structuredClone(_views)
+        structuredClone(_views),
+        structuredClone(_globals)
       ),
     __model: () => ({
       addElement: (element) => {
@@ -343,9 +345,7 @@ function builder<Spec extends BuilderSpecification, T extends AnyTypes>(
       specification: toLikeC4Specification(),
       elements: fromEntries(Array.from(_elements.entries())) as any,
       relations: mapToObj(_relations, r => [r.id, r]),
-      globals: {
-        styles: mapToObj(_globals.styles, s => [s.id, s])
-      },
+      globals: structuredClone(_globals),
       views: fromEntries(Array.from(_views.entries())) as any
     }),
     helpers: () => ({

package/src/model/LikeC4Model.ts

@@ -1,4 +1,4 @@
-import { isString, isTruthy, values } from 'remeda'
+import { isString, isTruthy, map, pipe, sort, values } from 'remeda'
 import type { Class } from 'type-fest'
 import { nonNullable } from '../errors'
 import type {
@@ -14,7 +14,8 @@ import type {
 } from '../types/model'
 import type { Relation as C4Relation } from '../types/relation'
 import type { Color as C4Color } from '../types/theme'
-import { ancestorsFqn, commonAncestor, parentFqn } from '../utils/fqn'
+import { compareNatural } from '../utils/compare-natural'
+import { ancestorsFqn, commonAncestor, parentFqn, sortNaturalByFqn } from '../utils/fqn'
 import { LikeC4DiagramModel } from './LikeC4DiagramModel'
 import { LikeC4ViewModel } from './LikeC4ViewModel'
 import type { ElementOrFqn, Fqn, IncomingFilter, OutgoingFilter, RelationID, ViewID } from './types'
@@ -65,7 +66,11 @@ export class LikeC4Model<M extends LikeC4Model.ViewModel = LikeC4Model.ViewModel
       this.addRelation(rel)
     }
     this._views = new Map(
-      values(views).map(view => [view.id, new ViewModelClass(view, this)] as [Fqn, M])
+      pipe(
+        values(views),
+        sort((a, b) => compareNatural(a.title ?? 'untitled', b.title ?? 'untitled')),
+        map(view => [view.id, new ViewModelClass(view, this)] as [Fqn, M])
+      )
     )
   }
 
@@ -530,6 +535,13 @@ export namespace LikeC4Model {
       return this.model.children(this)
     }
 
+    /**
+     * First 'view of' current element
+     */
+    public viewOf() {
+      return this.model.views().find(v => v.viewOf?.id === this.id) ?? null
+    }
+
     /**
      * All views 'view of' current element
      */

package/src/model/__test__/fixture.ts

@@ -335,6 +335,8 @@ export const fakeComputedModel = {
   elements: fakeElements,
   relations: fakeRelations,
   globals: {
+    predicates: {},
+    dynamicPredicates: {},
     styles: {}
   },
   views: {}

package/src/types/_common.ts

@@ -4,7 +4,7 @@ export type NonEmptyArray<T> = [T, ...T[]]
 
 export type NonEmptyReadonlyArray<T> = readonly [T, ...T[]]
 
-export type IconUrl = Tagged<string, 'IconUrl'>
+export type IconUrl = Tagged<string, 'IconUrl'> | 'none'
 
 export type CustomColor = string
 

package/src/types/element.ts

@@ -1,4 +1,4 @@
-import type { IfNever, Tagged, TupleToUnion } from 'type-fest'
+import type { Tagged, TupleToUnion } from 'type-fest'
 import type { IconUrl, NonEmptyArray } from './_common'
 import type { Color, ThemeColor } from './theme'
 

package/src/types/global.ts

@@ -1,10 +1,19 @@
-import type { Tagged } from 'type-fest'
+import type { NonEmptyTuple, Tagged } from 'type-fest'
 import type { NonEmptyArray } from './_common'
-import type { ViewRuleStyle } from './view'
+import type { DynamicViewIncludeRule, ViewRulePredicate, ViewRuleStyle } from './view'
+
+export type GlobalPredicateId = Tagged<string, 'GlobalPredicateId'>
+
+export type GlobalPredicates = NonEmptyArray<ViewRulePredicate>
+
+export type GlobalDynamicPredicates = NonEmptyArray<DynamicViewIncludeRule>
 
 export type GlobalStyleID = Tagged<string, 'GlobalStyleID'>
 
-export interface GlobalStyle {
-  readonly id: GlobalStyleID
-  readonly styles: NonEmptyArray<ViewRuleStyle>
+export type GlobalStyles = NonEmptyTuple<ViewRuleStyle>
+
+export interface ModelGlobals {
+  predicates: Record<GlobalPredicateId, GlobalPredicates>
+  dynamicPredicates: Record<GlobalPredicateId, GlobalDynamicPredicates>
+  styles: Record<GlobalStyleID, GlobalStyles>
 }

package/src/types/model.ts

@@ -1,5 +1,5 @@
 import type { ElementKindSpecification, Tag, TypedElement } from './element'
-import type { GlobalStyle, GlobalStyleID } from './global'
+import type { ModelGlobals } from './global'
 import type { Relation, RelationID, RelationshipKindSpecification } from './relation'
 import type { ComputedView, DiagramView, LikeC4View, ViewID } from './view'
 
@@ -20,9 +20,7 @@ export interface ParsedLikeC4Model<
   }
   elements: Record<Fqns, TypedElement<Fqns, ElementKinds, Tags>>
   relations: Record<RelationID, Relation>
-  globals: {
-    styles: Record<GlobalStyleID, GlobalStyle>
-  }
+  globals: ModelGlobals
   views: Record<Views, LikeC4View<Views, Tags>>
 }
 

package/src/types/view.ts

@@ -11,7 +11,7 @@ import {
   type Tag
 } from './element'
 import type { ElementExpression, ElementPredicateExpression, Expression } from './expression'
-import type { GlobalStyleID } from './global'
+import type { GlobalPredicateId, GlobalStyleID } from './global'
 import type { RelationID, RelationshipArrowType, RelationshipKind, RelationshipLineType } from './relation'
 import type { Color, ThemeColorValues } from './theme'
 import type { ElementNotation } from './view-notation'
@@ -34,6 +34,13 @@ export function isViewRulePredicate(rule: ViewRule): rule is ViewRulePredicate {
   )
 }
 
+export interface ViewRuleGlobalPredicateRef {
+  predicateId: GlobalPredicateId
+}
+export function isViewRuleGlobalPredicateRef(rule: ViewRule): rule is ViewRuleGlobalPredicateRef {
+  return 'predicateId' in rule
+}
+
 export interface ViewRuleStyle {
   targets: ElementExpression[]
   notation?: string
@@ -83,7 +90,13 @@ export function isViewRuleGroup(rule: ViewRule): rule is ViewRuleGroup {
   return 'title' in rule && 'groupRules' in rule && Array.isArray(rule.groupRules)
 }
 
-export type ViewRule = ViewRulePredicate | ViewRuleGroup | ViewRuleStyle | ViewRuleGlobalStyle | ViewRuleAutoLayout
+export type ViewRule =
+  | ViewRulePredicate
+  | ViewRuleGlobalPredicateRef
+  | ViewRuleGroup
+  | ViewRuleStyle
+  | ViewRuleGlobalStyle
+  | ViewRuleAutoLayout
 
 export interface BasicView<
   ViewType extends 'element' | 'dynamic',
@@ -178,7 +191,12 @@ export function isDynamicViewIncludeRule(rule: DynamicViewRule): rule is Dynamic
   return 'include' in rule && Array.isArray(rule.include)
 }
 
-export type DynamicViewRule = DynamicViewIncludeRule | ViewRuleStyle | ViewRuleGlobalStyle | ViewRuleAutoLayout
+export type DynamicViewRule =
+  | DynamicViewIncludeRule
+  | ViewRuleGlobalPredicateRef
+  | ViewRuleStyle
+  | ViewRuleGlobalStyle
+  | ViewRuleAutoLayout
 export interface DynamicView<
   ViewIDs extends string = string,
   Tags extends string = string