monorepo-next 9.4.1 → 9.4.3

package/package.json

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

package/src/build-dag.js

@@ -32,7 +32,7 @@ function thirdPass({
     let {
       dependencyType,
       dependencyRange,
-    } = doesDependOnPackage(_package, currentPackageName) || {};
+    } = doesDependOnPackage(_package, currentPackageName) ?? {};
 
     if (dependencyType) {
       let parent = group;
@@ -87,7 +87,7 @@ function createPackageNode({
   parent,
   branch,
 }) {
-  let _package = workspaceMeta.packages[packageName] || workspaceMeta;
+  let _package = workspaceMeta.packages[packageName] ?? workspaceMeta;
 
   let node = {
     isPackage: !_package.isPrivate,

package/src/build-dep-graph.js

@@ -13,7 +13,7 @@ function copyDeps(left, right) {
 }
 
 function firstPass(workspaceMeta, workspacePackageJson, workspacesPackageJsons) {
-  workspaceMeta.packageName = workspacePackageJson.name || 'Workspace Root';
+  workspaceMeta.packageName = workspacePackageJson.name ?? 'Workspace Root';
   workspaceMeta.version = workspacePackageJson.version;
   workspaceMeta.isPrivate = true;
   workspaceMeta.packages = {};
@@ -24,7 +24,7 @@ function firstPass(workspaceMeta, workspacePackageJson, workspacesPackageJsons)
       cwd: path.join(workspaceMeta.cwd, workspace),
       packageName,
       version: packageJson.version,
-      isPrivate: packageJson.private || false,
+      isPrivate: packageJson.private ?? false,
     };
     copyDeps(workspaceMeta.packages[packageName], packageJson);
   }

package/src/build-release-graph.js

@@ -11,7 +11,7 @@ const semver = require('semver');
 const dependencyTypes = require('./dependency-types');
 const { loadPackageConfig } = require('./config');
 const debug = require('./debug');
-const { createLogger } = require('./log');
+const { createSyncLogger, createAsyncLogger } = require('./log');
 
 const defaultReleaseType = 'patch';
 
@@ -207,7 +207,7 @@ function thirdPass({
 
       let isDevDep = dag.dependencyType === 'devDependencies';
       let currentReleaseType = current.releaseType;
-      let incomingReleaseType = parent ? parent.releaseType : currentReleaseType;
+      let incomingReleaseType = parent?.releaseType ?? currentReleaseType;
 
       if (shouldInheritGreaterReleaseType && !isDevDep && isReleaseTypeLessThan(currentReleaseType, incomingReleaseType)) {
         currentReleaseType = incomingReleaseType;
@@ -306,18 +306,19 @@ async function buildReleaseGraph({
   shouldInheritGreaterReleaseType,
   shouldExcludeDevChanges,
 }) {
-  let log = createLogger(_debug);
+  let logSync = createSyncLogger(_debug);
+  let logAsync = createAsyncLogger(_debug);
 
   let releaseTrees = {};
 
-  await log(firstPass, {
+  await logAsync(firstPass, {
     releaseTrees,
     packagesWithChanges,
   });
 
   // only packages with changes have been analyzed
 
-  await log(secondPass, {
+  await logAsync(secondPass, {
     releaseTrees,
     packagesWithChanges,
     shouldBumpInRangeDependencies,
@@ -327,7 +328,7 @@ async function buildReleaseGraph({
 
   // packages without changes, but need to be analyzed because of options
 
-  log(thirdPass, {
+  logSync(thirdPass, {
     releaseTrees,
     packagesWithChanges,
     shouldInheritGreaterReleaseType,
@@ -336,7 +337,7 @@ async function buildReleaseGraph({
 
   // dependents have now inherited release type
 
-  log(fourthPass, {
+  logSync(fourthPass, {
     releaseTrees,
     packagesWithChanges,
     shouldBumpInRangeDependencies,

package/src/detach.js

@@ -58,7 +58,7 @@ async function detach({
       let workspaceKey = 'Workspace Root';
 
       let choices = dag.node.dependents.map(dependent => {
-        return dependent.node.packageName || path.basename(dependent.node.cwd);
+        return dependent.node.packageName ?? path.basename(dependent.node.cwd);
       });
 
       let { answers } = await inquirer.prompt([{

package/src/get-workspaces-paths.js

@@ -109,7 +109,7 @@ async function getWorkspacesPaths({
         await fs.readFile(path.join(cwd, 'pnpm-workspace.yaml')),
       );
     } else {
-      packagesGlobs = workspaces.packages || workspaces;
+      packagesGlobs = workspaces.packages ?? workspaces;
     }
 
     let _2dFilesArray = await Promise.all(packagesGlobs.map(packagesGlob => {
@@ -157,7 +157,7 @@ function getWorkspacesPathsSync({
         fs.readFileSync(path.join(cwd, 'pnpm-workspace.yaml')),
       );
     } else {
-      packagesGlobs = workspaces.packages || workspaces;
+      packagesGlobs = workspaces.packages ?? workspaces;
     }
 
     let _2dFilesArray = packagesGlobs.map(packagesGlob => {

package/src/log.js

@@ -2,24 +2,56 @@
 
 const _debug = require('./debug');
 
-function createLogger(debug = _debug) {
-  return async function log(callback, ...args) {
-    let _debug = debug.extend(callback.name);
+function prepare(callback, debug = _debug) {
+  let _debug = debug.extend(callback.name);
+
+  _debug('begin');
+
+  let before = new Date();
+
+  return {
+    debug: _debug,
+    before,
+  };
+}
 
-    _debug('begin');
+function finish(debug, before) {
+  let elapsed = new Date() - before;
+
+  debug(`end in ${elapsed}ms`);
+}
 
-    let before = new Date();
+function createSyncLogger(debug) {
+  return function log(callback, ...args) {
+    let {
+      debug: _debug,
+      before,
+    } = prepare(callback, debug);
 
     try {
-      return await callback(...args);
+      return callback.apply(this, args);
     } finally {
-      let elapsed = new Date() - before;
+      finish(_debug, before);
+    }
+  };
+}
 
-      _debug(`end in ${elapsed}ms`);
+function createAsyncLogger(debug) {
+  return async function log(callback, ...args) {
+    let {
+      debug: _debug,
+      before,
+    } = prepare(callback, debug);
+
+    try {
+      return await callback.apply(this, args);
+    } finally {
+      finish(_debug, before);
     }
   };
 }
 
 module.exports = {
-  createLogger,
+  createSyncLogger,
+  createAsyncLogger,
 };

package/src/release.js

@@ -18,7 +18,7 @@ const {
 const semver = require('semver');
 const { builder } = require('../bin/commands/release');
 const debug = require('./debug');
-const { createLogger } = require('./log');
+const { createAsyncLogger } = require('./log');
 
 async function release({
   cwd = process.cwd(),
@@ -43,7 +43,7 @@ async function release({
   cached,
 } = {}) {
   let _debug = debug.extend(release.name);
-  let log = createLogger(_debug);
+  let logAsync = createAsyncLogger(_debug);
 
   let currentBranch = await getCurrentBranch(cwd);
   if (currentBranch !== defaultBranch) {
@@ -52,9 +52,9 @@ async function release({
 
   let workspaceCwd = await getWorkspaceCwd(cwd);
 
-  let workspaceMeta = await log(buildDepGraph, { workspaceCwd });
+  let workspaceMeta = await logAsync(buildDepGraph, { workspaceCwd });
 
-  let packagesWithChanges = await log(buildChangeGraph, {
+  let packagesWithChanges = await logAsync(buildChangeGraph, {
     workspaceMeta,
     shouldExcludeDevChanges,
     cached,
@@ -69,7 +69,7 @@ async function release({
     return;
   }
 
-  let releaseTrees = await log(buildReleaseGraph, {
+  let releaseTrees = await logAsync(buildReleaseGraph, {
     debug: _debug,
     packagesWithChanges,
     shouldBumpInRangeDependencies,