renovate 44.210.2 → 44.211.0

package/dist/modules/versioning/rez/index.js

@@ -61,7 +61,8 @@ function minSatisfyingVersion(versions, range) {
 	return api$1.minSatisfyingVersion(versions, rez2npm(range));
 }
 function isSingleVersion(constraint) {
-	return constraint.trim().startsWith("==") && isVersion(constraint.trim().substring(2).trim()) || isVersion(constraint.trim());
+	if (constraint.trim().startsWith("==") && isVersion(constraint.trim().substring(2).trim())) return true;
+	return isVersion(constraint.trim());
 }
 function sortVersions(a, b) {
 	return api$1.sortVersions(padZeroes(a), padZeroes(b));

package/dist/modules/versioning/rez/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["npm","pep440"],"sources":["../../../../lib/modules/versioning/rez/index.ts"],"sourcesContent":["import type { RangeStrategy } from '../../../types/versioning.ts';\nimport { regEx } from '../../../util/regex.ts';\nimport { coerceString } from '../../../util/string.ts';\nimport { api as npm } from '../npm/index.ts';\nimport { api as pep440 } from '../pep440/index.ts';\nimport type { NewValueConfig, VersioningApi } from '../types.ts';\n\nimport {\n  ascendingRange,\n  descendingRange,\n  exactVersion,\n  inclusiveBound,\n  lowerBound,\n  matchVersion,\n  upperBound,\n  versionGroup,\n} from './pattern.ts';\nimport {\n  npm2rezplus,\n  padZeroes,\n  pep4402rezInclusiveBound,\n  rez2npm,\n  rez2pep440,\n} from './transform.ts';\n\nexport const id = 'rez';\nexport const displayName = 'rez';\nexport const urls = ['[Rez package manager](https://github.com/nerdvegas/rez)'];\nexport const supportsRanges = true;\nexport const supportedRangeStrategies: RangeStrategy[] = [\n  'bump',\n  'widen',\n  'replace',\n];\n\nfunction equals(a: string, b: string): boolean {\n  try {\n    return npm.equals(padZeroes(a), padZeroes(b));\n  } catch /* istanbul ignore next */ {\n    return pep440.equals(a, b);\n  }\n}\n\nfunction getMajor(version: string): number | null {\n  try {\n    return npm.getMajor(padZeroes(version));\n  } catch /* istanbul ignore next */ {\n    return pep440.getMajor(version);\n  }\n}\n\nfunction getMinor(version: string): number | null {\n  try {\n    return npm.getMinor(padZeroes(version));\n  } catch /* istanbul ignore next */ {\n    return pep440.getMinor(version);\n  }\n}\n\nfunction getPatch(version: string): number | null {\n  try {\n    return npm.getPatch(padZeroes(version));\n  } catch /* istanbul ignore next */ {\n    return pep440.getPatch(version);\n  }\n}\n\nfunction isGreaterThan(a: string, b: string): boolean {\n  try {\n    return npm.isGreaterThan(padZeroes(a), padZeroes(b));\n  } catch /* istanbul ignore next */ {\n    return pep440.isGreaterThan(a, b);\n  }\n}\n\nfunction isLessThanRange(version: string, range: string): boolean {\n  return (\n    npm.isVersion(padZeroes(version)) &&\n    !!npm.isLessThanRange?.(padZeroes(version), rez2npm(range))\n  );\n}\n\nexport function isValid(input: string): boolean {\n  return npm.isValid(rez2npm(input));\n}\n\nfunction isStable(version: string): boolean {\n  return npm.isStable(padZeroes(version));\n}\n\nfunction isVersion(input: string): boolean {\n  return npm.isVersion(padZeroes(rez2npm(input)));\n}\n\nfunction matches(version: string, range: string): boolean {\n  return (\n    npm.isVersion(padZeroes(version)) &&\n    npm.matches(padZeroes(version), rez2npm(range))\n  );\n}\n\nfunction getSatisfyingVersion(\n  versions: string[],\n  range: string,\n): string | null {\n  return npm.getSatisfyingVersion(versions, rez2npm(range));\n}\n\nfunction minSatisfyingVersion(\n  versions: string[],\n  range: string,\n): string | null {\n  return npm.minSatisfyingVersion(versions, rez2npm(range));\n}\n\nfunction isSingleVersion(constraint: string): boolean {\n  return (\n    (constraint.trim().startsWith('==') &&\n      isVersion(constraint.trim().substring(2).trim())) ||\n    isVersion(constraint.trim())\n  );\n}\n\nfunction sortVersions(a: string, b: string): number {\n  return npm.sortVersions(padZeroes(a), padZeroes(b));\n}\n\nfunction matchVersionPrecision(\n  currentValue: string,\n  newVersion: string,\n): string | null {\n  if (!matchVersion.test(currentValue) || !isVersion(newVersion)) {\n    return null;\n  }\n  const precision = currentValue.split('.').length;\n  return newVersion.split('.').slice(0, precision).join('.');\n}\n\nfunction getNewValue({\n  currentValue,\n  rangeStrategy,\n  currentVersion,\n  newVersion,\n}: NewValueConfig): string | null {\n  const precisionMatchedVersion = matchVersionPrecision(\n    currentValue,\n    newVersion,\n  );\n  if (precisionMatchedVersion) {\n    return precisionMatchedVersion;\n  }\n  const pep440Value = pep440.getNewValue({\n    currentValue: rez2pep440(currentValue),\n    rangeStrategy,\n    currentVersion,\n    newVersion,\n  });\n  if (exactVersion.test(currentValue)) {\n    return pep440Value;\n  }\n  if (pep440Value && inclusiveBound.test(currentValue)) {\n    return pep4402rezInclusiveBound(pep440Value);\n  }\n  if (pep440Value && lowerBound.test(currentValue)) {\n    if (currentValue.includes('+')) {\n      return npm2rezplus(pep440Value);\n    }\n    return pep440Value;\n  }\n  if (pep440Value && upperBound.test(currentValue)) {\n    return pep440Value;\n  }\n  const matchAscRange = ascendingRange.exec(currentValue);\n  if (pep440Value && matchAscRange?.groups) {\n    // Replace version numbers but keep rez format, otherwise we just end up trying\n    // to convert every single case separately.\n    const lowerBoundAscCurrent = matchAscRange.groups.range_lower_asc;\n    const upperBoundAscCurrent = matchAscRange.groups.range_upper_asc;\n    const lowerAscVersionCurrent = matchAscRange.groups.range_lower_asc_version;\n    const upperAscVersionCurrent = matchAscRange.groups.range_upper_asc_version;\n    const [lowerBoundAscPep440, upperBoundAscPep440] = pep440Value.split(', ');\n    const lowerAscVersionNew = coerceString(\n      regEx(versionGroup).exec(lowerBoundAscPep440)?.[0],\n    );\n    const upperAscVersionNew = coerceString(\n      regEx(versionGroup).exec(upperBoundAscPep440)?.[0],\n    );\n    const lowerBoundAscNew = lowerBoundAscCurrent.replace(\n      lowerAscVersionCurrent,\n      lowerAscVersionNew,\n    );\n    const upperBoundAscNew = upperBoundAscCurrent.replace(\n      upperAscVersionCurrent,\n      upperAscVersionNew,\n    );\n    const separator = currentValue.includes(',') ? ',' : '';\n\n    return lowerBoundAscNew + separator + upperBoundAscNew;\n  }\n  const matchDscRange = descendingRange.exec(currentValue);\n  if (pep440Value && matchDscRange?.groups) {\n    // Replace version numbers but keep rez format, otherwise we just end up trying\n    // to convert every single case separately.\n    const upperBoundDescCurrent = matchDscRange.groups.range_upper_desc;\n    const lowerBoundDescCurrent = matchDscRange.groups.range_lower_desc;\n    const upperDescVersionCurrent =\n      matchDscRange.groups.range_upper_desc_version;\n    const lowerDescVersionCurrent =\n      matchDscRange.groups.range_lower_desc_version;\n    const [lowerBoundDescPep440, upperBoundDescPep440] =\n      pep440Value.split(', ');\n\n    const upperDescVersionNew = coerceString(\n      regEx(versionGroup).exec(upperBoundDescPep440)?.[0],\n    );\n    const lowerDescVersionNew = coerceString(\n      regEx(versionGroup).exec(lowerBoundDescPep440)?.[0],\n    );\n    const upperBoundDescNew = upperBoundDescCurrent.replace(\n      upperDescVersionCurrent,\n      upperDescVersionNew,\n    );\n    const lowerBoundDescNew = lowerBoundDescCurrent.replace(\n      lowerDescVersionCurrent,\n      lowerDescVersionNew,\n    );\n    // Descending ranges are only supported with a comma.\n    const separator = ',';\n\n    return upperBoundDescNew + separator + lowerBoundDescNew;\n  }\n  return null;\n}\n\nfunction isCompatible(version: string): boolean {\n  return isVersion(version);\n}\n\nexport const api: VersioningApi = {\n  equals,\n  getMajor,\n  getMinor,\n  getPatch,\n  getNewValue,\n  getSatisfyingVersion,\n  isCompatible,\n  isGreaterThan,\n  isLessThanRange,\n  isSingleVersion,\n  isStable,\n  isValid,\n  isVersion,\n  matches,\n  minSatisfyingVersion,\n  sortVersions,\n};\nexport default api;\n"],"mappings":"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"}
+{"version":3,"file":"index.js","names":["npm","pep440"],"sources":["../../../../lib/modules/versioning/rez/index.ts"],"sourcesContent":["import type { RangeStrategy } from '../../../types/versioning.ts';\nimport { regEx } from '../../../util/regex.ts';\nimport { coerceString } from '../../../util/string.ts';\nimport { api as npm } from '../npm/index.ts';\nimport { api as pep440 } from '../pep440/index.ts';\nimport type { NewValueConfig, VersioningApi } from '../types.ts';\n\nimport {\n  ascendingRange,\n  descendingRange,\n  exactVersion,\n  inclusiveBound,\n  lowerBound,\n  matchVersion,\n  upperBound,\n  versionGroup,\n} from './pattern.ts';\nimport {\n  npm2rezplus,\n  padZeroes,\n  pep4402rezInclusiveBound,\n  rez2npm,\n  rez2pep440,\n} from './transform.ts';\n\nexport const id = 'rez';\nexport const displayName = 'rez';\nexport const urls = ['[Rez package manager](https://github.com/nerdvegas/rez)'];\nexport const supportsRanges = true;\nexport const supportedRangeStrategies: RangeStrategy[] = [\n  'bump',\n  'widen',\n  'replace',\n];\n\nfunction equals(a: string, b: string): boolean {\n  try {\n    return npm.equals(padZeroes(a), padZeroes(b));\n  } catch /* istanbul ignore next */ {\n    return pep440.equals(a, b);\n  }\n}\n\nfunction getMajor(version: string): number | null {\n  try {\n    return npm.getMajor(padZeroes(version));\n  } catch /* istanbul ignore next */ {\n    return pep440.getMajor(version);\n  }\n}\n\nfunction getMinor(version: string): number | null {\n  try {\n    return npm.getMinor(padZeroes(version));\n  } catch /* istanbul ignore next */ {\n    return pep440.getMinor(version);\n  }\n}\n\nfunction getPatch(version: string): number | null {\n  try {\n    return npm.getPatch(padZeroes(version));\n  } catch /* istanbul ignore next */ {\n    return pep440.getPatch(version);\n  }\n}\n\nfunction isGreaterThan(a: string, b: string): boolean {\n  try {\n    return npm.isGreaterThan(padZeroes(a), padZeroes(b));\n  } catch /* istanbul ignore next */ {\n    return pep440.isGreaterThan(a, b);\n  }\n}\n\nfunction isLessThanRange(version: string, range: string): boolean {\n  return (\n    npm.isVersion(padZeroes(version)) &&\n    !!npm.isLessThanRange?.(padZeroes(version), rez2npm(range))\n  );\n}\n\nexport function isValid(input: string): boolean {\n  return npm.isValid(rez2npm(input));\n}\n\nfunction isStable(version: string): boolean {\n  return npm.isStable(padZeroes(version));\n}\n\nfunction isVersion(input: string): boolean {\n  return npm.isVersion(padZeroes(rez2npm(input)));\n}\n\nfunction matches(version: string, range: string): boolean {\n  return (\n    npm.isVersion(padZeroes(version)) &&\n    npm.matches(padZeroes(version), rez2npm(range))\n  );\n}\n\nfunction getSatisfyingVersion(\n  versions: string[],\n  range: string,\n): string | null {\n  return npm.getSatisfyingVersion(versions, rez2npm(range));\n}\n\nfunction minSatisfyingVersion(\n  versions: string[],\n  range: string,\n): string | null {\n  return npm.minSatisfyingVersion(versions, rez2npm(range));\n}\n\nfunction isSingleVersion(constraint: string): boolean {\n  if (\n    constraint.trim().startsWith('==') &&\n    isVersion(constraint.trim().substring(2).trim())\n  ) {\n    return true;\n  }\n  return isVersion(constraint.trim());\n}\n\nfunction sortVersions(a: string, b: string): number {\n  return npm.sortVersions(padZeroes(a), padZeroes(b));\n}\n\nfunction matchVersionPrecision(\n  currentValue: string,\n  newVersion: string,\n): string | null {\n  if (!matchVersion.test(currentValue) || !isVersion(newVersion)) {\n    return null;\n  }\n  const precision = currentValue.split('.').length;\n  return newVersion.split('.').slice(0, precision).join('.');\n}\n\nfunction getNewValue({\n  currentValue,\n  rangeStrategy,\n  currentVersion,\n  newVersion,\n}: NewValueConfig): string | null {\n  const precisionMatchedVersion = matchVersionPrecision(\n    currentValue,\n    newVersion,\n  );\n  if (precisionMatchedVersion) {\n    return precisionMatchedVersion;\n  }\n  const pep440Value = pep440.getNewValue({\n    currentValue: rez2pep440(currentValue),\n    rangeStrategy,\n    currentVersion,\n    newVersion,\n  });\n  if (exactVersion.test(currentValue)) {\n    return pep440Value;\n  }\n  if (pep440Value && inclusiveBound.test(currentValue)) {\n    return pep4402rezInclusiveBound(pep440Value);\n  }\n  if (pep440Value && lowerBound.test(currentValue)) {\n    if (currentValue.includes('+')) {\n      return npm2rezplus(pep440Value);\n    }\n    return pep440Value;\n  }\n  if (pep440Value && upperBound.test(currentValue)) {\n    return pep440Value;\n  }\n  const matchAscRange = ascendingRange.exec(currentValue);\n  if (pep440Value && matchAscRange?.groups) {\n    // Replace version numbers but keep rez format, otherwise we just end up trying\n    // to convert every single case separately.\n    const lowerBoundAscCurrent = matchAscRange.groups.range_lower_asc;\n    const upperBoundAscCurrent = matchAscRange.groups.range_upper_asc;\n    const lowerAscVersionCurrent = matchAscRange.groups.range_lower_asc_version;\n    const upperAscVersionCurrent = matchAscRange.groups.range_upper_asc_version;\n    const [lowerBoundAscPep440, upperBoundAscPep440] = pep440Value.split(', ');\n    const lowerAscVersionNew = coerceString(\n      regEx(versionGroup).exec(lowerBoundAscPep440)?.[0],\n    );\n    const upperAscVersionNew = coerceString(\n      regEx(versionGroup).exec(upperBoundAscPep440)?.[0],\n    );\n    const lowerBoundAscNew = lowerBoundAscCurrent.replace(\n      lowerAscVersionCurrent,\n      lowerAscVersionNew,\n    );\n    const upperBoundAscNew = upperBoundAscCurrent.replace(\n      upperAscVersionCurrent,\n      upperAscVersionNew,\n    );\n    const separator = currentValue.includes(',') ? ',' : '';\n\n    return lowerBoundAscNew + separator + upperBoundAscNew;\n  }\n  const matchDscRange = descendingRange.exec(currentValue);\n  if (pep440Value && matchDscRange?.groups) {\n    // Replace version numbers but keep rez format, otherwise we just end up trying\n    // to convert every single case separately.\n    const upperBoundDescCurrent = matchDscRange.groups.range_upper_desc;\n    const lowerBoundDescCurrent = matchDscRange.groups.range_lower_desc;\n    const upperDescVersionCurrent =\n      matchDscRange.groups.range_upper_desc_version;\n    const lowerDescVersionCurrent =\n      matchDscRange.groups.range_lower_desc_version;\n    const [lowerBoundDescPep440, upperBoundDescPep440] =\n      pep440Value.split(', ');\n\n    const upperDescVersionNew = coerceString(\n      regEx(versionGroup).exec(upperBoundDescPep440)?.[0],\n    );\n    const lowerDescVersionNew = coerceString(\n      regEx(versionGroup).exec(lowerBoundDescPep440)?.[0],\n    );\n    const upperBoundDescNew = upperBoundDescCurrent.replace(\n      upperDescVersionCurrent,\n      upperDescVersionNew,\n    );\n    const lowerBoundDescNew = lowerBoundDescCurrent.replace(\n      lowerDescVersionCurrent,\n      lowerDescVersionNew,\n    );\n    // Descending ranges are only supported with a comma.\n    const separator = ',';\n\n    return upperBoundDescNew + separator + lowerBoundDescNew;\n  }\n  return null;\n}\n\nfunction isCompatible(version: string): boolean {\n  return isVersion(version);\n}\n\nexport const api: VersioningApi = {\n  equals,\n  getMajor,\n  getMinor,\n  getPatch,\n  getNewValue,\n  getSatisfyingVersion,\n  isCompatible,\n  isGreaterThan,\n  isLessThanRange,\n  isSingleVersion,\n  isStable,\n  isValid,\n  isVersion,\n  matches,\n  minSatisfyingVersion,\n  sortVersions,\n};\nexport default api;\n"],"mappings":"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"}

