@likec4/core 1.34.2 → 1.35.0

package/dist/shared/{core.PqNe5WxQ.mjs → core.RnUJywKk.mjs}

@@ -1,66 +1,63 @@
-import { n as a$4, t as t$3, r as r$3, j as isElementModel, f as isNestedElementOfDeployedInstanceModel, d as isDeployedInstanceModel, i as isDeploymentNodeModel, e as isDeploymentElementModel, L as LikeC4Model } from './core.4SpVCM9m.mjs';
-import { u as u$6 } from './core.DbRvwARP.mjs';
+import { s as a$2, t as t$3, u as a$3, r as r$3, m as isElementModel, j as isNestedElementOfDeployedInstanceModel, f as isDeployedInstanceModel, i as isDeploymentNodeModel, h as isDeploymentElementModel, L as LikeC4Model } from './core.rpF8esVq.mjs';
+import { u as u$5 } from './core.DbRvwARP.mjs';
 import { m as m$2 } from './core.ByrmCl9I.mjs';
-import { i as i$a, t as t$4, n as n$3, d as deploymentConnection, R as RelationshipsAccum, D as DeploymentConnectionModel } from './core.D5qVzkws.mjs';
-import { p as p$1, f as findAscendingConnections, m as mergeConnections, d as differenceConnections, j as isNestedConnection, s as sortConnectionsByBoundaryHierarchy, o as findConnectionsBetween$3, n as modelConnection, b as findDescendantConnections, a as findDeepestNestedConnection, i as isAnyInOut, k as isOutgoing, g as isIncoming, C as ConnectionModel } from './core.BTnf14gD.mjs';
-import { u as a$3, C, t as s, r as getDefaultExportFromCjs, j as isDescendantOf, m as sortParentsFirst, i as isAncestor, p as parentFqn, e as compareByFqnHierarchically, o as isNonEmptyArray, n as nameFromFqn, s as sortByFqnHierarchically, d as commonAncestor, b as ancestorsFqn, k as isSameHierarchy } from './core.C_C-3c1S.mjs';
-import { c as commonHead, r as requireForeach, a as requireIterator, u as u$7, o as objectHash, d as d$5, S as Stack } from './core.CtKXPqN_.mjs';
+import { i as i$a, t as t$4, n as n$2, d as deploymentConnection, R as RelationshipsAccum, D as DeploymentConnectionModel } from './core.CQS11dNK.mjs';
+import { p as p$1, f as findAscendingConnections, m as mergeConnections, d as differenceConnections, j as isNestedConnection, s as sortConnectionsByBoundaryHierarchy, o as findConnectionsBetween$3, n as modelConnection, b as findDescendantConnections, a as findDeepestNestedConnection, i as isAnyInOut, k as isOutgoing, g as isIncoming, C as ConnectionModel } from './core.Y3j3s-oq.mjs';
+import { u as a$1, C, t as s, r as getDefaultExportFromCjs, j as isDescendantOf, m as sortParentsFirst, i as isAncestor, p as parentFqn, e as compareByFqnHierarchically, o as isNonEmptyArray, n as nameFromFqn, s as sortByFqnHierarchically, d as commonAncestor, b as ancestorsFqn, k as isSameHierarchy } from './core.DQj9iv_y.mjs';
+import { c as commonHead, r as requireForeach, a as requireIterator, u as u$6, o as objectHash, d as d$5, S as Stack } from './core.HUONfQfd.mjs';
 import { a as nonNullable, i as invariant, n as nonexhaustive } from './core.D4npX2q8.mjs';
-import { n as n$1, a as DefaultElementShape, D as DefaultThemeColor, f as DefaultArrowType, e as DefaultLineStyle, g as DefaultRelationshipColor } from './core.D56nCp7e.mjs';
+import { n, a as DefaultElementShape, D as DefaultThemeColor, f as DefaultArrowType, e as DefaultLineStyle, g as DefaultRelationshipColor } from './core.D56nCp7e.mjs';
 import { d as difference, a as intersection, u as union, i as i$b, h as hasIntersection } from './core.CpwrZi3D.mjs';
