monorepo-next 9.2.2 → 9.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "monorepo-next",
-  "version": "9.2.2",
+  "version": "9.2.4",
   "description": "Detach monorepo packages from normal linking",
   "bin": {
     "next": "bin/next.js"

package/src/cycle.js

@@ -2,6 +2,28 @@
 
 const dependencyTypes = require('./dependency-types');
 
+function sortCycle(cycle) {
+  let alpha = cycle[0];
+  let index = 0;
+
+  for (let i = 2; i < cycle.length - 2; i += 2) {
+    let name = cycle[i];
+
+    if (name < alpha) {
+      alpha = name;
+      index = i;
+    }
+  }
+
+  let shifts = index / 2;
+
+  for (let i = 0; i < shifts; i++) {
+    cycle = [...cycle.slice(2), cycle[1], cycle[2]];
+  }
+
+  return cycle;
+}
+
 function _getCycles({
   packages,
   _package,
@@ -13,29 +35,34 @@ function _getCycles({
   shouldDetectDevDependencies,
 }) {
   let { packageName } = _package;
+  let cycleTips = new Set();
 
   let hasVisitedNode = visitedNodes.has(packageName);
 
   if (hasVisitedNode) {
-    let isCycle = branch.has(packageName);
+    return cycleTips;
+  }
 
-    if (isCycle) {
-      let existingGroup = {
-        dependencyType,
-        dependencyRange,
-        packageName,
-      };
+  let isCycle = branch.has(packageName);
 
-      let newBranch = [...[...branch.values()].slice([...branch.keys()].indexOf(packageName)), existingGroup];
+  if (isCycle) {
+    let existingGroup = {
+      dependencyType,
+      dependencyRange,
+      packageName,
+    };
 
-      let cycle = newBranch.map(({ dependencyType, packageName }) => {
-        return [dependencyType, packageName];
-      });
+    let newBranch = [...[...branch.values()].slice([...branch.keys()].indexOf(packageName)), existingGroup];
 
-      cycles.add(cycle.flat().slice(1).join(' < '));
-    }
+    let cycle = newBranch.map(({ dependencyType, packageName }) => {
+      return [dependencyType, packageName];
+    });
+
+    cycles.add(sortCycle(cycle.flat().slice(1)).join(' < '));
+
+    cycleTips.add(packageName);
 
-    return;
+    return cycleTips;
   }
 
   let newGroup = {
@@ -46,8 +73,6 @@ function _getCycles({
 
   let newBranch = new Map([...branch, [packageName, newGroup]]);
 
-  visitedNodes.add(packageName);
-
   for (let dependencyType of dependencyTypes) {
     if (!shouldDetectDevDependencies && dependencyType === 'devDependencies') {
       continue;
@@ -59,7 +84,7 @@ function _getCycles({
       let dependencyRange = dependencies[packageName];
       let _package = packages[packageName];
 
-      _getCycles({
+      cycleTips = new Set([...cycleTips, ..._getCycles({
         packages,
         _package,
         dependencyType,
@@ -68,9 +93,17 @@ function _getCycles({
         visitedNodes,
         cycles,
         shouldDetectDevDependencies,
-      });
+      })]);
     }
   }
+
+  cycleTips.delete(packageName);
+
+  if (!cycleTips.size) {
+    visitedNodes.add(packageName);
+  }
+
+  return cycleTips;
 }
 
 function getCycles(workspaceMeta, {