workspace-tools 0.38.5 → 0.38.6

package/lib/{workspaces/readPackageInfo.d.ts → getPackageInfo.d.ts}

@@ -1,13 +1,13 @@
-import type { PackageInfo } from "../types/PackageInfo";
+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;
+export declare function getPackageInfo(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>;
+export declare function getPackageInfoAsync(cwd: string): Promise<PackageInfo | undefined>;

package/lib/{workspaces/readPackageInfo.js → getPackageInfo.js}

@@ -3,18 +3,18 @@ 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;
+exports.getPackageInfoAsync = exports.getPackageInfo = 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");
+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) {
+function getPackageInfo(cwd) {
     const packageJsonPath = path_1.default.join(cwd, "package.json");
     try {
         if (!fs_1.default.existsSync(packageJsonPath)) {
@@ -28,13 +28,13 @@ function readPackageInfo(cwd) {
         (0, logging_1.logVerboseWarning)(`Error reading or parsing ${packageJsonPath}: ${e?.message || e}`);
     }
 }
-exports.readPackageInfo = readPackageInfo;
+exports.getPackageInfo = getPackageInfo;
 /**
  * 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) {
+async function getPackageInfoAsync(cwd) {
     const packageJsonPath = path_1.default.join(cwd, "package.json");
     try {
         if (!fs_1.default.existsSync(packageJsonPath)) {
@@ -48,5 +48,5 @@ async function readPackageInfoAsync(cwd) {
         (0, logging_1.logVerboseWarning)(`Error reading or parsing ${packageJsonPath}: ${e?.message || e}`);
     }
 }
-exports.readPackageInfoAsync = readPackageInfoAsync;
-//# sourceMappingURL=readPackageInfo.js.map
+exports.getPackageInfoAsync = getPackageInfoAsync;
+//# sourceMappingURL=getPackageInfo.js.map

package/lib/getPackageInfo.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getPackageInfo.js","sourceRoot":"","sources":["../src/getPackageInfo.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,2DAAqC;AACrC,gDAAwB;AAExB,+DAA4D;AAC5D,uCAA8C;AAE9C;;;;GAIG;AACH,SAAgB,cAAc,CAAC,GAAW;IACxC,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,wCAaC;AAED;;;;GAIG;AACI,KAAK,UAAU,mBAAmB,CAAC,GAAW;IACnD,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,kDAaC"}

package/lib/getPackageInfos.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPackageInfosAsync = exports.getPackageInfos = void 0;
 const getWorkspaces_1 = require("./workspaces/getWorkspaces");
-const readPackageInfo_1 = require("./workspaces/readPackageInfo");
+const getPackageInfo_1 = require("./getPackageInfo");
 /**
  * Read all the package.json files in a monorepo. Only works for monorepos which
  * use a supported workspace manager.
@@ -17,7 +17,7 @@ function getPackageInfos(cwd) {
         }
     }
     else {
-        const rootInfo = (0, readPackageInfo_1.readPackageInfo)(cwd);
+        const rootInfo = (0, getPackageInfo_1.getPackageInfo)(cwd);
         if (rootInfo) {
             packageInfos[rootInfo.name] = rootInfo;
         }
@@ -43,7 +43,7 @@ async function getPackageInfosAsync(cwd) {
         }
     }
     else {
-        const rootInfo = (0, readPackageInfo_1.readPackageInfo)(cwd);
+        const rootInfo = (0, getPackageInfo_1.getPackageInfo)(cwd);
         if (rootInfo) {
             packageInfos[rootInfo.name] = rootInfo;
         }

package/lib/getPackageInfos.js.map

@@ -1 +1 @@
-{"version":3,"file":"getPackageInfos.js","sourceRoot":"","sources":["../src/getPackageInfos.ts"],"names":[],"mappings":";;;AACA,8DAA+E;AAC/E,kEAA+D;AAE/D;;;;GAIG;AACH,SAAgB,eAAe,CAAC,GAAW;IACzC,MAAM,YAAY,GAAiB,EAAE,CAAC;IACtC,MAAM,iBAAiB,GAAG,IAAA,6BAAa,EAAC,GAAG,CAAC,CAAC;IAE7C,IAAI,iBAAiB,CAAC,MAAM,EAAE;QAC5B,KAAK,MAAM,GAAG,IAAI,iBAAiB,EAAE;YACnC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,WAAW,CAAC;SAC1C;KACF;SAAM;QACL,MAAM,QAAQ,GAAG,IAAA,iCAAe,EAAC,GAAG,CAAC,CAAC;QACtC,IAAI,QAAQ,EAAE;YACZ,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;SACxC;KACF;IAED,OAAO,YAAY,CAAC;AACtB,CAAC;AAhBD,0CAgBC;AAED;;;;;;;;GAQG;AACI,KAAK,UAAU,oBAAoB,CAAC,GAAW;IACpD,MAAM,YAAY,GAAiB,EAAE,CAAC;IACtC,MAAM,iBAAiB,GAAG,MAAM,IAAA,kCAAkB,EAAC,GAAG,CAAC,CAAC;IAExD,IAAI,iBAAiB,CAAC,MAAM,EAAE;QAC5B,KAAK,MAAM,GAAG,IAAI,iBAAiB,EAAE;YACnC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,WAAW,CAAC;SAC1C;KACF;SAAM;QACL,MAAM,QAAQ,GAAG,IAAA,iCAAe,EAAC,GAAG,CAAC,CAAC;QACtC,IAAI,QAAQ,EAAE;YACZ,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;SACxC;KACF;IAED,OAAO,YAAY,CAAC;AACtB,CAAC;AAhBD,oDAgBC"}
+{"version":3,"file":"getPackageInfos.js","sourceRoot":"","sources":["../src/getPackageInfos.ts"],"names":[],"mappings":";;;AACA,8DAA+E;AAC/E,qDAAkD;AAElD;;;;GAIG;AACH,SAAgB,eAAe,CAAC,GAAW;IACzC,MAAM,YAAY,GAAiB,EAAE,CAAC;IACtC,MAAM,iBAAiB,GAAG,IAAA,6BAAa,EAAC,GAAG,CAAC,CAAC;IAE7C,IAAI,iBAAiB,CAAC,MAAM,EAAE;QAC5B,KAAK,MAAM,GAAG,IAAI,iBAAiB,EAAE;YACnC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,WAAW,CAAC;SAC1C;KACF;SAAM;QACL,MAAM,QAAQ,GAAG,IAAA,+BAAc,EAAC,GAAG,CAAC,CAAC;QACrC,IAAI,QAAQ,EAAE;YACZ,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;SACxC;KACF;IAED,OAAO,YAAY,CAAC;AACtB,CAAC;AAhBD,0CAgBC;AAED;;;;;;;;GAQG;AACI,KAAK,UAAU,oBAAoB,CAAC,GAAW;IACpD,MAAM,YAAY,GAAiB,EAAE,CAAC;IACtC,MAAM,iBAAiB,GAAG,MAAM,IAAA,kCAAkB,EAAC,GAAG,CAAC,CAAC;IAExD,IAAI,iBAAiB,CAAC,MAAM,EAAE;QAC5B,KAAK,MAAM,GAAG,IAAI,iBAAiB,EAAE;YACnC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,WAAW,CAAC;SAC1C;KACF;SAAM;QACL,MAAM,QAAQ,GAAG,IAAA,+BAAc,EAAC,GAAG,CAAC,CAAC;QACrC,IAAI,QAAQ,EAAE;YACZ,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;SACxC;KACF;IAED,OAAO,YAAY,CAAC;AACtB,CAAC;AAhBD,oDAgBC"}

package/lib/index.d.ts

@@ -14,7 +14,7 @@ export { findWorkspacePath } from "./workspaces/findWorkspacePath";
 export { getWorkspaces, getWorkspacesAsync } from "./workspaces/getWorkspaces";
 export { getWorkspacePackagePaths, getWorkspacePackagePathsAsync } from "./workspaces/getWorkspacePackagePaths";
 export { getWorkspaceManagerRoot, getWorkspaceRoot } from "./workspaces/getWorkspaceRoot";
-export { readPackageInfo, readPackageInfoAsync } from "./workspaces/readPackageInfo";
+export { getPackageInfo, getPackageInfoAsync } from "./getPackageInfo";
 export { getPnpmWorkspaceRoot, getPnpmWorkspaces } from "./workspaces/implementations/pnpm";
 export { getRushWorkspaceRoot, getRushWorkspaces } from "./workspaces/implementations/rush";
 export { getYarnWorkspaceRoot, getYarnWorkspaces } from "./workspaces/implementations/yarn";

package/lib/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isCatalogVersion = exports.getCatalogVersion = exports.getCatalogs = exports.getAllPackageJsonFilesAsync = exports.getAllPackageJsonFiles = exports.listOfWorkspacePackageNames = exports.getPackagesByFiles = exports.getChangedPackagesBetweenRefs = exports.getChangedPackages = exports.getYarnWorkspaces = exports.getYarnWorkspaceRoot = exports.getRushWorkspaces = exports.getRushWorkspaceRoot = exports.getPnpmWorkspaces = exports.getPnpmWorkspaceRoot = exports.readPackageInfoAsync = exports.readPackageInfo = exports.getWorkspaceRoot = exports.getWorkspaceManagerRoot = exports.getWorkspacePackagePathsAsync = exports.getWorkspacePackagePaths = exports.getWorkspacesAsync = exports.getWorkspaces = exports.findWorkspacePath = exports.getScopedPackages = exports.searchUp = exports.isChildOf = exports.findProjectRoot = exports.findPackageRoot = exports.findGitRoot = exports.setCachingEnabled = exports.getPackageInfosAsync = exports.getPackageInfos = void 0;
+exports.isCatalogVersion = exports.getCatalogVersion = exports.getCatalogs = exports.getAllPackageJsonFilesAsync = exports.getAllPackageJsonFiles = exports.listOfWorkspacePackageNames = exports.getPackagesByFiles = exports.getChangedPackagesBetweenRefs = exports.getChangedPackages = exports.getYarnWorkspaces = exports.getYarnWorkspaceRoot = exports.getRushWorkspaces = exports.getRushWorkspaceRoot = exports.getPnpmWorkspaces = exports.getPnpmWorkspaceRoot = exports.getPackageInfoAsync = exports.getPackageInfo = exports.getWorkspaceRoot = exports.getWorkspaceManagerRoot = exports.getWorkspacePackagePathsAsync = exports.getWorkspacePackagePaths = exports.getWorkspacesAsync = exports.getWorkspaces = exports.findWorkspacePath = exports.getScopedPackages = exports.searchUp = exports.isChildOf = exports.findProjectRoot = exports.findPackageRoot = exports.findGitRoot = exports.setCachingEnabled = exports.getPackageInfosAsync = exports.getPackageInfos = void 0;
 __exportStar(require("./dependencies/index"), exports);
 var getPackageInfos_1 = require("./getPackageInfos");
 Object.defineProperty(exports, "getPackageInfos", { enumerable: true, get: function () { return getPackageInfos_1.getPackageInfos; } });
@@ -43,9 +43,9 @@ Object.defineProperty(exports, "getWorkspacePackagePathsAsync", { enumerable: tr
 var getWorkspaceRoot_1 = require("./workspaces/getWorkspaceRoot");
 Object.defineProperty(exports, "getWorkspaceManagerRoot", { enumerable: true, get: function () { return getWorkspaceRoot_1.getWorkspaceManagerRoot; } });
 Object.defineProperty(exports, "getWorkspaceRoot", { enumerable: true, get: function () { return getWorkspaceRoot_1.getWorkspaceRoot; } });
-var readPackageInfo_1 = require("./workspaces/readPackageInfo");
-Object.defineProperty(exports, "readPackageInfo", { enumerable: true, get: function () { return readPackageInfo_1.readPackageInfo; } });
-Object.defineProperty(exports, "readPackageInfoAsync", { enumerable: true, get: function () { return readPackageInfo_1.readPackageInfoAsync; } });
+var getPackageInfo_1 = require("./getPackageInfo");
+Object.defineProperty(exports, "getPackageInfo", { enumerable: true, get: function () { return getPackageInfo_1.getPackageInfo; } });
+Object.defineProperty(exports, "getPackageInfoAsync", { enumerable: true, get: function () { return getPackageInfo_1.getPackageInfoAsync; } });
 var pnpm_1 = require("./workspaces/implementations/pnpm");
 Object.defineProperty(exports, "getPnpmWorkspaceRoot", { enumerable: true, get: function () { return pnpm_1.getPnpmWorkspaceRoot; } });
 Object.defineProperty(exports, "getPnpmWorkspaces", { enumerable: true, get: function () { return pnpm_1.getPnpmWorkspaces; } });

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,uDAAqC;AACrC,qDAA0E;AAAjE,kHAAA,eAAe,OAAA;AAAE,uHAAA,oBAAoB,OAAA;AAC9C,wCAAsB;AACtB,gDAA8B;AAC9B,uDAAuD;AAA9C,qHAAA,iBAAiB,OAAA;AAC1B,6CAA2B;AAC3B,iCAA6F;AAApF,oGAAA,WAAW,OAAA;AAAE,wGAAA,eAAe,OAAA;AAAE,wGAAA,eAAe,OAAA;AAAE,kGAAA,SAAS,OAAA;AAAE,iGAAA,QAAQ,OAAA;AAC3E,iCAA4C;AAAnC,0GAAA,iBAAiB,OAAA;AAK1B,oEAAmE;AAA1D,sHAAA,iBAAiB,OAAA;AAC1B,4DAA+E;AAAtE,8GAAA,aAAa,OAAA;AAAE,mHAAA,kBAAkB,OAAA;AAC1C,kFAAgH;AAAvG,oIAAA,wBAAwB,OAAA;AAAE,yIAAA,6BAA6B,OAAA;AAChE,kEAA0F;AAAjF,2HAAA,uBAAuB,OAAA;AAAE,oHAAA,gBAAgB,OAAA;AAClD,gEAAqF;AAA5E,kHAAA,eAAe,OAAA;AAAE,uHAAA,oBAAoB,OAAA;AAC9C,0DAA4F;AAAnF,4GAAA,oBAAoB,OAAA;AAAE,yGAAA,iBAAiB,OAAA;AAChD,0DAA4F;AAAnF,4GAAA,oBAAoB,OAAA;AAAE,yGAAA,iBAAiB,OAAA;AAChD,0DAA4F;AAAnF,4GAAA,oBAAoB,OAAA;AAAE,yGAAA,iBAAiB,OAAA;AAChD,sEAAoG;AAA3F,wHAAA,kBAAkB,OAAA;AAAE,mIAAA,6BAA6B,OAAA;AAC1D,sEAAqE;AAA5D,wHAAA,kBAAkB,OAAA;AAC3B,wFAAuF;AAA9E,0IAAA,2BAA2B,OAAA;AACpC,8EAA0G;AAAjG,gIAAA,sBAAsB,OAAA;AAAE,qIAAA,2BAA2B,OAAA;AAC5D,kDAAyF;AAAhF,uGAAA,WAAW,OAAA;AAAE,6GAAA,iBAAiB,OAAA;AAAE,4GAAA,gBAAgB,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,uDAAqC;AACrC,qDAA0E;AAAjE,kHAAA,eAAe,OAAA;AAAE,uHAAA,oBAAoB,OAAA;AAC9C,wCAAsB;AACtB,gDAA8B;AAC9B,uDAAuD;AAA9C,qHAAA,iBAAiB,OAAA;AAC1B,6CAA2B;AAC3B,iCAA6F;AAApF,oGAAA,WAAW,OAAA;AAAE,wGAAA,eAAe,OAAA;AAAE,wGAAA,eAAe,OAAA;AAAE,kGAAA,SAAS,OAAA;AAAE,iGAAA,QAAQ,OAAA;AAC3E,iCAA4C;AAAnC,0GAAA,iBAAiB,OAAA;AAK1B,oEAAmE;AAA1D,sHAAA,iBAAiB,OAAA;AAC1B,4DAA+E;AAAtE,8GAAA,aAAa,OAAA;AAAE,mHAAA,kBAAkB,OAAA;AAC1C,kFAAgH;AAAvG,oIAAA,wBAAwB,OAAA;AAAE,yIAAA,6BAA6B,OAAA;AAChE,kEAA0F;AAAjF,2HAAA,uBAAuB,OAAA;AAAE,oHAAA,gBAAgB,OAAA;AAClD,mDAAuE;AAA9D,gHAAA,cAAc,OAAA;AAAE,qHAAA,mBAAmB,OAAA;AAC5C,0DAA4F;AAAnF,4GAAA,oBAAoB,OAAA;AAAE,yGAAA,iBAAiB,OAAA;AAChD,0DAA4F;AAAnF,4GAAA,oBAAoB,OAAA;AAAE,yGAAA,iBAAiB,OAAA;AAChD,0DAA4F;AAAnF,4GAAA,oBAAoB,OAAA;AAAE,yGAAA,iBAAiB,OAAA;AAChD,sEAAoG;AAA3F,wHAAA,kBAAkB,OAAA;AAAE,mIAAA,6BAA6B,OAAA;AAC1D,sEAAqE;AAA5D,wHAAA,kBAAkB,OAAA;AAC3B,wFAAuF;AAA9E,0IAAA,2BAA2B,OAAA;AACpC,8EAA0G;AAAjG,gIAAA,sBAAsB,OAAA;AAAE,qIAAA,2BAA2B,OAAA;AAC5D,kDAAyF;AAAhF,uGAAA,WAAW,OAAA;AAAE,6GAAA,iBAAiB,OAAA;AAAE,4GAAA,gBAAgB,OAAA"}

package/lib/workspaces/catalogs.d.ts

@@ -11,15 +11,20 @@ export declare function getCatalogs(cwd: string): Catalogs | undefined;
  */
 export declare function isCatalogVersion(version: string): boolean;
 /**
- * Given a dependency package name and a version string, if the version starts with `catalog:`,
- * look up the actual version spec from the given catalogs.
+ * Given a dependency package name and a version spec string, if the version starts with `catalog:`,
+ * look up the actual version spec (not the final resolved version) from the given catalogs.
  *
- * Throws an error if the version uses `catalog:` but no catalogs are defined, or the version
- * isn't found in the given catalog.
+ * Throws an error if there's anything invalid about the catalog spec (no catalogs defined,
+ * no matching catalog, catalog doesn't contain `name`, recursive catalog version).
  *
  * Returns undefined if the version doesn't start with `catalog:`.
  * @see https://pnpm.io/catalogs
  * @see https://yarnpkg.com/features/catalogs
+ *
+ * @param name - Dependency package name
+ * @param version - Dependency version spec, e.g. `catalog:my-catalog` or `catalog:`,
+ * or some non-catalog spec like `^1.2.3`
+ * @returns Actual version spec from the catalog, or undefined if not a catalog version
  */
 export declare function getCatalogVersion(params: {
     name: string;

package/lib/workspaces/catalogs.js

@@ -13,45 +13,54 @@ function getCatalogs(cwd) {
     return utils?.getCatalogs?.(cwd);
 }
 exports.getCatalogs = getCatalogs;
-const catalogRegex = /^catalog:(.*)$/;
+const catalogPrefix = "catalog:";
 /**
  * Returns true if the version starts with `catalog:`.
  */
 function isCatalogVersion(version) {
-    return catalogRegex.test(version);
+    return version.startsWith(catalogPrefix);
 }
 exports.isCatalogVersion = isCatalogVersion;
 /**
- * Given a dependency package name and a version string, if the version starts with `catalog:`,
- * look up the actual version spec from the given catalogs.
+ * Given a dependency package name and a version spec string, if the version starts with `catalog:`,
+ * look up the actual version spec (not the final resolved version) from the given catalogs.
  *
- * Throws an error if the version uses `catalog:` but no catalogs are defined, or the version
- * isn't found in the given catalog.
+ * Throws an error if there's anything invalid about the catalog spec (no catalogs defined,
+ * no matching catalog, catalog doesn't contain `name`, recursive catalog version).
  *
  * Returns undefined if the version doesn't start with `catalog:`.
  * @see https://pnpm.io/catalogs
  * @see https://yarnpkg.com/features/catalogs
+ *
+ * @param name - Dependency package name
+ * @param version - Dependency version spec, e.g. `catalog:my-catalog` or `catalog:`,
+ * or some non-catalog spec like `^1.2.3`
+ * @returns Actual version spec from the catalog, or undefined if not a catalog version
  */
 function getCatalogVersion(params) {
     const { name, version, catalogs } = params;
-    const catalogMatch = version.match(/^catalog:(.*)$/);
-    if (!catalogMatch) {
+    if (!isCatalogVersion(version)) {
         return undefined;
     }
     if (!catalogs) {
         throw new Error(`Dependency "${name}" uses a catalog version "${version}" but no catalogs are defined.`);
     }
-    const catalogName = catalogMatch[1];
+    const catalogName = version.slice(catalogPrefix.length);
+    // If there's no name specified after "catalog:", use the default catalog.
+    // Otherwise use the named catalog.
     const checkCatalog = catalogName ? catalogs.named?.[catalogName] : catalogs.default;
     const catalogNameStr = catalogName ? `catalogs.${catalogName}` : "the default catalog";
     if (!checkCatalog) {
         throw new Error(`Dependency "${name}" uses a catalog version "${version}" but ${catalogNameStr} is not defined.`);
     }
-    const actualVersion = checkCatalog[name];
-    if (!actualVersion) {
+    const actualSpec = checkCatalog[name];
+    if (!actualSpec) {
         throw new Error(`Dependency "${name}" uses a catalog version "${version}", but ${catalogNameStr} doesn't define a version for "${name}".`);
     }
-    return actualVersion;
+    if (isCatalogVersion(actualSpec)) {
+        throw new Error(`Dependency "${name}" resolves to a recursive catalog version "${actualSpec}", which is not supported.`);
+    }
+    return actualSpec;
 }
 exports.getCatalogVersion = getCatalogVersion;
 //# sourceMappingURL=catalogs.js.map

package/lib/workspaces/catalogs.js.map

@@ -1 +1 @@
-{"version":3,"file":"catalogs.js","sourceRoot":"","sources":["../../src/workspaces/catalogs.ts"],"names":[],"mappings":";;;AACA,uDAA0D;AAE1D;;;;;GAKG;AACH,SAAgB,WAAW,CAAC,GAAW;IACrC,MAAM,KAAK,GAAG,IAAA,uCAAqB,EAAC,GAAG,CAAC,CAAC;IACzC,OAAO,KAAK,EAAE,WAAW,EAAE,CAAC,GAAG,CAAC,CAAC;AACnC,CAAC;AAHD,kCAGC;AAED,MAAM,YAAY,GAAG,gBAAgB,CAAC;AAEtC;;GAEG;AACH,SAAgB,gBAAgB,CAAC,OAAe;IAC9C,OAAO,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AACpC,CAAC;AAFD,4CAEC;AAED;;;;;;;;;;GAUG;AACH,SAAgB,iBAAiB,CAAC,MAIjC;IACC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IAE3C,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IACrD,IAAI,CAAC,YAAY,EAAE;QACjB,OAAO,SAAS,CAAC;KAClB;IAED,IAAI,CAAC,QAAQ,EAAE;QACb,MAAM,IAAI,KAAK,CAAC,eAAe,IAAI,6BAA6B,OAAO,gCAAgC,CAAC,CAAC;KAC1G;IAED,MAAM,WAAW,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;IACpC,MAAM,YAAY,GAAG,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC;IACpF,MAAM,cAAc,GAAG,WAAW,CAAC,CAAC,CAAC,YAAY,WAAW,EAAE,CAAC,CAAC,CAAC,qBAAqB,CAAC;IAEvF,IAAI,CAAC,YAAY,EAAE;QACjB,MAAM,IAAI,KAAK,CAAC,eAAe,IAAI,6BAA6B,OAAO,SAAS,cAAc,kBAAkB,CAAC,CAAC;KACnH;IAED,MAAM,aAAa,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;IACzC,IAAI,CAAC,aAAa,EAAE;QAClB,MAAM,IAAI,KAAK,CACb,eAAe,IAAI,6BAA6B,OAAO,UAAU,cAAc,kCAAkC,IAAI,IAAI,CAC1H,CAAC;KACH;IACD,OAAO,aAAa,CAAC;AACvB,CAAC;AA/BD,8CA+BC"}
+{"version":3,"file":"catalogs.js","sourceRoot":"","sources":["../../src/workspaces/catalogs.ts"],"names":[],"mappings":";;;AACA,uDAA0D;AAE1D;;;;;GAKG;AACH,SAAgB,WAAW,CAAC,GAAW;IACrC,MAAM,KAAK,GAAG,IAAA,uCAAqB,EAAC,GAAG,CAAC,CAAC;IACzC,OAAO,KAAK,EAAE,WAAW,EAAE,CAAC,GAAG,CAAC,CAAC;AACnC,CAAC;AAHD,kCAGC;AAED,MAAM,aAAa,GAAG,UAAU,CAAC;AAEjC;;GAEG;AACH,SAAgB,gBAAgB,CAAC,OAAe;IAC9C,OAAO,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;AAC3C,CAAC;AAFD,4CAEC;AAED;;;;;;;;;;;;;;;GAeG;AACH,SAAgB,iBAAiB,CAAC,MAIjC;IACC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IAE3C,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE;QAC9B,OAAO,SAAS,CAAC;KAClB;IAED,IAAI,CAAC,QAAQ,EAAE;QACb,MAAM,IAAI,KAAK,CAAC,eAAe,IAAI,6BAA6B,OAAO,gCAAgC,CAAC,CAAC;KAC1G;IAED,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IACxD,0EAA0E;IAC1E,mCAAmC;IACnC,MAAM,YAAY,GAAG,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC;IACpF,MAAM,cAAc,GAAG,WAAW,CAAC,CAAC,CAAC,YAAY,WAAW,EAAE,CAAC,CAAC,CAAC,qBAAqB,CAAC;IAEvF,IAAI,CAAC,YAAY,EAAE;QACjB,MAAM,IAAI,KAAK,CAAC,eAAe,IAAI,6BAA6B,OAAO,SAAS,cAAc,kBAAkB,CAAC,CAAC;KACnH;IAED,MAAM,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;IACtC,IAAI,CAAC,UAAU,EAAE;QACf,MAAM,IAAI,KAAK,CACb,eAAe,IAAI,6BAA6B,OAAO,UAAU,cAAc,kCAAkC,IAAI,IAAI,CAC1H,CAAC;KACH;IAED,IAAI,gBAAgB,CAAC,UAAU,CAAC,EAAE;QAChC,MAAM,IAAI,KAAK,CACb,eAAe,IAAI,8CAA8C,UAAU,4BAA4B,CACxG,CAAC;KACH;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAvCD,8CAuCC"}

package/lib/workspaces/getWorkspacePackageInfo.js

@@ -8,7 +8,7 @@ const path_1 = __importDefault(require("path"));
 const promises_1 = __importDefault(require("fs/promises"));
 const logging_1 = require("../logging");
 const infoFromPackageJson_1 = require("../infoFromPackageJson");
-const readPackageInfo_1 = require("./readPackageInfo");
+const getPackageInfo_1 = require("../getPackageInfo");
 /**
  * Get an array with names, paths, and package.json contents for each of the given package paths
  * ("workspace" paths in npm/yarn/pnpm terms) within a monorepo.
@@ -25,9 +25,9 @@ function getWorkspacePackageInfo(packagePaths) {
     }
     return packagePaths
         .map((workspacePath) => {
-        const packageJson = (0, readPackageInfo_1.readPackageInfo)(workspacePath);
+        const packageJson = (0, getPackageInfo_1.getPackageInfo)(workspacePath);
         if (!packageJson) {
-            return null; // readPackageInfo already logged a warning
+            return null; // getPackageInfo already logged a warning
         }
         return {
             name: packageJson.name,

package/lib/workspaces/getWorkspacePackageInfo.js.map

@@ -1 +1 @@
-{"version":3,"file":"getWorkspacePackageInfo.js","sourceRoot":"","sources":["../../src/workspaces/getWorkspacePackageInfo.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,2DAAqC;AAGrC,wCAA+C;AAC/C,gEAA6D;AAC7D,uDAAoD;AAEpD;;;;;;;;;GASG;AACH,SAAgB,uBAAuB,CAAC,YAAsB;IAC5D,IAAI,CAAC,YAAY,EAAE;QACjB,OAAO,EAAE,CAAC;KACX;IAED,OAAO,YAAY;SAChB,GAAG,CAA8B,CAAC,aAAa,EAAE,EAAE;QAClD,MAAM,WAAW,GAAG,IAAA,iCAAe,EAAC,aAAa,CAAC,CAAC;QACnD,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO,IAAI,CAAC,CAAC,2CAA2C;SACzD;QAED,OAAO;YACL,IAAI,EAAE,WAAW,CAAC,IAAI;YACtB,IAAI,EAAE,aAAa;YACnB,WAAW;SACZ,CAAC;IACJ,CAAC,CAAC;SACD,MAAM,CAAC,OAAO,CAAmB,CAAC;AACvC,CAAC;AAnBD,0DAmBC;AAED;;;;;;;;;;;;GAYG;AACI,KAAK,UAAU,4BAA4B,CAAC,YAAsB;IACvE,IAAI,CAAC,YAAY,EAAE;QACjB,OAAO,EAAE,CAAC;KACX;IAED,MAAM,oBAAoB,GAAG,YAAY,CAAC,GAAG,CAAuC,KAAK,EAAE,aAAa,EAAE,EAAE;QAC1G,MAAM,eAAe,GAAG,cAAI,CAAC,IAAI,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;QAEjE,IAAI;YACF,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,kBAAU,CAAC,QAAQ,CAAC,eAAe,EAAE,OAAO,CAAC,CAAgB,CAAC;YACnG,OAAO;gBACL,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,IAAI,EAAE,aAAa;gBACnB,WAAW,EAAE,IAAA,yCAAmB,EAAC,WAAW,EAAE,eAAe,CAAC;aAC/D,CAAC;SACH;QAAC,OAAO,GAAG,EAAE;YACZ,IAAA,2BAAiB,EAAC,4BAA4B,eAAe,uCAAuC,EAAE,GAAG,CAAC,CAAC;YAC3G,OAAO,IAAI,CAAC;SACb;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAmB,CAAC;AACrF,CAAC;AAtBD,oEAsBC"}
+{"version":3,"file":"getWorkspacePackageInfo.js","sourceRoot":"","sources":["../../src/workspaces/getWorkspacePackageInfo.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,2DAAqC;AAGrC,wCAA+C;AAC/C,gEAA6D;AAC7D,sDAAmD;AAEnD;;;;;;;;;GASG;AACH,SAAgB,uBAAuB,CAAC,YAAsB;IAC5D,IAAI,CAAC,YAAY,EAAE;QACjB,OAAO,EAAE,CAAC;KACX;IAED,OAAO,YAAY;SAChB,GAAG,CAA8B,CAAC,aAAa,EAAE,EAAE;QAClD,MAAM,WAAW,GAAG,IAAA,+BAAc,EAAC,aAAa,CAAC,CAAC;QAClD,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO,IAAI,CAAC,CAAC,0CAA0C;SACxD;QAED,OAAO;YACL,IAAI,EAAE,WAAW,CAAC,IAAI;YACtB,IAAI,EAAE,aAAa;YACnB,WAAW;SACZ,CAAC;IACJ,CAAC,CAAC;SACD,MAAM,CAAC,OAAO,CAAmB,CAAC;AACvC,CAAC;AAnBD,0DAmBC;AAED;;;;;;;;;;;;GAYG;AACI,KAAK,UAAU,4BAA4B,CAAC,YAAsB;IACvE,IAAI,CAAC,YAAY,EAAE;QACjB,OAAO,EAAE,CAAC;KACX;IAED,MAAM,oBAAoB,GAAG,YAAY,CAAC,GAAG,CAAuC,KAAK,EAAE,aAAa,EAAE,EAAE;QAC1G,MAAM,eAAe,GAAG,cAAI,CAAC,IAAI,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;QAEjE,IAAI;YACF,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,kBAAU,CAAC,QAAQ,CAAC,eAAe,EAAE,OAAO,CAAC,CAAgB,CAAC;YACnG,OAAO;gBACL,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,IAAI,EAAE,aAAa;gBACnB,WAAW,EAAE,IAAA,yCAAmB,EAAC,WAAW,EAAE,eAAe,CAAC;aAC/D,CAAC;SACH;QAAC,OAAO,GAAG,EAAE;YACZ,IAAA,2BAAiB,EAAC,4BAA4B,eAAe,uCAAuC,EAAE,GAAG,CAAC,CAAC;YAC3G,OAAO,IAAI,CAAC;SACb;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAmB,CAAC;AACrF,CAAC;AAtBD,oEAsBC"}

package/lib/workspaces/implementations/yarn.js

@@ -8,7 +8,7 @@ const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const index_1 = require("./index");
 const packageJsonWorkspaces_1 = require("./packageJsonWorkspaces");
-const readPackageInfo_1 = require("../readPackageInfo");
+const getPackageInfo_1 = require("../../getPackageInfo");
 const logging_1 = require("../../logging");
 const readYaml_1 = require("../../lockfile/readYaml");
 /** @deprecated Use `getWorkspaceManagerRoot` */
@@ -70,7 +70,7 @@ function getYarnCatalogs(cwd) {
         }
         else {
             // Check for midgard-yarn-strict definition of catalogs in package.json
-            const workspaceSettings = (0, readPackageInfo_1.readPackageInfo)(root)?.workspaces;
+            const workspaceSettings = (0, getPackageInfo_1.getPackageInfo)(root)?.workspaces;
             if (workspaceSettings &&
                 !Array.isArray(workspaceSettings) &&
                 (workspaceSettings?.catalog || workspaceSettings?.catalogs)) {

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

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"yarn.js","sourceRoot":"","sources":["../../../src/workspaces/implementations/yarn.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,gDAAwB;AACxB,mCAAqD;AAErD,mEAKiC;AACjC,yDAAsD;AAEtD,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,+BAAc,EAAC,IAAI,CAAC,EAAE,UAAU,CAAC;YAC3D,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/package.json

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

package/lib/workspaces/readPackageInfo.js.map

@@ -1 +0,0 @@
-{"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"}