workspace-tools 0.31.0 → 0.33.0

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

@@ -1 +1 @@
-{"version":3,"file":"npm.js","sourceRoot":"","sources":["../../../src/workspaces/implementations/npm.ts"],"names":[],"mappings":";;;AACA,mEAIiC;AAEjC,SAAgB,mBAAmB,CAAC,GAAW;IAC7C,MAAM,iBAAiB,GAAG,IAAA,mDAA2B,EAAC,GAAG,CAAC,CAAC;IAE3D,IAAI,CAAC,iBAAiB,EAAE;QACtB,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;KACvD;IAED,OAAO,iBAAiB,CAAC;AAC3B,CAAC;AARD,kDAQC;AAED,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;AAEM,KAAK,UAAU,qBAAqB,CAAC,GAAW;IACrD,MAAM,iBAAiB,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC;IACnD,OAAO,MAAM,IAAA,8DAAsC,EAAC,iBAAiB,CAAC,CAAC;AACzE,CAAC;AAHD,sDAGC"}
+{"version":3,"file":"npm.js","sourceRoot":"","sources":["../../../src/workspaces/implementations/npm.ts"],"names":[],"mappings":";;;AAAA,wBAA+C;AAE/C,mEAAoH;AAEpH,SAAS,mBAAmB,CAAC,GAAW;;IACtC,MAAM,IAAI,GAAG,MAAA,IAAA,6BAA0B,EAAC,GAAG,EAAE,SAAS,EAAE,KAAK,CAAC,0CAAE,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;;;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"}

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

@@ -1,3 +1,10 @@
-export declare function getPackageJsonWorkspaceRoot(cwd: string): string | null;
+/**
+ * Get an array with names, paths, and package.json contents for each package in an npm/yarn workspace.
+ * (See `../getWorkspaces` for why it's named this way.)
+ */
 export declare function getWorkspaceInfoFromWorkspaceRoot(packageJsonWorkspacesRoot: string): import("../..").WorkspaceInfo;
+/**
+ * Get an array with names, paths, and package.json contents for each package in an npm/yarn workspace.
+ * (See `../getWorkspaces` for why it's named this way.)
+ */
 export declare function getWorkspaceInfoFromWorkspaceRootAsync(packageJsonWorkspacesRoot: string): Promise<import("../..").WorkspaceInfo>;

package/lib/workspaces/implementations/packageJsonWorkspaces.js

@@ -3,59 +3,61 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getWorkspaceInfoFromWorkspaceRootAsync = exports.getWorkspaceInfoFromWorkspaceRoot = exports.getPackageJsonWorkspaceRoot = void 0;
+exports.getWorkspaceInfoFromWorkspaceRootAsync = exports.getWorkspaceInfoFromWorkspaceRoot = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
-const _1 = require(".");
 const getPackagePaths_1 = require("../../getPackagePaths");
 const getWorkspacePackageInfo_1 = require("../getWorkspacePackageInfo");
