workspace-tools 0.40.0 → 0.40.3

package/lib/workspaces/implementations/getWorkspaceManagerAndRoot.d.ts

@@ -1,22 +1,22 @@
 import { WorkspaceManager } from "../WorkspaceManager";
 export interface WorkspaceManagerAndRoot {
-    /** Workspace manager name */
+    /** Workspace/monorepo manager name */
     manager: WorkspaceManager;
-    /** Workspace root, where the manager configuration file is located */
+    /** Monorepo root, where the manager configuration file is located */
     root: string;
 }
 /**
- * Get the preferred workspace manager based on `process.env.PREFERRED_WORKSPACE_MANAGER`
+ * Get the preferred workspace/monorepo manager based on `process.env.PREFERRED_WORKSPACE_MANAGER`
  * (if valid).
  */
 export declare function getPreferredWorkspaceManager(): WorkspaceManager | undefined;
 /**
- * Get the workspace manager name and workspace root directory for `cwd`, with caching.
+ * Get the workspace/monorepo manager name and root directory for `cwd`, with caching.
  * Also respects the `process.env.PREFERRED_WORKSPACE_MANAGER` override, provided the relevant
  * manager file exists.
  * @param cwd Directory to search up from
  * @param cache Optional override cache for testing
  * @param preferredManager Optional override manager (if provided, only searches for this manager's file)
- * @returns Workspace manager and root, or undefined if it can't be determined
+ * @returns Workspace/monorepo manager and root, or undefined if it can't be determined
  */
 export declare function getWorkspaceManagerAndRoot(cwd: string, cache?: Map<string, WorkspaceManagerAndRoot | undefined>, preferredManager?: WorkspaceManager): WorkspaceManagerAndRoot | undefined;

package/lib/workspaces/implementations/getWorkspaceManagerAndRoot.js