-import { a as isIterable, n as n$2, l as l$6, b as iunique, i as iflat } from './core.8KM0D6va.mjs';
+import { a as isIterable, n as n$1, l as l$5, b as iunique, i as iflat } from './core.8KM0D6va.mjs';
 import { o as o$7 } from './core.BgvIuGGU.mjs';
-import { w as whereOperatorAsPredicate, F as FqnRef, y, m as isGroupElementKind, G as GroupElementKind, a as _type, _ as _stage, t as n$4, p as stepEdgeId } from './core.Br7Fab9l.mjs';
-import { M as ModelFqnExpr, c as isViewRuleStyle, F as FqnExpr, R as RelationExpr, s as o$8, i as isViewRulePredicate, o as isViewRuleAutoLayout, r as isViewRuleGroup, m as isViewRuleGlobalPredicateRef, l as isViewRuleGlobalStyle, q as isDynamicViewParallelSteps, a as ModelRelationExpr, b as ModelExpression, k as isDynamicView, j as isDeploymentView, f as isElementView } from './core.DXRAwwDB.mjs';
+import { w as whereOperatorAsPredicate, F as FqnRef, y, m as isGroupElementKind, G as GroupElementKind, a as _type, _ as _stage, t as n$3, p as stepEdgeId } from './core.BajmN8zR.mjs';
+import { M as ModelFqnExpr, c as isViewRuleStyle, F as FqnExpr, R as RelationExpr, s as o$8, i as isViewRulePredicate, o as isViewRuleAutoLayout, r as isViewRuleGroup, m as isViewRuleGlobalPredicateRef, l as isViewRuleGlobalStyle, q as isDynamicViewParallelSteps, a as ModelRelationExpr, b as ModelExpression, k as isDynamicView, j as isDeploymentView, f as isElementView } from './core.B1ZN723l.mjs';
+import { k } from './core.BpJu1RrF.mjs';
 import { a as toSet, t as toArray, i as imap } from './core.Btl47GOn.mjs';
-import { D as DefaultMap } from './core.BMCb0wJI.mjs';
+import { D as DefaultMap } from './core.yaRvRnMW.mjs';
 import { i as ifilter } from './core.BH9nN-_I.mjs';
-import { C as Connection, c as customInspectSymbol } from './core.C80Z37Eu.mjs';
+import { C as Connection, c as customInspectSymbol } from './core.C1GV0WWV.mjs';
 import { i as isome } from './core.BoyJPEen.mjs';
 
 function d$4(...e){return e.length===2?(n,...r)=>t$2(n,...e,...r):t$2(...e)}var t$2=(e,n,r,...a)=>n(e,...a)?typeof r=="function"?r(e,...a):r.onTrue(e,...a):typeof r=="function"?e:r.onFalse(e,...a);
 
-function l$5(...r){return u$6(o$6,r,u$5)}var o$6=(r,e)=>e<0?[]:r.slice(0,e);function u$5(r){if(r<=0)return a$3;let e=r;return a=>(e-=1,{done:e<=0,hasNext:true,next:a})}
+function l$4(...r){return u$5(o$6,r,u$4)}var o$6=(r,e)=>e<0?[]:r.slice(0,e);function u$4(r){if(r<=0)return a$1;let e=r;return a=>(e-=1,{done:e<=0,hasNext:true,next:a})}
 
-function l$4(...e){return u$6(u$4,e)}var u$4=(e,a,n)=>e.reduce(a,n);
+function l$3(...e){return u$5(u$3,e)}var u$3=(e,a,n)=>e.reduce(a,n);
 
-function t$1(...e){return u$6(r$2,e)}function r$2(e){return [...e].reverse()}
+function t$1(...e){return u$5(r$2,e)}function r$2(e){return [...e].reverse()}
 
