feat(npm): support yarn catalogs via yarn-plugin-catalogs

lib/modules/manager/npm/extract/common/catalogs.ts

@@ -0,0 +1,37 @@
+import { PackageDependency } from '../../../types';
+import { NpmManagerData } from '../../types';
+import { Catalog } from '../types';
+import { extractDependency, parseDepName } from './dependency';
+
+export const PNPM_CATALOG_DEPENDENCY = 'pnpm.catalog';
+export const YARN_CATALOG_DEPENDENCY = 'yarn.catalog';
+
+/**
+ * In order to facilitate matching on specific catalogs, we structure the
+ * depType as `[pnpm|yarn].catalog.default`, `[pnpm|yarn].catalog.react17`, and so on.
+ */
+function getCatalogDepType(name: string, npmManager: 'pnpm' | 'yarn'): string {
+  return `${npmManager === 'pnpm' ? PNPM_CATALOG_DEPENDENCY : YARN_CATALOG_DEPENDENCY}.${name}`;
+}
+export function extractCatalogDeps(
+  catalogs: Catalog[],
+  npmManager: 'pnpm' | 'yarn' = 'pnpm',
+): PackageDependency<NpmManagerData>[] {
+  const deps: PackageDependency<NpmManagerData>[] = [];
+
+  for (const catalog of catalogs) {
+    for (const [key, val] of Object.entries(catalog.dependencies)) {
+      const depType = getCatalogDepType(catalog.name, npmManager);
+      const depName = parseDepName(depType, key);
+      const dep: PackageDependency<NpmManagerData> = {
+        depType,
+        depName,
+        ...extractDependency(depType, depName, val!),
+        prettyDepType: depType,
+      };
+      deps.push(dep);
+    }
+  }
+
+  return deps;
+}

lib/modules/manager/npm/extract/index.spec.ts

@@ -15,6 +15,10 @@ const defaultExtractConfig = {
 
 const input01Content = Fixtures.get('inputs/01.json', '..');
 const input02Content = Fixtures.get('inputs/02.json', '..');
+const input01PackageManager = Fixtures.get(
+  'inputs/01-package-manager.json',
+  '..',
+);
 const input01GlobContent = Fixtures.get('inputs/01-glob.json', '..');
 const workspacesContent = Fixtures.get('inputs/workspaces.json', '..');
 const vendorisedContent = Fixtures.get('is-object.json', '..');
@@ -1267,6 +1271,128 @@ describe('modules/manager/npm/extract/index', () => {
         },
       ]);
     });
