@likec4/core 1.38.1 → 1.39.0

package/dist/builder/index.d.mts

@@ -1,11 +1,14 @@
 import { LastArrayElement, Split, Simplify, IsLiteral, Writable, IfNever, IsNever, TupleToUnion, Tagged } from 'type-fest';
-import { g as LikeC4Model } from '../shared/core.BvlHvikl.mjs';
+import { g as LikeC4Model } from '../shared/core.v1iEaXaR.mjs';
 import { D as DeploymentFqn, F as Fqn } from '../shared/core.DX-WYEPA.mjs';
-import { r as DeploymentElement, v as DeploymentRelationship, T as Element, _ as ModelRelation, a9 as Participant, M as ModelFqnExpr, d as ModelRelationExpr, aH as AnyViewRuleStyle, aM as AutoLayoutDirection, E as Expression, an as ParsedView, bb as ParsedDeploymentView, br as ParsedElementView, n as ParsedLikeC4ModelData, $ as ElementSpecification$1, a2 as RelationshipSpecification, a0 as TagSpecification } from '../shared/core.CE_hG7EJ.mjs';
+import { l as DeploymentElement, p as DeploymentRelationship, F as Element, O as ModelRelation, ah as AnyViewRuleStyle, am as AutoLayoutDirection, Z as ParsedView, aN as ParsedDeploymentView, b1 as ParsedElementView, h as ParsedLikeC4ModelData, Q as ElementSpecification$1, V as RelationshipSpecification, T as TagSpecification } from '../shared/core.aWJgARyY.mjs';
+import { c as Participant, E as Expression } from '../shared/core.20m8Um0g.mjs';
+import { ModelFqnExpr, ModelRelationExpr } from '../types/expression-model.mjs';
 import { N as NonEmptyArray, K as KeysOf } from '../shared/core.DuSLYTG6.mjs';
-import { x as setProject, a as Aux, S as SpecAux, A as Any } from '../shared/core.O6FG0HF9.mjs';
+import { y as setProject, a as Aux, S as SpecAux, A as Any } from '../shared/core.DdzRtJ9d.mjs';
 import { c as ElementShape, h as ThemeColor, b as BorderStyle, a as ShapeSize, S as SpacingSize, T as TextSize, f as RelationshipArrowType, R as RelationshipLineType } from '../shared/core.CzdwsPmY.mjs';
 import '../shared/core.CywrQs86.mjs';
+import '../types/fqnRef.mjs';
 
 type ToNested$1<T, Id extends string> = T extends TypesNested<infer P, any, any, any, any, any, any, any, infer F> ? TypesNested<`${P}.${Id}`, T['ElementKind'], T['Fqn'], T['ViewId'], T['RelationshipKind'], T['Tag'], T['MetadataKey'], T['DeploymentKind'], `${P}.${Id}` | F> : T extends AnyTypes ? TypesNested<Id, T['ElementKind'], T['Fqn'], T['ViewId'], T['RelationshipKind'], T['Tag'], T['MetadataKey'], T['DeploymentKind'], Id | T['DeploymentFqn']> : never;
 type FromNested$1<T extends AnyTypes, N> = N extends TypesNested<any, any, any, any, any, any, any, any, infer F> ? T extends TypesNested<infer P, any, any, any, any, any, any, any, any> ? TypesNested<P, T['ElementKind'], T['Fqn'], T['ViewId'], T['RelationshipKind'], T['Tag'], T['MetadataKey'], T['DeploymentKind'], F> : T extends AnyTypes ? Types<T['ElementKind'], T['Fqn'], T['ViewId'], T['RelationshipKind'], T['Tag'], T['MetadataKey'], T['DeploymentKind'], F> : never : never;

package/dist/builder/index.mjs

@@ -1,20 +1,22 @@
-import { i, l, d, c as computeLikeC4Model } from '../shared/core.Dw47t7nG.mjs';
-import { m } from '../shared/core.ByrmCl9I.mjs';
-import { a as _type, n as n$1, _ as _stage, c as isDeployedInstance, F as FqnRef } from '../shared/core.DK6I-Nr7.mjs';
-import { t as t$2 } from '../shared/core.BH9nN-_I.mjs';
-import { l as l$1 } from '../shared/core.8KM0D6va.mjs';
-import { u } from '../shared/core.DbRvwARP.mjs';
-import { t as t$1 } from '../shared/core.CzHQRs5x.mjs';
-import { i as i$1 } from '../shared/core.CpwrZi3D.mjs';
-import { n as nameFromFqn, k as isSameHierarchy, p as parentFqn } from '../shared/core.OUoo2ohq.mjs';
-import { t } from '../shared/core.zLlww-07.mjs';
-import { s as o, M as ModelFqnExpr, f as isElementView } from '../shared/core.BW8K1y6R.mjs';
+import defu from 'defu';
+import { isArray, isString, map, entries, mapValues, fromEntries, mapToObj, isNullish, pickBy, isNonNullish, hasAtLeast, isFunction } from 'remeda';
+import { c as computeLikeC4Model } from '../shared/core.DnRszv-l.mjs';
+import { n as nameFromFqn, d as isSameHierarchy, p as parentFqn } from '../shared/core.DgttqsJc.mjs';
+import { ModelFqnExpr } from '../types/expression-model.mjs';
+import { a as _type, _ as _stage, c as isDeployedInstance } from '../shared/core.yHe79zEl.mjs';
 import { i as invariant } from '../shared/core.D4npX2q8.mjs';
-import { a as DefaultElementShape, D as DefaultThemeColor } from '../shared/core.H8NbNp2X.mjs';
-import '../shared/core.DC6zzxS0.mjs';
-import '../shared/core.BH0VqY-7.mjs';
-import '../shared/core.CnIyafWn.mjs';
-import '../shared/core.B0oEIXqd.mjs';
+import { d as isElementView } from '../shared/core.T-eLZTW_.mjs';
+import { FqnRef } from '../types/fqnRef.mjs';
+import { D as DefaultThemeColor, a as DefaultElementShape } from '../shared/core.BqVo8LrH.mjs';
+import '../shared/core.BB6zA-UU.mjs';
+import '../shared/core.CaT0SUUK.mjs';
+import 'events';
+import '../shared/core.4u1dVmfX.mjs';
+import '../shared/core.Be1n9a0i.mjs';
+import '../types/expression.mjs';
+import '../shared/core.CsbOakly.mjs';
+import '../shared/core.BVNaR17u.mjs';
+import '../shared/core.CUw_2J9j.mjs';
 import 'rehype-raw';
 import 'rehype-sanitize';
 import 'rehype-stringify';
