@likec4/core 1.19.2 → 1.20.1

package/dist/builder/index.d.mts

@@ -1,6 +1,6 @@
 import { LastArrayElement, Split, Simplify, Writable, IfNever, Tagged, IsLiteral, IsStringLiteral as IsStringLiteral$1, TupleToUnion } from 'type-fest';
-import { d as LikeC4Model } from '../shared/core.2I-l5UtM.mjs';
-import { D as DeploymentElement, i as DeploymentRelation, at as ModelRelation, bs as ViewRuleStyle, aT as AutoLayoutDirection, A as CustomElementExpr, B as CustomRelationExpr, X as ExpressionV2, N as Expression, L as LikeC4View, b0 as DeploymentView, bd as ElementView, ax as RelationshipKindSpecification, g as DeploymentNodeKindSpecification, av as RelationshipArrowType, ay as RelationshipLineType, a9 as ParsedLikeC4Model } from '../shared/core.BL1oTk7-.mjs';
+import { L as LikeC4Model } from '../shared/core.jy6z2iRn.mjs';
+import { D as DeploymentElement, i as DeploymentRelation, at as ModelRelation, bs as ViewRuleStyle, aT as AutoLayoutDirection, bx as Participant, A as CustomElementExpr, B as CustomRelationExpr, X as ExpressionV2, N as Expression, L as LikeC4View, b0 as DeploymentView, bd as ElementView, ax as RelationshipKindSpecification, g as DeploymentNodeKindSpecification, av as RelationshipArrowType, ay as RelationshipLineType, a9 as ParsedLikeC4Model } from '../shared/core.Dfzrh1VA.mjs';
 import { F as Fqn, i as Element, N as NonEmptyArray, j as ElementKindSpecification, l as ElementShape, s as Color, h as BorderStyle, K as KeysOf } from '../shared/core.D74xkKkG.mjs';
 import { IsStringLiteral } from 'type-fest/source/is-literal';
 
