@likec4/core 1.46.0 → 1.46.3

package/dist/shared/{core.DU8pv3Q6.mjs → core.DVfPJPJj.mjs}

@@ -1,10 +1,10 @@
-import { t as t$3, e as e$3, a as DeploymentNodeModel, b as DeployedInstanceModel, c as DeploymentRelationModel, N as NestedElementOfDeployedInstanceModel } from './core.DbQpDoJS.mjs';
+import { t as t$3, e as e$3, a as DeploymentNodeModel, b as DeployedInstanceModel, c as DeploymentRelationModel, N as NestedElementOfDeployedInstanceModel } from './core.CRhT4Iio.mjs';
 import { e as e$2 } from './core.BKlholso.mjs';
 import { n as n$1 } from './core.BhNcrwzK.mjs';
 import { c as splitGlobalFqn, h as extractStep, g as isStepEdgeId, i as isGroupElementKind, b as isGlobalFqn, a as GlobalFqn } from './core.D0WZutNd.mjs';
 import { m as hierarchyLevel, n as nameFromFqn, i as isAncestor, g as commonAncestor, s as sortNaturalByFqn, f as sortParentsFirst, p as parentFqn, a as ancestorsFqn } from './core.CdNCAwq7.mjs';
 import { m as memoizeProp } from './core.CLSZtnFh.mjs';
-import { R as RichText, e as exact } from './core.BK-tI3Q3.mjs';
+import { R as RichText, e as exact } from './core.DEK-BO3_.mjs';
 import { preferSummary, preferDescription } from '../types/_aux.mjs';
 import { i as ihead } from './core.uFk_o9X6.mjs';
 import { t as t$6, b as compareNaturalHierarchically, c as compareNatural } from './core.3ZhnKAlZ.mjs';
@@ -12,7 +12,7 @@ import { t as t$2, a as t$4 } from './core.BsSXS-_R.mjs';
 import { t as t$5, e as e$4 } from './core.Coi_LOUZ.mjs';
 import { t as t$8 } from './core.CbT8JVYL.mjs';
 import { t as t$7 } from './core.BkVA6gjl.mjs';
-import { c as calcDriftsFromSnapshot, a as applyManualLayout, h as t$9 } from './core.Qv7vZIwZ.mjs';
+import { c as calcDriftsFromSnapshot, a as applyManualLayout, h as t$9 } from './core.DSalPD6v.mjs';
 import { L as LikeC4Styles } from './core.BspBF3SJ.mjs';
 import { g as getOrCreate } from './core.DcS-0zys.mjs';
 import { D as DefaultMap } from './core.BbE4y-yl.mjs';
@@ -21,8 +21,8 @@ import { FqnRef } from '../types/fqnRef.mjs';
 import { c as isDeploymentNode, a as _type, _ as _stage, i as isOnStage, w as whereOperatorAsPredicate } from './core.DH7TXqXf.mjs';
 import { i as ifind } from './core.CmPXpJ8l.mjs';
 import { i as ifilter } from './core.DRJma0Ol.mjs';
-import './core.DqlrMlsf.mjs';
-import './core.CQPEY2wQ.mjs';
+import './core.BFd1lU9R.mjs';
+import './core.78IWAHAE.mjs';
 
 function e$1(e){if(e==null||e===``)return  true;if(typeof e!=`object`)return  false;if(`length`in e&&typeof e.length==`number`)return e.length===0;if(`size`in e&&typeof e.size==`number`)return e.size===0;for(let t in e)return  false;return Object.getOwnPropertySymbols(e).length===0}
 
