workspace-tools 0.38.4 → 0.38.5

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

@@ -1,17 +1,25 @@
-import { WorkspaceInfo } from "../../types/WorkspaceInfo";
-/** @deprecated Use `getWorkspaceRoot` */
+import type { WorkspaceInfos } from "../../types/WorkspaceInfo";
+import type { Catalogs } from "../../types/Catalogs";
+/** @deprecated Use `getWorkspaceManagerRoot` */
 export declare function getPnpmWorkspaceRoot(cwd: string): string;
-/** Get package paths for a pnpm workspace. */
+/** Get paths for each package ("workspace") in a pnpm monorepo. */
 export declare function getWorkspacePackagePaths(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.)
+ * Get an array with names, paths, and package.json contents for each package ("workspace")
+ * in a pnpm monorepo.
  */
-export declare function getPnpmWorkspaces(cwd: string): WorkspaceInfo;
+export declare function getPnpmWorkspaces(cwd: string): WorkspaceInfos;
 /**
- * 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.)
+ * Get an array with names, paths, and package.json contents for each package ("workspace")
+ * in a pnpm monorepo.
  */
-export declare function getPnpmWorkspacesAsync(cwd: string): Promise<WorkspaceInfo>;
+export declare function getPnpmWorkspacesAsync(cwd: string): Promise<WorkspaceInfos>;
+/**
+ * Get version catalogs if present.
+ * Returns undefined if there's no catalog, or any issue reading or parsing.
+ * @see https://pnpm.io/catalogs
+ */
+export declare function getPnpmCatalogs(cwd: string): Catalogs | undefined;
 export { getPnpmWorkspaces as getWorkspaces };
 export { getPnpmWorkspacesAsync as getWorkspacesAsync };
+export { getPnpmCatalogs as getCatalogs };

package/lib/workspaces/implementations/pnpm.js

@@ -3,14 +3,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getWorkspacesAsync = exports.getWorkspaces = exports.getPnpmWorkspacesAsync = exports.getPnpmWorkspaces = exports.getWorkspacePackagePaths = exports.getPnpmWorkspaceRoot = void 0;
+exports.getCatalogs = exports.getWorkspacesAsync = exports.getWorkspaces = exports.getPnpmCatalogs = exports.getPnpmWorkspacesAsync = exports.getPnpmWorkspaces = exports.getWorkspacePackagePaths = 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 logging_1 = require("../../logging");
 const getWorkspaceManagerAndRoot_1 = require("./getWorkspaceManagerAndRoot");
