@likec4/core 0.50.0 → 0.52.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -82,10 +82,19 @@ function ancestorsFqn(fqn) {
82
82
  function compareFqnHierarchically(a, b) {
83
83
  const depthA = a.split(".").length;
84
84
  const depthB = b.split(".").length;
85
- if (depthA === depthB) {
86
- return 0;
87
- } else {
88
- return depthA - depthB;
85
+ switch (true) {
86
+ case depthA > depthB:
87
+ {
88
+ return 1;
89
+ }
90
+ case depthA < depthB:
91
+ {
92
+ return -1;
93
+ }
94
+ default:
95
+ {
96
+ return 0;
97
+ }
89
98
  }
90
99
  }
91
100
  function compareByFqnHierarchically(a, b) {
@@ -16,7 +16,14 @@ const compareRelations = (a, b) => {
16
16
  return -1;
17
17
  }
18
18
  const compareParents = parentA && parentB ? (0, _fqn.compareFqnHierarchically)(parentA, parentB) : 0;
19
- return compareParents || (0, _fqn.compareFqnHierarchically)(a.source, b.source) || (0, _fqn.compareFqnHierarchically)(a.target, b.target);
19
+ if (compareParents === 0) {
20
+ const compareSource = (0, _fqn.compareFqnHierarchically)(a.source, b.source);
21
+ if (compareSource !== 0) {
22
+ return compareSource;
23
+ }
24
+ return (0, _fqn.compareFqnHierarchically)(a.target, b.target);
25
+ }
26
+ return compareParents;
20
27
  };
21
28
  exports.compareRelations = compareRelations;
22
29
  const isInside = parent => {
@@ -67,10 +67,16 @@ export function ancestorsFqn(fqn) {
67
67
  export function compareFqnHierarchically(a, b) {
68
68
  const depthA = a.split(".").length;
69
69
  const depthB = b.split(".").length;
70
- if (depthA === depthB) {
71
- return 0;
72
- } else {
73
- return depthA - depthB;
70
+ switch (true) {
71
+ case depthA > depthB: {
72
+ return 1;
73
+ }
74
+ case depthA < depthB: {
75
+ return -1;
76
+ }
77
+ default: {
78
+ return 0;
79
+ }
74
80
  }
75
81
  }
76
82
  export function compareByFqnHierarchically(a, b) {
@@ -10,7 +10,14 @@ export const compareRelations = (a, b) => {
10
10
  return -1;
11
11
  }
12
12
  const compareParents = parentA && parentB ? compareFqnHierarchically(parentA, parentB) : 0;
13
- return compareParents || compareFqnHierarchically(a.source, b.source) || compareFqnHierarchically(a.target, b.target);
13
+ if (compareParents === 0) {
14
+ const compareSource = compareFqnHierarchically(a.source, b.source);
15
+ if (compareSource !== 0) {
16
+ return compareSource;
17
+ }
18
+ return compareFqnHierarchically(a.target, b.target);
19
+ }
20
+ return compareParents;
14
21
  };
15
22
  const isInside = (parent) => {
16
23
  const prefix = parent + ".";
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@likec4/core",
3
- "version": "0.50.0",
3
+ "version": "0.52.0",
4
4
  "license": "MIT",
5
5
  "homepage": "https://likec4.dev",
6
6
  "author": "Denis Davydkov <denis@davydkov.com>",
@@ -84,9 +84,9 @@
84
84
  },
85
85
  "devDependencies": {
86
86
  "execa": "^8.0.1",
87
- "typescript": "^5.3.2",
87
+ "typescript": "^5.3.3",
88
88
  "unbuild": "^2.0.0",
89
- "vitest": "^0.34.6"
89
+ "vitest": "^1.0.4"
90
90
  },
91
91
  "packageManager": "yarn@4.0.2",
92
92
  "volta": {