@likec4/core 0.33.1 → 0.34.0

package/dist/{colors.mjs → colors.cjs}

@@ -1,3 +1,9 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.defaultTheme = exports.RelationColors = exports.Colors = void 0;
 const blue = {
   // fill: colors.blue[500],
   // stroke: colors.blue[600],
@@ -28,13 +34,14 @@ const slate = {
   hiContrast: "#f8fafc",
   loContrast: "#e2e8f0"
 };
-export const RelationColors = {
+const RelationColors = {
   // lineColor: colors.neutral[400],
   // labelColor: colors.neutral[300],
   lineColor: "#a3a3a3",
   labelColor: "#d4d4d4"
 };
-export const Colors = {
+exports.RelationColors = RelationColors;
+const Colors = {
   primary: blue,
   blue,
   secondary: sky,
@@ -65,6 +72,7 @@ export const Colors = {
     loContrast: "#1f2937"
     // colors.gray[800],
   },
+
   green: {
     // fill: colors.green[600],
     // stroke: colors.green[700],
@@ -79,6 +87,7 @@ export const Colors = {
     // colors.gray[800],
     // loContrast: '#bbf7d0'
   },
+
   amber: {
     // fill: colors.amber[600],
     // stroke: colors.amber[700],
@@ -93,6 +102,7 @@ export const Colors = {
     loContrast: "#1f2937"
     // colors.gray[800],
   },
+
   indigo: {
     // fill: colors.indigo[500],
     // stroke: colors.indigo[600],
@@ -104,9 +114,11 @@ export const Colors = {
     loContrast: "#c7d2fe"
   }
 };
-export const defaultTheme = {
+exports.Colors = Colors;
+const defaultTheme = {
   font: "Helvetica",
   shadow: "#0a0a0a",
   relation: RelationColors,
   colors: Colors
 };
+exports.defaultTheme = defaultTheme;

package/dist/colors.js

@@ -1,9 +1,3 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.defaultTheme = exports.RelationColors = exports.Colors = void 0;
 const blue = {
   // fill: colors.blue[500],
   // stroke: colors.blue[600],
@@ -34,14 +28,13 @@ const slate = {
   hiContrast: "#f8fafc",
   loContrast: "#e2e8f0"
 };
-const RelationColors = {
+export const RelationColors = {
   // lineColor: colors.neutral[400],
   // labelColor: colors.neutral[300],
   lineColor: "#a3a3a3",
   labelColor: "#d4d4d4"
 };
-exports.RelationColors = RelationColors;
-const Colors = {
+export const Colors = {
   primary: blue,
   blue,
   secondary: sky,
@@ -72,7 +65,6 @@ const Colors = {
     loContrast: "#1f2937"
     // colors.gray[800],
   },
-
   green: {
     // fill: colors.green[600],
     // stroke: colors.green[700],
@@ -87,7 +79,6 @@ const Colors = {
     // colors.gray[800],
     // loContrast: '#bbf7d0'
   },
-
   amber: {
     // fill: colors.amber[600],
     // stroke: colors.amber[700],
@@ -102,7 +93,6 @@ const Colors = {
     loContrast: "#1f2937"
     // colors.gray[800],
   },
-
   indigo: {
     // fill: colors.indigo[500],
     // stroke: colors.indigo[600],
@@ -114,11 +104,9 @@ const Colors = {
     loContrast: "#c7d2fe"
   }
 };
-exports.Colors = Colors;
-const defaultTheme = {
+export const defaultTheme = {
   font: "Helvetica",
   shadow: "#0a0a0a",
   relation: RelationColors,
   colors: Colors
 };
-exports.defaultTheme = defaultTheme;

package/dist/compute-view/EdgeBuilder.cjs

@@ -0,0 +1,37 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.EdgeBuilder = void 0;
+var _rambdax = require("rambdax");
+var _utils = require("../utils/index.cjs");
+class EdgeBuilder {
+  _relationsObj = {};
+  add(source, target, relation) {
+    const bySource = this._relationsObj[source] ?? {};
+    const relations = bySource[target] ?? [];
+    relations.push(relation);
+    bySource[target] = relations;
+    this._relationsObj[source] = bySource;
+    return this;
+  }
+  build() {
+    return (0, _rambdax.keys)(this._relationsObj).flatMap(source => {
+      const targets = this._relationsObj[source] ?? {};
+      return (0, _rambdax.keys)(targets).map(target => {
+        const relations = (targets[target] ?? []).sort(_utils.compareRelations);
+        const label = relations.find(r => r.title !== "")?.title ?? null;
+        return {
+          id: `${source}:${target}`,
+          parent: (0, _utils.commonAncestor)(source, target),
+          source,
+          target,
+          label,
+          relations: (0, _rambdax.pluck)("id", relations)
+        };
+      });
+    }).sort(_utils.compareRelations).reverse();
+  }
+}
+exports.EdgeBuilder = EdgeBuilder;

package/dist/compute-view/EdgeBuilder.d.ts

@@ -1,5 +1,4 @@
-import type { Fqn, Relation } from '../types';
-import type { ComputedEdge } from '../types/computed-view';
+import type { ComputedEdge, Fqn, Relation } from '../types';
 export declare class EdgeBuilder {
     private _relationsObj;
     add(source: Fqn, target: Fqn, relation: Relation): this;

package/dist/compute-view/EdgeBuilder.js

@@ -1,13 +1,6 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.EdgeBuilder = void 0;
-var _rambdax = require("rambdax");
-var _fqn = require("../utils/fqn");
-var _relations = require("../utils/relations");
-class EdgeBuilder {
+import { keys, pluck } from "rambdax";
+import { commonAncestor, compareRelations } from "../utils/index.js";
+export class EdgeBuilder {
   _relationsObj = {};
   add(source, target, relation) {
     const bySource = this._relationsObj[source] ?? {};
@@ -18,21 +11,20 @@ class EdgeBuilder {
     return this;
   }
   build() {
-    return (0, _rambdax.keys)(this._relationsObj).flatMap(source => {
+    return keys(this._relationsObj).flatMap((source) => {
       const targets = this._relationsObj[source] ?? {};
-      return (0, _rambdax.keys)(targets).map(target => {
-        const relations = (targets[target] ?? []).sort(_relations.compareRelations);
-        const label = relations.find(r => r.title !== "")?.title ?? null;
+      return keys(targets).map((target) => {
+        const relations = (targets[target] ?? []).sort(compareRelations);
+        const label = relations.find((r) => r.title !== "")?.title ?? null;
         return {
           id: `${source}:${target}`,
-          parent: (0, _fqn.commonAncestor)(source, target),
+          parent: commonAncestor(source, target),
           source,
           target,
           label,
-          relations: (0, _rambdax.pluck)("id", relations)
+          relations: pluck("id", relations)
         };
       });
-    }).sort(_relations.compareRelations).reverse();
+    }).sort(compareRelations).reverse();
   }
 }
-exports.EdgeBuilder = EdgeBuilder;

package/dist/compute-view/compute-ctx.cjs

@@ -0,0 +1,35 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ComputeCtx = void 0;
+var _rambdax = require("rambdax");
+class ComputeCtx {
+  constructor(index, root, elements = /* @__PURE__ */new Set(), relations = /* @__PURE__ */new Set(), implicits = /* @__PURE__ */new Set()) {
+    this.index = index;
+    this.root = root;
+    this.elements = elements;
+    this.relations = relations;
+    this.implicits = implicits;
+  }
+  include({
+    elements,
+    relations,
+    implicits
+  }) {
+    return new ComputeCtx(this.index, this.root, elements ? /* @__PURE__ */new Set([...this.elements, ...elements]) : this.elements, relations ? /* @__PURE__ */new Set([...this.relations, ...relations]) : this.relations, implicits ? /* @__PURE__ */new Set([...this.implicits, ...implicits]) : this.implicits);
+  }
+  exclude({
+    elements,
+    relations,
+    implicits
+  }) {
+    let newImplicits = implicits ? new Set((0, _rambdax.difference)([...this.implicits], implicits)) : this.implicits;
+    if (elements) {
+      newImplicits = new Set((0, _rambdax.difference)([...newImplicits], elements));
+    }
+    return new ComputeCtx(this.index, this.root, elements ? new Set((0, _rambdax.difference)([...this.elements], elements)) : this.elements, relations ? new Set((0, _rambdax.difference)([...this.relations], relations)) : this.relations, newImplicits);
+  }
+}
+exports.ComputeCtx = ComputeCtx;

package/dist/compute-view/compute-ctx.js

@@ -1,12 +1,6 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.ComputeCtx = void 0;
-var _rambdax = require("rambdax");
-class ComputeCtx {
-  constructor(index, root, elements = /* @__PURE__ */new Set(), relations = /* @__PURE__ */new Set(), implicits = /* @__PURE__ */new Set()) {
+import { difference } from "rambdax";
+export class ComputeCtx {
+  constructor(index, root, elements = /* @__PURE__ */ new Set(), relations = /* @__PURE__ */ new Set(), implicits = /* @__PURE__ */ new Set()) {
     this.index = index;
     this.root = root;
     this.elements = elements;
@@ -18,18 +12,31 @@ class ComputeCtx {
     relations,
     implicits
   }) {
-    return new ComputeCtx(this.index, this.root, elements ? /* @__PURE__ */new Set([...this.elements, ...elements]) : this.elements, relations ? /* @__PURE__ */new Set([...this.relations, ...relations]) : this.relations, implicits ? /* @__PURE__ */new Set([...this.implicits, ...implicits]) : this.implicits);
+    return new ComputeCtx(
+      this.index,
+      this.root,
+      elements ? /* @__PURE__ */ new Set([...this.elements, ...elements]) : this.elements,
+      relations ? /* @__PURE__ */ new Set([...this.relations, ...relations]) : this.relations,
+      implicits ? /* @__PURE__ */ new Set([...this.implicits, ...implicits]) : this.implicits
+    );
   }
   exclude({
     elements,
     relations,
     implicits
   }) {
-    let newImplicits = implicits ? new Set((0, _rambdax.difference)([...this.implicits], implicits)) : this.implicits;
+    let newImplicits = implicits ? new Set(difference([...this.implicits], implicits)) : this.implicits;
     if (elements) {
-      newImplicits = new Set((0, _rambdax.difference)([...newImplicits], elements));
+      newImplicits = new Set(
+        difference([...newImplicits], elements)
+      );
     }
-    return new ComputeCtx(this.index, this.root, elements ? new Set((0, _rambdax.difference)([...this.elements], elements)) : this.elements, relations ? new Set((0, _rambdax.difference)([...this.relations], relations)) : this.relations, newImplicits);
+    return new ComputeCtx(
+      this.index,
+      this.root,
+      elements ? new Set(difference([...this.elements], elements)) : this.elements,
+      relations ? new Set(difference([...this.relations], relations)) : this.relations,
+      newImplicits
+    );
   }
 }
-exports.ComputeCtx = ComputeCtx;

package/dist/compute-view/compute-element-view.cjs

@@ -0,0 +1,135 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.computeElementView = computeElementView;
+var _remeda = require("remeda");
+var _errors = require("../errors/index.cjs");
+var _types = require("../types/index.cjs");
+var _utils = require("../utils/index.cjs");
+var _EdgeBuilder = require("./EdgeBuilder.cjs");
+var _computeCtx = require("./compute-ctx.cjs");
+var _computePredicates = require("./compute-predicates.cjs");
+var _applyViewRuleStyles = require("./utils/applyViewRuleStyles.cjs");
+var _sortNodes = require("./utils/sortNodes.cjs");
+function reduceToMap(elementsIterator) {
+  return Array.from(elementsIterator).sort(_utils.compareByFqnHierarchically).reduce((map, {
+    id,
+    color,
+    shape,
+    ...el
+  }) => {
+    let parent = (0, _utils.parentFqn)(id);
+    while (parent) {
+      if (map.has(parent)) {
+        break;
+      }
+      parent = (0, _utils.parentFqn)(parent);
+    }
+    if (parent) {
+      const parentNd = (0, _errors.nonNullable)(map.get(parent));
+      parentNd.children.push(id);
+    }
+    const node = {
+      ...el,
+      id,
+      parent,
+      color: color ?? _types.DefaultThemeColor,
+      shape: shape ?? _types.DefaultElementShape,
+      children: [],
+      inEdges: [],
+      outEdges: []
+    };
+    map.set(id, node);
+    return map;
+  }, /* @__PURE__ */new Map());
+}
+function computeElementView(view, index) {
+  const rootElement = view.viewOf ?? null;
+  let ctx = new _computeCtx.ComputeCtx(index, rootElement);
+  const rulesInclude = view.rules.filter(_types.isViewRuleExpression);
+  if (rootElement && rulesInclude.length == 0) {
+    ctx = ctx.include({
+      elements: [index.find(rootElement)]
+    });
+  }
+  for (const {
+    isInclude,
+    exprs
+  } of rulesInclude) {
+    for (const expr of exprs) {
+      if (_types.Expr.isElementKindExpr(expr) || _types.Expr.isElementTagExpr(expr)) {
+        ctx = isInclude ? (0, _computePredicates.includeElementKindOrTag)(ctx, expr) : (0, _computePredicates.excludeElementKindOrTag)(ctx, expr);
+        continue;
+      }
+      if (_types.Expr.isElementRef(expr)) {
+        ctx = isInclude ? (0, _computePredicates.includeElementRef)(ctx, expr) : (0, _computePredicates.excludeElementRef)(ctx, expr);
+        continue;
+      }
+      if (_types.Expr.isWildcard(expr)) {
+        ctx = isInclude ? (0, _computePredicates.includeWildcardRef)(ctx, expr) : (0, _computePredicates.excludeWildcardRef)(ctx, expr);
+        continue;
+      }
+      if (_types.Expr.isIncoming(expr)) {
+        ctx = isInclude ? (0, _computePredicates.includeIncomingExpr)(ctx, expr) : (0, _computePredicates.excludeIncomingExpr)(ctx, expr);
+        continue;
+      }
+      if (_types.Expr.isOutgoing(expr)) {
+        ctx = isInclude ? (0, _computePredicates.includeOutgoingExpr)(ctx, expr) : (0, _computePredicates.excludeOutgoingExpr)(ctx, expr);
+        continue;
+      }
+      if (_types.Expr.isInOut(expr)) {
+        ctx = isInclude ? (0, _computePredicates.includeInOutExpr)(ctx, expr) : (0, _computePredicates.excludeInOutExpr)(ctx, expr);
+        continue;
+      }
+      if (_types.Expr.isRelation(expr)) {
+        ctx = isInclude ? (0, _computePredicates.includeRelationExpr)(ctx, expr) : (0, _computePredicates.excludeRelationExpr)(ctx, expr);
+        continue;
+      }
+      (0, _errors.nonexhaustive)(expr);
+    }
+  }
+  const allElements = [...ctx.elements, ...ctx.implicits].sort(_utils.compareByFqnHierarchically).reverse();
+  const elementsWithRelations = /* @__PURE__ */new Set();
+  const edgeBuilder = new _EdgeBuilder.EdgeBuilder();
+  const anscestorOf = id => e => e.id === id || (0, _utils.isAncestor)(e.id, id);
+  const sortedRelations = [...ctx.relations];
+  for (const rel of sortedRelations) {
+    const source = (0, _remeda.find)(allElements, anscestorOf(rel.source));
+    if (!source) {
+      continue;
+    }
+    const target = (0, _remeda.find)(allElements, (0, _remeda.allPass)([anscestorOf(rel.target), e => !(0, _utils.isSameHierarchy)(e, source)]));
+    if (!target) {
+      continue;
+    }
+    elementsWithRelations.add(source);
+    elementsWithRelations.add(target);
+    edgeBuilder.add(source.id, target.id, rel);
+  }
+  const elements = /* @__PURE__ */new Set([...ctx.elements, ...elementsWithRelations]);
+  const nodesMap = reduceToMap(elements);
+  const edges = edgeBuilder.build().map(edge => {
+    while (edge.parent) {
+      if (nodesMap.has(edge.parent)) {
+        break;
+      }
+      edge.parent = (0, _utils.parentFqn)(edge.parent);
+    }
+    (0, _errors.nonNullable)(nodesMap.get(edge.source)).outEdges.push(edge.id);
+    (0, _errors.nonNullable)(nodesMap.get(edge.target)).inEdges.push(edge.id);
+    return edge;
+  });
+  const nodes = (0, _applyViewRuleStyles.applyViewRuleStyles)(view.rules.filter(_types.isViewRuleStyle), (0, _sortNodes.sortNodes)(nodesMap, edges)
+  // map(e => nodesMap.get(e.id)!, Array.from(elements))
+  );
+
+  const autoLayoutRule = view.rules.find(_types.isViewRuleAutoLayout);
+  return {
+    ...view,
+    autoLayout: autoLayoutRule?.autoLayout ?? "TB",
+    nodes,
+    edges
+  };
+}

package/dist/compute-view/compute-element-view.js

@@ -1,110 +1,117 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.computeElementView = computeElementView;
-var _remeda = require("remeda");
-var _errors = require("../errors");
-var _types = require("../types");
-var Expr = _interopRequireWildcard(require("../types/expression"));
-var _view = require("../types/view");
-var _utils = require("../utils");
-var _EdgeBuilder = require("./EdgeBuilder");
-var _computeCtx = require("./compute-ctx");
-var _computePredicates = require("./compute-predicates");
-var _applyViewRuleStyles = require("./utils/applyViewRuleStyles");
-var _sortNodes = require("./utils/sortNodes");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+import { allPass, find } from "remeda";
+import { nonNullable, nonexhaustive } from "../errors/index.js";
+import {
+  DefaultElementShape,
+  DefaultThemeColor,
+  Expr,
+  isViewRuleAutoLayout,
+  isViewRuleExpression,
+  isViewRuleStyle
+} from "../types/index.js";
+import { compareByFqnHierarchically, isAncestor, isSameHierarchy, parentFqn } from "../utils/index.js";
+import { EdgeBuilder } from "./EdgeBuilder.js";
+import { ComputeCtx } from "./compute-ctx.js";
+import {
+  excludeElementKindOrTag,
+  excludeElementRef,
+  excludeInOutExpr,
+  excludeIncomingExpr,
+  excludeOutgoingExpr,
+  excludeRelationExpr,
+  excludeWildcardRef,
+  includeElementKindOrTag,
+  includeElementRef,
+  includeInOutExpr,
+  includeIncomingExpr,
+  includeOutgoingExpr,
+  includeRelationExpr,
+  includeWildcardRef
+} from "./compute-predicates.js";
+import { applyViewRuleStyles } from "./utils/applyViewRuleStyles.js";
+import { sortNodes } from "./utils/sortNodes.js";
 function reduceToMap(elementsIterator) {
-  return Array.from(elementsIterator).sort(_utils.compareByFqnHierarchically).reduce((map, {
-    id,
-    color,
-    shape,
-    ...el
-  }) => {
-    let parent = (0, _utils.parentFqn)(id);
+  return Array.from(elementsIterator).sort(compareByFqnHierarchically).reduce((map, { id, color, shape, ...el }) => {
+    let parent = parentFqn(id);
     while (parent) {
       if (map.has(parent)) {
         break;
       }
-      parent = (0, _utils.parentFqn)(parent);
+      parent = parentFqn(parent);
     }
     if (parent) {
-      const parentNd = (0, _errors.nonNullable)(map.get(parent));
+      const parentNd = nonNullable(map.get(parent));
       parentNd.children.push(id);
     }
     const node = {
       ...el,
       id,
       parent,
-      color: color ?? _types.DefaultThemeColor,
-      shape: shape ?? _types.DefaultElementShape,
+      color: color ?? DefaultThemeColor,
+      shape: shape ?? DefaultElementShape,
       children: [],
       inEdges: [],
       outEdges: []
     };
     map.set(id, node);
     return map;
-  }, /* @__PURE__ */new Map());
+  }, /* @__PURE__ */ new Map());
 }
-function computeElementView(view, index) {
+export function computeElementView(view, index) {
   const rootElement = view.viewOf ?? null;
-  let ctx = new _computeCtx.ComputeCtx(index, rootElement);
-  const rulesInclude = view.rules.filter(_view.isViewRuleExpression);
+  let ctx = new ComputeCtx(index, rootElement);
+  const rulesInclude = view.rules.filter(isViewRuleExpression);
   if (rootElement && rulesInclude.length == 0) {
     ctx = ctx.include({
       elements: [index.find(rootElement)]
     });
   }
-  for (const {
-    isInclude,
-    exprs
-  } of rulesInclude) {
+  for (const { isInclude, exprs } of rulesInclude) {
     for (const expr of exprs) {
       if (Expr.isElementKindExpr(expr) || Expr.isElementTagExpr(expr)) {
-        ctx = isInclude ? (0, _computePredicates.includeElementKindOrTag)(ctx, expr) : (0, _computePredicates.excludeElementKindOrTag)(ctx, expr);
+        ctx = isInclude ? includeElementKindOrTag(ctx, expr) : excludeElementKindOrTag(ctx, expr);
         continue;
       }
       if (Expr.isElementRef(expr)) {
-        ctx = isInclude ? (0, _computePredicates.includeElementRef)(ctx, expr) : (0, _computePredicates.excludeElementRef)(ctx, expr);
+        ctx = isInclude ? includeElementRef(ctx, expr) : excludeElementRef(ctx, expr);
         continue;
       }
       if (Expr.isWildcard(expr)) {
-        ctx = isInclude ? (0, _computePredicates.includeWildcardRef)(ctx, expr) : (0, _computePredicates.excludeWildcardRef)(ctx, expr);
+        ctx = isInclude ? includeWildcardRef(ctx, expr) : excludeWildcardRef(ctx, expr);
         continue;
       }
       if (Expr.isIncoming(expr)) {
-        ctx = isInclude ? (0, _computePredicates.includeIncomingExpr)(ctx, expr) : (0, _computePredicates.excludeIncomingExpr)(ctx, expr);
+        ctx = isInclude ? includeIncomingExpr(ctx, expr) : excludeIncomingExpr(ctx, expr);
         continue;
       }
       if (Expr.isOutgoing(expr)) {
-        ctx = isInclude ? (0, _computePredicates.includeOutgoingExpr)(ctx, expr) : (0, _computePredicates.excludeOutgoingExpr)(ctx, expr);
+        ctx = isInclude ? includeOutgoingExpr(ctx, expr) : excludeOutgoingExpr(ctx, expr);
         continue;
       }
       if (Expr.isInOut(expr)) {
-        ctx = isInclude ? (0, _computePredicates.includeInOutExpr)(ctx, expr) : (0, _computePredicates.excludeInOutExpr)(ctx, expr);
+        ctx = isInclude ? includeInOutExpr(ctx, expr) : excludeInOutExpr(ctx, expr);
         continue;
       }
       if (Expr.isRelation(expr)) {
-        ctx = isInclude ? (0, _computePredicates.includeRelationExpr)(ctx, expr) : (0, _computePredicates.excludeRelationExpr)(ctx, expr);
+        ctx = isInclude ? includeRelationExpr(ctx, expr) : excludeRelationExpr(ctx, expr);
         continue;
       }
-      (0, _errors.nonexhaustive)(expr);
+      nonexhaustive(expr);
     }
   }
-  const allElements = [...ctx.elements, ...ctx.implicits].sort(_utils.compareByFqnHierarchically).reverse();
-  const elementsWithRelations = /* @__PURE__ */new Set();
-  const edgeBuilder = new _EdgeBuilder.EdgeBuilder();
-  const anscestorOf = id => e => e.id === id || (0, _utils.isAncestor)(e.id, id);
+  const allElements = [...ctx.elements, ...ctx.implicits].sort(compareByFqnHierarchically).reverse();
+  const elementsWithRelations = /* @__PURE__ */ new Set();
+  const edgeBuilder = new EdgeBuilder();
+  const anscestorOf = (id) => (e) => e.id === id || isAncestor(e.id, id);
   const sortedRelations = [...ctx.relations];
   for (const rel of sortedRelations) {
-    const source = (0, _remeda.find)(allElements, anscestorOf(rel.source));
+    const source = find(allElements, anscestorOf(rel.source));
     if (!source) {
       continue;
     }
-    const target = (0, _remeda.find)(allElements, (0, _remeda.allPass)([anscestorOf(rel.target), e => !(0, _utils.isSameHierarchy)(e, source)]));
+    const target = find(
+      allElements,
+      allPass([anscestorOf(rel.target), (e) => !isSameHierarchy(e, source)])
+    );
     if (!target) {
       continue;
     }
@@ -112,28 +119,29 @@ function computeElementView(view, index) {
     elementsWithRelations.add(target);
     edgeBuilder.add(source.id, target.id, rel);
   }
-  const elements = /* @__PURE__ */new Set([...ctx.elements, ...elementsWithRelations]);
+  const elements = /* @__PURE__ */ new Set([...ctx.elements, ...elementsWithRelations]);
   const nodesMap = reduceToMap(elements);
-  const edges = edgeBuilder.build().map(edge => {
+  const edges = edgeBuilder.build().map((edge) => {
     while (edge.parent) {
       if (nodesMap.has(edge.parent)) {
         break;
       }
-      edge.parent = (0, _utils.parentFqn)(edge.parent);
+      edge.parent = parentFqn(edge.parent);
     }
-    (0, _errors.nonNullable)(nodesMap.get(edge.source)).outEdges.push(edge.id);
-    (0, _errors.nonNullable)(nodesMap.get(edge.target)).inEdges.push(edge.id);
+    nonNullable(nodesMap.get(edge.source)).outEdges.push(edge.id);
+    nonNullable(nodesMap.get(edge.target)).inEdges.push(edge.id);
     return edge;
   });
-  const nodes = (0, _applyViewRuleStyles.applyViewRuleStyles)(view.rules.filter(_view.isViewRuleStyle), (0, _sortNodes.sortNodes)(nodesMap, edges)
-  // map(e => nodesMap.get(e.id)!, Array.from(elements))
+  const nodes = applyViewRuleStyles(
+    view.rules.filter(isViewRuleStyle),
+    sortNodes(nodesMap, edges)
+    // map(e => nodesMap.get(e.id)!, Array.from(elements))
   );
-
-  const autoLayoutRule = view.rules.find(_view.isViewRuleAutoLayout);
+  const autoLayoutRule = view.rules.find(isViewRuleAutoLayout);
   return {
     ...view,
     autoLayout: autoLayoutRule?.autoLayout ?? "TB",
     nodes,
     edges
   };
-}
+}