-/** @deprecated Use `getWorkspaceRoot` */
+function getPnpmWorkspaceRootAndYaml(cwd) {
+    const root = getPnpmWorkspaceRoot(cwd);
+    const pnpmWorkspacesFile = path_1.default.join(root, "pnpm-workspace.yaml");
+    return { root, workspaceYaml: (0, readYaml_1.readYaml)(pnpmWorkspacesFile) };
+}
+/** @deprecated Use `getWorkspaceManagerRoot` */
 function getPnpmWorkspaceRoot(cwd) {
     const root = (0, getWorkspaceManagerAndRoot_1.getWorkspaceManagerAndRoot)(cwd, undefined, "pnpm")?.root;
     if (!root) {
@@ -19,13 +24,11 @@ function getPnpmWorkspaceRoot(cwd) {
     return root;
 }
 exports.getPnpmWorkspaceRoot = getPnpmWorkspaceRoot;
-/** Get package paths for a pnpm workspace. */
+/** Get paths for each package ("workspace") in a pnpm monorepo. */
 function getWorkspacePackagePaths(cwd) {
     try {
-        const pnpmWorkspacesRoot = getPnpmWorkspaceRoot(cwd);
-        const pnpmWorkspacesFile = path_1.default.join(pnpmWorkspacesRoot, "pnpm-workspace.yaml");
-        const pnpmWorkspaces = (0, readYaml_1.readYaml)(pnpmWorkspacesFile);
-        return (0, getPackagePaths_1.getPackagePaths)(pnpmWorkspacesRoot, pnpmWorkspaces.packages);
+        const { root, workspaceYaml } = getPnpmWorkspaceRootAndYaml(cwd);
+        return (0, getPackagePaths_1.getPackagePaths)(root, workspaceYaml.packages);
     }
     catch (err) {
         (0, logging_1.logVerboseWarning)(`Error getting pnpm workspace package paths for ${cwd}`, err);
@@ -34,8 +37,8 @@ function getWorkspacePackagePaths(cwd) {
 }
 exports.getWorkspacePackagePaths = getWorkspacePackagePaths;
 /**
- * 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.)
+ * Get an array with names, paths, and package.json contents for each package ("workspace")
+ * in a pnpm monorepo.
  */
 function getPnpmWorkspaces(cwd) {
     try {
@@ -50,8 +53,8 @@ function getPnpmWorkspaces(cwd) {
 exports.getPnpmWorkspaces = getPnpmWorkspaces;
 exports.getWorkspaces = getPnpmWorkspaces;
 /**
- * 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.)
+ * Get an array with names, paths, and package.json contents for each package ("workspace")
+ * in a pnpm monorepo.
  */
 async function getPnpmWorkspacesAsync(cwd) {
     try {
@@ -65,4 +68,27 @@ async function getPnpmWorkspacesAsync(cwd) {
 }
 exports.getPnpmWorkspacesAsync = getPnpmWorkspacesAsync;
 exports.getWorkspacesAsync = getPnpmWorkspacesAsync;
+/**
+ * Get version catalogs if present.
+ * Returns undefined if there's no catalog, or any issue reading or parsing.
+ * @see https://pnpm.io/catalogs
+ */
+function getPnpmCatalogs(cwd) {
+    try {
+        const { workspaceYaml } = getPnpmWorkspaceRootAndYaml(cwd);
+        if (!workspaceYaml.catalog && !workspaceYaml.catalogs) {
+            return undefined;
+        }
+        return {
+            default: workspaceYaml.catalog,
+            named: workspaceYaml.catalogs,
+        };
+    }
+    catch (err) {
+        (0, logging_1.logVerboseWarning)(`Error getting pnpm catalogs for ${cwd}`, err);
+        return undefined;
+    }
+}
+exports.getPnpmCatalogs = getPnpmCatalogs;
+exports.getCatalogs = getPnpmCatalogs;
 //# 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,wEAAmG;AACnG,sDAAmD;AACnD,2CAAkD;AAClD,6EAA0E;AAM1E,yCAAyC;AACzC,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,8CAA8C;AAC9C,SAAgB,wBAAwB,CAAC,GAAW;IAClD,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,OAAO,IAAA,iCAAe,EAAC,kBAAkB,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC;KACrE;IAAC,OAAO,GAAG,EAAE;QACZ,IAAA,2BAAiB,EAAC,kDAAkD,GAAG,EAAE,EAAE,GAAG,CAAC,CAAC;QAChF,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AAZD,4DAYC;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":"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"}

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

@@ -1,17 +1,17 @@
-import { WorkspaceInfo } from "../../types/WorkspaceInfo";
+import type { WorkspaceInfos } from "../../types/WorkspaceInfo";
 /** @deprecated Use getWorkspaceRoot */
 export declare function getRushWorkspaceRoot(cwd: string): string;
-/** Get package paths for a rush workspace. */
+/** Get paths for each package ("workspace") in a rush monorepo. */
 export declare function getWorkspacePackagePaths(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.)
+ * Get an array with names, paths, and package.json contents for each package ("workspace")
+ * in a rush monorepo.
  */
-export declare function getRushWorkspaces(cwd: string): WorkspaceInfo;
+export declare function getRushWorkspaces(cwd: string): WorkspaceInfos;
 /**
- * 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.)
+ * Get an array with names, paths, and package.json contents for each package ("workspace")
+ * in a rush monorepo.
  */
-export declare function getRushWorkspacesAsync(cwd: string): Promise<WorkspaceInfo>;
+export declare function getRushWorkspacesAsync(cwd: string): Promise<WorkspaceInfos>;
 export { getRushWorkspaces as getWorkspaces };
 export { getRushWorkspacesAsync as getWorkspacesAsync };

package/lib/workspaces/implementations/rush.js

@@ -19,7 +19,7 @@ function getRushWorkspaceRoot(cwd) {
     return root;
 }
 exports.getRushWorkspaceRoot = getRushWorkspaceRoot;
-/** Get package paths for a rush workspace. */
+/** Get paths for each package ("workspace") in a rush monorepo. */
 function getWorkspacePackagePaths(cwd) {
     try {
         const rushWorkspaceRoot = getRushWorkspaceRoot(cwd);
@@ -35,8 +35,8 @@ function getWorkspacePackagePaths(cwd) {
 }
 exports.getWorkspacePackagePaths = getWorkspacePackagePaths;
 /**
- * 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.)
+ * Get an array with names, paths, and package.json contents for each package ("workspace")
+ * in a rush monorepo.
  */
 function getRushWorkspaces(cwd) {
     try {
@@ -51,8 +51,8 @@ function getRushWorkspaces(cwd) {
 exports.getRushWorkspaces = getRushWorkspaces;
 exports.getWorkspaces = getRushWorkspaces;
 /**
- * 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.)
+ * Get an array with names, paths, and package.json contents for each package ("workspace")
+ * in a rush monorepo.
  */
 async function getRushWorkspacesAsync(cwd) {
     try {

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,8CAA8C;AAC9C,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,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"}

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

@@ -1,19 +1,27 @@
-import { WorkspaceInfo } from "../../types/WorkspaceInfo";
-/** @deprecated Use `getWorkspaceRoot` */
+import type { WorkspaceInfos } from "../../types/WorkspaceInfo";
+import type { Catalogs } from "../../types/Catalogs";
+/** @deprecated Use `getWorkspaceManagerRoot` */
 export declare function getYarnWorkspaceRoot(cwd: string): string;
-/** Get package paths for a yarn workspace. */
+/** Get paths for each package ("workspace") in a yarn monorepo. */
 export declare function getWorkspacePackagePaths(cwd: string): string[];
-/** Get package paths for a yarn workspace. */
+/** Get paths for each package ("workspace") in a yarn monorepo. */
 export declare function getWorkspacePackagePathsAsync(cwd: string): Promise<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.)
+ * Get an array with names, paths, and package.json contents for each package ("workspace")
+ * in a yarn monorepo.
  */
-export declare function getYarnWorkspaces(cwd: string): WorkspaceInfo;
+export declare function getYarnWorkspaces(cwd: string): WorkspaceInfos;
 /**
- * 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.)
+ * Get an array with names, paths, and package.json contents for each package ("workspace")
+ * in a yarn monorepo.
  */
-export declare function getYarnWorkspacesAsync(cwd: string): Promise<WorkspaceInfo>;
+export declare function getYarnWorkspacesAsync(cwd: string): Promise<WorkspaceInfos>;
+/**
+ * Get version catalogs if present.
+ * Returns undefined if there's no catalog, or any issue reading or parsing.
+ * @see https://yarnpkg.com/features/catalogs
+ */
+export declare function getYarnCatalogs(cwd: string): Catalogs | undefined;
 export { getYarnWorkspaces as getWorkspaces };
 export { getYarnWorkspacesAsync as getWorkspacesAsync };
+export { getYarnCatalogs as getCatalogs };

package/lib/workspaces/implementations/yarn.js

@@ -1,32 +1,40 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getWorkspacesAsync = exports.getWorkspaces = exports.getYarnWorkspacesAsync = exports.getYarnWorkspaces = exports.getWorkspacePackagePathsAsync = exports.getWorkspacePackagePaths = exports.getYarnWorkspaceRoot = void 0;
-const _1 = require(".");
+exports.getCatalogs = exports.getWorkspacesAsync = exports.getWorkspaces = exports.getYarnCatalogs = exports.getYarnWorkspacesAsync = exports.getYarnWorkspaces = exports.getWorkspacePackagePathsAsync = exports.getWorkspacePackagePaths = exports.getYarnWorkspaceRoot = void 0;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const index_1 = require("./index");
 const packageJsonWorkspaces_1 = require("./packageJsonWorkspaces");
-/** @deprecated Use `getWorkspaceRoot` */
+const readPackageInfo_1 = require("../readPackageInfo");
+const logging_1 = require("../../logging");
+const readYaml_1 = require("../../lockfile/readYaml");
+/** @deprecated Use `getWorkspaceManagerRoot` */
 function getYarnWorkspaceRoot(cwd) {
-    const root = (0, _1.getWorkspaceManagerAndRoot)(cwd, undefined, "yarn")?.root;
+    const root = (0, index_1.getWorkspaceManagerAndRoot)(cwd, undefined, "yarn")?.root;
     if (!root) {
         throw new Error("Could not find yarn workspace root from " + cwd);
     }
     return root;
 }
 exports.getYarnWorkspaceRoot = getYarnWorkspaceRoot;
-/** Get package paths for a yarn workspace. */
+/** Get paths for each package ("workspace") in a yarn monorepo. */
 function getWorkspacePackagePaths(cwd) {
     const yarnWorkspacesRoot = getYarnWorkspaceRoot(cwd);
     return (0, packageJsonWorkspaces_1.getPackagePathsFromWorkspaceRoot)(yarnWorkspacesRoot);
 }
 exports.getWorkspacePackagePaths = getWorkspacePackagePaths;
-/** Get package paths for a yarn workspace. */
+/** Get paths for each package ("workspace") in a yarn monorepo. */
 function getWorkspacePackagePathsAsync(cwd) {
     const yarnWorkspacesRoot = getYarnWorkspaceRoot(cwd);
     return (0, packageJsonWorkspaces_1.getPackagePathsFromWorkspaceRootAsync)(yarnWorkspacesRoot);
 }
 exports.getWorkspacePackagePathsAsync = getWorkspacePackagePathsAsync;
 /**
- * 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.)
+ * Get an array with names, paths, and package.json contents for each package ("workspace")
+ * in a yarn monorepo.
  */
 function getYarnWorkspaces(cwd) {
     const yarnWorkspacesRoot = getYarnWorkspaceRoot(cwd);
@@ -35,8 +43,8 @@ function getYarnWorkspaces(cwd) {
 exports.getYarnWorkspaces = getYarnWorkspaces;
 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.)
+ * Get an array with names, paths, and package.json contents for each package ("workspace")
+ * in a yarn monorepo.
  */
 function getYarnWorkspacesAsync(cwd) {
     const yarnWorkspacesRoot = getYarnWorkspaceRoot(cwd);
@@ -44,4 +52,37 @@ function getYarnWorkspacesAsync(cwd) {
 }
 exports.getYarnWorkspacesAsync = getYarnWorkspacesAsync;
 exports.getWorkspacesAsync = getYarnWorkspacesAsync;
+/**
+ * Get version catalogs if present.
+ * Returns undefined if there's no catalog, or any issue reading or parsing.
+ * @see https://yarnpkg.com/features/catalogs
+ */
+function getYarnCatalogs(cwd) {
+    try {
+        const root = getYarnWorkspaceRoot(cwd);
+        const yarnrcYmlPath = path_1.default.join(root, ".yarnrc.yml");
+        if (fs_1.default.existsSync(yarnrcYmlPath)) {
+            const yarnrcYml = (0, readYaml_1.readYaml)(yarnrcYmlPath);
+            if (yarnrcYml?.catalog || yarnrcYml?.catalogs) {
+                // Yarn v4+ format
+                return { default: yarnrcYml.catalog, named: yarnrcYml.catalogs };
+            }
+        }
+        else {
+            // Check for midgard-yarn-strict definition of catalogs in package.json
+            const workspaceSettings = (0, readPackageInfo_1.readPackageInfo)(root)?.workspaces;
+            if (workspaceSettings &&
+                !Array.isArray(workspaceSettings) &&
+                (workspaceSettings?.catalog || workspaceSettings?.catalogs)) {
+                return { named: workspaceSettings.catalogs, default: workspaceSettings.catalog };
+            }
+        }
+    }
+    catch (err) {
+        (0, logging_1.logVerboseWarning)(`Error getting yarn catalogs for ${cwd}`, err);
+        return undefined;
+    }
+}
+exports.getYarnCatalogs = getYarnCatalogs;
+exports.getCatalogs = getYarnCatalogs;
 //# 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":";;;AAAA,wBAA+C;AAE/C,mEAKiC;AAEjC,yCAAyC;AACzC,SAAgB,oBAAoB,CAAC,GAAW;IAC9C,MAAM,IAAI,GAAG,IAAA,6BAA0B,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,8CAA8C;AAC9C,SAAgB,wBAAwB,CAAC,GAAW;IAClD,MAAM,kBAAkB,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;IACrD,OAAO,IAAA,wDAAgC,EAAC,kBAAkB,CAAC,CAAC;AAC9D,CAAC;AAHD,4DAGC;AAED,8CAA8C;AAC9C,SAAgB,6BAA6B,CAAC,GAAW;IACvD,MAAM,kBAAkB,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;IACrD,OAAO,IAAA,6DAAqC,EAAC,kBAAkB,CAAC,CAAC;AACnE,CAAC;AAHD,sEAGC;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"}
+{"version":3,"file":"yarn.js","sourceRoot":"","sources":["../../../src/workspaces/implementations/yarn.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,gDAAwB;AACxB,mCAAqD;AAErD,mEAKiC;AACjC,wDAAqD;AAErD,2CAAkD;AAClD,sDAAmD;AAEnD,gDAAgD;AAChD,SAAgB,oBAAoB,CAAC,GAAW;IAC9C,MAAM,IAAI,GAAG,IAAA,kCAA0B,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,MAAM,kBAAkB,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;IACrD,OAAO,IAAA,wDAAgC,EAAC,kBAAkB,CAAC,CAAC;AAC9D,CAAC;AAHD,4DAGC;AAED,mEAAmE;AACnE,SAAgB,6BAA6B,CAAC,GAAW;IACvD,MAAM,kBAAkB,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;IACrD,OAAO,IAAA,6DAAqC,EAAC,kBAAkB,CAAC,CAAC;AACnE,CAAC;AAHD,sEAGC;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;AA2C6B,0CAAa;AAzC3C;;;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;AAmCkC,oDAAkB;AAjCrD;;;;GAIG;AACH,SAAgB,eAAe,CAAC,GAAW;IACzC,IAAI;QACF,MAAM,IAAI,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;QACvC,MAAM,aAAa,GAAG,cAAI,CAAC,IAAI,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;QACrD,IAAI,YAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE;YAChC,MAAM,SAAS,GAAG,IAAA,mBAAQ,EAAkD,aAAa,CAAC,CAAC;YAC3F,IAAI,SAAS,EAAE,OAAO,IAAI,SAAS,EAAE,QAAQ,EAAE;gBAC7C,kBAAkB;gBAClB,OAAO,EAAE,OAAO,EAAE,SAAS,CAAC,OAAO,EAAE,KAAK,EAAE,SAAS,CAAC,QAAQ,EAAE,CAAC;aAClE;SACF;aAAM;YACL,uEAAuE;YACvE,MAAM,iBAAiB,GAAG,IAAA,iCAAe,EAAC,IAAI,CAAC,EAAE,UAAU,CAAC;YAC5D,IACE,iBAAiB;gBACjB,CAAC,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC;gBACjC,CAAC,iBAAiB,EAAE,OAAO,IAAI,iBAAiB,EAAE,QAAQ,CAAC,EAC3D;gBACA,OAAO,EAAE,KAAK,EAAE,iBAAiB,CAAC,QAAQ,EAAE,OAAO,EAAE,iBAAiB,CAAC,OAAO,EAAE,CAAC;aAClF;SACF;KACF;IAAC,OAAO,GAAG,EAAE;QACZ,IAAA,2BAAiB,EAAC,mCAAmC,GAAG,EAAE,EAAE,GAAG,CAAC,CAAC;QACjE,OAAO,SAAS,CAAC;KAClB;AACH,CAAC;AAzBD,0CAyBC;AAI2B,sCAAW"}

package/lib/workspaces/listOfWorkspacePackageNames.d.ts

@@ -1,2 +1,5 @@
-import { WorkspaceInfo } from "../types/WorkspaceInfo";
-export declare function listOfWorkspacePackageNames(workspaces: WorkspaceInfo): string[];
+import type { WorkspaceInfos } from "../types/WorkspaceInfo";
+/**
+ * @deprecated Just write `workspaces.map(w => w.name)` directly
+ */
+export declare function listOfWorkspacePackageNames(workspaces: WorkspaceInfos): string[];

package/lib/workspaces/listOfWorkspacePackageNames.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.listOfWorkspacePackageNames = void 0;
+/**
+ * @deprecated Just write `workspaces.map(w => w.name)` directly
+ */
 function listOfWorkspacePackageNames(workspaces) {
     return workspaces.map(({ name }) => name);
 }

package/lib/workspaces/listOfWorkspacePackageNames.js.map

@@ -1 +1 @@
-{"version":3,"file":"listOfWorkspacePackageNames.js","sourceRoot":"","sources":["../../src/workspaces/listOfWorkspacePackageNames.ts"],"names":[],"mappings":";;;AAEA,SAAgB,2BAA2B,CAAC,UAAyB;IACnE,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;AAC5C,CAAC;AAFD,kEAEC"}
+{"version":3,"file":"listOfWorkspacePackageNames.js","sourceRoot":"","sources":["../../src/workspaces/listOfWorkspacePackageNames.ts"],"names":[],"mappings":";;;AAEA;;GAEG;AACH,SAAgB,2BAA2B,CAAC,UAA0B;IACpE,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;AAC5C,CAAC;AAFD,kEAEC"}

package/lib/workspaces/readPackageInfo.d.ts

@@ -0,0 +1,13 @@
+import type { PackageInfo } from "../types/PackageInfo";
+/**
+ * Read package.json from the given path if it exists.
+ * Logs a warning if it doesn't exist, or there's an error reading or parsing it.
+ * @returns The package info, or undefined if it doesn't exist or can't be read
+ */
+export declare function readPackageInfo(cwd: string): PackageInfo | undefined;
+/**
+ * Read package.json from the given path if it exists.
+ * Logs a warning if it doesn't exist, or there's an error reading or parsing it.
+ * @returns The package info, or undefined if it doesn't exist or can't be read
+ */
+export declare function readPackageInfoAsync(cwd: string): Promise<PackageInfo | undefined>;

package/lib/workspaces/readPackageInfo.js

@@ -0,0 +1,52 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.readPackageInfoAsync = exports.readPackageInfo = void 0;
+const fs_1 = __importDefault(require("fs"));
+const promises_1 = __importDefault(require("fs/promises"));
+const path_1 = __importDefault(require("path"));
+const infoFromPackageJson_1 = require("../infoFromPackageJson");
+const logging_1 = require("../logging");
+/**
+ * Read package.json from the given path if it exists.
+ * Logs a warning if it doesn't exist, or there's an error reading or parsing it.
+ * @returns The package info, or undefined if it doesn't exist or can't be read
+ */
+function readPackageInfo(cwd) {
+    const packageJsonPath = path_1.default.join(cwd, "package.json");
+    try {
+        if (!fs_1.default.existsSync(packageJsonPath)) {
+            (0, logging_1.logVerboseWarning)(`File does not exist: ${packageJsonPath}`);
+            return undefined;
+        }
+        const packageJson = JSON.parse(fs_1.default.readFileSync(packageJsonPath, "utf-8"));
+        return (0, infoFromPackageJson_1.infoFromPackageJson)(packageJson, packageJsonPath);
+    }
+    catch (e) {
+        (0, logging_1.logVerboseWarning)(`Error reading or parsing ${packageJsonPath}: ${e?.message || e}`);
+    }
+}
+exports.readPackageInfo = readPackageInfo;
+/**
+ * Read package.json from the given path if it exists.
+ * Logs a warning if it doesn't exist, or there's an error reading or parsing it.
+ * @returns The package info, or undefined if it doesn't exist or can't be read
+ */
+async function readPackageInfoAsync(cwd) {
+    const packageJsonPath = path_1.default.join(cwd, "package.json");
+    try {
+        if (!fs_1.default.existsSync(packageJsonPath)) {
+            (0, logging_1.logVerboseWarning)(`File does not exist: ${packageJsonPath}`);
+            return undefined;
+        }
+        const packageJson = JSON.parse(await promises_1.default.readFile(packageJsonPath, "utf-8"));
+        return (0, infoFromPackageJson_1.infoFromPackageJson)(packageJson, packageJsonPath);
+    }
+    catch (e) {
+        (0, logging_1.logVerboseWarning)(`Error reading or parsing ${packageJsonPath}: ${e?.message || e}`);
+    }
+}
+exports.readPackageInfoAsync = readPackageInfoAsync;
+//# sourceMappingURL=readPackageInfo.js.map

package/lib/workspaces/readPackageInfo.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"readPackageInfo.js","sourceRoot":"","sources":["../../src/workspaces/readPackageInfo.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,2DAAqC;AACrC,gDAAwB;AAExB,gEAA6D;AAC7D,wCAA+C;AAE/C;;;;GAIG;AACH,SAAgB,eAAe,CAAC,GAAW;IACzC,MAAM,eAAe,GAAG,cAAI,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;IACvD,IAAI;QACF,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE;YACnC,IAAA,2BAAiB,EAAC,wBAAwB,eAAe,EAAE,CAAC,CAAC;YAC7D,OAAO,SAAS,CAAC;SAClB;QAED,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC,CAAC;QAC1E,OAAO,IAAA,yCAAmB,EAAC,WAAW,EAAE,eAAe,CAAC,CAAC;KAC1D;IAAC,OAAO,CAAC,EAAE;QACV,IAAA,2BAAiB,EAAC,4BAA4B,eAAe,KAAM,CAAW,EAAE,OAAO,IAAI,CAAC,EAAE,CAAC,CAAC;KACjG;AACH,CAAC;AAbD,0CAaC;AAED;;;;GAIG;AACI,KAAK,UAAU,oBAAoB,CAAC,GAAW;IACpD,MAAM,eAAe,GAAG,cAAI,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;IACvD,IAAI;QACF,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE;YACnC,IAAA,2BAAiB,EAAC,wBAAwB,eAAe,EAAE,CAAC,CAAC;YAC7D,OAAO,SAAS,CAAC;SAClB;QAED,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,kBAAU,CAAC,QAAQ,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC,CAAC;QACpF,OAAO,IAAA,yCAAmB,EAAC,WAAW,EAAE,eAAe,CAAC,CAAC;KAC1D;IAAC,OAAO,CAAC,EAAE;QACV,IAAA,2BAAiB,EAAC,4BAA4B,eAAe,KAAM,CAAW,EAAE,OAAO,IAAI,CAAC,EAAE,CAAC,CAAC;KACjG;AACH,CAAC;AAbD,oDAaC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "workspace-tools",
-  "version": "0.38.4",
+  "version": "0.38.5",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -14,7 +14,7 @@
   ],
   "scripts": {
     "api": "ws-tools-scripts api",
-    "build": "tsc",
+    "build": "tsc --pretty",
     "start": "tsc -w --preserveWatchOutput",
     "test": "jest"
   },
@@ -28,7 +28,6 @@
     "micromatch": "^4.0.0"
   },
   "devDependencies": {
-    "lodash": "^4.17.21",
     "@ws-tools/scripts": "*"
   }
 }