@likec4/core 1.9.0 → 1.10.1

package/dist/shared/{core.DcPLm41i.cjs → core.Db3ntVII.cjs}

@@ -24,6 +24,8 @@ function o(a){return t=>!a(t)}
 
 function e$1(n){return n==null}
 
+function n(r){return Array.isArray(r)}
+
 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));
@@ -208,6 +210,9 @@ function isViewRuleAutoLayout(rule) {
 function isDynamicViewIncludeRule(rule) {
   return "include" in rule && Array.isArray(rule.include);
 }
+function isDynamicViewParallelSteps(step) {
+  return "__parallel" in step && n(step.__parallel);
+}
 function isDynamicView(view) {
   return view.__ === "dynamic";
 }
@@ -220,8 +225,9 @@ function isExtendsElementView(view) {
 function isScopedElementView(view) {
   return isElementView(view) && "viewOf" in view;
 }
-function StepEdgeId(step) {
-  return `step-${String(step).padStart(3, "0")}`;
+function StepEdgeId(step, parallelStep) {
+  const id = `step-${String(step).padStart(2, "0")}`;
+  return parallelStep ? `${id}.${parallelStep}` : id;
 }
 function isStepEdgeId(id) {
   return id.startsWith("step-");
@@ -230,7 +236,13 @@ function extractStep(id) {
   if (!isStepEdgeId(id)) {
     throw new Error(`Invalid step edge id: ${id}`);
   }
-  return Number(id.slice("step-".length));
+  return parseFloat(id.slice("step-".length));
+}
+function getParallelStepsPrefix(id) {
+  if (isStepEdgeId(id) && id.includes(".")) {
+    return id.slice(0, id.indexOf(".") + 1);
+  }
+  return null;
 }
 function isComputedDynamicView(view) {
   return view.__ === "dynamic";
@@ -263,6 +275,7 @@ exports.e = e$1;
 exports.expression = expression;
 exports.extractStep = extractStep;
 exports.getBBoxCenter = getBBoxCenter;
+exports.getParallelStepsPrefix = getParallelStepsPrefix;
 exports.invariant = invariant;
 exports.isAndOperator = isAndOperator;
 exports.isComputedDynamicView = isComputedDynamicView;
@@ -271,6 +284,7 @@ exports.isCustomElement = isCustomElement;
 exports.isCustomRelationExpr = isCustomRelationExpr;
 exports.isDynamicView = isDynamicView;
 exports.isDynamicViewIncludeRule = isDynamicViewIncludeRule;
+exports.isDynamicViewParallelSteps = isDynamicViewParallelSteps;
 exports.isElement = isElement;
 exports.isElementKindExpr = isElementKindExpr;
 exports.isElementPredicateExpr = isElementPredicateExpr;

package/dist/shared/{core.DfUTsojZ.mjs → core.DeifT5lC.mjs}

@@ -22,6 +22,8 @@ function o(a){return t=>!a(t)}
 
 function e$1(n){return n==null}
 
+function n(r){return Array.isArray(r)}
+
 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));
@@ -206,6 +208,9 @@ function isViewRuleAutoLayout(rule) {
 function isDynamicViewIncludeRule(rule) {
   return "include" in rule && Array.isArray(rule.include);
 }
+function isDynamicViewParallelSteps(step) {
+  return "__parallel" in step && n(step.__parallel);
+}
 function isDynamicView(view) {
   return view.__ === "dynamic";
 }
@@ -218,8 +223,9 @@ function isExtendsElementView(view) {
 function isScopedElementView(view) {
   return isElementView(view) && "viewOf" in view;
 }
-function StepEdgeId(step) {
-  return `step-${String(step).padStart(3, "0")}`;
+function StepEdgeId(step, parallelStep) {
+  const id = `step-${String(step).padStart(2, "0")}`;
+  return parallelStep ? `${id}.${parallelStep}` : id;
 }
 function isStepEdgeId(id) {
   return id.startsWith("step-");
@@ -228,7 +234,13 @@ function extractStep(id) {
   if (!isStepEdgeId(id)) {
     throw new Error(`Invalid step edge id: ${id}`);
   }
-  return Number(id.slice("step-".length));
+  return parseFloat(id.slice("step-".length));
+}
+function getParallelStepsPrefix(id) {
+  if (isStepEdgeId(id) && id.includes(".")) {
+    return id.slice(0, id.indexOf(".") + 1);
+  }
+  return null;
 }
 function isComputedDynamicView(view) {
   return view.__ === "dynamic";
@@ -248,4 +260,4 @@ function getBBoxCenter({
   };
 }
 
-export { AsFqn as A, BorderStyles as B, isNotOperator as C, DefaultElementShape as D, ElementShapes as E, isAndOperator as F, isOrOperator as G, whereOperatorAsPredicate as H, DefaultLineStyle as I, DefaultArrowType as J, DefaultRelationshipColor as K, isThemeColor as L, isViewRulePredicate as M, isViewRuleStyle as N, isViewRuleAutoLayout as O, isDynamicViewIncludeRule as P, isDynamicView as Q, isElementView as R, isExtendsElementView as S, isScopedElementView as T, StepEdgeId as U, isStepEdgeId as V, extractStep as W, isComputedDynamicView as X, isComputedElementView as Y, getBBoxCenter as Z, DefaultThemeColor as a, nonexhaustive as b, expression as c, isElementRef as d, e$1 as e, isExpandedElementExpr as f, isCustomElement as g, isWildcard as h, invariant as i, isElementKindExpr as j, isElementTagExpr as k, isElement as l, isElementWhere as m, nonNullable as n, isElementPredicateExpr as o, isRelation as p, isInOut as q, isIncoming as r, isOutgoing as s, isRelationExpression as t, u, isRelationWhere as v, isCustomRelationExpr as w, isRelationPredicateExpr as x, isTagEqual as y, isKindEqual as z };
+export { getBBoxCenter as $, AsFqn as A, BorderStyles as B, isNotOperator as C, DefaultElementShape as D, ElementShapes as E, isAndOperator as F, isOrOperator as G, whereOperatorAsPredicate as H, DefaultLineStyle as I, DefaultArrowType as J, DefaultRelationshipColor as K, isThemeColor as L, isViewRulePredicate as M, isViewRuleStyle as N, isViewRuleAutoLayout as O, isDynamicViewIncludeRule as P, isDynamicViewParallelSteps as Q, isDynamicView as R, isElementView as S, isExtendsElementView as T, isScopedElementView as U, StepEdgeId as V, isStepEdgeId as W, extractStep as X, getParallelStepsPrefix as Y, isComputedDynamicView as Z, isComputedElementView as _, DefaultThemeColor as a, nonexhaustive as b, expression as c, isElementRef as d, e$1 as e, isExpandedElementExpr as f, isCustomElement as g, isWildcard as h, invariant as i, isElementKindExpr as j, isElementTagExpr as k, isElement as l, isElementWhere as m, nonNullable as n, isElementPredicateExpr as o, isRelation as p, isInOut as q, isIncoming as r, isOutgoing as s, isRelationExpression as t, u, isRelationWhere as v, isCustomRelationExpr as w, isRelationPredicateExpr as x, isTagEqual as y, isKindEqual as z };

package/dist/types/index.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const types_index = require('../shared/core.DcPLm41i.cjs');
+const types_index = require('../shared/core.Db3ntVII.cjs');
 
 
 
@@ -16,6 +16,7 @@ exports.Expr = types_index.expression;
 exports.StepEdgeId = types_index.StepEdgeId;
 exports.extractStep = types_index.extractStep;
 exports.getBBoxCenter = types_index.getBBoxCenter;
+exports.getParallelStepsPrefix = types_index.getParallelStepsPrefix;
 exports.isAndOperator = types_index.isAndOperator;
 exports.isComputedDynamicView = types_index.isComputedDynamicView;
 exports.isComputedElementView = types_index.isComputedElementView;
@@ -23,6 +24,7 @@ exports.isCustomElement = types_index.isCustomElement;
 exports.isCustomRelationExpr = types_index.isCustomRelationExpr;
 exports.isDynamicView = types_index.isDynamicView;
 exports.isDynamicViewIncludeRule = types_index.isDynamicViewIncludeRule;
+exports.isDynamicViewParallelSteps = types_index.isDynamicViewParallelSteps;
 exports.isElement = types_index.isElement;
 exports.isElementKindExpr = types_index.isElementKindExpr;
 exports.isElementPredicateExpr = types_index.isElementPredicateExpr;

package/dist/types/index.d.cts

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

package/dist/types/index.d.mts

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

package/dist/types/index.d.ts

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

package/dist/types/index.mjs

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@likec4/core",
-  "version": "1.9.0",
+  "version": "1.10.1",
   "license": "MIT",
   "homepage": "https://likec4.dev",
   "author": "Denis Davydkov <denis@davydkov.com>",
@@ -74,16 +74,18 @@
     }
   },
   "devDependencies": {
-    "@likec4/tsconfig": "1.9.0",
+    "@likec4/tsconfig": "1.10.1",
     "@mantine/colors-generator": "^7.12.2",
-    "chroma-js": "^3.0.0",
+    "@types/natural-compare-lite": "^1.4.2",
+    "chroma-js": "^3.1.1",
     "execa": "^9.3.1",
+    "natural-compare-lite": "^1.4.0",
     "remeda": "^2.11.0",
     "turbo": "^2.1.1",
-    "type-fest": "^4.26.0",
-    "typescript": "^5.5.4",
+    "type-fest": "^4.26.1",
+    "typescript": "^5.6.2",
     "unbuild": "^3.0.0-rc.7",
-    "vitest": "~2.0.5"
+    "vitest": "^2.1.0"
   },
-  "packageManager": "yarn@4.3.1"
+  "packageManager": "yarn@4.4.1"
 }

package/src/index.ts

@@ -2,6 +2,7 @@ export * from './colors'
 export * from './errors'
 export * from './model'
 export * from './types'
+export * from './utils/compare-natural'
 export * from './utils/fqn'
 export * from './utils/guards'
 export * from './utils/promises'

package/src/types/_common.ts

@@ -2,6 +2,8 @@ import type { Tagged } from 'type-fest'
 
 export type NonEmptyArray<T> = [T, ...T[]]
 
+export type NonEmptyReadonlyArray<T> = readonly [T, ...T[]]
+
 export type IconUrl = Tagged<string, 'IconUrl'>
 
 export type CustomColor = string

package/src/types/element.ts

@@ -43,7 +43,10 @@ export interface TagSpec {
 
 export interface Link {
   readonly title?: string
+  // Value from Likec4 DSL
   readonly url: string
+  // Relative to workspace root (if url is relative),
+  readonly relative?: string
 }
 
 export interface Element {

package/src/types/expression.ts

@@ -161,6 +161,10 @@ export interface CustomRelationExpr extends Omit<BaseExpr, 'customRelation'> {
     description?: string
     technology?: string
     notation?: string
+    // Link to dynamic view
+    navigateTo?: ViewID
+    // Notes for walkthrough
+    notes?: string
     color?: Color
     line?: RelationshipLineType
     head?: RelationshipArrowType

package/src/types/relation.ts

@@ -2,6 +2,7 @@ import type { Tagged } from 'type-fest'
 import type { NonEmptyArray } from './_common'
 import type { Fqn, Link, Tag } from './element'
 import type { Color, ThemeColor } from './theme'
+import type { ViewID } from './view'
 
 export type RelationID = Tagged<string, 'RelationID'>
 export type RelationshipKind = Tagged<string, 'RelationshipKind'>
@@ -40,6 +41,8 @@ export interface Relation {
   readonly head?: RelationshipArrowType
   readonly tail?: RelationshipArrowType
   readonly links?: NonEmptyArray<Link>
+  // Link to dynamic view
+  readonly navigateTo?: ViewID
   readonly metadata?: { [key: string]: string }
 }
 

package/src/types/view.ts

@@ -1,4 +1,4 @@
-import { isNullish } from 'remeda'
+import { isArray, isNullish } from 'remeda'
 import type { Tagged } from 'type-fest'
 import type { IconUrl, NonEmptyArray, Point, XYPoint } from './_common'
 import type { ElementKind, ElementShape, ElementStyle, Fqn, Link, Tag } from './element'
@@ -100,13 +100,24 @@ export interface DynamicViewStep {
   readonly description?: string
   readonly technology?: string
   readonly notation?: string
+  // Notes for walkthrough
+  readonly notes?: string
   readonly color?: Color
   readonly line?: RelationshipLineType
   readonly head?: RelationshipArrowType
   readonly tail?: RelationshipArrowType
   readonly isBackward?: boolean
+  // Link to dynamic view
+  readonly navigateTo?: ViewID
+  __parallel?: never
 }
 
+export interface DynamicViewParallelSteps {
+  readonly __parallel: DynamicViewStep[]
+}
+
+export type DynamicViewStepOrParallel = DynamicViewStep | DynamicViewParallelSteps
+
 export type DynamicViewIncludeRule = {
   include: ElementPredicateExpression[]
 }
@@ -119,11 +130,15 @@ export type DynamicViewRule = DynamicViewIncludeRule | ViewRuleStyle | ViewRuleA
 export interface DynamicView extends BasicView<'dynamic'> {
   readonly __: 'dynamic'
 
-  readonly steps: DynamicViewStep[]
+  readonly steps: DynamicViewStepOrParallel[]
 
   readonly rules: DynamicViewRule[]
 }
 
+export function isDynamicViewParallelSteps(step: DynamicViewStepOrParallel): step is DynamicViewParallelSteps {
+  return '__parallel' in step && isArray(step.__parallel)
+}
+
 export type CustomColorDefinitions = { [key: string]: ThemeColorValues }
 
 export type LikeC4View = ElementView | DynamicView
@@ -146,20 +161,31 @@ export function isScopedElementView(view: LikeC4View): view is ScopedElementView
 export type NodeId = Tagged<string, 'Fqn'>
 
 export type EdgeId = Tagged<string, 'EdgeId'>
-export type StepEdgeIdLiteral = `step-${number}`
+export type StepEdgeIdLiteral = `step-${number}` | `step-${number}.${number}`
 export type StepEdgeId = Tagged<StepEdgeIdLiteral, 'EdgeId'>
-export function StepEdgeId(step: number): StepEdgeId {
-  return `step-${String(step).padStart(3, '0')}` as StepEdgeId
+export function StepEdgeId(step: number, parallelStep?: number): StepEdgeId {
+  const id = `step-${String(step).padStart(2, '0')}` as StepEdgeId
+  return parallelStep ? `${id}.${parallelStep}` as StepEdgeId : id
 }
 
 export function isStepEdgeId(id: string): id is StepEdgeId {
   return id.startsWith('step-')
 }
+
 export function extractStep(id: EdgeId): number {
   if (!isStepEdgeId(id)) {
     throw new Error(`Invalid step edge id: ${id}`)
   }
-  return Number(id.slice('step-'.length))
+  return parseFloat(id.slice('step-'.length))
+}
+
+// Get the prefix of the parallel steps
+// i.e. step-01.1 -> step-01.
+export function getParallelStepsPrefix(id: string): string | null {
+  if (isStepEdgeId(id) && id.includes('.')) {
+    return id.slice(0, id.indexOf('.') + 1)
+  }
+  return null
 }
 
 export interface ComputedNode {
@@ -205,11 +231,16 @@ export interface ComputedEdge {
   technology?: string
   relations: RelationID[]
   kind?: RelationshipKind
+  notation?: string
+  // Notes for walkthrough
+  notes?: string
   color?: Color
   line?: RelationshipLineType
   head?: RelationshipArrowType
   tail?: RelationshipArrowType
   tags?: NonEmptyArray<Tag>
+  // Link to dynamic view
+  navigateTo?: ViewID
   /**
    * If this edge is derived from custom relationship predicate
    */

package/src/utils/compare-natural.spec.ts

@@ -0,0 +1,37 @@
+import { sort as remedaSort } from 'remeda'
+import { describe, expect, it } from 'vitest'
+import { compareNatural } from './compare-natural'
+
+describe('compareNatural', () => {
+  const sort = (array: Array<string | undefined>) => remedaSort(array, compareNatural)
+
+  it('should move undefined to the end', () => {
+    expect(
+      sort([
+        undefined,
+        'apple',
+        undefined,
+        'banana'
+      ])
+    ).toEqual([
+      'apple',
+      'banana',
+      undefined,
+      undefined
+    ])
+  })
+
+  it('should sort array of strings', () => {
+    expect(sort([
+      'apple1',
+      'apple11',
+      'apple2',
+      'apple10'
+    ])).toEqual([
+      'apple1',
+      'apple2',
+      'apple10',
+      'apple11'
+    ])
+  })
+})

package/src/utils/compare-natural.ts

@@ -0,0 +1,14 @@
+import compare from 'natural-compare-lite'
+import { isString } from 'remeda'
+
+
+export function compareNatural(a: string | undefined, b: string | undefined): -1 | 0 | 1 {
+  if (a === b) return 0
+  if (isString(a)) {
+    if (isString(b)) {
+      return compare(a, b)
+    }
+    return 1
+  }
+  return isString(b) ? -1 : 0
+}

package/src/utils/fqn.spec.ts

@@ -1,3 +1,4 @@
+import { prop } from 'remeda'
 import { describe, expect, it } from 'vitest'
 import type { Element, Fqn } from '../types'
 import {
@@ -7,7 +8,9 @@ import {
   isAncestor,
   isDescendantOf,
   notDescendantOf,
-  parentFqn
+  parentFqn,
+  sortByFqnHierarchically,
+  sortNaturalByFqn
 } from './fqn'
 
 const el = (id: string): Element => ({ id }) as unknown as Element
@@ -88,7 +91,13 @@ describe('notDescendantOf', () => {
 
 describe('compareFqnHierarchically', () => {
   it('should compare hierarchically', () => {
-    expect(['a', 'b', 'a.b', 'a.b.c', 'a.c.c'].sort(compareFqnHierarchically)).toEqual([
+    expect([
+      'a',
+      'b',
+      'a.b',
+      'a.b.c',
+      'a.c.c'
+    ].sort(compareFqnHierarchically)).toEqual([
       'a',
       'b',
       'a.b',
@@ -103,3 +112,91 @@ describe('compareFqnHierarchically', () => {
     ).toEqual(['aaa', 'aa', 'a', 'aaa.c', 'aa.b', 'a.c', 'a.b'])
   })
 })
+
+describe('sortNaturalByFqn', () => {
+  it('should sort hierarchically', () => {
+    expect(
+      sortNaturalByFqn([
+        el('a.b'),
+        el('a'),
+        el('a.c.a.b'),
+        el('a.c.c'),
+        el('b'),
+        el('a.b.c')
+      ]).map(prop('id'))
+    ).toEqual([
+      'a',
+      'b',
+      'a.b',
+      'a.b.c',
+      'a.c.c',
+      'a.c.a.b'
+    ])
+  })
+
+  it('should sort natural', () => {
+    expect(
+      sortNaturalByFqn([
+        el('b'),
+        el('a.c.c'),
+        el('a'),
+        el('a.b1'),
+        el('a.b2'),
+        el('a.b10'),
+        el('a.b2.c')
+      ]).map(prop('id'))
+    ).toEqual([
+      'a',
+      'b',
+      'a.b1',
+      'a.b2',
+      'a.b10',
+      'a.b2.c',
+      'a.c.c'
+    ])
+  })
+})
+
+describe('sortByFqnHierarchically', () => {
+  it('should sort hierarchically', () => {
+    expect(
+      sortByFqnHierarchically([
+        el('a.b'),
+        el('a'),
+        el('a.b.c'),
+        el('a.c.a.b'),
+        el('a.c.c'),
+        el('b')
+      ]).map(prop('id'))
+    ).toEqual([
+      'a',
+      'b',
+      'a.b',
+      'a.b.c',
+      'a.c.c',
+      'a.c.a.b'
+    ])
+  })
+
+  it('should preserve initial order', () => {
+    expect(
+      sortByFqnHierarchically([
+        el('b'),
+        el('a.c.c'),
+        el('a'),
+        el('a.b10'),
+        el('a.b2.c'),
+        el('a.b1'),
+        el('a.b2')
+      ]).map(prop('id'))
+    ).toEqual([
+      'b',
+      'a',
+      'a.b10',
+      'a.b1',
+      'a.b2',
+      'a.c.c',
+      'a.b2.c'
+    ])
+  })
+})

package/src/utils/fqn.ts

@@ -1,4 +1,5 @@
 import type { Element, Fqn } from '../types'
+import { compareNatural } from './compare-natural'
 import { isString } from './guards'
 
 type Predicate<T> = (x: T) => boolean
@@ -101,7 +102,7 @@ export function ancestorsFqn(fqn: Fqn): Fqn[] {
  *                    - Positive number if a is deeper than b.
  *                    - Negative number if b is deeper than a.
  */
-export function compareFqnHierarchically<T extends string = string>(a: T, b: T): number {
+export function compareFqnHierarchically<T extends string = string>(a: T, b: T): -1 | 0 | 1 {
   const depthA = a.split('.').length
   const depthB = b.split('.').length
   switch (true) {
@@ -120,3 +121,39 @@ export function compareFqnHierarchically<T extends string = string>(a: T, b: T):
 export function compareByFqnHierarchically<T extends { id: string }>(a: T, b: T) {
   return compareFqnHierarchically(a.id, b.id)
 }
+
+type IterableContainer<T = unknown> = ReadonlyArray<T> | readonly []
+type ReorderedArray<T extends IterableContainer> = {
+  -readonly [P in keyof T]: T[number]
+}
+
+export function sortByFqnHierarchically<T extends { id: string }, A extends IterableContainer<T>>(
+  array: A
+): ReorderedArray<A> {
+  return array
+    .map(item => ({ item, fqn: item.id.split('.') }))
+    .sort((a, b) => {
+      return a.fqn.length - b.fqn.length
+    })
+    .map(({ item }) => item) as ReorderedArray<A>
+}
+
+export function sortNaturalByFqn<T extends { id: string }, A extends IterableContainer<T>>(
+  array: A
+): ReorderedArray<A> {
+  return array
+    .map(item => ({ item, fqn: item.id.split('.') }))
+    .sort((a, b) => {
+      if (a.fqn.length !== b.fqn.length) {
+        return a.fqn.length - b.fqn.length
+      }
+      for (let i = 0; i < a.fqn.length; i++) {
+        const compare = compareNatural(a.fqn[i], b.fqn[i])
+        if (compare !== 0) {
+          return compare
+        }
+      }
+      return 0
+    })
+    .map(({ item }) => item) as ReorderedArray<A>
+}

package/src/utils/index.ts

@@ -1,3 +1,4 @@
+export * from './compare-natural'
 export * from './fqn'
 export * from './guards'
 export * from './promises'

package/src/utils/relations.spec.ts

@@ -170,7 +170,7 @@ describe('compareRelations', () => {
     }
   }
   function sorted(...relations: Array<{ source: string; target: string }>) {
-    return relations.sort(compareRelations).map(r => r.source + ' -> ' + r.target)
+    return relations.toSorted(compareRelations).map(r => r.source + ' -> ' + r.target)
   }
 
   it('should sort by source and target', () => {

package/src/utils/relations.ts

@@ -22,14 +22,14 @@ export const compareRelations = <T extends { source: string; target: string }>(a
     return -1
   }
   const compareParents = parentA && parentB ? compareFqnHierarchically(parentA, parentB) : 0
-  if (compareParents === 0) {
-    const compareSource = compareFqnHierarchically(a.source, b.source)
-    if (compareSource !== 0) {
-      return compareSource
-    }
-    return compareFqnHierarchically(a.target, b.target)
+  if (compareParents !== 0) {
+    return compareParents
   }
-  return compareParents
+  const compareSource = compareFqnHierarchically(a.source, b.source)
+  if (compareSource !== 0) {
+    return compareSource
+  }
+  return compareFqnHierarchically(a.target, b.target)
 }
 
 export const isInside = (parent: Fqn): RelationPredicate => {