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,49 @@
+import { logger } from '../../../../../logger';
+import { hasPackageManager } from './package-file';
+
+describe('modules/manager/npm/extract/common/package-file', () => {
+  beforeEach(() => {
+    vitest.clearAllMocks();
+  });
+
+  it('returns true for a valid packageManager with name@range (e.g. [email protected])', () => {
+    const content = JSON.stringify({ packageManager: '[email protected]' });
+    expect(hasPackageManager(content)).toBe(true);
+
+    expect(logger.trace).toHaveBeenCalledWith(
+      'npm.hasPackageManager from package.json',
+    );
+    expect(logger.debug).not.toHaveBeenCalled();
+  });
+
+  it('returns true for a valid range like npm@^9', () => {
+    const content = JSON.stringify({ packageManager: 'npm@^9' });
+    expect(hasPackageManager(content)).toBe(true);
+  });
+
+  it('returns true for yarn classic pin [email protected]', () => {
+    const content = JSON.stringify({ packageManager: '[email protected]' });
+    expect(hasPackageManager(content)).toBe(true);
+  });
+
+  it("returns false when packageManager does not contain '@' (e.g. 'npm')", () => {
+    const content = JSON.stringify({ packageManager: 'npm' });
+    expect(hasPackageManager(content)).toBe(false);
+  });
+
+  it('returns false when packageManager is missing', () => {
+    const content = JSON.stringify({ name: 'demo' });
+    expect(hasPackageManager(content)).toBe(false);
+  });
+
+  it("returns false and logs 'Invalid JSON' when content is not valid JSON", () => {
+    const bad = '{ not: valid json';
+    expect(hasPackageManager(bad)).toBe(false);
+    expect(logger.debug).toHaveBeenCalledWith('Invalid JSON');
+  });
+
+  it('returns false if packageManager is an empty string', () => {
+    const content = JSON.stringify({ packageManager: '' });
+    expect(hasPackageManager(content)).toBe(false);
+  });
+});

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

@@ -4,6 +4,7 @@ import { CONFIG_VALIDATION } from '../../../../../constants/error-messages';
 import { logger } from '../../../../../logger';
 import { regEx } from '../../../../../util/regex';
 import type { PackageDependency, PackageFileContent } from '../../../types';
+import { PackageJson } from '../../schema';
 import type { NpmManagerData } from '../../types';
 import type { NpmPackage, NpmPackageDependency } from '../types';
 import {
@@ -147,3 +148,18 @@ export function extractPackageJson(
     },
   };
 }
+
+export function hasPackageManager(content: string): boolean {
+  logger.trace(`npm.hasPackageManager from package.json`);
+  try {
+    const packageJsonResult = PackageJson.parse(content);
+
+    return (
+      is.nonEmptyString(packageJsonResult?.packageManager?.name) &&
+      is.nonEmptyString(packageJsonResult?.packageManager?.version)
+    );
+  } catch {
+    logger.debug(`Invalid JSON`);
+  }
+  return false;
+}

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', '..');
@@ -927,7 +931,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 +1272,138 @@ 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.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.findLocalSiblingOrParent.mockImplementation(
+        async (_, name) =>
+          await new Promise((resolve) =>
+            resolve(name === 'package.json' ? 'package.json' : null),
+          ),
+      );
+      fs.findLocalSiblingOrParent.mockResolvedValue('package.json');
+
+      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.findLocalSiblingOrParent.mockImplementation(
+        async (_, name) =>
+          await new Promise((resolve) =>
+            resolve(name === 'package.json' ? 'package.json' : null),
+          ),
+      );
+      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

@@ -17,11 +17,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 +254,35 @@ 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 hasPackageManager = await resolvePackageManager(packageFile);
+            const catalogsDeps = await extractYarnCatalogs(
+              yarnConfig.catalogs,
+              packageFile,
+              hasPackageManager,
+            );
+            if (catalogsDeps) {
+              npmFiles.push({
+                ...catalogsDeps,
+                packageFile,
+              });
+            }
+          }
         }
       }
     } else {
@@ -271,3 +293,19 @@ export async function extractAllPackageFiles(
   await postExtract(npmFiles);
   return npmFiles;
 }
+
+async function resolvePackageManager(packageFile: string): Promise<boolean> {
+  let hasPkgManager = false;
+  const packageJson = await findLocalSiblingOrParent(
+    packageFile,
+    'package.json',
+  );
+
+  if (packageJson) {
+    const content = await readLocalFile(packageJson, 'utf8');
+
+    hasPkgManager = content ? hasPackageManager(content) : false;
+  }
+
+  return hasPkgManager;
+}