renovate 42.0.0-next.1 → 42.0.0

package/dist/modules/manager/npm/post-update/pnpm.js.map

@@ -1 +1 @@
-{"version":3,"file":"pnpm.js","sourceRoot":"","sources":["../../../../../lib/modules/manager/npm/post-update/pnpm.ts"],"names":[],"mappings":"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","sourcesContent":["import is from '@sindresorhus/is';\nimport { quote } from 'shlex';\nimport upath from 'upath';\nimport { GlobalConfig } from '../../../../config/global';\nimport { TEMPORARY_ERROR } from '../../../../constants/error-messages';\nimport { logger } from '../../../../logger';\nimport { exec } from '../../../../util/exec';\nimport type {\n  ExecOptions,\n  ExtraEnv,\n  ToolConstraint,\n} from '../../../../util/exec/types';\nimport {\n  deleteLocalFile,\n  ensureCacheDir,\n  getSiblingFileName,\n  localPathExists,\n  readLocalFile,\n} from '../../../../util/fs';\nimport { uniqueStrings } from '../../../../util/string';\nimport { parseSingleYaml } from '../../../../util/yaml';\nimport type { PostUpdateConfig, Upgrade } from '../../types';\nimport { PNPM_CACHE_DIR, PNPM_STORE_DIR } from '../constants';\nimport type { PnpmWorkspaceFile } from '../extract/types';\nimport { getNodeToolConstraint } from './node-version';\nimport type { GenerateLockFileResult, PnpmLockFile } from './types';\nimport { getPackageManagerVersion, lazyLoadPackageJson } from './utils';\n\nfunction getPnpmConstraintFromUpgrades(upgrades: Upgrade[]): string | null {\n  for (const upgrade of upgrades) {\n    if (upgrade.depName === 'pnpm' && upgrade.newVersion) {\n      return upgrade.newVersion;\n    }\n  }\n  return null;\n}\n\nexport async function generateLockFile(\n  lockFileDir: string,\n  env: NodeJS.ProcessEnv,\n  config: PostUpdateConfig,\n  upgrades: Upgrade[] = [],\n): Promise<GenerateLockFileResult> {\n  const lockFileName = upath.join(lockFileDir, 'pnpm-lock.yaml');\n  logger.debug(`Spawning pnpm install to create ${lockFileName}`);\n  let lockFile: string | null = null;\n  let stdout: string | undefined;\n  let stderr: string | undefined;\n  const commands: string[] = [];\n  try {\n    const lazyPgkJson = lazyLoadPackageJson(lockFileDir);\n    const pnpmToolConstraint: ToolConstraint = {\n      toolName: 'pnpm',\n      constraint:\n        getPnpmConstraintFromUpgrades(upgrades) ?? // if pnpm is being upgraded, it comes first\n        config.constraints?.pnpm ?? // from user config or extraction\n        getPackageManagerVersion('pnpm', await lazyPgkJson.getValue()) ?? // look in package.json > packageManager or engines\n        (await getConstraintFromLockFile(lockFileName)), // use lockfileVersion to find pnpm version range\n    };\n\n    const pnpmConfigCacheDir = await ensureCacheDir(PNPM_CACHE_DIR);\n    const pnpmConfigStoreDir = await ensureCacheDir(PNPM_STORE_DIR);\n    const extraEnv: ExtraEnv = {\n      // those arwe no longer working and it's unclear if they ever worked\n      NPM_CONFIG_CACHE: env.NPM_CONFIG_CACHE,\n      npm_config_store: env.npm_config_store,\n      // these are used by pnpm v5 to v10. Maybe earlier versions too\n      npm_config_cache_dir: pnpmConfigCacheDir,\n      npm_config_store_dir: pnpmConfigStoreDir,\n      // pnpm stops reading npm_config_* env vars since v11\n      pnpm_config_cache_dir: pnpmConfigCacheDir,\n      pnpm_config_store_dir: pnpmConfigStoreDir,\n    };\n    const execOptions: ExecOptions = {\n      cwdFile: lockFileName,\n      extraEnv,\n      docker: {},\n      toolConstraints: [\n        await getNodeToolConstraint(config, upgrades, lockFileDir, lazyPgkJson),\n        pnpmToolConstraint,\n      ],\n    };\n    /* v8 ignore next 4 -- needs test */\n    if (GlobalConfig.get('exposeAllEnv')) {\n      extraEnv.NPM_AUTH = env.NPM_AUTH;\n      extraEnv.NPM_EMAIL = env.NPM_EMAIL;\n    }\n\n    const pnpmWorkspaceFilePath = getSiblingFileName(\n      lockFileName,\n      'pnpm-workspace.yaml',\n    );\n\n    let args = '--lockfile-only';\n\n    // If it's not a workspaces project/monorepo, but single project with unrelated other npm project in source tree (for example, a git submodule),\n    // `--recursive` will install un-wanted project.\n    // we should avoid this.\n    if (await localPathExists(pnpmWorkspaceFilePath)) {\n      const pnpmWorkspace = parseSingleYaml<PnpmWorkspaceFile>(\n        (await readLocalFile(pnpmWorkspaceFilePath, 'utf8'))!,\n      );\n      if (pnpmWorkspace?.packages?.length) {\n        logger.debug(\n          `Found pnpm workspace with ${pnpmWorkspace.packages.length} package definitions`,\n        );\n        // we are in a monorepo, 'pnpm update' needs the '--recursive' flag contrary to 'pnpm install'\n        args += ' --recursive';\n      }\n    }\n    if (!GlobalConfig.get('allowScripts') || config.ignoreScripts) {\n      args += ' --ignore-scripts';\n      args += ' --ignore-pnpmfile';\n    }\n    logger.trace({ args }, 'pnpm command options');\n\n    const lockUpdates = upgrades.filter((upgrade) => upgrade.isLockfileUpdate);\n\n    if (lockUpdates.length !== upgrades.length) {\n      // This command updates the lock file based on package.json\n      commands.push(`pnpm install ${args}`);\n    }\n\n    // rangeStrategy = update-lockfile\n    if (lockUpdates.length) {\n      logger.debug('Performing lockfileUpdate (pnpm)');\n      commands.push(\n        `pnpm update --no-save ${lockUpdates\n          // TODO: types (#22198)\n          .map((update) => `${update.packageName!}@${update.newVersion!}`)\n          .filter(uniqueStrings)\n          .map(quote)\n          .join(' ')} ${args}`,\n      );\n    }\n\n    // postUpdateOptions\n    if (config.postUpdateOptions?.includes('pnpmDedupe')) {\n      commands.push('pnpm dedupe --ignore-scripts');\n    }\n\n    if (upgrades.find((upgrade) => upgrade.isLockFileMaintenance)) {\n      logger.debug(\n        `Removing ${lockFileName} first due to lock file maintenance upgrade`,\n      );\n      try {\n        await deleteLocalFile(lockFileName);\n        /* v8 ignore start -- needs test */\n      } catch (err) {\n        logger.debug(\n          { err, lockFileName },\n          'Error removing `pnpm-lock.yaml` for lock file maintenance',\n        );\n      } /* v8 ignore stop -- needs test */\n    }\n\n    await exec(commands, execOptions);\n    lockFile = await readLocalFile(lockFileName, 'utf8');\n    /* v8 ignore start -- needs test */\n  } catch (err) {\n    if (err.message === TEMPORARY_ERROR) {\n      throw err;\n    }\n    logger.debug(\n      {\n        commands,\n        err,\n        stdout,\n        stderr,\n        type: 'pnpm',\n      },\n      'lock file error',\n    );\n    return { error: true, stderr: err.stderr, stdout: err.stdout };\n  } /* v8 ignore stop -- needs test */\n  return { lockFile };\n}\n\nexport async function getConstraintFromLockFile(\n  lockFileName: string,\n): Promise<string | null> {\n  let constraint: string | null = null;\n  try {\n    const lockfileContent = await readLocalFile(lockFileName, 'utf8');\n    if (!lockfileContent) {\n      logger.trace(`Empty pnpm lock file: ${lockFileName}`);\n      return null;\n    }\n    // TODO: use schema (#9610)\n    const pnpmLock = parseSingleYaml<PnpmLockFile>(lockfileContent);\n    if (\n      !is.number(pnpmLock?.lockfileVersion) &&\n      !is.numericString(pnpmLock?.lockfileVersion)\n    ) {\n      logger.trace(`Invalid pnpm lockfile version: ${lockFileName}`);\n      return null;\n    }\n    // find matching lockfileVersion and use its constraints\n    // if no match found use lockfileVersion 5\n    // lockfileVersion 5 is the minimum version required to generate the pnpm-lock.yaml file\n    const { lowerConstraint, upperConstraint } = lockToPnpmVersionMapping.find(\n      (m) => m.lockfileVersion === pnpmLock.lockfileVersion,\n    ) ?? {\n      lockfileVersion: 5.0,\n      lowerConstraint: '>=3',\n      upperConstraint: '<3.5.0',\n    };\n    constraint = lowerConstraint;\n    if (upperConstraint) {\n      constraint += ` ${upperConstraint}`;\n    }\n  } catch (err) {\n    logger.warn({ err }, 'Error getting pnpm constraints from lock file');\n  }\n  return constraint;\n}\n\n/**\n * pnpm lockfiles have corresponding version numbers called \"lockfileVersion\"\n * each lockfileVersion can only be generated by a certain pnpm version range\n * eg. lockfileVersion: 5.4 can only be generated by pnpm version >=7 && <8\n * official list can be found here : https://github.com/pnpm/spec/tree/master/lockfile\n * we use the mapping present below to find the compatible pnpm version range for a given lockfileVersion\n *\n * the various terms used in the mapping are explained below:\n * lowerConstraint : lowest pnpm version that can generate the lockfileVersion\n * upperConstraint : highest pnpm version that can generate the lockfileVersion\n * lowerBound      : highest pnpm version that is less than the lowerConstraint\n * upperBound      : lowest pnpm version that is greater than the upperConstraint\n *\n * To handle future lockfileVersions, we need to:\n * 1. add a upperBound and upperConstraint to the current latest lockfileVersion\n * 2. add an object for the new lockfileVersion with lowerBound and lowerConstraint\n *\n * lockfileVersion from v6 on are strings\n */\nconst lockToPnpmVersionMapping: LockToPnpmVersionMapping[] = [\n  { lockfileVersion: '9.0', lowerConstraint: '>=9' },\n  {\n    lockfileVersion: '6.0',\n    lowerConstraint: '>=7.24.2',\n    upperConstraint: '<9',\n  },\n  {\n    lockfileVersion: 5.4,\n    lowerConstraint: '>=7',\n    upperConstraint: '<8',\n  },\n  {\n    lockfileVersion: 5.3,\n    lowerConstraint: '>=6',\n    upperConstraint: '<7',\n  },\n  {\n    lockfileVersion: 5.2,\n    lowerConstraint: '>=5.10.0',\n    upperConstraint: '<6',\n  },\n  {\n    lockfileVersion: 5.1,\n    lowerConstraint: '>=3.5.0',\n    upperConstraint: '<5.9.3',\n  },\n];\n\ninterface LockToPnpmVersionMapping {\n  lockfileVersion: string | number;\n  lowerConstraint: string;\n  upperConstraint?: string;\n}\n"]}
+{"version":3,"file":"pnpm.js","sourceRoot":"","sources":["../../../../../lib/modules/manager/npm/post-update/pnpm.ts"],"names":[],"mappings":"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","sourcesContent":["import is from '@sindresorhus/is';\nimport { quote } from 'shlex';\nimport upath from 'upath';\nimport { GlobalConfig } from '../../../../config/global';\nimport { TEMPORARY_ERROR } from '../../../../constants/error-messages';\nimport { logger } from '../../../../logger';\nimport { exec } from '../../../../util/exec';\nimport type {\n  ExecOptions,\n  ExtraEnv,\n  ToolConstraint,\n} from '../../../../util/exec/types';\nimport {\n  deleteLocalFile,\n  ensureCacheDir,\n  getSiblingFileName,\n  localPathExists,\n  readLocalFile,\n} from '../../../../util/fs';\nimport { uniqueStrings } from '../../../../util/string';\nimport { parseSingleYaml } from '../../../../util/yaml';\nimport type { PostUpdateConfig, Upgrade } from '../../types';\nimport { PNPM_CACHE_DIR, PNPM_STORE_DIR } from '../constants';\nimport type { PnpmWorkspaceFile } from '../extract/types';\nimport { getNodeToolConstraint } from './node-version';\nimport type { GenerateLockFileResult, PnpmLockFile } from './types';\nimport { getPackageManagerVersion, lazyLoadPackageJson } from './utils';\n\nfunction getPnpmConstraintFromUpgrades(upgrades: Upgrade[]): string | null {\n  for (const upgrade of upgrades) {\n    if (upgrade.depName === 'pnpm' && upgrade.newVersion) {\n      return upgrade.newVersion;\n    }\n  }\n  return null;\n}\n\nexport async function generateLockFile(\n  lockFileDir: string,\n  env: NodeJS.ProcessEnv,\n  config: PostUpdateConfig,\n  upgrades: Upgrade[] = [],\n): Promise<GenerateLockFileResult> {\n  const lockFileName = upath.join(lockFileDir, 'pnpm-lock.yaml');\n  logger.debug(`Spawning pnpm install to create ${lockFileName}`);\n  let lockFile: string | null = null;\n  let stdout: string | undefined;\n  let stderr: string | undefined;\n  const commands: string[] = [];\n  try {\n    const lazyPgkJson = lazyLoadPackageJson(lockFileDir);\n    const pnpmToolConstraint: ToolConstraint = {\n      toolName: 'pnpm',\n      constraint:\n        getPnpmConstraintFromUpgrades(upgrades) ?? // if pnpm is being upgraded, it comes first\n        config.constraints?.pnpm ?? // from user config or extraction\n        getPackageManagerVersion('pnpm', await lazyPgkJson.getValue()) ?? // look in package.json > packageManager or engines\n        (await getConstraintFromLockFile(lockFileName)), // use lockfileVersion to find pnpm version range\n    };\n\n    const pnpmConfigCacheDir = await ensureCacheDir(PNPM_CACHE_DIR);\n    const pnpmConfigStoreDir = await ensureCacheDir(PNPM_STORE_DIR);\n    const extraEnv: ExtraEnv = {\n      // those arwe no longer working and it's unclear if they ever worked\n      NPM_CONFIG_CACHE: env.NPM_CONFIG_CACHE,\n      npm_config_store: env.npm_config_store,\n      // these are used by pnpm v5 to v10. Maybe earlier versions too\n      npm_config_cache_dir: pnpmConfigCacheDir,\n      npm_config_store_dir: pnpmConfigStoreDir,\n      // pnpm stops reading npm_config_* env vars since v11\n      pnpm_config_cache_dir: pnpmConfigCacheDir,\n      pnpm_config_store_dir: pnpmConfigStoreDir,\n    };\n    const execOptions: ExecOptions = {\n      cwdFile: lockFileName,\n      extraEnv,\n      docker: {},\n      toolConstraints: [\n        await getNodeToolConstraint(config, upgrades, lockFileDir, lazyPgkJson),\n        pnpmToolConstraint,\n      ],\n    };\n    /* v8 ignore next 4 -- needs test */\n    if (GlobalConfig.get('exposeAllEnv')) {\n      extraEnv.NPM_AUTH = env.NPM_AUTH;\n      extraEnv.NPM_EMAIL = env.NPM_EMAIL;\n    }\n\n    const pnpmWorkspaceFilePath = getSiblingFileName(\n      lockFileName,\n      'pnpm-workspace.yaml',\n    );\n\n    let args = '--lockfile-only';\n\n    // If it's not a workspaces project/monorepo, but single project with unrelated other npm project in source tree (for example, a git submodule),\n    // `--recursive` will install un-wanted project.\n    // we should avoid this.\n    if (await localPathExists(pnpmWorkspaceFilePath)) {\n      const pnpmWorkspace = parseSingleYaml<PnpmWorkspaceFile>(\n        (await readLocalFile(pnpmWorkspaceFilePath, 'utf8'))!,\n      );\n      if (pnpmWorkspace?.packages?.length) {\n        logger.debug(\n          `Found pnpm workspace with ${pnpmWorkspace.packages.length} package definitions`,\n        );\n        // we are in a monorepo, 'pnpm update' needs the '--recursive' flag contrary to 'pnpm install'\n        args += ' --recursive';\n      }\n    }\n    if (!GlobalConfig.get('allowScripts')) {\n      // If the admin disallows scripts, then neither scripts nor the pnpmfile should be run\n      args += ' --ignore-scripts';\n      args += ' --ignore-pnpmfile';\n    } else if (config.ignoreScripts) {\n      // If the admin allows scripts then always allow the pnpmfile\n      args += ' --ignore-scripts';\n    }\n\n    logger.trace({ args }, 'pnpm command options');\n\n    const lockUpdates = upgrades.filter((upgrade) => upgrade.isLockfileUpdate);\n\n    if (lockUpdates.length !== upgrades.length) {\n      // This command updates the lock file based on package.json\n      commands.push(`pnpm install ${args}`);\n    }\n\n    // rangeStrategy = update-lockfile\n    if (lockUpdates.length) {\n      logger.debug('Performing lockfileUpdate (pnpm)');\n      commands.push(\n        `pnpm update --no-save ${lockUpdates\n          // TODO: types (#22198)\n          .map((update) => `${update.packageName!}@${update.newVersion!}`)\n          .filter(uniqueStrings)\n          .map(quote)\n          .join(' ')} ${args}`,\n      );\n    }\n\n    // postUpdateOptions\n    if (config.postUpdateOptions?.includes('pnpmDedupe')) {\n      commands.push('pnpm dedupe --ignore-scripts');\n    }\n\n    if (upgrades.find((upgrade) => upgrade.isLockFileMaintenance)) {\n      logger.debug(\n        `Removing ${lockFileName} first due to lock file maintenance upgrade`,\n      );\n      try {\n        await deleteLocalFile(lockFileName);\n        /* v8 ignore start -- needs test */\n      } catch (err) {\n        logger.debug(\n          { err, lockFileName },\n          'Error removing `pnpm-lock.yaml` for lock file maintenance',\n        );\n      } /* v8 ignore stop -- needs test */\n    }\n\n    await exec(commands, execOptions);\n    lockFile = await readLocalFile(lockFileName, 'utf8');\n    /* v8 ignore start -- needs test */\n  } catch (err) {\n    if (err.message === TEMPORARY_ERROR) {\n      throw err;\n    }\n    logger.debug(\n      {\n        commands,\n        err,\n        stdout,\n        stderr,\n        type: 'pnpm',\n      },\n      'lock file error',\n    );\n    return { error: true, stderr: err.stderr, stdout: err.stdout };\n  } /* v8 ignore stop -- needs test */\n  return { lockFile };\n}\n\nexport async function getConstraintFromLockFile(\n  lockFileName: string,\n): Promise<string | null> {\n  let constraint: string | null = null;\n  try {\n    const lockfileContent = await readLocalFile(lockFileName, 'utf8');\n    if (!lockfileContent) {\n      logger.trace(`Empty pnpm lock file: ${lockFileName}`);\n      return null;\n    }\n    // TODO: use schema (#9610)\n    const pnpmLock = parseSingleYaml<PnpmLockFile>(lockfileContent);\n    if (\n      !is.number(pnpmLock?.lockfileVersion) &&\n      !is.numericString(pnpmLock?.lockfileVersion)\n    ) {\n      logger.trace(`Invalid pnpm lockfile version: ${lockFileName}`);\n      return null;\n    }\n    // find matching lockfileVersion and use its constraints\n    // if no match found use lockfileVersion 5\n    // lockfileVersion 5 is the minimum version required to generate the pnpm-lock.yaml file\n    const { lowerConstraint, upperConstraint } = lockToPnpmVersionMapping.find(\n      (m) => m.lockfileVersion === pnpmLock.lockfileVersion,\n    ) ?? {\n      lockfileVersion: 5.0,\n      lowerConstraint: '>=3',\n      upperConstraint: '<3.5.0',\n    };\n    constraint = lowerConstraint;\n    if (upperConstraint) {\n      constraint += ` ${upperConstraint}`;\n    }\n  } catch (err) {\n    logger.warn({ err }, 'Error getting pnpm constraints from lock file');\n  }\n  return constraint;\n}\n\n/**\n * pnpm lockfiles have corresponding version numbers called \"lockfileVersion\"\n * each lockfileVersion can only be generated by a certain pnpm version range\n * eg. lockfileVersion: 5.4 can only be generated by pnpm version >=7 && <8\n * official list can be found here : https://github.com/pnpm/spec/tree/master/lockfile\n * we use the mapping present below to find the compatible pnpm version range for a given lockfileVersion\n *\n * the various terms used in the mapping are explained below:\n * lowerConstraint : lowest pnpm version that can generate the lockfileVersion\n * upperConstraint : highest pnpm version that can generate the lockfileVersion\n * lowerBound      : highest pnpm version that is less than the lowerConstraint\n * upperBound      : lowest pnpm version that is greater than the upperConstraint\n *\n * To handle future lockfileVersions, we need to:\n * 1. add a upperBound and upperConstraint to the current latest lockfileVersion\n * 2. add an object for the new lockfileVersion with lowerBound and lowerConstraint\n *\n * lockfileVersion from v6 on are strings\n */\nconst lockToPnpmVersionMapping: LockToPnpmVersionMapping[] = [\n  { lockfileVersion: '9.0', lowerConstraint: '>=9' },\n  {\n    lockfileVersion: '6.0',\n    lowerConstraint: '>=7.24.2',\n    upperConstraint: '<9',\n  },\n  {\n    lockfileVersion: 5.4,\n    lowerConstraint: '>=7',\n    upperConstraint: '<8',\n  },\n  {\n    lockfileVersion: 5.3,\n    lowerConstraint: '>=6',\n    upperConstraint: '<7',\n  },\n  {\n    lockfileVersion: 5.2,\n    lowerConstraint: '>=5.10.0',\n    upperConstraint: '<6',\n  },\n  {\n    lockfileVersion: 5.1,\n    lowerConstraint: '>=3.5.0',\n    upperConstraint: '<5.9.3',\n  },\n];\n\ninterface LockToPnpmVersionMapping {\n  lockfileVersion: string | number;\n  lowerConstraint: string;\n  upperConstraint?: string;\n}\n"]}

