@likec4/core 0.51.0 → 0.53.0

package/dist/cjs/types/_common.d.ts

@@ -1,3 +1,3 @@
 import type { Opaque } from './opaque';
-export type NonEmptyArray<T> = [T, ...T[]];
+export type NonEmptyArray<T> = [T, ...T[]] | [...T[], T];
 export type IconUrl = Opaque<string, 'IconUrl'>;

package/dist/cjs/types/diagram.d.ts

@@ -24,12 +24,13 @@ export interface DiagramNode extends ComputedNode {
     };
     labels: DiagramLabel[];
     position: Point;
-    depth?: number;
 }
 export interface DiagramEdge extends ComputedEdge {
     points: NonEmptyArray<Point>;
     headArrow?: NonEmptyArray<Point>;
+    headArrowPoint?: Point;
     tailArrow?: NonEmptyArray<Point>;
+    tailArrowPoint?: Point;
     labels?: NonEmptyArray<DiagramLabel>;
     labelBBox?: BBox;
 }

package/dist/cjs/utils/fqn.d.ts

@@ -27,7 +27,7 @@ export declare function ancestorsFqn(fqn: Fqn): Fqn[];
  *                    - Positive number if a is deeper than b.
  *                    - Negative number if b is deeper than a.
  */
-export declare function compareFqnHierarchically(a: string, b: string): number;
+export declare function compareFqnHierarchically<T extends string = string>(a: T, b: T): number;
 export declare function compareByFqnHierarchically<T extends {
     id: Fqn;
 }>(a: T, b: T): number;

package/dist/cjs/utils/fqn.js

