workspace-tools 0.41.5 → 0.41.7

package/lib/workspaces/getCatalogVersion.js

@@ -25,11 +25,14 @@ function isCatalogVersion(version) {
     return version.startsWith(catalogPrefix);
 }
 function getCatalogVersion(params) {
-    const { name, version, catalogs } = params;
+    const { name, version, catalogs, allowNotFound } = params;
     if (!isCatalogVersion(version)) {
         return undefined;
     }
     if (!catalogs) {
+        if (allowNotFound) {
+            return undefined;
+        }
         throw new Error(`Dependency "${name}" uses a catalog version "${version}" but no catalogs are defined.`);
     }
     const catalogName = version.slice(catalogPrefix.length);
@@ -39,11 +42,14 @@ function getCatalogVersion(params) {
     // and yarn install would have errored if a named catalog "default" was referenced but not defined.)
     catalogName === "default" ? catalogs.named?.default || catalogs.default : catalogName ? catalogs.named?.[catalogName] : catalogs.default;
     const catalogNameStr = catalogName ? `catalogs.${catalogName}` : "the default catalog";
-    if (!checkCatalog) {
+    if (!checkCatalog && !allowNotFound) {
         throw new Error(`Dependency "${name}" uses a catalog version "${version}" but ${catalogNameStr} is not defined.`);
     }
-    const actualSpec = checkCatalog[name];
+    const actualSpec = checkCatalog?.[name];
     if (!actualSpec) {
+        if (allowNotFound) {
+            return undefined;
+        }
         throw new Error(`Dependency "${name}" uses a catalog version "${version}", but ${catalogNameStr} doesn't define a version for "${name}".`);
     }
     if (isCatalogVersion(actualSpec)) {

package/lib/workspaces/getCatalogVersion.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/workspaces/getCatalogVersion.ts"],"sourcesContent":["import type { Catalogs } from \"../types/Catalogs.js\";\n\nconst catalogPrefix = \"catalog:\";\n\n/**\n * Returns true if the version starts with `catalog:`.\n */\nexport function isCatalogVersion(version: string): boolean {\n  return version.startsWith(catalogPrefix);\n}\n\n/**\n * Given a dependency package name and a version spec string, if the version starts with `catalog:`,\n * look up the actual version spec (not the final resolved version) from the given catalogs.\n *\n * Throws an error if there's anything invalid about the catalog spec (no catalogs defined,\n * no matching catalog, catalog doesn't contain `name`, recursive catalog version).\n *\n * Returns undefined if the version doesn't start with `catalog:`.\n * @see https://pnpm.io/catalogs\n * @see https://yarnpkg.com/features/catalogs\n *\n * @param name - Dependency package name\n * @param version - Dependency version spec, e.g. `catalog:my-catalog` or `catalog:`,\n * or some non-catalog spec like `^1.2.3`\n * @returns Actual version spec from the catalog, or undefined if not a catalog version\n */\nexport function getCatalogVersion(params: {\n  name: string;\n  version: string;\n  catalogs: Catalogs | undefined;\n}): string | undefined {\n  const { name, version, catalogs } = params;\n\n  if (!isCatalogVersion(version)) {\n    return undefined;\n  }\n\n  if (!catalogs) {\n    throw new Error(`Dependency \"${name}\" uses a catalog version \"${version}\" but no catalogs are defined.`);\n  }\n\n  const catalogName = version.slice(catalogPrefix.length);\n  const checkCatalog =\n    // Explicit catalog:default refers to the default catalog in pnpm, or a catalog named \"default\"\n    // in yarn... Check for the yarn case first or fall back to .default. (getCatalogs should have\n    // removed the named \"default\" catalog from namedCatalogs in managers where they're the same,\n    // and yarn install would have errored if a named catalog \"default\" was referenced but not defined.)\n    catalogName === \"default\"\n      ? catalogs.named?.default || catalogs.default\n      : // Otherwise use either the given named catalog, or the default if no name was specified\n        catalogName\n        ? catalogs.named?.[catalogName]\n        : catalogs.default;\n  const catalogNameStr = catalogName ? `catalogs.${catalogName}` : \"the default catalog\";\n\n  if (!checkCatalog) {\n    throw new Error(`Dependency \"${name}\" uses a catalog version \"${version}\" but ${catalogNameStr} is not defined.`);\n  }\n\n  const actualSpec = checkCatalog[name];\n  if (!actualSpec) {\n    throw new Error(\n      `Dependency \"${name}\" uses a catalog version \"${version}\", but ${catalogNameStr} doesn't define a version for \"${name}\".`\n    );\n  }\n\n  if (isCatalogVersion(actualSpec)) {\n    throw new Error(\n      `Dependency \"${name}\" resolves to a recursive catalog version \"${actualSpec}\", which is not supported.`\n    );\n  }\n\n  return actualSpec;\n}\n"],"names":["getCatalogVersion","isCatalogVersion","catalogPrefix","version","startsWith","params","name","catalogs","undefined","Error","catalogName","slice","length","checkCatalog","named","default","catalogNameStr","actualSpec"],"mappings":";;;;;;;;;;;;;;;QA2BgBA;eAAAA;;QApBAC;eAAAA;;;AALhB,MAAMC,gBAAgB;AAKf,SAASD,iBAAiBE,OAAe;IAC9C,OAAOA,QAAQC,UAAU,CAACF;AAC5B;AAkBO,SAASF,kBAAkBK,MAIjC;IACC,MAAM,EAAEC,IAAI,EAAEH,OAAO,EAAEI,QAAQ,EAAE,GAAGF;IAEpC,IAAI,CAACJ,iBAAiBE,UAAU;QAC9B,OAAOK;IACT;IAEA,IAAI,CAACD,UAAU;QACb,MAAM,IAAIE,MAAM,CAAC,YAAY,EAAEH,KAAK,0BAA0B,EAAEH,QAAQ,8BAA8B,CAAC;IACzG;IAEA,MAAMO,cAAcP,QAAQQ,KAAK,CAACT,cAAcU,MAAM;IACtD,MAAMC,eACJ,+FAA+F;IAC/F,8FAA8F;IAC9F,6FAA6F;IAC7F,oGAAoG;IACpGH,gBAAgB,YACZH,SAASO,KAAK,EAAEC,WAAWR,SAASQ,OAAO,GAE3CL,cACEH,SAASO,KAAK,EAAE,CAACJ,YAAY,GAC7BH,SAASQ,OAAO;IACxB,MAAMC,iBAAiBN,cAAc,CAAC,SAAS,EAAEA,aAAa,GAAG;IAEjE,IAAI,CAACG,cAAc;QACjB,MAAM,IAAIJ,MAAM,CAAC,YAAY,EAAEH,KAAK,0BAA0B,EAAEH,QAAQ,MAAM,EAAEa,eAAe,gBAAgB,CAAC;IAClH;IAEA,MAAMC,aAAaJ,YAAY,CAACP,KAAK;IACrC,IAAI,CAACW,YAAY;QACf,MAAM,IAAIR,MACR,CAAC,YAAY,EAAEH,KAAK,0BAA0B,EAAEH,QAAQ,OAAO,EAAEa,eAAe,+BAA+B,EAAEV,KAAK,EAAE,CAAC;IAE7H;IAEA,IAAIL,iBAAiBgB,aAAa;QAChC,MAAM,IAAIR,MACR,CAAC,YAAY,EAAEH,KAAK,2CAA2C,EAAEW,WAAW,0BAA0B,CAAC;IAE3G;IAEA,OAAOA;AACT"}
+{"version":3,"sources":["../../src/workspaces/getCatalogVersion.ts"],"sourcesContent":["import type { Catalogs } from \"../types/Catalogs.js\";\n\nconst catalogPrefix = \"catalog:\";\n\n/**\n * Returns true if the version starts with `catalog:`.\n */\nexport function isCatalogVersion(version: string): boolean {\n  return version.startsWith(catalogPrefix);\n}\n\n/**\n * Given a dependency package name and a version spec string, if the version starts with `catalog:`,\n * look up the actual version spec (not the final resolved version) from the given catalogs.\n *\n * Throws an error if there's anything invalid about the catalog spec (no catalogs defined,\n * no matching catalog, catalog doesn't contain `name`, recursive catalog version).\n * If `allowNotFound` is true, it will return undefined if no match instead.\n *\n * Returns undefined if the version doesn't start with `catalog:`.\n * @see https://pnpm.io/catalogs\n * @see https://yarnpkg.com/features/catalogs\n *\n * @returns Actual version spec from the catalog, or undefined if not a catalog version\n * (or undefined if `allowNotFound` is true and the package isn't in the catalog)\n */\nexport function getCatalogVersion(params: {\n  /** Dependency package name */\n  name: string;\n  /**\n   * Dependency version spec, e.g. `catalog:my-catalog` or `catalog:`, or some non-catalog\n   * spec like `^1.2.3`\n   */\n  version: string;\n  catalogs: Catalogs | undefined;\n  allowNotFound?: boolean;\n}): string | undefined {\n  const { name, version, catalogs, allowNotFound } = params;\n\n  if (!isCatalogVersion(version)) {\n    return undefined;\n  }\n\n  if (!catalogs) {\n    if (allowNotFound) {\n      return undefined;\n    }\n    throw new Error(`Dependency \"${name}\" uses a catalog version \"${version}\" but no catalogs are defined.`);\n  }\n\n  const catalogName = version.slice(catalogPrefix.length);\n  const checkCatalog =\n    // Explicit catalog:default refers to the default catalog in pnpm, or a catalog named \"default\"\n    // in yarn... Check for the yarn case first or fall back to .default. (getCatalogs should have\n    // removed the named \"default\" catalog from namedCatalogs in managers where they're the same,\n    // and yarn install would have errored if a named catalog \"default\" was referenced but not defined.)\n    catalogName === \"default\"\n      ? catalogs.named?.default || catalogs.default\n      : // Otherwise use either the given named catalog, or the default if no name was specified\n        catalogName\n        ? catalogs.named?.[catalogName]\n        : catalogs.default;\n  const catalogNameStr = catalogName ? `catalogs.${catalogName}` : \"the default catalog\";\n\n  if (!checkCatalog && !allowNotFound) {\n    throw new Error(`Dependency \"${name}\" uses a catalog version \"${version}\" but ${catalogNameStr} is not defined.`);\n  }\n\n  const actualSpec = checkCatalog?.[name];\n  if (!actualSpec) {\n    if (allowNotFound) {\n      return undefined;\n    }\n    throw new Error(\n      `Dependency \"${name}\" uses a catalog version \"${version}\", but ${catalogNameStr} doesn't define a version for \"${name}\".`\n    );\n  }\n\n  if (isCatalogVersion(actualSpec)) {\n    throw new Error(\n      `Dependency \"${name}\" resolves to a recursive catalog version \"${actualSpec}\", which is not supported.`\n    );\n  }\n\n  return actualSpec;\n}\n"],"names":["getCatalogVersion","isCatalogVersion","catalogPrefix","version","startsWith","params","name","catalogs","allowNotFound","undefined","Error","catalogName","slice","length","checkCatalog","named","default","catalogNameStr","actualSpec"],"mappings":";;;;;;;;;;;;;;;QA0BgBA;eAAAA;;QAnBAC;eAAAA;;;AALhB,MAAMC,gBAAgB;AAKf,SAASD,iBAAiBE,OAAe;IAC9C,OAAOA,QAAQC,UAAU,CAACF;AAC5B;AAiBO,SAASF,kBAAkBK,MAUjC;IACC,MAAM,EAAEC,IAAI,EAAEH,OAAO,EAAEI,QAAQ,EAAEC,aAAa,EAAE,GAAGH;IAEnD,IAAI,CAACJ,iBAAiBE,UAAU;QAC9B,OAAOM;IACT;IAEA,IAAI,CAACF,UAAU;QACb,IAAIC,eAAe;YACjB,OAAOC;QACT;QACA,MAAM,IAAIC,MAAM,CAAC,YAAY,EAAEJ,KAAK,0BAA0B,EAAEH,QAAQ,8BAA8B,CAAC;IACzG;IAEA,MAAMQ,cAAcR,QAAQS,KAAK,CAACV,cAAcW,MAAM;IACtD,MAAMC,eACJ,+FAA+F;IAC/F,8FAA8F;IAC9F,6FAA6F;IAC7F,oGAAoG;IACpGH,gBAAgB,YACZJ,SAASQ,KAAK,EAAEC,WAAWT,SAASS,OAAO,GAE3CL,cACEJ,SAASQ,KAAK,EAAE,CAACJ,YAAY,GAC7BJ,SAASS,OAAO;IACxB,MAAMC,iBAAiBN,cAAc,CAAC,SAAS,EAAEA,aAAa,GAAG;IAEjE,IAAI,CAACG,gBAAgB,CAACN,eAAe;QACnC,MAAM,IAAIE,MAAM,CAAC,YAAY,EAAEJ,KAAK,0BAA0B,EAAEH,QAAQ,MAAM,EAAEc,eAAe,gBAAgB,CAAC;IAClH;IAEA,MAAMC,aAAaJ,cAAc,CAACR,KAAK;IACvC,IAAI,CAACY,YAAY;QACf,IAAIV,eAAe;YACjB,OAAOC;QACT;QACA,MAAM,IAAIC,MACR,CAAC,YAAY,EAAEJ,KAAK,0BAA0B,EAAEH,QAAQ,OAAO,EAAEc,eAAe,+BAA+B,EAAEX,KAAK,EAAE,CAAC;IAE7H;IAEA,IAAIL,iBAAiBiB,aAAa;QAChC,MAAM,IAAIR,MACR,CAAC,YAAY,EAAEJ,KAAK,2CAA2C,EAAEY,WAAW,0BAA0B,CAAC;IAE3G;IAEA,OAAOA;AACT"}

package/package.json

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