@@ -9,7 +9,7 @@ const paths_1 = require("../../paths");
 const isCachingEnabled_1 = require("../../isCachingEnabled");
 const workspaceCache = new Map();
 /**
- * Files indicating the workspace root for each manager.
+ * Files indicating the monorepo root for each manager.
  *
  * DO NOT REORDER! The order of keys determines the precedence of the files, which is
  * important for cases like lerna where lerna.json and e.g. yarn.lock may both exist.
@@ -23,7 +23,7 @@ const managerFiles = {
     npm: "package-lock.json",
 };
 /**
- * Get the preferred workspace manager based on `process.env.PREFERRED_WORKSPACE_MANAGER`
+ * Get the preferred workspace/monorepo manager based on `process.env.PREFERRED_WORKSPACE_MANAGER`
  * (if valid).
  */
 function getPreferredWorkspaceManager() {
@@ -32,13 +32,13 @@ function getPreferredWorkspaceManager() {
 }
 exports.getPreferredWorkspaceManager = getPreferredWorkspaceManager;
 /**
- * Get the workspace manager name and workspace root directory for `cwd`, with caching.
+ * Get the workspace/monorepo manager name and root directory for `cwd`, with caching.
  * Also respects the `process.env.PREFERRED_WORKSPACE_MANAGER` override, provided the relevant
  * manager file exists.
  * @param cwd Directory to search up from
  * @param cache Optional override cache for testing
  * @param preferredManager Optional override manager (if provided, only searches for this manager's file)
- * @returns Workspace manager and root, or undefined if it can't be determined
+ * @returns Workspace/monorepo manager and root, or undefined if it can't be determined
  */
 function getWorkspaceManagerAndRoot(cwd, cache, preferredManager) {
     cache = cache || workspaceCache;

package/lib/workspaces/implementations/getWorkspaceUtilities.d.ts

@@ -4,21 +4,25 @@ export interface WorkspaceUtilities {
     /**
      * Get an array of paths to packages ("workspaces") in the monorepo, based on the
      * manager's config file.
+     * @returns Array of monorepo package paths, or an empty array on error
      */
     getWorkspacePackagePaths: (cwd: string) => string[];
     /**
      * Get an array of paths to packages ("workspaces") in the monorepo, based on the
      * manager's config file.
+     * @returns Array of monorepo package paths, or an empty array on error
      */
     getWorkspacePackagePathsAsync?: (cwd: string) => Promise<string[]>;
     /**
      * Get an array with names, paths, and package.json contents for each package ("workspace")
      * in a monorepo.
+     * @returns Array of monorepo package infos, or an empty array on error
      */
     getWorkspaces: (cwd: string) => WorkspaceInfos;
     /**
      * Get an array with names, paths, and package.json contents for each package ("workspace")
      * in a monorepo.
+     * @returns Array of monorepo package infos, or an empty array on error
      */
     getWorkspacesAsync: (cwd: string) => Promise<WorkspaceInfos>;
     /**
@@ -27,7 +31,8 @@ export interface WorkspaceUtilities {
     getCatalogs?: (cwd: string) => Catalogs | undefined;
 }
 /**
- * Get utility implementations for the workspace manager of `cwd`.
+ * Get utility implementations for the workspace/monorepo manager of `cwd`.
+ * It will search up from `cwd` to find a manager file and monorepo root, with caching.
  * Returns undefined if the manager can't be determined.
  */
 export declare function getWorkspaceUtilities(cwd: string): WorkspaceUtilities | undefined;

package/lib/workspaces/implementations/getWorkspaceUtilities.js

@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getWorkspaceUtilities = void 0;
 const getWorkspaceManagerAndRoot_1 = require("./getWorkspaceManagerAndRoot");
 /**
- * Get utility implementations for the workspace manager of `cwd`.
+ * Get utility implementations for the workspace/monorepo manager of `cwd`.
+ * It will search up from `cwd` to find a manager file and monorepo root, with caching.
  * Returns undefined if the manager can't be determined.
  */
 function getWorkspaceUtilities(cwd) {

package/lib/workspaces/implementations/getWorkspaceUtilities.js.map

@@ -1 +1 @@
-{"version":3,"file":"getWorkspaceUtilities.js","sourceRoot":"","sources":["../../../src/workspaces/implementations/getWorkspaceUtilities.ts"],"names":[],"mappings":";;;AAEA,6EAA0E;AAmC1E;;;GAGG;AACH,SAAgB,qBAAqB,CAAC,GAAW;IAC/C,MAAM,OAAO,GAAG,IAAA,uDAA0B,EAAC,GAAG,CAAC,EAAE,OAAO,CAAC;IAEzD,QAAQ,OAAO,EAAE;QACf,KAAK,MAAM;YACT,OAAO,OAAO,CAAC,QAAQ,CAAyB,CAAC;QAEnD,KAAK,MAAM;YACT,OAAO,OAAO,CAAC,QAAQ,CAAyB,CAAC;QAEnD,KAAK,MAAM;YACT,OAAO,OAAO,CAAC,QAAQ,CAAyB,CAAC;QAEnD,KAAK,KAAK;YACR,OAAO,OAAO,CAAC,OAAO,CAAwB,CAAC;QAEjD,KAAK,OAAO;YACV,OAAO,OAAO,CAAC,SAAS,CAA0B,CAAC;KACtD;AACH,CAAC;AAnBD,sDAmBC"}
+{"version":3,"file":"getWorkspaceUtilities.js","sourceRoot":"","sources":["../../../src/workspaces/implementations/getWorkspaceUtilities.ts"],"names":[],"mappings":";;;AAEA,6EAA0E;AAuC1E;;;;GAIG;AACH,SAAgB,qBAAqB,CAAC,GAAW;IAC/C,MAAM,OAAO,GAAG,IAAA,uDAA0B,EAAC,GAAG,CAAC,EAAE,OAAO,CAAC;IAEzD,QAAQ,OAAO,EAAE;QACf,KAAK,MAAM;YACT,OAAO,OAAO,CAAC,QAAQ,CAAyB,CAAC;QAEnD,KAAK,MAAM;YACT,OAAO,OAAO,CAAC,QAAQ,CAAyB,CAAC;QAEnD,KAAK,MAAM;YACT,OAAO,OAAO,CAAC,QAAQ,CAAyB,CAAC;QAEnD,KAAK,KAAK;YACR,OAAO,OAAO,CAAC,OAAO,CAAwB,CAAC;QAEjD,KAAK,OAAO;YACV,OAAO,OAAO,CAAC,SAAS,CAA0B,CAAC;KACtD;AACH,CAAC;AAnBD,sDAmBC"}

package/lib/workspaces/implementations/lerna.d.ts

@@ -1,14 +1,19 @@
 import type { WorkspaceInfos } from "../../types/WorkspaceInfo";
-/** Get paths for each package ("workspace") in a lerna monorepo. */
+/**
+ * Get paths for each package ("workspace") in a lerna monorepo.
+ * @returns Array of monorepo package paths, or an empty array on error
+ */
 export declare function getWorkspacePackagePaths(cwd: string): string[];
 /**
  * Get an array with names, paths, and package.json contents for each package ("workspace")
  * in a lerna monorepo.
+ * @returns Array of monorepo package infos, or an empty array on error
  */
 export declare function getLernaWorkspaces(cwd: string): WorkspaceInfos;
 /**
  * Get an array with names, paths, and package.json contents for each package ("workspace")
  * in a lerna monorepo.
+ * @returns Array of monorepo package infos, or an empty array on error
  */
 export declare function getLernaWorkspacesAsync(cwd: string): Promise<WorkspaceInfos>;
 export { getLernaWorkspaces as getWorkspaces };

package/lib/workspaces/implementations/lerna.js

@@ -11,20 +11,23 @@ const getPackagePaths_1 = require("../../getPackagePaths");
 const getWorkspacePackageInfo_1 = require("../getWorkspacePackageInfo");
 const logging_1 = require("../../logging");
 const getWorkspaceManagerAndRoot_1 = require("./getWorkspaceManagerAndRoot");
-function getLernaWorkspaceRoot(cwd) {
+function getLernaRoot(cwd) {
     const root = (0, getWorkspaceManagerAndRoot_1.getWorkspaceManagerAndRoot)(cwd, undefined, "lerna")?.root;
     if (!root) {
-        throw new Error("Could not find lerna workspace root from " + cwd);
+        throw new Error("Could not find lerna root from " + cwd);
     }
     return root;
 }
-/** Get paths for each package ("workspace") in a lerna monorepo. */
+/**
+ * Get paths for each package ("workspace") in a lerna monorepo.
+ * @returns Array of monorepo package paths, or an empty array on error
+ */
 function getWorkspacePackagePaths(cwd) {
     try {
-        const lernaWorkspaceRoot = getLernaWorkspaceRoot(cwd);
-        const lernaJsonPath = path_1.default.join(lernaWorkspaceRoot, "lerna.json");
+        const root = getLernaRoot(cwd);
+        const lernaJsonPath = path_1.default.join(root, "lerna.json");
         const lernaConfig = jju_1.default.parse(fs_1.default.readFileSync(lernaJsonPath, "utf-8"));
-        return (0, getPackagePaths_1.getPackagePaths)(lernaWorkspaceRoot, lernaConfig.packages);
+        return (0, getPackagePaths_1.getPackagePaths)(root, lernaConfig.packages);
     }
     catch (err) {
         (0, logging_1.logVerboseWarning)(`Error getting lerna workspace package paths for ${cwd}`, err);
@@ -35,6 +38,7 @@ exports.getWorkspacePackagePaths = getWorkspacePackagePaths;
 /**
  * Get an array with names, paths, and package.json contents for each package ("workspace")
  * in a lerna monorepo.
+ * @returns Array of monorepo package infos, or an empty array on error
  */
 function getLernaWorkspaces(cwd) {
     try {
@@ -42,7 +46,7 @@ function getLernaWorkspaces(cwd) {
         return (0, getWorkspacePackageInfo_1.getWorkspacePackageInfo)(packagePaths);
     }
     catch (err) {
-        (0, logging_1.logVerboseWarning)(`Error getting lerna workspaces for ${cwd}`, err);
+        (0, logging_1.logVerboseWarning)(`Error getting lerna workspace package infos for ${cwd}`, err);
         return [];
     }
 }
@@ -51,6 +55,7 @@ exports.getWorkspaces = getLernaWorkspaces;
 /**
  * Get an array with names, paths, and package.json contents for each package ("workspace")
  * in a lerna monorepo.
+ * @returns Array of monorepo package infos, or an empty array on error
  */
 async function getLernaWorkspacesAsync(cwd) {
     try {
@@ -58,7 +63,7 @@ async function getLernaWorkspacesAsync(cwd) {
         return (0, getWorkspacePackageInfo_1.getWorkspacePackageInfoAsync)(packagePaths);
     }
     catch (err) {
-        (0, logging_1.logVerboseWarning)(`Error getting lerna workspaces for ${cwd}`, err);
+        (0, logging_1.logVerboseWarning)(`Error getting lerna workspace package infos for ${cwd}`, err);
         return [];
     }
 }

package/lib/workspaces/implementations/lerna.js.map

@@ -1 +1 @@
-{"version":3,"file":"lerna.js","sourceRoot":"","sources":["../../../src/workspaces/implementations/lerna.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,8CAAsB;AACtB,gDAAwB;AACxB,2DAAwD;AAExD,wEAAmG;AACnG,2CAAkD;AAClD,6EAA0E;AAE1E,SAAS,qBAAqB,CAAC,GAAW;IACxC,MAAM,IAAI,GAAG,IAAA,uDAA0B,EAAC,GAAG,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC;IACvE,IAAI,CAAC,IAAI,EAAE;QACT,MAAM,IAAI,KAAK,CAAC,2CAA2C,GAAG,GAAG,CAAC,CAAC;KACpE;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,oEAAoE;AACpE,SAAgB,wBAAwB,CAAC,GAAW;IAClD,IAAI;QACF,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC;QACtD,MAAM,aAAa,GAAG,cAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,YAAY,CAAC,CAAC;QAClE,MAAM,WAAW,GAAG,aAAG,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC,CAAC;QACvE,OAAO,IAAA,iCAAe,EAAC,kBAAkB,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;KAClE;IAAC,OAAO,GAAG,EAAE;QACZ,IAAA,2BAAiB,EAAC,mDAAmD,GAAG,EAAE,EAAE,GAAG,CAAC,CAAC;QACjF,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AAVD,4DAUC;AAED;;;GAGG;AACH,SAAgB,kBAAkB,CAAC,GAAW;IAC5C,IAAI;QACF,MAAM,YAAY,GAAG,wBAAwB,CAAC,GAAG,CAAC,CAAC;QACnD,OAAO,IAAA,iDAAuB,EAAC,YAAY,CAAC,CAAC;KAC9C;IAAC,OAAO,GAAG,EAAE;QACZ,IAAA,2BAAiB,EAAC,sCAAsC,GAAG,EAAE,EAAE,GAAG,CAAC,CAAC;QACpE,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AARD,gDAQC;AAgB8B,2CAAa;AAd5C;;;GAGG;AACI,KAAK,UAAU,uBAAuB,CAAC,GAAW;IACvD,IAAI;QACF,MAAM,YAAY,GAAG,wBAAwB,CAAC,GAAG,CAAC,CAAC;QACnD,OAAO,IAAA,sDAA4B,EAAC,YAAY,CAAC,CAAC;KACnD;IAAC,OAAO,GAAG,EAAE;QACZ,IAAA,2BAAiB,EAAC,sCAAsC,GAAG,EAAE,EAAE,GAAG,CAAC,CAAC;QACpE,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AARD,0DAQC;AAGmC,qDAAkB"}
+{"version":3,"file":"lerna.js","sourceRoot":"","sources":["../../../src/workspaces/implementations/lerna.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,8CAAsB;AACtB,gDAAwB;AACxB,2DAAwD;AAExD,wEAAmG;AACnG,2CAAkD;AAClD,6EAA0E;AAE1E,SAAS,YAAY,CAAC,GAAW;IAC/B,MAAM,IAAI,GAAG,IAAA,uDAA0B,EAAC,GAAG,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC;IACvE,IAAI,CAAC,IAAI,EAAE;QACT,MAAM,IAAI,KAAK,CAAC,iCAAiC,GAAG,GAAG,CAAC,CAAC;KAC1D;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;GAGG;AACH,SAAgB,wBAAwB,CAAC,GAAW;IAClD,IAAI;QACF,MAAM,IAAI,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;QAC/B,MAAM,aAAa,GAAG,cAAI,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QACpD,MAAM,WAAW,GAAG,aAAG,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC,CAAC;QACvE,OAAO,IAAA,iCAAe,EAAC,IAAI,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;KACpD;IAAC,OAAO,GAAG,EAAE;QACZ,IAAA,2BAAiB,EAAC,mDAAmD,GAAG,EAAE,EAAE,GAAG,CAAC,CAAC;QACjF,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AAVD,4DAUC;AAED;;;;GAIG;AACH,SAAgB,kBAAkB,CAAC,GAAW;IAC5C,IAAI;QACF,MAAM,YAAY,GAAG,wBAAwB,CAAC,GAAG,CAAC,CAAC;QACnD,OAAO,IAAA,iDAAuB,EAAC,YAAY,CAAC,CAAC;KAC9C;IAAC,OAAO,GAAG,EAAE;QACZ,IAAA,2BAAiB,EAAC,mDAAmD,GAAG,EAAE,EAAE,GAAG,CAAC,CAAC;QACjF,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AARD,gDAQC;AAiB8B,2CAAa;AAf5C;;;;GAIG;AACI,KAAK,UAAU,uBAAuB,CAAC,GAAW;IACvD,IAAI;QACF,MAAM,YAAY,GAAG,wBAAwB,CAAC,GAAG,CAAC,CAAC;QACnD,OAAO,IAAA,sDAA4B,EAAC,YAAY,CAAC,CAAC;KACnD;IAAC,OAAO,GAAG,EAAE;QACZ,IAAA,2BAAiB,EAAC,mDAAmD,GAAG,EAAE,EAAE,GAAG,CAAC,CAAC;QACjF,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AARD,0DAQC;AAGmC,qDAAkB"}

package/lib/workspaces/implementations/npm.js

@@ -3,23 +3,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getWorkspacesAsync = exports.getWorkspaces = exports.getNpmWorkspacesAsync = exports.getNpmWorkspaces = exports.getWorkspacePackagePathsAsync = exports.getWorkspacePackagePaths = void 0;
 const _1 = require(".");
 const packageJsonWorkspaces_1 = require("./packageJsonWorkspaces");
-function getNpmWorkspaceRoot(cwd) {
+function getNpmRoot(cwd) {
     const root = (0, _1.getWorkspaceManagerAndRoot)(cwd, undefined, "npm")?.root;
     if (!root) {
-        throw new Error("Could not find npm workspace root from " + cwd);
+        throw new Error("Could not find npm root from " + cwd);
     }
     return root;
 }
 /** Get paths for each package ("workspace") in an npm monorepo. */
 function getWorkspacePackagePaths(cwd) {
-    const npmWorkspacesRoot = getNpmWorkspaceRoot(cwd);
-    return (0, packageJsonWorkspaces_1.getPackagePathsFromWorkspaceRoot)(npmWorkspacesRoot);
+    const root = getNpmRoot(cwd);
+    return (0, packageJsonWorkspaces_1.getPackagePathsFromWorkspaceRoot)(root);
 }
 exports.getWorkspacePackagePaths = getWorkspacePackagePaths;
 /** Get paths for each package ("workspace") in an npm monorepo. */
 function getWorkspacePackagePathsAsync(cwd) {
-    const npmWorkspacesRoot = getNpmWorkspaceRoot(cwd);
-    return (0, packageJsonWorkspaces_1.getPackagePathsFromWorkspaceRootAsync)(npmWorkspacesRoot);
+    const root = getNpmRoot(cwd);
+    return (0, packageJsonWorkspaces_1.getPackagePathsFromWorkspaceRootAsync)(root);
 }
 exports.getWorkspacePackagePathsAsync = getWorkspacePackagePathsAsync;
 /**
@@ -27,8 +27,8 @@ exports.getWorkspacePackagePathsAsync = getWorkspacePackagePathsAsync;
  * in an npm monorepo.
  */
 function getNpmWorkspaces(cwd) {
-    const npmWorkspacesRoot = getNpmWorkspaceRoot(cwd);
-    return (0, packageJsonWorkspaces_1.getWorkspaceInfoFromWorkspaceRoot)(npmWorkspacesRoot);
+    const root = getNpmRoot(cwd);
+    return (0, packageJsonWorkspaces_1.getWorkspaceInfoFromWorkspaceRoot)(root);
 }
 exports.getNpmWorkspaces = getNpmWorkspaces;
 exports.getWorkspaces = getNpmWorkspaces;
@@ -37,8 +37,8 @@ exports.getWorkspaces = getNpmWorkspaces;
  * in an npm monorepo.
  */
 function getNpmWorkspacesAsync(cwd) {
-    const npmWorkspacesRoot = getNpmWorkspaceRoot(cwd);
-    return (0, packageJsonWorkspaces_1.getWorkspaceInfoFromWorkspaceRootAsync)(npmWorkspacesRoot);
+    const root = getNpmRoot(cwd);
+    return (0, packageJsonWorkspaces_1.getWorkspaceInfoFromWorkspaceRootAsync)(root);
 }
 exports.getNpmWorkspacesAsync = getNpmWorkspacesAsync;
 exports.getWorkspacesAsync = getNpmWorkspacesAsync;

package/lib/workspaces/implementations/npm.js.map

@@ -1 +1 @@
-{"version":3,"file":"npm.js","sourceRoot":"","sources":["../../../src/workspaces/implementations/npm.ts"],"names":[],"mappings":";;;AAAA,wBAA+C;AAE/C,mEAKiC;AAEjC,SAAS,mBAAmB,CAAC,GAAW;IACtC,MAAM,IAAI,GAAG,IAAA,6BAA0B,EAAC,GAAG,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,IAAI,CAAC;IACrE,IAAI,CAAC,IAAI,EAAE;QACT,MAAM,IAAI,KAAK,CAAC,yCAAyC,GAAG,GAAG,CAAC,CAAC;KAClE;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,mEAAmE;AACnE,SAAgB,wBAAwB,CAAC,GAAW;IAClD,MAAM,iBAAiB,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC;IACnD,OAAO,IAAA,wDAAgC,EAAC,iBAAiB,CAAC,CAAC;AAC7D,CAAC;AAHD,4DAGC;AAED,mEAAmE;AACnE,SAAgB,6BAA6B,CAAC,GAAW;IACvD,MAAM,iBAAiB,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC;IACnD,OAAO,IAAA,6DAAqC,EAAC,iBAAiB,CAAC,CAAC;AAClE,CAAC;AAHD,sEAGC;AAED;;;GAGG;AACH,SAAgB,gBAAgB,CAAC,GAAW;IAC1C,MAAM,iBAAiB,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC;IACnD,OAAO,IAAA,yDAAiC,EAAC,iBAAiB,CAAC,CAAC;AAC9D,CAAC;AAHD,4CAGC;AAW4B,yCAAa;AAT1C;;;GAGG;AACH,SAAgB,qBAAqB,CAAC,GAAW;IAC/C,MAAM,iBAAiB,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC;IACnD,OAAO,IAAA,8DAAsC,EAAC,iBAAiB,CAAC,CAAC;AACnE,CAAC;AAHD,sDAGC;AAGiC,mDAAkB"}
+{"version":3,"file":"npm.js","sourceRoot":"","sources":["../../../src/workspaces/implementations/npm.ts"],"names":[],"mappings":";;;AAAA,wBAA+C;AAE/C,mEAKiC;AAEjC,SAAS,UAAU,CAAC,GAAW;IAC7B,MAAM,IAAI,GAAG,IAAA,6BAA0B,EAAC,GAAG,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,IAAI,CAAC;IACrE,IAAI,CAAC,IAAI,EAAE;QACT,MAAM,IAAI,KAAK,CAAC,+BAA+B,GAAG,GAAG,CAAC,CAAC;KACxD;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,mEAAmE;AACnE,SAAgB,wBAAwB,CAAC,GAAW;IAClD,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;IAC7B,OAAO,IAAA,wDAAgC,EAAC,IAAI,CAAC,CAAC;AAChD,CAAC;AAHD,4DAGC;AAED,mEAAmE;AACnE,SAAgB,6BAA6B,CAAC,GAAW;IACvD,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;IAC7B,OAAO,IAAA,6DAAqC,EAAC,IAAI,CAAC,CAAC;AACrD,CAAC;AAHD,sEAGC;AAED;;;GAGG;AACH,SAAgB,gBAAgB,CAAC,GAAW;IAC1C,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;IAC7B,OAAO,IAAA,yDAAiC,EAAC,IAAI,CAAC,CAAC;AACjD,CAAC;AAHD,4CAGC;AAW4B,yCAAa;AAT1C;;;GAGG;AACH,SAAgB,qBAAqB,CAAC,GAAW;IAC/C,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;IAC7B,OAAO,IAAA,8DAAsC,EAAC,IAAI,CAAC,CAAC;AACtD,CAAC;AAHD,sDAGC;AAGiC,mDAAkB"}

package/lib/workspaces/implementations/packageJsonWorkspaces.d.ts

@@ -13,15 +13,19 @@ export declare function getPackagePathsFromWorkspaceRootAsync(root: string): Pro
 /**
  * Read the `workspaces` property the monorepo root package.json, then process the workspace globs
  * into an array with names, paths, and package.json contents for each package (each "workspace"
- * in npm/yarn/pnpm terms). Returns an empty array if there's any issue.
+ * in npm/yarn/pnpm terms).
+ *
+ * @returns Array of monorepo package infos, or an empty array on error
  */
 export declare function getWorkspaceInfoFromWorkspaceRoot(root: string): import("../..").WorkspaceInfos;
 /**
  * Read the `workspaces` property the monorepo root package.json, then process the workspace globs
  * into an array with names, paths, and package.json contents for each package (each "workspace"
- * in npm/yarn/pnpm terms). Returns an empty array if there's any issue.
+ * in npm/yarn/pnpm terms).
  *
  * NOTE: As of writing, this will start promises to read all package.json files in parallel,
  * without direct concurrency control.
+ *
+ * @returns Array of monorepo package infos, or an empty array on error
  */
 export declare function getWorkspaceInfoFromWorkspaceRootAsync(root: string): Promise<import("../..").WorkspaceInfos>;

package/lib/workspaces/implementations/packageJsonWorkspaces.js

@@ -19,7 +19,7 @@ function getPackages(root) {
         packageJson = JSON.parse(fs_1.default.readFileSync(packageJsonFile, "utf-8"));
     }
     catch (e) {
-        throw new Error("Could not load package.json from workspaces root");
+        throw new Error("Could not load package.json from monorepo root");
     }
     const { workspaces } = packageJson;
     if (Array.isArray(workspaces)) {
@@ -65,7 +65,9 @@ exports.getPackagePathsFromWorkspaceRootAsync = getPackagePathsFromWorkspaceRoot
 /**
  * Read the `workspaces` property the monorepo root package.json, then process the workspace globs
  * into an array with names, paths, and package.json contents for each package (each "workspace"
- * in npm/yarn/pnpm terms). Returns an empty array if there's any issue.
+ * in npm/yarn/pnpm terms).
+ *
+ * @returns Array of monorepo package infos, or an empty array on error
  */
 function getWorkspaceInfoFromWorkspaceRoot(root) {
     try {
@@ -73,7 +75,7 @@ function getWorkspaceInfoFromWorkspaceRoot(root) {
         return (0, getWorkspacePackageInfo_1.getWorkspacePackageInfo)(packagePaths);
     }
     catch (err) {
-        (0, logging_1.logVerboseWarning)(`Error getting workspace info for ${root}`, err);
+        (0, logging_1.logVerboseWarning)(`Error getting workspace package infos for ${root}`, err);
         return [];
     }
 }
@@ -81,10 +83,12 @@ exports.getWorkspaceInfoFromWorkspaceRoot = getWorkspaceInfoFromWorkspaceRoot;
 /**
  * Read the `workspaces` property the monorepo root package.json, then process the workspace globs
  * into an array with names, paths, and package.json contents for each package (each "workspace"
- * in npm/yarn/pnpm terms). Returns an empty array if there's any issue.
+ * in npm/yarn/pnpm terms).
  *
  * NOTE: As of writing, this will start promises to read all package.json files in parallel,
  * without direct concurrency control.
+ *
+ * @returns Array of monorepo package infos, or an empty array on error
  */
 async function getWorkspaceInfoFromWorkspaceRootAsync(root) {
     try {
@@ -92,7 +96,7 @@ async function getWorkspaceInfoFromWorkspaceRootAsync(root) {
         return (0, getWorkspacePackageInfo_1.getWorkspacePackageInfoAsync)(packagePaths);
     }
     catch (err) {
-        (0, logging_1.logVerboseWarning)(`Error getting workspace info for ${root}`, err);
+        (0, logging_1.logVerboseWarning)(`Error getting workspace package infos for ${root}`, err);
         return [];
     }
 }

package/lib/workspaces/implementations/packageJsonWorkspaces.js.map

@@ -1 +1 @@
-{"version":3,"file":"packageJsonWorkspaces.js","sourceRoot":"","sources":["../../../src/workspaces/implementations/packageJsonWorkspaces.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,gDAAwB;AACxB,2DAA8E;AAC9E,wEAAmG;AACnG,2CAAkD;AAWlD;;GAEG;AACH,SAAS,WAAW,CAAC,IAAY;IAC/B,MAAM,eAAe,GAAG,cAAI,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAExD,IAAI,WAAsC,CAAC;IAC3C,IAAI;QACF,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,eAAe,EAAE,OAAO,CAAC,CAA8B,CAAC;KAClG;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;KACrE;IAED,MAAM,EAAE,UAAU,EAAE,GAAG,WAAW,CAAC;IAEnC,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;QAC7B,OAAO,UAAU,CAAC;KACnB;IAED,IAAI,CAAC,UAAU,EAAE,QAAQ,EAAE;QACzB,MAAM,IAAI,KAAK,CAAC,yFAAyF,CAAC,CAAC;KAC5G;IAED,OAAO,UAAU,CAAC,QAAQ,CAAC;AAC7B,CAAC;AAED;;;;GAIG;AACH,SAAgB,gCAAgC,CAAC,IAAY;IAC3D,IAAI;QACF,MAAM,YAAY,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;QACvC,OAAO,YAAY,CAAC,CAAC,CAAC,IAAA,iCAAe,EAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;KAChE;IAAC,OAAO,GAAG,EAAE;QACZ,IAAA,2BAAiB,EAAC,mCAAmC,IAAI,EAAE,EAAE,GAAG,CAAC,CAAC;QAClE,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AARD,4EAQC;AAED;;;;GAIG;AACI,KAAK,UAAU,qCAAqC,CAAC,IAAY;IACtE,IAAI;QACF,MAAM,YAAY,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;QACvC,OAAO,YAAY,CAAC,CAAC,CAAC,IAAA,sCAAoB,EAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;KACrE;IAAC,OAAO,GAAG,EAAE;QACZ,IAAA,2BAAiB,EAAC,mCAAmC,IAAI,EAAE,EAAE,GAAG,CAAC,CAAC;QAClE,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AARD,sFAQC;AAED;;;;GAIG;AACH,SAAgB,iCAAiC,CAAC,IAAY;IAC5D,IAAI;QACF,MAAM,YAAY,GAAG,gCAAgC,CAAC,IAAI,CAAC,CAAC;QAC5D,OAAO,IAAA,iDAAuB,EAAC,YAAY,CAAC,CAAC;KAC9C;IAAC,OAAO,GAAG,EAAE;QACZ,IAAA,2BAAiB,EAAC,oCAAoC,IAAI,EAAE,EAAE,GAAG,CAAC,CAAC;QACnE,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AARD,8EAQC;AAED;;;;;;;GAOG;AACI,KAAK,UAAU,sCAAsC,CAAC,IAAY;IACvE,IAAI;QACF,MAAM,YAAY,GAAG,MAAM,qCAAqC,CAAC,IAAI,CAAC,CAAC;QACvE,OAAO,IAAA,sDAA4B,EAAC,YAAY,CAAC,CAAC;KACnD;IAAC,OAAO,GAAG,EAAE;QACZ,IAAA,2BAAiB,EAAC,oCAAoC,IAAI,EAAE,EAAE,GAAG,CAAC,CAAC;QACnE,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AARD,wFAQC"}
+{"version":3,"file":"packageJsonWorkspaces.js","sourceRoot":"","sources":["../../../src/workspaces/implementations/packageJsonWorkspaces.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,gDAAwB;AACxB,2DAA8E;AAC9E,wEAAmG;AACnG,2CAAkD;AAKlD;;GAEG;AACH,SAAS,WAAW,CAAC,IAAY;IAC/B,MAAM,eAAe,GAAG,cAAI,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAExD,IAAI,WAAsC,CAAC;IAC3C,IAAI;QACF,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,eAAe,EAAE,OAAO,CAAC,CAA8B,CAAC;KAClG;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;KACnE;IAED,MAAM,EAAE,UAAU,EAAE,GAAG,WAAW,CAAC;IAEnC,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;QAC7B,OAAO,UAAU,CAAC;KACnB;IAED,IAAI,CAAC,UAAU,EAAE,QAAQ,EAAE;QACzB,MAAM,IAAI,KAAK,CAAC,yFAAyF,CAAC,CAAC;KAC5G;IAED,OAAO,UAAU,CAAC,QAAQ,CAAC;AAC7B,CAAC;AAED;;;;GAIG;AACH,SAAgB,gCAAgC,CAAC,IAAY;IAC3D,IAAI;QACF,MAAM,YAAY,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;QACvC,OAAO,YAAY,CAAC,CAAC,CAAC,IAAA,iCAAe,EAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;KAChE;IAAC,OAAO,GAAG,EAAE;QACZ,IAAA,2BAAiB,EAAC,mCAAmC,IAAI,EAAE,EAAE,GAAG,CAAC,CAAC;QAClE,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AARD,4EAQC;AAED;;;;GAIG;AACI,KAAK,UAAU,qCAAqC,CAAC,IAAY;IACtE,IAAI;QACF,MAAM,YAAY,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;QACvC,OAAO,YAAY,CAAC,CAAC,CAAC,IAAA,sCAAoB,EAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;KACrE;IAAC,OAAO,GAAG,EAAE;QACZ,IAAA,2BAAiB,EAAC,mCAAmC,IAAI,EAAE,EAAE,GAAG,CAAC,CAAC;QAClE,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AARD,sFAQC;AAED;;;;;;GAMG;AACH,SAAgB,iCAAiC,CAAC,IAAY;IAC5D,IAAI;QACF,MAAM,YAAY,GAAG,gCAAgC,CAAC,IAAI,CAAC,CAAC;QAC5D,OAAO,IAAA,iDAAuB,EAAC,YAAY,CAAC,CAAC;KAC9C;IAAC,OAAO,GAAG,EAAE;QACZ,IAAA,2BAAiB,EAAC,6CAA6C,IAAI,EAAE,EAAE,GAAG,CAAC,CAAC;QAC5E,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AARD,8EAQC;AAED;;;;;;;;;GASG;AACI,KAAK,UAAU,sCAAsC,CAAC,IAAY;IACvE,IAAI;QACF,MAAM,YAAY,GAAG,MAAM,qCAAqC,CAAC,IAAI,CAAC,CAAC;QACvE,OAAO,IAAA,sDAA4B,EAAC,YAAY,CAAC,CAAC;KACnD;IAAC,OAAO,GAAG,EAAE;QACZ,IAAA,2BAAiB,EAAC,6CAA6C,IAAI,EAAE,EAAE,GAAG,CAAC,CAAC;QAC5E,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AARD,wFAQC"}

package/lib/workspaces/implementations/pnpm.d.ts

@@ -2,16 +2,21 @@ import type { WorkspaceInfos } from "../../types/WorkspaceInfo";
 import type { Catalogs } from "../../types/Catalogs";
 /** @deprecated Use `getWorkspaceManagerRoot` */
 export declare function getPnpmWorkspaceRoot(cwd: string): string;
-/** Get paths for each package ("workspace") in a pnpm monorepo. */
+/**
+ * Get paths for each package ("workspace") in a pnpm monorepo.
+ * @returns Array of monorepo package paths, or an empty array on error
+ */
 export declare function getWorkspacePackagePaths(cwd: string): string[];
 /**
  * Get an array with names, paths, and package.json contents for each package ("workspace")
  * in a pnpm monorepo.
+ * @returns Array of monorepo package infos, or an empty array on error
  */
 export declare function getPnpmWorkspaces(cwd: string): WorkspaceInfos;
 /**
  * Get an array with names, paths, and package.json contents for each package ("workspace")
  * in a pnpm monorepo.
+ * @returns Array of monorepo package infos, or an empty array on error
  */
 export declare function getPnpmWorkspacesAsync(cwd: string): Promise<WorkspaceInfos>;
 /**

package/lib/workspaces/implementations/pnpm.js

@@ -10,7 +10,7 @@ const getWorkspacePackageInfo_1 = require("../getWorkspacePackageInfo");
 const readYaml_1 = require("../../lockfile/readYaml");
 const logging_1 = require("../../logging");
 const getWorkspaceManagerAndRoot_1 = require("./getWorkspaceManagerAndRoot");
-function getPnpmWorkspaceRootAndYaml(cwd) {
+function getPnpmRootAndYaml(cwd) {
     const root = getPnpmWorkspaceRoot(cwd);
     const pnpmWorkspacesFile = path_1.default.join(root, "pnpm-workspace.yaml");
     return { root, workspaceYaml: (0, readYaml_1.readYaml)(pnpmWorkspacesFile) };
@@ -19,15 +19,18 @@ function getPnpmWorkspaceRootAndYaml(cwd) {
 function getPnpmWorkspaceRoot(cwd) {
     const root = (0, getWorkspaceManagerAndRoot_1.getWorkspaceManagerAndRoot)(cwd, undefined, "pnpm")?.root;
     if (!root) {
-        throw new Error("Could not find pnpm workspace root from " + cwd);
+        throw new Error("Could not find pnpm root from " + cwd);
     }
     return root;
 }
 exports.getPnpmWorkspaceRoot = getPnpmWorkspaceRoot;
-/** Get paths for each package ("workspace") in a pnpm monorepo. */
+/**
+ * Get paths for each package ("workspace") in a pnpm monorepo.
+ * @returns Array of monorepo package paths, or an empty array on error
+ */
 function getWorkspacePackagePaths(cwd) {
     try {
-        const { root, workspaceYaml } = getPnpmWorkspaceRootAndYaml(cwd);
+        const { root, workspaceYaml } = getPnpmRootAndYaml(cwd);
         return (0, getPackagePaths_1.getPackagePaths)(root, workspaceYaml.packages);
     }
     catch (err) {
@@ -39,6 +42,7 @@ exports.getWorkspacePackagePaths = getWorkspacePackagePaths;
 /**
  * Get an array with names, paths, and package.json contents for each package ("workspace")
  * in a pnpm monorepo.
+ * @returns Array of monorepo package infos, or an empty array on error
  */
 function getPnpmWorkspaces(cwd) {
     try {
@@ -46,7 +50,7 @@ function getPnpmWorkspaces(cwd) {
         return (0, getWorkspacePackageInfo_1.getWorkspacePackageInfo)(packagePaths);
     }
     catch (err) {
-        (0, logging_1.logVerboseWarning)(`Error getting pnpm workspaces for ${cwd}`, err);
+        (0, logging_1.logVerboseWarning)(`Error getting pnpm workspace package infos for ${cwd}`, err);
         return [];
     }
 }
@@ -55,6 +59,7 @@ exports.getWorkspaces = getPnpmWorkspaces;
 /**
  * Get an array with names, paths, and package.json contents for each package ("workspace")
  * in a pnpm monorepo.
+ * @returns Array of monorepo package infos, or an empty array on error
  */
 async function getPnpmWorkspacesAsync(cwd) {
     try {
@@ -62,7 +67,7 @@ async function getPnpmWorkspacesAsync(cwd) {
         return (0, getWorkspacePackageInfo_1.getWorkspacePackageInfoAsync)(packagePaths);
     }
     catch (err) {
-        (0, logging_1.logVerboseWarning)(`Error getting pnpm workspaces for ${cwd}`, err);
+        (0, logging_1.logVerboseWarning)(`Error getting pnpm workspace package infos for ${cwd}`, err);
         return [];
     }
 }
@@ -75,13 +80,16 @@ exports.getWorkspacesAsync = getPnpmWorkspacesAsync;
  */
 function getPnpmCatalogs(cwd) {
     try {
-        const { workspaceYaml } = getPnpmWorkspaceRootAndYaml(cwd);
+        const { workspaceYaml } = getPnpmRootAndYaml(cwd);
         if (!workspaceYaml.catalog && !workspaceYaml.catalogs) {
             return undefined;
         }
+        // pnpm treats catalog: and catalog:default as the same (and errors if both are defined),
+        // so treat the catalog named "default" as the default if present.
+        const { default: namedDefaultCatalog, ...namedCatalogs } = workspaceYaml.catalogs || {};
         return {
-            default: workspaceYaml.catalog,
-            named: workspaceYaml.catalogs,
+            default: workspaceYaml.catalog || namedDefaultCatalog,
+            named: Object.keys(namedCatalogs).length ? namedCatalogs : undefined,
         };
     }
     catch (err) {

package/lib/workspaces/implementations/pnpm.js.map

@@ -1 +1 @@
-{"version":3,"file":"pnpm.js","sourceRoot":"","sources":["../../../src/workspaces/implementations/pnpm.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAExB,2DAAwD;AAExD,wEAAmG;AACnG,sDAAmD;AACnD,2CAAkD;AAClD,6EAA0E;AAU1E,SAAS,2BAA2B,CAAC,GAAW;IAC9C,MAAM,IAAI,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;IACvC,MAAM,kBAAkB,GAAG,cAAI,CAAC,IAAI,CAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC;IAClE,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,IAAA,mBAAQ,EAAoB,kBAAkB,CAAC,EAAE,CAAC;AAClF,CAAC;AAED,gDAAgD;AAChD,SAAgB,oBAAoB,CAAC,GAAW;IAC9C,MAAM,IAAI,GAAG,IAAA,uDAA0B,EAAC,GAAG,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC;IACtE,IAAI,CAAC,IAAI,EAAE;QACT,MAAM,IAAI,KAAK,CAAC,0CAA0C,GAAG,GAAG,CAAC,CAAC;KACnE;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAND,oDAMC;AAED,mEAAmE;AACnE,SAAgB,wBAAwB,CAAC,GAAW;IAClD,IAAI;QACF,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,2BAA2B,CAAC,GAAG,CAAC,CAAC;QAEjE,OAAO,IAAA,iCAAe,EAAC,IAAI,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC;KACtD;IAAC,OAAO,GAAG,EAAE;QACZ,IAAA,2BAAiB,EAAC,kDAAkD,GAAG,EAAE,EAAE,GAAG,CAAC,CAAC;QAChF,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AATD,4DASC;AAED;;;GAGG;AACH,SAAgB,iBAAiB,CAAC,GAAW;IAC3C,IAAI;QACF,MAAM,YAAY,GAAG,wBAAwB,CAAC,GAAG,CAAC,CAAC;QACnD,OAAO,IAAA,iDAAuB,EAAC,YAAY,CAAC,CAAC;KAC9C;IAAC,OAAO,GAAG,EAAE;QACZ,IAAA,2BAAiB,EAAC,qCAAqC,GAAG,EAAE,EAAE,GAAG,CAAC,CAAC;QACnE,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AARD,8CAQC;AAqC6B,0CAAa;AAnC3C;;;GAGG;AACI,KAAK,UAAU,sBAAsB,CAAC,GAAW;IACtD,IAAI;QACF,MAAM,YAAY,GAAG,wBAAwB,CAAC,GAAG,CAAC,CAAC;QACnD,OAAO,IAAA,sDAA4B,EAAC,YAAY,CAAC,CAAC;KACnD;IAAC,OAAO,GAAG,EAAE;QACZ,IAAA,2BAAiB,EAAC,qCAAqC,GAAG,EAAE,EAAE,GAAG,CAAC,CAAC;QACnE,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AARD,wDAQC;AAwBkC,oDAAkB;AAtBrD;;;;GAIG;AACH,SAAgB,eAAe,CAAC,GAAW;IACzC,IAAI;QACF,MAAM,EAAE,aAAa,EAAE,GAAG,2BAA2B,CAAC,GAAG,CAAC,CAAC;QAC3D,IAAI,CAAC,aAAa,CAAC,OAAO,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE;YACrD,OAAO,SAAS,CAAC;SAClB;QACD,OAAO;YACL,OAAO,EAAE,aAAa,CAAC,OAAO;YAC9B,KAAK,EAAE,aAAa,CAAC,QAAQ;SAC9B,CAAC;KACH;IAAC,OAAO,GAAG,EAAE;QACZ,IAAA,2BAAiB,EAAC,mCAAmC,GAAG,EAAE,EAAE,GAAG,CAAC,CAAC;QACjE,OAAO,SAAS,CAAC;KAClB;AACH,CAAC;AAdD,0CAcC;AAI2B,sCAAW"}
+{"version":3,"file":"pnpm.js","sourceRoot":"","sources":["../../../src/workspaces/implementations/pnpm.ts"],"names":[],"mappings":"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"}

package/lib/workspaces/implementations/rush.d.ts

@@ -1,16 +1,21 @@
 import type { WorkspaceInfos } from "../../types/WorkspaceInfo";
 /** @deprecated Use getWorkspaceRoot */
 export declare function getRushWorkspaceRoot(cwd: string): string;
-/** Get paths for each package ("workspace") in a rush monorepo. */
+/**
+ * Get paths for each package ("workspace") in a rush monorepo.
+ * @returns Array of monorepo package paths, or an empty array on error
+ */
 export declare function getWorkspacePackagePaths(cwd: string): string[];
 /**
  * Get an array with names, paths, and package.json contents for each package ("workspace")
  * in a rush monorepo.
+ * @returns Array of monorepo package infos, or an empty array on error
  */
 export declare function getRushWorkspaces(cwd: string): WorkspaceInfos;
 /**
  * Get an array with names, paths, and package.json contents for each package ("workspace")
  * in a rush monorepo.
+ * @returns Array of monorepo package infos, or an empty array on error
  */
 export declare function getRushWorkspacesAsync(cwd: string): Promise<WorkspaceInfos>;
 export { getRushWorkspaces as getWorkspaces };

package/lib/workspaces/implementations/rush.js

@@ -14,18 +14,20 @@ const getWorkspaceManagerAndRoot_1 = require("./getWorkspaceManagerAndRoot");
 function getRushWorkspaceRoot(cwd) {
     const root = (0, getWorkspaceManagerAndRoot_1.getWorkspaceManagerAndRoot)(cwd, undefined, "rush")?.root;
     if (!root) {
-        throw new Error("Could not find rush workspace root from " + cwd);
+        throw new Error("Could not find rush root from " + cwd);
     }
     return root;
 }
 exports.getRushWorkspaceRoot = getRushWorkspaceRoot;
-/** Get paths for each package ("workspace") in a rush monorepo. */
+/**
+ * Get paths for each package ("workspace") in a rush monorepo.
+ * @returns Array of monorepo package paths, or an empty array on error
+ */
 function getWorkspacePackagePaths(cwd) {
     try {
-        const rushWorkspaceRoot = getRushWorkspaceRoot(cwd);
-        const rushJsonPath = path_1.default.join(rushWorkspaceRoot, "rush.json");
+        const root = getRushWorkspaceRoot(cwd);
+        const rushJsonPath = path_1.default.join(root, "rush.json");
         const rushConfig = jju_1.default.parse(fs_1.default.readFileSync(rushJsonPath, "utf-8"));
-        const root = path_1.default.dirname(rushJsonPath);
         return rushConfig.projects.map((project) => path_1.default.join(root, project.projectFolder));
     }
     catch (err) {
@@ -37,6 +39,7 @@ exports.getWorkspacePackagePaths = getWorkspacePackagePaths;
 /**
  * Get an array with names, paths, and package.json contents for each package ("workspace")
  * in a rush monorepo.
+ * @returns Array of monorepo package infos, or an empty array on error
  */
 function getRushWorkspaces(cwd) {
     try {
@@ -44,7 +47,7 @@ function getRushWorkspaces(cwd) {
         return (0, getWorkspacePackageInfo_1.getWorkspacePackageInfo)(packagePaths);
     }
     catch (err) {
-        (0, logging_1.logVerboseWarning)(`Error getting rush workspaces for ${cwd}`, err);
+        (0, logging_1.logVerboseWarning)(`Error getting rush workspace package infos for ${cwd}`, err);
         return [];
     }
 }
@@ -53,6 +56,7 @@ exports.getWorkspaces = getRushWorkspaces;
 /**
  * Get an array with names, paths, and package.json contents for each package ("workspace")
  * in a rush monorepo.
+ * @returns Array of monorepo package infos, or an empty array on error
  */
 async function getRushWorkspacesAsync(cwd) {
     try {
@@ -60,7 +64,7 @@ async function getRushWorkspacesAsync(cwd) {
         return (0, getWorkspacePackageInfo_1.getWorkspacePackageInfoAsync)(packagePaths);
     }
     catch (err) {
-        (0, logging_1.logVerboseWarning)(`Error getting rush workspaces for ${cwd}`, err);
+        (0, logging_1.logVerboseWarning)(`Error getting rush workspace package infos for ${cwd}`, err);
         return [];
     }
 }

package/lib/workspaces/implementations/rush.js.map

@@ -1 +1 @@
-{"version":3,"file":"rush.js","sourceRoot":"","sources":["../../../src/workspaces/implementations/rush.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,8CAAsB;AACtB,4CAAoB;AAGpB,wEAAmG;AACnG,2CAAkD;AAClD,6EAA0E;AAE1E,uCAAuC;AACvC,SAAgB,oBAAoB,CAAC,GAAW;IAC9C,MAAM,IAAI,GAAG,IAAA,uDAA0B,EAAC,GAAG,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC;IACtE,IAAI,CAAC,IAAI,EAAE;QACT,MAAM,IAAI,KAAK,CAAC,0CAA0C,GAAG,GAAG,CAAC,CAAC;KACnE;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAND,oDAMC;AAED,mEAAmE;AACnE,SAAgB,wBAAwB,CAAC,GAAW;IAClD,IAAI;QACF,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;QACpD,MAAM,YAAY,GAAG,cAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC;QAE/D,MAAM,UAAU,GAAmD,aAAG,CAAC,KAAK,CAC1E,YAAE,CAAC,YAAY,CAAC,YAAY,EAAE,OAAO,CAAC,CACvC,CAAC;QACF,MAAM,IAAI,GAAG,cAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QACxC,OAAO,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,cAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC;KACrF;IAAC,OAAO,GAAG,EAAE;QACZ,IAAA,2BAAiB,EAAC,kDAAkD,GAAG,EAAE,EAAE,GAAG,CAAC,CAAC;QAChF,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AAdD,4DAcC;AAED;;;GAGG;AACH,SAAgB,iBAAiB,CAAC,GAAW;IAC3C,IAAI;QACF,MAAM,YAAY,GAAG,wBAAwB,CAAC,GAAG,CAAC,CAAC;QACnD,OAAO,IAAA,iDAAuB,EAAC,YAAY,CAAC,CAAC;KAC9C;IAAC,OAAO,GAAG,EAAE;QACZ,IAAA,2BAAiB,EAAC,qCAAqC,GAAG,EAAE,EAAE,GAAG,CAAC,CAAC;QACnE,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AARD,8CAQC;AAgB6B,0CAAa;AAd3C;;;GAGG;AACI,KAAK,UAAU,sBAAsB,CAAC,GAAW;IACtD,IAAI;QACF,MAAM,YAAY,GAAG,wBAAwB,CAAC,GAAG,CAAC,CAAC;QACnD,OAAO,IAAA,sDAA4B,EAAC,YAAY,CAAC,CAAC;KACnD;IAAC,OAAO,GAAG,EAAE;QACZ,IAAA,2BAAiB,EAAC,qCAAqC,GAAG,EAAE,EAAE,GAAG,CAAC,CAAC;QACnE,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AARD,wDAQC;AAGkC,oDAAkB"}
+{"version":3,"file":"rush.js","sourceRoot":"","sources":["../../../src/workspaces/implementations/rush.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,8CAAsB;AACtB,4CAAoB;AAGpB,wEAAmG;AACnG,2CAAkD;AAClD,6EAA0E;AAE1E,uCAAuC;AACvC,SAAgB,oBAAoB,CAAC,GAAW;IAC9C,MAAM,IAAI,GAAG,IAAA,uDAA0B,EAAC,GAAG,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC;IACtE,IAAI,CAAC,IAAI,EAAE;QACT,MAAM,IAAI,KAAK,CAAC,gCAAgC,GAAG,GAAG,CAAC,CAAC;KACzD;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAND,oDAMC;AAED;;;GAGG;AACH,SAAgB,wBAAwB,CAAC,GAAW;IAClD,IAAI;QACF,MAAM,IAAI,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;QACvC,MAAM,YAAY,GAAG,cAAI,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAElD,MAAM,UAAU,GAAmD,aAAG,CAAC,KAAK,CAC1E,YAAE,CAAC,YAAY,CAAC,YAAY,EAAE,OAAO,CAAC,CACvC,CAAC;QACF,OAAO,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,cAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC;KACrF;IAAC,OAAO,GAAG,EAAE;QACZ,IAAA,2BAAiB,EAAC,kDAAkD,GAAG,EAAE,EAAE,GAAG,CAAC,CAAC;QAChF,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AAbD,4DAaC;AAED;;;;GAIG;AACH,SAAgB,iBAAiB,CAAC,GAAW;IAC3C,IAAI;QACF,MAAM,YAAY,GAAG,wBAAwB,CAAC,GAAG,CAAC,CAAC;QACnD,OAAO,IAAA,iDAAuB,EAAC,YAAY,CAAC,CAAC;KAC9C;IAAC,OAAO,GAAG,EAAE;QACZ,IAAA,2BAAiB,EAAC,kDAAkD,GAAG,EAAE,EAAE,GAAG,CAAC,CAAC;QAChF,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AARD,8CAQC;AAiB6B,0CAAa;AAf3C;;;;GAIG;AACI,KAAK,UAAU,sBAAsB,CAAC,GAAW;IACtD,IAAI;QACF,MAAM,YAAY,GAAG,wBAAwB,CAAC,GAAG,CAAC,CAAC;QACnD,OAAO,IAAA,sDAA4B,EAAC,YAAY,CAAC,CAAC;KACnD;IAAC,OAAO,GAAG,EAAE;QACZ,IAAA,2BAAiB,EAAC,kDAAkD,GAAG,EAAE,EAAE,GAAG,CAAC,CAAC;QAChF,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AARD,wDAQC;AAGkC,oDAAkB"}

package/lib/workspaces/implementations/yarn.d.ts

@@ -2,18 +2,26 @@ import type { WorkspaceInfos } from "../../types/WorkspaceInfo";
 import type { Catalogs } from "../../types/Catalogs";
 /** @deprecated Use `getWorkspaceManagerRoot` */
 export declare function getYarnWorkspaceRoot(cwd: string): string;
-/** Get paths for each package ("workspace") in a yarn monorepo. */
+/**
+ * Get paths for each package ("workspace") in a yarn monorepo.
+ * @returns Array of monorepo package paths, or an empty array on error
+ */
 export declare function getWorkspacePackagePaths(cwd: string): string[];
-/** Get paths for each package ("workspace") in a yarn monorepo. */
+/**
+ * Get paths for each package ("workspace") in a yarn monorepo.
+ * @returns Array of monorepo package paths, or an empty array on error
+ */
 export declare function getWorkspacePackagePathsAsync(cwd: string): Promise<string[]>;
 /**
  * Get an array with names, paths, and package.json contents for each package ("workspace")
  * in a yarn monorepo.
+ * @returns Array of monorepo package infos, or an empty array on error
  */
 export declare function getYarnWorkspaces(cwd: string): WorkspaceInfos;
 /**
  * Get an array with names, paths, and package.json contents for each package ("workspace")
  * in a yarn monorepo.
+ * @returns Array of monorepo package infos, or an empty array on error
  */
 export declare function getYarnWorkspacesAsync(cwd: string): Promise<WorkspaceInfos>;
 /**