@@ -81,7 +81,7 @@ class ElementModel {
    * It includes tags from the element and its kind.
    */
   get tags() {
-    return memoizeProp(this, Symbol.for("tags"), () => {
+    return memoizeProp(this, /* @__PURE__ */ Symbol.for("tags"), () => {
       return n$1([
         ...this.$element.tags ?? [],
         ...this.$model.specification.elements[this.$element.kind]?.tags ?? []
@@ -119,7 +119,7 @@ class ElementModel {
     return this.$element.links ?? [];
   }
   get defaultView() {
-    return memoizeProp(this, Symbol.for("defaultView"), () => ihead(this.scopedViews()) ?? null);
+    return memoizeProp(this, /* @__PURE__ */ Symbol.for("defaultView"), () => ihead(this.scopedViews()) ?? null);
   }
   get isRoot() {
     return this.parent === null;
@@ -226,16 +226,16 @@ class ElementModel {
     return;
   }
   get allOutgoing() {
-    return memoizeProp(this, Symbol.for("allOutgoing"), () => new Set(this.outgoing()));
+    return memoizeProp(this, /* @__PURE__ */ Symbol.for("allOutgoing"), () => new Set(this.outgoing()));
   }
   get allIncoming() {
-    return memoizeProp(this, Symbol.for("allIncoming"), () => new Set(this.incoming()));
+    return memoizeProp(this, /* @__PURE__ */ Symbol.for("allIncoming"), () => new Set(this.incoming()));
   }
   /**
    * Iterate over all views that include this element.
    */
   views() {
-    return memoizeProp(this, Symbol.for("views"), () => {
+    return memoizeProp(this, /* @__PURE__ */ Symbol.for("views"), () => {
       const views = /* @__PURE__ */ new Set();
       for (const view of this.$model.views()) {
         if (view.includesElement(this.id)) {
@@ -250,7 +250,7 @@ class ElementModel {
    * It is possible that element is not included in the view.
    */
   scopedViews() {
-    return memoizeProp(this, Symbol.for("scopedViews"), () => {
+    return memoizeProp(this, /* @__PURE__ */ Symbol.for("scopedViews"), () => {
       const views = /* @__PURE__ */ new Set();
       for (const vm of this.$model.views()) {
         if (vm.isScopedElementView() && vm.viewOf.id === this.id) {
@@ -469,7 +469,8 @@ class LikeC4DeploymentModel {
    * Returns a specific relationship by its ID.
    */
   relationship(id) {
-    return nonNullable(this.#relations.get(getId(id)), `DeploymentRelationModel ${id} not found`);
+    const relationId = getId(id);
+    return nonNullable(this.#relations.get(relationId), `DeploymentRelationModel ${relationId} not found`);
   }
   findRelationship(id) {
     return this.#relations.get(id) ?? null;
@@ -1706,7 +1707,7 @@ class LikeC4Model {
    * If the project is not defined in the model, it returns a default project with the ID "default".
    */
   get project() {
-    return this.$data.project ?? memoizeProp(this, Symbol.for("project"), () => ({
+    return this.$data.project ?? memoizeProp(this, /* @__PURE__ */ Symbol.for("project"), () => ({
       id: this.projectId
     }));
   }
@@ -1714,7 +1715,7 @@ class LikeC4Model {
     return this.$data.specification;
   }
   get globals() {
-    return memoizeProp(this, Symbol.for("globals"), () => ({
+    return memoizeProp(this, /* @__PURE__ */ Symbol.for("globals"), () => ({
       predicates: {
         ...this.$data.globals?.predicates
       },

package/dist/shared/{core.Byj60hH6.d.mts → core.DezoCAzf.d.mts}

@@ -1,4 +1,4 @@
-import { E as ElementModel, e as DeploymentElementModel } from './core.BLG-ADpi.mjs';
+import { E as ElementModel, e as DeploymentElementModel } from './core.DK3pdsTf.mjs';
 import { A as Any } from './core.BkSYCfRg.mjs';
 import { F as Fqn } from './core.CDdf8izT.mjs';
 

package/dist/shared/{core.D4Y4U8Lp.d.mts → core.I8sCl3WM.d.mts}

@@ -1,5 +1,5 @@
-import { C as Connection, c as customInspectSymbol } from './core.Byj60hH6.mjs';
-import { E as ElementModel, R as RelationshipModel } from './core.BLG-ADpi.mjs';
+import { C as Connection, c as customInspectSymbol } from './core.DezoCAzf.mjs';
+import { E as ElementModel, R as RelationshipModel } from './core.DK3pdsTf.mjs';
 import { A as Any, U as Unknown, z as EdgeId } from './core.BkSYCfRg.mjs';
 
 /**

package/dist/shared/{core.CQYL_Z-_.d.mts → core.e5GJ61_a.d.mts}

@@ -1,5 +1,5 @@
-import { C as Connection, c as customInspectSymbol } from './core.Byj60hH6.mjs';
-import { e as DeploymentElementModel, h as RelationshipsAccum, D as DeploymentNodeModel, R as RelationshipModel, b as DeploymentRelationModel } from './core.BLG-ADpi.mjs';
+import { C as Connection, c as customInspectSymbol } from './core.DezoCAzf.mjs';
+import { e as DeploymentElementModel, h as RelationshipsAccum, D as DeploymentNodeModel, R as RelationshipModel, b as DeploymentRelationModel } from './core.DK3pdsTf.mjs';
 import { A as Any, z as EdgeId } from './core.BkSYCfRg.mjs';
 import { c as IteratorLike } from './core.DB0Ue5Wx.mjs';
 

package/dist/shared/{core.DJpiszim.mjs → core.xgoPk2RG.mjs}

@@ -1,37 +1,37 @@
-import { n as n$d, b as t$i, d as t$k, e as t$l, f as t$n, g as buildElementNotations, t as t$q } from './core.Qv7vZIwZ.mjs';
+import { n as n$d, b as t$i, d as t$j, e as t$l, f as t$m, g as buildElementNotations, t as t$q } from './core.DSalPD6v.mjs';
 import { t as t$a, a as t$b } from './core.BsSXS-_R.mjs';
 import { t as t$e } from './core.CbT8JVYL.mjs';
-import { a as t$c, t as t$j, i as isElementModel, b as isNestedElementOfDeployedInstanceModel, c as isDeployedInstanceModel, d as isDeploymentNodeModel, e as isDeploymentElementModel, L as LikeC4Model } from './core.DU8pv3Q6.mjs';
-import { c as commonHead, t as t$f, o as objectHash, b as t$m, a as compareRelations, S as Stack } from './core.xeuDd__E.mjs';
+import { a as t$c, t as t$k, i as isElementModel, b as isNestedElementOfDeployedInstanceModel, c as isDeployedInstanceModel, d as isDeploymentNodeModel, e as isDeploymentElementModel, L as LikeC4Model } from './core.DVfPJPJj.mjs';
+import { c as commonHead, t as t$f, o as objectHash, b as t$n, a as compareRelations, S as Stack } from './core.xeuDd__E.mjs';
 import { a as nonNullable, i as invariant, n as nonexhaustive } from './core.D4npX2q8.mjs';
 import { G as Graph } from './core.CmGY9blO.mjs';
-import { r as requireIterables, e as exact, t as t$o } from './core.BK-tI3Q3.mjs';
+import { r as requireIterables, e as exact, t as t$o } from './core.DEK-BO3_.mjs';
 import { b as requireIterator } from './core.CBLX4mT8.mjs';
 import { g as getDefaultExportFromCjs } from './core.B85MJLTf.mjs';
 import { n as n$c, t as t$d } from './core.3ZhnKAlZ.mjs';
 import { e as e$4 } from './core.BKlholso.mjs';
 import { f as flattenMarkdownOrString, i as isGroupElementKind, G as GroupElementKind, e as stepEdgeId } from './core.D0WZutNd.mjs';
-import { b as isDescendantOf, f as sortParentsFirst, i as isAncestor, p as parentFqn, j as compareByFqnHierarchically, c as isNonEmptyArray, n as nameFromFqn, o as sortByFqnHierarchically, g as commonAncestor, a as ancestorsFqn, d as isSameHierarchy } from './core.CdNCAwq7.mjs';
+import { b as isDescendantOf, f as sortParentsFirst, i as isAncestor, p as parentFqn, j as compareByFqnHierarchically, c as isNonEmptyArray, o as sortByFqnHierarchically, g as commonAncestor, a as ancestorsFqn, d as isSameHierarchy } from './core.CdNCAwq7.mjs';
 import { d as difference, i as intersection, u as union, h as hasIntersection } from './core.DbfO90vF.mjs';
-import { e as e$8 } from './core.Coi_LOUZ.mjs';
-import { w as whereOperatorAsPredicate, m as isViewRuleStyle, v as t$g, l as isViewRulePredicate, a as _type, _ as _stage, u as e$b, t as isDynamicView, s as isDeploymentView, p as isElementView } from './core.DH7TXqXf.mjs';
-import { n as n$e } from './core.BhNcrwzK.mjs';
+import { e as e$9 } from './core.Coi_LOUZ.mjs';
+import { w as whereOperatorAsPredicate, m as isViewRuleStyle, v as t$g, u as e$8, l as isViewRulePredicate, a as _type, _ as _stage, t as isDynamicView, s as isDeploymentView, p as isElementView } from './core.DH7TXqXf.mjs';
+import { e as e$5, d as deploymentConnection, R as RelationshipsAccum, D as DeploymentConnectionModel } from './core.CRhT4Iio.mjs';
 import { e as e$6, a as iunique, i as iflat } from './core.C4x8aaWa.mjs';
-import { e as e$5, d as deploymentConnection, R as RelationshipsAccum, D as DeploymentConnectionModel } from './core.DbQpDoJS.mjs';
 import { e as e$7 } from './core.BoYfZOBm.mjs';
 import { ModelFqnExpr, ModelRelationExpr, ModelExpression } from '../types/expression-model.mjs';
 import { FqnRef } from '../types/fqnRef.mjs';
 import { preferSummary } from '../types/_aux.mjs';
 import { a as t$h } from './core.BspBF3SJ.mjs';
+import { n as n$e } from './core.BhNcrwzK.mjs';
 import { FqnExpr, RelationExpr } from '../types/expression.mjs';
-import { f as findAscendingConnections, m as mergeConnections, d as differenceConnections, j as isNestedConnection, s as sortConnectionsByBoundaryHierarchy, o as findConnectionsBetween$3, p as findConnection$3, n as modelConnection, b as findDescendantConnections, a as findDeepestNestedConnection, i as isAnyInOut, k as isOutgoing, g as isIncoming, C as ConnectionModel } from './core.CQPEY2wQ.mjs';
+import { f as findAscendingConnections, m as mergeConnections, d as differenceConnections, j as isNestedConnection, s as sortConnectionsByBoundaryHierarchy, o as findConnectionsBetween$3, p as findConnection$3, n as modelConnection, b as findDescendantConnections, a as findDeepestNestedConnection, i as isAnyInOut, k as isOutgoing, g as isIncoming, C as ConnectionModel } from './core.78IWAHAE.mjs';
 import { t as toSet, a as toArray, i as imap } from './core.C3JowhaZ.mjs';
 import { D as DefaultMap } from './core.BbE4y-yl.mjs';
 import { i as ifilter } from './core.DRJma0Ol.mjs';
-import { C as Connection, c as customInspectSymbol } from './core.DqlrMlsf.mjs';
+import { C as Connection, c as customInspectSymbol } from './core.BFd1lU9R.mjs';
 import { i as isome } from './core.FZ305VYd.mjs';
-import { i as isIterable, e as e$9 } from './core.RfnaEmgA.mjs';
-import { k as e$a, c as isViewRuleAutoLayout, h as isViewRuleGroup, a as isViewRuleGlobalPredicateRef, i as isViewRuleGlobalStyle, e as isDynamicStepsParallel, f as isDynamicStepsSeries, j as isViewRuleRank } from './core.om36dXXW.mjs';
+import { i as isIterable, e as e$a } from './core.RfnaEmgA.mjs';
+import { k as e$b, c as isViewRuleAutoLayout, h as isViewRuleGroup, a as isViewRuleGlobalPredicateRef, i as isViewRuleGlobalStyle, e as isDynamicStepsParallel, f as isDynamicStepsSeries, j as isViewRuleRank } from './core.om36dXXW.mjs';
 import { t as t$p } from './core.q10OP9oJ.mjs';
 
 function e$3(e){return ()=>e}
@@ -1506,14 +1506,7 @@ function buildComputedNodes({ defaults }, elements, groups) {
 function pickRelationshipProps(relation) {
   const {
     title,
-    description = null,
-    technology = null,
-    kind = null,
-    color = null,
-    line = null,
-    head = null,
-    tail = null,
-    navigateTo = null
+    description = null
   } = relation;
   return {
     // Pick description only if title is present
@@ -1521,13 +1514,7 @@ function pickRelationshipProps(relation) {
       title,
       description
     },
-    technology,
-    kind,
-    color,
-    line,
-    head,
-    tail,
-    navigateTo
+    ...t$i(relation, ["color", "technology", "head", "line", "tail", "kind", "navigateTo"])
   };
 }
 function mergePropsFromRelationships(relations, prefer) {
@@ -1581,14 +1568,12 @@ function mergePropsFromRelationships(relations, prefer) {
       }
     )
   );
-  let technology = t$5(allprops.technology);
-  let title = t$5(allprops.title) ?? (allprops.title.length > 1 ? "[...]" : null);
+  let title = t$5(allprops.title) ?? (allprops.title.length > 1 ? "[...]" : void 0);
   const tags = n$e(allprops.tags);
   let merged = exact({
-    // If there is no title, but there is technology, use technology as title
-    title: title ?? (technology ? `[${technology}]` : null),
+    title,
     description: t$5(allprops.description),
-    technology,
+    technology: t$5(allprops.technology),
     kind: t$5(allprops.kind),
     head: t$5(allprops.head),
     tail: t$5(allprops.tail),
@@ -1598,10 +1583,15 @@ function mergePropsFromRelationships(relations, prefer) {
     ...isNonEmptyArray(tags) && { tags }
   });
   if (prefer) {
-    return {
+    const preferred = pickRelationshipProps(prefer);
+    merged = t$3({
       ...merged,
-      ...t$3(pickRelationshipProps(prefer), e$4)
-    };
+      ...preferred
+    }, e$4);
+  }
+  if (e$8(merged.title) && e$4(merged.technology)) {
+    merged.title = `[${merged.technology}]`;
+    delete merged.technology;
   }
   return merged;
 }
@@ -1701,56 +1691,27 @@ function deploymentExpressionToPredicate(target) {
 function instanceSummary(model) {
   return preferSummary(model.$instance) ?? preferSummary(model.element.$element);
 }
-function toNodeSource(el) {
-  if (el.isDeploymentNode()) {
-    const onlyOneInstance = el.onlyOneInstance();
-    let {
-      title,
-      id,
-      description: description2,
-      summary,
-      metadata: _metadata,
-      // omit
-      style: {
-        icon: icon2,
-        shape: shape2,
-        color: color2
-      },
-      element: _element,
-      // omit
-      tags: _tags,
-      // omit
-      ...$node
-    } = el.$node;
-    let tags = [...el.tags];
-    summary ??= description2;
-    if (onlyOneInstance) {
-      tags = n$e([...tags, ...onlyOneInstance.tags]);
-      if (title === nameFromFqn(el.id)) {
-        title = onlyOneInstance.title;
-      }
-      icon2 ??= onlyOneInstance.style.icon;
-      color2 ??= onlyOneInstance.style.color;
-      shape2 ??= onlyOneInstance.style.shape;
-      summary ??= instanceSummary(onlyOneInstance);
-    }
-    return exact({
-      id,
-      deploymentRef: id,
-      title,
-      ...$node,
-      color: color2 ?? el.color,
-      shape: shape2 ?? el.shape,
-      ...onlyOneInstance && {
-        modelRef: onlyOneInstance.element.id
-      },
-      icon: icon2,
-      description: summary,
-      tags,
-      style: n$6(el.style, ["icon", "shape", "color"])
-    });
-  }
-  invariant(el.isInstance(), "Expected Instance");
+function deploymentNodeToNodeSource(el) {
+  const id = el.id;
+  const onlyOneInstance = el.onlyOneInstance();
+  return exact({
+    id,
+    deploymentRef: id,
+    title: el.title,
+    kind: el.kind,
+    technology: el.technology ?? void 0,
+    links: t$b(el.links, 1) ? [...el.links] : void 0,
+    notation: el.$node.notation ?? void 0,
+    color: el.color,
+    shape: el.shape,
+    modelRef: onlyOneInstance?.element.id,
+    icon: el.style.icon,
+    description: preferSummary(el.$node) ?? void 0,
+    tags: [...el.tags],
+    style: n$6(el.style, ["icon", "shape", "color"])
+  });
+}
+function instanceToNodeSource(el) {
   const instance = el.$instance;
   const element = el.element;
   const { icon, color, shape, ...style } = el.style;
@@ -1758,15 +1719,12 @@ function toNodeSource(el) {
     ...element.links,
     ...instance.links ?? []
   ];
-  const notation = instance.notation ?? element.$element.notation;
-  const description = instanceSummary(el);
-  const technology = el.technology ?? void 0;
   return exact({
     id: el.id,
     kind: "instance",
     title: el.title,
-    description,
-    technology,
+    description: instanceSummary(el) ?? void 0,
+    technology: el.technology ?? void 0,
     tags: [...el.tags],
     links: t$b(links, 1) ? links : void 0,
     icon,
@@ -1775,9 +1733,15 @@ function toNodeSource(el) {
     style,
     deploymentRef: instance.id,
     modelRef: element.id,
-    notation
+    notation: instance.notation
   });
 }
+function toNodeSource(el) {
+  if (el.isInstance()) {
+    return instanceToNodeSource(el);
+  }
+  return deploymentNodeToNodeSource(el);
+}
 function toComputedEdges$1(connections) {
   return connections.reduce((acc, e) => {
     const relations = [
@@ -1826,7 +1790,41 @@ function toComputedEdges$1(connections) {
   }, []);
 }
 function buildNodes$1(model, memory) {
-  return buildComputedNodes(model.$styles, [...memory.final].map(toNodeSource));
+  const nodesMap = buildComputedNodes(model.$styles, [...memory.final].map(toNodeSource));
+  for (const node of nodesMap.values()) {
+    if (!node.deploymentRef || !node.modelRef || node.children.length > 0) {
+      continue;
+    }
+    const deploymentNode = model.deployment.element(node.deploymentRef);
+    const onlyOneInstance = deploymentNode.isDeploymentNode() && deploymentNode.onlyOneInstance();
+    if (!onlyOneInstance) {
+      continue;
+    }
+    if (node.title === deploymentNode.name) {
+      node.title = onlyOneInstance.title;
+    }
+    node.description ??= instanceSummary(onlyOneInstance) ?? null;
+    node.technology ??= onlyOneInstance.technology;
+    if (e$5(node.tags)) {
+      node.tags = [...onlyOneInstance.tags];
+    }
+    if ((!node.links || e$5(node.links)) && t$b(onlyOneInstance.links, 1)) {
+      node.links = [...onlyOneInstance.links];
+    }
+    const defaults = model.$styles.defaults;
+    if (node.shape === defaults.shape && node.shape !== onlyOneInstance.shape) {
+      node.shape = onlyOneInstance.shape;
+      node.notation = null;
+    }
+    if (node.color === defaults.color && node.color !== onlyOneInstance.color) {
+      node.color = onlyOneInstance.color;
+      node.notation = null;
+    }
+    if (!node.icon && onlyOneInstance.icon) {
+      node.icon = onlyOneInstance.icon;
+    }
+  }
+  return nodesMap;
 }
 function applyDeploymentViewRuleStyles(rules, nodes) {
   for (const rule of rules) {
@@ -1857,17 +1855,17 @@ function findCrossBoundarySameSourceOrTarget(connections) {
     }
     t$d(
       sameRelationGroup,
-      t$l((conn) => [
+      t$m((conn) => [
         { group: `$source-${conn.source.id}`, conn },
         { group: `$target-${conn.target.id}`, conn }
       ]),
-      t$k(e$8("group")),
-      t$j(),
+      t$l(e$9("group")),
+      t$k(),
       n$d(t$b(2)),
       t$7(
         // In each group, sort by hierarchy, first are deepest
-        t$i(
-          t$e(e$8("conn")),
+        t$j(
+          t$e(e$9("conn")),
           sortConnectionsByBoundaryHierarchy("desc"),
           // Drop first, as it is the deepest
           // Drop if boundary is same as previous
@@ -2029,7 +2027,7 @@ let StageInclude$1 = class StageInclude extends AbstractStageInclude {
       // filter(c => this._connections.some(c2 => c2.id === c.id)),
       t$7(({ source, target, boundary }) => {
         t$d(
-          t$m(
+          t$n(
             [...toArray(source.ancestors()).reverse(), source],
             [...toArray(target.ancestors()).reverse(), target]
           ),
@@ -2290,7 +2288,7 @@ const DirectRelationPredicate = {
         }
         connections = t$d(
           sources,
-          t$l((source2) => {
+          t$m((source2) => {
             const targets = resolveAscendingSiblings(source2);
             return findConnectionsBetween$2(source2, targets, dir);
           }),
@@ -2310,7 +2308,7 @@ const DirectRelationPredicate = {
         }
         connections = t$d(
           targets,
-          t$l((target2) => {
+          t$m((target2) => {
             const sources = resolveAscendingSiblings(target2);
             return [...sources].flatMap((source2) => findConnection$2(source2, target2, dir));
           }),
@@ -2328,17 +2326,17 @@ const DirectRelationPredicate = {
         const isTarget = filterIncomingConnections(targets);
         connections = t$d(
           sources,
-          t$l((s) => findConnectionsBetween$2(s, targets, dir)),
+          t$m((s) => findConnectionsBetween$2(s, targets, dir)),
           n$d((c) => isSource(c) && isTarget(c)),
           applyPredicate(where)
         );
       }
     }
     stage.addConnections(connections);
-    if (FqnExpr.isDeploymentRef(source) && e$9(source.selector)) {
+    if (FqnExpr.isDeploymentRef(source) && e$a(source.selector)) {
       stage.addImplicit(model.element(source.ref.deployment));
     }
-    if (FqnExpr.isDeploymentRef(target) && e$9(target.selector)) {
+    if (FqnExpr.isDeploymentRef(target) && e$a(target.selector)) {
       stage.addImplicit(model.element(target.ref.deployment));
     }
     return stage;
@@ -2573,7 +2571,7 @@ function applyPredicate(...args) {
   if (where === null) {
     return c;
   }
-  if (e$a(c)) {
+  if (e$b(c)) {
     return c.map((x) => applyPredicate(x, where)).filter((x) => x.nonEmpty());
   }
   return c.update({
@@ -2586,7 +2584,7 @@ function applyElementPredicate(...args) {
     return (x) => applyElementPredicate(x, args[0]);
   }
   const [c, where] = args;
-  if (e$a(c)) {
+  if (e$b(c)) {
     return c.filter((x) => applyElementPredicate(x, where));
   }
   return where?.(toFilterable(c, c)) ?? true;
@@ -2609,7 +2607,7 @@ function toFilterable(relationEndpoint, connectionEndpoint) {
     };
   }
   if (isNestedElementOfDeployedInstanceModel(relationEndpoint)) {
-    return t$n(relationEndpoint.element, ["tags", "kind"]);
+    return t$i(relationEndpoint.element, ["tags", "kind"]);
   }
   if (isDeployedInstanceModel(relationEndpoint)) {
     return {
@@ -2618,7 +2616,7 @@ function toFilterable(relationEndpoint, connectionEndpoint) {
     };
   }
   if (isDeploymentNodeModel(relationEndpoint)) {
-    return t$n(relationEndpoint, ["tags", "kind"]);
+    return t$i(relationEndpoint, ["tags", "kind"]);
   }
   nonexhaustive(relationEndpoint);
 }
@@ -3002,7 +3000,7 @@ function applyCustomElementProperties(_rules, _nodes) {
       textSize,
       description,
       ...rest
-    } = t$o(props, e$b);
+    } = t$o(props, e$8);
     const style = exact({
       border,
       opacity,
@@ -3052,14 +3050,14 @@ function resolveGlobalRulesInElementView(rules, globals) {
   return rules.reduce((acc, rule) => {
     if (isViewRuleGlobalPredicateRef(rule)) {
       const globalPredicates = globals.predicates[rule.predicateId];
-      if (e$b(globalPredicates)) {
+      if (e$8(globalPredicates)) {
         return acc;
       }
       return acc.concat(globalPredicates);
     }
     if (isViewRuleGlobalStyle(rule)) {
       const globalStyles = globals.styles[rule.styleId];
-      if (e$b(globalStyles)) {
+      if (e$8(globalStyles)) {
         return acc;
       }
       return acc.concat(globalStyles);
@@ -3072,14 +3070,14 @@ function resolveGlobalRulesInDynamicView(rules, globals) {
   return rules.reduce((acc, rule) => {
     if (isViewRuleGlobalPredicateRef(rule)) {
       const globalPredicates = globals.dynamicPredicates[rule.predicateId];
-      if (e$b(globalPredicates)) {
+      if (e$8(globalPredicates)) {
         return acc;
       }
       return acc.concat(globalPredicates);
     }
     if (isViewRuleGlobalStyle(rule)) {
       const globalStyles = globals.styles[rule.styleId];
-      if (e$b(globalStyles)) {
+      if (e$8(globalStyles)) {
         return acc;
       }
       return acc.concat(globalStyles);
@@ -3141,7 +3139,7 @@ function elementsFromSteps(model, steps) {
       actors.push(target);
     }
   };
-  for (const step of t$l(steps, flattenSteps)) {
+  for (const step of t$m(steps, flattenSteps)) {
     const source = model.element(step.source);
     const target = model.element(step.target);
     let sourceColumn = actors.indexOf(source);
@@ -3176,7 +3174,7 @@ function findRelations(source, target, currentViewId) {
   }
   const alltags = t$d(
     relationships,
-    t$l((r) => r.tags),
+    t$m((r) => r.tags),
     n$e()
   );
   const tags = t$b(alltags, 1) ? alltags : void 0;
@@ -3189,7 +3187,7 @@ function findRelations(source, target, currentViewId) {
   if (!navigateTo) {
     navigateTo = t$d(
       relationships,
-      t$l(
+      t$m(
         (r) => r.$relationship.navigateTo && r.$relationship.navigateTo !== currentViewId ? r.$relationship.navigateTo : []
       ),
       n$e(),
@@ -3461,7 +3459,7 @@ function applyCustomRelationProperties(_rules, nodes, _edges) {
   } of rules) {
     const description = _description ? { description: { txt: _description } } : {};
     const notes = _notes ? { notes: { txt: _notes } } : {};
-    const props = t$o(customprops, e$b);
+    const props = t$o(customprops, e$8);
     const satisfies = relationExpressionToPredicates(expr);
     edges.forEach((edge, i) => {
       let source, target;
@@ -3479,7 +3477,7 @@ function applyCustomRelationProperties(_rules, nodes, _edges) {
       if (!source || !target) {
         return;
       }
-      if (satisfies({ source, target, ...t$n(edge, ["kind", "tags"]) })) {
+      if (satisfies({ source, target, ...t$i(edge, ["kind", "tags"]) })) {
         edges[i] = {
           ...edge,
           ...props,
@@ -3622,7 +3620,7 @@ class StageInclude extends AbstractStageInclude {
       connections,
       t$7(({ source, target, boundary }) => {
         t$d(
-          t$m(
+          t$n(
             [...toArray(source.ancestors()).reverse(), source],
             [...toArray(target.ancestors()).reverse(), target]
           ),
@@ -3787,7 +3785,7 @@ function findRedundantConnections(connections) {
     t$2((reducedConnections, connection, _, all) => {
       const descendants = findDescendantConnections(all, connection);
       const nestedRelations = union(
-        ...descendants.map(e$8("relations"))
+        ...descendants.map(e$9("relations"))
       );
       let accum = intersection(connection.relations, nestedRelations);
       if (descendants.length > 0) {
@@ -4121,7 +4119,7 @@ const DirectRelationExprPredicate = {
         const sources = resolveElements(model, source);
         const connections2 = t$d(
           sources,
-          t$l(
+          t$m(
             (source2) => t$d(
               source2,
               e(e$3(isBidirectional === true), {
@@ -4179,7 +4177,7 @@ const DirectRelationExprPredicate = {
         const targets = resolveElements(model, target);
         const connections2 = t$d(
           targets,
-          t$l(
+          t$m(
             (target2) => t$d(
               target2,
               e(e$3(isBidirectional === true), {
@@ -4257,8 +4255,8 @@ const DirectRelationExprPredicate = {
       case (sourceIsWildcard && targetIsWildcard): {
         relations = t$d(
           memory.connections,
-          t$l(t$i(
-            e$8("relations"),
+          t$m(t$j(
+            e$9("relations"),
             ifilter(where),
             toArray()
           )),
@@ -4271,7 +4269,7 @@ const DirectRelationExprPredicate = {
         const sources = resolveElements(model, source);
         relations = t$d(
           sources,
-          t$l(
+          t$m(
             (source2) => t$d(
               source2,
               e(e$3(isBidirectional === true), {
@@ -4291,7 +4289,7 @@ const DirectRelationExprPredicate = {
         const targets = resolveElements(model, target);
         relations = t$d(
           targets,
-          t$l(
+          t$m(
             (target2) => t$d(
               target2,
               e(e$3(isBidirectional === true), {

package/dist/types/index.mjs

@@ -1,4 +1,4 @@
-export { R as RichText, e as exact } from '../shared/core.BK-tI3Q3.mjs';
+export { R as RichText, e as exact } from '../shared/core.DEK-BO3_.mjs';
 export { preferDescription, preferSummary } from './_aux.mjs';
 export { b as _layout, _ as _stage, a as _type, j as isAndOperator, n as isComputedView, d as isDeployedInstance, c as isDeploymentNode, s as isDeploymentView, o as isDiagramView, t as isDynamicView, p as isElementView, r as isExtendsElementView, f as isKindEqual, o as isLayoutedView, h as isNotOperator, i as isOnStage, k as isOrOperator, g as isParticipantOperator, q as isScopedElementView, e as isTagEqual, l as isViewRulePredicate, m as isViewRuleStyle, w as whereOperatorAsPredicate } from '../shared/core.DH7TXqXf.mjs';
 export { Expression, FqnExpr, RelationExpr } from './expression.mjs';