@@ -24,77 +26,19 @@ import 'remark-rehype';
 import 'unified';
 import 'mdast-util-from-markdown';
 import 'mdast-util-to-string';
-import '../shared/core.C4Cn4Jy_.mjs';
-import '../shared/core.BgvIuGGU.mjs';
-import '../shared/core.BoyJPEen.mjs';
-import '../shared/core.Bp-IQmJR.mjs';
-import '../shared/core.BL_xjl90.mjs';
-import '../shared/core.BpJu1RrF.mjs';
-import '../shared/core.Btl47GOn.mjs';
-import '../shared/core.DDoAFHHp.mjs';
+import '../shared/core.CWv15GLo.mjs';
+import '../shared/core.Be4Jy9Qx.mjs';
+import '../shared/core.CCD1ID81.mjs';
+import '../shared/core.DLpidoWc.mjs';
+import '../shared/core.BuoXfSMj.mjs';
+import '../shared/core.DoM6aM9N.mjs';
+import '../shared/core.DozSPE83.mjs';
 import '../shared/core.DcS-0zys.mjs';
-import '../shared/core.DsMrjY2q.mjs';
-
-function n(...r){return u(Object.fromEntries,r)}
-
-function isPlainObject(value) {
-  if (value === null || typeof value !== "object") {
-    return false;
-  }
-  const prototype = Object.getPrototypeOf(value);
-  if (prototype !== null && prototype !== Object.prototype && Object.getPrototypeOf(prototype) !== null) {
-    return false;
-  }
-  if (Symbol.iterator in value) {
-    return false;
-  }
-  if (Symbol.toStringTag in value) {
-    return Object.prototype.toString.call(value) === "[object Module]";
-  }
-  return true;
-}
-
-function _defu(baseObject, defaults, namespace = ".", merger) {
-  if (!isPlainObject(defaults)) {
-    return _defu(baseObject, {}, namespace, merger);
-  }
-  const object = Object.assign({}, defaults);
-  for (const key in baseObject) {
-    if (key === "__proto__" || key === "constructor") {
-      continue;
-    }
-    const value = baseObject[key];
-    if (value === null || value === void 0) {
-      continue;
-    }
-    if (merger && merger(object, key, value, namespace)) {
-      continue;
-    }
-    if (Array.isArray(value) && Array.isArray(object[key])) {
-      object[key] = [...value, ...object[key]];
-    } else if (isPlainObject(value) && isPlainObject(object[key])) {
-      object[key] = _defu(
-        value,
-        object[key],
-        (namespace ? `${namespace}.` : "") + key.toString(),
-        merger
-      );
-    } else {
-      object[key] = value;
-    }
-  }
-  return object;
-}
-function createDefu(merger) {
-  return (...arguments_) => (
-    // eslint-disable-next-line unicorn/no-array-reduce
-    arguments_.reduce((p, c) => _defu(p, c, "", merger), {})
-  );
-}
-const defu = createDefu();
+import '../shared/core.GTgsmXS_.mjs';
+import '../shared/core.CNGyqkJh.mjs';
 
 function parseWhere(where) {
-  if (t(where)) {
+  if (isString(where)) {
     const op = where;
     switch (true) {
       case op.startsWith("tag is not #"):
@@ -141,12 +85,12 @@ function parseWhere(where) {
   }
   if (where.and) {
     return {
-      and: m(where.and, parseWhere)
+      and: map(where.and, parseWhere)
     };
   }
   if (where.or) {
     return {
-      or: m(where.or, parseWhere)
+      or: map(where.or, parseWhere)
     };
   }
   if (where.not) {
@@ -211,7 +155,7 @@ function $exclude(...args) {
 }
 function $style(element, { notation, ...style }) {
   return (b) => b.style({
-    targets: (o(element) ? element : [element]).map((e) => b.$expr(e)),
+    targets: (isArray(element) ? element : [element]).map((e) => b.$expr(e)),
     ...notation ? { notation } : {},
     style: {
       ...style
@@ -226,7 +170,7 @@ function $rules(...rules) {
 }
 
 function $deploymentExpr(expr) {
-  if (!t(expr)) {
+  if (!isString(expr)) {
     return expr;
   }
   const asTypedDeploymentExpression = (expr2) => {
@@ -300,7 +244,7 @@ const asTypedExpr = (expr) => {
   return expr;
 };
 function $expr(expr) {
-  if (!t(expr)) {
+  if (!isString(expr)) {
     return expr;
   }
   if (expr === "*") {
@@ -405,7 +349,7 @@ function mkViewBuilder(view) {
 }
 
 function validateSpec(specification) {
-  for (const [kind, spec] of t$1(specification.elements)) {
+  for (const [kind, spec] of entries(specification.elements)) {
     if (spec.tags) {
       for (const tag of spec.tags) {
         invariant(specification.tags?.[tag], `Invalid specification for element kind "${kind}": tag "${tag}" not found`);
@@ -413,7 +357,7 @@ function validateSpec(specification) {
     }
   }
   if (specification.deployments) {
-    for (const [kind, spec] of t$1(specification.deployments)) {
+    for (const [kind, spec] of entries(specification.deployments)) {
       if (spec.tags) {
         for (const tag of spec.tags) {
           invariant(
@@ -442,7 +386,7 @@ function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _
       relationships: {
         ...structuredClone(spec.relationships)
       },
-      tags: i(spec.tags ?? {}, (tagSpec) => ({
+      tags: mapValues(spec.tags ?? {}, (tagSpec) => ({
         color: DefaultThemeColor,
         ...tagSpec
       })),
@@ -451,13 +395,13 @@ function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _
     };
   };
   const mapLinks = (links) => {
-    if (!links || !i$1(links, 1)) {
+    if (!links || !hasAtLeast(links, 1)) {
       return null;
     }
-    return m(links, (l) => typeof l === "string" ? { url: l } : l);
+    return map(links, (l) => typeof l === "string" ? { url: l } : l);
   };
   const createGenericView = (id, _props, builder2) => {
-    if (t$2(_props)) {
+    if (isFunction(_props)) {
       builder2 = _props;
       _props = {};
     }
@@ -596,22 +540,22 @@ function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _
         ...project
       },
       specification: toLikeC4Specification(),
-      elements: n(
+      elements: fromEntries(
         structuredClone(
           Array.from(_elements.entries())
         )
       ),
-      relations: l(_relations, (r) => [r.id, structuredClone(r)]),
+      relations: mapToObj(_relations, (r) => [r.id, structuredClone(r)]),
       globals: structuredClone(_globals),
       deployments: {
-        elements: n(
+        elements: fromEntries(
           structuredClone(
             Array.from(_deployments.entries())
           )
         ),
-        relations: l(_deploymentRelations, (r) => [r.id, structuredClone(r)])
+        relations: mapToObj(_deploymentRelations, (r) => [r.id, structuredClone(r)])
       },
-      views: n(
+      views: fromEntries(
         structuredClone(
           Array.from(_views.entries())
         )
@@ -680,10 +624,10 @@ function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _
             return b;
           };
         },
-        ...i(
+        ...mapValues(
           spec.elements,
           ({ style: specStyle, ...spec2 }, kind) => (id, _props) => {
-            const add = (b) => {
+            const add = ((b) => {
               const {
                 links: _links,
                 icon: _icon,
@@ -704,21 +648,21 @@ function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _
                 tags: [],
                 color: specStyle?.color ?? DefaultThemeColor,
                 shape: specStyle?.shape ?? DefaultElementShape,
-                style: d({
+                style: pickBy({
                   border: specStyle?.border,
                   opacity: specStyle?.opacity,
                   size: specStyle?.size,
                   padding: specStyle?.padding,
                   textSize: specStyle?.textSize,
                   ...style
-                }, l$1),
+                }, isNonNullish),
                 links,
                 ...icon && { icon },
                 ...spec2,
                 ...props
               });
               return b;
-            };
+            });
             add.with = (...ops) => (b) => {
               add(b);
               const { __fqn, __addSourcelessRelation } = b;
@@ -836,7 +780,7 @@ function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _
         },
         instanceOf: (id, target, _props) => {
           return (b) => {
-            if (n$1(target)) {
+            if (isNullish(target)) {
               target = id;
               id = nameFromFqn(id);
             } else if (typeof target === "string") {
@@ -888,10 +832,10 @@ function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _
             return b;
           };
         },
-        ...i(
+        ...mapValues(
           spec.deployments ?? {},
           ({ style: specStyle, ...spec2 }, kind) => (id, _props) => {
-            const add = (b) => {
+            const add = ((b) => {
               const {
                 links,
                 icon: _icon,
@@ -913,21 +857,21 @@ function builder(spec, _elements = /* @__PURE__ */ new Map(), _relations = [], _
                   ...icon && { icon },
                   color: specStyle?.color ?? DefaultThemeColor,
                   shape: specStyle?.shape ?? DefaultElementShape,
-                  ...d({
+                  ...pickBy({
                     border: specStyle?.border,
                     opacity: specStyle?.opacity,
                     size: specStyle?.size,
                     padding: specStyle?.padding,
                     textSize: specStyle?.textSize,
                     ...style
-                  }, l$1)
+                  }, isNonNullish)
                 },
                 ...links && { links: mapLinks(links) },
                 ...spec2,
                 ...props
               });
               return b;
-            };
+            });
             add.with = (...ops) => (b) => {
               add(b);
               const { __deploymentFqn } = b;

package/dist/compute-view/index.d.mts

@@ -1,11 +1,14 @@
-import { A as Any } from '../shared/core.O6FG0HF9.mjs';
-import { g as LikeC4Model } from '../shared/core.BvlHvikl.mjs';
-import { n as ParsedLikeC4ModelData, C as ComputedLikeC4ModelData, an as ParsedView, aq as ComputedView } from '../shared/core.CE_hG7EJ.mjs';
+import { A as Any } from '../shared/core.DdzRtJ9d.mjs';
+import { g as LikeC4Model } from '../shared/core.v1iEaXaR.mjs';
+import { h as ParsedLikeC4ModelData, C as ComputedLikeC4ModelData, Z as ParsedView, a0 as ComputedView } from '../shared/core.aWJgARyY.mjs';
 import 'type-fest';
 import '../shared/core.DuSLYTG6.mjs';
 import '../shared/core.DX-WYEPA.mjs';
 import '../shared/core.CywrQs86.mjs';
 import '../shared/core.CzdwsPmY.mjs';
+import '../shared/core.20m8Um0g.mjs';
+import '../types/fqnRef.mjs';
+import '../types/expression-model.mjs';
 
 type ComputeViewResult<V> = {
     isSuccess: true;

package/dist/compute-view/index.mjs

@@ -1,26 +1,19 @@
-import { G as Graph, w as willCreateCycle, t as topologicalSortExports, i as i$2, l } from '../shared/core.Dw47t7nG.mjs';
-export { c as computeLikeC4Model, a as computeParsedModelData, b as computeView, u as unsafeComputeView } from '../shared/core.Dw47t7nG.mjs';
-import { i as i$1 } from '../shared/core.DC6zzxS0.mjs';
-import { r } from '../shared/core.CzHQRs5x.mjs';
-import { h as isExtendsElementView, f as isElementView } from '../shared/core.BW8K1y6R.mjs';
-import { o as isNonEmptyArray } from '../shared/core.OUoo2ohq.mjs';
-import { i } from '../shared/core.CpwrZi3D.mjs';
-import { u } from '../shared/core.DbRvwARP.mjs';
-import { m } from '../shared/core.ByrmCl9I.mjs';
-import '../shared/core.C4Cn4Jy_.mjs';
-import '../shared/core.BH0VqY-7.mjs';
-import '../shared/core.BgvIuGGU.mjs';
-import '../shared/core.BoyJPEen.mjs';
-import '../shared/core.BH9nN-_I.mjs';
+import { G as Graph, w as willCreateCycle, t as topologicalSortExports } from '../shared/core.DnRszv-l.mjs';
+export { c as computeLikeC4Model, a as computeParsedModelData, b as computeView, u as unsafeComputeView } from '../shared/core.DnRszv-l.mjs';
+import { values, unique, mapValues, omit, mapToObj, map } from 'remeda';
+import { f as isExtendsElementView, d as isElementView } from '../shared/core.T-eLZTW_.mjs';
+import { c as isNonEmptyArray } from '../shared/core.DgttqsJc.mjs';
+import '../shared/core.BB6zA-UU.mjs';
+import '../shared/core.CaT0SUUK.mjs';
 import '../shared/core.D4npX2q8.mjs';
-import '../shared/core.Bp-IQmJR.mjs';
-import '../shared/core.8KM0D6va.mjs';
-import '../shared/core.CnIyafWn.mjs';
-import '../shared/core.DK6I-Nr7.mjs';
-import '../shared/core.zLlww-07.mjs';
-import '../shared/core.BL_xjl90.mjs';
-import '../shared/core.H8NbNp2X.mjs';
-import '../shared/core.B0oEIXqd.mjs';
+import 'events';
+import '../shared/core.4u1dVmfX.mjs';
+import '../types/expression-model.mjs';
+import '../types/fqnRef.mjs';
+import '../shared/core.Be1n9a0i.mjs';
+import '../shared/core.yHe79zEl.mjs';
+import '../shared/core.BqVo8LrH.mjs';
+import '../shared/core.CUw_2J9j.mjs';
 import 'rehype-raw';
 import 'rehype-sanitize';
 import 'rehype-stringify';
@@ -30,20 +23,26 @@ import 'remark-rehype';
 import 'unified';
 import 'mdast-util-from-markdown';
 import 'mdast-util-to-string';
-import '../shared/core.BpJu1RrF.mjs';
-import '../shared/core.Btl47GOn.mjs';
-import '../shared/core.DDoAFHHp.mjs';
+import '../types/expression.mjs';
+import '../shared/core.CsbOakly.mjs';
+import '../shared/core.BVNaR17u.mjs';
+import '../shared/core.CWv15GLo.mjs';
+import '../shared/core.Be4Jy9Qx.mjs';
+import '../shared/core.CCD1ID81.mjs';
+import '../shared/core.DLpidoWc.mjs';
+import '../shared/core.BuoXfSMj.mjs';
+import '../shared/core.DoM6aM9N.mjs';
+import '../shared/core.DozSPE83.mjs';
 import '../shared/core.DcS-0zys.mjs';
-import '../shared/core.DsMrjY2q.mjs';
-
-function y(...t){return u(f,t)}function f(t,e){if(!i(e,1))return {...t};if(!i(e,2)){let{[e[0]]:r,...m}=t;return m}let o={...t};for(let r of e)delete o[r];return o}
+import '../shared/core.GTgsmXS_.mjs';
+import '../shared/core.CNGyqkJh.mjs';
 
 function resolveRulesExtendedViews(unresolvedViews) {
   const g = new Graph({
     type: "directed"
   });
   const extendedViews = [];
-  for (const view of r(unresolvedViews)) {
+  for (const view of values(unresolvedViews)) {
     g.addNode(view.id, { view });
     if (isExtendsElementView(view)) {
       extendedViews.push(view);
@@ -74,7 +73,7 @@ function resolveRulesExtendedViews(unresolvedViews) {
     if (!extendsFrom || !isElementView(extendsFrom)) {
       return acc;
     }
-    const tags = i$1([
+    const tags = unique([
       ...extendsFrom.tags ?? [],
       ...view.tags ?? []
     ]);
@@ -96,7 +95,7 @@ function resolveRulesExtendedViews(unresolvedViews) {
 }
 
 function withReadableEdges({ edges, nodes, ...view }, separator = ":") {
-  const edgeids = l(edges, (e) => [e.id, `${e.source}${separator}${e.target}`]);
+  const edgeids = mapToObj(edges, (e) => [e.id, `${e.source}${separator}${e.target}`]);
   return {
     ...view,
     edges: edges.map((e) => ({
@@ -105,8 +104,8 @@ function withReadableEdges({ edges, nodes, ...view }, separator = ":") {
     })),
     nodes: nodes.map((n) => ({
       ...n,
-      inEdges: m(n.inEdges, (e) => edgeids[e]),
-      outEdges: m(n.outEdges, (e) => edgeids[e])
+      inEdges: map(n.inEdges, (e) => edgeids[e]),
+      outEdges: map(n.outEdges, (e) => edgeids[e])
     })),
     nodeIds: nodes.map((n) => n.id),
     edgeIds: edges.map((e) => edgeids[e.id])
@@ -115,7 +114,7 @@ function withReadableEdges({ edges, nodes, ...view }, separator = ":") {
 function viewsWithReadableEdges({ views, ...model }) {
   return {
     ...model,
-    views: i$2(views, (v) => y(withReadableEdges(v), ["nodeIds", "edgeIds"]))
+    views: mapValues(views, (v) => omit(withReadableEdges(v), ["nodeIds", "edgeIds"]))
   };
 }
 

package/dist/compute-view/relationships-view/index.d.mts

@@ -1,10 +1,13 @@
-import { A as Any, U as Unknown, g as ElementId, V as ViewId } from '../../shared/core.O6FG0HF9.mjs';
-import { E as ElementModel, R as RelationshipModel, g as LikeC4Model } from '../../shared/core.BvlHvikl.mjs';
+import { A as Any, U as Unknown, j as ElementId, V as ViewId } from '../../shared/core.DdzRtJ9d.mjs';
+import { E as ElementModel, R as RelationshipModel, g as LikeC4Model } from '../../shared/core.v1iEaXaR.mjs';
 import 'type-fest';
 import '../../shared/core.DuSLYTG6.mjs';
 import '../../shared/core.DX-WYEPA.mjs';
 import '../../shared/core.CywrQs86.mjs';
-import '../../shared/core.CE_hG7EJ.mjs';
+import '../../shared/core.aWJgARyY.mjs';
+import '../../types/expression-model.mjs';
+import '../../shared/core.20m8Um0g.mjs';
+import '../../types/fqnRef.mjs';
 import '../../shared/core.CzdwsPmY.mjs';
 
 type RelationshipsViewData<M extends Any = Unknown> = {

package/dist/compute-view/relationships-view/index.mjs

@@ -1,9 +1,9 @@
-import { m as sortParentsFirst, j as isDescendantOf, i as isAncestor, C } from '../../shared/core.OUoo2ohq.mjs';
-import { D as DefaultMap } from '../../shared/core.DDoAFHHp.mjs';
+import { pipe } from 'remeda';
+import { f as sortParentsFirst, b as isDescendantOf, i as isAncestor } from '../../shared/core.DgttqsJc.mjs';
+import { D as DefaultMap } from '../../shared/core.BuoXfSMj.mjs';
 import { a as nonNullable, i as invariant } from '../../shared/core.D4npX2q8.mjs';
-import { a as toSet, t as toArray, i as imap } from '../../shared/core.Btl47GOn.mjs';
-import { i as ifilter } from '../../shared/core.BH9nN-_I.mjs';
-import '../../shared/core.zLlww-07.mjs';
+import { a as toSet, t as toArray, i as imap } from '../../shared/core.DLpidoWc.mjs';
+import { i as ifilter } from '../../shared/core.CCD1ID81.mjs';
 
 function treeFromElements(elements) {
   const sorted = sortParentsFirst([...elements]);
@@ -169,7 +169,7 @@ function computeScopedRelationshipsView(subjectId, view, likec4model) {
   const isDescendant = isDescendantOf(subject);
   const others = /* @__PURE__ */ new Set([
     ...subject.ascendingSiblings(),
-    ...C(
+    ...pipe(
       view.elements(),
       imap((e) => e.element),
       ifilter((e) => e !== subject && isDescendant(e))

package/dist/index.d.mts

@@ -1,12 +1,15 @@
 export { ElementColors, RelationshipColors, computeColorValues, defaultTheme } from './theme/index.mjs';
-export { BiMap, DefaultWeakMap, LinkedList, MultiMap, Queue, Stack, commonHead, compareNatural, compareNaturalHierarchically, compareRelations, delay, difference, equalsSet, getOrCreate, hasAtLeast, intersection, invariant, isNonEmptyArray, isString, markdownToHtml, markdownToText, memoizeProp, nonNullable, nonexhaustive, objectHash, promiseNextTick, stringHash, symmetricDifference, union } from './utils/index.mjs';
+export { B as BiMap, D as DefaultWeakMap, L as LinkedList, M as MultiMap, Q as Queue, i as invariant, a as isNonEmptyArray, b as isString, m as memoizeProp, c as nonNullable, n as nonexhaustive } from './shared/core.PHwHXzkG.mjs';
 export { D as DefaultMap } from './shared/core.CywrQs86.mjs';
-export { A as Any, A as AnyAux, a as Aux, E as ExtractOnStage, M as ModelStage, S as SpecAux, U as Unknown, b as UnknownComputed, c as UnknownLayouted, d as UnknownParsed, e as _stage, f as _type, _ as aux, i as isOnStage } from './shared/core.O6FG0HF9.mjs';
+export { I as IterableContainer, a as ancestorsFqn, i as isAncestor, b as isDescendantOf, c as isSameHierarchy, n as nameFromFqn, p as parentFqn, s as sortNaturalByFqn, d as sortParentsFirst } from './shared/core.DM3vdkO_.mjs';
+export { i as isIterable } from './shared/core.DXhDWKFZ.mjs';
+export { A as Any, A as AnyAux, a as Aux, E as ExtractOnStage, M as ModelStage, S as SpecAux, U as Unknown, b as UnknownComputed, c as UnknownLayouted, d as UnknownParsed, e as _stage, f as _type, _ as aux, i as isOnStage } from './shared/core.DdzRtJ9d.mjs';
 export { A as AnyFqn, B as BuiltInIcon, D as DeploymentFqn, b as DeploymentKind, j as EdgeId, E as ElementKind, F as Fqn, e as GlobalFqn, G as GroupElementKind, I as Icon, a as IconUrl, M as MarkdownOrString, N as NodeId, P as ProjectId, d as RelationId, R as RelationKind, c as RelationshipKind, k as StepEdgeId, S as StepEdgeIdLiteral, m as StepEdgeKind, T as Tag, V as ViewId, o as extractStep, f as flattenMarkdownOrString, g as isGlobalFqn, i as isGroupElementKind, n as isStepEdgeId, s as scalar, h as splitGlobalFqn, l as stepEdgeId } from './shared/core.DX-WYEPA.mjs';
-export { Y as AbstractRelationship, ae as AndOperator, aG as AnyExcludePredicate, aF as AnyIncludePredicate, as as AnyView, aH as AnyViewRuleStyle, aM as AutoLayoutDirection, H as AuxFromDump, A as AuxFromLikeC4ModelData, B as BBox, aU as BaseParsedViewProperties, aT as BaseViewProperties, a$ as ComputedDeploymentView, b0 as ComputedDynamicView, aZ as ComputedEdge, a_ as ComputedElementView, C as ComputedLikeC4ModelData, aY as ComputedNode, aq as ComputedView, V as DefaultArrowType, J as DefaultElementShape, U as DefaultLineStyle, N as DefaultPaddingSize, W as DefaultRelationshipColor, K as DefaultShapeSize, O as DefaultTextSize, I as DefaultThemeColor, q as DeployedInstance, r as DeploymentElement, s as DeploymentElementRef, D as DeploymentElementStyle, p as DeploymentNode, w as DeploymentRelation, v as DeploymentRelationship, b7 as DeploymentViewExcludePredicate, b6 as DeploymentViewIncludePredicate, b8 as DeploymentViewPredicate, ba as DeploymentViewRule, b9 as DeploymentViewRuleStyle, b2 as DiagramEdge, b1 as DiagramNode, ao as DiagramView, bg as DynamicViewIncludeRule, bd as DynamicViewParallelSteps, bh as DynamicViewRule, bc as DynamicViewStep, bf as DynamicViewStepOrParallel, T as Element, $ as ElementSpecification, Q as ElementStyle, bl as ElementViewExcludePredicate, bk as ElementViewIncludePredicate, bm as ElementViewPredicate, bq as ElementViewRule, bn as ElementViewRuleGroup, bp as ElementViewRuleStyle, a4 as EqualOperator, E as Expression, aj as Filterable, F as FqnExpr, f as FqnRef, j as GlobalDynamicPredicates, G as GlobalPredicateId, i as GlobalPredicates, k as GlobalStyleID, l as GlobalStyles, a7 as KindEqual, b4 as LayoutedDeploymentView, b5 as LayoutedDynamicView, b3 as LayoutedElementView, L as LayoutedLikeC4ModelData, ao as LayoutedView, o as LikeC4ModelData, y as LikeC4ModelDump, am as LikeC4Project, an as LikeC4View, e as ModelExpression, M as ModelFqnExpr, m as ModelGlobals, _ as ModelRelation, d as ModelRelationExpr, aV as NodeNotation, ac as NotOperator, ak as OperatorPredicate, ag as OrOperator, bb as ParsedDeploymentView, bi as ParsedDynamicView, br as ParsedElementView, n as ParsedLikeC4ModelData, an as ParsedView, a9 as Participant, aa as ParticipantOperator, g as Point, P as PredicateSelector, ar as ProcessedView, z as ProjectDump, h as RectBox, c as RelationExpr, Z as Relationship, a2 as RelationshipSpecification, R as RichText, a as RichTextEmpty, b as RichTextOrEmpty, x as SpecTypesFromDump, a3 as Specification, S as SpecificationDump, a5 as TagEqual, a0 as TagSpecification, aQ as ViewAutoLayout, aR as ViewManualLayout, at as ViewOnStage, av as ViewRule, aO as ViewRuleAutoLayout, aK as ViewRuleGlobalPredicateRef, aI as ViewRuleGlobalStyle, aw as ViewRulePredicate, aS as ViewType, aX as ViewWithHash, aW as ViewWithNotation, au as ViewWithType, ai as WhereOperator, X as XYPoint, be as getParallelStepsPrefix, af as isAndOperator, aN as isAutoLayoutDirection, az as isComputedView, u as isDeployedInstance, t as isDeploymentNode, aD as isDeploymentView, ap as isDiagramView, aE as isDynamicView, bj as isDynamicViewParallelSteps, aA as isElementView, aC as isExtendsElementView, a8 as isKindEqual, ap as isLayoutedView, ad as isNotOperator, ah as isOrOperator, ab as isParticipantOperator, aB as isScopedElementView, a1 as isTagColorSpecified, a6 as isTagEqual, aP as isViewRuleAutoLayout, aL as isViewRuleGlobalPredicateRef, aJ as isViewRuleGlobalStyle, bo as isViewRuleGroup, ax as isViewRulePredicate, ay as isViewRuleStyle, al as whereOperatorAsPredicate } from './shared/core.CE_hG7EJ.mjs';
+export { K as AbstractRelationship, ag as AnyExcludePredicate, af as AnyIncludePredicate, a2 as AnyView, ah as AnyViewRuleStyle, am as AutoLayoutDirection, u as AuxFromDump, A as AuxFromLikeC4ModelData, B as BBox, au as BaseParsedViewProperties, at as BaseViewProperties, aB as ComputedDeploymentView, aC as ComputedDynamicView, az as ComputedEdge, aA as ComputedElementView, C as ComputedLikeC4ModelData, ay as ComputedNode, a0 as ComputedView, I as DefaultArrowType, w as DefaultElementShape, H as DefaultLineStyle, y as DefaultPaddingSize, J as DefaultRelationshipColor, x as DefaultShapeSize, z as DefaultTextSize, v as DefaultThemeColor, k as DeployedInstance, l as DeploymentElement, m as DeploymentElementRef, D as DeploymentElementStyle, j as DeploymentNode, q as DeploymentRelation, p as DeploymentRelationship, aJ as DeploymentViewExcludePredicate, aI as DeploymentViewIncludePredicate, aK as DeploymentViewPredicate, aM as DeploymentViewRule, aL as DeploymentViewRuleStyle, aE as DiagramEdge, aD as DiagramNode, _ as DiagramView, aS as DynamicViewIncludeRule, aP as DynamicViewParallelSteps, aT as DynamicViewRule, aO as DynamicViewStep, aR as DynamicViewStepOrParallel, F as Element, Q as ElementSpecification, E as ElementStyle, aX as ElementViewExcludePredicate, aW as ElementViewIncludePredicate, aY as ElementViewPredicate, b0 as ElementViewRule, aZ as ElementViewRuleGroup, a$ as ElementViewRuleStyle, e as GlobalDynamicPredicates, G as GlobalPredicateId, d as GlobalPredicates, f as GlobalStyleID, g as GlobalStyles, aG as LayoutedDeploymentView, aH as LayoutedDynamicView, aF as LayoutedElementView, L as LayoutedLikeC4ModelData, _ as LayoutedView, i as LikeC4ModelData, s as LikeC4ModelDump, Y as LikeC4Project, Z as LikeC4View, M as ModelGlobals, O as ModelRelation, av as NodeNotation, aN as ParsedDeploymentView, aU as ParsedDynamicView, b1 as ParsedElementView, h as ParsedLikeC4ModelData, Z as ParsedView, P as Point, a1 as ProcessedView, t as ProjectDump, c as RectBox, N as Relationship, V as RelationshipSpecification, R as RichText, a as RichTextEmpty, b as RichTextOrEmpty, r as SpecTypesFromDump, W as Specification, S as SpecificationDump, T as TagSpecification, aq as ViewAutoLayout, ar as ViewManualLayout, a3 as ViewOnStage, a5 as ViewRule, ao as ViewRuleAutoLayout, ak as ViewRuleGlobalPredicateRef, ai as ViewRuleGlobalStyle, a6 as ViewRulePredicate, as as ViewType, ax as ViewWithHash, aw as ViewWithNotation, a4 as ViewWithType, X as XYPoint, aQ as getParallelStepsPrefix, an as isAutoLayoutDirection, a9 as isComputedView, o as isDeployedInstance, n as isDeploymentNode, ad as isDeploymentView, $ as isDiagramView, ae as isDynamicView, aV as isDynamicViewParallelSteps, aa as isElementView, ac as isExtendsElementView, $ as isLayoutedView, ab as isScopedElementView, U as isTagColorSpecified, ap as isViewRuleAutoLayout, al as isViewRuleGlobalPredicateRef, aj as isViewRuleGlobalStyle, a_ as isViewRuleGroup, a7 as isViewRulePredicate, a8 as isViewRuleStyle } from './shared/core.aWJgARyY.mjs';
 export { C as Coalesce, E as ExclusiveUnion, I as IteratorLike, K as KeysOf, L as Link, b as NTuple, N as NonEmptyArray, a as NonEmptyReadonlyArray, P as Predicate } from './shared/core.DuSLYTG6.mjs';
+export { A as AndOperator, a as EqualOperator, E as Expression, j as Filterable, F as FqnExpr, K as KindEqual, N as NotOperator, k as OperatorPredicate, O as OrOperator, c as Participant, d as ParticipantOperator, P as PredicateSelector, R as RelationExpr, T as TagEqual, W as WhereOperator, g as isAndOperator, b as isKindEqual, f as isNotOperator, h as isOrOperator, e as isParticipantOperator, i as isTagEqual, w as whereOperatorAsPredicate } from './shared/core.20m8Um0g.mjs';
+export { ModelExpression, ModelFqnExpr, ModelRelationExpr } from './types/expression-model.mjs';
+export { FqnRef } from './types/fqnRef.mjs';
 export { b as BorderStyle, B as BorderStyles, i as Color, C as ColorLiteral, d as CustomColor, e as CustomColorDefinitions, c as ElementShape, E as ElementShapes, k as ElementThemeColorValues, l as ElementThemeColors, H as HexColor, L as LikeC4Theme, f as RelationshipArrowType, R as RelationshipLineType, m as RelationshipThemeColorValues, o as RelationshipThemeColors, a as ShapeSize, S as SpacingSize, T as TextSize, h as ThemeColor, n as ThemeColorValues, g as ThemeColors, j as isThemeColor } from './shared/core.CzdwsPmY.mjs';
 export { ViewChange } from './types/index.mjs';
-export { I as IterableContainer, R as ReorderedArray, a as ancestorsFqn, c as commonAncestor, b as compareByFqnHierarchically, d as compareFqnHierarchically, h as hierarchyDistance, e as hierarchyLevel, i as isAncestor, f as isDescendantOf, g as isSameHierarchy, n as nameFromFqn, p as parentFqn, s as sortByFqnHierarchically, j as sortNaturalByFqn, k as sortParentsFirst } from './shared/core.wwaSalox.mjs';
-export { ifilter, ifind, ifirst, iflat, ihead, imap, ireduce, isIterable, isome, iunique, toArray, toSet } from './utils/iterable/index.mjs';
 import 'type-fest';

package/dist/index.mjs

@@ -1,32 +1,23 @@
 export { ElementColors, RelationshipColors, computeColorValues, defaultTheme } from './theme/index.mjs';
+export { a as ancestorsFqn, i as isAncestor, b as isDescendantOf, c as isNonEmptyArray, d as isSameHierarchy, e as isString, n as nameFromFqn, p as parentFqn, s as sortNaturalByFqn, f as sortParentsFirst } from './shared/core.DgttqsJc.mjs';
+export { b as BiMap, d as DefaultWeakMap, l as LinkedList, m as MultiMap, q as Queue } from './shared/core.DlG1xWt2.mjs';
+export { D as DefaultMap } from './shared/core.BuoXfSMj.mjs';
+export { i as invariant, a as nonNullable, n as nonexhaustive } from './shared/core.D4npX2q8.mjs';
+export { i as isIterable } from './shared/core.DoM6aM9N.mjs';
+export { m as memoizeProp } from './shared/core.CUw_2J9j.mjs';
 export { _ as aux } from './types/_aux.mjs';
-export { D as DeploymentFqn, E as EdgeId, F as Fqn, a as GlobalFqn, G as GroupElementKind, N as NodeId, P as ProjectId, R as RelationId, S as StepEdgeKind, V as ViewId, g as extractStep, f as flattenMarkdownOrString, b as isGlobalFqn, i as isGroupElementKind, e as isStepEdgeId, s as scalar, c as splitGlobalFqn, d as stepEdgeId } from './shared/core.BL_xjl90.mjs';
-export { f as DefaultArrowType, a as DefaultElementShape, e as DefaultLineStyle, c as DefaultPaddingSize, g as DefaultRelationshipColor, b as DefaultShapeSize, d as DefaultTextSize, D as DefaultThemeColor, R as RichText } from './shared/core.H8NbNp2X.mjs';
-export { F as FqnRef, _ as _stage, a as _type, h as isAndOperator, c as isDeployedInstance, b as isDeploymentNode, e as isKindEqual, g as isNotOperator, i as isOnStage, j as isOrOperator, f as isParticipantOperator, d as isTagEqual, w as whereOperatorAsPredicate } from './shared/core.DK6I-Nr7.mjs';
-export { E as Expression, F as FqnExpr, b as ModelExpression, M as ModelFqnExpr, a as ModelRelationExpr, R as RelationExpr, p as getParallelStepsPrefix, n as isAutoLayoutDirection, d as isComputedView, j as isDeploymentView, e as isDiagramView, k as isDynamicView, q as isDynamicViewParallelSteps, f as isElementView, h as isExtendsElementView, e as isLayoutedView, g as isScopedElementView, o as isViewRuleAutoLayout, m as isViewRuleGlobalPredicateRef, l as isViewRuleGlobalStyle, r as isViewRuleGroup, i as isViewRulePredicate, c as isViewRuleStyle } from './shared/core.BW8K1y6R.mjs';
+export { D as DeploymentFqn, E as EdgeId, F as Fqn, a as GlobalFqn, G as GroupElementKind, N as NodeId, P as ProjectId, R as RelationId, S as StepEdgeKind, V as ViewId, g as extractStep, f as flattenMarkdownOrString, b as isGlobalFqn, i as isGroupElementKind, e as isStepEdgeId, s as scalar, c as splitGlobalFqn, d as stepEdgeId } from './shared/core.Be1n9a0i.mjs';
+export { f as DefaultArrowType, a as DefaultElementShape, e as DefaultLineStyle, c as DefaultPaddingSize, g as DefaultRelationshipColor, b as DefaultShapeSize, d as DefaultTextSize, D as DefaultThemeColor, R as RichText } from './shared/core.BqVo8LrH.mjs';
+export { _ as _stage, a as _type, h as isAndOperator, c as isDeployedInstance, b as isDeploymentNode, e as isKindEqual, g as isNotOperator, i as isOnStage, j as isOrOperator, f as isParticipantOperator, d as isTagEqual, w as whereOperatorAsPredicate } from './shared/core.yHe79zEl.mjs';
+export { Expression, FqnExpr, RelationExpr } from './types/expression.mjs';
+export { ModelExpression, ModelFqnExpr, ModelRelationExpr } from './types/expression-model.mjs';
+export { FqnRef } from './types/fqnRef.mjs';
 export { B as BBox, a as BorderStyles, E as ElementShapes, R as RectBox, T as ThemeColors, i as isTagColorSpecified, b as isThemeColor } from './shared/core.CxGKeL-L.mjs';
-export { b as BiMap, d as DefaultWeakMap, l as LinkedList, m as MultiMap, q as Queue, c as compareRelations, a as delay, p as promiseNextTick } from './shared/core.Dhc0yIwT.mjs';
-export { D as DefaultMap } from './shared/core.DDoAFHHp.mjs';
-export { S as Stack, c as commonHead, o as objectHash } from './shared/core.Bp-IQmJR.mjs';
-export { i as invariant, a as nonNullable, n as nonexhaustive } from './shared/core.D4npX2q8.mjs';
-export { b as ancestorsFqn, d as commonAncestor, e as compareByFqnHierarchically, f as compareFqnHierarchically, c as compareNatural, a as compareNaturalHierarchically, h as hierarchyDistance, g as hierarchyLevel, i as isAncestor, j as isDescendantOf, o as isNonEmptyArray, k as isSameHierarchy, q as isString, n as nameFromFqn, p as parentFqn, s as sortByFqnHierarchically, l as sortNaturalByFqn, m as sortParentsFirst } from './shared/core.OUoo2ohq.mjs';
-export { g as getOrCreate } from './shared/core.DcS-0zys.mjs';
-export { d as difference, e as equalsSet, i as hasAtLeast, a as intersection, b as stringHash, s as symmetricDifference, u as union } from './shared/core.CpwrZi3D.mjs';
-export { i as ifilter } from './shared/core.BH9nN-_I.mjs';
-export { i as ifind, a as ihead } from './shared/core.DsMrjY2q.mjs';
-export { ifirst, ireduce } from './utils/iterable/index.mjs';
-export { i as iflat, a as isIterable, b as iunique } from './shared/core.8KM0D6va.mjs';
-export { i as imap, t as toArray, a as toSet } from './shared/core.Btl47GOn.mjs';
-export { i as isome } from './shared/core.BoyJPEen.mjs';
-export { a as markdownToHtml, b as markdownToText, m as memoizeProp } from './shared/core.B0oEIXqd.mjs';
+export { n as getParallelStepsPrefix, l as isAutoLayoutDirection, b as isComputedView, g as isDeploymentView, c as isDiagramView, h as isDynamicView, o as isDynamicViewParallelSteps, d as isElementView, f as isExtendsElementView, c as isLayoutedView, e as isScopedElementView, m as isViewRuleAutoLayout, k as isViewRuleGlobalPredicateRef, j as isViewRuleGlobalStyle, p as isViewRuleGroup, i as isViewRulePredicate, a as isViewRuleStyle } from './shared/core.T-eLZTW_.mjs';
 import '@mantine/colors-generator';
 import 'chroma-js';
-import './shared/core.BpJu1RrF.mjs';
-import './shared/core.DbRvwARP.mjs';
-import './shared/core.CnIyafWn.mjs';
-import './shared/core.zLlww-07.mjs';
-import './shared/core.BgvIuGGU.mjs';
-import './shared/core.ByrmCl9I.mjs';
+import 'remeda';
+import './shared/core.CaT0SUUK.mjs';
 import 'rehype-raw';
 import 'rehype-sanitize';
 import 'rehype-stringify';

package/dist/model/connection/deployment/index.d.mts

@@ -1,10 +1,13 @@
-export { C as Connection } from '../../../shared/core.Bf5zKDK1.mjs';
-export { D as DeploymentConnectionModel, a as findConnection, b as findConnectionsBetween, c as findConnectionsWithin } from '../../../shared/core.DhDo8LAz.mjs';
-import '../../../shared/core.BvlHvikl.mjs';
-import '../../../shared/core.O6FG0HF9.mjs';
+export { C as Connection } from '../../../shared/core.CXCmvCws.mjs';
+export { D as DeploymentConnectionModel, a as findConnection, b as findConnectionsBetween, c as findConnectionsWithin } from '../../../shared/core.C7pZp1nR.mjs';
+import '../../../shared/core.v1iEaXaR.mjs';
+import '../../../shared/core.DdzRtJ9d.mjs';
 import 'type-fest';
 import '../../../shared/core.DuSLYTG6.mjs';
 import '../../../shared/core.DX-WYEPA.mjs';
 import '../../../shared/core.CywrQs86.mjs';
-import '../../../shared/core.CE_hG7EJ.mjs';
+import '../../../shared/core.aWJgARyY.mjs';
+import '../../../types/expression-model.mjs';
+import '../../../shared/core.20m8Um0g.mjs';
+import '../../../types/fqnRef.mjs';
 import '../../../shared/core.CzdwsPmY.mjs';