monorepo-next 7.2.4 → 7.3.0

package/package.json

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

package/src/attach.js

@@ -4,6 +4,7 @@ const path = require('path');
 const writeJson = require('./json').write;
 const buildDepGraph = require('./build-dep-graph');
 const buildDAG = require('./build-dag');
+const { isCycle } = buildDAG;
 const dependencyTypes = require('./dependency-types');
 const {
   getWorkspaceCwd,
@@ -29,16 +30,16 @@ async function detachDependents(dag) {
   // prevent loops
   const detach = require('./detach');
 
-  for (let node of dag.dependents) {
+  for (let group of dag.node.dependents) {
     await detach({
-      package: path.basename(dag.cwd),
-      cwd: node.cwd,
+      package: path.basename(dag.node.cwd),
+      cwd: group.node.cwd,
     });
 
-    if (node.isPackage) {
+    if (group.node.isPackage) {
       await attach({
-        cwd: node.cwd,
-        dag: node,
+        cwd: group.node.cwd,
+        dag: group,
       });
     }
   }
@@ -83,7 +84,7 @@ async function attach({
     // don't mutate package.json until after DAG is built
     myPackageJson.version = matches[1];
 
-    if (!dag.isCycle) {
+    if (!isCycle(dag)) {
       await detachDependents(dag);
     }
   }

package/src/build-change-graph.js

@@ -41,19 +41,19 @@ async function getPackageChangedFiles({
 }
 
 function crawlDag(dag, packagesWithChanges) {
-  for (let node of dag.dependents) {
-    if (packagesWithChanges[node.packageName]) {
+  for (let group of dag.node.dependents) {
+    if (packagesWithChanges[group.node.packageName]) {
       continue;
     }
 
-    packagesWithChanges[node.packageName] = {
+    packagesWithChanges[group.node.packageName] = {
       changedFiles: [],
       changedReleasableFiles: [],
-      dag: node,
+      dag: group,
     };
 
-    if (node.dependencyType !== 'devDependencies') {
-      crawlDag(node, packagesWithChanges);
+    if (group.dependencyType !== 'devDependencies') {
+      crawlDag(group, packagesWithChanges);
     }
   }
 }

package/src/build-dag.js

@@ -14,8 +14,15 @@ function doesDependOnPackage(_package, packageName) {
   }
 }
 
-function thirdPass(workspaceMeta, dag) {
-  let currentPackageName = dag.packageName;
+function thirdPass({
+  workspaceMeta,
+  group,
+  branch,
+  visitedNodes,
+}) {
+  let currentPackageName = group.node.packageName;
+
+  visitedNodes[currentPackageName] = group.node;
 
   for (let _package of collectPackages(workspaceMeta)) {
     if (_package.packageName === currentPackageName) {
@@ -28,57 +35,122 @@ function thirdPass(workspaceMeta, dag) {
     } = doesDependOnPackage(_package, currentPackageName) || {};
 
     if (dependencyType) {
-      let node = createPackageNode({
+      let parent = group;
+
+      let visitedNode = visitedNodes[_package.packageName];
+
+      if (visitedNode) {
+        group.node.dependents.push({
+          parent,
+          dependencyType,
+          dependencyRange,
+          node: visitedNode,
+        });
+
+        continue;
+      }
+
+      let {
+        newGroup,
+        newBranch,
+      } = createPackageNode({
         workspaceMeta,
         packageName: _package.packageName,
         dependencyType,
         dependencyRange,
-        dag,
+        parent,
+        branch,
       });
-      dag.dependents.push(node);
-      if (node.isPackage && !node.isCycle) {
-        thirdPass(workspaceMeta, node);
+
+      group.node.dependents.push(newGroup);
+
+      if (group.node.isPackage && !isCycle(newGroup)) {
+        thirdPass({
+          workspaceMeta,
+          group: newGroup,
+          branch: newBranch,
+          visitedNodes,
+        });
       }
     }
   }
 }
 
+function isCycle(group) {
+  let current = group;
+
+  do {
+    current = current.parent;
+
+    if (!current) {
+      return false;
+    }
+
+    if (current.node === group.node) {
+      return true;
+    }
+  } while (true);
+}
+
 function createPackageNode({
   workspaceMeta,
   packageName,
   dependencyType,
   dependencyRange,
-  dag,
+  parent,
+  branch,
 }) {
   let _package = workspaceMeta.packages[packageName];
+
   let node = {
     isPackage: !!(_package && !_package.isPrivate),
     cwd: _package ? _package.cwd : workspaceMeta.cwd,
     packageName,
     version: _package ? _package.version : workspaceMeta.version,
-    ...dependencyType ? { dependencyType } : {},
-    ...typeof dependencyRange === 'string' ? { dependencyRange } : {},
-    branch: [...dag.branch, dag.packageName].filter(Boolean),
-    ..._package ? { isCycle: dag.branch.includes(packageName) } : {},
   };
-  if (!node.isCycle) {
+
+  let group = {
+    parent,
+    dependencyType,
+    dependencyRange,
+    node,
+  };
+
+  if (!isCycle(group)) {
     node.dependents = [];
   }
-  return node;
+
+  let newBranch = [...branch, packageName].filter(Boolean);
+
+  return {
+    newGroup: group,
+    newBranch,
+  };
 }
 
 function buildDAG(workspaceMeta, packageName) {
-  let dag = createPackageNode({
+  let {
+    newGroup,
+    newBranch,
+  } = createPackageNode({
     workspaceMeta,
     packageName,
-    dag: {
-      branch: [],
-    },
+    branch: [],
   });
 
-  thirdPass(workspaceMeta, dag);
+  let visitedNodes = {};
+
+  thirdPass({
+    workspaceMeta,
+    group: newGroup,
+    branch: newBranch,
+    visitedNodes,
+  });
 
-  return dag;
+  return newGroup;
 }
 
 module.exports = buildDAG;
+Object.assign(module.exports, {
+  isCycle,
+});

package/src/build-release-graph.js

@@ -9,6 +9,7 @@ const {
 const { trackNewVersion } = require('./version');
 const semver = require('semver');
 const dependencyTypes = require('./dependency-types');
+const { isCycle } = require('./build-dag');
 
 const defaultReleaseType = 'patch';
 
@@ -54,7 +55,7 @@ async function init({
     isPackage,
     packageName: name,
     cwd,
-  } = dag;
+  } = dag.node;
 
   let packageJsonPath = path.join(cwd, 'package.json');
 
@@ -116,12 +117,12 @@ async function secondPass({
       dag,
       parent,
     }) {
-      let doesPackageHaveChanges = !!releaseTrees[dag.packageName];
+      let doesPackageHaveChanges = !!releaseTrees[dag.node.packageName];
       if (!doesPackageHaveChanges) {
         let isDevDep = dag.dependencyType === 'devDependencies';
         let shouldVersionBump = !shouldExcludeDevChanges || !isDevDep;
 
-        if (dag.isPackage && shouldInheritGreaterReleaseType && !isDevDep && shouldBumpInRangeDependencies) {
+        if (dag.node.isPackage && shouldInheritGreaterReleaseType && !isDevDep && shouldBumpInRangeDependencies) {
           await init({ dag, releaseTrees, releaseType: parent.releaseType });
         } else if (!isReleaseTypeInRange(parent.oldVersion, parent.releaseType, dag.dependencyRange)) {
           await init({ dag, releaseTrees, releaseType: defaultReleaseType, shouldVersionBump });
@@ -136,14 +137,14 @@ async function secondPass({
         }
       }
 
-      for (let node of dag.dependents) {
-        if (node.isCycle) {
+      for (let group of dag.node.dependents) {
+        if (isCycle(group)) {
           continue;
         }
 
         await crawlDag({
-          dag: node,
-          parent: releaseTrees[dag.packageName],
+          dag: group,
+          parent: releaseTrees[dag.node.packageName],
         });
       }
     })({
@@ -166,7 +167,7 @@ function thirdPass({
       dag,
       parent,
     }) {
-      let current = releaseTrees[dag.packageName];
+      let current = releaseTrees[dag.node.packageName];
 
       if (!current) {
         return;
@@ -182,13 +183,13 @@ function thirdPass({
 
       current.releaseType = currentReleaseType;
 
-      for (let node of dag.dependents) {
-        if (!node.isPackage || node.isCycle) {
+      for (let group of dag.node.dependents) {
+        if (!group.node.isPackage || isCycle(group)) {
           continue;
         }
 
         crawlDag({
-          dag: node,
+          dag: group,
           parent: current,
         });
       }
@@ -212,7 +213,7 @@ function fourthPass({
       dag,
       parent,
     }) {
-      let current = releaseTrees[dag.packageName];
+      let current = releaseTrees[dag.node.packageName];
 
       if (!current) {
         return;
@@ -247,13 +248,13 @@ function fourthPass({
         });
       }
 
-      for (let node of dag.dependents) {
-        if (node.isCycle) {
+      for (let group of dag.node.dependents) {
+        if (isCycle(group)) {
           continue;
         }
 
         crawlDag({
-          dag: node,
+          dag: group,
           parent: current,
         });
       }

package/src/changed-files.js

@@ -52,11 +52,11 @@ async function changedFiles({
     changedFiles: _changedFiles,
     dag,
   } of packagesWithChanges) {
-    if (packages.length && !packages.includes(path.basename(dag.cwd))) {
+    if (packages.length && !packages.includes(path.basename(dag.node.cwd))) {
       continue;
     }
 
-    if (isPackageCwd && !await arePathsTheSame(dag.cwd, cwd)) {
+    if (isPackageCwd && !await arePathsTheSame(dag.node.cwd, cwd)) {
       continue;
     }
 

package/src/changed.js

@@ -33,7 +33,7 @@ async function changed({
     cached,
   });
 
-  let _changed = packagesWithChanges.map(({ dag }) => dag.packageName);
+  let _changed = packagesWithChanges.map(({ dag }) => dag.node.packageName);
 
   return _changed;
 }

package/src/detach.js

@@ -53,12 +53,12 @@ async function detach({
     // don't mutate package.json until after DAG is built
     myPackageJson.version = `${major}.${minor}.${patch}-detached`;
 
-    if (dag.dependents.length) {
+    if (dag.node.dependents.length) {
       // include space as to never match a similarly named package
       let workspaceKey = 'Workspace Root';
 
-      let choices = dag.dependents.map(dependent => {
-        return dependent.packageName || path.basename(dependent.cwd);
+      let choices = dag.node.dependents.map(dependent => {
+        return dependent.node.packageName || path.basename(dependent.node.cwd);
       });
 
       let { answers } = await inquirer.prompt([{
@@ -72,18 +72,18 @@ async function detach({
         // switch to key/value instead of array?
         let isPackage = answer !== workspaceKey;
 
-        return dag.dependents.find(dependent => {
-          return isPackage ? dependent.packageName === answer : !dependent.isPackage;
+        return dag.node.dependents.find(dependent => {
+          return isPackage ? dependent.node.packageName === answer : !dependent.node.isPackage;
         });
       });
 
       // prevent loops
       const attach = require('./attach');
 
-      for (let node of dependents) {
+      for (let group of dependents) {
         await attach({
           package: path.basename(cwd),
-          cwd: node.cwd,
+          cwd: group.node.cwd,
         });
       }
     }

package/src/get-changelog.js

@@ -40,7 +40,7 @@ async function getChangelog({
   });
 
   packagesWithChanges = packagesWithChanges.filter(({ dag }) => {
-    return dag.packageName && dag.version;
+    return dag.node.packageName && dag.node.version;
   });
 
   let releaseTrees = await buildReleaseGraph({

package/src/release.js

@@ -53,7 +53,7 @@ async function release({
   });
 
   packagesWithChanges = packagesWithChanges.filter(({ dag }) => {
-    return dag.packageName && dag.version;
+    return dag.node.packageName && dag.node.version;
   });
 
   if (!packagesWithChanges.some(({ changedReleasableFiles }) => changedReleasableFiles.length)) {

package/src/run.js

@@ -30,7 +30,7 @@ async function run({
   let stderr = '';
 
   for (let { dag } of packagesWithChanges) {
-    let cp = execa('yarn', args, { cwd: dag.cwd });
+    let cp = execa('yarn', args, { cwd: dag.node.cwd });
 
     if (!silent) {
       cp.stdout.pipe(process.stdout);