workspace-tools 0.38.4 → 0.38.6

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 getPackageInfo_1 = require("../../getPackageInfo");
+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, getPackageInfo_1.getPackageInfo)(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,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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "workspace-tools",
-  "version": "0.38.4",
+  "version": "0.38.6",
   "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": "*"
   }
 }