@likec4/core 1.27.3 → 1.28.0

package/dist/shared/{core.BMep80lJ.mjs → core.DgfwjBtu.mjs}

@@ -1,6 +1,8 @@
 import { i as invariant, a as nonexhaustive } from './core.C-YXI-43.mjs';
 import { u } from './core.DbRvwARP.mjs';
 
+function n$1(e){return !!e}
+
 function o$1(a){return t=>!a(t)}
 
 function n(e){return e==null}
@@ -11,19 +13,6 @@ function t(...a){return u(e,a)}var e=(a,o)=>o.every(l=>l(a));
 
 function y(...a){return u(r,a)}var r=(a,o)=>o.some(e=>e(a));
 
-var DeploymentElement;
-((DeploymentElement2) => {
-  DeploymentElement2.isDeploymentNode = (el) => {
-    return "kind" in el && !("element" in el);
-  };
-  DeploymentElement2.isInstance = (el) => {
-    return "element" in el && !("kind" in el);
-  };
-})(DeploymentElement || (DeploymentElement = {}));
-
-function AsFqn(name, parent) {
-  return parent ? parent + "." + name : name;
-}
 const BorderStyles = ["solid", "dashed", "dotted", "none"];
 var ElementKind;
 ((ElementKind2) => {
@@ -44,78 +33,38 @@ const DefaultShapeSize = "md";
 const DefaultPaddingSize = "md";
 const DefaultTextSize = "md";
 
-function isElementRef(expr) {
-  return "element" in expr;
-}
-function isExpandedElementExpr(expr) {
-  return "expanded" in expr;
-}
-function isCustomElement(expr) {
-  return "custom" in expr && (isElement(expr.custom.expr) || isElementWhere(expr.custom.expr));
-}
-function isWildcard(expr) {
-  return "wildcard" in expr;
-}
-function isElementKindExpr(expr) {
-  return "elementKind" in expr && "isEqual" in expr;
-}
-function isElementTagExpr(expr) {
-  return "elementTag" in expr && "isEqual" in expr;
-}
-function isElement(expr) {
-  return isElementRef(expr) || isWildcard(expr) || isElementKindExpr(expr) || isElementTagExpr(expr) || isExpandedElementExpr(expr);
-}
-function isElementWhere(expr) {
-  return "where" in expr && isElement(expr.where.expr);
-}
-function isElementPredicateExpr(expr) {
-  return isElement(expr) || isElementWhere(expr) || isCustomElement(expr);
-}
-function isRelation(expr) {
-  return "source" in expr && "target" in expr;
-}
-function isInOut(expr) {
-  return "inout" in expr;
-}
-function isIncoming(expr) {
-  return "incoming" in expr;
-}
-function isOutgoing(expr) {
-  return "outgoing" in expr;
-}
-function isRelationExpression(expr) {
-  return isRelation(expr) || isInOut(expr) || isIncoming(expr) || isOutgoing(expr);
+function AsFqn(name, parent) {
+  return parent ? parent + "." + name : name;
 }
-function isRelationWhere(expr) {
-  return "where" in expr && isRelationExpression(expr.where.expr);
+function GlobalFqn(projectId, name) {
+  invariant(n$1(projectId), "Project ID must start with @");
+  return "@" + projectId + "." + name;
 }
-function isCustomRelationExpr(expr) {
-  return "customRelation" in expr;
+function isGlobalFqn(fqn) {
+  return fqn.startsWith("@");
 }
-function isRelationPredicateExpr(expr) {
-  return isRelationExpression(expr) || isRelationWhere(expr) || isCustomRelationExpr(expr);
+function splitGlobalFqn(fqn) {
+  if (!fqn.startsWith("@")) {
+    return [null, fqn];
+  }
+  const firstDot = fqn.indexOf(".");
+  if (firstDot < 2) {
+    throw new Error("Invalid global FQN");
+  }
+  const projectId = fqn.slice(1, firstDot);
+  const name = fqn.slice(firstDot + 1);
+  return [projectId, name];
 }
 
-const expression = {
-  __proto__: null,
-  isCustomElement: isCustomElement,
-  isCustomRelationExpr: isCustomRelationExpr,
-  isElement: isElement,
-  isElementKindExpr: isElementKindExpr,
-  isElementPredicateExpr: isElementPredicateExpr,
-  isElementRef: isElementRef,
-  isElementTagExpr: isElementTagExpr,
-  isElementWhere: isElementWhere,
-  isExpandedElementExpr: isExpandedElementExpr,
-  isInOut: isInOut,
-  isIncoming: isIncoming,
-  isOutgoing: isOutgoing,
-  isRelation: isRelation,
-  isRelationExpression: isRelationExpression,
-  isRelationPredicateExpr: isRelationPredicateExpr,
-  isRelationWhere: isRelationWhere,
-  isWildcard: isWildcard
-};
+var DeploymentElement;
+((DeploymentElement2) => {
+  DeploymentElement2.isDeploymentNode = (el) => {
+    return "kind" in el && !("element" in el);
+  };
+  DeploymentElement2.isInstance = (el) => {
+    return "element" in el && !("kind" in el);
+  };
+})(DeploymentElement || (DeploymentElement = {}));
 
 var FqnRef;
 ((FqnRef2) => {
@@ -126,10 +75,13 @@ var FqnRef;
     return "deployment" in ref && !("element" in ref);
   };
   FqnRef2.isDeploymentRef = (ref) => {
-    return !(0, FqnRef2.isModelRef)(ref);
+    return !(0, FqnRef2.isModelRef)(ref) && !(0, FqnRef2.isImportRef)(ref);
   };
   FqnRef2.isModelRef = (ref) => {
-    return "model" in ref;
+    return "model" in ref && !("project" in ref);
+  };
+  FqnRef2.isImportRef = (ref) => {
+    return "project" in ref && "model" in ref;
   };
   FqnRef2.toDeploymentRef = (ref) => {
     invariant((0, FqnRef2.isDeploymentRef)(ref), "Expected DeploymentRef");
@@ -140,6 +92,15 @@ var FqnRef;
       id: ref.deployment
     };
   };
+  FqnRef2.toModelFqn = (ref) => {
+    if ((0, FqnRef2.isImportRef)(ref)) {
+      return GlobalFqn(ref.project, ref.model);
+    }
+    if ((0, FqnRef2.isModelRef)(ref)) {
+      return ref.model;
+    }
+    throw new Error("Expected FqnRef.ModelRef or FqnRef.ImportRef");
+  };
 })(FqnRef || (FqnRef = {}));
 var FqnExpr;
 ((FqnExpr2) => {
@@ -147,11 +108,37 @@ var FqnExpr;
     return "wildcard" in expr && expr.wildcard === true;
   };
   FqnExpr2.isModelRef = (ref) => {
-    return "ref" in ref && FqnRef.isModelRef(ref.ref);
+    return "ref" in ref && (FqnRef.isModelRef(ref.ref) || FqnRef.isImportRef(ref.ref));
   };
   FqnExpr2.isDeploymentRef = (ref) => {
     return "ref" in ref && FqnRef.isDeploymentRef(ref.ref);
   };
+  function isElementKindExpr(expr) {
+    return "elementKind" in expr && "isEqual" in expr;
+  }
+  FqnExpr2.isElementKindExpr = isElementKindExpr;
+  function isElementTagExpr(expr) {
+    return "elementTag" in expr && "isEqual" in expr;
+  }
+  FqnExpr2.isElementTagExpr = isElementTagExpr;
+  FqnExpr2.isWhere = (expr) => {
+    return "where" in expr && (0, FqnExpr2.is)(expr.where.expr);
+  };
+  FqnExpr2.isCustom = (expr) => {
+    return "custom" in expr && ((0, FqnExpr2.is)(expr.custom.expr) || (0, FqnExpr2.isWhere)(expr.custom.expr));
+  };
+  FqnExpr2.is = (expr) => {
+    return (0, FqnExpr2.isWildcard)(expr) || (0, FqnExpr2.isModelRef)(expr) || (0, FqnExpr2.isDeploymentRef)(expr) || isElementKindExpr(expr) || isElementTagExpr(expr);
+  };
+  FqnExpr2.unwrap = (expr) => {
+    if ((0, FqnExpr2.isCustom)(expr)) {
+      expr = expr.custom.expr;
+    }
+    if ((0, FqnExpr2.isWhere)(expr)) {
+      expr = expr.where.expr;
+    }
+    return expr;
+  };
 })(FqnExpr || (FqnExpr = {}));
 var RelationExpr;
 ((RelationExpr2) => {
@@ -168,19 +155,143 @@ var RelationExpr;
     return "inout" in expr;
   };
   RelationExpr2.isWhere = (expr) => {
-    return "where" in expr;
+    return "where" in expr && ((0, RelationExpr2.isDirect)(expr.where.expr) || (0, RelationExpr2.isIncoming)(expr.where.expr) || (0, RelationExpr2.isOutgoing)(expr.where.expr) || (0, RelationExpr2.isInOut)(expr.where.expr));
+  };
+  RelationExpr2.isCustom = (expr) => {
+    return "customRelation" in expr;
+  };
+  RelationExpr2.is = (expr) => {
+    return (0, RelationExpr2.isDirect)(expr) || (0, RelationExpr2.isIncoming)(expr) || (0, RelationExpr2.isOutgoing)(expr) || (0, RelationExpr2.isInOut)(expr);
+  };
+  RelationExpr2.unwrap = (expr) => {
+    if ((0, RelationExpr2.isCustom)(expr)) {
+      expr = expr.customRelation.expr;
+    }
+    if ((0, RelationExpr2.isWhere)(expr)) {
+      expr = expr.where.expr;
+    }
+    return expr;
   };
 })(RelationExpr || (RelationExpr = {}));
 var ExpressionV2;
 ((ExpressionV22) => {
+  ExpressionV22.isWhere = (expr) => {
+    return "where" in expr;
+  };
+  ExpressionV22.isRelationWhere = (expr) => {
+    return RelationExpr.isWhere(expr);
+  };
+  ExpressionV22.isFqnExprWhere = (expr) => {
+    return FqnExpr.isWhere(expr);
+  };
   ExpressionV22.isFqnExpr = (expr) => {
-    return FqnExpr.isWildcard(expr) || FqnExpr.isModelRef(expr) || FqnExpr.isDeploymentRef(expr);
+    return FqnExpr.is(expr) || FqnExpr.isWhere(expr) || FqnExpr.isCustom(expr);
   };
   ExpressionV22.isRelation = (expr) => {
-    return RelationExpr.isDirect(expr) || RelationExpr.isIncoming(expr) || RelationExpr.isOutgoing(expr) || RelationExpr.isInOut(expr);
+    return RelationExpr.is(expr) || RelationExpr.isWhere(expr) || RelationExpr.isCustom(expr);
   };
 })(ExpressionV2 || (ExpressionV2 = {}));
 
+var ModelLayer;
+((ModelLayer2) => {
+  ((FqnRef2) => {
+    FqnRef2.isModelRef = (ref) => {
+      return "model" in ref && !("project" in ref);
+    };
+    FqnRef2.isImportRef = (ref) => {
+      return "project" in ref && "model" in ref;
+    };
+    FqnRef2.toFqn = (ref) => {
+      if ((0, FqnRef2.isImportRef)(ref)) {
+        return GlobalFqn(ref.project, ref.model);
+      }
+      if ((0, FqnRef2.isModelRef)(ref)) {
+        return ref.model;
+      }
+      throw new Error("Expected FqnRef.ModelRef or FqnRef.ImportRef");
+    };
+  })(ModelLayer2.FqnRef || (ModelLayer2.FqnRef = {}));
+  let FqnExpr;
+  ((FqnExpr2) => {
+    FqnExpr2.isWildcard = (expr) => {
+      return "wildcard" in expr && expr.wildcard === true;
+    };
+    FqnExpr2.isModelRef = (ref) => {
+      return "ref" in ref;
+    };
+    function isElementKindExpr(expr) {
+      return "elementKind" in expr && "isEqual" in expr;
+    }
+    FqnExpr2.isElementKindExpr = isElementKindExpr;
+    function isElementTagExpr(expr) {
+      return "elementTag" in expr && "isEqual" in expr;
+    }
+    FqnExpr2.isElementTagExpr = isElementTagExpr;
+    FqnExpr2.isWhere = (expr) => {
+      return "where" in expr && (0, FqnExpr2.is)(expr.where.expr);
+    };
+    FqnExpr2.isCustom = (expr) => {
+      return "custom" in expr && ((0, FqnExpr2.is)(expr.custom.expr) || (0, FqnExpr2.isWhere)(expr.custom.expr));
+    };
+    FqnExpr2.is = (expr) => {
+      return (0, FqnExpr2.isWildcard)(expr) || (0, FqnExpr2.isModelRef)(expr) || isElementKindExpr(expr) || isElementTagExpr(expr);
+    };
+  })(FqnExpr = ModelLayer2.FqnExpr || (ModelLayer2.FqnExpr = {}));
+  function isAnyFqnExpr(expr) {
+    return FqnExpr.is(expr) || FqnExpr.isWhere(expr) || FqnExpr.isCustom(expr);
+  }
+  ModelLayer2.isAnyFqnExpr = isAnyFqnExpr;
+  let RelationExpr;
+  ((RelationExpr2) => {
+    RelationExpr2.isDirect = (expr) => {
+      return "source" in expr && "target" in expr;
+    };
+    RelationExpr2.isIncoming = (expr) => {
+      return "incoming" in expr;
+    };
+    RelationExpr2.isOutgoing = (expr) => {
+      return "outgoing" in expr;
+    };
+    RelationExpr2.isInOut = (expr) => {
+      return "inout" in expr;
+    };
+    RelationExpr2.isWhere = (expr) => {
+      return "where" in expr && (0, RelationExpr2.is)(expr.where.expr);
+    };
+    RelationExpr2.isCustom = (expr) => {
+      return "customRelation" in expr;
+    };
+    RelationExpr2.is = (expr) => {
+      return (0, RelationExpr2.isDirect)(expr) || (0, RelationExpr2.isIncoming)(expr) || (0, RelationExpr2.isOutgoing)(expr) || (0, RelationExpr2.isInOut)(expr);
+    };
+  })(RelationExpr = ModelLayer2.RelationExpr || (ModelLayer2.RelationExpr = {}));
+  function isAnyRelationExpr(expr) {
+    return RelationExpr.is(expr) || RelationExpr.isWhere(expr) || RelationExpr.isCustom(expr);
+  }
+  ModelLayer2.isAnyRelationExpr = isAnyRelationExpr;
+  function isExpression(expr) {
+    return isAnyFqnExpr(expr) || isAnyRelationExpr(expr);
+  }
+  ModelLayer2.isExpression = isExpression;
+  ((Expression2) => {
+    Expression2.isWhere = (expr) => {
+      return "where" in expr;
+    };
+    Expression2.isCustomFqnExpr = (expr) => {
+      return FqnExpr.isCustom(expr);
+    };
+    Expression2.isCustomRelationExpr = (expr) => {
+      return RelationExpr.isCustom(expr);
+    };
+    Expression2.isFqnExpr = (expr) => {
+      return FqnExpr.is(expr);
+    };
+    Expression2.isRelation = (expr) => {
+      return RelationExpr.is(expr);
+    };
+  })(ModelLayer2.Expression || (ModelLayer2.Expression = {}));
+})(ModelLayer || (ModelLayer = {}));
+
 const isTagEqual = (operator) => {
   return "tag" in operator;
 };
@@ -381,4 +492,4 @@ var DiagramNode;
   DiagramNode2.isNodesGroup = isNodesGroup;
 })(DiagramNode || (DiagramNode = {}));
 