@@ -147,7 +147,8 @@ declare namespace ViewPredicate {
     type DeploymentConnectionExpression<T extends AnyTypes> = T extends Types<any, any, any, any, any, any, any, infer F extends string> ? `${F} -> ${F}` : never;
     type WhereTag<Tag extends string> = `tag ${'is' | 'is not'} #${Tag}`;
     type WhereKind<Kind extends string> = `kind ${'is' | 'is not'} ${Kind}`;
-    type WhereEq<Types extends AnyTypes> = ViewPredicate.WhereTag<Types['Tag']> | ViewPredicate.WhereKind<Types['ElementKind']>;
+    type WhereParticipant<Types extends AnyTypes> = `${Participant}.${WhereTag<Types['Tag']> | WhereKind<Types['ElementKind']>}`;
+    type WhereEq<Types extends AnyTypes> = ViewPredicate.WhereTag<Types['Tag']> | ViewPredicate.WhereKind<Types['ElementKind']> | ViewPredicate.WhereParticipant<Types>;
     type WhereOperator<Types extends AnyTypes> = ViewPredicate.WhereEq<Types> | {
         and: NonEmptyArray<ViewPredicate.WhereOperator<Types>>;
         or?: never;

package/dist/builder/index.d.ts

@@ -1,6 +1,6 @@
 import { LastArrayElement, Split, Simplify, Writable, IfNever, Tagged, IsLiteral, IsStringLiteral as IsStringLiteral$1, TupleToUnion } from 'type-fest';
-import { d as LikeC4Model } from '../shared/core.CqXs9Frh.js';
-import { D as DeploymentElement, i as DeploymentRelation, at as ModelRelation, bs as ViewRuleStyle, aT as AutoLayoutDirection, A as CustomElementExpr, B as CustomRelationExpr, X as ExpressionV2, N as Expression, L as LikeC4View, b0 as DeploymentView, bd as ElementView, ax as RelationshipKindSpecification, g as DeploymentNodeKindSpecification, av as RelationshipArrowType, ay as RelationshipLineType, a9 as ParsedLikeC4Model } from '../shared/core.DyJ41fBO.js';
+import { L as LikeC4Model } from '../shared/core.ZWiGANIJ.js';
+import { D as DeploymentElement, i as DeploymentRelation, at as ModelRelation, bs as ViewRuleStyle, aT as AutoLayoutDirection, bx as Participant, A as CustomElementExpr, B as CustomRelationExpr, X as ExpressionV2, N as Expression, L as LikeC4View, b0 as DeploymentView, bd as ElementView, ax as RelationshipKindSpecification, g as DeploymentNodeKindSpecification, av as RelationshipArrowType, ay as RelationshipLineType, a9 as ParsedLikeC4Model } from '../shared/core.D_Gc58Gt.js';
 import { F as Fqn, i as Element, N as NonEmptyArray, j as ElementKindSpecification, l as ElementShape, s as Color, h as BorderStyle, K as KeysOf } from '../shared/core.D74xkKkG.js';
 import { IsStringLiteral } from 'type-fest/source/is-literal';
 
@@ -147,7 +147,8 @@ declare namespace ViewPredicate {
     type DeploymentConnectionExpression<T extends AnyTypes> = T extends Types<any, any, any, any, any, any, any, infer F extends string> ? `${F} -> ${F}` : never;
     type WhereTag<Tag extends string> = `tag ${'is' | 'is not'} #${Tag}`;
     type WhereKind<Kind extends string> = `kind ${'is' | 'is not'} ${Kind}`;
-    type WhereEq<Types extends AnyTypes> = ViewPredicate.WhereTag<Types['Tag']> | ViewPredicate.WhereKind<Types['ElementKind']>;
+    type WhereParticipant<Types extends AnyTypes> = `${Participant}.${WhereTag<Types['Tag']> | WhereKind<Types['ElementKind']>}`;
+    type WhereEq<Types extends AnyTypes> = ViewPredicate.WhereTag<Types['Tag']> | ViewPredicate.WhereKind<Types['ElementKind']> | ViewPredicate.WhereParticipant<Types>;
     type WhereOperator<Types extends AnyTypes> = ViewPredicate.WhereEq<Types> | {
         and: NonEmptyArray<ViewPredicate.WhereOperator<Types>>;
         or?: never;

package/dist/builder/{index.js → index.mjs}

@@ -1,7 +1,7 @@
-import { l, L as LikeC4Model, i, d } from '../shared/index.KOeaSlL8.js';
-import { t, m, p as parentFqn, a as isSameHierarchy, n as nameFromFqn, i as i$1, l as l$1, b as t$1 } from '../shared/object_hash.CE_oF3I3.js';
-import { b as isElementPredicateExpr, o, c as isScopedElementView, D as DeploymentElement, n as n$1, d as DefaultThemeColor, e as DefaultElementShape } from '../shared/view.DrmaOfjr.js';
-import { u, i as invariant } from '../shared/chunk-RAAYCPUM.M-JWF7SS.js';
+import { l, L as LikeC4Model, i, d } from '../shared/core.CqCTxzMY.mjs';
+import { b as t, m, p as parentFqn, c as isSameHierarchy, n as nameFromFqn, a as i$1, l as l$1, d as t$1 } from '../shared/core.BxvDITEI.mjs';
+import { b as isElementPredicateExpr, o, c as isScopedElementView, D as DeploymentElement, n as n$1, d as DefaultThemeColor, e as DefaultElementShape } from '../shared/core.DunIMHRf.mjs';
+import { u, i as invariant } from '../shared/core.M-JWF7SS.mjs';
 
 function n(...r){return u(Object.fromEntries,r)}
 
@@ -89,6 +89,16 @@ function parseWhere(where) {
             eq: op.replace("kind is ", "")
           }
         };
+      case op.startsWith("source."):
+        return {
+          operator: parseWhere(op.replace("source.", "")),
+          participant: "source"
+        };
+      case op.startsWith("target."):
+        return {
+          operator: parseWhere(op.replace("target.", "")),
+          participant: "target"
+        };
       default:
         throw new Error(`Unknown where operator: ${where}`);
     }

package/dist/compute-view/index.cjs

@@ -0,0 +1,86 @@
+'use strict';
+
+const model_index = require('../shared/core.BGus30EM.cjs');
+const compute = require('../shared/core.gv1bMwCC.cjs');
+const view = require('../shared/core.B2QYWlYe.cjs');
+const object_hash = require('../shared/core.C9DCnJh8.cjs');
+const chunkRAAYCPUM = require('../shared/core.DsoCu540.cjs');
+
+function y(...t){return chunkRAAYCPUM.u(f,t)}function f(t,e){if(!object_hash.i(e,1))return {...t};if(!object_hash.i(e,2)){let{[e[0]]:r,...m}=t;return m}let o={...t};for(let r of e)delete o[r];return o}
+
+function resolveRulesExtendedViews(unresolvedViews) {
+  const g = new model_index.Graph({
+    type: "directed"
+  });
+  const extendedViews = [];
+  for (const view$1 of model_index.r(unresolvedViews)) {
+    g.addNode(view$1.id, { view: view$1 });
+    if (view.isExtendsElementView(view$1)) {
+      extendedViews.push(view$1);
+    }
+  }
+  if (extendedViews.length === 0) {
+    return unresolvedViews;
+  }
+  for (const view of extendedViews) {
+    if (!g.hasNode(view.extends)) {
+      console.warn(`View "${view.id}" extends from "${view.extends}" which does not exist`);
+      continue;
+    }
+    if (model_index.willCreateCycle(g, view.id, view.extends)) {
+      console.warn(`View "${view.id}" extends from "${view.extends}" which creates a cycle`);
+      continue;
+    }
+    g.addDirectedEdge(view.id, view.extends);
+  }
+  const sorted = model_index.topologicalSortExports.topologicalSort(g).reverse();
+  return sorted.reduce((acc, id) => {
+    const view$1 = g.getNodeAttribute(id, "view");
+    if (!view.isExtendsElementView(view$1)) {
+      acc[view$1.id] = view$1;
+      return acc;
+    }
+    const extendsFrom = acc[view$1.extends];
+    if (!extendsFrom || !view.isElementView(extendsFrom)) {
+      return acc;
+    }
+    acc[view$1.id] = {
+      ...extendsFrom,
+      ...view$1,
+      rules: [...extendsFrom.rules, ...view$1.rules]
+    };
+    return acc;
+  }, {});
+}
+
+function withReadableEdges({ edges, nodes, ...view }, separator = ":") {
+  const edgeids = model_index.l(edges, (e) => [e.id, `${e.source}${separator}${e.target}`]);
+  return {
+    ...view,
+    edges: edges.map((e) => ({
+      ...e,
+      id: edgeids[e.id]
+    })),
+    nodes: nodes.map((n) => ({
+      ...n,
+      inEdges: object_hash.m(n.inEdges, (e) => edgeids[e]),
+      outEdges: object_hash.m(n.outEdges, (e) => edgeids[e])
+    })),
+    nodeIds: nodes.map((n) => n.id),
+    edgeIds: edges.map((e) => edgeids[e.id])
+  };
+}
+function viewsWithReadableEdges({ views, ...model }) {
+  return {
+    ...model,
+    views: model_index.i(views, (v) => y(withReadableEdges(v), ["nodeIds", "edgeIds"]))
+  };
+}
+
+exports.computeView = model_index.computeView;
+exports.computeViews = model_index.computeViews;
+exports.unsafeComputeView = model_index.unsafeComputeView;
+exports.computeRelationshipsView = compute.computeRelationshipsView;
+exports.resolveRulesExtendedViews = resolveRulesExtendedViews;
+exports.viewsWithReadableEdges = viewsWithReadableEdges;
+exports.withReadableEdges = withReadableEdges;

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

@@ -0,0 +1,23 @@
+export { C as ComputeViewResult, c as computeView, a as computeViews, u as unsafeComputeView } from '../shared/core.BdbFkE_p.cjs';
+export { c as computeRelationshipsView } from '../shared/core.BvdNMbcA.cjs';
+import { L as LikeC4View, C as ComputedView, a as ComputedLikeC4Model } from '../shared/core.B72vUaNB.cjs';
+import 'type-fest';
+import '../shared/core.D74xkKkG.cjs';
+
+/**
+ * Resolve rules of extended views
+ * (Removes invalid views)
+ */
+declare function resolveRulesExtendedViews<V extends Record<any, LikeC4View>>(unresolvedViews: V): V;
+
+/**
+ * Convert hashed edge ids to human-readable
+ * Mostly for testing purposes
+ */
+declare function withReadableEdges<T extends ComputedView>({ edges, nodes, ...view }: T, separator?: string): T & {
+    nodeIds: string[];
+    edgeIds: string[];
+};
+declare function viewsWithReadableEdges<M extends ComputedLikeC4Model>({ views, ...model }: M): M;
+
+export { resolveRulesExtendedViews, viewsWithReadableEdges, withReadableEdges };

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

@@ -1,5 +1,6 @@
-export { C as ComputeViewResult, c as computeView, a as computeViews, u as unsafeComputeView } from '../shared/core.2I-l5UtM.mjs';
-import { L as LikeC4View, C as ComputedView, a as ComputedLikeC4Model } from '../shared/core.BL1oTk7-.mjs';
+export { C as ComputeViewResult, c as computeView, a as computeViews, u as unsafeComputeView } from '../shared/core.jy6z2iRn.mjs';
+export { c as computeRelationshipsView } from '../shared/core.BRuJ3Wzf.mjs';
+import { L as LikeC4View, C as ComputedView, a as ComputedLikeC4Model } from '../shared/core.Dfzrh1VA.mjs';
 import 'type-fest';
 import '../shared/core.D74xkKkG.mjs';
 

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

@@ -1,5 +1,6 @@
-export { C as ComputeViewResult, c as computeView, a as computeViews, u as unsafeComputeView } from '../shared/core.CqXs9Frh.js';
-import { L as LikeC4View, C as ComputedView, a as ComputedLikeC4Model } from '../shared/core.DyJ41fBO.js';
+export { C as ComputeViewResult, c as computeView, a as computeViews, u as unsafeComputeView } from '../shared/core.ZWiGANIJ.js';
+export { c as computeRelationshipsView } from '../shared/core.Damrzla-.js';
+import { L as LikeC4View, C as ComputedView, a as ComputedLikeC4Model } from '../shared/core.D_Gc58Gt.js';
 import 'type-fest';
 import '../shared/core.D74xkKkG.js';
 

package/dist/compute-view/{index.js → index.mjs}

@@ -1,8 +1,9 @@
-import { G as Graph, r, w as willCreateCycle, t as topologicalSortExports, l, i as i$1 } from '../shared/index.KOeaSlL8.js';
-export { c as computeView, a as computeViews, u as unsafeComputeView } from '../shared/index.KOeaSlL8.js';
-import { i as isExtendsElementView, a as isElementView } from '../shared/view.DrmaOfjr.js';
-import { i, m } from '../shared/object_hash.CE_oF3I3.js';
-import { u } from '../shared/chunk-RAAYCPUM.M-JWF7SS.js';
+import { G as Graph, r, w as willCreateCycle, t as topologicalSortExports, l, i as i$1 } from '../shared/core.CqCTxzMY.mjs';
+export { c as computeView, a as computeViews, u as unsafeComputeView } from '../shared/core.CqCTxzMY.mjs';
+export { c as computeRelationshipsView } from '../shared/core.m3rCQAv6.mjs';
+import { i as isExtendsElementView, a as isElementView } from '../shared/core.DunIMHRf.mjs';
+import { a as i, m } from '../shared/core.BxvDITEI.mjs';
+import { u } from '../shared/core.M-JWF7SS.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}