@likec4/core 0.4.0 → 0.6.0

package/dist/compute-view/EdgeBuilder.js

@@ -12,7 +12,8 @@ export class EdgeBuilder {
         return this;
     }
     build() {
-        return keys(this._relationsObj).flatMap(source => {
+        return keys(this._relationsObj)
+            .flatMap(source => {
             const targets = this._relationsObj[source] ?? {};
             return keys(targets).map(target => {
                 const relations = (targets[target] ?? []).sort(compareRelations);
@@ -26,6 +27,8 @@ export class EdgeBuilder {
                     relations: pluck('id', relations)
                 };
             });
-        }).sort(compareRelations).reverse();
+        })
+            .sort(compareRelations)
+            .reverse();
     }
 }

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

@@ -1,4 +1,4 @@
-import { anyPass, filter } from 'rambdax';
+import { anyPass, filter, head } from 'rambdax';
 import { DefaultElementShape, DefaultThemeColor } from '../types';
 import * as Expression from '../types/expression';
 import { isViewRuleAutoLayout, isViewRuleExpression, isViewRuleStyle } from '../types/view';
@@ -12,8 +12,10 @@ function updateSetWith(set, elements, addToSet = true) {
         addToSet ? set.add(e) : set.delete(e);
     }
 }
-function transformToNodes(elementsIterator, index) {
-    return [...elementsIterator].sort(compareByFqnHierarchically).reduce((map, { id, title, color, shape, description }) => {
+function transformToNodes(elementsIterator, index, currentViewid) {
+    return [...elementsIterator]
+        .sort(compareByFqnHierarchically)
+        .reduce((map, { id, title, color, shape, description }) => {
         let parent = parentFqn(id);
         while (parent) {
             if (map.has(parent)) {
@@ -21,14 +23,14 @@ function transformToNodes(elementsIterator, index) {
             }
             parent = parentFqn(parent);
         }
-        const navigateTo = index.defaultViewOf(id);
+        const navigateTo = head(index.defaultViewOf(id).filter(v => v !== currentViewid));
         map.set(id, Object.assign({
             id,
             parent,
             title,
             color: color ?? DefaultThemeColor,
             shape: shape ?? DefaultElementShape,
-            children: [],
+            children: []
         }, description ? { description } : {}, navigateTo ? { navigateTo } : {}));
         if (parent) {
             map.get(parent)?.children.push(id);
@@ -50,9 +52,7 @@ function applyViewRuleStyles(rules, nodes) {
             }
             if (Expression.isElementRef(target)) {
                 const { element, isDescedants } = target;
-                predicates.push(isDescedants
-                    ? (n) => n.id.startsWith(element + '.')
-                    : (n) => n.id === element);
+                predicates.push(isDescedants ? n => n.id.startsWith(element + '.') : n => n.id === element);
                 continue;
             }
             failExpectedNever(target);
@@ -79,7 +79,10 @@ export function computeElementView(view, index) {
             if (isInclude) {
                 const filters = [];
                 // When include element(s) without newNeighbours, include in-out relations
-                if (elements.size > 0 && newElements.length > 0 && newNeighbours.length === 0 && Expression.isElement(expr)) {
+                if (elements.size > 0 &&
+                    newElements.length > 0 &&
+                    newNeighbours.length === 0 &&
+                    Expression.isElement(expr)) {
                     for (const e of elements) {
                         for (const newE of newElements) {
                             if (!isSameHierarchy(e, newE)) {
@@ -144,7 +147,7 @@ export function computeElementView(view, index) {
             idx = resolvedRelations.findIndex(findPredicate);
         }
     }
-    const nodesreg = transformToNodes(elements, index);
+    const nodesreg = transformToNodes(elements, index, view.id);
     const edges = edgeBuilder.build().map(edge => {
         while (edge.parent) {
             if (nodesreg.has(edge.parent)) {

package/dist/compute-view/utils/evaluate-expression.js

@@ -54,21 +54,12 @@ const evaluateElementExpression = (index, expr, rootElement = null) => {
     // WildcardExpression
     if (Expr.isWildcard(expr)) {
         if (rootElement) {
-            elements = [
-                index.find(rootElement),
-                ...index.children(rootElement)
-            ];
+            elements = [index.find(rootElement), ...index.children(rootElement)];
             neighbours = [
                 ...index.siblings(rootElement),
-                ...index.ancestors(rootElement).flatMap(a => [
-                    ...index.siblings(a.id)
-                ])
+                ...index.ancestors(rootElement).flatMap(a => [...index.siblings(a.id)])
             ];
-            relations = index.filterRelations(anyPass([
-                isInside(rootElement),
-                isIncoming(rootElement),
-                isOutgoing(rootElement),
-            ]));
+            relations = index.filterRelations(anyPass([isInside(rootElement), isIncoming(rootElement), isOutgoing(rootElement)]));
         }
         else {
             elements = index.rootElements();
@@ -116,14 +107,8 @@ export function evaluateExpression(index, expr, rootElement) {
             const outgoing = index.filterRelations(isOutgoing(target.id));
             if (incoming.length + outgoing.length > 0) {
                 elements.push(target);
-                neighbours = neighbours.concat(map(index.find, [
-                    ...pluck('source', incoming),
-                    ...pluck('target', outgoing),
-                ]));
-                relations = relations.concat([
-                    ...incoming,
-                    ...outgoing
-                ]);
+                neighbours = neighbours.concat(map(index.find, [...pluck('source', incoming), ...pluck('target', outgoing)]));
+                relations = relations.concat([...incoming, ...outgoing]);
             }
         }
         return {

package/dist/compute-view/utils/sortNodes.js

@@ -36,7 +36,7 @@ export function sortNodes(_nodes, edges) {
     const sorted = alg.topsort(g);
     const nodes = sorted.map(id => _nodes.get(id));
     for (const node of nodes) {
-        node.children = nodes.flatMap(n => n.parent === node.id ? n.id : []);
+        node.children = nodes.flatMap(n => (n.parent === node.id ? n.id : []));
     }
     return nodes;
 }

package/dist/model-index/model-index.d.ts

@@ -25,6 +25,6 @@ export declare class ModelIndex {
     rootElements(): Element[];
     get elements(): Element[];
     addRelation(rel: Relation): void;
-    defaultViewOf: (id: Fqn) => ViewID | undefined;
+    defaultViewOf: (id: Fqn) => ViewID[];
 }
 export {};

package/dist/model-index/model-index.js

@@ -38,7 +38,9 @@ export class ModelIndex {
         }
         for (const { id, viewOf } of Object.values(views)) {
             if (viewOf) {
-                index._defaultElementView.set(viewOf, id);
+                const views = index._defaultElementView.get(viewOf) ?? [];
+                views.push(id);
+                index._defaultElementView.set(viewOf, views);
             }
         }
         return index;
@@ -136,6 +138,6 @@ export class ModelIndex {
         // }
     }
     defaultViewOf = (id) => {
-        return this._defaultElementView.get(id);
+        return this._defaultElementView.get(id) ?? [];
     };
 }

package/dist/types/diagram.d.ts

@@ -1,23 +1,25 @@
 import type { ComputedEdge, ComputedNode, ComputedView } from './computed-view';
 export type Point = [x: number, y: number];
+export interface DiagramLabel {
+    align: 'left' | 'right' | 'center';
+    fontStyle?: 'bold' | 'normal';
+    fontSize: number;
+    pt: Point;
+    width: number;
+    text: string;
+}
 export interface DiagramNode extends ComputedNode {
     size: {
         width: number;
         height: number;
     };
+    labels: DiagramLabel[];
     position: Point;
-    relative: Point;
 }
 export interface DiagramEdge extends ComputedEdge {
     points: Point[];
     headArrow?: Point[];
-    labelBox: {
-        x: number;
-        y: number;
-        width: number;
-        height?: number;
-        align?: 'left' | 'right' | 'center';
-    } | null;
+    labels: DiagramLabel[];
 }
 export interface DiagramView extends ComputedView<DiagramNode, DiagramEdge> {
     width: number;

package/dist/utils/relations.js

@@ -1,7 +1,7 @@
 import { either } from 'rambdax';
 import { compareFqnHierarchically } from './fqn';
 export const compareRelations = (a, b) => {
-    return compareFqnHierarchically(a.source, b.source) || compareFqnHierarchically(a.target, b.target);
+    return (compareFqnHierarchically(a.source, b.source) || compareFqnHierarchically(a.target, b.target));
 };
 export const isInside = (parent) => {
     const prefix = parent + '.';
@@ -13,7 +13,7 @@ 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 + '.').startsWith(sourcePrefix) && (rel.target + '.').startsWith(targetPrefix));
     };
 };
 export const isAnyBetween = (source, target) => {
@@ -22,13 +22,13 @@ 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 + '.').startsWith(targetPrefix));
     };
 };
 export const isOutgoing = (source) => {
     const sourcePrefix = source + '.';
     return (rel) => {
-        return (rel.source + '.').startsWith(sourcePrefix) && !(rel.target + '.').startsWith(sourcePrefix);
+        return ((rel.source + '.').startsWith(sourcePrefix) && !(rel.target + '.').startsWith(sourcePrefix));
     };
 };
 export const isAnyInOut = (source) => {

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@likec4/core",
-  "version": "0.4.0",
+  "version": "0.6.0",
+  "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://like-c4.dev",
   "author": "Denis Davydkov <denis@davydkov.com>",
@@ -9,7 +10,8 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/likec4/likec4.git"
+    "url": "https://github.com/likec4/likec4.git",
+    "directory": "packages/core"
   },
   "scripts": {
     "compile": "",
@@ -19,7 +21,7 @@
     "lint": "run -T eslint src/ --fix",
     "test": "vitest run",
     "test:watch": "vitest",
-    "clean": "rimraf dist"
+    "clean": "run -T rimraf dist"
   },
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -81,8 +83,8 @@
     "tiny-invariant": "^1.3.1"
   },
   "devDependencies": {
-    "typescript": "^5.0.3",
-    "vite": "^4.2.1",
+    "typescript": "^5.0.4",
+    "vite": "^4.2.2",
     "vitest": "^0.30.1"
   }
 }