-export { isAutoLayoutDirection as $, AsFqn as A, BorderStyles as B, isRelationPredicateExpr as C, DefaultElementShape as D, ElementKind as E, isRelationWhere as F, isWildcard as G, ExpressionV2 as H, FqnExpr as I, FqnRef as J, isAndOperator as K, isKindEqual as L, isNotOperator as M, isOrOperator as N, isParticipantOperator as O, isTagEqual as P, whereOperatorAsPredicate as Q, RelationExpr as R, DefaultArrowType as S, DefaultLineStyle as T, DefaultRelationshipColor as U, ComputedNode as V, ComputedView as W, DiagramNode as X, extractStep as Y, getBBoxCenter as Z, getParallelStepsPrefix as _, isElementView as a, isDeploymentView as a0, isDynamicView as a1, isDynamicViewParallelSteps as a2, isStepEdgeId as a3, isViewRuleAutoLayout as a4, isViewRuleGlobalPredicateRef as a5, isViewRuleGlobalStyle as a6, isViewRuleGroup as a7, isViewRulePredicate as a8, isViewRuleStyle as a9, stepEdgeId as aa, o$1 as ab, y as ac, isElementPredicateExpr as b, DefaultThemeColor as c, DeploymentElement as d, isScopedElementView as e, expression as f, DefaultPaddingSize as g, DefaultShapeSize as h, isExtendsElementView as i, DefaultTextSize as j, ElementShapes as k, isCustomElement as l, isCustomRelationExpr as m, n, o, isElement as p, isElementKindExpr as q, isElementRef as r, isElementTagExpr as s, isElementWhere as t, isExpandedElementExpr as u, isIncoming as v, isInOut as w, isOutgoing as x, isRelation as y, isRelationExpression as z };
+export { y as $, AsFqn as A, BorderStyles as B, ComputedNode as C, DefaultElementShape as D, ElementKind as E, FqnExpr as F, GlobalFqn as G, DiagramNode as H, extractStep as I, getBBoxCenter as J, getParallelStepsPrefix as K, isAutoLayoutDirection as L, ModelLayer as M, isDeploymentView as N, isDynamicView as O, isDynamicViewParallelSteps as P, isStepEdgeId as Q, RelationExpr as R, isViewRuleAutoLayout as S, isViewRuleGlobalPredicateRef as T, isViewRuleGlobalStyle as U, isViewRuleGroup as V, isViewRulePredicate as W, isViewRuleStyle as X, stepEdgeId as Y, n$1 as Z, o$1 as _, isElementView as a, DefaultThemeColor as b, DeploymentElement as c, isScopedElementView as d, isGlobalFqn as e, DefaultPaddingSize as f, DefaultShapeSize as g, DefaultTextSize as h, isExtendsElementView as i, ElementShapes as j, ExpressionV2 as k, FqnRef as l, isAndOperator as m, n, o, isKindEqual as p, isNotOperator as q, isOrOperator as r, splitGlobalFqn as s, isParticipantOperator as t, isTagEqual as u, DefaultArrowType as v, whereOperatorAsPredicate as w, DefaultLineStyle as x, DefaultRelationshipColor as y, ComputedView as z };