-function d$3(...r){return u$6(i$9,r)}var i$9=(r,t)=>{let a=[[],[]];for(let[o,e]of r.entries())t(e,o,r)?a[0].push(e):a[1].push(e);return a};
+function d$3(...r){return u$5(i$9,r)}var i$9=(r,t)=>{let a=[[],[]];for(let[o,e]of r.entries())t(e,o,r)?a[0].push(e):a[1].push(e);return a};
 
-function i$8(...e){return u$6(o$5,e)}function o$5(e,n){let t={};for(let r of n)r in e&&(t[r]=e[r]);return t}
+function i$8(...e){return u$5(o$5,e)}function o$5(e,n){let t={};for(let r of n)r in e&&(t[r]=e[r]);return t}
 
-function d$2(...e){return u$6(i$7,e)}function i$7(e,o){let t={};for(let[r,n]of Object.entries(e))o(n,r,e)&&(t[r]=n);return t}
+function d$2(...e){return u$5(i$7,e)}function i$7(e,o){let t={};for(let[r,n]of Object.entries(e))o(n,r,e)&&(t[r]=n);return t}
 
 function i$6(...n){return o=>C(o,...n)}
 
-function d$1(...e){return u$6(l$3,e)}function l$3(e,a){let t={...e};for(let[n,o]of Object.entries(t))a(o,n,e)&&delete t[n];return t}
+function d$1(...e){return u$5(l$2,e)}function l$2(e,a){let t={...e};for(let[n,o]of Object.entries(t))a(o,n,e)&&delete t[n];return t}
 
-function l$2(...n){return u$6(d,n)}function d(n,o){let e={};for(let[a,t]of n.entries()){let[y,u]=o(t,a,n);e[y]=u;}return e}
+function l$1(...n){return u$5(d,n)}function d(n,o){let e={};for(let[a,t]of n.entries()){let[y,u]=o(t,a,n);e[y]=u;}return e}
 
-function i$5(...e){return u$6(o$4,e)}function o$4(e,r){let a={};for(let[n,u]of Object.entries(e)){let l=r(u,n,e);a[n]=l;}return a}
-
-function a$2(...e){return u$6(n,e)}var n=e=>e.at(-1);
+function i$5(...e){return u$5(o$4,e)}function o$4(e,r){let a={};for(let[n,u]of Object.entries(e)){let l=r(u,n,e);a[n]=l;}return a}
 
 function e(o){return typeof o=="boolean"}
 
-function i$4(...e){return u$6(p,e)}var p=(e,d)=>{let r=Object.create(null);for(let n=0;n<e.length;n++){let t=e[n],y=d(t,n,e);if(y!==void 0){let o=r[y];o===void 0?r[y]=[t]:o.push(t);}}return Object.setPrototypeOf(r,Object.prototype),r};
-
-function k(...n){return u$6(u$3,n)}function u$3(n,e){if(n===e||Object.is(n,e))return  true;if(typeof n!="object"||typeof e!="object"||n===null||e===null||Object.getPrototypeOf(n)!==Object.getPrototypeOf(e))return  false;if(Array.isArray(n))return l$1(n,e);if(n instanceof Map)return a$1(n,e);if(n instanceof Set)return c(n,e);if(n instanceof Date)return n.getTime()===e.getTime();if(n instanceof RegExp)return n.toString()===e.toString();if(Object.keys(n).length!==Object.keys(e).length)return  false;for(let[r,t]of Object.entries(n))if(!(r in e)||!u$3(t,e[r]))return  false;return  true}function l$1(n,e){if(n.length!==e.length)return  false;for(let[r,t]of n.entries())if(!u$3(t,e[r]))return  false;return  true}function a$1(n,e){if(n.size!==e.size)return  false;for(let[r,t]of n.entries())if(!e.has(r)||!u$3(t,e.get(r)))return  false;return  true}function c(n,e){if(n.size!==e.size)return  false;let r=[...e];for(let t of n){let o=false;for(let[s,f]of r.entries())if(u$3(t,f)){o=true,r.splice(s,1);break}if(!o)return  false}return  true}
+function i$4(...e){return u$5(p,e)}var p=(e,d)=>{let r=Object.create(null);for(let n=0;n<e.length;n++){let t=e[n],y=d(t,n,e);if(y!==void 0){let o=r[y];o===void 0?r[y]=[t]:o.push(t);}}return Object.setPrototypeOf(r,Object.prototype),r};
 
