monorepo-next 9.2.1 → 9.2.2

package/package.json

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

package/src/cycle.js

@@ -2,94 +2,51 @@
 
 const dependencyTypes = require('./dependency-types');
 
-function createPackageNode({
-  packageName,
-  dependencyType,
-  dependencyRange,
-  parent,
-  branch,
-}) {
-  let group = {
-    parent,
-    dependencyType,
-    dependencyRange,
-    isCycle: false,
-    packageName,
-  };
-
-  let newBranch = [...branch, group].filter(Boolean);
-
-  return {
-    newGroup: group,
-    newBranch,
-  };
-}
-
-function findGroupInBranchByPackageName(branch, packageName) {
-  let _i = -1;
-
-  for (let i = 0; i < branch.length; i++) {
-    if (branch[i].packageName === packageName) {
-      _i = i;
-
-      break;
-    }
-  }
-
-  return _i;
-}
-
 function _getCycles({
   packages,
   _package,
   dependencyType,
   dependencyRange,
-  parent,
   branch,
   visitedNodes,
   cycles,
   shouldDetectDevDependencies,
 }) {
-  let visitedNode = visitedNodes[_package.packageName];
-
-  if (visitedNode) {
-    let i = findGroupInBranchByPackageName(branch, _package.packageName);
+  let { packageName } = _package;
 
-    let isCycle = i !== -1;
+  let hasVisitedNode = visitedNodes.has(packageName);
 
-    let existingGroup = {
-      parent,
-      dependencyType,
-      dependencyRange,
-      isCycle,
-      packageName: visitedNode,
-    };
+  if (hasVisitedNode) {
+    let isCycle = branch.has(packageName);
 
     if (isCycle) {
-      let newBranch = [...branch.slice(i), existingGroup];
+      let existingGroup = {
+        dependencyType,
+        dependencyRange,
+        packageName,
+      };
+
+      let newBranch = [...[...branch.values()].slice([...branch.keys()].indexOf(packageName)), existingGroup];
 
       let cycle = newBranch.map(({ dependencyType, packageName }) => {
         return [dependencyType, packageName];
       });
 
-      cycles[cycle.flat().slice(1).join(' < ')] = existingGroup;
+      cycles.add(cycle.flat().slice(1).join(' < '));
     }
 
     return;
   }
 
-  let {
-    newGroup,
-    newBranch,
-  } = createPackageNode({
-    packageName: _package.packageName,
+  let newGroup = {
     dependencyType,
     dependencyRange,
-    parent,
-    branch,
-  });
+    packageName,
+  };
+
+  let newBranch = new Map([...branch, [packageName, newGroup]]);
 
-  visitedNodes[_package.packageName] = newGroup.packageName;
+  visitedNodes.add(packageName);
 
   for (let dependencyType of dependencyTypes) {
     if (!shouldDetectDevDependencies && dependencyType === 'devDependencies') {
@@ -107,7 +64,6 @@ function _getCycles({
         _package,
         dependencyType,
         dependencyRange,
-        parent: newGroup,
         branch: newBranch,
         visitedNodes,
         cycles,
@@ -120,8 +76,8 @@ function _getCycles({
 function getCycles(workspaceMeta, {
   shouldDetectDevDependencies,
 } = {}) {
-  let cycles = {};
-  let visitedNodes = {};
+  let cycles = new Set();
+  let visitedNodes = new Set();
   let { packages } = workspaceMeta;
 
   for (let packageName of Object.keys(packages).sort()) {
@@ -130,14 +86,14 @@ function getCycles(workspaceMeta, {
     _getCycles({
       packages,
       _package,
-      branch: [],
+      branch: new Map(),
       visitedNodes,
       cycles,
       shouldDetectDevDependencies,
     });
   }
 
-  return Object.keys(cycles).sort();
+  return [...cycles].sort();
 }
 
 Object.assign(module.exports, {