+
+    it('extracts yarnrc.yml and adds it as packageFile', async () => {
+      const yarnrc = codeBlock`
+        nodeLinker: node-modules
+
+        plugins:
+          - checksum: 4cb9601cfc0c71e5b0ffd0a85b78e37430b62257040714c2558298ce1fc058f4e918903f0d1747a4fef3f58e15722c35bd76d27492d9d08aa5b04e235bf43b22
+            path: .yarn/plugins/@yarnpkg/plugin-catalogs.cjs
+            spec: 'https://raw.githubusercontent.com/toss/yarn-plugin-catalogs/main/bundles/%40yarnpkg/plugin-catalogs.js'
+
+        catalogs:
+          list:
+            is-positive: 1.0.0
+      `;
+      fs.findLocalSiblingOrParent.mockResolvedValue('.yarnrc.yml');
+
+      fs.readLocalFile.mockResolvedValueOnce(input02Content);
+      fs.readLocalFile.mockResolvedValue(yarnrc);
+
+      const res = await extractAllPackageFiles(defaultExtractConfig, [
+        'package.json',
+      ]);
+
+      expect(res).toEqual([
+        {
+          deps: [
+            {
+              currentValue: '7.0.0',
+              datasource: 'npm',
+              depName: '@babel/core',
+              depType: 'dependencies',
+              prettyDepType: 'dependency',
+            },
+            {
+              currentValue: '1.21.0',
+              datasource: 'npm',
+              depName: 'config',
+              depType: 'dependencies',
+              prettyDepType: 'dependency',
+            },
+            {
+              currentValue: '0.7.0',
+              datasource: 'npm',
+              depName: 'express>cookie',
+              packageName: 'cookie',
+              depType: 'pnpm.overrides',
+              prettyDepType: 'overrides',
+            },
+          ],
+          extractedConstraints: {},
+          managerData: {
+            hasPackageManager: false,
+            npmLock: undefined,
+            packageJsonName: 'renovate',
+            pnpmShrinkwrap: undefined,
+            workspacesPackages: undefined,
+            workspaces: undefined,
+            yarnLock: undefined,
+            npmrcFileName: '.yarnrc.yml',
+            yarnZeroInstall: false,
+          },
+          npmrc: yarnrc,
+          packageFile: 'package.json',
+          packageFileVersion: '1.0.0',
+          skipInstalls: true,
+        },
+        {
+          deps: [
+            {
+              currentValue: '1.0.0',
+              datasource: 'npm',
+              depName: 'is-positive',
+              depType: 'yarn.catalog.default',
+              prettyDepType: 'yarn.catalog.default',
+            },
+          ],
+          managerData: {
+            hasPackageManager: false,
+          },
+          packageFile: '.yarnrc.yml',
+        },
+      ]);
+    });
+
+    it('extracts yarnrc.yml and adds it as packageFile and sets pacakgeManager', async () => {
+      const yarnrc = codeBlock`
+        nodeLinker: node-modules
+
+        plugins:
+          - checksum: 4cb9601cfc0c71e5b0ffd0a85b78e37430b62257040714c2558298ce1fc058f4e918903f0d1747a4fef3f58e15722c35bd76d27492d9d08aa5b04e235bf43b22
+            path: .yarn/plugins/@yarnpkg/plugin-catalogs.cjs
+            spec: 'https://raw.githubusercontent.com/toss/yarn-plugin-catalogs/main/bundles/%40yarnpkg/plugin-catalogs.js'
+
+        catalogs:
+          list:
+            is-positive: 1.0.0
+      `;
+      fs.findLocalSiblingOrParent.mockResolvedValue('.yarnrc.yml');
+
+      fs.readLocalFile.mockResolvedValueOnce(input01PackageManager);
+      fs.readLocalFile.mockResolvedValue(yarnrc);
+
+      const res = await extractAllPackageFiles(defaultExtractConfig, [
+        'package.json',
+      ]);
+
+      expect(res[1]).toEqual({
+        deps: [
+          {
+            currentValue: '1.0.0',
+            datasource: 'npm',
+            depName: 'is-positive',
+            depType: 'yarn.catalog.default',
+            prettyDepType: 'yarn.catalog.default',
+          },
+        ],
+        managerData: {
+          hasPackageManager: true,
+        },
+        packageFile: '.yarnrc.yml',
+      });
+    });
   });
 
   describe('.postExtract()', () => {

lib/modules/manager/npm/extract/index.ts

@@ -20,11 +20,11 @@ import { extractPackageJson } from './common/package-file';
 import { extractPnpmWorkspaceFile, tryParsePnpmWorkspaceYaml } from './pnpm';
 import { postExtract } from './post';
 import type { NpmPackage } from './types';
-import { isZeroInstall } from './yarn';
+import { extractYarnCatalogsFromYml, isZeroInstall } from './yarn';
 import type { YarnConfig } from './yarnrc';
 import {
   loadConfigFromLegacyYarnrc,
-  loadConfigFromYarnrcYml,
+  loadYarnRcYml,
   resolveRegistryUrl,
 } from './yarnrc';
 
@@ -137,13 +137,7 @@ export async function extractPackageFile(
     ? await isZeroInstall(yarnrcYmlFileName)
     : false;
 
-  let yarnConfig: YarnConfig | null = null;
-  const repoYarnrcYml = yarnrcYmlFileName
-    ? await readLocalFile(yarnrcYmlFileName, 'utf8')
-    : null;
-  if (is.string(repoYarnrcYml) && repoYarnrcYml.trim().length > 0) {
-    yarnConfig = loadConfigFromYarnrcYml(repoYarnrcYml);
-  }
+  let yarnConfig: YarnConfig | null = await loadYarnRcYml(yarnrcYmlFileName);
 
   const legacyYarnrcFileName = await findLocalSiblingOrParent(
     packageFile,
@@ -252,6 +246,7 @@ export async function extractAllPackageFiles(
           });
         }
       } else {
+        debugger;
         logger.trace({ packageFile }, `Extracting as a package.json file`);
         const deps = await extractPackageFile(content, packageFile, config);
         if (deps) {
@@ -260,12 +255,35 @@ export async function extractAllPackageFiles(
             packageFile,
           });
         }
+
+        if (packageFile === 'package.json') {
+          const yarnrcYmlFileName = await findLocalSiblingOrParent(
+            packageFile,
+            '.yarnrc.yml',
+          );
+
+          const yarnConfig: YarnConfig | null =
+            await loadYarnRcYml(yarnrcYmlFileName);
+
+          if (yarnConfig?.catalogs) {
+            const catalogsDeps = await extractYarnCatalogsFromYml(
+              yarnConfig.catalogs,
+              packageFile,
+              deps?.managerData?.hasPackageManager ?? false,
+            );
+            if (catalogsDeps) {
+              npmFiles.push({
+                ...catalogsDeps,
+                packageFile: '.yarnrc.yml',
+              });
+            }
+          }
+        }
       }
     } else {
       logger.debug({ packageFile }, `No content found`);
     }
   }