-function u$2(...e){return u$6(i$3,e)}function i$3(e,a){let r={};for(let[o,n]of e.entries()){let d=a(n,o,e);r[d]=n;}return r}
+function u$2(...e){return u$5(i$3,e)}function i$3(e,a){let r={};for(let[o,n]of e.entries()){let d=a(n,o,e);r[d]=n;}return r}
 
-function u$1(...a){return u$6(o$3,a,l)}var o$3=(a,r)=>a.flatMap(r),l=a=>(r,t,y)=>{let n=a(r,t,y);return Array.isArray(n)?{done:false,hasNext:true,hasMany:true,next:n}:{done:false,hasNext:true,next:n}};
+function u$1(...a){return u$5(o$3,a,l)}var o$3=(a,r)=>a.flatMap(r),l=a=>(r,t,y)=>{let n=a(r,t,y);return Array.isArray(n)?{done:false,hasNext:true,hasMany:true,next:n}:{done:false,hasNext:true,next:n}};
 
-function u(...e){return u$6(o$2,e,i$2)}function o$2(e,a){return e.forEach(a),e}var i$2=e=>(a,n,t)=>(e(a,n,t),{done:false,hasNext:true,next:a});
+function u(...e){return u$5(o$2,e,i$2)}function o$2(e,a){return e.forEach(a),e}var i$2=e=>(a,n,t)=>(e(a,n,t),{done:false,hasNext:true,next:a});
 
-function m$1(...e){return u$6(o$1,e,i$1)}var o$1=(e,n)=>e.filter(n),i$1=e=>(n,a,d)=>e(n,a,d)?{done:false,hasNext:true,next:n}:s;
+function m$1(...e){return u$5(o$1,e,i$1)}var o$1=(e,n)=>e.filter(n),i$1=e=>(n,a,d)=>e(n,a,d)?{done:false,hasNext:true,next:n}:s;
 
-function o(...e){return u$6(t,e)}var t=(e,r)=>{for(let n=e.length-1;n>=0;n--){let a=e[n];if(r(a,n,e))return a}};
+function o(...e){return u$5(t,e)}var t=(e,r)=>{for(let n=e.length-1;n>=0;n--){let a=e[n];if(r(a,n,e))return a}};
 
-function m(...e){return u$6(i,e)}function i(e,t){for(let[n,o]of e.entries())if(!t(o,n,e))return e.slice(n);return []}
+function m(...e){return u$5(i,e)}function i(e,t){for(let[n,o]of e.entries())if(!t(o,n,e))return e.slice(n);return []}
 
-function a(...e){return u$6(r$1,e)}var r$1=(e,t)=>[...e,...t];
+function a(...e){return u$5(r$1,e)}var r$1=(e,t)=>[...e,...t];
 
 function r(n){return ()=>n}
 
@@ -106,7 +103,7 @@ function buildElementNotations(nodes) {
         kinds
       }))
     ),
