workspace-tools 0.40.0 → 0.40.3

package/lib/workspaces/implementations/yarn.js

@@ -15,40 +15,48 @@ const readYaml_1 = require("../../lockfile/readYaml");
 function getYarnWorkspaceRoot(cwd) {
     const root = (0, index_1.getWorkspaceManagerAndRoot)(cwd, undefined, "yarn")?.root;
     if (!root) {
-        throw new Error("Could not find yarn workspace root from " + cwd);
+        throw new Error("Could not find yarn root from " + cwd);
     }
     return root;
 }
 exports.getYarnWorkspaceRoot = getYarnWorkspaceRoot;
-/** Get paths for each package ("workspace") in a yarn monorepo. */
+/**
+ * Get paths for each package ("workspace") in a yarn monorepo.
+ * @returns Array of monorepo package paths, or an empty array on error
+ */
 function getWorkspacePackagePaths(cwd) {
-    const yarnWorkspacesRoot = getYarnWorkspaceRoot(cwd);
-    return (0, packageJsonWorkspaces_1.getPackagePathsFromWorkspaceRoot)(yarnWorkspacesRoot);
+    const root = getYarnWorkspaceRoot(cwd);
+    return (0, packageJsonWorkspaces_1.getPackagePathsFromWorkspaceRoot)(root);
 }
 exports.getWorkspacePackagePaths = getWorkspacePackagePaths;
-/** Get paths for each package ("workspace") in a yarn monorepo. */
+/**
+ * Get paths for each package ("workspace") in a yarn monorepo.
+ * @returns Array of monorepo package paths, or an empty array on error
+ */
 function getWorkspacePackagePathsAsync(cwd) {
-    const yarnWorkspacesRoot = getYarnWorkspaceRoot(cwd);
-    return (0, packageJsonWorkspaces_1.getPackagePathsFromWorkspaceRootAsync)(yarnWorkspacesRoot);
+    const root = getYarnWorkspaceRoot(cwd);
+    return (0, packageJsonWorkspaces_1.getPackagePathsFromWorkspaceRootAsync)(root);
 }
 exports.getWorkspacePackagePathsAsync = getWorkspacePackagePathsAsync;
 /**
  * Get an array with names, paths, and package.json contents for each package ("workspace")
  * in a yarn monorepo.
+ * @returns Array of monorepo package infos, or an empty array on error
  */
 function getYarnWorkspaces(cwd) {
-    const yarnWorkspacesRoot = getYarnWorkspaceRoot(cwd);
-    return (0, packageJsonWorkspaces_1.getWorkspaceInfoFromWorkspaceRoot)(yarnWorkspacesRoot);
+    const root = getYarnWorkspaceRoot(cwd);
+    return (0, packageJsonWorkspaces_1.getWorkspaceInfoFromWorkspaceRoot)(root);
 }
 exports.getYarnWorkspaces = getYarnWorkspaces;
 exports.getWorkspaces = getYarnWorkspaces;
 /**
  * Get an array with names, paths, and package.json contents for each package ("workspace")
  * in a yarn monorepo.
+ * @returns Array of monorepo package infos, or an empty array on error
  */
 function getYarnWorkspacesAsync(cwd) {
-    const yarnWorkspacesRoot = getYarnWorkspaceRoot(cwd);
-    return (0, packageJsonWorkspaces_1.getWorkspaceInfoFromWorkspaceRootAsync)(yarnWorkspacesRoot);
+    const root = getYarnWorkspaceRoot(cwd);
+    return (0, packageJsonWorkspaces_1.getWorkspaceInfoFromWorkspaceRootAsync)(root);
 }
 exports.getYarnWorkspacesAsync = getYarnWorkspacesAsync;
 exports.getWorkspacesAsync = getYarnWorkspacesAsync;
@@ -74,7 +82,12 @@ function getYarnCatalogs(cwd) {
             if (workspaceSettings &&
                 !Array.isArray(workspaceSettings) &&
                 (workspaceSettings?.catalog || workspaceSettings?.catalogs)) {
-                return { named: workspaceSettings.catalogs, default: workspaceSettings.catalog };
+                // This probably handles a catalog named "default" as the default catalog
+                const { default: namedDefaultCatalog, ...namedCatalogs } = workspaceSettings.catalogs || {};
+                return {
+                    default: workspaceSettings.catalog || namedDefaultCatalog,
+                    named: Object.keys(namedCatalogs).length ? namedCatalogs : undefined,
+                };
             }
         }
     }

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,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"}
+{"version":3,"file":"yarn.js","sourceRoot":"","sources":["../../../src/workspaces/implementations/yarn.ts"],"names":[],"mappings":"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"}

package/package.json

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

package/lib/workspaces/catalogs.js.map

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