-
   await postExtract(npmFiles);
   return npmFiles;
 }

lib/modules/manager/npm/extract/pnpm.ts

@@ -11,17 +11,13 @@ import {
   readLocalFile,
 } from '../../../../util/fs';
 import { parseSingleYaml } from '../../../../util/yaml';
-import type {
-  PackageDependency,
-  PackageFile,
-  PackageFileContent,
-} from '../../types';
+import type { PackageFile, PackageFileContent } from '../../types';
 import type { PnpmDependencySchema, PnpmLockFile } from '../post-update/types';
 import type { PnpmCatalogsSchema } from '../schema';
 import { PnpmWorkspaceFileSchema } from '../schema';
 import type { NpmManagerData } from '../types';
-import { extractDependency, parseDepName } from './common/dependency';
-import type { LockFile, PnpmCatalog, PnpmWorkspaceFile } from './types';
+import { extractCatalogDeps } from './common/catalogs';
+import type { Catalog, LockFile, PnpmWorkspaceFile } from './types';
 
 function isPnpmLockfile(obj: any): obj is PnpmLockFile {
   return is.plainObject(obj) && 'lockfileVersion' in obj;
@@ -279,7 +275,7 @@ export async function extractPnpmWorkspaceFile(
 
   const pnpmCatalogs = pnpmCatalogsToArray(catalogs);
 
-  const deps = extractPnpmCatalogDeps(pnpmCatalogs);
+  const deps = extractCatalogDeps(pnpmCatalogs);
 
   let pnpmShrinkwrap;
   const filePath = getSiblingFileName(packageFile, 'pnpm-lock.yaml');
@@ -296,42 +292,11 @@ export async function extractPnpmWorkspaceFile(
   };
 }
 
-/**
- * In order to facilitate matching on specific catalogs, we structure the
- * depType as `pnpm.catalog.default`, `pnpm.catalog.react17`, and so on.
- */
-function getCatalogDepType(name: string): string {
-  const CATALOG_DEPENDENCY = 'pnpm.catalog';
-  return `${CATALOG_DEPENDENCY}.${name}`;
-}
-
-function extractPnpmCatalogDeps(
-  catalogs: PnpmCatalog[],
-): PackageDependency<NpmManagerData>[] {
-  const deps: PackageDependency<NpmManagerData>[] = [];
-
-  for (const catalog of catalogs) {
-    for (const [key, val] of Object.entries(catalog.dependencies)) {
-      const depType = getCatalogDepType(catalog.name);
-      const depName = parseDepName(depType, key);
-      const dep: PackageDependency<NpmManagerData> = {
-        depType,
-        depName,
-        ...extractDependency(depType, depName, val!),
-        prettyDepType: depType,
-      };
-      deps.push(dep);
-    }
-  }
-
-  return deps;
-}
-
 function pnpmCatalogsToArray({
   catalog: defaultCatalogDeps,
   catalogs: namedCatalogs,
-}: PnpmCatalogs): PnpmCatalog[] {
-  const result: PnpmCatalog[] = [];
+}: PnpmCatalogs): Catalog[] {
+  const result: Catalog[] = [];
 
   if (defaultCatalogDeps !== undefined) {
     result.push({ name: 'default', dependencies: defaultCatalogDeps });

lib/modules/manager/npm/extract/types.ts

@@ -55,7 +55,7 @@ export interface PnpmWorkspaceFile {
  * A pnpm catalog is either the default catalog (catalog:, catalogs:default), or
  * a named one (catalogs:<name>)
  */
-export interface PnpmCatalog {
+export interface Catalog {
   name: string;
   dependencies: NpmPackageDependency;
 }