@likec4/core 0.7.0 → 0.18.0

package/dist/types/diagram.d.ts

@@ -24,5 +24,11 @@ export interface DiagramEdge extends ComputedEdge {
 export interface DiagramView extends ComputedView<DiagramNode, DiagramEdge> {
     width: number;
     height: number;
+    boundingBox: {
+        x: number;
+        y: number;
+        width: number;
+        height: number;
+    };
 }
 //# sourceMappingURL=diagram.d.ts.map

package/dist/types/element.d.ts

@@ -2,8 +2,8 @@ import type { Opaque } from './opaque';
 export type Fqn = Opaque<string, 'Fqn'>;
 export declare function Fqn(name: string, parent?: Fqn | null): Fqn;
 export type ElementKind = Opaque<string, 'ElementKind'>;
-export type ThemeColor = 'primary' | 'secondary' | 'muted';
-export type ElementShape = 'rectangle' | 'person' | 'browser' | 'cylinder' | 'storage' | 'queue';
+export type ThemeColor = 'amber' | 'blue' | 'gray' | 'slate' | 'green' | 'indigo' | 'muted' | 'primary' | 'red' | 'secondary' | 'sky';
+export type ElementShape = 'rectangle' | 'person' | 'browser' | 'mobile' | 'cylinder' | 'storage' | 'queue';
 export declare const DefaultThemeColor: ThemeColor;
 export declare const DefaultElementShape: ElementShape;
 export interface ElementStyle {

package/dist/utils/compute-node-levels.d.ts

@@ -0,0 +1,8 @@
+import type { ComputedView } from '../types/computed-view';
+type NodeLevelDepth = {
+    level: number;
+    depth: number;
+};
+export declare const computeNodeLevels: ({ nodes }: ComputedView) => Record<import("..").Fqn, NodeLevelDepth>;
+export {};
+//# sourceMappingURL=compute-node-levels.d.ts.map

package/dist/utils/compute-node-levels.js

@@ -0,0 +1,31 @@
+import invariant from 'tiny-invariant';
+export const computeNodeLevels = ({ nodes }) => {
+    const nodeLevels = {};
+    const compute = (node, level) => {
+        let levels = nodeLevels[node.id];
+        if (levels) {
+            return levels;
+        }
+        if (node.children.length === 0) {
+            levels = { level, depth: 0 };
+            nodeLevels[node.id] = levels;
+            return levels;
+        }
+        let depth = 1;
+        for (const childId of node.children) {
+            const child = nodes.find(n => n.id === childId);
+            invariant(child, `Child ${childId} not found`);
+            const { depth: childDepth } = compute(child, level + 1);
+            depth = Math.max(childDepth + 1, depth);
+        }
+        levels = { level, depth };
+        nodeLevels[node.id] = levels;
+        return levels;
+    };
+    for (const node of nodes) {
+        if (!node.parent) {
+            compute(node, 0);
+        }
+    }
+    return nodeLevels;
+};

package/dist/utils/fqn.d.ts

@@ -2,6 +2,8 @@ import type { Element, Fqn } from '../types';
 export declare function nameFromFqn(fqn: Fqn): string;
 export declare function isAncestor(...args: [ancestor: Fqn, another: Fqn] | [ancestor: Element, another: Element]): boolean;
 export declare function isSameHierarchy(...args: [one: Fqn, another: Fqn] | [one: Element, another: Element]): boolean;
+export declare function isDescendantOf(ancestors: Element[]): (e: Element) => boolean;
+export declare function notDescendantOf(ancestors: Element[]): (e: Element) => boolean;
 export declare function commonAncestor(first: Fqn, second: Fqn): Fqn | null;
 export declare function parentFqn(fqn: Fqn): Fqn | null;
 export declare const compareFqnHierarchically: (a: string, b: string) => number;

package/dist/utils/fqn.js

@@ -1,3 +1,4 @@
+import { anyPass } from 'rambdax';
 import { isString } from './guards';
 export function nameFromFqn(fqn) {
     const lastDot = fqn.lastIndexOf('.');
@@ -18,7 +19,26 @@ export function isSameHierarchy(...args) {
     const another = isString(args[1]) ? args[1] : args[1].id;
     return one === another || another.startsWith(one + '.') || one.startsWith(another + '.');
 }
+export function isDescendantOf(ancestors) {
+    const predicates = ancestors.flatMap(a => [
+        (e) => e.id === a.id,
+        (e) => isAncestor(a, e)
+    ]);
+    return anyPass(predicates);
+}
+export function notDescendantOf(ancestors) {
+    const isDescendant = isDescendantOf(ancestors);
+    return (e) => !isDescendant(e);
+}
 export function commonAncestor(first, second) {
+    const parentA = parentFqn(first);
+    const parentB = parentFqn(second);
+    if (parentA === parentB) {
+        return parentA;
+    }
+    if (!parentA || !parentB) {
+        return null;
+    }
     const a = first.split('.');
     const b = second.split('.');
     let ancestor = null;
@@ -40,7 +60,8 @@ export const compareFqnHierarchically = (a, b) => {
     const depthA = a.split('.').length;
     const depthB = b.split('.').length;
     if (depthA === depthB) {
-        return a.localeCompare(b);
+        // return a.localeCompare(b)
+        return 0;
     }
     else {
         return depthA - depthB;

package/dist/utils/index.d.ts

@@ -1,4 +1,5 @@
 export * from './fqn';
 export * from './guards';
+export * from './compute-node-levels';
 export * as Relations from './relations';
 //# sourceMappingURL=index.d.ts.map

package/dist/utils/index.js

@@ -1,3 +1,4 @@
 export * from './fqn';
 export * from './guards';
+export * from './compute-node-levels';
 export * as Relations from './relations';

package/dist/utils/relations.d.ts

@@ -1,4 +1,4 @@
-import type { Fqn } from '../types';
+import type { Fqn, Element } from '../types';
 type Relation = {
     source: Fqn;
     target: Fqn;
@@ -13,5 +13,6 @@ export declare const isAnyBetween: (source: Fqn, target: Fqn) => import("rambdax
 export declare const isIncoming: (target: Fqn) => (rel: Relation) => boolean;
 export declare const isOutgoing: (source: Fqn) => (rel: Relation) => boolean;
 export declare const isAnyInOut: (source: Fqn) => import("rambdax").Predicate<Relation>;
+export declare const hasRelation: (rel: Relation) => (element: Element) => boolean;
 export {};
 //# sourceMappingURL=relations.d.ts.map

package/dist/utils/relations.js

@@ -1,5 +1,5 @@
 import { either } from 'rambdax';
-import { compareFqnHierarchically } from './fqn';
+import { compareFqnHierarchically, isAncestor } from './fqn';
 export const compareRelations = (a, b) => {
     return (compareFqnHierarchically(a.source, b.source) || compareFqnHierarchically(a.target, b.target));
 };
@@ -13,7 +13,8 @@ export const isBetween = (source, target) => {
     const sourcePrefix = source + '.';
     const targetPrefix = target + '.';
     return (rel) => {
-        return ((rel.source + '.').startsWith(sourcePrefix) && (rel.target + '.').startsWith(targetPrefix));
+        return ((rel.source === source || (rel.source + '.').startsWith(sourcePrefix)) &&
+            (rel.target === target || (rel.target + '.').startsWith(targetPrefix)));
     };
 };
 export const isAnyBetween = (source, target) => {
@@ -22,15 +23,20 @@ export const isAnyBetween = (source, target) => {
 export const isIncoming = (target) => {
     const targetPrefix = target + '.';
     return (rel) => {
-        return (!(rel.source + '.').startsWith(targetPrefix) && (rel.target + '.').startsWith(targetPrefix));
+        return (!(rel.source + '.').startsWith(targetPrefix) && (rel.target === target || (rel.target + '.').startsWith(targetPrefix)));
     };
 };
 export const isOutgoing = (source) => {
     const sourcePrefix = source + '.';
     return (rel) => {
-        return ((rel.source + '.').startsWith(sourcePrefix) && !(rel.target + '.').startsWith(sourcePrefix));
+        return ((rel.source === source || (rel.source + '.').startsWith(sourcePrefix)) && !(rel.target + '.').startsWith(sourcePrefix));
     };
 };
 export const isAnyInOut = (source) => {
     return either(isIncoming(source), isOutgoing(source));
 };
+export const hasRelation = (rel) => {
+    return (element) => {
+        return isAncestor(rel.source, element.id) || isAncestor(rel.target, element.id);
+    };
+};

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@likec4/core",
-  "version": "0.7.0",
+  "version": "0.18.0",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
   "author": "Denis Davydkov <denis@davydkov.com>",
   "files": [
     "dist",
-    "!**/*.spec.js",
-    "!**/*.spec.d.ts",
+    "!dist/__test__",
+    "!**/*.spec.*",
     "!**/*.map"
   ],
   "repository": {
@@ -21,11 +21,11 @@
     "build": "tsc",
     "dev": "tsc --watch",
     "lint": "run -T eslint src/ --fix",
-    "test": "vitest run",
-    "test:watch": "vitest",
+    "test": "run -T vitest run",
+    "test:watch": "run -T vitest",
     "clean": "run -T rimraf dist"
   },
-  "main": "./dist/index.js",
+  "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "type": "module",
   "exports": {
@@ -39,6 +39,11 @@
       "import": "./dist/types/index.js",
       "default": "./dist/types/index.js"
     },
+    "./colors": {
+      "types": "./dist/colors.d.ts",
+      "import": "./dist/colors.js",
+      "default": "./dist/colors.js"
+    },
     "./utils": {
       "types": "./dist/utils/index.d.ts",
       "import": "./dist/utils/index.js",
@@ -54,7 +59,7 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org",
     "access": "public",
-    "main": "./dist/index.js",
+    "module": "./dist/index.js",
     "types": "./dist/index.d.ts",
     "exports": {
       ".": {
@@ -67,6 +72,11 @@
         "import": "./dist/types/index.js",
         "default": "./dist/types/index.js"
       },
+      "./colors": {
+        "types": "./dist/colors.d.ts",
+        "import": "./dist/colors.js",
+        "default": "./dist/colors.js"
+      },
       "./utils": {
         "types": "./dist/utils/index.d.ts",
         "import": "./dist/utils/index.js",
@@ -85,8 +95,6 @@
     "tiny-invariant": "^1.3.1"
   },
   "devDependencies": {
-    "typescript": "^5.0.4",
-    "vite": "^4.3.3",
-    "vitest": "^0.31.0"
+    "typescript": "^5.1.3"
   }
 }

package/dist/__test__/data.d.ts

@@ -1,174 +0,0 @@
-import { ModelIndex } from '../model-index';
-import type { ElementKind, ElementView, Fqn, RelationID } from '../types';
-/**
-              ┌──────────────────────────────────────────────────┐
-              │                      cloud                       │
-              │  ┌───────────────────────────────────────────┐   │
-              │  │                 frontend                  │   │
-┏━━━━━━━━━━┓  │  │   ┏━━━━━━━━━━━━━┓   ┏━━━━━━━━━━━━━━━━┓    │   │   ┏━━━━━━━━━━━┓
-┃          ┃  │  │   ┃             ┃   ┃                ┃    │   │   ┃           ┃
-┃ customer ┃──┼──┼──▶┃  dashboard  ┃   ┃   adminpanel   ┃◀───┼───┼───┃  support  ┃
-┃          ┃  │  │   ┃             ┃   ┃                ┃    │   │   ┃           ┃
-┗━━━━━━━━━━┛  │  │   ┗━━━━━━┳━━━━━━┛   ┗━━━━━━━━┳━━━━━━━┛    │   │   ┗━━━━━━━━━━━┛
-              │  └──────────┼───────────────────┼────────────┘   │
-              │             ├───────────────────┘                │
-              │             │                                    │
-              │  ┌──────────┼────────────────────────────────┐   │
-              │  │          ▼       backend                  │   │
-              │  │   ┏━━━━━━━━━━━━━┓       ┏━━━━━━━━━━━━━┓   │   │
-              │  │   ┃             ┃       ┃             ┃   │   │
-              │  │   ┃  graphlql   ┃──────▶┃   storage   ┃   │   │
-              │  │   ┃             ┃       ┃             ┃   │   │
-              │  │   ┗━━━━━━━━━━━━━┛       ┗━━━━━━┳━━━━━━┛   │   │
-              │  └────────────────────────────────┼──────────┘   │
-              └───────────────────────────────────┼──────────────┘
-                                                  │
-                                        ┌─────────┼─────────┐
-                                        │ amazon  │         │
-                                        │         ▼         │
-                                        │ ┏━━━━━━━━━━━━━━┓  │
-                                        │ ┃              ┃  │
-                                        │ ┃      s3      ┃  │
-                                        │ ┃              ┃  │
-                                        │ ┗━━━━━━━━━━━━━━┛  │
-                                        └───────────────────┘
-
-specification {
-  element actor
-  element system
-  element component
-}
-
-model {
-
-  actor customer
-  actor support
-
-  system cloud {
-    component backend {
-      component graphql
-      component storage
-
-      graphql -> storage
-    }
-
-    component frontend {
-      component dashboard {
-        -> graphql
-      }
-      component adminPanel {
-        -> graphql
-      }
-    }
-  }
-
-  customer -> dashboard
-  support -> adminPanel
-
-  system amazon {
-    component s3
-
-    cloud.backend.storage -> s3
-  }
-
-}
-
- */
-export declare const fakeElements: {
-    amazon: {
-        id: Fqn;
-        kind: ElementKind;
-        title: string;
-    };
-    cloud: {
-        id: Fqn;
-        kind: ElementKind;
-        title: string;
-    };
-    customer: {
-        id: Fqn;
-        kind: ElementKind;
-        title: string;
-    };
-    support: {
-        id: Fqn;
-        kind: ElementKind;
-        title: string;
-    };
-    'amazon.s3': {
-        id: Fqn;
-        kind: ElementKind;
-        title: string;
-    };
-    'cloud.backend': {
-        id: Fqn;
-        kind: ElementKind;
-        title: string;
-    };
-    'cloud.frontend': {
-        id: Fqn;
-        kind: ElementKind;
-        title: string;
-    };
-    'cloud.backend.graphql': {
-        id: Fqn;
-        kind: ElementKind;
-        title: string;
-    };
-    'cloud.backend.storage': {
-        id: Fqn;
-        kind: ElementKind;
-        title: string;
-    };
-    'cloud.frontend.adminPanel': {
-        id: Fqn;
-        kind: ElementKind;
-        title: string;
-    };
-    'cloud.frontend.dashboard': {
-        id: Fqn;
-        kind: ElementKind;
-        title: string;
-    };
-};
-export declare const fakeRelations: {
-    'customer:cloud.frontend.dashboard': {
-        id: RelationID;
-        source: Fqn;
-        target: Fqn;
-        title: string;
-    };
-    'support:cloud.frontend.adminPanel': {
-        id: RelationID;
-        source: Fqn;
-        target: Fqn;
-        title: string;
-    };
-    'cloud.backend.storage:amazon.s3': {
-        id: RelationID;
-        source: Fqn;
-        target: Fqn;
-        title: string;
-    };
-    'cloud.backend.graphql:cloud.backend.storage': {
-        id: RelationID;
-        source: Fqn;
-        target: Fqn;
-        title: string;
-    };
-    'cloud.frontend.dashboard:cloud.backend.graphql': {
-        id: RelationID;
-        source: Fqn;
-        target: Fqn;
-        title: string;
-    };
-    'cloud.frontend.adminPanel:cloud.backend.graphql': {
-        id: RelationID;
-        source: Fqn;
-        target: Fqn;
-        title: string;
-    };
-};
-export declare const fakeElementView: ElementView;
-export declare const fakeModel: () => ModelIndex;
-//# sourceMappingURL=data.d.ts.map

package/dist/__test__/data.js

@@ -1,188 +0,0 @@
-import { ModelIndex } from '../model-index';
-/**
-              ┌──────────────────────────────────────────────────┐
-              │                      cloud                       │
-              │  ┌───────────────────────────────────────────┐   │
-              │  │                 frontend                  │   │
-┏━━━━━━━━━━┓  │  │   ┏━━━━━━━━━━━━━┓   ┏━━━━━━━━━━━━━━━━┓    │   │   ┏━━━━━━━━━━━┓
-┃          ┃  │  │   ┃             ┃   ┃                ┃    │   │   ┃           ┃
-┃ customer ┃──┼──┼──▶┃  dashboard  ┃   ┃   adminpanel   ┃◀───┼───┼───┃  support  ┃
-┃          ┃  │  │   ┃             ┃   ┃                ┃    │   │   ┃           ┃
-┗━━━━━━━━━━┛  │  │   ┗━━━━━━┳━━━━━━┛   ┗━━━━━━━━┳━━━━━━━┛    │   │   ┗━━━━━━━━━━━┛
-              │  └──────────┼───────────────────┼────────────┘   │
-              │             ├───────────────────┘                │
-              │             │                                    │
-              │  ┌──────────┼────────────────────────────────┐   │
-              │  │          ▼       backend                  │   │
-              │  │   ┏━━━━━━━━━━━━━┓       ┏━━━━━━━━━━━━━┓   │   │
-              │  │   ┃             ┃       ┃             ┃   │   │
-              │  │   ┃  graphlql   ┃──────▶┃   storage   ┃   │   │
-              │  │   ┃             ┃       ┃             ┃   │   │
-              │  │   ┗━━━━━━━━━━━━━┛       ┗━━━━━━┳━━━━━━┛   │   │
-              │  └────────────────────────────────┼──────────┘   │
-              └───────────────────────────────────┼──────────────┘
-                                                  │
-                                        ┌─────────┼─────────┐
-                                        │ amazon  │         │
-                                        │         ▼         │
-                                        │ ┏━━━━━━━━━━━━━━┓  │
-                                        │ ┃              ┃  │
-                                        │ ┃      s3      ┃  │
-                                        │ ┃              ┃  │
-                                        │ ┗━━━━━━━━━━━━━━┛  │
-                                        └───────────────────┘
-
-specification {
-  element actor
-  element system
-  element component
-}
-
-model {
-
-  actor customer
-  actor support
-
-  system cloud {
-    component backend {
-      component graphql
-      component storage
-
-      graphql -> storage
-    }
-
-    component frontend {
-      component dashboard {
-        -> graphql
-      }
-      component adminPanel {
-        -> graphql
-      }
-    }
-  }
-
-  customer -> dashboard
-  support -> adminPanel
-
-  system amazon {
-    component s3
-
-    cloud.backend.storage -> s3
-  }
-
-}
-
- */
-export const fakeElements = {
-    amazon: {
-        id: 'amazon',
-        kind: 'system',
-        title: 'amazon'
-    },
-    cloud: {
-        id: 'cloud',
-        kind: 'system',
-        title: 'cloud'
-    },
-    customer: {
-        id: 'customer',
-        kind: 'actor',
-        title: 'customer'
-    },
-    support: {
-        id: 'support',
-        kind: 'actor',
-        title: 'support'
-    },
-    'amazon.s3': {
-        id: 'amazon.s3',
-        kind: 'component',
-        title: 's3'
-    },
-    'cloud.backend': {
-        id: 'cloud.backend',
-        kind: 'component',
-        title: 'backend'
-    },
-    'cloud.frontend': {
-        id: 'cloud.frontend',
-        kind: 'component',
-        title: 'frontend'
-    },
-    'cloud.backend.graphql': {
-        id: 'cloud.backend.graphql',
-        kind: 'component',
-        title: 'graphql'
-    },
-    'cloud.backend.storage': {
-        id: 'cloud.backend.storage',
-        kind: 'component',
-        title: 'storage'
-    },
-    'cloud.frontend.adminPanel': {
-        id: 'cloud.frontend.adminPanel',
-        kind: 'component',
-        title: 'adminPanel'
-    },
-    'cloud.frontend.dashboard': {
-        id: 'cloud.frontend.dashboard',
-        kind: 'component',
-        title: 'dashboard'
-    }
-};
-export const fakeRelations = {
-    'customer:cloud.frontend.dashboard': {
-        id: 'customer:cloud.frontend.dashboard',
-        source: 'customer',
-        target: 'cloud.frontend.dashboard',
-        title: ''
-    },
-    'support:cloud.frontend.adminPanel': {
-        id: 'support:cloud.frontend.adminPanel',
-        source: 'support',
-        target: 'cloud.frontend.adminPanel',
-        title: ''
-    },
-    'cloud.backend.storage:amazon.s3': {
-        id: 'cloud.backend.storage:amazon.s3',
-        source: 'cloud.backend.storage',
-        target: 'amazon.s3',
-        title: ''
-    },
-    'cloud.backend.graphql:cloud.backend.storage': {
-        id: 'cloud.backend.graphql:cloud.backend.storage',
-        source: 'cloud.backend.graphql',
-        target: 'cloud.backend.storage',
-        title: ''
-    },
-    'cloud.frontend.dashboard:cloud.backend.graphql': {
-        id: 'cloud.frontend.dashboard:cloud.backend.graphql',
-        source: 'cloud.frontend.dashboard',
-        target: 'cloud.backend.graphql',
-        title: ''
-    },
-    'cloud.frontend.adminPanel:cloud.backend.graphql': {
-        id: 'cloud.frontend.adminPanel:cloud.backend.graphql',
-        source: 'cloud.frontend.adminPanel',
-        target: 'cloud.backend.graphql',
-        title: ''
-    }
-};
-export const fakeElementView = {
-    id: 'fakeView',
-    title: '',
-    viewOf: 'cloud',
-    rules: [
-        {
-            isInclude: true,
-            exprs: [{ wildcard: true }]
-        }
-    ]
-};
-export const fakeModel = () => ModelIndex.from({
-    elements: fakeElements,
-    relations: fakeRelations,
-    views: {
-        [fakeElementView.id]: fakeElementView
-    }
-});

package/dist/__test__/index.d.ts

@@ -1,2 +0,0 @@
-export * from './data';
-//# sourceMappingURL=index.d.ts.map

package/dist/__test__/index.js

@@ -1 +0,0 @@
-export * from './data';

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

@@ -1,5 +0,0 @@
-import type { ModelIndex } from '../model-index';
-import { type ElementView } from '../types';
-import type { ComputedView } from '../types/computed-view';
-export declare function computeElementView(view: ElementView, index: ModelIndex): ComputedView;
-//# sourceMappingURL=compute.element-view.d.ts.map