-    a$4(
+    a$2(
       p$1("shape"),
       p$1("title"),
       [
@@ -139,7 +136,7 @@ function linkNodesWithEdges(nodesMap, edges) {
     const sourceAncestors = ancestorsOfNode(source, nodesMap);
     const targetAncestors = ancestorsOfNode(target, nodesMap);
     const hasAncestors = sourceAncestors.length > 0 && targetAncestors.length > 0;
-    const edgeParent = hasAncestors ? a$2(
+    const edgeParent = hasAncestors ? a$3(
       commonHead(
         t$1(sourceAncestors),
         t$1(targetAncestors)
@@ -1202,7 +1199,7 @@ function topologicalSort(param) {
     if (target.parent && target.parent !== edge.parent) {
       C(
         ancestorsOfNode(target, param.nodes),
-        u$7((ancestor) => ancestor.inEdges.includes(edge.id)),
+        u$6((ancestor) => ancestor.inEdges.includes(edge.id)),
         u((ancestor) => {
           g.mergeNode(ancestor.id);
           if (!willCreateCycle(g, edge.source, ancestor.id)) {
@@ -1268,19 +1265,19 @@ function calcViewLayoutHash(view) {
     autoLayout: view.autoLayout,
     nodes: C(
       view.nodes,
-      m$2((n) => ({
-        id: n.id,
-        icon: n$1(n.icon) ? "Y" : "N",
-        title: n.title,
-        description: n.description?.md ?? n.description?.txt ?? null,
-        technology: n.technology ?? null,
-        shape: n.shape,
-        size: n.style.size ?? null,
-        textSize: n.style.textSize ?? null,
-        padding: n.style.padding ?? null,
-        children: n.children
+      m$2((n$1) => ({
+        id: n$1.id,
+        icon: n(n$1.icon) ? "Y" : "N",
+        title: n$1.title,
+        description: n$1.description?.md ?? n$1.description?.txt ?? null,
+        technology: n$1.technology ?? null,
+        shape: n$1.shape,
+        size: n$1.style.size ?? null,
+        textSize: n$1.style.textSize ?? null,
+        padding: n$1.style.padding ?? null,
+        children: n$1.children
       })),
-      l$2(({ id, ...node }) => [id, node])
+      l$1(({ id, ...node }) => [id, node])
     ),
     edges: C(
       view.edges,
@@ -1295,7 +1292,7 @@ function calcViewLayoutHash(view) {
         tail: e.tail,
         line: e.line
       })),
-      l$2(({ source, target, ...edge }) => [`${source}:${target}`, edge])
+      l$1(({ source, target, ...edge }) => [`${source}:${target}`, edge])
     )
   };
   view.hash = objectHash(tohash);
@@ -1739,29 +1736,29 @@ function applyViewRuleStyle(rule, predicates, nodes) {
     u((n) => {
       n.shape = rule.style.shape ?? n.shape;
       n.color = rule.style.color ?? n.color;
-      if (n$2(rule.style.icon)) {
+      if (n$1(rule.style.icon)) {
         n.icon = rule.style.icon;
       }
-      if (n$2(rule.notation)) {
+      if (n$1(rule.notation)) {
         n.notation = rule.notation;
       }
       let styleOverride;
-      if (n$2(rule.style.border)) {
+      if (n$1(rule.style.border)) {
         styleOverride = { border: rule.style.border };
       }
-      if (n$2(rule.style.opacity)) {
+      if (n$1(rule.style.opacity)) {
         styleOverride = { ...styleOverride, opacity: rule.style.opacity };
       }
-      if (n$2(rule.style.multiple)) {
+      if (n$1(rule.style.multiple)) {
         styleOverride = { ...styleOverride, multiple: rule.style.multiple };
       }
-      if (n$2(rule.style.padding)) {
+      if (n$1(rule.style.padding)) {
         styleOverride = { ...styleOverride, padding: rule.style.padding };
       }
-      if (n$2(rule.style.size)) {
+      if (n$1(rule.style.size)) {
         styleOverride = { ...styleOverride, size: rule.style.size };
       }
-      if (n$2(rule.style.textSize)) {
+      if (n$1(rule.style.textSize)) {
         styleOverride = { ...styleOverride, textSize: rule.style.textSize };
       }
       if (styleOverride) {
@@ -1925,33 +1922,33 @@ function pickRelationshipProps(relation) {
 function mergePropsFromRelationships(relations, prefer) {
   const allprops = C(
     relations,
-    l$4(
+    l$3(
       (acc, r) => {
-        if (n$1(r.title) && !acc.title.includes(r.title)) {
+        if (n(r.title) && !acc.title.includes(r.title)) {
           acc.title.push(r.title);
         }
-        if (n$1(r.description) && !acc.description.some(k(r.description))) {
+        if (n(r.description) && !acc.description.some(k(r.description))) {
           acc.description.push(r.description);
         }
-        if (n$1(r.technology) && !acc.technology.includes(r.technology)) {
+        if (n(r.technology) && !acc.technology.includes(r.technology)) {
           acc.technology.push(r.technology);
         }
-        if (n$1(r.kind) && !acc.kind.includes(r.kind)) {
+        if (n(r.kind) && !acc.kind.includes(r.kind)) {
           acc.kind.push(r.kind);
         }
-        if (n$1(r.color) && !acc.color.includes(r.color)) {
+        if (n(r.color) && !acc.color.includes(r.color)) {
           acc.color.push(r.color);
         }
-        if (n$1(r.line) && !acc.line.includes(r.line)) {
+        if (n(r.line) && !acc.line.includes(r.line)) {
           acc.line.push(r.line);
         }
-        if (n$1(r.head) && !acc.head.includes(r.head)) {
+        if (n(r.head) && !acc.head.includes(r.head)) {
           acc.head.push(r.head);
         }
-        if (n$1(r.tail) && !acc.tail.includes(r.tail)) {
+        if (n(r.tail) && !acc.tail.includes(r.tail)) {
           acc.tail.push(r.tail);
         }
-        if (n$1(r.navigateTo) && !acc.navigateTo.includes(r.navigateTo)) {
+        if (n(r.navigateTo) && !acc.navigateTo.includes(r.navigateTo)) {
           acc.navigateTo.push(r.navigateTo);
         }
         if (r.tags) {
@@ -1995,12 +1992,12 @@ function mergePropsFromRelationships(relations, prefer) {
       ...isNonEmptyArray(allprops.links) && { links: allprops.links },
       ...isNonEmptyArray(tags) && { tags }
     },
-    n$1
+    n
   );
   if (prefer) {
     return {
       ...merged,
-      ...d$2(pickRelationshipProps(prefer), n$1)
+      ...d$2(pickRelationshipProps(prefer), n)
     };
   }
   return merged;
@@ -2161,7 +2158,7 @@ function toNodeSource(el) {
     deploymentRef: instance.id,
     modelRef: element.id,
     ...notation && { notation },
-    ...!n$3(metadata) && { metadata }
+    ...!n$2(metadata) && { metadata }
   };
 }
 function toComputedEdges$1(connections) {
@@ -2314,7 +2311,7 @@ function findRedundantConnections$1(connections) {
   return C(
     connections,
     mergeConnections,
-    l$4((redundants, connection) => {
+    l$3((redundants, connection) => {
       const { source, target, relations } = connection;
       if (source.isInstance() && target.isInstance()) {
         return redundants;
@@ -2410,7 +2407,7 @@ let StageInclude$1 = class StageInclude extends AbstractStageInclude {
           ),
           // Filter out common ancestors
           m(([sourceAncestor, targetAncestor]) => sourceAncestor === targetAncestor),
-          l$5(1),
+          l$4(1),
           u(([sourceAncestor, targetAncestor]) => {
             if (source === sourceAncestor && target === targetAncestor) {
               this.addImplicit(boundary);
@@ -2711,10 +2708,10 @@ const DirectRelationPredicate = {
       }
     }
     stage.addConnections(connections);
-    if (FqnExpr.isDeploymentRef(source) && l$6(source.selector)) {
+    if (FqnExpr.isDeploymentRef(source) && l$5(source.selector)) {
       stage.addImplicit(model.element(source.ref.deployment));
     }
-    if (FqnExpr.isDeploymentRef(target) && l$6(target.selector)) {
+    if (FqnExpr.isDeploymentRef(target) && l$5(target.selector)) {
       stage.addImplicit(model.element(target.ref.deployment));
     }
     return stage;
@@ -3112,7 +3109,7 @@ function findConnectedElements(stage) {
     stage.mergedConnections(),
     cleanCrossBoundary,
     cleanRedundantRelationships,
-    l$4((acc, c) => {
+    l$3((acc, c) => {
       acc.add(c.source);
       acc.add(c.target);
       return acc;
@@ -3378,8 +3375,8 @@ function applyCustomElementProperties(_rules, _nodes) {
       textSize,
       description,
       ...rest
-    } = d$1(props, n$4);
-    const notEmpty = !n$3(rest);
+    } = d$1(props, n$3);
+    const notEmpty = !n$2(rest);
     const satisfies = elementExprToPredicate(expr);
     nodes.forEach((node, i) => {
       if (isGroupElementKind(node) || !satisfies(node)) {
@@ -3438,14 +3435,14 @@ function resolveGlobalRulesInElementView(rules, globals) {
   return rules.reduce((acc, rule) => {
     if (isViewRuleGlobalPredicateRef(rule)) {
       const globalPredicates = globals.predicates[rule.predicateId];
-      if (n$4(globalPredicates)) {
+      if (n$3(globalPredicates)) {
         return acc;
       }
       return acc.concat(globalPredicates);
     }
     if (isViewRuleGlobalStyle(rule)) {
       const globalStyles = globals.styles[rule.styleId];
-      if (n$4(globalStyles)) {
+      if (n$3(globalStyles)) {
         return acc;
       }
       return acc.concat(globalStyles);
@@ -3458,14 +3455,14 @@ function resolveGlobalRulesInDynamicView(rules, globals) {
   return rules.reduce((acc, rule) => {
     if (isViewRuleGlobalPredicateRef(rule)) {
       const globalPredicates = globals.dynamicPredicates[rule.predicateId];
-      if (n$4(globalPredicates)) {
+      if (n$3(globalPredicates)) {
         return acc;
       }
       return acc.concat(globalPredicates);
     }
     if (isViewRuleGlobalStyle(rule)) {
       const globalStyles = globals.styles[rule.styleId];
-      if (n$4(globalStyles)) {
+      if (n$3(globalStyles)) {
         return acc;
       }
       return acc.concat(globalStyles);
@@ -3505,7 +3502,7 @@ class DynamicViewCompute {
       color,
       line
     } = this.findRelations(source, target);
-    const navigateTo = n$1(stepNavigateTo) && stepNavigateTo !== this.view.id ? stepNavigateTo : derivedNavigateTo;
+    const navigateTo = n(stepNavigateTo) && stepNavigateTo !== this.view.id ? stepNavigateTo : derivedNavigateTo;
     this.steps.push({
       id,
       ...step,
@@ -3648,7 +3645,7 @@ class DynamicViewCompute {
     const alltags = C(
       relationships,
       u$1((r) => r.tags),
-      m$1(n$1),
+      m$1(n),
       i$a()
     );
     const tags = i$b(alltags, 1) ? alltags : null;
@@ -3658,17 +3655,17 @@ class DynamicViewCompute {
     const navigateTo = relationNavigateTo && relationNavigateTo !== this.view.id ? relationNavigateTo : C(
       relationships,
       m$2((r) => r.$relationship.navigateTo),
-      m$1(n$1),
+      m$1(n),
       m$1((v) => v !== this.view.id),
       i$a(),
       t$4()
     );
     const commonProperties = C(
       relationships,
-      l$4((acc, { title, $relationship: r }) => {
-        n$1(title) && acc.title.add(title);
-        n$1(r.color) && acc.color.add(r.color);
-        n$1(r.line) && acc.line.add(r.line);
+      l$3((acc, { title, $relationship: r }) => {
+        n(title) && acc.title.add(title);
+        n(r.color) && acc.color.add(r.color);
+        n(r.line) && acc.line.add(r.line);
         return acc;
       }, {
         color: /* @__PURE__ */ new Set(),
@@ -3743,7 +3740,7 @@ function applyCustomRelationProperties(_rules, nodes, _edges) {
       ...customprops
     }
   } of rules) {
-    const props = d$1(customprops, n$4);
+    const props = d$1(customprops, n$3);
     const satisfies = relationExpressionToPredicates(expr);
     edges.forEach((edge, i) => {
       let source, target;
@@ -3909,7 +3906,7 @@ class StageInclude extends AbstractStageInclude {
           ),
           // Filter out common ancestors
           m(([sourceAncestor, targetAncestor]) => sourceAncestor === targetAncestor),
-          l$5(1),
+          l$4(1),
           u(([sourceAncestor, targetAncestor]) => {
             if (sourceAncestor === source && targetAncestor === target) {
               this.addImplicitWithinScope(boundary);
@@ -4065,7 +4062,7 @@ function findRedundantConnections(connections) {
   return C(
     [...connections],
     mergeConnections,
-    l$4((reducedConnections, connection, _, all) => {
+    l$3((reducedConnections, connection, _, all) => {
       const descendants = findDescendantConnections(all, connection);
       const nestedRelations = union(
         ...descendants.map(p$1("relations"))
@@ -4354,6 +4351,7 @@ function buildNodes(memory) {
 }
 
 const isWildcard = ModelFqnExpr.isWildcard;
+const isAncestorOrDescendantOf = (a, b) => a.isAncestorOf(b) || a.isDescendantOf(b);
 const DirectRelationExprPredicate = {
   include: ({ expr: { source, target, isBidirectional = false }, memory, model, stage, where, filterWhere }) => {
     const sourceIsWildcard = isWildcard(source);
@@ -4407,6 +4405,7 @@ const DirectRelationExprPredicate = {
               ([outgoing, incoming]) => a(
                 C(
                   outgoing,
+                  m$1((r) => !isAncestorOrDescendantOf(source2, r.target)),
                   m$2(
                     (outgoing2) => new ConnectionModel(
                       source2,
@@ -4417,6 +4416,7 @@ const DirectRelationExprPredicate = {
                 ),
                 C(
                   incoming,
+                  m$1((r) => !isAncestorOrDescendantOf(source2, r.source)),
                   m$2(
                     (incoming2) => new ConnectionModel(
                       incoming2.source,
@@ -4462,6 +4462,7 @@ const DirectRelationExprPredicate = {
               ([incoming, outgoing]) => a(
                 C(
                   outgoing,
+                  m$1((r) => !isAncestorOrDescendantOf(target2, r.target)),
                   m$2(
                     (outgoing2) => new ConnectionModel(
                       target2,
@@ -4472,6 +4473,7 @@ const DirectRelationExprPredicate = {
                 ),
                 C(
                   incoming,
+                  m$1((r) => !isAncestorOrDescendantOf(target2, r.source)),
                   m$2(
                     (incoming2) => new ConnectionModel(
                       incoming2.source,
@@ -5227,4 +5229,4 @@ function computeLikeC4Model(parsed) {
   return LikeC4Model.create(computeParsedModelData(parsed));
 }
 
-export { Graph as G, computeParsedModelData as a, computeView as b, computeLikeC4Model as c, d$2 as d, i$5 as i, l$2 as l, topologicalSortExports as t, unsafeComputeView as u, willCreateCycle as w };
+export { Graph as G, computeParsedModelData as a, computeView as b, computeLikeC4Model as c, d$2 as d, i$5 as i, l$1 as l, topologicalSortExports as t, unsafeComputeView as u, willCreateCycle as w };