package/dist/shared/core.SjLhMA7a.d.mts

@@ -0,0 +1,62 @@
+import { Simplify, UnionToIntersection, Tagged } from 'type-fest';
+
+type NonEmptyArray<T> = [T, ...T[]];
+type NonEmptyReadonlyArray<T> = readonly [T, ...T[]];
+type CustomColor = string;
+type Point = readonly [x: number, y: number];
+interface XYPoint {
+    x: number;
+    y: number;
+}
+type KeysOf<T> = keyof T extends infer K extends string ? K : never;
+type AllNever<Expressions> = UnionToIntersection<{
+    [Name in keyof Expressions]: {
+        -readonly [Key in keyof Expressions[Name]]?: never;
+    };
+}[keyof Expressions]>;
+/**
+ * @example
+ *   type Variant1 = {
+ *     a: string
+ *   }
+ *   type Variant2 = {
+ *     b: number
+ *   }
+ *
+ *   type Variants = ExclusiveUnion<{
+ *     Variant1: Variant1,
+ *     Variant2: Variant2
+ *   }>
+ *
+ *   Fail here
+ *   const variant1: Variants = {
+ *      a: 'one',
+ *      b: 1
+ *   }
+ */
+type ExclusiveUnion<Expressions> = Expressions extends object ? {
+    [Name in keyof Expressions]: Simplify<Omit<AllNever<Expressions>, keyof Expressions[Name]> & Expressions[Name]>;
+}[keyof Expressions] : Expressions;
+/**
+ * Copy from https://github.com/remeda/remeda/blob/main/src/internal/types/NTuple.ts
+ * An array with *exactly* N elements in it.
+ *
+ * Only literal N values are supported. For very large N the type might result
+ * in a recurse depth error. For negative N the type would result in an infinite
+ * recursion. None of these have protections because this is an internal type!
+ */
+type NTuple<T, N extends number, Result extends Array<unknown> = []> = Result['length'] extends N ? Result : NTuple<T, N, [...Result, T]>;
+type IteratorLike<T> = IteratorObject<T, BuiltinIteratorReturn>;
+type Predicate<T> = (x: T) => boolean;
+
+type ProjectId = Tagged<string, 'ProjectID'>;
+type IconUrl = Tagged<string, 'IconUrl'> | 'none';
+type Fqn<Id extends string = string> = Tagged<Id, 'Fqn'>;
+type Tag<Tags extends string = string> = Tagged<Tags, 'Tag'>;
+declare function AsFqn(name: string, parent?: Fqn | null): Fqn;
+type GlobalFqn<Id extends string = string> = Tagged<Fqn<Id>, 'GlobalFqn'>;
+declare function GlobalFqn(projectId: ProjectId, name: string): GlobalFqn;
+declare function isGlobalFqn(fqn: string): fqn is GlobalFqn;
+declare function splitGlobalFqn<Id extends string>(fqn: Fqn<Id> | GlobalFqn<Id>): [ProjectId | null, Fqn<Id>];
+
+export { AsFqn as A, type CustomColor as C, type ExclusiveUnion as E, type Fqn as F, GlobalFqn as G, type IteratorLike as I, type KeysOf as K, type NonEmptyArray as N, type Point as P, type Tag as T, type XYPoint as X, type NonEmptyReadonlyArray as a, type NTuple as b, type Predicate as c, type IconUrl as d, type ProjectId as e, isGlobalFqn as i, splitGlobalFqn as s };