package/dist/modules/manager/npm/post-update/types.d.ts

@@ -23,7 +23,7 @@ export interface GenerateLockFileResult {
     stderr?: string;
     stdout?: string;
 }
-export type PnpmDependencySchema = Record<string, {
+export type PnpmDependency = Record<string, {
     version: string;
 } | string>;
 export interface PnpmLockFile {
@@ -31,10 +31,10 @@ export interface PnpmLockFile {
     catalogs?: Record<string, Record<string, {
         version: string;
     }>>;
-    importers?: Record<string, Record<string, PnpmDependencySchema>>;
-    dependencies: PnpmDependencySchema;
-    devDependencies: PnpmDependencySchema;
-    optionalDependencies: PnpmDependencySchema;
+    importers?: Record<string, Record<string, PnpmDependency>>;
+    dependencies: PnpmDependency;
+    devDependencies: PnpmDependency;
+    optionalDependencies: PnpmDependency;
 }
 export interface YarnRcNpmRegistry {
     npmAlwaysAuth?: boolean;

package/dist/modules/manager/npm/post-update/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../lib/modules/manager/npm/post-update/types.ts"],"names":[],"mappings":"","sourcesContent":["import type { FileChange } from '../../../../util/git/types';\nimport type { PackageFile } from '../../types';\nimport type { NpmManagerData } from '../types';\n\nexport interface DetermineLockFileDirsResult {\n  yarnLockDirs: string[];\n  npmLockDirs: string[];\n  pnpmShrinkwrapDirs: string[];\n}\n\nexport interface AdditionalPackageFiles {\n  npm?: Partial<PackageFile<NpmManagerData>>[];\n}\n\nexport interface ArtifactError {\n  lockFile: string;\n  stderr?: string;\n}\n\nexport interface WriteExistingFilesResult {\n  artifactErrors: ArtifactError[];\n  updatedArtifacts: FileChange[];\n}\n\nexport interface GenerateLockFileResult {\n  error?: boolean;\n  lockFile?: string | null;\n  stderr?: string;\n  stdout?: string;\n}\n\n// the dependencies schema is different for v6 and other lockfile versions\n// Ref: https://github.com/pnpm/spec/issues/4#issuecomment-1524059392\nexport type PnpmDependencySchema = Record<string, { version: string } | string>;\n\nexport interface PnpmLockFile {\n  lockfileVersion: number | string;\n  catalogs?: Record<string, Record<string, { version: string }>>;\n  importers?: Record<string, Record<string, PnpmDependencySchema>>;\n  dependencies: PnpmDependencySchema;\n  devDependencies: PnpmDependencySchema;\n  optionalDependencies: PnpmDependencySchema;\n}\n\nexport interface YarnRcNpmRegistry {\n  npmAlwaysAuth?: boolean;\n  npmAuthIdent?: string;\n  npmAuthToken?: string;\n}\n\nexport interface YarnRcYmlFile {\n  yarnPath?: string | null;\n  npmRegistries: Record<string, YarnRcNpmRegistry>;\n}\n"]}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../lib/modules/manager/npm/post-update/types.ts"],"names":[],"mappings":"","sourcesContent":["import type { FileChange } from '../../../../util/git/types';\nimport type { PackageFile } from '../../types';\nimport type { NpmManagerData } from '../types';\n\nexport interface DetermineLockFileDirsResult {\n  yarnLockDirs: string[];\n  npmLockDirs: string[];\n  pnpmShrinkwrapDirs: string[];\n}\n\nexport interface AdditionalPackageFiles {\n  npm?: Partial<PackageFile<NpmManagerData>>[];\n}\n\nexport interface ArtifactError {\n  lockFile: string;\n  stderr?: string;\n}\n\nexport interface WriteExistingFilesResult {\n  artifactErrors: ArtifactError[];\n  updatedArtifacts: FileChange[];\n}\n\nexport interface GenerateLockFileResult {\n  error?: boolean;\n  lockFile?: string | null;\n  stderr?: string;\n  stdout?: string;\n}\n\n// the dependencies schema is different for v6 and other lockfile versions\n// Ref: https://github.com/pnpm/spec/issues/4#issuecomment-1524059392\nexport type PnpmDependency = Record<string, { version: string } | string>;\n\nexport interface PnpmLockFile {\n  lockfileVersion: number | string;\n  catalogs?: Record<string, Record<string, { version: string }>>;\n  importers?: Record<string, Record<string, PnpmDependency>>;\n  dependencies: PnpmDependency;\n  devDependencies: PnpmDependency;\n  optionalDependencies: PnpmDependency;\n}\n\nexport interface YarnRcNpmRegistry {\n  npmAlwaysAuth?: boolean;\n  npmAuthIdent?: string;\n  npmAuthToken?: string;\n}\n\nexport interface YarnRcYmlFile {\n  yarnPath?: string | null;\n  npmRegistries: Record<string, YarnRcNpmRegistry>;\n}\n"]}

package/dist/modules/manager/npm/post-update/utils.d.ts

@@ -1,6 +1,5 @@
 import { Lazy } from '../../../../util/lazy';
-import type { PackageJsonSchema } from '../schema';
-export declare function lazyLoadPackageJson(lockFileDir: string): Lazy<Promise<PackageJsonSchema>>;
+import type { PackageJson } from '../schema';
+export declare function lazyLoadPackageJson(lockFileDir: string): Lazy<Promise<PackageJson>>;
 export type LazyPackageJson = ReturnType<typeof lazyLoadPackageJson>;
-export declare function loadPackageJson(lockFileDir: string): Promise<PackageJsonSchema>;
-export declare function getPackageManagerVersion(name: string, pkg: PackageJsonSchema): string | null;
+export declare function getPackageManagerVersion(name: string, pkg: PackageJson): string | null;

package/dist/modules/manager/npm/post-update/utils.js

@@ -1,26 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.lazyLoadPackageJson = lazyLoadPackageJson;
-exports.loadPackageJson = loadPackageJson;
 exports.getPackageManagerVersion = getPackageManagerVersion;
 const tslib_1 = require("tslib");
 const is_1 = tslib_1.__importDefault(require("@sindresorhus/is"));
 const semver_1 = tslib_1.__importDefault(require("semver"));
-const upath_1 = tslib_1.__importDefault(require("upath"));
 const logger_1 = require("../../../../logger");
-const fs_1 = require("../../../../util/fs");
 const lazy_1 = require("../../../../util/lazy");
-const schema_1 = require("../schema");
+const utils_1 = require("../utils");
 function lazyLoadPackageJson(lockFileDir) {
-    return new lazy_1.Lazy(() => loadPackageJson(lockFileDir));
-}
-async function loadPackageJson(lockFileDir) {
-    const json = await (0, fs_1.readLocalFile)(upath_1.default.join(lockFileDir, 'package.json'), 'utf8');
-    const res = schema_1.PackageJson.safeParse(json);
-    if (res.success) {
-        return res.data;
-    }
-    return {};
+    return new lazy_1.Lazy(() => (0, utils_1.loadPackageJson)(lockFileDir));
 }
 function getPackageManagerVersion(name, pkg) {
     if (pkg.volta?.[name]) {

package/dist/modules/manager/npm/post-update/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../lib/modules/manager/npm/post-update/utils.ts"],"names":[],"mappings":";;AASA,kDAIC;AAID,0CAYC;AAED,4DAyCC;;AAxED,kEAAkC;AAClC,4DAA4B;AAC5B,0DAA0B;AAC1B,+CAA4C;AAC5C,4CAAoD;AACpD,gDAA6C;AAE7C,sCAAwC;AAExC,SAAgB,mBAAmB,CACjC,WAAmB;IAEnB,OAAO,IAAI,WAAI,CAAC,GAAG,EAAE,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC;AACtD,CAAC;AAIM,KAAK,UAAU,eAAe,CACnC,WAAmB;IAEnB,MAAM,IAAI,GAAG,MAAM,IAAA,kBAAa,EAC9B,eAAK,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,EACvC,MAAM,CACP,CAAC;IACF,MAAM,GAAG,GAAG,oBAAW,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IACxC,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;QAChB,OAAO,GAAG,CAAC,IAAI,CAAC;IAClB,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAgB,wBAAwB,CACtC,IAAY,EACZ,GAAsB;IAEtB,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QACtB,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAChC,eAAM,CAAC,KAAK,CAAC,SAAS,IAAI,sCAAsC,OAAO,EAAE,CAAC,CAAC;QAE3E,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,IAAI,GAAG,CAAC,UAAU,EAAE,cAAc,EAAE,CAAC;QACnC,MAAM,eAAe,GAAG,YAAE,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,cAAc,CAAC;YAC7D,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,cAAc;YAC/B,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;QACpC,MAAM,UAAU,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;QAClE,MAAM,OAAO,GAAG,UAAU,EAAE,OAAO,CAAC;QACpC,IAAI,OAAO,EAAE,CAAC;YACZ,eAAM,CAAC,KAAK,CACV,SAAS,IAAI,2CAA2C,OAAO,EAAE,CAClE,CAAC;YACF,OAAO,OAAO,CAAC;QACjB,CAAC;IACH,CAAC;IACD,IAAI,GAAG,CAAC,cAAc,EAAE,IAAI,KAAK,IAAI,EAAE,CAAC;QACtC,MAAM,OAAO,GAAG,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC;QAC3C,eAAM,CAAC,KAAK,CACV,SAAS,IAAI,+CAA+C,OAAO,EAAE,CACtE,CAAC;QACF,IAAI,gBAAM,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;YAC1B,OAAO,OAAO,CAAC;QACjB,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QACxB,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAClC,eAAM,CAAC,KAAK,CACV,SAAS,IAAI,wCAAwC,OAAO,EAAE,CAC/D,CAAC;QACF,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC","sourcesContent":["import is from '@sindresorhus/is';\nimport semver from 'semver';\nimport upath from 'upath';\nimport { logger } from '../../../../logger';\nimport { readLocalFile } from '../../../../util/fs';\nimport { Lazy } from '../../../../util/lazy';\nimport type { PackageJsonSchema } from '../schema';\nimport { PackageJson } from '../schema';\n\nexport function lazyLoadPackageJson(\n  lockFileDir: string,\n): Lazy<Promise<PackageJsonSchema>> {\n  return new Lazy(() => loadPackageJson(lockFileDir));\n}\n\nexport type LazyPackageJson = ReturnType<typeof lazyLoadPackageJson>;\n\nexport async function loadPackageJson(\n  lockFileDir: string,\n): Promise<PackageJsonSchema> {\n  const json = await readLocalFile(\n    upath.join(lockFileDir, 'package.json'),\n    'utf8',\n  );\n  const res = PackageJson.safeParse(json);\n  if (res.success) {\n    return res.data;\n  }\n  return {};\n}\n\nexport function getPackageManagerVersion(\n  name: string,\n  pkg: PackageJsonSchema,\n): string | null {\n  if (pkg.volta?.[name]) {\n    const version = pkg.volta[name];\n    logger.debug(`Found ${name} constraint in package.json volta: ${version}`);\n\n    return version;\n  }\n  if (pkg.devEngines?.packageManager) {\n    const packageManagers = is.array(pkg.devEngines.packageManager)\n      ? pkg.devEngines.packageManager\n      : [pkg.devEngines.packageManager];\n    const packageMgr = packageManagers.find((pm) => pm.name === name);\n    const version = packageMgr?.version;\n    if (version) {\n      logger.debug(\n        `Found ${name} constraint in package.json devEngines: ${version}`,\n      );\n      return version;\n    }\n  }\n  if (pkg.packageManager?.name === name) {\n    const version = pkg.packageManager.version;\n    logger.debug(\n      `Found ${name} constraint in package.json packageManager: ${version}`,\n    );\n    if (semver.valid(version)) {\n      return version;\n    }\n    return null;\n  }\n  if (pkg.engines?.[name]) {\n    const version = pkg.engines[name];\n    logger.debug(\n      `Found ${name} constraint in package.json engines: ${version}`,\n    );\n    return version;\n  }\n  return null;\n}\n"]}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../lib/modules/manager/npm/post-update/utils.ts"],"names":[],"mappings":";;AAOA,kDAIC;AAGD,4DAyCC;;AAvDD,kEAAkC;AAClC,4DAA4B;AAC5B,+CAA4C;AAC5C,gDAA6C;AAE7C,oCAA2C;AAE3C,SAAgB,mBAAmB,CACjC,WAAmB;IAEnB,OAAO,IAAI,WAAI,CAAC,GAAG,EAAE,CAAC,IAAA,uBAAe,EAAC,WAAW,CAAC,CAAC,CAAC;AACtD,CAAC;AAGD,SAAgB,wBAAwB,CACtC,IAAY,EACZ,GAAgB;IAEhB,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QACtB,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAChC,eAAM,CAAC,KAAK,CAAC,SAAS,IAAI,sCAAsC,OAAO,EAAE,CAAC,CAAC;QAE3E,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,IAAI,GAAG,CAAC,UAAU,EAAE,cAAc,EAAE,CAAC;QACnC,MAAM,eAAe,GAAG,YAAE,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,cAAc,CAAC;YAC7D,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,cAAc;YAC/B,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;QACpC,MAAM,UAAU,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;QAClE,MAAM,OAAO,GAAG,UAAU,EAAE,OAAO,CAAC;QACpC,IAAI,OAAO,EAAE,CAAC;YACZ,eAAM,CAAC,KAAK,CACV,SAAS,IAAI,2CAA2C,OAAO,EAAE,CAClE,CAAC;YACF,OAAO,OAAO,CAAC;QACjB,CAAC;IACH,CAAC;IACD,IAAI,GAAG,CAAC,cAAc,EAAE,IAAI,KAAK,IAAI,EAAE,CAAC;QACtC,MAAM,OAAO,GAAG,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC;QAC3C,eAAM,CAAC,KAAK,CACV,SAAS,IAAI,+CAA+C,OAAO,EAAE,CACtE,CAAC;QACF,IAAI,gBAAM,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;YAC1B,OAAO,OAAO,CAAC;QACjB,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QACxB,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAClC,eAAM,CAAC,KAAK,CACV,SAAS,IAAI,wCAAwC,OAAO,EAAE,CAC/D,CAAC;QACF,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC","sourcesContent":["import is from '@sindresorhus/is';\nimport semver from 'semver';\nimport { logger } from '../../../../logger';\nimport { Lazy } from '../../../../util/lazy';\nimport type { PackageJson } from '../schema';\nimport { loadPackageJson } from '../utils';\n\nexport function lazyLoadPackageJson(\n  lockFileDir: string,\n): Lazy<Promise<PackageJson>> {\n  return new Lazy(() => loadPackageJson(lockFileDir));\n}\nexport type LazyPackageJson = ReturnType<typeof lazyLoadPackageJson>;\n\nexport function getPackageManagerVersion(\n  name: string,\n  pkg: PackageJson,\n): string | null {\n  if (pkg.volta?.[name]) {\n    const version = pkg.volta[name];\n    logger.debug(`Found ${name} constraint in package.json volta: ${version}`);\n\n    return version;\n  }\n  if (pkg.devEngines?.packageManager) {\n    const packageManagers = is.array(pkg.devEngines.packageManager)\n      ? pkg.devEngines.packageManager\n      : [pkg.devEngines.packageManager];\n    const packageMgr = packageManagers.find((pm) => pm.name === name);\n    const version = packageMgr?.version;\n    if (version) {\n      logger.debug(\n        `Found ${name} constraint in package.json devEngines: ${version}`,\n      );\n      return version;\n    }\n  }\n  if (pkg.packageManager?.name === name) {\n    const version = pkg.packageManager.version;\n    logger.debug(\n      `Found ${name} constraint in package.json packageManager: ${version}`,\n    );\n    if (semver.valid(version)) {\n      return version;\n    }\n    return null;\n  }\n  if (pkg.engines?.[name]) {\n    const version = pkg.engines[name];\n    logger.debug(\n      `Found ${name} constraint in package.json engines: ${version}`,\n    );\n    return version;\n  }\n  return null;\n}\n"]}

package/dist/modules/manager/npm/schema.d.ts

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-export declare const PnpmCatalogsSchema: z.ZodObject<{
+export declare const PnpmCatalogs: z.ZodObject<{
     catalog: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
     catalogs: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodString>>>;
 }, "strip", z.ZodTypeAny, {
@@ -9,7 +9,18 @@ export declare const PnpmCatalogsSchema: z.ZodObject<{
     catalog?: Record<string, string> | undefined;
     catalogs?: Record<string, Record<string, string>> | undefined;
 }>;
-export declare const YarnrcSchema: z.ZodObject<{
+export declare const YarnCatalogs: z.ZodObject<{
+    catalog: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+    catalogs: z.ZodCatch<z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodString>>>>;
+}, "strip", z.ZodTypeAny, {
+    catalog?: Record<string, string> | undefined;
+    catalogs?: Record<string, Record<string, string>> | undefined;
+}, {
+    catalog?: Record<string, string> | undefined;
+    catalogs?: unknown;
+}>;
+export type YarnCatalogs = z.infer<typeof YarnCatalogs>;
+export declare const YarnConfig: z.ZodPipeline<z.ZodEffects<z.ZodString, string | number | boolean | import("type-fest", { with: { "resolution-mode": "import" } }).JsonObject | import("type-fest", { with: { "resolution-mode": "import" } }).JsonValue[] | readonly import("type-fest", { with: { "resolution-mode": "import" } }).JsonValue[] | null, string>, z.ZodIntersection<z.ZodObject<{
     npmRegistryServer: z.ZodOptional<z.ZodString>;
     npmScopes: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
         npmRegistryServer: z.ZodOptional<z.ZodString>;
@@ -28,9 +39,18 @@ export declare const YarnrcSchema: z.ZodObject<{
     npmScopes?: Record<string, {
         npmRegistryServer?: string | undefined;
     }> | undefined;
-}>;
-export type YarnrcConfig = z.infer<typeof YarnrcSchema>;
-export declare const PnpmWorkspaceFileSchema: z.ZodIntersection<z.ZodObject<{
+}>, z.ZodObject<{
+    catalog: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+    catalogs: z.ZodCatch<z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodString>>>>;
+}, "strip", z.ZodTypeAny, {
+    catalog?: Record<string, string> | undefined;
+    catalogs?: Record<string, Record<string, string>> | undefined;
+}, {
+    catalog?: Record<string, string> | undefined;
+    catalogs?: unknown;
+}>>>;
+export type YarnConfig = z.infer<typeof YarnConfig>;
+export declare const PnpmWorkspaceFile: z.ZodIntersection<z.ZodObject<{
     packages: z.ZodArray<z.ZodString, "many">;
 }, "strip", z.ZodTypeAny, {
     packages: string[];
@@ -46,11 +66,12 @@ export declare const PnpmWorkspaceFileSchema: z.ZodIntersection<z.ZodObject<{
     catalog?: Record<string, string> | undefined;
     catalogs?: Record<string, Record<string, string>> | undefined;
 }>>;
-export declare const PackageManagerSchema: z.ZodEffects<z.ZodEffects<z.ZodString, string[], string>, {
+export type PnpmWorkspaceFile = z.infer<typeof PnpmWorkspaceFile>;
+export declare const PackageManager: z.ZodEffects<z.ZodEffects<z.ZodString, string[], string>, {
     name: string;
     version: string;
 }, string>;
-export declare const PackageJsonSchema: z.ZodObject<{
+export declare const PackageJson: z.ZodPipeline<z.ZodEffects<z.ZodString, string | number | boolean | import("type-fest", { with: { "resolution-mode": "import" } }).JsonObject | import("type-fest", { with: { "resolution-mode": "import" } }).JsonValue[] | readonly import("type-fest", { with: { "resolution-mode": "import" } }).JsonValue[] | null, string>, z.ZodObject<{
     devEngines: z.ZodOptional<z.ZodObject<{
         packageManager: z.ZodOptional<z.ZodUnion<[z.ZodObject<{
             name: z.ZodString;
@@ -98,99 +119,14 @@ export declare const PackageJsonSchema: z.ZodObject<{
     }, string>>;
     volta: z.ZodOptional<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodAny>, Record<string, string>, Record<string, any>>>;
 }, "strip", z.ZodTypeAny, {
-    dependencies?: Record<string, string> | undefined;
-    devDependencies?: Record<string, string> | undefined;
-    peerDependencies?: Record<string, string> | undefined;
     engines?: Record<string, string> | undefined;
-    packageManager?: {
-        name: string;
-        version: string;
-    } | undefined;
-    volta?: Record<string, string> | undefined;
-    devEngines?: {
-        packageManager?: {
-            name: string;
-            version?: string | undefined;
-        } | {
-            name: string;
-            version?: string | undefined;
-        }[] | undefined;
-    } | undefined;
-}, {
-    dependencies?: Record<string, any> | undefined;
-    devDependencies?: Record<string, any> | undefined;
-    peerDependencies?: Record<string, any> | undefined;
-    engines?: Record<string, any> | undefined;
-    packageManager?: string | undefined;
-    volta?: Record<string, any> | undefined;
-    devEngines?: {
-        packageManager?: {
-            name: string;
-            version?: string | undefined;
-        } | {
-            name: string;
-            version?: string | undefined;
-        }[] | undefined;
-    } | undefined;
-}>;
-export type PackageJsonSchema = z.infer<typeof PackageJsonSchema>;
-export declare const PackageJson: z.ZodPipeline<z.ZodEffects<z.ZodString, string | number | boolean | import("type-fest").JsonObject | import("type-fest").JsonValue[] | readonly import("type-fest").JsonValue[] | null, string>, z.ZodObject<{
-    devEngines: z.ZodOptional<z.ZodObject<{
-        packageManager: z.ZodOptional<z.ZodUnion<[z.ZodObject<{
-            name: z.ZodString;
-            version: z.ZodOptional<z.ZodString>;
-        }, "strip", z.ZodTypeAny, {
-            name: string;
-            version?: string | undefined;
-        }, {
-            name: string;
-            version?: string | undefined;
-        }>, z.ZodArray<z.ZodObject<{
-            name: z.ZodString;
-            version: z.ZodOptional<z.ZodString>;
-        }, "strip", z.ZodTypeAny, {
-            name: string;
-            version?: string | undefined;
-        }, {
-            name: string;
-            version?: string | undefined;
-        }>, "many">]>>;
-    }, "strip", z.ZodTypeAny, {
-        packageManager?: {
-            name: string;
-            version?: string | undefined;
-        } | {
-            name: string;
-            version?: string | undefined;
-        }[] | undefined;
-    }, {
-        packageManager?: {
-            name: string;
-            version?: string | undefined;
-        } | {
-            name: string;
-            version?: string | undefined;
-        }[] | undefined;
-    }>>;
-    engines: z.ZodOptional<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodAny>, Record<string, string>, Record<string, any>>>;
-    dependencies: z.ZodOptional<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodAny>, Record<string, string>, Record<string, any>>>;
-    devDependencies: z.ZodOptional<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodAny>, Record<string, string>, Record<string, any>>>;
-    peerDependencies: z.ZodOptional<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodAny>, Record<string, string>, Record<string, any>>>;
-    packageManager: z.ZodOptional<z.ZodEffects<z.ZodEffects<z.ZodString, string[], string>, {
-        name: string;
-        version: string;
-    }, string>>;
-    volta: z.ZodOptional<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodAny>, Record<string, string>, Record<string, any>>>;
-}, "strip", z.ZodTypeAny, {
     dependencies?: Record<string, string> | undefined;
     devDependencies?: Record<string, string> | undefined;
     peerDependencies?: Record<string, string> | undefined;
-    engines?: Record<string, string> | undefined;
     packageManager?: {
         name: string;
         version: string;
     } | undefined;
-    volta?: Record<string, string> | undefined;
     devEngines?: {
         packageManager?: {
             name: string;
@@ -200,13 +136,13 @@ export declare const PackageJson: z.ZodPipeline<z.ZodEffects<z.ZodString, string
             version?: string | undefined;
         }[] | undefined;
     } | undefined;
+    volta?: Record<string, string> | undefined;
 }, {
+    engines?: Record<string, any> | undefined;
     dependencies?: Record<string, any> | undefined;
     devDependencies?: Record<string, any> | undefined;
     peerDependencies?: Record<string, any> | undefined;
-    engines?: Record<string, any> | undefined;
     packageManager?: string | undefined;
-    volta?: Record<string, any> | undefined;
     devEngines?: {
         packageManager?: {
             name: string;
@@ -216,8 +152,10 @@ export declare const PackageJson: z.ZodPipeline<z.ZodEffects<z.ZodString, string
             version?: string | undefined;
         }[] | undefined;
     } | undefined;
+    volta?: Record<string, any> | undefined;
 }>>;
-export declare const PackageLockV3Schema: z.ZodObject<{
+export type PackageJson = z.infer<typeof PackageJson>;
+export declare const PackageLockV3: z.ZodObject<{
     lockfileVersion: z.ZodLiteral<3>;
     packages: z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodAny>, Record<string, {
         version: string;
@@ -231,7 +169,7 @@ export declare const PackageLockV3Schema: z.ZodObject<{
     lockfileVersion: 3;
     packages: Record<string, any>;
 }>;
-export declare const PackageLockPreV3Schema: z.ZodEffects<z.ZodObject<{
+export declare const PackageLockPreV3: z.ZodEffects<z.ZodObject<{
     lockfileVersion: z.ZodUnion<[z.ZodLiteral<2>, z.ZodLiteral<1>]>;
     dependencies: z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodAny>, Record<string, {
         version: string;
@@ -253,7 +191,7 @@ export declare const PackageLockPreV3Schema: z.ZodEffects<z.ZodObject<{
     dependencies: Record<string, any>;
     lockfileVersion: 1 | 2;
 }>;
-export declare const PackageLock: z.ZodEffects<z.ZodPipeline<z.ZodEffects<z.ZodString, string | number | boolean | import("type-fest").JsonObject | import("type-fest").JsonValue[] | readonly import("type-fest").JsonValue[] | null, string>, z.ZodUnion<[z.ZodObject<{
+export declare const PackageLock: z.ZodEffects<z.ZodPipeline<z.ZodEffects<z.ZodString, string | number | boolean | import("type-fest", { with: { "resolution-mode": "import" } }).JsonObject | import("type-fest", { with: { "resolution-mode": "import" } }).JsonValue[] | readonly import("type-fest", { with: { "resolution-mode": "import" } }).JsonValue[] | null, string>, z.ZodUnion<[z.ZodObject<{
     lockfileVersion: z.ZodLiteral<3>;
     packages: z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodAny>, Record<string, {
         version: string;

package/dist/modules/manager/npm/schema.js

@@ -1,26 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PackageLock = exports.PackageLockPreV3Schema = exports.PackageLockV3Schema = exports.PackageJson = exports.PackageJsonSchema = exports.PackageManagerSchema = exports.PnpmWorkspaceFileSchema = exports.YarnrcSchema = exports.PnpmCatalogsSchema = void 0;
+exports.PackageLock = exports.PackageLockPreV3 = exports.PackageLockV3 = exports.PackageJson = exports.PackageManager = exports.PnpmWorkspaceFile = exports.YarnConfig = exports.YarnCatalogs = exports.PnpmCatalogs = void 0;
 const zod_1 = require("zod");
 const schema_utils_1 = require("../../../util/schema-utils");
-exports.PnpmCatalogsSchema = zod_1.z.object({
+exports.PnpmCatalogs = zod_1.z.object({
     catalog: zod_1.z.optional(zod_1.z.record(zod_1.z.string())),
     catalogs: zod_1.z.optional(zod_1.z.record(zod_1.z.record(zod_1.z.string()))),
 });
-exports.YarnrcSchema = zod_1.z.object({
+exports.YarnCatalogs = zod_1.z.object({
+    catalog: zod_1.z.optional(zod_1.z.record(zod_1.z.string())),
+    catalogs: zod_1.z.optional(zod_1.z.record(zod_1.z.record(zod_1.z.string()))).catch(undefined),
+});
+exports.YarnConfig = schema_utils_1.Yaml.pipe(zod_1.z
+    .object({
     npmRegistryServer: zod_1.z.string().optional(),
     npmScopes: zod_1.z
         .record(zod_1.z.object({
         npmRegistryServer: zod_1.z.string().optional(),
     }))
         .optional(),
-});
-exports.PnpmWorkspaceFileSchema = zod_1.z
+})
+    .and(exports.YarnCatalogs));
+exports.PnpmWorkspaceFile = zod_1.z
     .object({
     packages: zod_1.z.array(zod_1.z.string()),
 })
-    .and(exports.PnpmCatalogsSchema);
-exports.PackageManagerSchema = zod_1.z
+    .and(exports.PnpmCatalogs);
+exports.PackageManager = zod_1.z
     .string()
     .transform((val) => val.split('@'))
     .transform(([name, ...version]) => ({ name, version: version.join('@') }));
@@ -28,27 +34,26 @@ const DevEngineDependency = zod_1.z.object({
     name: zod_1.z.string(),
     version: zod_1.z.string().optional(),
 });
-const DevEngineSchema = zod_1.z.object({
+const DevEngine = zod_1.z.object({
     packageManager: DevEngineDependency.or(zod_1.z.array(DevEngineDependency)).optional(),
 });
-exports.PackageJsonSchema = zod_1.z.object({
-    devEngines: DevEngineSchema.optional(),
+exports.PackageJson = schema_utils_1.Json.pipe(zod_1.z.object({
+    devEngines: DevEngine.optional(),
     engines: (0, schema_utils_1.LooseRecord)(zod_1.z.string()).optional(),
     dependencies: (0, schema_utils_1.LooseRecord)(zod_1.z.string()).optional(),
     devDependencies: (0, schema_utils_1.LooseRecord)(zod_1.z.string()).optional(),
     peerDependencies: (0, schema_utils_1.LooseRecord)(zod_1.z.string()).optional(),
-    packageManager: exports.PackageManagerSchema.optional(),
+    packageManager: exports.PackageManager.optional(),
     volta: (0, schema_utils_1.LooseRecord)(zod_1.z.string()).optional(),
-});
-exports.PackageJson = schema_utils_1.Json.pipe(exports.PackageJsonSchema);
-exports.PackageLockV3Schema = zod_1.z.object({
+}));
+exports.PackageLockV3 = zod_1.z.object({
     lockfileVersion: zod_1.z.literal(3),
     packages: (0, schema_utils_1.LooseRecord)(zod_1.z
         .string()
         .transform((x) => x.replace(/^node_modules\//, ''))
         .refine((x) => x.trim() !== ''), zod_1.z.object({ version: zod_1.z.string() })),
 });
-exports.PackageLockPreV3Schema = zod_1.z
+exports.PackageLockPreV3 = zod_1.z
     .object({
     lockfileVersion: zod_1.z.union([zod_1.z.literal(2), zod_1.z.literal(1)]),
     dependencies: (0, schema_utils_1.LooseRecord)(zod_1.z.object({ version: zod_1.z.string() })),
@@ -57,7 +62,7 @@ exports.PackageLockPreV3Schema = zod_1.z
     lockfileVersion,
     packages,
 }));
-exports.PackageLock = schema_utils_1.Json.pipe(zod_1.z.union([exports.PackageLockV3Schema, exports.PackageLockPreV3Schema])).transform(({ packages, lockfileVersion }) => {
+exports.PackageLock = schema_utils_1.Json.pipe(zod_1.z.union([exports.PackageLockV3, exports.PackageLockPreV3])).transform(({ packages, lockfileVersion }) => {
     const lockedVersions = {};
     for (const [entry, val] of Object.entries(packages)) {
         lockedVersions[entry] = val.version;

package/dist/modules/manager/npm/schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../lib/modules/manager/npm/schema.ts"],"names":[],"mappings":"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","sourcesContent":["import { z } from 'zod';\nimport { Json, LooseRecord } from '../../../util/schema-utils';\n\nexport const PnpmCatalogsSchema = z.object({\n  catalog: z.optional(z.record(z.string())),\n  catalogs: z.optional(z.record(z.record(z.string()))),\n});\n\nexport const YarnrcSchema = z.object({\n  npmRegistryServer: z.string().optional(),\n  npmScopes: z\n    .record(\n      z.object({\n        npmRegistryServer: z.string().optional(),\n      }),\n    )\n    .optional(),\n});\n\nexport type YarnrcConfig = z.infer<typeof YarnrcSchema>;\n\nexport const PnpmWorkspaceFileSchema = z\n  .object({\n    packages: z.array(z.string()),\n  })\n  .and(PnpmCatalogsSchema);\n\nexport const PackageManagerSchema = z\n  .string()\n  .transform((val) => val.split('@'))\n  .transform(([name, ...version]) => ({ name, version: version.join('@') }));\n\nconst DevEngineDependency = z.object({\n  name: z.string(),\n  version: z.string().optional(),\n});\n\nconst DevEngineSchema = z.object({\n  packageManager: DevEngineDependency.or(\n    z.array(DevEngineDependency),\n  ).optional(),\n});\n\nexport const PackageJsonSchema = z.object({\n  devEngines: DevEngineSchema.optional(),\n  engines: LooseRecord(z.string()).optional(),\n  dependencies: LooseRecord(z.string()).optional(),\n  devDependencies: LooseRecord(z.string()).optional(),\n  peerDependencies: LooseRecord(z.string()).optional(),\n  packageManager: PackageManagerSchema.optional(),\n  volta: LooseRecord(z.string()).optional(),\n});\n\nexport type PackageJsonSchema = z.infer<typeof PackageJsonSchema>;\n\nexport const PackageJson = Json.pipe(PackageJsonSchema);\n\nexport const PackageLockV3Schema = z.object({\n  lockfileVersion: z.literal(3),\n  packages: LooseRecord(\n    z\n      .string()\n      .transform((x) => x.replace(/^node_modules\\//, ''))\n      .refine((x) => x.trim() !== ''),\n    z.object({ version: z.string() }),\n  ),\n});\n\nexport const PackageLockPreV3Schema = z\n  .object({\n    lockfileVersion: z.union([z.literal(2), z.literal(1)]),\n    dependencies: LooseRecord(z.object({ version: z.string() })),\n  })\n  .transform(({ lockfileVersion, dependencies: packages }) => ({\n    lockfileVersion,\n    packages,\n  }));\n\nexport const PackageLock = Json.pipe(\n  z.union([PackageLockV3Schema, PackageLockPreV3Schema]),\n).transform(({ packages, lockfileVersion }) => {\n  const lockedVersions: Record<string, string> = {};\n  for (const [entry, val] of Object.entries(packages)) {\n    lockedVersions[entry] = val.version;\n  }\n  return { lockedVersions, lockfileVersion };\n});\n"]}
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../lib/modules/manager/npm/schema.ts"],"names":[],"mappings":"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","sourcesContent":["import { z } from 'zod';\nimport { Json, LooseRecord, Yaml } from '../../../util/schema-utils';\n\nexport const PnpmCatalogs = z.object({\n  catalog: z.optional(z.record(z.string())),\n  catalogs: z.optional(z.record(z.record(z.string()))),\n});\n\nexport const YarnCatalogs = z.object({\n  catalog: z.optional(z.record(z.string())),\n  catalogs: z.optional(z.record(z.record(z.string()))).catch(undefined),\n});\nexport type YarnCatalogs = z.infer<typeof YarnCatalogs>;\n\nexport const YarnConfig = Yaml.pipe(\n  z\n    .object({\n      npmRegistryServer: z.string().optional(),\n      npmScopes: z\n        .record(\n          z.object({\n            npmRegistryServer: z.string().optional(),\n          }),\n        )\n        .optional(),\n    })\n    .and(YarnCatalogs),\n);\nexport type YarnConfig = z.infer<typeof YarnConfig>;\n\nexport const PnpmWorkspaceFile = z\n  .object({\n    packages: z.array(z.string()),\n  })\n  .and(PnpmCatalogs);\nexport type PnpmWorkspaceFile = z.infer<typeof PnpmWorkspaceFile>;\n\nexport const PackageManager = z\n  .string()\n  .transform((val) => val.split('@'))\n  .transform(([name, ...version]) => ({ name, version: version.join('@') }));\n\nconst DevEngineDependency = z.object({\n  name: z.string(),\n  version: z.string().optional(),\n});\n\nconst DevEngine = z.object({\n  packageManager: DevEngineDependency.or(\n    z.array(DevEngineDependency),\n  ).optional(),\n});\n\nexport const PackageJson = Json.pipe(\n  z.object({\n    devEngines: DevEngine.optional(),\n    engines: LooseRecord(z.string()).optional(),\n    dependencies: LooseRecord(z.string()).optional(),\n    devDependencies: LooseRecord(z.string()).optional(),\n    peerDependencies: LooseRecord(z.string()).optional(),\n    packageManager: PackageManager.optional(),\n    volta: LooseRecord(z.string()).optional(),\n  }),\n);\n\nexport type PackageJson = z.infer<typeof PackageJson>;\n\nexport const PackageLockV3 = z.object({\n  lockfileVersion: z.literal(3),\n  packages: LooseRecord(\n    z\n      .string()\n      .transform((x) => x.replace(/^node_modules\\//, ''))\n      .refine((x) => x.trim() !== ''),\n    z.object({ version: z.string() }),\n  ),\n});\n\nexport const PackageLockPreV3 = z\n  .object({\n    lockfileVersion: z.union([z.literal(2), z.literal(1)]),\n    dependencies: LooseRecord(z.object({ version: z.string() })),\n  })\n  .transform(({ lockfileVersion, dependencies: packages }) => ({\n    lockfileVersion,\n    packages,\n  }));\n\nexport const PackageLock = Json.pipe(\n  z.union([PackageLockV3, PackageLockPreV3]),\n).transform(({ packages, lockfileVersion }) => {\n  const lockedVersions: Record<string, string> = {};\n  for (const [entry, val] of Object.entries(packages)) {\n    lockedVersions[entry] = val.version;\n  }\n  return { lockedVersions, lockfileVersion };\n});\n"]}

package/dist/modules/manager/npm/update/dependency/index.js

@@ -9,6 +9,7 @@ const regex_1 = require("../../../../../util/regex");
 const string_1 = require("../../../../../util/string");
 const common_1 = require("./common");
 const pnpm_1 = require("./pnpm");
+const yarn_1 = require("./yarn");
 function renameObjKey(oldObj, oldKey, newKey) {
     const keys = Object.keys(oldObj);
     return keys.reduce((acc, key) => {
@@ -86,6 +87,9 @@ function updateDependency({ fileContent, upgrade, }) {
     if (upgrade.depType?.startsWith('pnpm.catalog')) {
         return (0, pnpm_1.updatePnpmCatalogDependency)({ fileContent, upgrade });
     }
+    if (upgrade.depType?.startsWith('yarn.catalog')) {
+        return (0, yarn_1.updateYarnrcCatalogDependency)({ fileContent, upgrade });
+    }
     const { depType, managerData } = upgrade;
     const depName = managerData?.key ?? upgrade.depName;
     let { newValue } = upgrade;

package/dist/modules/manager/npm/update/dependency/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../lib/modules/manager/npm/update/dependency/index.ts"],"names":[],"mappings":";;AAmHA,4CA4JC;;AA/QD,kEAAkC;AAClC,mCAAgC;AAChC,kDAA+C;AAC/C,qDAAgE;AAChE,uDAAgE;AAShE,qCAA+D;AAC/D,iCAAqD;AAErD,SAAS,YAAY,CACnB,MAAwB,EACxB,MAAc,EACd,MAAc;IAEd,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACjC,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QAC9B,IAAI,GAAG,KAAK,MAAM,EAAE,CAAC;YACnB,GAAG,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;QAC/B,CAAC;aAAM,CAAC;YACN,GAAG,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QACzB,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAsB,CAAC,CAAC;AAC7B,CAAC;AAED,SAAS,eAAe,CACtB,cAA0B,EAC1B,WAAmB,EACnB,OAIoB,EACpB,OAAe,EACf,QAAgB,EAChB,QAAgB,EAChB,OAAkB;IAElB,IAAI,OAAO,KAAK,gBAAgB,EAAE,CAAC;QACjC,cAAc,CAAC,OAAO,CAAC,GAAG,QAAQ,CAAC;IACrC,CAAC;SAAM,IAAI,OAAO,KAAK,gBAAgB,EAAE,CAAC;QACxC,cAAc,CAAC,IAAK,CAAC,SAAU,CAAC,OAAO,CAAC,GAAG,QAAQ,CAAC;IACtD,CAAC;SAAM,IAAI,OAAO,KAAK,QAAQ,EAAE,CAAC;QAChC,qDAAqD;QACrD,OAAO,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAE,EAAE;YAC7C,CAAC,QAAQ,CAAC,EAAE,cAAc,CAAC,OAAO,CAAE,CAAC,QAAQ,CAAC;SAC/C,CAAC,CAAC,QAAQ,CAAC,CAAC;IACf,CAAC;SAAM,IAAI,OAAO,KAAK,kBAAkB,EAAE,CAAC;QAC1C,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;YAC1B,cAAc,CAAC,gBAAgB,GAAG,YAAY;YAC5C,cAAc;YACd,cAAc,CAAC,gBAAiB,EAChC,QAAQ,EACR,QAAQ,CACT,CAAC;QACJ,CAAC;IACH,CAAC;SAAM,IAAI,OAAO,IAAI,OAAO,KAAK,WAAW,EAAE,CAAC;QAC9C,mDAAmD;QACnD,MAAM,EAAE,kBAAkB,EAAE,eAAe,EAAE,GAAG,mBAAmB,CACjE,cAAc,CAAC,OAAO,CAAE,EACxB,OAAO,EACP,OAAO,CACR,CAAC;QACF,IAAI,kBAAkB,EAAE,CAAC;YACvB,kBAAkB,CAAC,eAAe,CAAC,GAAG,QAAQ,CAAC;QACjD,CAAC;IACH,CAAC;SAAM,CAAC;QACN,iDAAiD;QACjD,cAAc,CAAC,OAAO,CAAE,CAAC,OAAO,CAAC,GAAG,QAAQ,CAAC;IAC/C,CAAC;IACD,kCAAkC;IAClC,MAAM,YAAY,GAAG,IAAI,QAAQ,GAAG,CAAC;IACrC,IAAI,SAAS,GAAG,IAAI,QAAQ,GAAG,CAAC;IAEhC,MAAM,cAAc,GAAG,IAAA,oBAAY,EAAC,OAAO,CAAC,CAAC;IAC7C,MAAM,OAAO,GAAG,IAAA,aAAK,EAAC,WAAW,cAAc,cAAc,CAAC,CAAC;IAC/D,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACrC,IAAI,KAAK,IAAI,OAAO,KAAK,aAAa,EAAE,CAAC;QACvC,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,QAAQ,GAAG,CAAC,CAAC;QACpE,cAAc,CAAC,OAAO,CAAE,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC;QAC1C,SAAS,GAAG,IAAI,KAAK,GAAG,CAAC;IAC3B,CAAC;IAED,gCAAgC;IAChC,IAAI,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC,IAAI,OAAO,GAAG,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IACvE,eAAM,CAAC,KAAK,CAAC,4BAA4B,WAAW,EAAE,CAAC,CAAC;IACxD,uCAAuC;IACvC,OAAO,WAAW,GAAG,WAAW,CAAC,MAAM,EAAE,WAAW,IAAI,CAAC,EAAE,CAAC;QAC1D,mDAAmD;QACnD,IAAI,IAAA,gBAAO,EAAC,WAAW,EAAE,WAAW,EAAE,YAAY,CAAC,EAAE,CAAC;YACpD,eAAM,CAAC,KAAK,CAAC,wBAAwB,WAAW,EAAE,CAAC,CAAC;YACpD,iCAAiC;YACjC,MAAM,WAAW,GAAG,IAAA,kBAAS,EAC3B,WAAW,EACX,WAAW,EACX,YAAY,EACZ,SAAS,CACV,CAAC;YACF,mDAAmD;YACnD,IAAI,IAAA,eAAM,EAAC,cAAc,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC;gBACpD,OAAO,WAAW,CAAC;YACrB,CAAC;QACH,CAAC;QACD,oCAAoC;IACtC,CAAC;IACD,MAAM,IAAI,KAAK,EAAE,CAAC;AACpB,CAAC;AAED,SAAgB,gBAAgB,CAAC,EAC/B,WAAW,EACX,OAAO,GACgB;IACvB,IAAI,OAAO,CAAC,OAAO,EAAE,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;QAChD,OAAO,IAAA,kCAA2B,EAAC,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,CAAC;IAC/D,CAAC;IAED,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IACzC,MAAM,OAAO,GAAW,WAAW,EAAE,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC;IAC5D,IAAI,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAE3B,QAAQ,GAAG,IAAA,uBAAc,EAAC,OAAO,CAAC,IAAI,QAAQ,CAAC;IAC/C,QAAQ,GAAG,IAAA,4BAAmB,EAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,QAAQ,CAAC;IAE9D,eAAM,CAAC,KAAK,CAAC,2BAA2B,OAAO,IAAI,OAAO,MAAM,QAAQ,EAAE,CAAC,CAAC;IAC5E,IAAI,CAAC;QACH,MAAM,cAAc,GAAe,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAC3D,IAAI,kBAAkB,GAAyB,SAAS,CAAC;QACzD,uBAAuB;QACvB,IAAI,UAA8B,CAAC;QACnC,IAAI,OAAO,KAAK,gBAAgB,EAAE,CAAC;YACjC,UAAU,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;YACrC,QAAQ,GAAG,GAAG,OAAO,IAAI,QAAQ,EAAE,CAAC;QACtC,CAAC;aAAM,IAAI,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC;YACrC,kBAAkB,GAAG,WAAW,EAAE,OAAO,CAAC;YAC1C,IAAI,kBAAkB,EAAE,CAAC;gBACvB,oEAAoE;gBACpE,MAAM,EAAE,kBAAkB,EAAE,eAAe,EAAE,GAAG,mBAAmB,CACjE,cAAc,CAAC,SAAU,EACzB,kBAAkB,EAClB,OAAO,CACR,CAAC;gBACF,IAAI,kBAAkB,EAAE,CAAC;oBACvB,UAAU,GAAG,kBAAkB,CAAC,eAAe,CAAE,CAAC;gBACpD,CAAC;YACH,CAAC;QACH,CAAC;aAAM,IAAI,OAAO,KAAK,gBAAgB,EAAE,CAAC;YACxC,UAAU,GAAG,cAAc,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC,OAAO,CAAC,CAAC;QACzD,CAAC;aAAM,CAAC;YACN,UAAU,GAAG,cAAc,CAAC,OAAqB,CAAE,CAAC,OAAO,CAAW,CAAC;QACzE,CAAC;QACD,IAAI,UAAU,KAAK,QAAQ,EAAE,CAAC;YAC5B,eAAM,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;YAC3C,OAAO,WAAW,CAAC;QACrB,CAAC;QAED,cAAc;QACd,IAAI,cAAsB,CAAC;QAC3B,IAAI,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,mBAAmB,KAAK,OAAO,EAAE,CAAC;YAC/D,cAAc,GAAG,eAAe,CAC9B,cAAc,EACd,WAAW,EACX,OAAqB,EACrB,OAAO,EACP,UAAW,EACX,OAAO,OAAO,CAAC,OAAO,IAAI,QAAQ,EAAE,EACpC,kBAAkB,CACnB,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,cAAc,GAAG,eAAe,CAC9B,cAAc,EACd,WAAW,EACX,OAAqB,EACrB,OAAO,EACP,UAAW,EACX,QAAS,EACT,kBAAkB,CACnB,CAAC;YACF,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;gBACpB,cAAc,GAAG,eAAe,CAC9B,cAAc,EACd,cAAc,EACd,OAAqB,EACrB,OAAO,EACP,OAAO,EACP,OAAO,CAAC,OAAO,EACf,kBAAkB,CACnB,CAAC;YACJ,CAAC;QACH,CAAC;QACD,mCAAmC;QACnC,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,eAAM,CAAC,KAAK,CACV,EAAE,WAAW,EAAE,cAAc,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,EAC3D,iCAAiC,CAClC,CAAC;YACF,OAAO,WAAW,CAAC;QACrB,CAAC;QACD,kCAAkC;QAClC,IAAI,cAAc,EAAE,WAAW,EAAE,CAAC;YAChC,IAAI,MAA0B,CAAC;YAC/B,IAAI,cAAc,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC;gBACxC,MAAM,GAAG,OAAO,CAAC;YACnB,CAAC;iBAAM,IAAI,cAAc,CAAC,WAAW,CAAC,MAAM,OAAO,EAAE,CAAC,EAAE,CAAC;gBACvD,MAAM,GAAG,MAAM,OAAO,EAAE,CAAC;YAC3B,CAAC;YACD,IAAI,MAAM,EAAE,CAAC;gBACX,mCAAmC;gBACnC,IAAI,cAAc,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,UAAU,EAAE,CAAC;oBACtD,eAAM,CAAC,KAAK,CACV;wBACE,OAAO;wBACP,MAAM;wBACN,UAAU;wBACV,kBAAkB,EAAE,cAAc,CAAC,WAAW,CAAC,MAAM,CAAC;qBACvD,EACD,yEAAyE,CAC1E,CAAC;gBACJ,CAAC,CAAC,kCAAkC;gBACpC,cAAc,GAAG,eAAe,CAC9B,cAAc,EACd,cAAc,EACd,aAAa,EACb,MAAM;gBACN,cAAc;gBACd,cAAc,CAAC,WAAW,CAAC,MAAM,CAAE;gBACnC,cAAc;gBACd,QAAS,CACV,CAAC;gBACF,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;oBACpB,IAAI,MAAM,KAAK,MAAM,OAAO,EAAE,EAAE,CAAC;wBAC/B,0DAA0D;wBAC1D,OAAO,CAAC,OAAO,GAAG,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;oBAC5C,CAAC;oBACD,cAAc,GAAG,eAAe,CAC9B,cAAc,EACd,cAAc,EACd,aAAa,EACb,MAAM,EACN,MAAM,EACN,OAAO,CAAC,OAAO,CAChB,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;QACD,IAAI,cAAc,EAAE,gBAAgB,EAAE,CAAC;YACrC,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,gBAAgB,CAAC,EAAE,CAAC;gBACvE,IAAI,MAAM,CAAC,UAAU,CAAC,OAAO,GAAG,GAAG,CAAC,EAAE,CAAC;oBACrC,cAAc,GAAG,eAAe,CAC9B,cAAc,EACd,cAAc,EACd,kBAAkB,EAClB,OAAO,EACP,MAAM;oBACN,uBAAuB;oBACvB,GAAG,OAAO,IAAI,QAAQ,EAAE,CACzB,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO,cAAc,CAAC;IACxB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,eAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,wBAAwB,CAAC,CAAC;QAChD,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,SAAS,mBAAmB,CAC1B,aAAiC,EACjC,OAAiB,EACjB,OAAe;IAKf,yDAAyD;IACzD,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC/C,IAAI,WAAW,GAAuB,aAAa,CAAC;IACpD,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,IAAI,WAAW,EAAE,CAAC;YAChB,WAAW,GAAG,WAAW,CAAC,MAAM,CAAsC,CAAC;QACzE,CAAC;IACH,CAAC;IACD,MAAM,eAAe,GAAG,OAAO,KAAK,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC;IAC/D,MAAM,kBAAkB,GAAG,WAAqC,CAAC;IACjE,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,CAAC;AACjD,CAAC;AAED,SAAS,gBAAgB,CAAC,OAAgC;IACxD,OAAO,CACL,YAAE,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,EAAE,YAAE,CAAC,8BAA8B,CAAC;QACzE,OAAO,CAAC,OAAO,KAAK,WAAW,CAChC,CAAC;AACJ,CAAC","sourcesContent":["import is from '@sindresorhus/is';\nimport { dequal } from 'dequal';\nimport { logger } from '../../../../../logger';\nimport { escapeRegExp, regEx } from '../../../../../util/regex';\nimport { matchAt, replaceAt } from '../../../../../util/string';\nimport type { UpdateDependencyConfig, Upgrade } from '../../../types';\nimport type {\n  DependenciesMeta,\n  NpmPackage,\n  OverrideDependency,\n  RecursiveOverride,\n} from '../../extract/types';\nimport type { NpmDepType, NpmManagerData } from '../../types';\nimport { getNewGitValue, getNewNpmAliasValue } from './common';\nimport { updatePnpmCatalogDependency } from './pnpm';\n\nfunction renameObjKey(\n  oldObj: DependenciesMeta,\n  oldKey: string,\n  newKey: string,\n): DependenciesMeta {\n  const keys = Object.keys(oldObj);\n  return keys.reduce((acc, key) => {\n    if (key === oldKey) {\n      acc[newKey] = oldObj[oldKey];\n    } else {\n      acc[key] = oldObj[key];\n    }\n    return acc;\n  }, {} as DependenciesMeta);\n}\n\nfunction replaceAsString(\n  parsedContents: NpmPackage,\n  fileContent: string,\n  depType:\n    | NpmDepType\n    | 'dependenciesMeta'\n    | 'packageManager'\n    | 'pnpm.overrides',\n  depName: string,\n  oldValue: string,\n  newValue: string,\n  parents?: string[],\n): string {\n  if (depType === 'packageManager') {\n    parsedContents[depType] = newValue;\n  } else if (depType === 'pnpm.overrides') {\n    parsedContents.pnpm!.overrides![depName] = newValue;\n  } else if (depName === oldValue) {\n    // The old value is the name of the dependency itself\n    delete Object.assign(parsedContents[depType]!, {\n      [newValue]: parsedContents[depType]![oldValue],\n    })[oldValue];\n  } else if (depType === 'dependenciesMeta') {\n    if (oldValue !== newValue) {\n      parsedContents.dependenciesMeta = renameObjKey(\n        // TODO #22198\n        parsedContents.dependenciesMeta!,\n        oldValue,\n        newValue,\n      );\n    }\n  } else if (parents && depType === 'overrides') {\n    // there is an object as a value in overrides block\n    const { depObjectReference, overrideDepName } = overrideDepPosition(\n      parsedContents[depType]!,\n      parents,\n      depName,\n    );\n    if (depObjectReference) {\n      depObjectReference[overrideDepName] = newValue;\n    }\n  } else {\n    // The old value is the version of the dependency\n    parsedContents[depType]![depName] = newValue;\n  }\n  // Look for the old version number\n  const searchString = `\"${oldValue}\"`;\n  let newString = `\"${newValue}\"`;\n\n  const escapedDepName = escapeRegExp(depName);\n  const patchRe = regEx(`^(patch:${escapedDepName}@(npm:)?).*#`);\n  const match = patchRe.exec(oldValue);\n  if (match && depType === 'resolutions') {\n    const patch = oldValue.replace(match[0], `${match[1]}${newValue}#`);\n    parsedContents[depType]![depName] = patch;\n    newString = `\"${patch}\"`;\n  }\n\n  // Skip ahead to depType section\n  let searchIndex = fileContent.indexOf(`\"${depType}\"`) + depType.length;\n  logger.trace(`Starting search at index ${searchIndex}`);\n  // Iterate through the rest of the file\n  for (; searchIndex < fileContent.length; searchIndex += 1) {\n    // First check if we have a hit for the old version\n    if (matchAt(fileContent, searchIndex, searchString)) {\n      logger.trace(`Found match at index ${searchIndex}`);\n      // Now test if the result matches\n      const testContent = replaceAt(\n        fileContent,\n        searchIndex,\n        searchString,\n        newString,\n      );\n      // Compare the parsed JSON structure of old and new\n      if (dequal(parsedContents, JSON.parse(testContent))) {\n        return testContent;\n      }\n    }\n    /* v8 ignore next 3 -- needs test */\n  }\n  throw new Error();\n}\n\nexport function updateDependency({\n  fileContent,\n  upgrade,\n}: UpdateDependencyConfig): string | null {\n  if (upgrade.depType?.startsWith('pnpm.catalog')) {\n    return updatePnpmCatalogDependency({ fileContent, upgrade });\n  }\n\n  const { depType, managerData } = upgrade;\n  const depName: string = managerData?.key ?? upgrade.depName;\n  let { newValue } = upgrade;\n\n  newValue = getNewGitValue(upgrade) ?? newValue;\n  newValue = getNewNpmAliasValue(newValue, upgrade) ?? newValue;\n\n  logger.debug(`npm.updateDependency(): ${depType}.${depName} = ${newValue}`);\n  try {\n    const parsedContents: NpmPackage = JSON.parse(fileContent);\n    let overrideDepParents: string[] | undefined = undefined;\n    // Save the old version\n    let oldVersion: string | undefined;\n    if (depType === 'packageManager') {\n      oldVersion = parsedContents[depType];\n      newValue = `${depName}@${newValue}`;\n    } else if (isOverrideObject(upgrade)) {\n      overrideDepParents = managerData?.parents;\n      if (overrideDepParents) {\n        // old version when there is an object as a value in overrides block\n        const { depObjectReference, overrideDepName } = overrideDepPosition(\n          parsedContents.overrides!,\n          overrideDepParents,\n          depName,\n        );\n        if (depObjectReference) {\n          oldVersion = depObjectReference[overrideDepName]!;\n        }\n      }\n    } else if (depType === 'pnpm.overrides') {\n      oldVersion = parsedContents.pnpm?.overrides?.[depName];\n    } else {\n      oldVersion = parsedContents[depType as NpmDepType]![depName] as string;\n    }\n    if (oldVersion === newValue) {\n      logger.trace('Version is already updated');\n      return fileContent;\n    }\n\n    // TODO #22198\n    let newFileContent: string;\n    if (upgrade.newName && upgrade.replacementApproach === 'alias') {\n      newFileContent = replaceAsString(\n        parsedContents,\n        fileContent,\n        depType as NpmDepType,\n        depName,\n        oldVersion!,\n        `npm:${upgrade.newName}@${newValue}`,\n        overrideDepParents,\n      );\n    } else {\n      newFileContent = replaceAsString(\n        parsedContents,\n        fileContent,\n        depType as NpmDepType,\n        depName,\n        oldVersion!,\n        newValue!,\n        overrideDepParents,\n      );\n      if (upgrade.newName) {\n        newFileContent = replaceAsString(\n          parsedContents,\n          newFileContent,\n          depType as NpmDepType,\n          depName,\n          depName,\n          upgrade.newName,\n          overrideDepParents,\n        );\n      }\n    }\n    /* v8 ignore start -- needs test */\n    if (!newFileContent) {\n      logger.debug(\n        { fileContent, parsedContents, depType, depName, newValue },\n        'Warning: updateDependency error',\n      );\n      return fileContent;\n    }\n    /* v8 ignore stop -- needs test */\n    if (parsedContents?.resolutions) {\n      let depKey: string | undefined;\n      if (parsedContents.resolutions[depName]) {\n        depKey = depName;\n      } else if (parsedContents.resolutions[`**/${depName}`]) {\n        depKey = `**/${depName}`;\n      }\n      if (depKey) {\n        /* v8 ignore start -- needs test */\n        if (parsedContents.resolutions[depKey] !== oldVersion) {\n          logger.debug(\n            {\n              depName,\n              depKey,\n              oldVersion,\n              resolutionsVersion: parsedContents.resolutions[depKey],\n            },\n            'Upgraded dependency exists in yarn resolutions but is different version',\n          );\n        } /* v8 ignore stop -- needs test */\n        newFileContent = replaceAsString(\n          parsedContents,\n          newFileContent,\n          'resolutions',\n          depKey,\n          // TODO #22198\n          parsedContents.resolutions[depKey]!,\n          // TODO #22198\n          newValue!,\n        );\n        if (upgrade.newName) {\n          if (depKey === `**/${depName}`) {\n            // handles the case where a replacement is in a resolution\n            upgrade.newName = `**/${upgrade.newName}`;\n          }\n          newFileContent = replaceAsString(\n            parsedContents,\n            newFileContent,\n            'resolutions',\n            depKey,\n            depKey,\n            upgrade.newName,\n          );\n        }\n      }\n    }\n    if (parsedContents?.dependenciesMeta) {\n      for (const [depKey] of Object.entries(parsedContents.dependenciesMeta)) {\n        if (depKey.startsWith(depName + '@')) {\n          newFileContent = replaceAsString(\n            parsedContents,\n            newFileContent,\n            'dependenciesMeta',\n            depName,\n            depKey,\n            // TODO: types (#22198)\n            `${depName}@${newValue}`,\n          );\n        }\n      }\n    }\n    return newFileContent;\n  } catch (err) {\n    logger.debug({ err }, 'updateDependency error');\n    return null;\n  }\n}\n\nfunction overrideDepPosition(\n  overrideBlock: OverrideDependency,\n  parents: string[],\n  depName: string,\n): {\n  depObjectReference: Record<string, string>;\n  overrideDepName: string;\n} {\n  // get override dep position when its nested in an object\n  const lastParent = parents[parents.length - 1];\n  let overrideDep: OverrideDependency = overrideBlock;\n  for (const parent of parents) {\n    if (overrideDep) {\n      overrideDep = overrideDep[parent] as Record<string, RecursiveOverride>;\n    }\n  }\n  const overrideDepName = depName === lastParent ? '.' : depName;\n  const depObjectReference = overrideDep as Record<string, string>;\n  return { depObjectReference, overrideDepName };\n}\n\nfunction isOverrideObject(upgrade: Upgrade<NpmManagerData>): boolean {\n  return (\n    is.array(upgrade.managerData?.parents, is.nonEmptyStringAndNotWhitespace) &&\n    upgrade.depType === 'overrides'\n  );\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../lib/modules/manager/npm/update/dependency/index.ts"],"names":[],"mappings":"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","sourcesContent":["import is from '@sindresorhus/is';\nimport { dequal } from 'dequal';\nimport { logger } from '../../../../../logger';\nimport { escapeRegExp, regEx } from '../../../../../util/regex';\nimport { matchAt, replaceAt } from '../../../../../util/string';\nimport type { UpdateDependencyConfig, Upgrade } from '../../../types';\nimport type {\n  DependenciesMeta,\n  NpmPackage,\n  OverrideDependency,\n  RecursiveOverride,\n} from '../../extract/types';\nimport type { NpmDepType, NpmManagerData } from '../../types';\nimport { getNewGitValue, getNewNpmAliasValue } from './common';\nimport { updatePnpmCatalogDependency } from './pnpm';\nimport { updateYarnrcCatalogDependency } from './yarn';\n\nfunction renameObjKey(\n  oldObj: DependenciesMeta,\n  oldKey: string,\n  newKey: string,\n): DependenciesMeta {\n  const keys = Object.keys(oldObj);\n  return keys.reduce((acc, key) => {\n    if (key === oldKey) {\n      acc[newKey] = oldObj[oldKey];\n    } else {\n      acc[key] = oldObj[key];\n    }\n    return acc;\n  }, {} as DependenciesMeta);\n}\n\nfunction replaceAsString(\n  parsedContents: NpmPackage,\n  fileContent: string,\n  depType:\n    | NpmDepType\n    | 'dependenciesMeta'\n    | 'packageManager'\n    | 'pnpm.overrides',\n  depName: string,\n  oldValue: string,\n  newValue: string,\n  parents?: string[],\n): string {\n  if (depType === 'packageManager') {\n    parsedContents[depType] = newValue;\n  } else if (depType === 'pnpm.overrides') {\n    parsedContents.pnpm!.overrides![depName] = newValue;\n  } else if (depName === oldValue) {\n    // The old value is the name of the dependency itself\n    delete Object.assign(parsedContents[depType]!, {\n      [newValue]: parsedContents[depType]![oldValue],\n    })[oldValue];\n  } else if (depType === 'dependenciesMeta') {\n    if (oldValue !== newValue) {\n      parsedContents.dependenciesMeta = renameObjKey(\n        // TODO #22198\n        parsedContents.dependenciesMeta!,\n        oldValue,\n        newValue,\n      );\n    }\n  } else if (parents && depType === 'overrides') {\n    // there is an object as a value in overrides block\n    const { depObjectReference, overrideDepName } = overrideDepPosition(\n      parsedContents[depType]!,\n      parents,\n      depName,\n    );\n    if (depObjectReference) {\n      depObjectReference[overrideDepName] = newValue;\n    }\n  } else {\n    // The old value is the version of the dependency\n    parsedContents[depType]![depName] = newValue;\n  }\n  // Look for the old version number\n  const searchString = `\"${oldValue}\"`;\n  let newString = `\"${newValue}\"`;\n\n  const escapedDepName = escapeRegExp(depName);\n  const patchRe = regEx(`^(patch:${escapedDepName}@(npm:)?).*#`);\n  const match = patchRe.exec(oldValue);\n  if (match && depType === 'resolutions') {\n    const patch = oldValue.replace(match[0], `${match[1]}${newValue}#`);\n    parsedContents[depType]![depName] = patch;\n    newString = `\"${patch}\"`;\n  }\n\n  // Skip ahead to depType section\n  let searchIndex = fileContent.indexOf(`\"${depType}\"`) + depType.length;\n  logger.trace(`Starting search at index ${searchIndex}`);\n  // Iterate through the rest of the file\n  for (; searchIndex < fileContent.length; searchIndex += 1) {\n    // First check if we have a hit for the old version\n    if (matchAt(fileContent, searchIndex, searchString)) {\n      logger.trace(`Found match at index ${searchIndex}`);\n      // Now test if the result matches\n      const testContent = replaceAt(\n        fileContent,\n        searchIndex,\n        searchString,\n        newString,\n      );\n      // Compare the parsed JSON structure of old and new\n      if (dequal(parsedContents, JSON.parse(testContent))) {\n        return testContent;\n      }\n    }\n    /* v8 ignore next 3 -- needs test */\n  }\n  throw new Error();\n}\n\nexport function updateDependency({\n  fileContent,\n  upgrade,\n}: UpdateDependencyConfig): string | null {\n  if (upgrade.depType?.startsWith('pnpm.catalog')) {\n    return updatePnpmCatalogDependency({ fileContent, upgrade });\n  }\n  if (upgrade.depType?.startsWith('yarn.catalog')) {\n    return updateYarnrcCatalogDependency({ fileContent, upgrade });\n  }\n\n  const { depType, managerData } = upgrade;\n  const depName: string = managerData?.key ?? upgrade.depName;\n  let { newValue } = upgrade;\n\n  newValue = getNewGitValue(upgrade) ?? newValue;\n  newValue = getNewNpmAliasValue(newValue, upgrade) ?? newValue;\n\n  logger.debug(`npm.updateDependency(): ${depType}.${depName} = ${newValue}`);\n  try {\n    const parsedContents: NpmPackage = JSON.parse(fileContent);\n    let overrideDepParents: string[] | undefined = undefined;\n    // Save the old version\n    let oldVersion: string | undefined;\n    if (depType === 'packageManager') {\n      oldVersion = parsedContents[depType];\n      newValue = `${depName}@${newValue}`;\n    } else if (isOverrideObject(upgrade)) {\n      overrideDepParents = managerData?.parents;\n      if (overrideDepParents) {\n        // old version when there is an object as a value in overrides block\n        const { depObjectReference, overrideDepName } = overrideDepPosition(\n          parsedContents.overrides!,\n          overrideDepParents,\n          depName,\n        );\n        if (depObjectReference) {\n          oldVersion = depObjectReference[overrideDepName]!;\n        }\n      }\n    } else if (depType === 'pnpm.overrides') {\n      oldVersion = parsedContents.pnpm?.overrides?.[depName];\n    } else {\n      oldVersion = parsedContents[depType as NpmDepType]![depName] as string;\n    }\n    if (oldVersion === newValue) {\n      logger.trace('Version is already updated');\n      return fileContent;\n    }\n\n    // TODO #22198\n    let newFileContent: string;\n    if (upgrade.newName && upgrade.replacementApproach === 'alias') {\n      newFileContent = replaceAsString(\n        parsedContents,\n        fileContent,\n        depType as NpmDepType,\n        depName,\n        oldVersion!,\n        `npm:${upgrade.newName}@${newValue}`,\n        overrideDepParents,\n      );\n    } else {\n      newFileContent = replaceAsString(\n        parsedContents,\n        fileContent,\n        depType as NpmDepType,\n        depName,\n        oldVersion!,\n        newValue!,\n        overrideDepParents,\n      );\n      if (upgrade.newName) {\n        newFileContent = replaceAsString(\n          parsedContents,\n          newFileContent,\n          depType as NpmDepType,\n          depName,\n          depName,\n          upgrade.newName,\n          overrideDepParents,\n        );\n      }\n    }\n    /* v8 ignore start -- needs test */\n    if (!newFileContent) {\n      logger.debug(\n        { fileContent, parsedContents, depType, depName, newValue },\n        'Warning: updateDependency error',\n      );\n      return fileContent;\n    }\n    /* v8 ignore stop -- needs test */\n    if (parsedContents?.resolutions) {\n      let depKey: string | undefined;\n      if (parsedContents.resolutions[depName]) {\n        depKey = depName;\n      } else if (parsedContents.resolutions[`**/${depName}`]) {\n        depKey = `**/${depName}`;\n      }\n      if (depKey) {\n        /* v8 ignore start -- needs test */\n        if (parsedContents.resolutions[depKey] !== oldVersion) {\n          logger.debug(\n            {\n              depName,\n              depKey,\n              oldVersion,\n              resolutionsVersion: parsedContents.resolutions[depKey],\n            },\n            'Upgraded dependency exists in yarn resolutions but is different version',\n          );\n        } /* v8 ignore stop -- needs test */\n        newFileContent = replaceAsString(\n          parsedContents,\n          newFileContent,\n          'resolutions',\n          depKey,\n          // TODO #22198\n          parsedContents.resolutions[depKey]!,\n          // TODO #22198\n          newValue!,\n        );\n        if (upgrade.newName) {\n          if (depKey === `**/${depName}`) {\n            // handles the case where a replacement is in a resolution\n            upgrade.newName = `**/${upgrade.newName}`;\n          }\n          newFileContent = replaceAsString(\n            parsedContents,\n            newFileContent,\n            'resolutions',\n            depKey,\n            depKey,\n            upgrade.newName,\n          );\n        }\n      }\n    }\n    if (parsedContents?.dependenciesMeta) {\n      for (const [depKey] of Object.entries(parsedContents.dependenciesMeta)) {\n        if (depKey.startsWith(depName + '@')) {\n          newFileContent = replaceAsString(\n            parsedContents,\n            newFileContent,\n            'dependenciesMeta',\n            depName,\n            depKey,\n            // TODO: types (#22198)\n            `${depName}@${newValue}`,\n          );\n        }\n      }\n    }\n    return newFileContent;\n  } catch (err) {\n    logger.debug({ err }, 'updateDependency error');\n    return null;\n  }\n}\n\nfunction overrideDepPosition(\n  overrideBlock: OverrideDependency,\n  parents: string[],\n  depName: string,\n): {\n  depObjectReference: Record<string, string>;\n  overrideDepName: string;\n} {\n  // get override dep position when its nested in an object\n  const lastParent = parents[parents.length - 1];\n  let overrideDep: OverrideDependency = overrideBlock;\n  for (const parent of parents) {\n    if (overrideDep) {\n      overrideDep = overrideDep[parent] as Record<string, RecursiveOverride>;\n    }\n  }\n  const overrideDepName = depName === lastParent ? '.' : depName;\n  const depObjectReference = overrideDep as Record<string, string>;\n  return { depObjectReference, overrideDepName };\n}\n\nfunction isOverrideObject(upgrade: Upgrade<NpmManagerData>): boolean {\n  return (\n    is.array(upgrade.managerData?.parents, is.nonEmptyStringAndNotWhitespace) &&\n    upgrade.depType === 'overrides'\n  );\n}\n"]}

package/dist/modules/manager/npm/update/dependency/pnpm.js

@@ -29,7 +29,7 @@ function updatePnpmCatalogDependency({ fileContent, upgrade, }) {
         // values. Thus, we use both an annotated AST and a JS representation; the
         // former for manipulation, and the latter for querying/validation.
         document = (0, yaml_1.parseDocument)(fileContent, { keepSourceTokens: true });
-        parsedContents = schema_1.PnpmCatalogsSchema.parse(document.toJS());
+        parsedContents = schema_1.PnpmCatalogs.parse(document.toJS());
     }
     catch (err) {
         logger_1.logger.debug({ err }, 'Could not parse pnpm-workspace YAML file.');