-function getPackageJsonWorkspaceRoot(cwd) {
-    var _a;
-    const lockFile = (_a = (0, _1.getWorkspaceImplementationAndLockFile)(cwd)) === null || _a === void 0 ? void 0 : _a.lockFile;
-    const packageJsonWorkspacesRoot = lockFile ? path_1.default.dirname(lockFile) : cwd;
-    return packageJsonWorkspacesRoot;
-}
-exports.getPackageJsonWorkspaceRoot = getPackageJsonWorkspaceRoot;
-function getRootPackageJson(packageJsonWorkspacesRoot) {
+const logging_1 = require("../../logging");
+/**
+ * Read the workspace root package.json and get the list of package globs from its `workspaces` property.
+ */
+function getPackages(packageJsonWorkspacesRoot) {
     const packageJsonFile = path_1.default.join(packageJsonWorkspacesRoot, "package.json");
+    let packageJson;
     try {
-        const packageJson = JSON.parse(fs_1.default.readFileSync(packageJsonFile, "utf-8"));
-        return packageJson;
+        packageJson = JSON.parse(fs_1.default.readFileSync(packageJsonFile, "utf-8"));
     }
     catch (e) {
         throw new Error("Could not load package.json from workspaces root");
     }
-}
-function getPackages(packageJson) {
     const { workspaces } = packageJson;
-    if (workspaces && Array.isArray(workspaces)) {
+    if (Array.isArray(workspaces)) {
         return workspaces;
     }
-    if (!workspaces || !workspaces.packages) {
+    if (!(workspaces === null || workspaces === void 0 ? void 0 : workspaces.packages)) {
         throw new Error("Could not find a workspaces object in package.json");
     }
     return workspaces.packages;
 }
+/**
+ * Get an array with names, paths, and package.json contents for each package in an npm/yarn workspace.
+ * (See `../getWorkspaces` for why it's named this way.)
+ */
 function getWorkspaceInfoFromWorkspaceRoot(packageJsonWorkspacesRoot) {
     try {
-        const rootPackageJson = getRootPackageJson(packageJsonWorkspacesRoot);
-        const packages = getPackages(rootPackageJson);
-        const packagePaths = (0, getPackagePaths_1.getPackagePaths)(packageJsonWorkspacesRoot, packages);
+        const packageGlobs = getPackages(packageJsonWorkspacesRoot);
+        const packagePaths = (0, getPackagePaths_1.getPackagePaths)(packageJsonWorkspacesRoot, packageGlobs);
         return (0, getWorkspacePackageInfo_1.getWorkspacePackageInfo)(packagePaths);
     }
-    catch {
+    catch (err) {
+        (0, logging_1.logVerboseWarning)(`Error getting workspace info for ${packageJsonWorkspacesRoot}`, err);
         return [];
     }
 }
 exports.getWorkspaceInfoFromWorkspaceRoot = getWorkspaceInfoFromWorkspaceRoot;
+/**
+ * Get an array with names, paths, and package.json contents for each package in an npm/yarn workspace.
+ * (See `../getWorkspaces` for why it's named this way.)
+ */
 async function getWorkspaceInfoFromWorkspaceRootAsync(packageJsonWorkspacesRoot) {
     try {
-        const rootPackageJson = getRootPackageJson(packageJsonWorkspacesRoot);
-        const packages = getPackages(rootPackageJson);
-        const packagePaths = await (0, getPackagePaths_1.getPackagePathsAsync)(packageJsonWorkspacesRoot, packages);
+        const packageGlobs = getPackages(packageJsonWorkspacesRoot);
+        const packagePaths = await (0, getPackagePaths_1.getPackagePathsAsync)(packageJsonWorkspacesRoot, packageGlobs);
         return (0, getWorkspacePackageInfo_1.getWorkspacePackageInfoAsync)(packagePaths);
     }
-    catch {
+    catch (err) {
+        (0, logging_1.logVerboseWarning)(`Error getting workspace info for ${packageJsonWorkspacesRoot}`, 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,wBAA0D;AAC1D,2DAA8E;AAC9E,wEAAmG;AAWnG,SAAgB,2BAA2B,CAAC,GAAW;;IACrD,MAAM,QAAQ,GAAG,MAAA,IAAA,wCAAqC,EAAC,GAAG,CAAC,0CAAE,QAAQ,CAAC;IACtE,MAAM,yBAAyB,GAAG,QAAQ,CAAC,CAAC,CAAC,cAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IAC1E,OAAO,yBAAyB,CAAC;AACnC,CAAC;AAJD,kEAIC;AAED,SAAS,kBAAkB,CAAC,yBAAiC;IAC3D,MAAM,eAAe,GAAG,cAAI,CAAC,IAAI,CAAC,yBAAyB,EAAE,cAAc,CAAC,CAAC;IAE7E,IAAI;QACF,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC,CAAC;QAC1E,OAAO,WAAW,CAAC;KACpB;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;KACrE;AACH,CAAC;AAED,SAAS,WAAW,CAAC,WAAkC;IACrD,MAAM,EAAE,UAAU,EAAE,GAAG,WAAW,CAAC;IAEnC,IAAI,UAAU,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;QAC3C,OAAO,UAAU,CAAC;KACnB;IAED,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE;QACvC,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;KACvE;IAED,OAAO,UAAU,CAAC,QAAQ,CAAC;AAC7B,CAAC;AAED,SAAgB,iCAAiC,CAAC,yBAAiC;IACjF,IAAI;QACF,MAAM,eAAe,GAAG,kBAAkB,CAAC,yBAAyB,CAAC,CAAC;QACtE,MAAM,QAAQ,GAAG,WAAW,CAAC,eAAe,CAAC,CAAC;QAC9C,MAAM,YAAY,GAAG,IAAA,iCAAe,EAAC,yBAAyB,EAAE,QAAQ,CAAC,CAAC;QAC1E,OAAO,IAAA,iDAAuB,EAAC,YAAY,CAAC,CAAC;KAC9C;IAAC,MAAM;QACN,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AATD,8EASC;AAEM,KAAK,UAAU,sCAAsC,CAAC,yBAAiC;IAC5F,IAAI;QACF,MAAM,eAAe,GAAG,kBAAkB,CAAC,yBAAyB,CAAC,CAAC;QACtE,MAAM,QAAQ,GAAG,WAAW,CAAC,eAAe,CAAC,CAAC;QAC9C,MAAM,YAAY,GAAG,MAAM,IAAA,sCAAoB,EAAC,yBAAyB,EAAE,QAAQ,CAAC,CAAC;QACrF,OAAO,IAAA,sDAA4B,EAAC,YAAY,CAAC,CAAC;KACnD;IAAC,MAAM;QACN,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AATD,wFASC"}
+{"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,yBAAiC;IACpD,MAAM,eAAe,GAAG,cAAI,CAAC,IAAI,CAAC,yBAAyB,EAAE,cAAc,CAAC,CAAC;IAE7E,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,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,QAAQ,CAAA,EAAE;QACzB,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;KACvE;IAED,OAAO,UAAU,CAAC,QAAQ,CAAC;AAC7B,CAAC;AAED;;;GAGG;AACH,SAAgB,iCAAiC,CAAC,yBAAiC;IACjF,IAAI;QACF,MAAM,YAAY,GAAG,WAAW,CAAC,yBAAyB,CAAC,CAAC;QAC5D,MAAM,YAAY,GAAG,IAAA,iCAAe,EAAC,yBAAyB,EAAE,YAAY,CAAC,CAAC;QAC9E,OAAO,IAAA,iDAAuB,EAAC,YAAY,CAAC,CAAC;KAC9C;IAAC,OAAO,GAAG,EAAE;QACZ,IAAA,2BAAiB,EAAC,oCAAoC,yBAAyB,EAAE,EAAE,GAAG,CAAC,CAAC;QACxF,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AATD,8EASC;AAED;;;GAGG;AACI,KAAK,UAAU,sCAAsC,CAAC,yBAAiC;IAC5F,IAAI;QACF,MAAM,YAAY,GAAG,WAAW,CAAC,yBAAyB,CAAC,CAAC;QAC5D,MAAM,YAAY,GAAG,MAAM,IAAA,sCAAoB,EAAC,yBAAyB,EAAE,YAAY,CAAC,CAAC;QACzF,OAAO,IAAA,sDAA4B,EAAC,YAAY,CAAC,CAAC;KACnD;IAAC,OAAO,GAAG,EAAE;QACZ,IAAA,2BAAiB,EAAC,oCAAoC,yBAAyB,EAAE,EAAE,GAAG,CAAC,CAAC;QACxF,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AATD,wFASC"}

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

@@ -1,3 +1,9 @@
 import { WorkspaceInfo } from "../../types/WorkspaceInfo";
+/** @deprecated Use `getWorkspaceRoot` */
 export declare function getPnpmWorkspaceRoot(cwd: string): string;
+/**
+ * Get an array with names, paths, and package.json contents for each package in a pnpm workspace.
+ * (See `../getWorkspaces` for why it's named this way.)
+ */
 export declare function getPnpmWorkspaces(cwd: string): WorkspaceInfo;
+export { getPnpmWorkspaces as getWorkspaces };

package/lib/workspaces/implementations/pnpm.js

@@ -3,20 +3,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPnpmWorkspaces = exports.getPnpmWorkspaceRoot = void 0;
+exports.getWorkspaces = exports.getPnpmWorkspaces = exports.getPnpmWorkspaceRoot = void 0;
 const path_1 = __importDefault(require("path"));
 const getPackagePaths_1 = require("../../getPackagePaths");
 const getWorkspacePackageInfo_1 = require("../getWorkspacePackageInfo");
 const readYaml_1 = require("../../lockfile/readYaml");
-const paths_1 = require("../../paths");
+const logging_1 = require("../../logging");
+const getWorkspaceManagerAndRoot_1 = require("./getWorkspaceManagerAndRoot");
+/** @deprecated Use `getWorkspaceRoot` */
 function getPnpmWorkspaceRoot(cwd) {
-    const pnpmWorkspacesFile = (0, paths_1.searchUp)("pnpm-workspace.yaml", cwd);
-    if (!pnpmWorkspacesFile) {
-        throw new Error("Could not find pnpm workspaces root");
+    var _a;
+    const root = (_a = (0, getWorkspaceManagerAndRoot_1.getWorkspaceManagerAndRoot)(cwd, undefined, "pnpm")) === null || _a === void 0 ? void 0 : _a.root;
+    if (!root) {
+        throw new Error("Could not find pnpm workspace root from " + cwd);
     }
-    return path_1.default.dirname(pnpmWorkspacesFile);
+    return root;
 }
 exports.getPnpmWorkspaceRoot = getPnpmWorkspaceRoot;
+/**
+ * Get an array with names, paths, and package.json contents for each package in a pnpm workspace.
+ * (See `../getWorkspaces` for why it's named this way.)
+ */
 function getPnpmWorkspaces(cwd) {
     try {
         const pnpmWorkspacesRoot = getPnpmWorkspaceRoot(cwd);
@@ -26,9 +33,11 @@ function getPnpmWorkspaces(cwd) {
         const workspaceInfo = (0, getWorkspacePackageInfo_1.getWorkspacePackageInfo)(packagePaths);
         return workspaceInfo;
     }
-    catch {
+    catch (err) {
+        (0, logging_1.logVerboseWarning)(`Error getting pnpm workspaces for ${cwd}`, err);
         return [];
     }
 }
 exports.getPnpmWorkspaces = getPnpmWorkspaces;
+exports.getWorkspaces = getPnpmWorkspaces;
 //# sourceMappingURL=pnpm.js.map

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,wEAAqE;AACrE,sDAAmD;AACnD,uCAAuC;AAMvC,SAAgB,oBAAoB,CAAC,GAAW;IAC9C,MAAM,kBAAkB,GAAG,IAAA,gBAAQ,EAAC,qBAAqB,EAAE,GAAG,CAAC,CAAC;IAEhE,IAAI,CAAC,kBAAkB,EAAE;QACvB,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;KACxD;IAED,OAAO,cAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;AAC1C,CAAC;AARD,oDAQC;AAED,SAAgB,iBAAiB,CAAC,GAAW;IAC3C,IAAI;QACF,MAAM,kBAAkB,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;QACrD,MAAM,kBAAkB,GAAG,cAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,CAAC;QAEhF,MAAM,cAAc,GAAG,IAAA,mBAAQ,EAAC,kBAAkB,CAAmB,CAAC;QAEtE,MAAM,YAAY,GAAG,IAAA,iCAAe,EAAC,kBAAkB,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC;QAClF,MAAM,aAAa,GAAG,IAAA,iDAAuB,EAAC,YAAY,CAAC,CAAC;QAE5D,OAAO,aAAa,CAAC;KACtB;IAAC,MAAM;QACN,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AAdD,8CAcC"}
+{"version":3,"file":"pnpm.js","sourceRoot":"","sources":["../../../src/workspaces/implementations/pnpm.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAExB,2DAAwD;AAExD,wEAAqE;AACrE,sDAAmD;AACnD,2CAAkD;AAClD,6EAA0E;AAM1E,yCAAyC;AACzC,SAAgB,oBAAoB,CAAC,GAAW;;IAC9C,MAAM,IAAI,GAAG,MAAA,IAAA,uDAA0B,EAAC,GAAG,EAAE,SAAS,EAAE,MAAM,CAAC,0CAAE,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;;;GAGG;AACH,SAAgB,iBAAiB,CAAC,GAAW;IAC3C,IAAI;QACF,MAAM,kBAAkB,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;QACrD,MAAM,kBAAkB,GAAG,cAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,CAAC;QAEhF,MAAM,cAAc,GAAG,IAAA,mBAAQ,EAAC,kBAAkB,CAAsB,CAAC;QAEzE,MAAM,YAAY,GAAG,IAAA,iCAAe,EAAC,kBAAkB,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC;QAClF,MAAM,aAAa,GAAG,IAAA,iDAAuB,EAAC,YAAY,CAAC,CAAC;QAE5D,OAAO,aAAa,CAAC;KACtB;IAAC,OAAO,GAAG,EAAE;QACZ,IAAA,2BAAiB,EAAC,qCAAqC,GAAG,EAAE,EAAE,GAAG,CAAC,CAAC;QACnE,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AAfD,8CAeC;AAE6B,0CAAa"}

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

@@ -1,3 +1,9 @@
 import { WorkspaceInfo } from "../../types/WorkspaceInfo";
+/** @deprecated Use getWorkspaceRoot */
 export declare function getRushWorkspaceRoot(cwd: string): string;
+/**
+ * Get an array with names, paths, and package.json contents for each package in a rush workspace.
+ * (See `../getWorkspaces` for why it's named this way.)
+ */
 export declare function getRushWorkspaces(cwd: string): WorkspaceInfo;
+export { getRushWorkspaces as getWorkspaces };

package/lib/workspaces/implementations/rush.js

@@ -3,20 +3,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRushWorkspaces = exports.getRushWorkspaceRoot = void 0;
+exports.getWorkspaces = exports.getRushWorkspaces = exports.getRushWorkspaceRoot = void 0;
 const path_1 = __importDefault(require("path"));
 const jju_1 = __importDefault(require("jju"));
 const fs_1 = __importDefault(require("fs"));
 const getWorkspacePackageInfo_1 = require("../getWorkspacePackageInfo");
-const paths_1 = require("../../paths");
+const logging_1 = require("../../logging");
+const getWorkspaceManagerAndRoot_1 = require("./getWorkspaceManagerAndRoot");
+/** @deprecated Use getWorkspaceRoot */
 function getRushWorkspaceRoot(cwd) {
-    const rushJsonPath = (0, paths_1.searchUp)("rush.json", cwd);
-    if (!rushJsonPath) {
-        throw new Error("Could not find rush workspaces root");
+    var _a;
+    const root = (_a = (0, getWorkspaceManagerAndRoot_1.getWorkspaceManagerAndRoot)(cwd, undefined, "rush")) === null || _a === void 0 ? void 0 : _a.root;
+    if (!root) {
+        throw new Error("Could not find rush workspace root from " + cwd);
     }
-    return path_1.default.dirname(rushJsonPath);
+    return root;
 }
 exports.getRushWorkspaceRoot = getRushWorkspaceRoot;
+/**
+ * Get an array with names, paths, and package.json contents for each package in a rush workspace.
+ * (See `../getWorkspaces` for why it's named this way.)
+ */
 function getRushWorkspaces(cwd) {
     try {
         const rushWorkspaceRoot = getRushWorkspaceRoot(cwd);
@@ -25,9 +32,11 @@ function getRushWorkspaces(cwd) {
         const root = path_1.default.dirname(rushJsonPath);
         return (0, getWorkspacePackageInfo_1.getWorkspacePackageInfo)(rushConfig.projects.map((project) => path_1.default.join(root, project.projectFolder)));
     }
-    catch {
+    catch (err) {
+        (0, logging_1.logVerboseWarning)(`Error getting rush workspaces for ${cwd}`, err);
         return [];
     }
 }
 exports.getRushWorkspaces = getRushWorkspaces;
+exports.getWorkspaces = getRushWorkspaces;
 //# sourceMappingURL=rush.js.map

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,wEAAqE;AACrE,uCAAuC;AAEvC,SAAgB,oBAAoB,CAAC,GAAW;IAC9C,MAAM,YAAY,GAAG,IAAA,gBAAQ,EAAC,WAAW,EAAE,GAAG,CAAC,CAAC;IAEhD,IAAI,CAAC,YAAY,EAAE;QACjB,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;KACxD;IAED,OAAO,cAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;AACpC,CAAC;AARD,oDAQC;AAED,SAAgB,iBAAiB,CAAC,GAAW;IAC3C,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;QAExC,OAAO,IAAA,iDAAuB,EAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,cAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;KAC9G;IAAC,MAAM;QACN,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AAdD,8CAcC"}
+{"version":3,"file":"rush.js","sourceRoot":"","sources":["../../../src/workspaces/implementations/rush.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,8CAAsB;AACtB,4CAAoB;AAGpB,wEAAqE;AACrE,2CAAkD;AAClD,6EAA0E;AAE1E,uCAAuC;AACvC,SAAgB,oBAAoB,CAAC,GAAW;;IAC9C,MAAM,IAAI,GAAG,MAAA,IAAA,uDAA0B,EAAC,GAAG,EAAE,SAAS,EAAE,MAAM,CAAC,0CAAE,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;;;GAGG;AACH,SAAgB,iBAAiB,CAAC,GAAW;IAC3C,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;QAExC,OAAO,IAAA,iDAAuB,EAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,cAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;KAC9G;IAAC,OAAO,GAAG,EAAE;QACZ,IAAA,2BAAiB,EAAC,qCAAqC,GAAG,EAAE,EAAE,GAAG,CAAC,CAAC;QACnE,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AAfD,8CAeC;AAE6B,0CAAa"}

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

@@ -1,4 +1,15 @@
 import { WorkspaceInfo } from "../../types/WorkspaceInfo";
+/** @deprecated Use `getWorkspaceRoot` */
 export declare function getYarnWorkspaceRoot(cwd: string): string;
+/**
+ * Get an array with names, paths, and package.json contents for each package in a yarn workspace.
+ * (See `../getWorkspaces` for why it's named this way.)
+ */
 export declare function getYarnWorkspaces(cwd: string): WorkspaceInfo;
+/**
+ * Get an array with names, paths, and package.json contents for each package in a yarn workspace.
+ * (See `../getWorkspaces` for why it's named this way.)
+ */
 export declare function getYarnWorkspacesAsync(cwd: string): Promise<WorkspaceInfo>;
+export { getYarnWorkspaces as getWorkspaces };
+export { getYarnWorkspacesAsync as getWorkspacesAsync };

package/lib/workspaces/implementations/yarn.js

@@ -1,23 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getYarnWorkspacesAsync = exports.getYarnWorkspaces = exports.getYarnWorkspaceRoot = void 0;
+exports.getWorkspacesAsync = exports.getWorkspaces = exports.getYarnWorkspacesAsync = exports.getYarnWorkspaces = exports.getYarnWorkspaceRoot = void 0;
+const _1 = require(".");
 const packageJsonWorkspaces_1 = require("./packageJsonWorkspaces");
+/** @deprecated Use `getWorkspaceRoot` */
 function getYarnWorkspaceRoot(cwd) {
-    const yarnWorkspacesRoot = (0, packageJsonWorkspaces_1.getPackageJsonWorkspaceRoot)(cwd);
-    if (!yarnWorkspacesRoot) {
-        throw new Error("Could not find yarn workspaces root");
+    var _a;
+    const root = (_a = (0, _1.getWorkspaceManagerAndRoot)(cwd, undefined, "yarn")) === null || _a === void 0 ? void 0 : _a.root;
+    if (!root) {
+        throw new Error("Could not find yarn workspace root from " + cwd);
     }
-    return yarnWorkspacesRoot;
+    return root;
 }
 exports.getYarnWorkspaceRoot = getYarnWorkspaceRoot;
+/**
+ * Get an array with names, paths, and package.json contents for each package in a yarn workspace.
+ * (See `../getWorkspaces` for why it's named this way.)
+ */
 function getYarnWorkspaces(cwd) {
     const yarnWorkspacesRoot = getYarnWorkspaceRoot(cwd);
     return (0, packageJsonWorkspaces_1.getWorkspaceInfoFromWorkspaceRoot)(yarnWorkspacesRoot);
 }
 exports.getYarnWorkspaces = getYarnWorkspaces;
-async function getYarnWorkspacesAsync(cwd) {
+exports.getWorkspaces = getYarnWorkspaces;
+/**
+ * Get an array with names, paths, and package.json contents for each package in a yarn workspace.
+ * (See `../getWorkspaces` for why it's named this way.)
+ */
+function getYarnWorkspacesAsync(cwd) {
     const yarnWorkspacesRoot = getYarnWorkspaceRoot(cwd);
-    return await (0, packageJsonWorkspaces_1.getWorkspaceInfoFromWorkspaceRootAsync)(yarnWorkspacesRoot);
+    return (0, packageJsonWorkspaces_1.getWorkspaceInfoFromWorkspaceRootAsync)(yarnWorkspacesRoot);
 }
 exports.getYarnWorkspacesAsync = getYarnWorkspacesAsync;
+exports.getWorkspacesAsync = getYarnWorkspacesAsync;
 //# sourceMappingURL=yarn.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"yarn.js","sourceRoot":"","sources":["../../../src/workspaces/implementations/yarn.ts"],"names":[],"mappings":";;;AACA,mEAIiC;AAEjC,SAAgB,oBAAoB,CAAC,GAAW;IAC9C,MAAM,kBAAkB,GAAG,IAAA,mDAA2B,EAAC,GAAG,CAAC,CAAC;IAE5D,IAAI,CAAC,kBAAkB,EAAE;QACvB,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;KACxD;IAED,OAAO,kBAAkB,CAAC;AAC5B,CAAC;AARD,oDAQC;AAED,SAAgB,iBAAiB,CAAC,GAAW;IAC3C,MAAM,kBAAkB,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;IACrD,OAAO,IAAA,yDAAiC,EAAC,kBAAkB,CAAC,CAAC;AAC/D,CAAC;AAHD,8CAGC;AAEM,KAAK,UAAU,sBAAsB,CAAC,GAAW;IACtD,MAAM,kBAAkB,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;IACrD,OAAO,MAAM,IAAA,8DAAsC,EAAC,kBAAkB,CAAC,CAAC;AAC1E,CAAC;AAHD,wDAGC"}
+{"version":3,"file":"yarn.js","sourceRoot":"","sources":["../../../src/workspaces/implementations/yarn.ts"],"names":[],"mappings":";;;AAAA,wBAA+C;AAE/C,mEAAoH;AAEpH,yCAAyC;AACzC,SAAgB,oBAAoB,CAAC,GAAW;;IAC9C,MAAM,IAAI,GAAG,MAAA,IAAA,6BAA0B,EAAC,GAAG,EAAE,SAAS,EAAE,MAAM,CAAC,0CAAE,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;;;GAGG;AACH,SAAgB,iBAAiB,CAAC,GAAW;IAC3C,MAAM,kBAAkB,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;IACrD,OAAO,IAAA,yDAAiC,EAAC,kBAAkB,CAAC,CAAC;AAC/D,CAAC;AAHD,8CAGC;AAW6B,0CAAa;AAT3C;;;GAGG;AACH,SAAgB,sBAAsB,CAAC,GAAW;IAChD,MAAM,kBAAkB,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;IACrD,OAAO,IAAA,8DAAsC,EAAC,kBAAkB,CAAC,CAAC;AACpE,CAAC;AAHD,wDAGC;AAGkC,oDAAkB"}

package/lib/workspaces/workspaces.d.ts

@@ -1,7 +1,15 @@
 /**
- * Get paths to every package.json in the workspace, given a cwd
- * @param cwd
+ * Get paths to every package.json in the workspace, given a cwd.
+ *
+ * **WARNING**: On first call for a given `cwd`, this will **read ALL package.json files,
+ * not only their paths**!
  */
 export declare function getAllPackageJsonFiles(cwd: string): string[];
-export declare function _resetCache(): void;
+export declare function _resetPackageJsonFilesCache(): void;
+/**
+ * Get paths to every package.json in the workspace, given a cwd.
+ *
+ * **WARNING**: On first call for a given `cwd`, this will **read ALL package.json files,
+ * not only their paths**!
+ */
 export declare function getAllPackageJsonFilesAsync(cwd: string): Promise<string[]>;

package/lib/workspaces/workspaces.js

@@ -1,11 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAllPackageJsonFilesAsync = exports._resetCache = exports.getAllPackageJsonFiles = void 0;
+exports.getAllPackageJsonFilesAsync = exports._resetPackageJsonFilesCache = exports.getAllPackageJsonFiles = void 0;
 const getWorkspaces_1 = require("./getWorkspaces");
 const cache = new Map();
 /**
- * Get paths to every package.json in the workspace, given a cwd
- * @param cwd
+ * Get paths to every package.json in the workspace, given a cwd.
+ *
+ * **WARNING**: On first call for a given `cwd`, this will **read ALL package.json files,
+ * not only their paths**!
  */
 function getAllPackageJsonFiles(cwd) {
     if (cache.has(cwd)) {
@@ -17,10 +19,16 @@ function getAllPackageJsonFiles(cwd) {
     return packageJsonFiles;
 }
 exports.getAllPackageJsonFiles = getAllPackageJsonFiles;
-function _resetCache() {
+function _resetPackageJsonFilesCache() {
     cache.clear();
 }
-exports._resetCache = _resetCache;
+exports._resetPackageJsonFilesCache = _resetPackageJsonFilesCache;
+/**
+ * Get paths to every package.json in the workspace, given a cwd.
+ *
+ * **WARNING**: On first call for a given `cwd`, this will **read ALL package.json files,
+ * not only their paths**!
+ */
 async function getAllPackageJsonFilesAsync(cwd) {
     if (cache.has(cwd)) {
         return cache.get(cwd);

package/lib/workspaces/workspaces.js.map

@@ -1 +1 @@
-{"version":3,"file":"workspaces.js","sourceRoot":"","sources":["../../src/workspaces/workspaces.ts"],"names":[],"mappings":";;;AAAA,mDAAoE;AAEpE,MAAM,KAAK,GAAG,IAAI,GAAG,EAAoB,CAAC;AAE1C;;;GAGG;AACH,SAAgB,sBAAsB,CAAC,GAAW;IAChD,IAAI,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;QAClB,OAAO,KAAK,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC;KACxB;IAED,MAAM,UAAU,GAAG,IAAA,6BAAa,EAAC,GAAG,CAAC,CAAC;IACtC,MAAM,gBAAgB,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;IAE9F,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;IAEjC,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAXD,wDAWC;AAED,SAAgB,WAAW;IACzB,KAAK,CAAC,KAAK,EAAE,CAAC;AAChB,CAAC;AAFD,kCAEC;AAEM,KAAK,UAAU,2BAA2B,CAAC,GAAW;IAC3D,IAAI,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;QAClB,OAAO,KAAK,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC;KACxB;IAED,MAAM,UAAU,GAAG,MAAM,IAAA,kCAAkB,EAAC,GAAG,CAAC,CAAC;IACjD,MAAM,gBAAgB,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;IAE9F,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;IAEjC,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAXD,kEAWC"}
+{"version":3,"file":"workspaces.js","sourceRoot":"","sources":["../../src/workspaces/workspaces.ts"],"names":[],"mappings":";;;AAAA,mDAAoE;AAEpE,MAAM,KAAK,GAAG,IAAI,GAAG,EAAoB,CAAC;AAE1C;;;;;GAKG;AACH,SAAgB,sBAAsB,CAAC,GAAW;IAChD,IAAI,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;QAClB,OAAO,KAAK,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC;KACxB;IAED,MAAM,UAAU,GAAG,IAAA,6BAAa,EAAC,GAAG,CAAC,CAAC;IACtC,MAAM,gBAAgB,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;IAE9F,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;IAEjC,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAXD,wDAWC;AAED,SAAgB,2BAA2B;IACzC,KAAK,CAAC,KAAK,EAAE,CAAC;AAChB,CAAC;AAFD,kEAEC;AAED;;;;;GAKG;AACI,KAAK,UAAU,2BAA2B,CAAC,GAAW;IAC3D,IAAI,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;QAClB,OAAO,KAAK,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC;KACxB;IAED,MAAM,UAAU,GAAG,MAAM,IAAA,kCAAkB,EAAC,GAAG,CAAC,CAAC;IACjD,MAAM,gBAAgB,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;IAE9F,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;IAEjC,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAXD,kEAWC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "workspace-tools",
-  "version": "0.31.0",
+  "version": "0.33.0",
   "license": "MIT",
   "repository": {
     "type": "git",