package/dist/modules/versioning/vcpkg/index.js

@@ -99,7 +99,8 @@ function isValid(input) {
 function isCompatible(version, current) {
 	const v = parse(version);
 	const c = current ? parse(current) : null;
-	return !!v && (!c || v.scheme === c.scheme);
+	if (!v) return false;
+	return !c || v.scheme === c.scheme;
 }
 function isStable(version) {
 	const parsed = parse(version);

package/dist/modules/versioning/vcpkg/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["semver","loose"],"sources":["../../../../lib/modules/versioning/vcpkg/index.ts"],"sourcesContent":["import { isString } from '@sindresorhus/is';\nimport { DateTime } from 'luxon';\nimport type { SemVer } from 'semver';\nimport { coerce } from 'semver';\nimport { regEx } from '../../../util/regex.ts';\nimport { api as loose } from '../loose/index.ts';\nimport { api as semver } from '../semver/index.ts';\nimport type { NewValueConfig, VersioningApi } from '../types.ts';\n\nexport const id = 'vcpkg';\nexport const displayName = 'vcpkg';\nexport const urls = [\n  '[vcpkg - Versioning](https://learn.microsoft.com/vcpkg/users/versioning)',\n];\nexport const supportsRanges = false;\n\ntype Scheme = 'date' | 'numeric' | 'string' | 'invalid';\n\ninterface ParsedVersion {\n  base: string;\n  portVersion: number;\n  scheme: Scheme;\n  strictSemver: boolean;\n  dateHead?: string;\n  dateTail?: number[];\n}\n\nconst portVersionRegex = regEx(/^(?<base>.*)#(?<port>\\d+)$/);\nconst dateRegex = regEx(\n  /^(?<head>\\d{4}-\\d{2}-\\d{2})(?<tail>(?:\\.(?:0|[1-9]\\d*))*)$/,\n);\n// vcpkg-tool's dot-version grammar: numbers and numeric prerelease\n// identifiers without leading zeros.\nconst numericRegex = regEx(\n  /^(?:0|[1-9]\\d*)(?:\\.(?:0|[1-9]\\d*))*(?:-(?:0|[1-9]\\d*|\\d*[A-Za-z-][0-9A-Za-z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[A-Za-z-][0-9A-Za-z-]*))*)?(?:\\+[0-9A-Za-z-]+(?:\\.[0-9A-Za-z-]+)*)?$/,\n);\nconst numericPrereleaseRegex = regEx(/-[0-9A-Za-z.-]+(?:\\+[0-9A-Za-z.-]+)?$/);\nconst numericBuildRegex = regEx(/\\+[0-9A-Za-z.-]+$/);\nconst strictSemverRegex = regEx(\n  /^\\d+\\.\\d+\\.\\d+(?:-[0-9A-Za-z.-]+)?(?:\\+[0-9A-Za-z.-]+)?$/,\n);\n\nfunction splitPortVersion(input: string): {\n  base: string;\n  portVersion: number;\n} {\n  const match = portVersionRegex.exec(input);\n  if (match?.groups) {\n    return {\n      base: match.groups.base,\n      portVersion: Number.parseInt(match.groups.port, 10),\n    };\n  }\n  return { base: input, portVersion: 0 };\n}\n\nfunction isValidDateHead(head: string): boolean {\n  return DateTime.fromISO(head, { zone: 'utc' }).isValid;\n}\n\nfunction matchDate(base: string): { head: string; tail: number[] } | null {\n  const match = dateRegex.exec(base);\n  if (!match?.groups) {\n    return null;\n  }\n  const tail = match.groups.tail\n    ? match.groups.tail\n        .slice(1)\n        .split('.')\n        .map((s) => Number.parseInt(s, 10))\n    : [];\n  return { head: match.groups.head, tail };\n}\n\nfunction detectScheme(base: string): Scheme {\n  const dateParts = matchDate(base);\n  if (dateParts) {\n    // A date-shaped base must parse as a real calendar date, otherwise the\n    // whole version is rejected rather than falling back to another scheme.\n    return isValidDateHead(dateParts.head) ? 'date' : 'invalid';\n  }\n  if (numericRegex.test(base)) {\n    return 'numeric';\n  }\n  return 'string';\n}\n\nfunction parse(input: string | undefined | null): ParsedVersion | null {\n  if (!isString(input)) {\n    return null;\n  }\n  const trimmed = input.trim();\n  if (trimmed === '') {\n    return null;\n  }\n  const { base, portVersion } = splitPortVersion(trimmed);\n  // `#` only introduces a port-version, so one left in the base is invalid.\n  if (base === '' || base.includes('#')) {\n    return null;\n  }\n  const scheme = detectScheme(base);\n  if (scheme === 'invalid') {\n    return null;\n  }\n  const strictSemver =\n    scheme === 'numeric' &&\n    strictSemverRegex.test(base) &&\n    semver.isValid(base);\n  if (scheme === 'date') {\n    // detectScheme guarantees matchDate succeeds\n    const dateParts = matchDate(base)!;\n    return {\n      base,\n      portVersion,\n      scheme,\n      strictSemver,\n      dateHead: dateParts.head,\n      dateTail: dateParts.tail,\n    };\n  }\n  return { base, portVersion, scheme, strictSemver };\n}\n\nfunction compareBase(a: ParsedVersion, b: ParsedVersion): number | null {\n  if (a.scheme !== b.scheme) {\n    return null;\n  }\n  if (a.scheme === 'date') {\n    // `parse` guarantees `dateHead` and `dateTail` are populated for the\n    // `date` scheme, so the non-null assertions are safe.\n    const aHead = a.dateHead!;\n    const bHead = b.dateHead!;\n    if (aHead !== bHead) {\n      return aHead < bHead ? -1 : 1;\n    }\n    // Same date head, compare disambiguation tail per the relaxed `version`\n    // scheme rule, so a version with the smaller set of sections takes\n    // precedence (i.e. sorts earlier).\n    const aTail = a.dateTail!;\n    const bTail = b.dateTail!;\n    const minLen = Math.min(aTail.length, bTail.length);\n    for (let i = 0; i < minLen; i += 1) {\n      if (aTail[i] !== bTail[i]) {\n        return aTail[i] < bTail[i] ? -1 : 1;\n      }\n    }\n    if (aTail.length !== bTail.length) {\n      return aTail.length < bTail.length ? -1 : 1;\n    }\n    return 0;\n  }\n  if (a.scheme === 'numeric') {\n    if (a.strictSemver && b.strictSemver) {\n      return semver.sortVersions(a.base, b.base);\n    }\n    return loose.sortVersions(a.base, b.base);\n  }\n  // Opaque strings order only against an identical base.\n  return a.base === b.base ? 0 : null;\n}\n\nfunction compare(a: ParsedVersion, b: ParsedVersion): number | null {\n  const baseResult = compareBase(a, b);\n  if (baseResult === null) {\n    return null;\n  }\n  if (baseResult !== 0) {\n    return baseResult;\n  }\n  return a.portVersion - b.portVersion;\n}\n\nfunction isValid(input: string | undefined | null): boolean {\n  return parse(input) !== null;\n}\n\n// vcpkg does not compare versions across schemes, so a candidate using a\n// different scheme is not an upgrade of the current one.\nfunction isCompatible(version: string, current?: string): boolean {\n  const v = parse(version);\n  const c = current ? parse(current) : null;\n  return !!v && (!c || v.scheme === c.scheme);\n}\n\nfunction isStable(version: string): boolean {\n  const parsed = parse(version);\n  if (!parsed) {\n    return false;\n  }\n  if (parsed.scheme === 'numeric') {\n    // A pre-release suffix (`-...`) marks the version as unstable.\n    // Pure build metadata (`+...`) is ignored, matching SemVer.\n    const withoutBuild = parsed.base.replace(numericBuildRegex, '');\n    return !numericPrereleaseRegex.test(withoutBuild);\n  }\n  // Date and opaque-string versions have no prerelease concept, treat as stable.\n  return true;\n}\n\n// Returns null when a component exceeds semver's 16-digit limit.\nfunction coerceNumeric(base: string, strictSemver: boolean): SemVer | null {\n  if (strictSemver) {\n    return coerce(base);\n  }\n  // Strip any pre-release or build suffix before coercion so loose forms like\n  // `1.2-alpha` map to `1.2.0` instead of failing.\n  const stripped = base\n    .replace(numericBuildRegex, '')\n    .replace(numericPrereleaseRegex, '');\n  return coerce(stripped);\n}\n\nfunction getMajor(version: string): number | null {\n  const parsed = parse(version);\n  if (parsed?.scheme !== 'numeric') {\n    return null;\n  }\n  return coerceNumeric(parsed.base, parsed.strictSemver)?.major ?? null;\n}\n\nfunction getMinor(version: string): number | null {\n  const parsed = parse(version);\n  if (parsed?.scheme !== 'numeric') {\n    return null;\n  }\n  return coerceNumeric(parsed.base, parsed.strictSemver)?.minor ?? null;\n}\n\nfunction getPatch(version: string): number | null {\n  const parsed = parse(version);\n  if (parsed?.scheme !== 'numeric') {\n    return null;\n  }\n  return coerceNumeric(parsed.base, parsed.strictSemver)?.patch ?? null;\n}\n\nfunction equals(version: string, other: string): boolean {\n  const a = parse(version);\n  const b = parse(other);\n  return !!a && !!b && compare(a, b) === 0;\n}\n\nfunction isGreaterThan(version: string, other: string): boolean {\n  const a = parse(version);\n  const b = parse(other);\n  if (!a || !b) {\n    return false;\n  }\n  const result = compare(a, b);\n  return result !== null && result > 0;\n}\n\nfunction sortVersions(version: string, other: string): number {\n  const a = parse(version);\n  const b = parse(other);\n  if (!a || !b) {\n    return 0;\n  }\n  // Lookup sorts only releases that `isGreaterThan` the current version,\n  // and those order against each other.\n  return compare(a, b) ?? 0;\n}\n\nfunction matches(version: string, range: string): boolean {\n  return equals(version, range);\n}\n\nfunction getSatisfyingVersion(\n  versions: string[],\n  range: string,\n): string | null {\n  return versions.find((version) => equals(version, range)) ?? null;\n}\n\nfunction getNewValue({ newVersion }: NewValueConfig): string {\n  return newVersion;\n}\n\nexport const api: VersioningApi = {\n  equals,\n  getMajor,\n  getMinor,\n  getPatch,\n  isCompatible,\n  isGreaterThan,\n  isSingleVersion: isValid,\n  isStable,\n  isValid,\n  isVersion: isValid,\n  matches,\n  getSatisfyingVersion,\n  minSatisfyingVersion: getSatisfyingVersion,\n  getNewValue,\n  sortVersions,\n};\n\nexport default api;\n"],"mappings":"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"}
+{"version":3,"file":"index.js","names":["semver","loose"],"sources":["../../../../lib/modules/versioning/vcpkg/index.ts"],"sourcesContent":["import { isString } from '@sindresorhus/is';\nimport { DateTime } from 'luxon';\nimport type { SemVer } from 'semver';\nimport { coerce } from 'semver';\nimport { regEx } from '../../../util/regex.ts';\nimport { api as loose } from '../loose/index.ts';\nimport { api as semver } from '../semver/index.ts';\nimport type { NewValueConfig, VersioningApi } from '../types.ts';\n\nexport const id = 'vcpkg';\nexport const displayName = 'vcpkg';\nexport const urls = [\n  '[vcpkg - Versioning](https://learn.microsoft.com/vcpkg/users/versioning)',\n];\nexport const supportsRanges = false;\n\ntype Scheme = 'date' | 'numeric' | 'string' | 'invalid';\n\ninterface ParsedVersion {\n  base: string;\n  portVersion: number;\n  scheme: Scheme;\n  strictSemver: boolean;\n  dateHead?: string;\n  dateTail?: number[];\n}\n\nconst portVersionRegex = regEx(/^(?<base>.*)#(?<port>\\d+)$/);\nconst dateRegex = regEx(\n  /^(?<head>\\d{4}-\\d{2}-\\d{2})(?<tail>(?:\\.(?:0|[1-9]\\d*))*)$/,\n);\n// vcpkg-tool's dot-version grammar: numbers and numeric prerelease\n// identifiers without leading zeros.\nconst numericRegex = regEx(\n  /^(?:0|[1-9]\\d*)(?:\\.(?:0|[1-9]\\d*))*(?:-(?:0|[1-9]\\d*|\\d*[A-Za-z-][0-9A-Za-z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[A-Za-z-][0-9A-Za-z-]*))*)?(?:\\+[0-9A-Za-z-]+(?:\\.[0-9A-Za-z-]+)*)?$/,\n);\nconst numericPrereleaseRegex = regEx(/-[0-9A-Za-z.-]+(?:\\+[0-9A-Za-z.-]+)?$/);\nconst numericBuildRegex = regEx(/\\+[0-9A-Za-z.-]+$/);\nconst strictSemverRegex = regEx(\n  /^\\d+\\.\\d+\\.\\d+(?:-[0-9A-Za-z.-]+)?(?:\\+[0-9A-Za-z.-]+)?$/,\n);\n\nfunction splitPortVersion(input: string): {\n  base: string;\n  portVersion: number;\n} {\n  const match = portVersionRegex.exec(input);\n  if (match?.groups) {\n    return {\n      base: match.groups.base,\n      portVersion: Number.parseInt(match.groups.port, 10),\n    };\n  }\n  return { base: input, portVersion: 0 };\n}\n\nfunction isValidDateHead(head: string): boolean {\n  return DateTime.fromISO(head, { zone: 'utc' }).isValid;\n}\n\nfunction matchDate(base: string): { head: string; tail: number[] } | null {\n  const match = dateRegex.exec(base);\n  if (!match?.groups) {\n    return null;\n  }\n  const tail = match.groups.tail\n    ? match.groups.tail\n        .slice(1)\n        .split('.')\n        .map((s) => Number.parseInt(s, 10))\n    : [];\n  return { head: match.groups.head, tail };\n}\n\nfunction detectScheme(base: string): Scheme {\n  const dateParts = matchDate(base);\n  if (dateParts) {\n    // A date-shaped base must parse as a real calendar date, otherwise the\n    // whole version is rejected rather than falling back to another scheme.\n    return isValidDateHead(dateParts.head) ? 'date' : 'invalid';\n  }\n  if (numericRegex.test(base)) {\n    return 'numeric';\n  }\n  return 'string';\n}\n\nfunction parse(input: string | undefined | null): ParsedVersion | null {\n  if (!isString(input)) {\n    return null;\n  }\n  const trimmed = input.trim();\n  if (trimmed === '') {\n    return null;\n  }\n  const { base, portVersion } = splitPortVersion(trimmed);\n  // `#` only introduces a port-version, so one left in the base is invalid.\n  if (base === '' || base.includes('#')) {\n    return null;\n  }\n  const scheme = detectScheme(base);\n  if (scheme === 'invalid') {\n    return null;\n  }\n  const strictSemver =\n    scheme === 'numeric' &&\n    strictSemverRegex.test(base) &&\n    semver.isValid(base);\n  if (scheme === 'date') {\n    // detectScheme guarantees matchDate succeeds\n    const dateParts = matchDate(base)!;\n    return {\n      base,\n      portVersion,\n      scheme,\n      strictSemver,\n      dateHead: dateParts.head,\n      dateTail: dateParts.tail,\n    };\n  }\n  return { base, portVersion, scheme, strictSemver };\n}\n\nfunction compareBase(a: ParsedVersion, b: ParsedVersion): number | null {\n  if (a.scheme !== b.scheme) {\n    return null;\n  }\n  if (a.scheme === 'date') {\n    // `parse` guarantees `dateHead` and `dateTail` are populated for the\n    // `date` scheme, so the non-null assertions are safe.\n    const aHead = a.dateHead!;\n    const bHead = b.dateHead!;\n    if (aHead !== bHead) {\n      return aHead < bHead ? -1 : 1;\n    }\n    // Same date head, compare disambiguation tail per the relaxed `version`\n    // scheme rule, so a version with the smaller set of sections takes\n    // precedence (i.e. sorts earlier).\n    const aTail = a.dateTail!;\n    const bTail = b.dateTail!;\n    const minLen = Math.min(aTail.length, bTail.length);\n    for (let i = 0; i < minLen; i += 1) {\n      if (aTail[i] !== bTail[i]) {\n        return aTail[i] < bTail[i] ? -1 : 1;\n      }\n    }\n    if (aTail.length !== bTail.length) {\n      return aTail.length < bTail.length ? -1 : 1;\n    }\n    return 0;\n  }\n  if (a.scheme === 'numeric') {\n    if (a.strictSemver && b.strictSemver) {\n      return semver.sortVersions(a.base, b.base);\n    }\n    return loose.sortVersions(a.base, b.base);\n  }\n  // Opaque strings order only against an identical base.\n  return a.base === b.base ? 0 : null;\n}\n\nfunction compare(a: ParsedVersion, b: ParsedVersion): number | null {\n  const baseResult = compareBase(a, b);\n  if (baseResult === null) {\n    return null;\n  }\n  if (baseResult !== 0) {\n    return baseResult;\n  }\n  return a.portVersion - b.portVersion;\n}\n\nfunction isValid(input: string | undefined | null): boolean {\n  return parse(input) !== null;\n}\n\n// vcpkg does not compare versions across schemes, so a candidate using a\n// different scheme is not an upgrade of the current one.\nfunction isCompatible(version: string, current?: string): boolean {\n  const v = parse(version);\n  const c = current ? parse(current) : null;\n  if (!v) {\n    return false;\n  }\n  return !c || v.scheme === c.scheme;\n}\n\nfunction isStable(version: string): boolean {\n  const parsed = parse(version);\n  if (!parsed) {\n    return false;\n  }\n  if (parsed.scheme === 'numeric') {\n    // A pre-release suffix (`-...`) marks the version as unstable.\n    // Pure build metadata (`+...`) is ignored, matching SemVer.\n    const withoutBuild = parsed.base.replace(numericBuildRegex, '');\n    return !numericPrereleaseRegex.test(withoutBuild);\n  }\n  // Date and opaque-string versions have no prerelease concept, treat as stable.\n  return true;\n}\n\n// Returns null when a component exceeds semver's 16-digit limit.\nfunction coerceNumeric(base: string, strictSemver: boolean): SemVer | null {\n  if (strictSemver) {\n    return coerce(base);\n  }\n  // Strip any pre-release or build suffix before coercion so loose forms like\n  // `1.2-alpha` map to `1.2.0` instead of failing.\n  const stripped = base\n    .replace(numericBuildRegex, '')\n    .replace(numericPrereleaseRegex, '');\n  return coerce(stripped);\n}\n\nfunction getMajor(version: string): number | null {\n  const parsed = parse(version);\n  if (parsed?.scheme !== 'numeric') {\n    return null;\n  }\n  return coerceNumeric(parsed.base, parsed.strictSemver)?.major ?? null;\n}\n\nfunction getMinor(version: string): number | null {\n  const parsed = parse(version);\n  if (parsed?.scheme !== 'numeric') {\n    return null;\n  }\n  return coerceNumeric(parsed.base, parsed.strictSemver)?.minor ?? null;\n}\n\nfunction getPatch(version: string): number | null {\n  const parsed = parse(version);\n  if (parsed?.scheme !== 'numeric') {\n    return null;\n  }\n  return coerceNumeric(parsed.base, parsed.strictSemver)?.patch ?? null;\n}\n\nfunction equals(version: string, other: string): boolean {\n  const a = parse(version);\n  const b = parse(other);\n  return !!a && !!b && compare(a, b) === 0;\n}\n\nfunction isGreaterThan(version: string, other: string): boolean {\n  const a = parse(version);\n  const b = parse(other);\n  if (!a || !b) {\n    return false;\n  }\n  const result = compare(a, b);\n  return result !== null && result > 0;\n}\n\nfunction sortVersions(version: string, other: string): number {\n  const a = parse(version);\n  const b = parse(other);\n  if (!a || !b) {\n    return 0;\n  }\n  // Lookup sorts only releases that `isGreaterThan` the current version,\n  // and those order against each other.\n  return compare(a, b) ?? 0;\n}\n\nfunction matches(version: string, range: string): boolean {\n  return equals(version, range);\n}\n\nfunction getSatisfyingVersion(\n  versions: string[],\n  range: string,\n): string | null {\n  return versions.find((version) => equals(version, range)) ?? null;\n}\n\nfunction getNewValue({ newVersion }: NewValueConfig): string {\n  return newVersion;\n}\n\nexport const api: VersioningApi = {\n  equals,\n  getMajor,\n  getMinor,\n  getPatch,\n  isCompatible,\n  isGreaterThan,\n  isSingleVersion: isValid,\n  isStable,\n  isValid,\n  isVersion: isValid,\n  matches,\n  getSatisfyingVersion,\n  minSatisfyingVersion: getSatisfyingVersion,\n  getNewValue,\n  sortVersions,\n};\n\nexport default api;\n"],"mappings":"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"}

package/dist/util/cache/package/impl/base.js

@@ -73,7 +73,8 @@ var PackageCacheBase = class {
 };
 function isExpiredLegacyEntry(entry) {
 	const { expiry } = entry;
-	return expiry !== void 0 && (!expiry.isValid || DateTime.local() >= expiry);
+	if (expiry === void 0) return false;
+	return !expiry.isValid || DateTime.local() >= expiry;
 }
 export { PackageCacheBase };
 

package/dist/util/cache/package/impl/base.js.map

@@ -1 +1 @@
-{"version":3,"file":"base.js","names":[],"sources":["../../../../../lib/util/cache/package/impl/base.ts"],"sourcesContent":["import { DateTime } from 'luxon';\nimport { logger } from '../../../../logger/index.ts';\nimport type { MaybePromise } from '../../../../types/index.ts';\nimport { decodeEntry, encodeEntry, isEnvelope } from '../codec.ts';\nimport type { LegacyEntry } from '../legacy.ts';\nimport { decodeLegacyEntry } from '../legacy.ts';\nimport type { PackageCacheNamespace } from '../types.ts';\n\nexport abstract class PackageCacheBase {\n  async get<T = unknown>(\n    namespace: PackageCacheNamespace,\n    key: string,\n  ): Promise<T | undefined> {\n    let raw: Buffer | undefined;\n    try {\n      raw = await this.readRaw(namespace, key);\n    } catch (err) {\n      logger.once.debug({ err }, 'Error while reading package cache value');\n      return undefined;\n    }\n\n    if (!raw) {\n      logger.trace({ namespace, key }, 'Cache miss');\n      return undefined;\n    }\n\n    try {\n      if (isEnvelope(raw)) {\n        const entry = await decodeEntry(raw);\n        logger.trace({ namespace, key }, 'Returning cached value');\n        return entry.value as T;\n      }\n\n      // TODO: Delete this legacy cache fallback once pre-envelope entries have\n      // expired.\n      const entry = await decodeLegacyEntry(raw);\n      if (isExpiredLegacyEntry(entry)) {\n        await this.removeInvalidEntry(namespace, key);\n        return undefined;\n      }\n\n      await this.upgradeLegacyEntry(namespace, key, entry);\n\n      logger.trace({ namespace, key }, 'Returning cached value');\n      return entry.value as T;\n    } catch (err) {\n      logger.once.debug({ err }, 'Error while reading package cache value');\n      await this.removeInvalidEntry(namespace, key);\n      return undefined;\n    }\n  }\n\n  async set(\n    namespace: PackageCacheNamespace,\n    key: string,\n    value: unknown,\n    hardTtlMinutes: number,\n  ): Promise<void> {\n    logger.trace({ namespace, key, hardTtlMinutes }, 'Saving cached value');\n\n    const ttlSeconds = Math.floor(hardTtlMinutes * 60);\n\n    try {\n      if (ttlSeconds <= 0) {\n        await this.rm(namespace, key);\n        return;\n      }\n\n      await this.writeRaw(\n        namespace,\n        key,\n        await encodeEntry(value, DateTime.local()),\n        ttlSeconds,\n      );\n    } catch (err) {\n      logger.once.warn({ err }, 'Error while setting package cache value');\n    }\n  }\n\n  abstract destroy(): Promise<void>;\n\n  protected abstract readRaw(\n    namespace: PackageCacheNamespace,\n    key: string,\n  ): MaybePromise<Buffer | undefined>;\n\n  protected abstract writeRaw(\n    namespace: PackageCacheNamespace,\n    key: string,\n    data: Buffer,\n    ttlSeconds: number,\n  ): MaybePromise<void>;\n\n  protected abstract rm(\n    namespace: PackageCacheNamespace,\n    key: string,\n  ): MaybePromise<void>;\n\n  // The file backend's cleanup can't read a legacy entry's in-payload expiry, so\n  // it overrides this to rewrite the entry as an envelope on read and avoid\n  // purging it. Best-effort: overrides must not throw or change the read result.\n  // TODO: Delete with the legacy decoder once pre-envelope entries have expired.\n  protected upgradeLegacyEntry(\n    _namespace: PackageCacheNamespace,\n    _key: string,\n    _entry: LegacyEntry,\n  ): MaybePromise<void> {\n    // Default: no upgrade.\n  }\n\n  private async removeInvalidEntry(\n    namespace: PackageCacheNamespace,\n    key: string,\n  ): Promise<void> {\n    try {\n      await this.rm(namespace, key);\n    } catch (err) {\n      logger.once.debug({ err }, 'Error while removing package cache value');\n    }\n  }\n}\n\n// TODO: Delete with the legacy JSON-wrapper decoder; envelopes use\n// backend-native TTL.\nfunction isExpiredLegacyEntry(entry: LegacyEntry): boolean {\n  const { expiry } = entry;\n  return (\n    expiry !== undefined && (!expiry.isValid || DateTime.local() >= expiry)\n  );\n}\n"],"mappings":";;;;;AAQA,IAAsB,mBAAtB,MAAuC;CACrC,MAAM,IACJ,WACA,KACwB;EACxB,IAAI;EACJ,IAAI;GACF,MAAM,MAAM,KAAK,QAAQ,WAAW,GAAG;EACzC,SAAS,KAAK;GACZ,OAAO,KAAK,MAAM,EAAE,IAAI,GAAG,yCAAyC;GACpE;EACF;EAEA,IAAI,CAAC,KAAK;GACR,OAAO,MAAM;IAAE;IAAW;GAAI,GAAG,YAAY;GAC7C;EACF;EAEA,IAAI;GACF,IAAI,WAAW,GAAG,GAAG;IACnB,MAAM,QAAQ,MAAM,YAAY,GAAG;IACnC,OAAO,MAAM;KAAE;KAAW;IAAI,GAAG,wBAAwB;IACzD,OAAO,MAAM;GACf;GAIA,MAAM,QAAQ,MAAM,kBAAkB,GAAG;GACzC,IAAI,qBAAqB,KAAK,GAAG;IAC/B,MAAM,KAAK,mBAAmB,WAAW,GAAG;IAC5C;GACF;GAEA,MAAM,KAAK,mBAAmB,WAAW,KAAK,KAAK;GAEnD,OAAO,MAAM;IAAE;IAAW;GAAI,GAAG,wBAAwB;GACzD,OAAO,MAAM;EACf,SAAS,KAAK;GACZ,OAAO,KAAK,MAAM,EAAE,IAAI,GAAG,yCAAyC;GACpE,MAAM,KAAK,mBAAmB,WAAW,GAAG;GAC5C;EACF;CACF;CAEA,MAAM,IACJ,WACA,KACA,OACA,gBACe;EACf,OAAO,MAAM;GAAE;GAAW;GAAK;EAAe,GAAG,qBAAqB;EAEtE,MAAM,aAAa,KAAK,MAAM,iBAAiB,EAAE;EAEjD,IAAI;GACF,IAAI,cAAc,GAAG;IACnB,MAAM,KAAK,GAAG,WAAW,GAAG;IAC5B;GACF;GAEA,MAAM,KAAK,SACT,WACA,KACA,MAAM,YAAY,OAAO,SAAS,MAAM,CAAC,GACzC,UACF;EACF,SAAS,KAAK;GACZ,OAAO,KAAK,KAAK,EAAE,IAAI,GAAG,yCAAyC;EACrE;CACF;CAyBA,mBACE,YACA,MACA,QACoB,CAEtB;CAEA,MAAc,mBACZ,WACA,KACe;EACf,IAAI;GACF,MAAM,KAAK,GAAG,WAAW,GAAG;EAC9B,SAAS,KAAK;GACZ,OAAO,KAAK,MAAM,EAAE,IAAI,GAAG,0CAA0C;EACvE;CACF;AACF;AAIA,SAAS,qBAAqB,OAA6B;CACzD,MAAM,EAAE,WAAW;CACnB,OACE,WAAW,KAAA,MAAc,CAAC,OAAO,WAAW,SAAS,MAAM,KAAK;AAEpE"}
+{"version":3,"file":"base.js","names":[],"sources":["../../../../../lib/util/cache/package/impl/base.ts"],"sourcesContent":["import { DateTime } from 'luxon';\nimport { logger } from '../../../../logger/index.ts';\nimport type { MaybePromise } from '../../../../types/index.ts';\nimport { decodeEntry, encodeEntry, isEnvelope } from '../codec.ts';\nimport type { LegacyEntry } from '../legacy.ts';\nimport { decodeLegacyEntry } from '../legacy.ts';\nimport type { PackageCacheNamespace } from '../types.ts';\n\nexport abstract class PackageCacheBase {\n  async get<T = unknown>(\n    namespace: PackageCacheNamespace,\n    key: string,\n  ): Promise<T | undefined> {\n    let raw: Buffer | undefined;\n    try {\n      raw = await this.readRaw(namespace, key);\n    } catch (err) {\n      logger.once.debug({ err }, 'Error while reading package cache value');\n      return undefined;\n    }\n\n    if (!raw) {\n      logger.trace({ namespace, key }, 'Cache miss');\n      return undefined;\n    }\n\n    try {\n      if (isEnvelope(raw)) {\n        const entry = await decodeEntry(raw);\n        logger.trace({ namespace, key }, 'Returning cached value');\n        return entry.value as T;\n      }\n\n      // TODO: Delete this legacy cache fallback once pre-envelope entries have\n      // expired.\n      const entry = await decodeLegacyEntry(raw);\n      if (isExpiredLegacyEntry(entry)) {\n        await this.removeInvalidEntry(namespace, key);\n        return undefined;\n      }\n\n      await this.upgradeLegacyEntry(namespace, key, entry);\n\n      logger.trace({ namespace, key }, 'Returning cached value');\n      return entry.value as T;\n    } catch (err) {\n      logger.once.debug({ err }, 'Error while reading package cache value');\n      await this.removeInvalidEntry(namespace, key);\n      return undefined;\n    }\n  }\n\n  async set(\n    namespace: PackageCacheNamespace,\n    key: string,\n    value: unknown,\n    hardTtlMinutes: number,\n  ): Promise<void> {\n    logger.trace({ namespace, key, hardTtlMinutes }, 'Saving cached value');\n\n    const ttlSeconds = Math.floor(hardTtlMinutes * 60);\n\n    try {\n      if (ttlSeconds <= 0) {\n        await this.rm(namespace, key);\n        return;\n      }\n\n      await this.writeRaw(\n        namespace,\n        key,\n        await encodeEntry(value, DateTime.local()),\n        ttlSeconds,\n      );\n    } catch (err) {\n      logger.once.warn({ err }, 'Error while setting package cache value');\n    }\n  }\n\n  abstract destroy(): Promise<void>;\n\n  protected abstract readRaw(\n    namespace: PackageCacheNamespace,\n    key: string,\n  ): MaybePromise<Buffer | undefined>;\n\n  protected abstract writeRaw(\n    namespace: PackageCacheNamespace,\n    key: string,\n    data: Buffer,\n    ttlSeconds: number,\n  ): MaybePromise<void>;\n\n  protected abstract rm(\n    namespace: PackageCacheNamespace,\n    key: string,\n  ): MaybePromise<void>;\n\n  // The file backend's cleanup can't read a legacy entry's in-payload expiry, so\n  // it overrides this to rewrite the entry as an envelope on read and avoid\n  // purging it. Best-effort: overrides must not throw or change the read result.\n  // TODO: Delete with the legacy decoder once pre-envelope entries have expired.\n  protected upgradeLegacyEntry(\n    _namespace: PackageCacheNamespace,\n    _key: string,\n    _entry: LegacyEntry,\n  ): MaybePromise<void> {\n    // Default: no upgrade.\n  }\n\n  private async removeInvalidEntry(\n    namespace: PackageCacheNamespace,\n    key: string,\n  ): Promise<void> {\n    try {\n      await this.rm(namespace, key);\n    } catch (err) {\n      logger.once.debug({ err }, 'Error while removing package cache value');\n    }\n  }\n}\n\n// TODO: Delete with the legacy JSON-wrapper decoder; envelopes use\n// backend-native TTL.\nfunction isExpiredLegacyEntry(entry: LegacyEntry): boolean {\n  const { expiry } = entry;\n  if (expiry === undefined) {\n    return false;\n  }\n  return !expiry.isValid || DateTime.local() >= expiry;\n}\n"],"mappings":";;;;;AAQA,IAAsB,mBAAtB,MAAuC;CACrC,MAAM,IACJ,WACA,KACwB;EACxB,IAAI;EACJ,IAAI;GACF,MAAM,MAAM,KAAK,QAAQ,WAAW,GAAG;EACzC,SAAS,KAAK;GACZ,OAAO,KAAK,MAAM,EAAE,IAAI,GAAG,yCAAyC;GACpE;EACF;EAEA,IAAI,CAAC,KAAK;GACR,OAAO,MAAM;IAAE;IAAW;GAAI,GAAG,YAAY;GAC7C;EACF;EAEA,IAAI;GACF,IAAI,WAAW,GAAG,GAAG;IACnB,MAAM,QAAQ,MAAM,YAAY,GAAG;IACnC,OAAO,MAAM;KAAE;KAAW;IAAI,GAAG,wBAAwB;IACzD,OAAO,MAAM;GACf;GAIA,MAAM,QAAQ,MAAM,kBAAkB,GAAG;GACzC,IAAI,qBAAqB,KAAK,GAAG;IAC/B,MAAM,KAAK,mBAAmB,WAAW,GAAG;IAC5C;GACF;GAEA,MAAM,KAAK,mBAAmB,WAAW,KAAK,KAAK;GAEnD,OAAO,MAAM;IAAE;IAAW;GAAI,GAAG,wBAAwB;GACzD,OAAO,MAAM;EACf,SAAS,KAAK;GACZ,OAAO,KAAK,MAAM,EAAE,IAAI,GAAG,yCAAyC;GACpE,MAAM,KAAK,mBAAmB,WAAW,GAAG;GAC5C;EACF;CACF;CAEA,MAAM,IACJ,WACA,KACA,OACA,gBACe;EACf,OAAO,MAAM;GAAE;GAAW;GAAK;EAAe,GAAG,qBAAqB;EAEtE,MAAM,aAAa,KAAK,MAAM,iBAAiB,EAAE;EAEjD,IAAI;GACF,IAAI,cAAc,GAAG;IACnB,MAAM,KAAK,GAAG,WAAW,GAAG;IAC5B;GACF;GAEA,MAAM,KAAK,SACT,WACA,KACA,MAAM,YAAY,OAAO,SAAS,MAAM,CAAC,GACzC,UACF;EACF,SAAS,KAAK;GACZ,OAAO,KAAK,KAAK,EAAE,IAAI,GAAG,yCAAyC;EACrE;CACF;CAyBA,mBACE,YACA,MACA,QACoB,CAEtB;CAEA,MAAc,mBACZ,WACA,KACe;EACf,IAAI;GACF,MAAM,KAAK,GAAG,WAAW,GAAG;EAC9B,SAAS,KAAK;GACZ,OAAO,KAAK,MAAM,EAAE,IAAI,GAAG,0CAA0C;EACvE;CACF;AACF;AAIA,SAAS,qBAAqB,OAA6B;CACzD,MAAM,EAAE,WAAW;CACnB,IAAI,WAAW,KAAA,GACb,OAAO;CAET,OAAO,CAAC,OAAO,WAAW,SAAS,MAAM,KAAK;AAChD"}

package/dist/util/cache/package/with-cache.js

@@ -22,7 +22,8 @@ async function withCache(options, fn) {
 	};
 	const cachePrivatePackages = GlobalConfig.get("cachePrivatePackages");
 	function canUseCache() {
-		return ctx.cacheable && (ctx.public || cachePrivatePackages);
+		if (!ctx.cacheable) return false;
+		return ctx.public || cachePrivatePackages;
 	}
 	if (!canUseCache()) return await fn(ctx);
 	// istanbul ignore if -- TODO: add test #40625

package/dist/util/cache/package/with-cache.js.map

@@ -1 +1 @@
-{"version":3,"file":"with-cache.js","names":["packageCache.get","packageCache.setWithRawTtl"],"sources":["../../../../lib/util/cache/package/with-cache.ts"],"sourcesContent":["import { isUndefined } from '@sindresorhus/is';\nimport { DateTime } from 'luxon';\nimport { GlobalConfig } from '../../../config/global.ts';\nimport { logger } from '../../../logger/index.ts';\nimport { acquireLock } from '../../mutex.ts';\nimport * as packageCache from './index.ts';\nimport { buildCacheKey } from './key.ts';\nimport { resolveTtlValues } from './ttl.ts';\nimport type { CachedRecord, PackageCacheNamespace } from './types.ts';\n\nexport interface CacheContext {\n  /**\n   * Whether the result may be shared through the package cache.\n   * `cachePrivatePackages` allows storage when this is `false`.\n   * @default true\n   */\n  public: boolean;\n\n  /**\n   * Whether the result should be stored in the cache.\n   * `false` prevents storage even when `cachePrivatePackages` is enabled.\n   * @default true\n   */\n  cacheable: boolean;\n}\n\nexport interface CachedOptions {\n  /**\n   * The cache namespace.\n   */\n  namespace: PackageCacheNamespace;\n\n  /**\n   * The cache key.\n   */\n  key: string;\n\n  /**\n   * The TTL (or expiry) of the key in minutes.\n   * @default 30\n   */\n  ttlMinutes?: number;\n\n  /**\n   * Whether the result may be shared through the package cache.\n   * @default true\n   */\n  public?: boolean;\n\n  /**\n   * Enable extended hard TTL for graceful degradation.\n   * When true and upstream errors occur, stale cached data is returned.\n   * @default false\n   */\n  fallback?: boolean;\n}\n\n/**\n * Caches the result of a function.\n *\n * @param options - Cache options\n * @param fn - The function to cache\n * @returns The cached or fresh result\n */\nexport async function withCache<T>(\n  options: CachedOptions,\n  fn: (ctx: CacheContext) => T | PromiseLike<T>,\n): Promise<Awaited<T>> {\n  const { namespace, key, ttlMinutes = 30, fallback = false } = options;\n\n  const ctx: CacheContext = {\n    public: options.public ?? true,\n    cacheable: true,\n  };\n  const cachePrivatePackages = GlobalConfig.get('cachePrivatePackages');\n\n  function canUseCache(): boolean {\n    return ctx.cacheable && (ctx.public || cachePrivatePackages);\n  }\n\n  if (!canUseCache()) {\n    return await fn(ctx);\n  }\n\n  // istanbul ignore if -- TODO: add test #40625\n  if (!namespace || !key) {\n    return await fn(ctx);\n  }\n\n  const cacheKey = buildCacheKey('cache-decorator', key);\n\n  // prevent concurrent processing and cache writes\n  const releaseLock = await acquireLock(cacheKey, namespace);\n\n  try {\n    const cachedRecord = await packageCache.get<CachedRecord>(\n      namespace,\n      cacheKey,\n    );\n\n    const { softTtlMinutes, hardTtlMinutes: resolvedHardTtl } =\n      resolveTtlValues(namespace, ttlMinutes);\n\n    // The separation between \"soft\" and \"hard\" TTL allows us to treat\n    // data as obsolete according to the \"soft\" TTL while physically storing it\n    // according to the \"hard\" TTL.\n    //\n    // This helps us return obsolete data in case of upstream server errors,\n    // which is more useful than throwing exceptions ourselves.\n    //\n    // The `fallback` option controls whether this extended TTL behavior is used.\n    // When false, the \"soft\" just equals the \"hard\" ttl.\n    const hardTtlMinutes = fallback ? resolvedHardTtl : softTtlMinutes;\n\n    let fallbackValue: unknown;\n    if (cachedRecord) {\n      const now = DateTime.local();\n      const cachedAt = DateTime.fromISO(cachedRecord.cachedAt);\n\n      const softDeadline = cachedAt.plus({ minutes: softTtlMinutes });\n      if (now < softDeadline) {\n        return cachedRecord.value as Awaited<T>;\n      }\n\n      const hardDeadline = cachedAt.plus({ minutes: hardTtlMinutes });\n      if (now < hardDeadline) {\n        fallbackValue = cachedRecord.value;\n      }\n    }\n\n    let newValue: Awaited<T>;\n    try {\n      newValue = await fn(ctx);\n    } catch (err) {\n      if (!isUndefined(fallbackValue)) {\n        logger.debug(\n          { err },\n          'Package cache: callback error, returning stale data',\n        );\n        return fallbackValue as Awaited<T>;\n      }\n      throw err;\n    }\n\n    if (!isUndefined(newValue) && canUseCache()) {\n      const newRecord: CachedRecord = {\n        cachedAt: DateTime.local().toISO(),\n        value: newValue,\n      };\n      await packageCache.setWithRawTtl(\n        namespace,\n        cacheKey,\n        newRecord,\n        hardTtlMinutes,\n      );\n    }\n\n    return newValue;\n  } finally {\n    releaseLock();\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;AAgEA,eAAsB,UACpB,SACA,IACqB;CACrB,MAAM,EAAE,WAAW,KAAK,aAAa,IAAI,WAAW,UAAU;CAE9D,MAAM,MAAoB;EACxB,QAAQ,QAAQ,UAAU;EAC1B,WAAW;CACb;CACA,MAAM,uBAAuB,aAAa,IAAI,sBAAsB;CAEpE,SAAS,cAAuB;EAC9B,OAAO,IAAI,cAAc,IAAI,UAAU;CACzC;CAEA,IAAI,CAAC,YAAY,GACf,OAAO,MAAM,GAAG,GAAG;;CAIrB,IAAI,CAAC,aAAa,CAAC,KACjB,OAAO,MAAM,GAAG,GAAG;CAGrB,MAAM,WAAW,cAAc,mBAAmB,GAAG;CAGrD,MAAM,cAAc,MAAM,YAAY,UAAU,SAAS;CAEzD,IAAI;EACF,MAAM,eAAe,MAAMA,IACzB,WACA,QACF;EAEA,MAAM,EAAE,gBAAgB,gBAAgB,oBACtC,iBAAiB,WAAW,UAAU;EAWxC,MAAM,iBAAiB,WAAW,kBAAkB;EAEpD,IAAI;EACJ,IAAI,cAAc;GAChB,MAAM,MAAM,SAAS,MAAM;GAC3B,MAAM,WAAW,SAAS,QAAQ,aAAa,QAAQ;GAGvD,IAAI,MADiB,SAAS,KAAK,EAAE,SAAS,eAAe,CACxC,GACnB,OAAO,aAAa;GAItB,IAAI,MADiB,SAAS,KAAK,EAAE,SAAS,eAAe,CACxC,GACnB,gBAAgB,aAAa;EAEjC;EAEA,IAAI;EACJ,IAAI;GACF,WAAW,MAAM,GAAG,GAAG;EACzB,SAAS,KAAK;GACZ,IAAI,CAAC,YAAY,aAAa,GAAG;IAC/B,OAAO,MACL,EAAE,IAAI,GACN,qDACF;IACA,OAAO;GACT;GACA,MAAM;EACR;EAEA,IAAI,CAAC,YAAY,QAAQ,KAAK,YAAY,GAAG;GAC3C,MAAM,YAA0B;IAC9B,UAAU,SAAS,MAAM,CAAC,CAAC,MAAM;IACjC,OAAO;GACT;GACA,MAAMC,cACJ,WACA,UACA,WACA,cACF;EACF;EAEA,OAAO;CACT,UAAU;EACR,YAAY;CACd;AACF"}
+{"version":3,"file":"with-cache.js","names":["packageCache.get","packageCache.setWithRawTtl"],"sources":["../../../../lib/util/cache/package/with-cache.ts"],"sourcesContent":["import { isUndefined } from '@sindresorhus/is';\nimport { DateTime } from 'luxon';\nimport { GlobalConfig } from '../../../config/global.ts';\nimport { logger } from '../../../logger/index.ts';\nimport { acquireLock } from '../../mutex.ts';\nimport * as packageCache from './index.ts';\nimport { buildCacheKey } from './key.ts';\nimport { resolveTtlValues } from './ttl.ts';\nimport type { CachedRecord, PackageCacheNamespace } from './types.ts';\n\nexport interface CacheContext {\n  /**\n   * Whether the result may be shared through the package cache.\n   * `cachePrivatePackages` allows storage when this is `false`.\n   * @default true\n   */\n  public: boolean;\n\n  /**\n   * Whether the result should be stored in the cache.\n   * `false` prevents storage even when `cachePrivatePackages` is enabled.\n   * @default true\n   */\n  cacheable: boolean;\n}\n\nexport interface CachedOptions {\n  /**\n   * The cache namespace.\n   */\n  namespace: PackageCacheNamespace;\n\n  /**\n   * The cache key.\n   */\n  key: string;\n\n  /**\n   * The TTL (or expiry) of the key in minutes.\n   * @default 30\n   */\n  ttlMinutes?: number;\n\n  /**\n   * Whether the result may be shared through the package cache.\n   * @default true\n   */\n  public?: boolean;\n\n  /**\n   * Enable extended hard TTL for graceful degradation.\n   * When true and upstream errors occur, stale cached data is returned.\n   * @default false\n   */\n  fallback?: boolean;\n}\n\n/**\n * Caches the result of a function.\n *\n * @param options - Cache options\n * @param fn - The function to cache\n * @returns The cached or fresh result\n */\nexport async function withCache<T>(\n  options: CachedOptions,\n  fn: (ctx: CacheContext) => T | PromiseLike<T>,\n): Promise<Awaited<T>> {\n  const { namespace, key, ttlMinutes = 30, fallback = false } = options;\n\n  const ctx: CacheContext = {\n    public: options.public ?? true,\n    cacheable: true,\n  };\n  const cachePrivatePackages = GlobalConfig.get('cachePrivatePackages');\n\n  function canUseCache(): boolean {\n    if (!ctx.cacheable) {\n      return false;\n    }\n    return ctx.public || cachePrivatePackages;\n  }\n\n  if (!canUseCache()) {\n    return await fn(ctx);\n  }\n\n  // istanbul ignore if -- TODO: add test #40625\n  if (!namespace || !key) {\n    return await fn(ctx);\n  }\n\n  const cacheKey = buildCacheKey('cache-decorator', key);\n\n  // prevent concurrent processing and cache writes\n  const releaseLock = await acquireLock(cacheKey, namespace);\n\n  try {\n    const cachedRecord = await packageCache.get<CachedRecord>(\n      namespace,\n      cacheKey,\n    );\n\n    const { softTtlMinutes, hardTtlMinutes: resolvedHardTtl } =\n      resolveTtlValues(namespace, ttlMinutes);\n\n    // The separation between \"soft\" and \"hard\" TTL allows us to treat\n    // data as obsolete according to the \"soft\" TTL while physically storing it\n    // according to the \"hard\" TTL.\n    //\n    // This helps us return obsolete data in case of upstream server errors,\n    // which is more useful than throwing exceptions ourselves.\n    //\n    // The `fallback` option controls whether this extended TTL behavior is used.\n    // When false, the \"soft\" just equals the \"hard\" ttl.\n    const hardTtlMinutes = fallback ? resolvedHardTtl : softTtlMinutes;\n\n    let fallbackValue: unknown;\n    if (cachedRecord) {\n      const now = DateTime.local();\n      const cachedAt = DateTime.fromISO(cachedRecord.cachedAt);\n\n      const softDeadline = cachedAt.plus({ minutes: softTtlMinutes });\n      if (now < softDeadline) {\n        return cachedRecord.value as Awaited<T>;\n      }\n\n      const hardDeadline = cachedAt.plus({ minutes: hardTtlMinutes });\n      if (now < hardDeadline) {\n        fallbackValue = cachedRecord.value;\n      }\n    }\n\n    let newValue: Awaited<T>;\n    try {\n      newValue = await fn(ctx);\n    } catch (err) {\n      if (!isUndefined(fallbackValue)) {\n        logger.debug(\n          { err },\n          'Package cache: callback error, returning stale data',\n        );\n        return fallbackValue as Awaited<T>;\n      }\n      throw err;\n    }\n\n    if (!isUndefined(newValue) && canUseCache()) {\n      const newRecord: CachedRecord = {\n        cachedAt: DateTime.local().toISO(),\n        value: newValue,\n      };\n      await packageCache.setWithRawTtl(\n        namespace,\n        cacheKey,\n        newRecord,\n        hardTtlMinutes,\n      );\n    }\n\n    return newValue;\n  } finally {\n    releaseLock();\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;AAgEA,eAAsB,UACpB,SACA,IACqB;CACrB,MAAM,EAAE,WAAW,KAAK,aAAa,IAAI,WAAW,UAAU;CAE9D,MAAM,MAAoB;EACxB,QAAQ,QAAQ,UAAU;EAC1B,WAAW;CACb;CACA,MAAM,uBAAuB,aAAa,IAAI,sBAAsB;CAEpE,SAAS,cAAuB;EAC9B,IAAI,CAAC,IAAI,WACP,OAAO;EAET,OAAO,IAAI,UAAU;CACvB;CAEA,IAAI,CAAC,YAAY,GACf,OAAO,MAAM,GAAG,GAAG;;CAIrB,IAAI,CAAC,aAAa,CAAC,KACjB,OAAO,MAAM,GAAG,GAAG;CAGrB,MAAM,WAAW,cAAc,mBAAmB,GAAG;CAGrD,MAAM,cAAc,MAAM,YAAY,UAAU,SAAS;CAEzD,IAAI;EACF,MAAM,eAAe,MAAMA,IACzB,WACA,QACF;EAEA,MAAM,EAAE,gBAAgB,gBAAgB,oBACtC,iBAAiB,WAAW,UAAU;EAWxC,MAAM,iBAAiB,WAAW,kBAAkB;EAEpD,IAAI;EACJ,IAAI,cAAc;GAChB,MAAM,MAAM,SAAS,MAAM;GAC3B,MAAM,WAAW,SAAS,QAAQ,aAAa,QAAQ;GAGvD,IAAI,MADiB,SAAS,KAAK,EAAE,SAAS,eAAe,CACxC,GACnB,OAAO,aAAa;GAItB,IAAI,MADiB,SAAS,KAAK,EAAE,SAAS,eAAe,CACxC,GACnB,gBAAgB,aAAa;EAEjC;EAEA,IAAI;EACJ,IAAI;GACF,WAAW,MAAM,GAAG,GAAG;EACzB,SAAS,KAAK;GACZ,IAAI,CAAC,YAAY,aAAa,GAAG;IAC/B,OAAO,MACL,EAAE,IAAI,GACN,qDACF;IACA,OAAO;GACT;GACA,MAAM;EACR;EAEA,IAAI,CAAC,YAAY,QAAQ,KAAK,YAAY,GAAG;GAC3C,MAAM,YAA0B;IAC9B,UAAU,SAAS,MAAM,CAAC,CAAC,MAAM;IACjC,OAAO;GACT;GACA,MAAMC,cACJ,WACA,UACA,WACA,cACF;EACF;EAEA,OAAO;CACT,UAAU;EACR,YAAY;CACd;AACF"}

package/dist/util/check-token.js

@@ -21,10 +21,13 @@ function checkGithubToken(packageFiles = {}) {
 	}
 	const githubDeps = [];
 	const deps = Object.values(packageFiles).flat().map((file) => file.deps).flat();
-	for (const dep of deps) if (!dep.skipReason && (dep.datasource === GithubTagsDatasource.id || dep.datasource === GithubReleasesDatasource.id || dep.datasource === GithubReleaseAttachmentsDatasource.id)) {
-		dep.skipReason = "github-token-required";
-		// v8 ignore else -- TODO: add test #40625
-		if (dep.depName) githubDeps.push(dep.depName);
+	for (const dep of deps) {
+		const isGithubDatasource = dep.datasource === GithubTagsDatasource.id || dep.datasource === GithubReleasesDatasource.id || dep.datasource === GithubReleaseAttachmentsDatasource.id;
+		if (!dep.skipReason && isGithubDatasource) {
+			dep.skipReason = "github-token-required";
+			// v8 ignore else -- TODO: add test #40625
+			if (dep.depName) githubDeps.push(dep.depName);
+		}
 	}
 	if (githubDeps.length > 0) {
 		// v8 ignore else -- TODO: add test #40625

package/dist/util/check-token.js.map

@@ -1 +1 @@
-{"version":3,"file":"check-token.js","names":["hostRules.find","memCache.get"],"sources":["../../lib/util/check-token.ts"],"sourcesContent":["import { GlobalConfig } from '../config/global.ts';\nimport { logger } from '../logger/index.ts';\nimport { GithubReleaseAttachmentsDatasource } from '../modules/datasource/github-release-attachments/index.ts';\nimport { GithubReleasesDatasource } from '../modules/datasource/github-releases/index.ts';\nimport { GithubTagsDatasource } from '../modules/datasource/github-tags/index.ts';\nimport type { PackageFileContent } from '../modules/manager/types.ts';\nimport type { CombinedHostRule } from '../types/index.ts';\nimport * as memCache from '../util/cache/memory/index.ts';\nimport * as hostRules from './host-rules.ts';\n\nexport function checkGithubToken(\n  packageFiles: Record<string, PackageFileContent[]> = {},\n): void {\n  const { token } = hostRules.find({\n    hostType: 'github',\n    url: 'https://api.github.com',\n  });\n\n  if (token) {\n    logger.trace('GitHub token is found');\n    return;\n  }\n\n  if (!GlobalConfig.get('githubTokenWarn')) {\n    logger.trace('GitHub token warning is disabled');\n    return;\n  }\n\n  const githubDeps: string[] = [];\n  const deps = Object.values(packageFiles)\n    .flat()\n    .map((file) => file.deps)\n    .flat();\n  for (const dep of deps) {\n    if (\n      !dep.skipReason &&\n      (dep.datasource === GithubTagsDatasource.id ||\n        dep.datasource === GithubReleasesDatasource.id ||\n        dep.datasource === GithubReleaseAttachmentsDatasource.id)\n    ) {\n      dep.skipReason = 'github-token-required';\n      // v8 ignore else -- TODO: add test #40625\n      if (dep.depName) {\n        githubDeps.push(dep.depName);\n      }\n    }\n  }\n\n  if (githubDeps.length > 0) {\n    const warningLogged = memCache.get<boolean | undefined>(\n      'github-token-required-warning-logged',\n    );\n    // v8 ignore else -- TODO: add test #40625\n    if (!warningLogged) {\n      const withoutDuplicates = [...new Set(githubDeps)];\n      logger.warn(\n        { githubDeps: withoutDuplicates },\n        `GitHub token is required for some dependencies`,\n      );\n      memCache.set('github-token-required-warning-logged', true);\n    }\n  }\n}\n\nexport function isGithubPersonalAccessToken(token: string): boolean {\n  return token.startsWith('ghp_');\n}\n\nexport function isGithubServerToServerToken(token: string): boolean {\n  return token.startsWith('ghs_');\n}\n\nexport function isGithubFineGrainedPersonalAccessToken(token: string): boolean {\n  return token.startsWith('github_pat_');\n}\n\nexport function findGithubToken(\n  searchResult: CombinedHostRule,\n): string | undefined {\n  return searchResult?.token?.replace('x-access-token:', '');\n}\n\nexport function takePersonalAccessTokenIfPossible(\n  githubToken: string | undefined,\n  gitTagsGithubToken: string | undefined,\n): string | undefined {\n  if (gitTagsGithubToken && isGithubPersonalAccessToken(gitTagsGithubToken)) {\n    logger.debug('Using GitHub Personal Access Token (git-tags)');\n    return gitTagsGithubToken;\n  }\n\n  if (githubToken && isGithubPersonalAccessToken(githubToken)) {\n    logger.debug('Using GitHub Personal Access Token');\n    return githubToken;\n  }\n\n  if (\n    gitTagsGithubToken &&\n    isGithubFineGrainedPersonalAccessToken(gitTagsGithubToken)\n  ) {\n    logger.debug('Using GitHub Fine-grained Personal Access Token (git-tags)');\n    return gitTagsGithubToken;\n  }\n\n  if (githubToken && isGithubFineGrainedPersonalAccessToken(githubToken)) {\n    logger.debug('Using GitHub Fine-grained Personal Access Token');\n    return githubToken;\n  }\n\n  if (gitTagsGithubToken) {\n    if (isGithubServerToServerToken(gitTagsGithubToken)) {\n      logger.debug('Using GitHub Server-to-Server token (git-tags)');\n    } else {\n      logger.debug('Using unknown GitHub token type (git-tags)');\n    }\n    return gitTagsGithubToken;\n  }\n\n  if (githubToken) {\n    if (isGithubServerToServerToken(githubToken)) {\n      logger.debug('Using GitHub Server-to-Server token');\n    } else {\n      logger.debug('Using unknown GitHub token type');\n    }\n  }\n\n  return githubToken;\n}\n"],"mappings":";;;;;;;;AAUA,SAAgB,iBACd,eAAqD,CAAC,GAChD;CACN,MAAM,EAAE,UAAUA,KAAe;EAC/B,UAAU;EACV,KAAK;CACP,CAAC;CAED,IAAI,OAAO;EACT,OAAO,MAAM,uBAAuB;EACpC;CACF;CAEA,IAAI,CAAC,aAAa,IAAI,iBAAiB,GAAG;EACxC,OAAO,MAAM,kCAAkC;EAC/C;CACF;CAEA,MAAM,aAAuB,CAAC;CAC9B,MAAM,OAAO,OAAO,OAAO,YAAY,CAAC,CACrC,KAAK,CAAC,CACN,KAAK,SAAS,KAAK,IAAI,CAAC,CACxB,KAAK;CACR,KAAK,MAAM,OAAO,MAChB,IACE,CAAC,IAAI,eACJ,IAAI,eAAe,qBAAqB,MACvC,IAAI,eAAe,yBAAyB,MAC5C,IAAI,eAAe,mCAAmC,KACxD;EACA,IAAI,aAAa;;EAEjB,IAAI,IAAI,SACN,WAAW,KAAK,IAAI,OAAO;CAE/B;CAGF,IAAI,WAAW,SAAS,GAKlB;;MAAA,CAJkBC,IACpB,sCAGe,GAAG;GAClB,MAAM,oBAAoB,CAAC,GAAG,IAAI,IAAI,UAAU,CAAC;GACjD,OAAO,KACL,EAAE,YAAY,kBAAkB,GAChC,gDACF;GACA,IAAa,wCAAwC,IAAI;EAC3D;;AAEJ;AAEA,SAAgB,4BAA4B,OAAwB;CAClE,OAAO,MAAM,WAAW,MAAM;AAChC;AAEA,SAAgB,4BAA4B,OAAwB;CAClE,OAAO,MAAM,WAAW,MAAM;AAChC;AAEA,SAAgB,uCAAuC,OAAwB;CAC7E,OAAO,MAAM,WAAW,aAAa;AACvC;AAEA,SAAgB,gBACd,cACoB;CACpB,OAAO,cAAc,OAAO,QAAQ,mBAAmB,EAAE;AAC3D;AAEA,SAAgB,kCACd,aACA,oBACoB;CACpB,IAAI,sBAAsB,4BAA4B,kBAAkB,GAAG;EACzE,OAAO,MAAM,+CAA+C;EAC5D,OAAO;CACT;CAEA,IAAI,eAAe,4BAA4B,WAAW,GAAG;EAC3D,OAAO,MAAM,oCAAoC;EACjD,OAAO;CACT;CAEA,IACE,sBACA,uCAAuC,kBAAkB,GACzD;EACA,OAAO,MAAM,4DAA4D;EACzE,OAAO;CACT;CAEA,IAAI,eAAe,uCAAuC,WAAW,GAAG;EACtE,OAAO,MAAM,iDAAiD;EAC9D,OAAO;CACT;CAEA,IAAI,oBAAoB;EACtB,IAAI,4BAA4B,kBAAkB,GAChD,OAAO,MAAM,gDAAgD;OAE7D,OAAO,MAAM,4CAA4C;EAE3D,OAAO;CACT;CAEA,IAAI,aAAa;EACf,IAAI,4BAA4B,WAAW,GACzC,OAAO,MAAM,qCAAqC;OAElD,OAAO,MAAM,iCAAiC;CAElD;CAEA,OAAO;AACT"}
+{"version":3,"file":"check-token.js","names":["hostRules.find","memCache.get"],"sources":["../../lib/util/check-token.ts"],"sourcesContent":["import { GlobalConfig } from '../config/global.ts';\nimport { logger } from '../logger/index.ts';\nimport { GithubReleaseAttachmentsDatasource } from '../modules/datasource/github-release-attachments/index.ts';\nimport { GithubReleasesDatasource } from '../modules/datasource/github-releases/index.ts';\nimport { GithubTagsDatasource } from '../modules/datasource/github-tags/index.ts';\nimport type { PackageFileContent } from '../modules/manager/types.ts';\nimport type { CombinedHostRule } from '../types/index.ts';\nimport * as memCache from '../util/cache/memory/index.ts';\nimport * as hostRules from './host-rules.ts';\n\nexport function checkGithubToken(\n  packageFiles: Record<string, PackageFileContent[]> = {},\n): void {\n  const { token } = hostRules.find({\n    hostType: 'github',\n    url: 'https://api.github.com',\n  });\n\n  if (token) {\n    logger.trace('GitHub token is found');\n    return;\n  }\n\n  if (!GlobalConfig.get('githubTokenWarn')) {\n    logger.trace('GitHub token warning is disabled');\n    return;\n  }\n\n  const githubDeps: string[] = [];\n  const deps = Object.values(packageFiles)\n    .flat()\n    .map((file) => file.deps)\n    .flat();\n  for (const dep of deps) {\n    const isGithubDatasource =\n      dep.datasource === GithubTagsDatasource.id ||\n      dep.datasource === GithubReleasesDatasource.id ||\n      dep.datasource === GithubReleaseAttachmentsDatasource.id;\n    if (!dep.skipReason && isGithubDatasource) {\n      dep.skipReason = 'github-token-required';\n      // v8 ignore else -- TODO: add test #40625\n      if (dep.depName) {\n        githubDeps.push(dep.depName);\n      }\n    }\n  }\n\n  if (githubDeps.length > 0) {\n    const warningLogged = memCache.get<boolean | undefined>(\n      'github-token-required-warning-logged',\n    );\n    // v8 ignore else -- TODO: add test #40625\n    if (!warningLogged) {\n      const withoutDuplicates = [...new Set(githubDeps)];\n      logger.warn(\n        { githubDeps: withoutDuplicates },\n        `GitHub token is required for some dependencies`,\n      );\n      memCache.set('github-token-required-warning-logged', true);\n    }\n  }\n}\n\nexport function isGithubPersonalAccessToken(token: string): boolean {\n  return token.startsWith('ghp_');\n}\n\nexport function isGithubServerToServerToken(token: string): boolean {\n  return token.startsWith('ghs_');\n}\n\nexport function isGithubFineGrainedPersonalAccessToken(token: string): boolean {\n  return token.startsWith('github_pat_');\n}\n\nexport function findGithubToken(\n  searchResult: CombinedHostRule,\n): string | undefined {\n  return searchResult?.token?.replace('x-access-token:', '');\n}\n\nexport function takePersonalAccessTokenIfPossible(\n  githubToken: string | undefined,\n  gitTagsGithubToken: string | undefined,\n): string | undefined {\n  if (gitTagsGithubToken && isGithubPersonalAccessToken(gitTagsGithubToken)) {\n    logger.debug('Using GitHub Personal Access Token (git-tags)');\n    return gitTagsGithubToken;\n  }\n\n  if (githubToken && isGithubPersonalAccessToken(githubToken)) {\n    logger.debug('Using GitHub Personal Access Token');\n    return githubToken;\n  }\n\n  if (\n    gitTagsGithubToken &&\n    isGithubFineGrainedPersonalAccessToken(gitTagsGithubToken)\n  ) {\n    logger.debug('Using GitHub Fine-grained Personal Access Token (git-tags)');\n    return gitTagsGithubToken;\n  }\n\n  if (githubToken && isGithubFineGrainedPersonalAccessToken(githubToken)) {\n    logger.debug('Using GitHub Fine-grained Personal Access Token');\n    return githubToken;\n  }\n\n  if (gitTagsGithubToken) {\n    if (isGithubServerToServerToken(gitTagsGithubToken)) {\n      logger.debug('Using GitHub Server-to-Server token (git-tags)');\n    } else {\n      logger.debug('Using unknown GitHub token type (git-tags)');\n    }\n    return gitTagsGithubToken;\n  }\n\n  if (githubToken) {\n    if (isGithubServerToServerToken(githubToken)) {\n      logger.debug('Using GitHub Server-to-Server token');\n    } else {\n      logger.debug('Using unknown GitHub token type');\n    }\n  }\n\n  return githubToken;\n}\n"],"mappings":";;;;;;;;AAUA,SAAgB,iBACd,eAAqD,CAAC,GAChD;CACN,MAAM,EAAE,UAAUA,KAAe;EAC/B,UAAU;EACV,KAAK;CACP,CAAC;CAED,IAAI,OAAO;EACT,OAAO,MAAM,uBAAuB;EACpC;CACF;CAEA,IAAI,CAAC,aAAa,IAAI,iBAAiB,GAAG;EACxC,OAAO,MAAM,kCAAkC;EAC/C;CACF;CAEA,MAAM,aAAuB,CAAC;CAC9B,MAAM,OAAO,OAAO,OAAO,YAAY,CAAC,CACrC,KAAK,CAAC,CACN,KAAK,SAAS,KAAK,IAAI,CAAC,CACxB,KAAK;CACR,KAAK,MAAM,OAAO,MAAM;EACtB,MAAM,qBACJ,IAAI,eAAe,qBAAqB,MACxC,IAAI,eAAe,yBAAyB,MAC5C,IAAI,eAAe,mCAAmC;EACxD,IAAI,CAAC,IAAI,cAAc,oBAAoB;GACzC,IAAI,aAAa;;GAEjB,IAAI,IAAI,SACN,WAAW,KAAK,IAAI,OAAO;EAE/B;CACF;CAEA,IAAI,WAAW,SAAS,GAKlB;;MAAA,CAJkBC,IACpB,sCAGe,GAAG;GAClB,MAAM,oBAAoB,CAAC,GAAG,IAAI,IAAI,UAAU,CAAC;GACjD,OAAO,KACL,EAAE,YAAY,kBAAkB,GAChC,gDACF;GACA,IAAa,wCAAwC,IAAI;EAC3D;;AAEJ;AAEA,SAAgB,4BAA4B,OAAwB;CAClE,OAAO,MAAM,WAAW,MAAM;AAChC;AAEA,SAAgB,4BAA4B,OAAwB;CAClE,OAAO,MAAM,WAAW,MAAM;AAChC;AAEA,SAAgB,uCAAuC,OAAwB;CAC7E,OAAO,MAAM,WAAW,aAAa;AACvC;AAEA,SAAgB,gBACd,cACoB;CACpB,OAAO,cAAc,OAAO,QAAQ,mBAAmB,EAAE;AAC3D;AAEA,SAAgB,kCACd,aACA,oBACoB;CACpB,IAAI,sBAAsB,4BAA4B,kBAAkB,GAAG;EACzE,OAAO,MAAM,+CAA+C;EAC5D,OAAO;CACT;CAEA,IAAI,eAAe,4BAA4B,WAAW,GAAG;EAC3D,OAAO,MAAM,oCAAoC;EACjD,OAAO;CACT;CAEA,IACE,sBACA,uCAAuC,kBAAkB,GACzD;EACA,OAAO,MAAM,4DAA4D;EACzE,OAAO;CACT;CAEA,IAAI,eAAe,uCAAuC,WAAW,GAAG;EACtE,OAAO,MAAM,iDAAiD;EAC9D,OAAO;CACT;CAEA,IAAI,oBAAoB;EACtB,IAAI,4BAA4B,kBAAkB,GAChD,OAAO,MAAM,gDAAgD;OAE7D,OAAO,MAAM,4CAA4C;EAE3D,OAAO;CACT;CAEA,IAAI,aAAa;EACf,IAAI,4BAA4B,WAAW,GACzC,OAAO,MAAM,qCAAqC;OAElD,OAAO,MAAM,iCAAiC;CAElD;CAEA,OAAO;AACT"}

package/dist/util/exec/utils.js

@@ -21,13 +21,16 @@ function getChildEnv({ extraEnv, env: forcedEnv = {} } = {}) {
 	for (const [key, val] of Object.entries(combinedEnv)) if (isString(val)) result[key] = `${val}`;
 	return result;
 }
+function isValidShell(shell) {
+	return isBoolean(shell) || isNonEmptyStringAndNotWhitespace(shell);
+}
 function isCommandWithOptions(cmd) {
 	if (!(isObject(cmd) && "command" in cmd)) return false;
 	if (!Array.isArray(cmd.command)) return false;
 	if (!cmd.command.length) return false;
 	if (cmd.command.some((v) => !isString(v))) return false;
 	if ("ignoreFailure" in cmd && !isBoolean(cmd.ignoreFailure)) return false;
-	if ("shell" in cmd && !(isBoolean(cmd.shell) || isNonEmptyStringAndNotWhitespace(cmd.shell))) return false;
+	if ("shell" in cmd && !isValidShell(cmd.shell)) return false;
 	return true;
 }
 function asRawCommand(cmd) {

package/dist/util/exec/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","names":[],"sources":["../../../lib/util/exec/utils.ts"],"sourcesContent":["import {\n  isBoolean,\n  isNonEmptyStringAndNotWhitespace,\n  isObject,\n  isString,\n} from '@sindresorhus/is';\nimport { join } from 'shlex';\nimport { getCustomEnv, getUserEnv } from '../env.ts';\nimport { coerceObject } from '../object.ts';\nimport { getChildProcessEnv } from './env.ts';\nimport type { CommandWithOptions, ExecOptions } from './types.ts';\n\nexport type ResolvedChildEnv = Record<string, string>;\n\nexport function getChildEnv({\n  extraEnv,\n  env: forcedEnv = {},\n}: Pick<ExecOptions, 'env' | 'extraEnv'> = {}): ResolvedChildEnv {\n  const globalConfigEnv = getCustomEnv();\n  const userConfiguredEnv = getUserEnv();\n\n  const inheritedKeys: string[] = [];\n  for (const [key, val] of Object.entries(coerceObject(extraEnv))) {\n    if (isString(val)) {\n      inheritedKeys.push(key);\n    }\n  }\n\n  const parentEnv = getChildProcessEnv(inheritedKeys);\n  const combinedEnv = {\n    ...extraEnv,\n    ...parentEnv,\n    ...globalConfigEnv,\n    ...userConfiguredEnv,\n    ...forcedEnv,\n  };\n\n  const result: Record<string, string> = {};\n  for (const [key, val] of Object.entries(combinedEnv)) {\n    if (isString(val)) {\n      result[key] = `${val}`;\n    }\n  }\n\n  return result;\n}\n\nexport function isCommandWithOptions(cmd: unknown): cmd is CommandWithOptions {\n  if (!(isObject(cmd) && 'command' in cmd)) {\n    return false;\n  }\n\n  if (!Array.isArray(cmd.command)) {\n    return false;\n  }\n\n  if (!cmd.command.length) {\n    return false;\n  }\n\n  if (cmd.command.some((v) => !isString(v))) {\n    return false;\n  }\n\n  if ('ignoreFailure' in cmd && !isBoolean(cmd.ignoreFailure)) {\n    return false;\n  }\n\n  if (\n    'shell' in cmd &&\n    !(isBoolean(cmd.shell) || isNonEmptyStringAndNotWhitespace(cmd.shell))\n  ) {\n    return false;\n  }\n\n  return true;\n}\n\nexport function asRawCommand(cmd: string | CommandWithOptions): string {\n  if (isCommandWithOptions(cmd)) {\n    return join(cmd.command);\n  }\n\n  return cmd;\n}\n\nexport function asRawCommands(\n  cmds: string | (string | CommandWithOptions)[],\n): string[] {\n  if (isString(cmds)) {\n    return [cmds];\n  }\n  return cmds.map((cmd) => asRawCommand(cmd));\n}\n"],"mappings":";;;;;;AAcA,SAAgB,YAAY,EAC1B,UACA,KAAK,YAAY,CAAC,MACuB,CAAC,GAAqB;CAC/D,MAAM,kBAAkB,aAAa;CACrC,MAAM,oBAAoB,WAAW;CAErC,MAAM,gBAA0B,CAAC;CACjC,KAAK,MAAM,CAAC,KAAK,QAAQ,OAAO,QAAQ,aAAa,QAAQ,CAAC,GAC5D,IAAI,SAAS,GAAG,GACd,cAAc,KAAK,GAAG;CAI1B,MAAM,YAAY,mBAAmB,aAAa;CAClD,MAAM,cAAc;EAClB,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;CACL;CAEA,MAAM,SAAiC,CAAC;CACxC,KAAK,MAAM,CAAC,KAAK,QAAQ,OAAO,QAAQ,WAAW,GACjD,IAAI,SAAS,GAAG,GACd,OAAO,OAAO,GAAG;CAIrB,OAAO;AACT;AAEA,SAAgB,qBAAqB,KAAyC;CAC5E,IAAI,EAAE,SAAS,GAAG,KAAK,aAAa,MAClC,OAAO;CAGT,IAAI,CAAC,MAAM,QAAQ,IAAI,OAAO,GAC5B,OAAO;CAGT,IAAI,CAAC,IAAI,QAAQ,QACf,OAAO;CAGT,IAAI,IAAI,QAAQ,MAAM,MAAM,CAAC,SAAS,CAAC,CAAC,GACtC,OAAO;CAGT,IAAI,mBAAmB,OAAO,CAAC,UAAU,IAAI,aAAa,GACxD,OAAO;CAGT,IACE,WAAW,OACX,EAAE,UAAU,IAAI,KAAK,KAAK,iCAAiC,IAAI,KAAK,IAEpE,OAAO;CAGT,OAAO;AACT;AAEA,SAAgB,aAAa,KAA0C;CACrE,IAAI,qBAAqB,GAAG,GAC1B,OAAO,KAAK,IAAI,OAAO;CAGzB,OAAO;AACT"}
+{"version":3,"file":"utils.js","names":[],"sources":["../../../lib/util/exec/utils.ts"],"sourcesContent":["import {\n  isBoolean,\n  isNonEmptyStringAndNotWhitespace,\n  isObject,\n  isString,\n} from '@sindresorhus/is';\nimport { join } from 'shlex';\nimport { getCustomEnv, getUserEnv } from '../env.ts';\nimport { coerceObject } from '../object.ts';\nimport { getChildProcessEnv } from './env.ts';\nimport type { CommandWithOptions, ExecOptions } from './types.ts';\n\nexport type ResolvedChildEnv = Record<string, string>;\n\nexport function getChildEnv({\n  extraEnv,\n  env: forcedEnv = {},\n}: Pick<ExecOptions, 'env' | 'extraEnv'> = {}): ResolvedChildEnv {\n  const globalConfigEnv = getCustomEnv();\n  const userConfiguredEnv = getUserEnv();\n\n  const inheritedKeys: string[] = [];\n  for (const [key, val] of Object.entries(coerceObject(extraEnv))) {\n    if (isString(val)) {\n      inheritedKeys.push(key);\n    }\n  }\n\n  const parentEnv = getChildProcessEnv(inheritedKeys);\n  const combinedEnv = {\n    ...extraEnv,\n    ...parentEnv,\n    ...globalConfigEnv,\n    ...userConfiguredEnv,\n    ...forcedEnv,\n  };\n\n  const result: Record<string, string> = {};\n  for (const [key, val] of Object.entries(combinedEnv)) {\n    if (isString(val)) {\n      result[key] = `${val}`;\n    }\n  }\n\n  return result;\n}\n\nfunction isValidShell(shell: unknown): boolean {\n  return isBoolean(shell) || isNonEmptyStringAndNotWhitespace(shell);\n}\n\nexport function isCommandWithOptions(cmd: unknown): cmd is CommandWithOptions {\n  if (!(isObject(cmd) && 'command' in cmd)) {\n    return false;\n  }\n\n  if (!Array.isArray(cmd.command)) {\n    return false;\n  }\n\n  if (!cmd.command.length) {\n    return false;\n  }\n\n  if (cmd.command.some((v) => !isString(v))) {\n    return false;\n  }\n\n  if ('ignoreFailure' in cmd && !isBoolean(cmd.ignoreFailure)) {\n    return false;\n  }\n\n  if ('shell' in cmd && !isValidShell(cmd.shell)) {\n    return false;\n  }\n\n  return true;\n}\n\nexport function asRawCommand(cmd: string | CommandWithOptions): string {\n  if (isCommandWithOptions(cmd)) {\n    return join(cmd.command);\n  }\n\n  return cmd;\n}\n\nexport function asRawCommands(\n  cmds: string | (string | CommandWithOptions)[],\n): string[] {\n  if (isString(cmds)) {\n    return [cmds];\n  }\n  return cmds.map((cmd) => asRawCommand(cmd));\n}\n"],"mappings":";;;;;;AAcA,SAAgB,YAAY,EAC1B,UACA,KAAK,YAAY,CAAC,MACuB,CAAC,GAAqB;CAC/D,MAAM,kBAAkB,aAAa;CACrC,MAAM,oBAAoB,WAAW;CAErC,MAAM,gBAA0B,CAAC;CACjC,KAAK,MAAM,CAAC,KAAK,QAAQ,OAAO,QAAQ,aAAa,QAAQ,CAAC,GAC5D,IAAI,SAAS,GAAG,GACd,cAAc,KAAK,GAAG;CAI1B,MAAM,YAAY,mBAAmB,aAAa;CAClD,MAAM,cAAc;EAClB,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;CACL;CAEA,MAAM,SAAiC,CAAC;CACxC,KAAK,MAAM,CAAC,KAAK,QAAQ,OAAO,QAAQ,WAAW,GACjD,IAAI,SAAS,GAAG,GACd,OAAO,OAAO,GAAG;CAIrB,OAAO;AACT;AAEA,SAAS,aAAa,OAAyB;CAC7C,OAAO,UAAU,KAAK,KAAK,iCAAiC,KAAK;AACnE;AAEA,SAAgB,qBAAqB,KAAyC;CAC5E,IAAI,EAAE,SAAS,GAAG,KAAK,aAAa,MAClC,OAAO;CAGT,IAAI,CAAC,MAAM,QAAQ,IAAI,OAAO,GAC5B,OAAO;CAGT,IAAI,CAAC,IAAI,QAAQ,QACf,OAAO;CAGT,IAAI,IAAI,QAAQ,MAAM,MAAM,CAAC,SAAS,CAAC,CAAC,GACtC,OAAO;CAGT,IAAI,mBAAmB,OAAO,CAAC,UAAU,IAAI,aAAa,GACxD,OAAO;CAGT,IAAI,WAAW,OAAO,CAAC,aAAa,IAAI,KAAK,GAC3C,OAAO;CAGT,OAAO;AACT;AAEA,SAAgB,aAAa,KAA0C;CACrE,IAAI,qBAAqB,GAAG,GAC1B,OAAO,KAAK,IAAI,OAAO;CAGzB,OAAO;AACT"}

package/dist/util/git/auth.js

@@ -77,6 +77,10 @@ function getAuthenticationRules(gitUrl, hostType, token) {
 	});
 	return authenticationRules;
 }
+function hasCredentials(rule) {
+	const basicAuth = rule.username && rule.password;
+	return !!(rule.token ?? basicAuth);
+}
 /**
 * Appends Git authentication for the repository `url` from the credentials registered from URL credentials for it with `hostType`, a username without a password as a percent-encoded token; configured host rules come through `getAll()` instead.
 * @returns a new environment without modifying the input
@@ -104,7 +108,7 @@ function getGitEnvironmentVariables(environmentVariables, hostTypes = [], url) {
 	});
 	if (gitHubHostRule?.token) gitEnvironmentVariables = getGitAuthenticatedEnvironmentVariables(gitEnvironmentVariables, "https://github.com/", gitHubHostRule);
 	const gitAllowedHostTypes = /* @__PURE__ */ new Set([...PLATFORM_HOST_TYPES, ...hostTypes]);
-	const hostRules = getAll().filter((r) => r.matchHost && (r.token ?? (r.username && r.password))).filter((r) => !gitHubHostRule || !githubApiUrls.has(r.matchHost));
+	const hostRules = getAll().filter((r) => r.matchHost && hasCredentials(r)).filter((r) => !gitHubHostRule || !githubApiUrls.has(r.matchHost));
 	for (const hostRule of hostRules) if (!hostRule.hostType || gitAllowedHostTypes.has(hostRule.hostType)) gitEnvironmentVariables = addAuthFromHostRule(hostRule, gitEnvironmentVariables);
 	if (url) for (const hostType of hostTypes) gitEnvironmentVariables = getGitUrlEnvironmentVariables(gitEnvironmentVariables, url, hostType);
 	return gitEnvironmentVariables;

package/dist/util/git/auth.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth.js","names":[],"sources":["../../../lib/util/git/auth.ts"],"sourcesContent":["import { isEmptyString } from '@sindresorhus/is';\nimport { PLATFORM_HOST_TYPES } from '../../constants/platforms.ts';\nimport { logger } from '../../logger/index.ts';\nimport type { HostRule } from '../../types/index.ts';\nimport { detectPlatform } from '../common.ts';\nimport type { ResolvedChildEnv } from '../exec/utils.ts';\nimport { find, findDetachedCredentials, getAll } from '../host-rules.ts';\nimport { regEx } from '../regex.ts';\nimport { createURLFromHostOrURL, isHttpUrl } from '../url.ts';\nimport { addGitConfigEnvironmentVariables } from './config.ts';\nimport type { AuthenticationRule } from './types.ts';\nimport { getTokenCredentials, parseGitUrl } from './url.ts';\n\nconst platformHostTypes = new Set<string>(PLATFORM_HOST_TYPES);\n\nconst githubApiUrls = new Set([\n  'github.com',\n  'api.github.com',\n  'https://api.github.com',\n  'https://api.github.com/',\n]);\n\n/**\n * Append Git authentication configuration to a resolved child environment.\n * @returns a new environment without modifying the input\n */\nexport function getGitAuthenticatedEnvironmentVariables(\n  environmentVariables: Readonly<ResolvedChildEnv>,\n  originalGitUrl: string,\n  { token, username, password, hostType, matchHost }: HostRule,\n): ResolvedChildEnv {\n  if (!token && !(username && password)) {\n    logger.warn(\n      { host: matchHost },\n      `Could not create environment variable for host as neither token or username and password was set`,\n    );\n    return { ...environmentVariables };\n  }\n\n  let authenticationRules: AuthenticationRule[];\n  if (token) {\n    authenticationRules = getAuthenticationRulesWithToken(\n      originalGitUrl,\n      hostType,\n      token,\n    );\n  } else {\n    const encodedUsername = encodeURIComponent(username!);\n    const encodedPassword = encodeURIComponent(password!);\n\n    authenticationRules = getAuthenticationRules(\n      originalGitUrl,\n      hostType,\n      `${encodedUsername}:${encodedPassword}`,\n    );\n  }\n\n  return addGitConfigEnvironmentVariables(\n    environmentVariables,\n    authenticationRules.map((rule) => ({\n      key: `url.${rule.url}.insteadOf`,\n      value: rule.insteadOf,\n    })),\n  );\n}\n\nfunction getAuthenticationRulesWithToken(\n  url: string,\n  hostType: string | undefined | null,\n  authToken: string,\n): AuthenticationRule[] {\n  const type = hostType ?? detectPlatform(url);\n  const platform =\n    hostType && platformHostTypes.has(hostType)\n      ? hostType\n      : detectPlatform(url);\n  return getAuthenticationRules(\n    url,\n    type,\n    getTokenCredentials(platform, authToken),\n  );\n}\n\n/**\n * Generates the authentication rules for later git usage for the given host\n * @link https://coolaj86.com/articles/vanilla-devops-git-credentials-cheatsheet/\n * @param gitUrl Git repository URL\n * @param hostType Git host type\n * @param token Authentication token or `username:password` string\n */\nexport function getAuthenticationRules(\n  gitUrl: string,\n  hostType: string | undefined | null,\n  token: string,\n): AuthenticationRule[] {\n  const authenticationRules = [];\n  const hasUser = token.split(':').length > 1;\n  const insteadUrl = parseGitUrl(gitUrl);\n  let sshPort = insteadUrl.port;\n\n  if (hostType === 'bitbucket-server') {\n    // For Bitbucket Server/Data Center, `source` must be `bitbucket-server`\n    // to generate HTTP(s) URLs correctly.\n    // https://github.com/IonicaBizau/git-url-parse/blob/28828546c148d58bbcff61409915a4e1e8f7eb11/lib/index.js#L304\n    insteadUrl.source = 'bitbucket-server';\n\n    // sshPort is string, wrong type!\n    // https://github.com/DefinitelyTyped/DefinitelyTyped/pull/72361\n    // https://github.com/IonicaBizau/parse-path/blob/87f71f273da90f85f6845937a70b7c032eeae4e3/lib/index.js#L45\n    // v8 ignore next -- TODO: add test #40625\n    if (!sshPort || isEmptyString(sshPort)) {\n      // By default, bitbucket-server SSH port is 7999.\n      // For non-default port, the generated auth config will likely be incorrect.\n      sshPort = '7999';\n    }\n  }\n\n  const url = { ...insteadUrl };\n  // git-url-parse would prefix `x-token-auth:` again on bitbucket.org\n  if (hasUser && url.source === 'bitbucket.org') {\n    url.source = 'bitbucket';\n  }\n  const protocol = regEx(/^https?$/).test(url.protocol)\n    ? url.protocol\n    : 'https';\n\n  // ssh protocol with user if empty\n  url.token = hasUser ? token : `ssh:${token}`;\n  authenticationRules.push({\n    url: url.toString(protocol),\n    // only edge case, need to stringify ourself because the exact syntax is not supported by the library\n    // https://github.com/IonicaBizau/git-url-parse/blob/246c9119fb42c2ea1c280028fe77c53eb34c190c/lib/index.js#L246\n    insteadOf: `ssh://git@${insteadUrl.resource}${\n      sshPort ? `:${sshPort}` : ''\n    }/${insteadUrl.full_name}${insteadUrl.git_suffix ? '.git' : ''}`,\n  });\n\n  // alternative ssh protocol with user if empty\n  url.token = hasUser ? token : `git:${token}`;\n  authenticationRules.push({\n    url: url.toString(protocol),\n    insteadOf: { ...insteadUrl, port: sshPort }.toString('ssh'),\n  });\n\n  // https protocol with no user as default fallback\n  url.token = token;\n  authenticationRules.push({\n    url: url.toString(protocol),\n    insteadOf: insteadUrl.toString(protocol),\n  });\n\n  return authenticationRules;\n}\n\n/**\n * Appends Git authentication for the repository `url` from the credentials registered from URL credentials for it with `hostType`, a username without a password as a percent-encoded token; configured host rules come through `getAll()` instead.\n * @returns a new environment without modifying the input\n */\nfunction getGitUrlEnvironmentVariables(\n  environmentVariables: Readonly<ResolvedChildEnv>,\n  url: string,\n  hostType: string,\n): ResolvedChildEnv {\n  const credentials = findDetachedCredentials({ hostType, url });\n  if (!credentials?.username) {\n    return { ...environmentVariables };\n  }\n  const auth: HostRule = credentials.password\n    ? credentials\n    : { token: encodeURIComponent(credentials.username) };\n  return getGitAuthenticatedEnvironmentVariables(environmentVariables, url, {\n    ...auth,\n    hostType,\n  });\n}\n\n/**\n * Appends Git authentication from the host rules with a `matchHost` for the platform host types and `hostTypes`, and, when `url` is given, for that single repository from the credentials registered from URL credentials for it with each of `hostTypes`.\n * @returns a new environment without modifying the input\n */\nexport function getGitEnvironmentVariables(\n  environmentVariables: Readonly<ResolvedChildEnv>,\n  hostTypes: readonly string[] = [],\n  url?: string,\n): ResolvedChildEnv {\n  let gitEnvironmentVariables: ResolvedChildEnv = { ...environmentVariables };\n\n  // hard-coded logic to use authentication for github.com based on the githubToken for api.github.com\n  const gitHubHostRule = find({\n    hostType: 'github',\n    url: 'https://api.github.com/',\n  });\n\n  if (gitHubHostRule?.token) {\n    gitEnvironmentVariables = getGitAuthenticatedEnvironmentVariables(\n      gitEnvironmentVariables,\n      'https://github.com/',\n      gitHubHostRule,\n    );\n  }\n\n  // Manager-scoped rules are opt-in so unrelated credentials are not exposed to Git.\n  const gitAllowedHostTypes = new Set<string>([\n    ...PLATFORM_HOST_TYPES,\n    ...hostTypes,\n  ]);\n\n  // filter rules without `matchHost` and `token` or username and password and github api github rules\n  const hostRules = getAll()\n    .filter((r) => r.matchHost && (r.token ?? (r.username && r.password)))\n    .filter((r) => !gitHubHostRule || !githubApiUrls.has(r.matchHost!));\n\n  // for each hostRule without hostType we add additional authentication variables to the environmentVariables\n  // for each hostRule with hostType we add additional authentication variables to the environmentVariables\n  for (const hostRule of hostRules) {\n    if (!hostRule.hostType || gitAllowedHostTypes.has(hostRule.hostType)) {\n      gitEnvironmentVariables = addAuthFromHostRule(\n        hostRule,\n        gitEnvironmentVariables,\n      );\n    }\n  }\n\n  // `getAll()` leaves out the rules registered from URL credentials, which only apply to the repository they came from\n  if (url) {\n    for (const hostType of hostTypes) {\n      gitEnvironmentVariables = getGitUrlEnvironmentVariables(\n        gitEnvironmentVariables,\n        url,\n        hostType,\n      );\n    }\n  }\n  return gitEnvironmentVariables;\n}\n\nfunction addAuthFromHostRule(\n  hostRule: HostRule,\n  environmentVariables: Readonly<ResolvedChildEnv>,\n): ResolvedChildEnv {\n  const httpUrl = createURLFromHostOrURL(hostRule.matchHost!)?.toString();\n  if (isHttpUrl(httpUrl)) {\n    logger.trace(`Adding Git authentication for ${httpUrl} using token auth.`);\n    return getGitAuthenticatedEnvironmentVariables(\n      environmentVariables,\n      httpUrl!,\n      hostRule,\n    );\n  }\n\n  logger.debug(\n    `Could not parse registryUrl ${hostRule.matchHost!} or not using http(s). Ignoring`,\n  );\n  return { ...environmentVariables };\n}\n"],"mappings":"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"}
+{"version":3,"file":"auth.js","names":[],"sources":["../../../lib/util/git/auth.ts"],"sourcesContent":["import { isEmptyString } from '@sindresorhus/is';\nimport { PLATFORM_HOST_TYPES } from '../../constants/platforms.ts';\nimport { logger } from '../../logger/index.ts';\nimport type { HostRule } from '../../types/index.ts';\nimport { detectPlatform } from '../common.ts';\nimport type { ResolvedChildEnv } from '../exec/utils.ts';\nimport { find, findDetachedCredentials, getAll } from '../host-rules.ts';\nimport { regEx } from '../regex.ts';\nimport { createURLFromHostOrURL, isHttpUrl } from '../url.ts';\nimport { addGitConfigEnvironmentVariables } from './config.ts';\nimport type { AuthenticationRule } from './types.ts';\nimport { getTokenCredentials, parseGitUrl } from './url.ts';\n\nconst platformHostTypes = new Set<string>(PLATFORM_HOST_TYPES);\n\nconst githubApiUrls = new Set([\n  'github.com',\n  'api.github.com',\n  'https://api.github.com',\n  'https://api.github.com/',\n]);\n\n/**\n * Append Git authentication configuration to a resolved child environment.\n * @returns a new environment without modifying the input\n */\nexport function getGitAuthenticatedEnvironmentVariables(\n  environmentVariables: Readonly<ResolvedChildEnv>,\n  originalGitUrl: string,\n  { token, username, password, hostType, matchHost }: HostRule,\n): ResolvedChildEnv {\n  if (!token && !(username && password)) {\n    logger.warn(\n      { host: matchHost },\n      `Could not create environment variable for host as neither token or username and password was set`,\n    );\n    return { ...environmentVariables };\n  }\n\n  let authenticationRules: AuthenticationRule[];\n  if (token) {\n    authenticationRules = getAuthenticationRulesWithToken(\n      originalGitUrl,\n      hostType,\n      token,\n    );\n  } else {\n    const encodedUsername = encodeURIComponent(username!);\n    const encodedPassword = encodeURIComponent(password!);\n\n    authenticationRules = getAuthenticationRules(\n      originalGitUrl,\n      hostType,\n      `${encodedUsername}:${encodedPassword}`,\n    );\n  }\n\n  return addGitConfigEnvironmentVariables(\n    environmentVariables,\n    authenticationRules.map((rule) => ({\n      key: `url.${rule.url}.insteadOf`,\n      value: rule.insteadOf,\n    })),\n  );\n}\n\nfunction getAuthenticationRulesWithToken(\n  url: string,\n  hostType: string | undefined | null,\n  authToken: string,\n): AuthenticationRule[] {\n  const type = hostType ?? detectPlatform(url);\n  const platform =\n    hostType && platformHostTypes.has(hostType)\n      ? hostType\n      : detectPlatform(url);\n  return getAuthenticationRules(\n    url,\n    type,\n    getTokenCredentials(platform, authToken),\n  );\n}\n\n/**\n * Generates the authentication rules for later git usage for the given host\n * @link https://coolaj86.com/articles/vanilla-devops-git-credentials-cheatsheet/\n * @param gitUrl Git repository URL\n * @param hostType Git host type\n * @param token Authentication token or `username:password` string\n */\nexport function getAuthenticationRules(\n  gitUrl: string,\n  hostType: string | undefined | null,\n  token: string,\n): AuthenticationRule[] {\n  const authenticationRules = [];\n  const hasUser = token.split(':').length > 1;\n  const insteadUrl = parseGitUrl(gitUrl);\n  let sshPort = insteadUrl.port;\n\n  if (hostType === 'bitbucket-server') {\n    // For Bitbucket Server/Data Center, `source` must be `bitbucket-server`\n    // to generate HTTP(s) URLs correctly.\n    // https://github.com/IonicaBizau/git-url-parse/blob/28828546c148d58bbcff61409915a4e1e8f7eb11/lib/index.js#L304\n    insteadUrl.source = 'bitbucket-server';\n\n    // sshPort is string, wrong type!\n    // https://github.com/DefinitelyTyped/DefinitelyTyped/pull/72361\n    // https://github.com/IonicaBizau/parse-path/blob/87f71f273da90f85f6845937a70b7c032eeae4e3/lib/index.js#L45\n    // v8 ignore next -- TODO: add test #40625\n    if (!sshPort || isEmptyString(sshPort)) {\n      // By default, bitbucket-server SSH port is 7999.\n      // For non-default port, the generated auth config will likely be incorrect.\n      sshPort = '7999';\n    }\n  }\n\n  const url = { ...insteadUrl };\n  // git-url-parse would prefix `x-token-auth:` again on bitbucket.org\n  if (hasUser && url.source === 'bitbucket.org') {\n    url.source = 'bitbucket';\n  }\n  const protocol = regEx(/^https?$/).test(url.protocol)\n    ? url.protocol\n    : 'https';\n\n  // ssh protocol with user if empty\n  url.token = hasUser ? token : `ssh:${token}`;\n  authenticationRules.push({\n    url: url.toString(protocol),\n    // only edge case, need to stringify ourself because the exact syntax is not supported by the library\n    // https://github.com/IonicaBizau/git-url-parse/blob/246c9119fb42c2ea1c280028fe77c53eb34c190c/lib/index.js#L246\n    insteadOf: `ssh://git@${insteadUrl.resource}${\n      sshPort ? `:${sshPort}` : ''\n    }/${insteadUrl.full_name}${insteadUrl.git_suffix ? '.git' : ''}`,\n  });\n\n  // alternative ssh protocol with user if empty\n  url.token = hasUser ? token : `git:${token}`;\n  authenticationRules.push({\n    url: url.toString(protocol),\n    insteadOf: { ...insteadUrl, port: sshPort }.toString('ssh'),\n  });\n\n  // https protocol with no user as default fallback\n  url.token = token;\n  authenticationRules.push({\n    url: url.toString(protocol),\n    insteadOf: insteadUrl.toString(protocol),\n  });\n\n  return authenticationRules;\n}\n\nfunction hasCredentials(rule: HostRule): boolean {\n  const basicAuth = rule.username && rule.password;\n  return !!(rule.token ?? basicAuth);\n}\n\n/**\n * Appends Git authentication for the repository `url` from the credentials registered from URL credentials for it with `hostType`, a username without a password as a percent-encoded token; configured host rules come through `getAll()` instead.\n * @returns a new environment without modifying the input\n */\nfunction getGitUrlEnvironmentVariables(\n  environmentVariables: Readonly<ResolvedChildEnv>,\n  url: string,\n  hostType: string,\n): ResolvedChildEnv {\n  const credentials = findDetachedCredentials({ hostType, url });\n  if (!credentials?.username) {\n    return { ...environmentVariables };\n  }\n  const auth: HostRule = credentials.password\n    ? credentials\n    : { token: encodeURIComponent(credentials.username) };\n  return getGitAuthenticatedEnvironmentVariables(environmentVariables, url, {\n    ...auth,\n    hostType,\n  });\n}\n\n/**\n * Appends Git authentication from the host rules with a `matchHost` for the platform host types and `hostTypes`, and, when `url` is given, for that single repository from the credentials registered from URL credentials for it with each of `hostTypes`.\n * @returns a new environment without modifying the input\n */\nexport function getGitEnvironmentVariables(\n  environmentVariables: Readonly<ResolvedChildEnv>,\n  hostTypes: readonly string[] = [],\n  url?: string,\n): ResolvedChildEnv {\n  let gitEnvironmentVariables: ResolvedChildEnv = { ...environmentVariables };\n\n  // hard-coded logic to use authentication for github.com based on the githubToken for api.github.com\n  const gitHubHostRule = find({\n    hostType: 'github',\n    url: 'https://api.github.com/',\n  });\n\n  if (gitHubHostRule?.token) {\n    gitEnvironmentVariables = getGitAuthenticatedEnvironmentVariables(\n      gitEnvironmentVariables,\n      'https://github.com/',\n      gitHubHostRule,\n    );\n  }\n\n  // Manager-scoped rules are opt-in so unrelated credentials are not exposed to Git.\n  const gitAllowedHostTypes = new Set<string>([\n    ...PLATFORM_HOST_TYPES,\n    ...hostTypes,\n  ]);\n\n  // filter rules without `matchHost` and `token` or username and password and github api github rules\n  const hostRules = getAll()\n    .filter((r) => r.matchHost && hasCredentials(r))\n    .filter((r) => !gitHubHostRule || !githubApiUrls.has(r.matchHost!));\n\n  // for each hostRule without hostType we add additional authentication variables to the environmentVariables\n  // for each hostRule with hostType we add additional authentication variables to the environmentVariables\n  for (const hostRule of hostRules) {\n    if (!hostRule.hostType || gitAllowedHostTypes.has(hostRule.hostType)) {\n      gitEnvironmentVariables = addAuthFromHostRule(\n        hostRule,\n        gitEnvironmentVariables,\n      );\n    }\n  }\n\n  // `getAll()` leaves out the rules registered from URL credentials, which only apply to the repository they came from\n  if (url) {\n    for (const hostType of hostTypes) {\n      gitEnvironmentVariables = getGitUrlEnvironmentVariables(\n        gitEnvironmentVariables,\n        url,\n        hostType,\n      );\n    }\n  }\n  return gitEnvironmentVariables;\n}\n\nfunction addAuthFromHostRule(\n  hostRule: HostRule,\n  environmentVariables: Readonly<ResolvedChildEnv>,\n): ResolvedChildEnv {\n  const httpUrl = createURLFromHostOrURL(hostRule.matchHost!)?.toString();\n  if (isHttpUrl(httpUrl)) {\n    logger.trace(`Adding Git authentication for ${httpUrl} using token auth.`);\n    return getGitAuthenticatedEnvironmentVariables(\n      environmentVariables,\n      httpUrl!,\n      hostRule,\n    );\n  }\n\n  logger.debug(\n    `Could not parse registryUrl ${hostRule.matchHost!} or not using http(s). Ignoring`,\n  );\n  return { ...environmentVariables };\n}\n"],"mappings":"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"}

package/dist/util/git/error.js.map

@@ -1 +1 @@
-{"version":3,"file":"error.js","names":[],"sources":["../../../lib/util/git/error.ts"],"sourcesContent":["import { CONFIG_VALIDATION } from '../../constants/error-messages.ts';\nimport { logger } from '../../logger/index.ts';\nimport { ExternalHostError } from '../../types/errors/external-host-error.ts';\nimport { getEnv } from '../env.ts';\nimport type { FileChange } from './types.ts';\n\nexport function checkForPlatformFailure(err: Error): Error | null {\n  if (getEnv().NODE_ENV === 'test') {\n    return null;\n  }\n  const externalHostFailureStrings = [\n    'remote: Invalid username or password',\n    'gnutls_handshake() failed',\n    'The requested URL returned error: 403',\n    'The requested URL returned error: 5',\n    'The remote end hung up unexpectedly',\n    'access denied or repository not exported',\n    'Could not write new index file',\n    'Failed to connect to',\n    'Connection timed out',\n    'malformed object name',\n    'Could not resolve host',\n    'early EOF',\n    'fatal: bad config', // .gitmodules problem\n    'expected flush after ref listing',\n  ];\n  for (const errorStr of externalHostFailureStrings) {\n    if (err.message.includes(errorStr)) {\n      logger.debug({ err }, 'Converting git error to ExternalHostError');\n      return new ExternalHostError(err, 'git');\n    }\n    /* v8 ignore next -- TODO: add test */\n  }\n\n  /* v8 ignore next -- TODO: add test */\n  const configErrorStrings = [\n    {\n      error: 'GitLab: Branch name does not follow the pattern',\n      message:\n        \"Cannot push because branch name does not follow project's push rules\",\n    },\n    {\n      error: 'GitLab: Commit message does not follow the pattern',\n      message:\n        \"Cannot push because commit message does not follow project's push rules\",\n    },\n    {\n      error: ' is not a member of team',\n      message:\n        'The `Restrict commits to existing GitLab users` rule is blocking Renovate push. Check the Renovate `gitAuthor` setting',\n    },\n    {\n      error: 'TF401027:',\n      message:\n        'You need the Git `GenericContribute` permission to perform this action',\n    },\n    {\n      error: 'matches more than one',\n      message:\n        \"Renovate cannot push branches if there are tags with names the same as Renovate's branches. Please remove conflicting tag names or change Renovate's branchPrefix to avoid conflicts.\",\n    },\n  ];\n  /* v8 ignore next -- TODO: add test */\n  for (const { error, message } of configErrorStrings) {\n    if (err.message.includes(error)) {\n      logger.debug({ err }, 'Converting git error to CONFIG_VALIDATION error');\n      const res = new Error(CONFIG_VALIDATION);\n      res.validationError = message;\n      res.validationMessage = `\\`${err.message.replaceAll('`', \"'\")}\\``;\n      return res;\n    }\n  }\n\n  /* v8 ignore next -- TODO: add test */\n  return null;\n}\n\n/* v8 ignore next -- TODO: add tests */\nexport function handleCommitError(\n  err: Error,\n  branchName: string,\n  files?: FileChange[],\n): null {\n  checkForPlatformFailure(err);\n  if (err.message.includes(`'refs/heads/renovate' exists`)) {\n    const error = new Error(CONFIG_VALIDATION);\n    error.validationSource = 'None';\n    error.validationError = 'An existing branch is blocking Renovate';\n    error.validationMessage = `Renovate needs to create the branch \\`${branchName}\\` but is blocked from doing so because of an existing branch called \\`renovate\\`. Please remove it so that Renovate can proceed.`;\n    throw error;\n  }\n  if (\n    err.message.includes(\n      'refusing to allow a GitHub App to create or update workflow',\n    )\n  ) {\n    logger.warn(\n      'App has not been granted permissions to update Workflows - aborting branch.',\n    );\n    return null;\n  }\n  if (err.message.includes('GH013')) {\n    logger.debug({ err }, 'GitHub repository ruleset blocked push');\n    const error = new Error(CONFIG_VALIDATION);\n    error.validationSource = branchName;\n    error.validationError = 'GitHub repository ruleset violation';\n    error.validationMessage =\n      `Renovate cannot push to \\`${branchName}\\` because a GitHub ` +\n      `repository ruleset rejected the push (GH013). Update the ` +\n      `ruleset - or grant Renovate a bypass actor - so Renovate can ` +\n      `proceed. Original error: \\`${err.message.replaceAll('`', \"'\")}\\``;\n    throw error;\n  }\n  if (\n    (err.message.includes('remote rejected') || err.message.includes('403')) &&\n    files?.some((file) => file.path?.startsWith('.github/workflows/'))\n  ) {\n    logger.debug({ err }, 'commitFiles error');\n    logger.info('Workflows update rejection - aborting branch.');\n    return null;\n  }\n  if (err.message.includes('protected branch hook declined')) {\n    const error = new Error(CONFIG_VALIDATION);\n    error.validationSource = branchName;\n    error.validationError = 'Renovate branch is protected';\n    error.validationMessage = `Renovate cannot push to its branch because branch protection has been enabled.`;\n    throw error;\n  }\n  if (err.message.includes('can only push your own commits')) {\n    const error = new Error(CONFIG_VALIDATION);\n    error.validationSource = branchName;\n    error.validationError = 'Bitbucket committer error';\n    error.validationMessage = `Renovate has experienced the following error when attempting to push its branch to the server: \\`${err.message.replaceAll(\n      '`',\n      \"'\",\n    )}\\``;\n    throw error;\n  }\n  if (err.message.includes('remote: error: cannot lock ref')) {\n    logger.error({ err }, 'Error committing files.');\n    return null;\n  }\n  if (\n    err.message.includes('denying non-fast-forward') ||\n    err.message.includes('GH003: Sorry, force-pushing')\n  ) {\n    logger.debug({ err }, 'Permission denied to update branch');\n    const error = new Error(CONFIG_VALIDATION);\n    error.validationSource = branchName;\n    error.validationError = 'Force push denied';\n    error.validationMessage = `Renovate is unable to update branch(es) due to force pushes being disallowed.`;\n    throw error;\n  }\n  logger.debug({ err }, 'Unknown error committing files');\n  // We don't know why this happened, so this will cause bubble up to a branch error\n  throw err;\n}\n\nexport function bulkChangesDisallowed(err: Error): boolean {\n  return err.message.includes('update more than');\n}\n"],"mappings":"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"}
+{"version":3,"file":"error.js","names":[],"sources":["../../../lib/util/git/error.ts"],"sourcesContent":["import { CONFIG_VALIDATION } from '../../constants/error-messages.ts';\nimport { logger } from '../../logger/index.ts';\nimport { ExternalHostError } from '../../types/errors/external-host-error.ts';\nimport { getEnv } from '../env.ts';\nimport type { FileChange } from './types.ts';\n\nexport function checkForPlatformFailure(err: Error): Error | null {\n  if (getEnv().NODE_ENV === 'test') {\n    return null;\n  }\n  const externalHostFailureStrings = [\n    'remote: Invalid username or password',\n    'gnutls_handshake() failed',\n    'The requested URL returned error: 403',\n    'The requested URL returned error: 5',\n    'The remote end hung up unexpectedly',\n    'access denied or repository not exported',\n    'Could not write new index file',\n    'Failed to connect to',\n    'Connection timed out',\n    'malformed object name',\n    'Could not resolve host',\n    'early EOF',\n    'fatal: bad config', // .gitmodules problem\n    'expected flush after ref listing',\n  ];\n  for (const errorStr of externalHostFailureStrings) {\n    if (err.message.includes(errorStr)) {\n      logger.debug({ err }, 'Converting git error to ExternalHostError');\n      return new ExternalHostError(err, 'git');\n    }\n    /* v8 ignore next -- TODO: add test */\n  }\n\n  /* v8 ignore next -- TODO: add test */\n  const configErrorStrings = [\n    {\n      error: 'GitLab: Branch name does not follow the pattern',\n      message:\n        \"Cannot push because branch name does not follow project's push rules\",\n    },\n    {\n      error: 'GitLab: Commit message does not follow the pattern',\n      message:\n        \"Cannot push because commit message does not follow project's push rules\",\n    },\n    {\n      error: ' is not a member of team',\n      message:\n        'The `Restrict commits to existing GitLab users` rule is blocking Renovate push. Check the Renovate `gitAuthor` setting',\n    },\n    {\n      error: 'TF401027:',\n      message:\n        'You need the Git `GenericContribute` permission to perform this action',\n    },\n    {\n      error: 'matches more than one',\n      message:\n        \"Renovate cannot push branches if there are tags with names the same as Renovate's branches. Please remove conflicting tag names or change Renovate's branchPrefix to avoid conflicts.\",\n    },\n  ];\n  /* v8 ignore next -- TODO: add test */\n  for (const { error, message } of configErrorStrings) {\n    if (err.message.includes(error)) {\n      logger.debug({ err }, 'Converting git error to CONFIG_VALIDATION error');\n      const res = new Error(CONFIG_VALIDATION);\n      res.validationError = message;\n      res.validationMessage = `\\`${err.message.replaceAll('`', \"'\")}\\``;\n      return res;\n    }\n  }\n\n  /* v8 ignore next -- TODO: add test */\n  return null;\n}\n\n/* v8 ignore next -- TODO: add tests */\nexport function handleCommitError(\n  err: Error,\n  branchName: string,\n  files?: FileChange[],\n): null {\n  checkForPlatformFailure(err);\n  if (err.message.includes(`'refs/heads/renovate' exists`)) {\n    const error = new Error(CONFIG_VALIDATION);\n    error.validationSource = 'None';\n    error.validationError = 'An existing branch is blocking Renovate';\n    error.validationMessage = `Renovate needs to create the branch \\`${branchName}\\` but is blocked from doing so because of an existing branch called \\`renovate\\`. Please remove it so that Renovate can proceed.`;\n    throw error;\n  }\n  if (\n    err.message.includes(\n      'refusing to allow a GitHub App to create or update workflow',\n    )\n  ) {\n    logger.warn(\n      'App has not been granted permissions to update Workflows - aborting branch.',\n    );\n    return null;\n  }\n  if (err.message.includes('GH013')) {\n    logger.debug({ err }, 'GitHub repository ruleset blocked push');\n    const error = new Error(CONFIG_VALIDATION);\n    error.validationSource = branchName;\n    error.validationError = 'GitHub repository ruleset violation';\n    error.validationMessage =\n      `Renovate cannot push to \\`${branchName}\\` because a GitHub ` +\n      `repository ruleset rejected the push (GH013). Update the ` +\n      `ruleset - or grant Renovate a bypass actor - so Renovate can ` +\n      `proceed. Original error: \\`${err.message.replaceAll('`', \"'\")}\\``;\n    throw error;\n  }\n  const isRejected =\n    err.message.includes('remote rejected') || err.message.includes('403');\n  if (\n    isRejected &&\n    files?.some((file) => file.path?.startsWith('.github/workflows/'))\n  ) {\n    logger.debug({ err }, 'commitFiles error');\n    logger.info('Workflows update rejection - aborting branch.');\n    return null;\n  }\n  if (err.message.includes('protected branch hook declined')) {\n    const error = new Error(CONFIG_VALIDATION);\n    error.validationSource = branchName;\n    error.validationError = 'Renovate branch is protected';\n    error.validationMessage = `Renovate cannot push to its branch because branch protection has been enabled.`;\n    throw error;\n  }\n  if (err.message.includes('can only push your own commits')) {\n    const error = new Error(CONFIG_VALIDATION);\n    error.validationSource = branchName;\n    error.validationError = 'Bitbucket committer error';\n    error.validationMessage = `Renovate has experienced the following error when attempting to push its branch to the server: \\`${err.message.replaceAll(\n      '`',\n      \"'\",\n    )}\\``;\n    throw error;\n  }\n  if (err.message.includes('remote: error: cannot lock ref')) {\n    logger.error({ err }, 'Error committing files.');\n    return null;\n  }\n  if (\n    err.message.includes('denying non-fast-forward') ||\n    err.message.includes('GH003: Sorry, force-pushing')\n  ) {\n    logger.debug({ err }, 'Permission denied to update branch');\n    const error = new Error(CONFIG_VALIDATION);\n    error.validationSource = branchName;\n    error.validationError = 'Force push denied';\n    error.validationMessage = `Renovate is unable to update branch(es) due to force pushes being disallowed.`;\n    throw error;\n  }\n  logger.debug({ err }, 'Unknown error committing files');\n  // We don't know why this happened, so this will cause bubble up to a branch error\n  throw err;\n}\n\nexport function bulkChangesDisallowed(err: Error): boolean {\n  return err.message.includes('update more than');\n}\n"],"mappings":"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"}

package/dist/util/host-rules.js

@@ -211,7 +211,8 @@ function withoutUserinfo(url, parsed) {
 function parseUserinfoUrl(url) {
 	if (!url.includes("@")) return null;
 	const parsed = parseUrl(url);
-	if (!parsed || !isHttpUrl(parsed) || !parsed.username && !parsed.password) return null;
+	if (!parsed || !isHttpUrl(parsed)) return null;
+	if (!parsed.username && !parsed.password) return null;
 	if (!parsed.password && isPlaceholderUsername(parsed.username)) return null;
 	return parsed;
 }
@@ -331,7 +332,8 @@ function matchesHost(url, matchHost, { prefixOnly = false } = {}) {
 	const parsedMatchHost = parseUrl(matchHost);
 	if (isHttpUrl(parsedUrl) && isHttpUrl(parsedMatchHost)) {
 		const { href } = parsedMatchHost;
-		return stripUrlCredentials(parsedUrl).startsWith(href) || !prefixOnly && ensureTrailingSlash(`${parsedUrl.origin}${parsedUrl.pathname}`) === href;
+		if (stripUrlCredentials(parsedUrl).startsWith(href)) return true;
+		return !prefixOnly && ensureTrailingSlash(`${parsedUrl.origin}${parsedUrl.pathname}`) === href;
 	}
 	const { hostname } = parsedUrl;
 	if (!hostname) return false;
@@ -344,7 +346,7 @@ function fromShorterToLongerMatchHost(a, b) {
 	return a.matchHost.length - b.matchHost.length;
 }
 function hostRuleRank({ hostType, matchHost, readOnly }) {
-	if ((hostType || readOnly) && matchHost) return 3;
+	if ((!!hostType || !!readOnly) && matchHost) return 3;
 	if (matchHost) return 2;
 	if (hostType) return 1;
 	return 0;