@@ -82,10 +82,19 @@ function ancestorsFqn(fqn) {
 function compareFqnHierarchically(a, b) {
   const depthA = a.split(".").length;
   const depthB = b.split(".").length;
-  if (depthA === depthB) {
-    return 0;
-  } else {
-    return depthA - depthB;
+  switch (true) {
+    case depthA > depthB:
+      {
+        return 1;
+      }
+    case depthA < depthB:
+      {
+        return -1;
+      }
+    default:
+      {
+        return 0;
+      }
   }
 }
 function compareByFqnHierarchically(a, b) {

package/dist/cjs/utils/relations.js

@@ -16,7 +16,14 @@ const compareRelations = (a, b) => {
     return -1;
   }
   const compareParents = parentA && parentB ? (0, _fqn.compareFqnHierarchically)(parentA, parentB) : 0;
-  return compareParents || (0, _fqn.compareFqnHierarchically)(a.source, b.source) || (0, _fqn.compareFqnHierarchically)(a.target, b.target);
+  if (compareParents === 0) {
+    const compareSource = (0, _fqn.compareFqnHierarchically)(a.source, b.source);
+    if (compareSource !== 0) {
+      return compareSource;
+    }
+    return (0, _fqn.compareFqnHierarchically)(a.target, b.target);
+  }
+  return compareParents;
 };
 exports.compareRelations = compareRelations;
 const isInside = parent => {

package/dist/esm/types/_common.d.ts

@@ -1,3 +1,3 @@
 import type { Opaque } from './opaque';
-export type NonEmptyArray<T> = [T, ...T[]];
+export type NonEmptyArray<T> = [T, ...T[]] | [...T[], T];
 export type IconUrl = Opaque<string, 'IconUrl'>;

package/dist/esm/types/diagram.d.ts

@@ -24,12 +24,13 @@ export interface DiagramNode extends ComputedNode {
     };
     labels: DiagramLabel[];
     position: Point;
-    depth?: number;
 }
 export interface DiagramEdge extends ComputedEdge {
     points: NonEmptyArray<Point>;
     headArrow?: NonEmptyArray<Point>;
+    headArrowPoint?: Point;
     tailArrow?: NonEmptyArray<Point>;
+    tailArrowPoint?: Point;
     labels?: NonEmptyArray<DiagramLabel>;
     labelBBox?: BBox;
 }

package/dist/esm/utils/fqn.d.ts

@@ -27,7 +27,7 @@ export declare function ancestorsFqn(fqn: Fqn): Fqn[];
  *                    - Positive number if a is deeper than b.
  *                    - Negative number if b is deeper than a.
  */
-export declare function compareFqnHierarchically(a: string, b: string): number;
+export declare function compareFqnHierarchically<T extends string = string>(a: T, b: T): number;
 export declare function compareByFqnHierarchically<T extends {
     id: Fqn;
 }>(a: T, b: T): number;

package/dist/esm/utils/fqn.js

@@ -67,10 +67,16 @@ export function ancestorsFqn(fqn) {
 export function compareFqnHierarchically(a, b) {
   const depthA = a.split(".").length;
   const depthB = b.split(".").length;
-  if (depthA === depthB) {
-    return 0;
-  } else {
-    return depthA - depthB;
+  switch (true) {
+    case depthA > depthB: {
+      return 1;
+    }
+    case depthA < depthB: {
+      return -1;
+    }
+    default: {
+      return 0;
+    }
   }
 }
 export function compareByFqnHierarchically(a, b) {

package/dist/esm/utils/relations.js

@@ -10,7 +10,14 @@ export const compareRelations = (a, b) => {
     return -1;
   }
   const compareParents = parentA && parentB ? compareFqnHierarchically(parentA, parentB) : 0;
-  return compareParents || compareFqnHierarchically(a.source, b.source) || compareFqnHierarchically(a.target, b.target);
+  if (compareParents === 0) {
+    const compareSource = compareFqnHierarchically(a.source, b.source);
+    if (compareSource !== 0) {
+      return compareSource;
+    }
+    return compareFqnHierarchically(a.target, b.target);
+  }
+  return compareParents;
 };
 const isInside = (parent) => {
   const prefix = parent + ".";

package/dist/types/types/_common.d.ts

@@ -1,4 +1,4 @@
 import type { Opaque } from './opaque';
-export type NonEmptyArray<T> = [T, ...T[]];
+export type NonEmptyArray<T> = [T, ...T[]] | [...T[], T];
 export type IconUrl = Opaque<string, 'IconUrl'>;
 //# sourceMappingURL=_common.d.ts.map

package/dist/types/types/diagram.d.ts

@@ -24,12 +24,13 @@ export interface DiagramNode extends ComputedNode {
     };
     labels: DiagramLabel[];
     position: Point;
-    depth?: number;
 }
 export interface DiagramEdge extends ComputedEdge {
     points: NonEmptyArray<Point>;
     headArrow?: NonEmptyArray<Point>;
+    headArrowPoint?: Point;
     tailArrow?: NonEmptyArray<Point>;
+    tailArrowPoint?: Point;
     labels?: NonEmptyArray<DiagramLabel>;
     labelBBox?: BBox;
 }

package/dist/types/utils/fqn.d.ts

@@ -27,7 +27,7 @@ export declare function ancestorsFqn(fqn: Fqn): Fqn[];
  *                    - Positive number if a is deeper than b.
  *                    - Negative number if b is deeper than a.
  */
-export declare function compareFqnHierarchically(a: string, b: string): number;
+export declare function compareFqnHierarchically<T extends string = string>(a: T, b: T): number;
 export declare function compareByFqnHierarchically<T extends {
     id: Fqn;
 }>(a: T, b: T): number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@likec4/core",
-  "version": "0.51.0",
+  "version": "0.53.0",
   "license": "MIT",
   "homepage": "https://likec4.dev",
   "author": "Denis Davydkov <denis@davydkov.com>",
@@ -78,15 +78,15 @@
   },
   "dependencies": {
     "rambdax": "^9.1.1",
-    "remeda": "^1.29.0",
+    "remeda": "^1.30.0",
     "safe-stable-stringify": "^2.4.3",
     "ts-custom-error": "^3.3.1"
   },
   "devDependencies": {
     "execa": "^8.0.1",
-    "typescript": "^5.3.2",
+    "typescript": "^5.3.3",
     "unbuild": "^2.0.0",
-    "vitest": "^1.0.1"
+    "vitest": "^1.1.3"
   },
   "packageManager": "yarn@4.0.2",
   "volta": {