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

lib/config/index.spec.ts

@@ -127,7 +127,11 @@ describe('config/index', () => {
       expect(config).toContainEntries([
         [
           'managerFilePatterns',
-          ['/(^|/)package\\.json$/', '/(^|/)pnpm-workspace\\.yaml$/'],
+          [
+            '/(^|/)package\\.json$/',
+            '/(^|/)pnpm-workspace\\.yaml$/',
+            '/(^|/)\\.yarnrc\\.yml$/',
+          ],
         ],
       ]);
       expect(getManagerConfig(parentConfig, 'html')).toContainEntries([

lib/modules/manager/npm/extract/common/package-file.spec.ts

@@ -0,0 +1,67 @@
+vi.mock('fs-extra', async () =>
+  (
+    await vi.importActual<typeof import('~test/fixtures')>('~test/fixtures')
+  ).fsExtra(),
+);
+
+import { GlobalConfig } from '../../../../../config/global';
+import { logger } from '../../../../../logger';
+import { hasPackageManager } from './package-file';
+import { Fixtures } from '~test/fixtures';
+
+describe('modules/manager/npm/extract/common/package-file', () => {
+  beforeEach(() => {
+    Fixtures.reset();
+    GlobalConfig.set({ localDir: '/', cacheDir: '/tmp/cache' });
+    vitest.clearAllMocks();
+  });
+
+  it('returns true for a valid packageManager with name@range (e.g. [email protected])', async () => {
+    Fixtures.mock({
+      '/repo/package.json': JSON.stringify({ packageManager: '[email protected]' }),
+    });
+    await expect(hasPackageManager('/repo')).resolves.toBe(true);
+
+    expect(logger.trace).toHaveBeenCalledWith(
+      'npm.hasPackageManager from package.json',
+    );
+  });
+
+  it('returns true for a valid range like npm@^9', async () => {
+    Fixtures.mock({
+      '/repo/package.json': JSON.stringify({ packageManager: 'npm@^9' }),
+    });
+    await expect(hasPackageManager('/repo')).resolves.toBe(true);
+  });
+
+  it('returns true for yarn classic pin [email protected]', async () => {
+    Fixtures.mock({
+      '/repo/package.json': JSON.stringify({ packageManager: '[email protected]' }),
+    });
+    await expect(hasPackageManager('/repo')).resolves.toBe(true);
+  });
+
+  it("returns false when packageManager does not contain '@' (e.g. 'npm')", async () => {
+    Fixtures.mock({
+      '/repo/package.json': JSON.stringify({ packageManager: 'npm' }),
+    });
+    await expect(hasPackageManager('/repo')).resolves.toBe(false);
+  });
+
+  it('returns false when packageManager is missing', async () => {
+    Fixtures.mock({ '/repo/package.json': JSON.stringify({ name: 'demo' }) });
+    await expect(hasPackageManager('/repo')).resolves.toBe(false);
+  });
+
+  it('returns false when package.json is invalid', async () => {
+    Fixtures.mock({ '/repo/package.json': '{ not: valid json' });
+    await expect(hasPackageManager('/repo')).resolves.toBe(false);
+  });
+
+  it('returns false if packageManager is an empty string', async () => {
+    Fixtures.mock({
+      '/repo/package.json': JSON.stringify({ packageManager: '' }),
+    });
+    await expect(hasPackageManager('/repo')).resolves.toBe(false);
+  });
+});

lib/modules/manager/npm/extract/common/package-file.ts

@@ -5,6 +5,7 @@ import { logger } from '../../../../../logger';
 import { regEx } from '../../../../../util/regex';
 import type { PackageDependency, PackageFileContent } from '../../../types';
 import type { NpmManagerData } from '../../types';
+import { loadPackageJson } from '../../utils';
 import type { NpmPackage, NpmPackageDependency } from '../types';
 import {
   extractDependency,
@@ -147,3 +148,16 @@ export function extractPackageJson(
     },
   };
 }
+
+export async function hasPackageManager(
+  packageJsonDir: string,
+): Promise<boolean> {
+  logger.trace(`npm.hasPackageManager from package.json`);
+
+  const packageJsonResult = await loadPackageJson(packageJsonDir);
+
+  return (
+    is.nonEmptyString(packageJsonResult?.packageManager?.name) &&
+    is.nonEmptyString(packageJsonResult?.packageManager?.version)
+  );
+}

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

@@ -1,6 +1,7 @@
 import { codeBlock } from 'common-tags';
 import { extractAllPackageFiles } from '..';
 import { logger } from '../../../../logger';
+import * as fsUtil from '../../../../util/fs/util';
 import type { ExtractConfig } from '../../types';
 import { postExtract } from './post';
 import * as npmExtract from '.';
@@ -15,6 +16,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', '..');
@@ -927,7 +932,7 @@ describe('modules/manager/npm/extract/index', () => {
       const pJsonStr = JSON.stringify(pJson);
       const res = await npmExtract.extractPackageFile(
         pJsonStr,
-        'package.json',
+        '.yarnrc.yml',
         defaultExtractConfig,
       );
       expect(res).toMatchObject({
@@ -1268,6 +1273,142 @@ 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.readLocalFile.mockResolvedValueOnce(yarnrc);
+
+      fs.getParentDir.mockReturnValue('./');
+
+      vi.spyOn(fsUtil, 'ensureLocalPath').mockImplementation(
+        (p) => './.yarnrc.yml',
+      );
+
+      fs.readLocalFile.mockResolvedValueOnce(input02Content);
+
+      const res = await extractAllPackageFiles(defaultExtractConfig, [
+        '.yarnrc.yml',
+      ]);
+
+      expect(res).toEqual([
+        {
+          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 packageManager to true', 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.getParentDir.mockReturnValue('./');
+
+      vi.spyOn(fsUtil, 'ensureLocalPath').mockImplementation(
+        (p) => './.yarnrc.yml',
+      );
+
+      fs.readLocalFile.mockResolvedValueOnce(yarnrc);
+      fs.readLocalFile.mockResolvedValueOnce(input01PackageManager);
+
+      const res = await extractAllPackageFiles(defaultExtractConfig, [
+        '.yarnrc.yml',
+      ]);
+
+      expect(res[0]).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',
+      });
+    });
+
+    it('extracts yarnrc.yml and adds it as packageFile and packageManager to false if no deps', 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.getParentDir.mockReturnValue('./');
+
+      vi.spyOn(fsUtil, 'ensureLocalPath').mockImplementation(
+        (p) => './.yarnrc.yml',
+      );
+
+      fs.readLocalFile.mockResolvedValueOnce(yarnrc);
+
+      fs.readLocalFile.mockResolvedValueOnce(
+        '{"name": "simulate deps to be null", brokenJsonHere: }',
+      );
+
+      const res = await extractAllPackageFiles(defaultExtractConfig, [
+        '.yarnrc.yml',
+      ]);
+
+      expect(res[0]).toEqual({
+        deps: [
+          {
+            currentValue: '1.0.0',
+            datasource: 'npm',
+            depName: 'is-positive',
+            depType: 'yarn.catalog.default',
+            prettyDepType: 'yarn.catalog.default',
+          },
+        ],
+        managerData: {
+          hasPackageManager: false,
+        },
+        packageFile: '.yarnrc.yml',
+      });
+    });
   });
 
   describe('.postExtract()', () => {

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

@@ -3,9 +3,11 @@ import { GlobalConfig } from '../../../../config/global';
 import { logger } from '../../../../logger';
 import {
   findLocalSiblingOrParent,
+  getParentDir,
   getSiblingFileName,
   readLocalFile,
 } from '../../../../util/fs';
+import { ensureLocalPath } from '../../../../util/fs/util';
 import { newlineRegex, regEx } from '../../../../util/regex';
 import { NpmDatasource } from '../../../datasource/npm';
 
@@ -17,11 +19,11 @@ import type {
 import type { YarnConfig } from '../schema';
 import type { NpmLockFiles, NpmManagerData } from '../types';
 import { getExtractedConstraints } from './common/dependency';
-import { extractPackageJson } from './common/package-file';
+import { extractPackageJson, hasPackageManager } from './common/package-file';
 import { extractPnpmWorkspaceFile, tryParsePnpmWorkspaceYaml } from './pnpm';
 import { postExtract } from './post';
 import type { NpmPackage } from './types';
-import { isZeroInstall } from './yarn';
+import { extractYarnCatalogs, isZeroInstall } from './yarn';
 import {
   loadConfigFromLegacyYarnrc,
   loadConfigFromYarnrcYml,
@@ -254,13 +256,37 @@ export async function extractAllPackageFiles(
           });
         }
       } else {
-        logger.trace({ packageFile }, `Extracting as a package.json file`);
-        const deps = await extractPackageFile(content, packageFile, config);
-        if (deps) {
-          npmFiles.push({
-            ...deps,
-            packageFile,
-          });
+        if (packageFile.endsWith('json')) {
+          logger.trace({ packageFile }, `Extracting as a package.json file`);
+
+          const deps = await extractPackageFile(content, packageFile, config);
+          if (deps) {
+            npmFiles.push({
+              ...deps,
+              packageFile,
+            });
+          }
+        } else {
+          logger.trace({ packageFile }, `Extracting as a .yarnrc.yml file`);
+
+          const yarnConfig = loadConfigFromYarnrcYml(content);
+
+          if (yarnConfig?.catalogs) {
+            const hasPackageManagerResult = await hasPackageManager(
+              getParentDir(ensureLocalPath(packageFile)),
+            );
+            const catalogsDeps = await extractYarnCatalogs(
+              yarnConfig.catalogs,
+              packageFile,
+              hasPackageManagerResult,
+            );
+            if (catalogsDeps) {
+              npmFiles.push({
+                ...catalogsDeps,
+                packageFile,
+              });
+            }
+          }
         }
       }
     } else {