package/dist/types/index.d.mts

@@ -1,7 +1,7 @@
-import { X as XYPoint, N as NonEmptyArray, P as Point, l as BorderStyle, p as ElementShape, Q as ThemeColor, F as Fqn } from '../shared/core.30yYKXcZ.mjs';
-export { A as AsFqn, B as BorderStyles, x as Color, y as ColorLiteral, C as CustomColor, D as DefaultElementShape, f as DefaultPaddingSize, g as DefaultShapeSize, h as DefaultTextSize, i as DefaultThemeColor, m as Element, j as ElementKind, n as ElementKindSpecification, o as ElementKindSpecificationStyle, k as ElementShapes, q as ElementStyle, G as ElementThemeColorValues, z as ElementThemeColors, E as ExclusiveUnion, H as HexColorLiteral, I as IconUrl, a as IteratorLike, K as KeysOf, L as LikeC4Theme, r as Link, c as NTuple, b as NonEmptyReadonlyArray, d as Predicate, e as ProjectId, J as RelationshipThemeColorValues, R as RelationshipThemeColors, S as ShapeSize, M as SpacingSize, s as Tag, t as TagSpec, O as TextSize, T as ThemeColorValues, w as ThemeColors, u as TypedElement, v as isThemeColor } from '../shared/core.30yYKXcZ.mjs';
-import { bo as ViewId, a_ as BBox, bp as ViewManualLayout, aX as AutoLayoutDirection } from '../shared/core.CFDwncxs.mjs';
-export { aw as AbstractRelation, ah as AllNever, ai as AndOperator, a5 as AnyParsedLikeC4ModelData, aY as BasicElementView, aZ as BasicView, a$ as ComputedDeploymentView, b0 as ComputedDynamicView, b1 as ComputedEdge, b2 as ComputedElementView, C as ComputedLikeC4ModelData, aD as ComputedNode, a as ComputedView, b3 as CustomColorDefinitions, A as CustomElementExpr, B as CustomRelationExpr, at as DefaultArrowType, au as DefaultLineStyle, av as DefaultRelationshipColor, b as DeployedInstance, D as DeploymentElement, c as DeploymentElementStyle, d as DeploymentNode, f as DeploymentNodeKind, g as DeploymentNodeKindSpecification, h as DeploymentRef, i as DeploymentRelation, b4 as DeploymentView, b5 as DeploymentViewRule, b6 as DeploymentViewRulePredicate, b7 as DeploymentViewRuleStyle, b8 as DiagramEdge, aE as DiagramNode, b9 as DiagramView, E as DirectRelationExpr, ba as DynamicView, bb as DynamicViewIncludeRule, bc as DynamicViewParallelSteps, bd as DynamicViewRule, be as DynamicViewStep, bf as DynamicViewStepOrParallel, bg as EdgeId, F as ElementExpression, G as ElementKindExpr, bA as ElementNotation, H as ElementPredicateExpression, I as ElementRefExpr, J as ElementTagExpr, bh as ElementView, K as ElementWhereExpr, aj as EqualOperator, M as ExpandedElementExpr, N as Expression, X as ExpressionV2, bi as ExtendsElementView, ak as Filterable, Y as FqnExpr, Z as FqnRef, a6 as GenericLikeC4ModelData, $ as GlobalDynamicPredicates, a0 as GlobalPredicateId, a1 as GlobalPredicates, a2 as GlobalStyleID, a3 as GlobalStyles, Q as InOutExpr, O as IncomingExpr, al as KindEqual, a7 as LayoutedLikeC4ModelData, a8 as LikeC4ModelDump, L as LikeC4View, a4 as ModelGlobals, ax as ModelRelation, bj as NodeId, R as NonWilcard, am as NotOperator, an as OperatorPredicate, ao as OrOperator, S as OutgoingExpr, a9 as ParsedLikeC4ModelData, ap as Participant, aq as ParticipantOperator, P as PredicateSelector, _ as RelationExpr, T as RelationExpression, ay as RelationId, U as RelationPredicateExpression, V as RelationWhereExpr, az as RelationshipArrowType, aA as RelationshipKind, aB as RelationshipKindSpecification, aC as RelationshipLineType, bk as ScopedElementView, bl as StepEdgeId, bm as StepEdgeIdLiteral, ar as TagEqual, bn as ViewAutoLayout, bq as ViewRule, br as ViewRuleAutoLayout, bs as ViewRuleGlobalPredicateRef, bt as ViewRuleGlobalStyle, bu as ViewRuleGroup, bv as ViewRulePredicate, bw as ViewRuleStyle, bx as ViewRuleStyleOrGlobalRef, by as ViewWithHash, bz as ViewWithNotation, as as WhereOperator, W as WildcardExpr, aF as extractStep, aG as getBBoxCenter, aH as getParallelStepsPrefix, aa as isAndOperator, aI as isAutoLayoutDirection, j as isCustomElement, k as isCustomRelationExpr, aJ as isDeploymentView, aK as isDynamicView, aL as isDynamicViewParallelSteps, l as isElement, m as isElementKindExpr, n as isElementPredicateExpr, o as isElementRef, p as isElementTagExpr, aM as isElementView, q as isElementWhere, r as isExpandedElementExpr, aN as isExtendsElementView, t as isInOut, s as isIncoming, ab as isKindEqual, ac as isNotOperator, ad as isOrOperator, u as isOutgoing, ae as isParticipantOperator, v as isRelation, w as isRelationExpression, x as isRelationPredicateExpr, y as isRelationWhere, aO as isScopedElementView, aP as isStepEdgeId, af as isTagEqual, aQ as isViewRuleAutoLayout, aR as isViewRuleGlobalPredicateRef, aS as isViewRuleGlobalStyle, aT as isViewRuleGroup, aU as isViewRulePredicate, aV as isViewRuleStyle, z as isWildcard, aW as stepEdgeId, ag as whereOperatorAsPredicate } from '../shared/core.CFDwncxs.mjs';
+import { X as XYPoint, N as NonEmptyArray, P as Point, F as Fqn } from '../shared/core.SjLhMA7a.mjs';
+export { A as AsFqn, C as CustomColor, E as ExclusiveUnion, G as GlobalFqn, d as IconUrl, I as IteratorLike, K as KeysOf, b as NTuple, a as NonEmptyReadonlyArray, c as Predicate, e as ProjectId, T as Tag, i as isGlobalFqn, s as splitGlobalFqn } from '../shared/core.SjLhMA7a.mjs';
+import { bk as ViewId, aW as BBox, p as BorderStyle, t as ElementShape, ay as ThemeColor, bl as ViewManualLayout, aT as AutoLayoutDirection } from '../shared/core.DJvmfnEi.mjs';
+export { ag as AbstractRelation, a1 as AllNever, a2 as AndOperator, O as AnyParsedLikeC4ModelData, aU as BasicElementView, aV as BasicView, B as BorderStyles, ap as Color, aq as ColorLiteral, aX as ComputedDeploymentView, aY as ComputedDynamicView, aZ as ComputedEdge, a_ as ComputedElementView, C as ComputedLikeC4ModelData, az as ComputedNode, a as ComputedView, a$ as CustomColorDefinitions, ad as DefaultArrowType, j as DefaultElementShape, ae as DefaultLineStyle, k as DefaultPaddingSize, af as DefaultRelationshipColor, l as DefaultShapeSize, m as DefaultTextSize, n as DefaultThemeColor, c as DeployedInstance, D as DeploymentElement, d as DeploymentElementStyle, e as DeploymentNode, f as DeploymentNodeKind, g as DeploymentNodeKindSpecification, h as DeploymentRef, i as DeploymentRelation, b0 as DeploymentView, b1 as DeploymentViewRule, b2 as DeploymentViewRulePredicate, b3 as DeploymentViewRuleStyle, b4 as DiagramEdge, aA as DiagramNode, b5 as DiagramView, b6 as DynamicView, b7 as DynamicViewIncludeRule, b8 as DynamicViewParallelSteps, b9 as DynamicViewRule, ba as DynamicViewStep, bb as DynamicViewStepOrParallel, bc as EdgeId, q as Element, E as ElementKind, r as ElementKindSpecification, s as ElementKindSpecificationStyle, bw as ElementNotation, o as ElementShapes, u as ElementStyle, as as ElementThemeColorValues, ar as ElementThemeColors, bd as ElementView, a3 as EqualOperator, y as ExpressionV2, be as ExtendsElementView, a4 as Filterable, F as FqnExpr, z as FqnRef, Q as GenericLikeC4ModelData, G as GlobalDynamicPredicates, A as GlobalPredicateId, I as GlobalPredicates, J as GlobalStyleID, K as GlobalStyles, H as HexColorLiteral, a5 as KindEqual, S as LayoutedLikeC4ModelData, U as LikeC4ModelDump, b as LikeC4Theme, L as LikeC4View, v as Link, N as ModelGlobals, M as ModelLayer, ah as ModelRelation, bf as NodeId, a6 as NotOperator, a7 as OperatorPredicate, a8 as OrOperator, V as ParsedLikeC4ModelData, a9 as Participant, aa as ParticipantOperator, P as PredicateSelector, R as RelationExpr, ai as RelationId, aj as RelationshipArrowType, ak as RelationshipKind, al as RelationshipKindSpecification, am as RelationshipLineType, au as RelationshipThemeColorValues, at as RelationshipThemeColors, bg as ScopedElementView, av as ShapeSize, aw as SpacingSize, bh as StepEdgeId, bi as StepEdgeIdLiteral, ab as TagEqual, w as TagSpec, ax as TextSize, T as ThemeColorValues, ao as ThemeColors, x as TypedElement, bj as ViewAutoLayout, bm as ViewRule, bn as ViewRuleAutoLayout, bo as ViewRuleGlobalPredicateRef, bp as ViewRuleGlobalStyle, bq as ViewRuleGroup, br as ViewRulePredicate, bs as ViewRuleStyle, bt as ViewRuleStyleOrGlobalRef, bu as ViewWithHash, bv as ViewWithNotation, ac as WhereOperator, aB as extractStep, aC as getBBoxCenter, aD as getParallelStepsPrefix, W as isAndOperator, aE as isAutoLayoutDirection, aF as isDeploymentView, aG as isDynamicView, aH as isDynamicViewParallelSteps, aI as isElementView, aJ as isExtendsElementView, X as isKindEqual, Y as isNotOperator, Z as isOrOperator, _ as isParticipantOperator, aK as isScopedElementView, aL as isStepEdgeId, $ as isTagEqual, an as isThemeColor, aM as isViewRuleAutoLayout, aN as isViewRuleGlobalPredicateRef, aO as isViewRuleGlobalStyle, aP as isViewRuleGroup, aQ as isViewRulePredicate, aR as isViewRuleStyle, aS as stepEdgeId, a0 as whereOperatorAsPredicate } from '../shared/core.DJvmfnEi.mjs';
 import 'type-fest';
 
 /**

package/dist/types/index.mjs

@@ -1,4 +1,4 @@
-export { A as AsFqn, B as BorderStyles, V as ComputedNode, W as ComputedView, S as DefaultArrowType, D as DefaultElementShape, T as DefaultLineStyle, g as DefaultPaddingSize, U as DefaultRelationshipColor, h as DefaultShapeSize, j as DefaultTextSize, c as DefaultThemeColor, d as DeploymentElement, X as DiagramNode, E as ElementKind, k as ElementShapes, H as ExpressionV2, I as FqnExpr, J as FqnRef, R as RelationExpr, Y as extractStep, Z as getBBoxCenter, _ as getParallelStepsPrefix, K as isAndOperator, $ as isAutoLayoutDirection, l as isCustomElement, m as isCustomRelationExpr, a0 as isDeploymentView, a1 as isDynamicView, a2 as isDynamicViewParallelSteps, p as isElement, q as isElementKindExpr, b as isElementPredicateExpr, r as isElementRef, s as isElementTagExpr, a as isElementView, t as isElementWhere, u as isExpandedElementExpr, i as isExtendsElementView, w as isInOut, v as isIncoming, L as isKindEqual, M as isNotOperator, N as isOrOperator, x as isOutgoing, O as isParticipantOperator, y as isRelation, z as isRelationExpression, C as isRelationPredicateExpr, F as isRelationWhere, e as isScopedElementView, a3 as isStepEdgeId, P as isTagEqual, a4 as isViewRuleAutoLayout, a5 as isViewRuleGlobalPredicateRef, a6 as isViewRuleGlobalStyle, a7 as isViewRuleGroup, a8 as isViewRulePredicate, a9 as isViewRuleStyle, G as isWildcard, aa as stepEdgeId, Q as whereOperatorAsPredicate } from '../shared/core.BMep80lJ.mjs';
+export { A as AsFqn, B as BorderStyles, C as ComputedNode, z as ComputedView, v as DefaultArrowType, D as DefaultElementShape, x as DefaultLineStyle, f as DefaultPaddingSize, y as DefaultRelationshipColor, g as DefaultShapeSize, h as DefaultTextSize, b as DefaultThemeColor, c as DeploymentElement, H as DiagramNode, E as ElementKind, j as ElementShapes, k as ExpressionV2, F as FqnExpr, l as FqnRef, G as GlobalFqn, M as ModelLayer, R as RelationExpr, I as extractStep, J as getBBoxCenter, K as getParallelStepsPrefix, m as isAndOperator, L as isAutoLayoutDirection, N as isDeploymentView, O as isDynamicView, P as isDynamicViewParallelSteps, a as isElementView, i as isExtendsElementView, e as isGlobalFqn, p as isKindEqual, q as isNotOperator, r as isOrOperator, t as isParticipantOperator, d as isScopedElementView, Q as isStepEdgeId, u as isTagEqual, S as isViewRuleAutoLayout, T as isViewRuleGlobalPredicateRef, U as isViewRuleGlobalStyle, V as isViewRuleGroup, W as isViewRulePredicate, X as isViewRuleStyle, s as splitGlobalFqn, Y as stepEdgeId, w as whereOperatorAsPredicate } from '../shared/core.DgfwjBtu.mjs';
 
 const ThemeColors = [
   "amber",

package/dist/utils/index.d.mts

@@ -1,5 +1,5 @@
-export { I as IterableContainer, R as ReorderedArray, a as ancestorsFqn, c as commonAncestor, b as compareByFqnHierarchically, d as compareFqnHierarchically, h as hierarchyDistance, e as hierarchyLevel, i as isAncestor, f as isDescendantOf, g as isSameHierarchy, n as nameFromFqn, p as parentFqn, s as sortByFqnHierarchically, j as sortNaturalByFqn, k as sortParentsFirst } from '../shared/core.HKn0jlo_.mjs';
-import { N as NonEmptyArray, a as IteratorLike } from '../shared/core.30yYKXcZ.mjs';
+export { I as IterableContainer, R as ReorderedArray, a as ancestorsFqn, c as commonAncestor, b as compareByFqnHierarchically, d as compareFqnHierarchically, h as hierarchyDistance, e as hierarchyLevel, i as isAncestor, f as isDescendantOf, g as isSameHierarchy, n as nameFromFqn, p as parentFqn, s as sortByFqnHierarchically, j as sortNaturalByFqn, k as sortParentsFirst } from '../shared/core.D2830qgg.mjs';
+import { N as NonEmptyArray, I as IteratorLike } from '../shared/core.SjLhMA7a.mjs';
 import { IsNumericLiteral } from 'type-fest';
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@likec4/core",
-  "version": "1.27.3",
+  "version": "1.28.0",
   "license": "MIT",
   "homepage": "https://likec4.dev",
   "author": "Denis Davydkov <denis@davydkov.com>",
@@ -84,7 +84,7 @@
     "access": "public"
   },
   "dependencies": {
-    "type-fest": "^4.38.0"
+    "type-fest": "^4.39.1"
   },
   "devDependencies": {
     "@dagrejs/dagre": "1.1.4",
@@ -102,11 +102,11 @@
     "object-hash": "^3.0.0",
     "obliterator": "^2.0.5",
     "remeda": "^2.21.2",
-    "turbo": "^2.4.4",
-    "typescript": "^5.8.2",
+    "turbo": "^2.5.0",
+    "typescript": "^5.8.3",
     "unbuild": "^3.5.0",
-    "vitest": "^3.0.9",
-    "@likec4/tsconfig": "1.27.3"
+    "vitest": "^3.1.1",
+    "@likec4/tsconfig": "1.28.0"
   },
   "scripts": {
     "typecheck": "tsc --noEmit",

package/src/builder/Builder.ts

@@ -340,6 +340,7 @@ function builder<Spec extends BuilderSpecification, T extends AnyTypes>(
           Array.from(_views.entries()),
         ),
       ),
+      imports: {},
     } as any),
     toLikeC4Model: () => {
       const parsed = self.build()

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

@@ -2,15 +2,12 @@ import { isArray, isString, map } from 'remeda'
 import type { LiteralUnion, Simplify } from 'type-fest'
 import {
   type AutoLayoutDirection,
-  type CustomElementExpr,
-  type CustomRelationExpr,
-  type ElementExpression as C4ElementExpression,
-  type Expression as C4Expression,
+  type ExpressionV2,
   type NonEmptyArray,
   type ViewRuleStyle,
   type WhereOperator,
-  isElementPredicateExpr,
 } from '../types'
+import { ModelLayer } from '../types/expression-v2-model'
 import type { KindEqual, Participant, TagEqual } from '../types/operators'
 import type { AnyTypes, Types } from './_types'
 
@@ -87,7 +84,10 @@ export namespace ViewPredicate {
   export type Custom<Types extends AnyTypes> = {
     where?: ViewPredicate.WhereOperator<Types>
     with?: Simplify<
-      Omit<CustomElementExpr['custom'] & CustomRelationExpr['customRelation'], 'expr' | 'relation' | 'navigateTo'> & {
+      Omit<
+        ModelLayer.FqnExpr.Custom['custom'] & ModelLayer.RelationExpr.Custom['customRelation'],
+        'expr' | 'relation' | 'navigateTo'
+      > & {
         navigateTo?: Types['ViewId']
       }
     >
@@ -181,7 +181,7 @@ function $include<B extends LikeC4ViewBuilder<AnyTypes, any, any>>(
 
       const custom = args[1].with
       if (custom) {
-        const isElement = isElementPredicateExpr(expr)
+        const isElement = ModelLayer.FqnExpr.is(expr)
         if (isElement) {
           expr = {
             custom: {
@@ -193,7 +193,7 @@ function $include<B extends LikeC4ViewBuilder<AnyTypes, any, any>>(
           expr = {
             customRelation: {
               ...custom,
-              relation: expr as any,
+              expr: expr as any,
             },
           }
         }
@@ -212,7 +212,7 @@ function $exclude<B extends LikeC4ViewBuilder<AnyTypes, any, any>>(
     | [B['TypedExpr'], ViewPredicate.Custom<B['Types']>]
 ): (b: B) => B {
   return (b) => {
-    let expr = b.$expr(args[0]) as C4Expression
+    let expr = b.$expr(args[0]) as ExpressionV2
     if (args.length === 2 && args[1].where) {
       const condition = parseWhere(args[1].where)
       expr = {
@@ -233,7 +233,7 @@ function $style<B extends LikeC4ViewBuilder<AnyTypes, any, any>>(
 ): (b: B) => B {
   return (b) =>
     b.style({
-      targets: (isArray(element) ? element : [element]).map(e => b.$expr(e as any) as C4ElementExpression),
+      targets: (isArray(element) ? element : [element]).map(e => b.$expr(e as any) as ModelLayer.FqnExpr),
       ...(notation ? { notation } : {}),
       style: {
         ...style,