renovate 44.93.8 → 44.94.0

package/dist/modules/datasource/npm/npmrc.js

@@ -109,7 +109,7 @@ function setNpmrc(input) {
 		const npmrcRules = convertNpmrcToRules(npmrc);
 		if (npmrcRules.hostRules?.length) npmrcRules.hostRules.forEach((hostRule) => add(hostRule));
 		packageRules = npmrcRules.packageRules;
-	} else if (npmrc) {
+	} else {
 		logger.debug("Resetting npmrc");
 		npmrc = {};
 		npmrcRaw = "";

package/dist/modules/datasource/npm/npmrc.js.map

@@ -1 +1 @@
-{"version":3,"file":"npmrc.js","names":["hostRules.add"],"sources":["../../../../lib/modules/datasource/npm/npmrc.ts"],"sourcesContent":["import { isNonEmptyString, isString } from '@sindresorhus/is';\nimport ini from 'ini';\nimport { GlobalConfig } from '../../../config/global.ts';\nimport type { PackageRule } from '../../../config/types.ts';\nimport { logger } from '../../../logger/index.ts';\nimport type { HostRule } from '../../../types/index.ts';\nimport { getEnv } from '../../../util/env.ts';\nimport * as hostRules from '../../../util/host-rules.ts';\nimport { regEx } from '../../../util/regex.ts';\nimport { fromBase64 } from '../../../util/string.ts';\nimport { ensureTrailingSlash, isHttpUrl } from '../../../util/url.ts';\nimport { defaultRegistryUrl } from './common.ts';\nimport type { NpmrcRules } from './types.ts';\n\nlet npmrc: Record<string, any> = {};\nlet npmrcRaw = '';\nlet packageRules: PackageRule[] = [];\n\nfunction envReplace(value: any, env = getEnv()): any {\n  /* v8 ignore next -- TODO: add test */\n  if (!isString(value)) {\n    return value;\n  }\n\n  const ENV_EXPR = regEx(/(?<esc>\\\\*)\\$\\{(?<envVarName>[^}]+)\\}/g);\n\n  return value.replace(ENV_EXPR, (match, _esc, envVarName) => {\n    if (env[envVarName] === undefined) {\n      logger.warn({ match }, 'Failed to replace env in config');\n      throw new Error('env-replace');\n    }\n    return env[envVarName];\n  });\n}\n\nexport function getMatchHostFromNpmrcHost(input: string): string {\n  if (input.startsWith('//')) {\n    const matchHost = input.replace('//', '');\n    if (matchHost.includes('/')) {\n      return `https://${matchHost}`;\n    }\n    return matchHost;\n  }\n  return input;\n}\n\nexport function convertNpmrcToRules(npmrc: Record<string, any>): NpmrcRules {\n  const rules: NpmrcRules = {\n    hostRules: [],\n    packageRules: [],\n  };\n  // Generate hostRules\n  const hostType = 'npm';\n  const hosts: Record<string, HostRule> = {};\n  for (const [key, value] of Object.entries(npmrc)) {\n    if (!isNonEmptyString(value)) {\n      continue;\n    }\n    const keyParts = key.split(':');\n    const keyType = keyParts.pop();\n    let matchHost = '';\n    if (keyParts.length) {\n      matchHost = getMatchHostFromNpmrcHost(keyParts.join(':'));\n    }\n    const rule: HostRule = hosts[matchHost] || {};\n    if (keyType === '_authToken' || keyType === '_auth') {\n      rule.token = value;\n      if (keyType === '_auth') {\n        rule.authType = 'Basic';\n      }\n    } else if (keyType === 'username') {\n      rule.username = value;\n    } else if (keyType === '_password') {\n      rule.password = fromBase64(value);\n    } else {\n      continue; // don't add the rule\n    }\n    hosts[matchHost] = rule;\n  }\n  for (const [matchHost, rule] of Object.entries(hosts)) {\n    const hostRule = { ...rule, hostType };\n    if (matchHost) {\n      hostRule.matchHost = matchHost;\n    }\n    rules.hostRules?.push(hostRule);\n  }\n  // Generate packageRules\n  const matchDatasources = ['npm'];\n  const { registry } = npmrc;\n  // packageRules order matters, so look for a default registry first\n  if (isNonEmptyString(registry)) {\n    if (isHttpUrl(registry)) {\n      // Default registry\n      rules.packageRules?.push({\n        matchDatasources,\n        registryUrls: [registry],\n      });\n    } else {\n      logger.warn({ registry }, 'Invalid npmrc registry= URL');\n    }\n  }\n  // Now look for scoped registries\n  for (const [key, value] of Object.entries(npmrc)) {\n    if (!isNonEmptyString(value)) {\n      continue;\n    }\n    const keyParts = key.split(':');\n    const keyType = keyParts.pop();\n    if (keyType === 'registry' && keyParts.length && isNonEmptyString(value)) {\n      const scope = keyParts.join(':');\n      if (isHttpUrl(value)) {\n        rules.packageRules?.push({\n          matchDatasources,\n          matchPackageNames: [`${scope}/**`],\n          registryUrls: [value],\n        });\n      } else {\n        logger.warn({ scope, registry: value }, 'Invalid npmrc registry= URL');\n      }\n    }\n  }\n  return rules;\n}\n\nexport function setNpmrc(input?: string): void {\n  if (input) {\n    if (input === npmrcRaw) {\n      return;\n    }\n    const existingNpmrc = npmrc;\n    npmrcRaw = input;\n    logger.debug('Setting npmrc');\n    npmrc = ini.parse(input.replace(regEx(/\\\\n/g), '\\n'));\n    const exposeAllEnv = GlobalConfig.get('exposeAllEnv');\n    for (const [key, val] of Object.entries(npmrc)) {\n      if (\n        !exposeAllEnv &&\n        key.endsWith('registry') &&\n        isString(val) &&\n        val.includes('localhost')\n      ) {\n        logger.debug(\n          { key, val },\n          'Detected localhost registry - rejecting npmrc file',\n        );\n        npmrc = existingNpmrc;\n        return;\n      }\n    }\n    if (exposeAllEnv) {\n      for (const key of Object.keys(npmrc)) {\n        npmrc[key] = envReplace(npmrc[key]);\n      }\n    }\n    const npmrcRules = convertNpmrcToRules(npmrc);\n    if (npmrcRules.hostRules?.length) {\n      npmrcRules.hostRules.forEach((hostRule) => hostRules.add(hostRule));\n    }\n    packageRules = npmrcRules.packageRules;\n    // NOTE: `npmrc` is an object, so it is never falsy. A coverage-ignore hint\n    // cannot suppress the implicit else on an `else if`.\n  } else if (npmrc) {\n    logger.debug('Resetting npmrc');\n    npmrc = {};\n    npmrcRaw = '';\n    packageRules = [];\n  }\n}\n\nexport function resolveRegistryUrl(packageName: string): string {\n  let registryUrl = defaultRegistryUrl;\n  for (const rule of packageRules) {\n    const { matchPackageNames, registryUrls } = rule;\n    if (\n      !matchPackageNames ||\n      packageName.startsWith(matchPackageNames[0].replace(regEx(/\\*\\*$/), ''))\n    ) {\n      // TODO: fix types #22198\n      registryUrl = registryUrls![0];\n    }\n  }\n  return registryUrl;\n}\n\nexport function resolvePackageUrl(\n  registryUrl: string,\n  packageName: string,\n): string {\n  return new URL(\n    encodeURIComponent(packageName).replace(regEx(/^%40/), '@'),\n    ensureTrailingSlash(registryUrl),\n  ).href;\n}\n"],"mappings":"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"}
+{"version":3,"file":"npmrc.js","names":["hostRules.add"],"sources":["../../../../lib/modules/datasource/npm/npmrc.ts"],"sourcesContent":["import { isNonEmptyString, isString } from '@sindresorhus/is';\nimport ini from 'ini';\nimport { GlobalConfig } from '../../../config/global.ts';\nimport type { PackageRule } from '../../../config/types.ts';\nimport { logger } from '../../../logger/index.ts';\nimport type { HostRule } from '../../../types/index.ts';\nimport { getEnv } from '../../../util/env.ts';\nimport * as hostRules from '../../../util/host-rules.ts';\nimport { regEx } from '../../../util/regex.ts';\nimport { fromBase64 } from '../../../util/string.ts';\nimport { ensureTrailingSlash, isHttpUrl } from '../../../util/url.ts';\nimport { defaultRegistryUrl } from './common.ts';\nimport type { NpmrcRules } from './types.ts';\n\nlet npmrc: Record<string, any> = {};\nlet npmrcRaw = '';\nlet packageRules: PackageRule[] = [];\n\nfunction envReplace(value: any, env = getEnv()): any {\n  /* v8 ignore next -- TODO: add test */\n  if (!isString(value)) {\n    return value;\n  }\n\n  const ENV_EXPR = regEx(/(?<esc>\\\\*)\\$\\{(?<envVarName>[^}]+)\\}/g);\n\n  return value.replace(ENV_EXPR, (match, _esc, envVarName) => {\n    if (env[envVarName] === undefined) {\n      logger.warn({ match }, 'Failed to replace env in config');\n      throw new Error('env-replace');\n    }\n    return env[envVarName];\n  });\n}\n\nexport function getMatchHostFromNpmrcHost(input: string): string {\n  if (input.startsWith('//')) {\n    const matchHost = input.replace('//', '');\n    if (matchHost.includes('/')) {\n      return `https://${matchHost}`;\n    }\n    return matchHost;\n  }\n  return input;\n}\n\nexport function convertNpmrcToRules(npmrc: Record<string, any>): NpmrcRules {\n  const rules: NpmrcRules = {\n    hostRules: [],\n    packageRules: [],\n  };\n  // Generate hostRules\n  const hostType = 'npm';\n  const hosts: Record<string, HostRule> = {};\n  for (const [key, value] of Object.entries(npmrc)) {\n    if (!isNonEmptyString(value)) {\n      continue;\n    }\n    const keyParts = key.split(':');\n    const keyType = keyParts.pop();\n    let matchHost = '';\n    if (keyParts.length) {\n      matchHost = getMatchHostFromNpmrcHost(keyParts.join(':'));\n    }\n    const rule: HostRule = hosts[matchHost] || {};\n    if (keyType === '_authToken' || keyType === '_auth') {\n      rule.token = value;\n      if (keyType === '_auth') {\n        rule.authType = 'Basic';\n      }\n    } else if (keyType === 'username') {\n      rule.username = value;\n    } else if (keyType === '_password') {\n      rule.password = fromBase64(value);\n    } else {\n      continue; // don't add the rule\n    }\n    hosts[matchHost] = rule;\n  }\n  for (const [matchHost, rule] of Object.entries(hosts)) {\n    const hostRule = { ...rule, hostType };\n    if (matchHost) {\n      hostRule.matchHost = matchHost;\n    }\n    rules.hostRules?.push(hostRule);\n  }\n  // Generate packageRules\n  const matchDatasources = ['npm'];\n  const { registry } = npmrc;\n  // packageRules order matters, so look for a default registry first\n  if (isNonEmptyString(registry)) {\n    if (isHttpUrl(registry)) {\n      // Default registry\n      rules.packageRules?.push({\n        matchDatasources,\n        registryUrls: [registry],\n      });\n    } else {\n      logger.warn({ registry }, 'Invalid npmrc registry= URL');\n    }\n  }\n  // Now look for scoped registries\n  for (const [key, value] of Object.entries(npmrc)) {\n    if (!isNonEmptyString(value)) {\n      continue;\n    }\n    const keyParts = key.split(':');\n    const keyType = keyParts.pop();\n    if (keyType === 'registry' && keyParts.length && isNonEmptyString(value)) {\n      const scope = keyParts.join(':');\n      if (isHttpUrl(value)) {\n        rules.packageRules?.push({\n          matchDatasources,\n          matchPackageNames: [`${scope}/**`],\n          registryUrls: [value],\n        });\n      } else {\n        logger.warn({ scope, registry: value }, 'Invalid npmrc registry= URL');\n      }\n    }\n  }\n  return rules;\n}\n\nexport function setNpmrc(input?: string): void {\n  if (input) {\n    if (input === npmrcRaw) {\n      return;\n    }\n    const existingNpmrc = npmrc;\n    npmrcRaw = input;\n    logger.debug('Setting npmrc');\n    npmrc = ini.parse(input.replace(regEx(/\\\\n/g), '\\n'));\n    const exposeAllEnv = GlobalConfig.get('exposeAllEnv');\n    for (const [key, val] of Object.entries(npmrc)) {\n      if (\n        !exposeAllEnv &&\n        key.endsWith('registry') &&\n        isString(val) &&\n        val.includes('localhost')\n      ) {\n        logger.debug(\n          { key, val },\n          'Detected localhost registry - rejecting npmrc file',\n        );\n        npmrc = existingNpmrc;\n        return;\n      }\n    }\n    if (exposeAllEnv) {\n      for (const key of Object.keys(npmrc)) {\n        npmrc[key] = envReplace(npmrc[key]);\n      }\n    }\n    const npmrcRules = convertNpmrcToRules(npmrc);\n    if (npmrcRules.hostRules?.length) {\n      npmrcRules.hostRules.forEach((hostRule) => hostRules.add(hostRule));\n    }\n    packageRules = npmrcRules.packageRules;\n  } else {\n    // `npmrc` starts as an object and is only ever reassigned to one, so it is\n    // always truthy here\n    logger.debug('Resetting npmrc');\n    npmrc = {};\n    npmrcRaw = '';\n    packageRules = [];\n  }\n}\n\nexport function resolveRegistryUrl(packageName: string): string {\n  let registryUrl = defaultRegistryUrl;\n  for (const rule of packageRules) {\n    const { matchPackageNames, registryUrls } = rule;\n    if (\n      !matchPackageNames ||\n      packageName.startsWith(matchPackageNames[0].replace(regEx(/\\*\\*$/), ''))\n    ) {\n      // TODO: fix types #22198\n      registryUrl = registryUrls![0];\n    }\n  }\n  return registryUrl;\n}\n\nexport function resolvePackageUrl(\n  registryUrl: string,\n  packageName: string,\n): string {\n  return new URL(\n    encodeURIComponent(packageName).replace(regEx(/^%40/), '@'),\n    ensureTrailingSlash(registryUrl),\n  ).href;\n}\n"],"mappings":"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"}

package/dist/modules/datasource/ruby-version/index.js

@@ -59,6 +59,7 @@ var RubyVersionDatasource = class RubyVersionDatasource extends Datasource {
 		return withCache({
 			namespace: `datasource-${RubyVersionDatasource.id}`,
 			key: "all",
+			cacheable: true,
 			fallback: true
 		}, () => this._getReleases(config));
 	}

package/dist/modules/datasource/ruby-version/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["rubyVersioningId"],"sources":["../../../../lib/modules/datasource/ruby-version/index.ts"],"sourcesContent":["import { logger } from '../../../logger/index.ts';\nimport { ExternalHostError } from '../../../types/errors/external-host-error.ts';\nimport { coerceArray } from '../../../util/array.ts';\nimport { withCache } from '../../../util/cache/package/with-cache.ts';\nimport { parse } from '../../../util/html.ts';\nimport type { HttpError } from '../../../util/http/index.ts';\nimport { asTimestamp } from '../../../util/timestamp.ts';\nimport {\n  isVersion,\n  id as rubyVersioningId,\n} from '../../versioning/ruby/index.ts';\nimport { Datasource } from '../datasource.ts';\nimport type { GetReleasesConfig, ReleaseResult } from '../types.ts';\n\nexport class RubyVersionDatasource extends Datasource {\n  static readonly id = 'ruby-version';\n\n  constructor() {\n    super(RubyVersionDatasource.id);\n  }\n\n  override readonly defaultRegistryUrls = ['https://www.ruby-lang.org/'];\n\n  override readonly customRegistrySupport = false;\n\n  override readonly defaultVersioning = rubyVersioningId;\n\n  override readonly releaseTimestampSupport = true;\n  override readonly releaseTimestampNote =\n    'The release timestamp is determined from the `release-list` table in the results.';\n  override readonly sourceUrlSupport = 'package';\n  override readonly sourceUrlNote =\n    'We use the URL: https://github.com/ruby/ruby.';\n\n  private async _getReleases({\n    registryUrl,\n  }: GetReleasesConfig): Promise<ReleaseResult | null> {\n    const res: ReleaseResult = {\n      homepage: 'https://www.ruby-lang.org',\n      sourceUrl: 'https://github.com/ruby/ruby',\n      releases: [],\n    };\n    // TODO: types (#22198)\n    const rubyVersionsUrl = `${registryUrl}en/downloads/releases/`;\n    try {\n      const response = await this.http.getText(rubyVersionsUrl);\n\n      const root = parse(response.body);\n      const rows = coerceArray(\n        root.querySelector('.release-list')?.querySelectorAll('tr'),\n      );\n      rows.forEach((row) => {\n        const tds = row.querySelectorAll('td');\n        const columns: string[] = [];\n        tds.forEach((td) => columns.push(td.innerHTML));\n        if (columns.length) {\n          const version = columns[0].replace('Ruby ', '');\n          if (isVersion(version)) {\n            const releaseTimestamp = asTimestamp(columns[1]);\n            const changelogUrl = columns[2]\n              .replace('<a href=\"', 'https://www.ruby-lang.org')\n              .replace('\">more...</a>', '');\n            res.releases.push({ version, releaseTimestamp, changelogUrl });\n          }\n        }\n      });\n      if (!res.releases.length) {\n        logger.warn({ registryUrl }, 'Missing ruby releases');\n        return null;\n      }\n    } catch (err) {\n      this.handleGenericErrors(err);\n    }\n\n    return res;\n  }\n\n  getReleases(config: GetReleasesConfig): Promise<ReleaseResult | null> {\n    return withCache(\n      {\n        namespace: `datasource-${RubyVersionDatasource.id}`,\n        key: 'all',\n        fallback: true,\n      },\n      () => this._getReleases(config),\n    );\n  }\n\n  override handleHttpErrors(err: HttpError): never | void {\n    throw new ExternalHostError(err);\n  }\n}\n"],"mappings":";;;;;;;;;AAcA,IAAa,wBAAb,MAAa,8BAA8B,WAAW;CACpD,OAAgB,KAAK;CAErB,cAAc;EACZ,MAAM,sBAAsB,EAAE;CAChC;CAEA,sBAAwC,CAAC,4BAA4B;CAErE,wBAA0C;CAE1C,oBAAsCA;CAEtC,0BAA4C;CAC5C,uBACE;CACF,mBAAqC;CACrC,gBACE;CAEF,MAAc,aAAa,EACzB,eACmD;EACnD,MAAM,MAAqB;GACzB,UAAU;GACV,WAAW;GACX,UAAU,CAAC;EACb;EAEA,MAAM,kBAAkB,GAAG,YAAY;EACvC,IAAI;GACF,MAAM,WAAW,MAAM,KAAK,KAAK,QAAQ,eAAe;GAExD,MAAM,OAAO,MAAM,SAAS,IAAI;GAIhC,YAFE,KAAK,cAAc,eAAe,CAAC,EAAE,iBAAiB,IAAI,CAEzD,CAAC,CAAC,SAAS,QAAQ;IACpB,MAAM,MAAM,IAAI,iBAAiB,IAAI;IACrC,MAAM,UAAoB,CAAC;IAC3B,IAAI,SAAS,OAAO,QAAQ,KAAK,GAAG,SAAS,CAAC;IAC9C,IAAI,QAAQ,QAAQ;KAClB,MAAM,UAAU,QAAQ,EAAE,CAAC,QAAQ,SAAS,EAAE;KAC9C,IAAI,UAAU,OAAO,GAAG;MACtB,MAAM,mBAAmB,YAAY,QAAQ,EAAE;MAC/C,MAAM,eAAe,QAAQ,EAAE,CAC5B,QAAQ,cAAa,2BAA2B,CAAC,CACjD,QAAQ,kBAAiB,EAAE;MAC9B,IAAI,SAAS,KAAK;OAAE;OAAS;OAAkB;MAAa,CAAC;KAC/D;IACF;GACF,CAAC;GACD,IAAI,CAAC,IAAI,SAAS,QAAQ;IACxB,OAAO,KAAK,EAAE,YAAY,GAAG,uBAAuB;IACpD,OAAO;GACT;EACF,SAAS,KAAK;GACZ,KAAK,oBAAoB,GAAG;EAC9B;EAEA,OAAO;CACT;CAEA,YAAY,QAA0D;EACpE,OAAO,UACL;GACE,WAAW,cAAc,sBAAsB;GAC/C,KAAK;GACL,UAAU;EACZ,SACM,KAAK,aAAa,MAAM,CAChC;CACF;CAEA,iBAA0B,KAA8B;EACtD,MAAM,IAAI,kBAAkB,GAAG;CACjC;AACF"}
+{"version":3,"file":"index.js","names":["rubyVersioningId"],"sources":["../../../../lib/modules/datasource/ruby-version/index.ts"],"sourcesContent":["import { logger } from '../../../logger/index.ts';\nimport { ExternalHostError } from '../../../types/errors/external-host-error.ts';\nimport { coerceArray } from '../../../util/array.ts';\nimport { withCache } from '../../../util/cache/package/with-cache.ts';\nimport { parse } from '../../../util/html.ts';\nimport type { HttpError } from '../../../util/http/index.ts';\nimport { asTimestamp } from '../../../util/timestamp.ts';\nimport {\n  isVersion,\n  id as rubyVersioningId,\n} from '../../versioning/ruby/index.ts';\nimport { Datasource } from '../datasource.ts';\nimport type { GetReleasesConfig, ReleaseResult } from '../types.ts';\n\nexport class RubyVersionDatasource extends Datasource {\n  static readonly id = 'ruby-version';\n\n  constructor() {\n    super(RubyVersionDatasource.id);\n  }\n\n  override readonly defaultRegistryUrls = ['https://www.ruby-lang.org/'];\n\n  override readonly customRegistrySupport = false;\n\n  override readonly defaultVersioning = rubyVersioningId;\n\n  override readonly releaseTimestampSupport = true;\n  override readonly releaseTimestampNote =\n    'The release timestamp is determined from the `release-list` table in the results.';\n  override readonly sourceUrlSupport = 'package';\n  override readonly sourceUrlNote =\n    'We use the URL: https://github.com/ruby/ruby.';\n\n  private async _getReleases({\n    registryUrl,\n  }: GetReleasesConfig): Promise<ReleaseResult | null> {\n    const res: ReleaseResult = {\n      homepage: 'https://www.ruby-lang.org',\n      sourceUrl: 'https://github.com/ruby/ruby',\n      releases: [],\n    };\n    // TODO: types (#22198)\n    const rubyVersionsUrl = `${registryUrl}en/downloads/releases/`;\n    try {\n      const response = await this.http.getText(rubyVersionsUrl);\n\n      const root = parse(response.body);\n      const rows = coerceArray(\n        root.querySelector('.release-list')?.querySelectorAll('tr'),\n      );\n      rows.forEach((row) => {\n        const tds = row.querySelectorAll('td');\n        const columns: string[] = [];\n        tds.forEach((td) => columns.push(td.innerHTML));\n        if (columns.length) {\n          const version = columns[0].replace('Ruby ', '');\n          if (isVersion(version)) {\n            const releaseTimestamp = asTimestamp(columns[1]);\n            const changelogUrl = columns[2]\n              .replace('<a href=\"', 'https://www.ruby-lang.org')\n              .replace('\">more...</a>', '');\n            res.releases.push({ version, releaseTimestamp, changelogUrl });\n          }\n        }\n      });\n      if (!res.releases.length) {\n        logger.warn({ registryUrl }, 'Missing ruby releases');\n        return null;\n      }\n    } catch (err) {\n      this.handleGenericErrors(err);\n    }\n\n    return res;\n  }\n\n  getReleases(config: GetReleasesConfig): Promise<ReleaseResult | null> {\n    return withCache(\n      {\n        namespace: `datasource-${RubyVersionDatasource.id}`,\n        key: 'all',\n        cacheable: true,\n        fallback: true,\n      },\n      () => this._getReleases(config),\n    );\n  }\n\n  override handleHttpErrors(err: HttpError): never | void {\n    throw new ExternalHostError(err);\n  }\n}\n"],"mappings":";;;;;;;;;AAcA,IAAa,wBAAb,MAAa,8BAA8B,WAAW;CACpD,OAAgB,KAAK;CAErB,cAAc;EACZ,MAAM,sBAAsB,EAAE;CAChC;CAEA,sBAAwC,CAAC,4BAA4B;CAErE,wBAA0C;CAE1C,oBAAsCA;CAEtC,0BAA4C;CAC5C,uBACE;CACF,mBAAqC;CACrC,gBACE;CAEF,MAAc,aAAa,EACzB,eACmD;EACnD,MAAM,MAAqB;GACzB,UAAU;GACV,WAAW;GACX,UAAU,CAAC;EACb;EAEA,MAAM,kBAAkB,GAAG,YAAY;EACvC,IAAI;GACF,MAAM,WAAW,MAAM,KAAK,KAAK,QAAQ,eAAe;GAExD,MAAM,OAAO,MAAM,SAAS,IAAI;GAIhC,YAFE,KAAK,cAAc,eAAe,CAAC,EAAE,iBAAiB,IAAI,CAEzD,CAAC,CAAC,SAAS,QAAQ;IACpB,MAAM,MAAM,IAAI,iBAAiB,IAAI;IACrC,MAAM,UAAoB,CAAC;IAC3B,IAAI,SAAS,OAAO,QAAQ,KAAK,GAAG,SAAS,CAAC;IAC9C,IAAI,QAAQ,QAAQ;KAClB,MAAM,UAAU,QAAQ,EAAE,CAAC,QAAQ,SAAS,EAAE;KAC9C,IAAI,UAAU,OAAO,GAAG;MACtB,MAAM,mBAAmB,YAAY,QAAQ,EAAE;MAC/C,MAAM,eAAe,QAAQ,EAAE,CAC5B,QAAQ,cAAa,2BAA2B,CAAC,CACjD,QAAQ,kBAAiB,EAAE;MAC9B,IAAI,SAAS,KAAK;OAAE;OAAS;OAAkB;MAAa,CAAC;KAC/D;IACF;GACF,CAAC;GACD,IAAI,CAAC,IAAI,SAAS,QAAQ;IACxB,OAAO,KAAK,EAAE,YAAY,GAAG,uBAAuB;IACpD,OAAO;GACT;EACF,SAAS,KAAK;GACZ,KAAK,oBAAoB,GAAG;EAC9B;EAEA,OAAO;CACT;CAEA,YAAY,QAA0D;EACpE,OAAO,UACL;GACE,WAAW,cAAc,sBAAsB;GAC/C,KAAK;GACL,WAAW;GACX,UAAU;EACZ,SACM,KAAK,aAAa,MAAM,CAChC;CACF;CAEA,iBAA0B,KAA8B;EACtD,MAAM,IAAI,kBAAkB,GAAG;CACjC;AACF"}

package/dist/modules/datasource/typst/index.js

@@ -7,17 +7,14 @@ import { Registry } from "./schema.js";
 //#region lib/modules/datasource/typst/index.ts
 var TypstDatasource = class TypstDatasource extends Datasource {
 	static id = "typst";
+	customRegistrySupport = false;
 	defaultRegistryUrls = ["https://packages.typst.org/preview/index.json"];
 	defaultVersioning = id;
 	constructor() {
 		super(TypstDatasource.id);
 	}
 	async _getReleases({ packageName }) {
-		const [namespace, pkg] = packageName.split("/");
-		if (namespace !== "preview") {
-			logger.debug(`Unsupported namespace for @${packageName}`);
-			return null;
-		}
+		const [, pkg] = packageName.split("/");
 		const [registryUrl] = this.defaultRegistryUrls;
 		const cacheProvider = new PackageHttpCacheProvider({
 			namespace: "datasource-typst:cache-provider",
@@ -30,11 +27,17 @@ var TypstDatasource = class TypstDatasource extends Datasource {
 		result.registryUrl = registryUrl;
 		return result;
 	}
-	getReleases(config) {
+	async getReleases(config) {
+		const [namespace] = config.packageName.split("/");
+		if (namespace !== "preview") {
+			logger.debug(`Unsupported namespace for @${config.packageName}`);
+			return null;
+		}
 		return withCache({
 			namespace: `datasource-${TypstDatasource.id}:registry-releases`,
 			key: config.packageName,
-			fallback: true
+			fallback: true,
+			cacheable: true
 		}, () => this._getReleases(config));
 	}
 };

package/dist/modules/datasource/typst/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["semver"],"sources":["../../../../lib/modules/datasource/typst/index.ts"],"sourcesContent":["import { logger } from '../../../logger/index.ts';\nimport { withCache } from '../../../util/cache/package/with-cache.ts';\nimport { PackageHttpCacheProvider } from '../../../util/http/cache/package-http-cache-provider.ts';\nimport { id as semver } from '../../versioning/semver-coerced/index.ts';\nimport { Datasource } from '../datasource.ts';\nimport type { GetReleasesConfig, ReleaseResult } from '../types.ts';\nimport { Registry } from './schema.ts';\n\nexport class TypstDatasource extends Datasource {\n  static readonly id = 'typst';\n\n  override readonly defaultRegistryUrls = [\n    'https://packages.typst.org/preview/index.json',\n  ];\n\n  override defaultVersioning = semver;\n\n  constructor() {\n    super(TypstDatasource.id);\n  }\n\n  private async _getReleases({\n    packageName,\n  }: GetReleasesConfig): Promise<ReleaseResult | null> {\n    const [namespace, pkg] = packageName.split('/');\n    if (namespace !== 'preview') {\n      logger.debug(`Unsupported namespace for @${packageName}`);\n      return null;\n    }\n\n    const [registryUrl] = this.defaultRegistryUrls;\n\n    const cacheProvider = new PackageHttpCacheProvider({\n      namespace: 'datasource-typst:cache-provider',\n      checkAuthorizationHeader: false,\n      checkCacheControlHeader: false,\n    });\n\n    const { body: registry } = await this.http.getJson(\n      registryUrl,\n      { cacheProvider },\n      Registry,\n    );\n\n    const result = registry[pkg];\n    if (!result) {\n      return null;\n    }\n\n    result.registryUrl = registryUrl;\n    return result;\n  }\n\n  override getReleases(\n    config: GetReleasesConfig,\n  ): Promise<ReleaseResult | null> {\n    return withCache(\n      {\n        namespace: `datasource-${TypstDatasource.id}:registry-releases`,\n        key: config.packageName,\n        fallback: true,\n      },\n      () => this._getReleases(config),\n    );\n  }\n}\n"],"mappings":";;;;;;;AAQA,IAAa,kBAAb,MAAa,wBAAwB,WAAW;CAC9C,OAAgB,KAAK;CAErB,sBAAwC,CACtC,+CACF;CAEA,oBAA6BA;CAE7B,cAAc;EACZ,MAAM,gBAAgB,EAAE;CAC1B;CAEA,MAAc,aAAa,EACzB,eACmD;EACnD,MAAM,CAAC,WAAW,OAAO,YAAY,MAAM,GAAG;EAC9C,IAAI,cAAc,WAAW;GAC3B,OAAO,MAAM,8BAA8B,aAAa;GACxD,OAAO;EACT;EAEA,MAAM,CAAC,eAAe,KAAK;EAE3B,MAAM,gBAAgB,IAAI,yBAAyB;GACjD,WAAW;GACX,0BAA0B;GAC1B,yBAAyB;EAC3B,CAAC;EAED,MAAM,EAAE,MAAM,aAAa,MAAM,KAAK,KAAK,QACzC,aACA,EAAE,cAAc,GAChB,QACF;EAEA,MAAM,SAAS,SAAS;EACxB,IAAI,CAAC,QACH,OAAO;EAGT,OAAO,cAAc;EACrB,OAAO;CACT;CAEA,YACE,QAC+B;EAC/B,OAAO,UACL;GACE,WAAW,cAAc,gBAAgB,GAAG;GAC5C,KAAK,OAAO;GACZ,UAAU;EACZ,SACM,KAAK,aAAa,MAAM,CAChC;CACF;AACF"}
+{"version":3,"file":"index.js","names":["semver"],"sources":["../../../../lib/modules/datasource/typst/index.ts"],"sourcesContent":["import { logger } from '../../../logger/index.ts';\nimport { withCache } from '../../../util/cache/package/with-cache.ts';\nimport { PackageHttpCacheProvider } from '../../../util/http/cache/package-http-cache-provider.ts';\nimport { id as semver } from '../../versioning/semver-coerced/index.ts';\nimport { Datasource } from '../datasource.ts';\nimport type { GetReleasesConfig, ReleaseResult } from '../types.ts';\nimport { Registry } from './schema.ts';\n\nexport class TypstDatasource extends Datasource {\n  static readonly id = 'typst';\n\n  override readonly customRegistrySupport = false;\n\n  override readonly defaultRegistryUrls = [\n    'https://packages.typst.org/preview/index.json',\n  ];\n\n  override defaultVersioning = semver;\n\n  constructor() {\n    super(TypstDatasource.id);\n  }\n\n  private async _getReleases({\n    packageName,\n  }: GetReleasesConfig): Promise<ReleaseResult | null> {\n    const [, pkg] = packageName.split('/');\n\n    const [registryUrl] = this.defaultRegistryUrls;\n\n    const cacheProvider = new PackageHttpCacheProvider({\n      namespace: 'datasource-typst:cache-provider',\n      checkAuthorizationHeader: false,\n      checkCacheControlHeader: false,\n    });\n\n    const { body: registry } = await this.http.getJson(\n      registryUrl,\n      { cacheProvider },\n      Registry,\n    );\n\n    const result = registry[pkg];\n    if (!result) {\n      return null;\n    }\n\n    result.registryUrl = registryUrl;\n    return result;\n  }\n\n  override async getReleases(\n    config: GetReleasesConfig,\n  ): Promise<ReleaseResult | null> {\n    const [namespace] = config.packageName.split('/');\n    if (namespace !== 'preview') {\n      logger.debug(`Unsupported namespace for @${config.packageName}`);\n      return null;\n    }\n\n    return withCache(\n      {\n        namespace: `datasource-${TypstDatasource.id}:registry-releases`,\n        key: config.packageName,\n        fallback: true,\n        cacheable: true,\n      },\n      () => this._getReleases(config),\n    );\n  }\n}\n"],"mappings":";;;;;;;AAQA,IAAa,kBAAb,MAAa,wBAAwB,WAAW;CAC9C,OAAgB,KAAK;CAErB,wBAA0C;CAE1C,sBAAwC,CACtC,+CACF;CAEA,oBAA6BA;CAE7B,cAAc;EACZ,MAAM,gBAAgB,EAAE;CAC1B;CAEA,MAAc,aAAa,EACzB,eACmD;EACnD,MAAM,GAAG,OAAO,YAAY,MAAM,GAAG;EAErC,MAAM,CAAC,eAAe,KAAK;EAE3B,MAAM,gBAAgB,IAAI,yBAAyB;GACjD,WAAW;GACX,0BAA0B;GAC1B,yBAAyB;EAC3B,CAAC;EAED,MAAM,EAAE,MAAM,aAAa,MAAM,KAAK,KAAK,QACzC,aACA,EAAE,cAAc,GAChB,QACF;EAEA,MAAM,SAAS,SAAS;EACxB,IAAI,CAAC,QACH,OAAO;EAGT,OAAO,cAAc;EACrB,OAAO;CACT;CAEA,MAAe,YACb,QAC+B;EAC/B,MAAM,CAAC,aAAa,OAAO,YAAY,MAAM,GAAG;EAChD,IAAI,cAAc,WAAW;GAC3B,OAAO,MAAM,8BAA8B,OAAO,aAAa;GAC/D,OAAO;EACT;EAEA,OAAO,UACL;GACE,WAAW,cAAc,gBAAgB,GAAG;GAC5C,KAAK,OAAO;GACZ,UAAU;GACV,WAAW;EACb,SACM,KAAK,aAAa,MAAM,CAChC;CACF;AACF"}

package/dist/modules/manager/apm/artifacts.js

@@ -3,7 +3,8 @@ import { logger } from "../../../logger/index.js";
 import { deleteLocalFile, getSiblingFileName, readLocalFile, writeLocalFile } from "../../../util/fs/index.js";
 import { exec } from "../../../util/exec/index.js";
 import { getRepoStatus } from "../../../util/git/index.js";
-import { resolveToolConstraint } from "../util.js";
+import { collectFileChanges } from "../../../util/git/file-changes.js";
+import { artifactErrorResult, fileChangesToArtifactResults, resolveToolConstraint } from "../util.js";
 import { isNonEmptyArray } from "@sindresorhus/is";
 //#region lib/modules/manager/apm/artifacts.ts
 async function updateArtifacts({ packageFileName, updatedDeps, newPackageFileContent, config }) {
@@ -31,19 +32,10 @@ async function updateArtifacts({ packageFileName, updatedDeps, newPackageFileCon
 		};
 		await exec("apm install", execOptions);
 		const status = await getRepoStatus();
-		const res = [];
-		for (const path of [...status.modified, ...status.not_added]) {
-			if (path === packageFileName) continue;
-			res.push({ file: {
-				type: "addition",
-				path,
-				contents: await readLocalFile(path)
-			} });
-		}
-		for (const path of status.deleted) res.push({ file: {
-			type: "deletion",
-			path
-		} });
+		const res = fileChangesToArtifactResults([...await collectFileChanges(status, {
+			include: ["modified", "not_added"],
+			filter: (path) => path !== packageFileName
+		}), ...await collectFileChanges(status, { include: ["deleted"] })]);
 		if (!res.length) {
 			logger.debug("apm: no changed files after install");
 			return null;
@@ -52,10 +44,7 @@ async function updateArtifacts({ packageFileName, updatedDeps, newPackageFileCon
 	} catch (err) {
 		if (err.message === "temporary-error") throw err;
 		logger.debug({ err }, `Failed to update ${lockFileName}`);
-		return [{ artifactError: {
-			fileName: lockFileName,
-			stderr: `${err}`
-		} }];
+		return artifactErrorResult(lockFileName, err);
 	}
 }
 //#endregion

package/dist/modules/manager/apm/artifacts.js.map

@@ -1 +1 @@
-{"version":3,"file":"artifacts.js","names":[],"sources":["../../../../lib/modules/manager/apm/artifacts.ts"],"sourcesContent":["import { isNonEmptyArray } from '@sindresorhus/is';\nimport { TEMPORARY_ERROR } from '../../../constants/error-messages.ts';\nimport { logger } from '../../../logger/index.ts';\nimport { exec } from '../../../util/exec/index.ts';\nimport type { ExecOptions } from '../../../util/exec/types.ts';\nimport {\n  deleteLocalFile,\n  getSiblingFileName,\n  readLocalFile,\n  writeLocalFile,\n} from '../../../util/fs/index.ts';\nimport { getRepoStatus } from '../../../util/git/index.ts';\nimport type { UpdateArtifact, UpdateArtifactsResult } from '../types.ts';\nimport { resolveToolConstraint } from '../util.ts';\n\nexport async function updateArtifacts({\n  packageFileName,\n  updatedDeps,\n  newPackageFileContent,\n  config,\n}: UpdateArtifact): Promise<UpdateArtifactsResult[] | null> {\n  logger.debug(`apm.updateArtifacts(${packageFileName})`);\n  const { isLockFileMaintenance } = config;\n\n  if (!isNonEmptyArray(updatedDeps) && !isLockFileMaintenance) {\n    logger.debug('apm: no updated deps - returning null');\n    return null;\n  }\n\n  const lockFileName = getSiblingFileName(packageFileName, 'apm.lock.yaml');\n  const existingLockFileContent = await readLocalFile(lockFileName, 'utf8');\n  if (!existingLockFileContent) {\n    logger.debug('apm: no lock file found');\n    return null;\n  }\n\n  try {\n    await writeLocalFile(packageFileName, newPackageFileContent);\n    if (isLockFileMaintenance) {\n      await deleteLocalFile(lockFileName);\n    }\n\n    const execOptions: ExecOptions = {\n      cwdFile: packageFileName,\n      docker: {},\n      toolConstraints: [\n        {\n          toolName: 'apm',\n          constraint: await resolveToolConstraint(config, 'apm'),\n        },\n      ],\n    };\n    await exec('apm install', execOptions);\n\n    // `apm install` regenerates the lockfile and re-deploys the harness\n    // directories (`.github/`, `.claude/`, ...) that APM consumers commit, so\n    // return every file it changed - not just the lockfile - or the committed\n    // instruction files go stale after a bump. `apm_modules/` is the gitignored\n    // cache, so it is not reported here.\n    const status = await getRepoStatus();\n    const res: UpdateArtifactsResult[] = [];\n    for (const path of [...status.modified, ...status.not_added]) {\n      // the manifest itself is committed as an updated package file\n      if (path === packageFileName) {\n        continue;\n      }\n      res.push({\n        file: { type: 'addition', path, contents: await readLocalFile(path) },\n      });\n    }\n    for (const path of status.deleted) {\n      res.push({ file: { type: 'deletion', path } });\n    }\n    if (!res.length) {\n      logger.debug('apm: no changed files after install');\n      return null;\n    }\n    return res;\n  } catch (err) {\n    if (err.message === TEMPORARY_ERROR) {\n      throw err;\n    }\n    logger.debug({ err }, `Failed to update ${lockFileName}`);\n    return [\n      {\n        artifactError: {\n          fileName: lockFileName,\n          stderr: `${err}`,\n        },\n      },\n    ];\n  }\n}\n"],"mappings":";;;;;;;;AAeA,eAAsB,gBAAgB,EACpC,iBACA,aACA,uBACA,UAC0D;CAC1D,OAAO,MAAM,uBAAuB,gBAAgB,EAAE;CACtD,MAAM,EAAE,0BAA0B;CAElC,IAAI,CAAC,gBAAgB,WAAW,KAAK,CAAC,uBAAuB;EAC3D,OAAO,MAAM,uCAAuC;EACpD,OAAO;CACT;CAEA,MAAM,eAAe,mBAAmB,iBAAiB,eAAe;CAExE,IAAI,CAAC,MADiC,cAAc,cAAc,MAAM,GAC1C;EAC5B,OAAO,MAAM,yBAAyB;EACtC,OAAO;CACT;CAEA,IAAI;EACF,MAAM,eAAe,iBAAiB,qBAAqB;EAC3D,IAAI,uBACF,MAAM,gBAAgB,YAAY;EAGpC,MAAM,cAA2B;GAC/B,SAAS;GACT,QAAQ,CAAC;GACT,iBAAiB,CACf;IACE,UAAU;IACV,YAAY,MAAM,sBAAsB,QAAQ,KAAK;GACvD,CACF;EACF;EACA,MAAM,KAAK,eAAe,WAAW;EAOrC,MAAM,SAAS,MAAM,cAAc;EACnC,MAAM,MAA+B,CAAC;EACtC,KAAK,MAAM,QAAQ,CAAC,GAAG,OAAO,UAAU,GAAG,OAAO,SAAS,GAAG;GAE5D,IAAI,SAAS,iBACX;GAEF,IAAI,KAAK,EACP,MAAM;IAAE,MAAM;IAAY;IAAM,UAAU,MAAM,cAAc,IAAI;GAAE,EACtE,CAAC;EACH;EACA,KAAK,MAAM,QAAQ,OAAO,SACxB,IAAI,KAAK,EAAE,MAAM;GAAE,MAAM;GAAY;EAAK,EAAE,CAAC;EAE/C,IAAI,CAAC,IAAI,QAAQ;GACf,OAAO,MAAM,qCAAqC;GAClD,OAAO;EACT;EACA,OAAO;CACT,SAAS,KAAK;EACZ,IAAI,IAAI,YAAA,mBACN,MAAM;EAER,OAAO,MAAM,EAAE,IAAI,GAAG,oBAAoB,cAAc;EACxD,OAAO,CACL,EACE,eAAe;GACb,UAAU;GACV,QAAQ,GAAG;EACb,EACF,CACF;CACF;AACF"}
+{"version":3,"file":"artifacts.js","names":[],"sources":["../../../../lib/modules/manager/apm/artifacts.ts"],"sourcesContent":["import { isNonEmptyArray } from '@sindresorhus/is';\nimport { TEMPORARY_ERROR } from '../../../constants/error-messages.ts';\nimport { logger } from '../../../logger/index.ts';\nimport { exec } from '../../../util/exec/index.ts';\nimport type { ExecOptions } from '../../../util/exec/types.ts';\nimport {\n  deleteLocalFile,\n  getSiblingFileName,\n  readLocalFile,\n  writeLocalFile,\n} from '../../../util/fs/index.ts';\nimport { collectFileChanges } from '../../../util/git/file-changes.ts';\nimport { getRepoStatus } from '../../../util/git/index.ts';\nimport type { UpdateArtifact, UpdateArtifactsResult } from '../types.ts';\nimport {\n  artifactErrorResult,\n  fileChangesToArtifactResults,\n  resolveToolConstraint,\n} from '../util.ts';\n\nexport async function updateArtifacts({\n  packageFileName,\n  updatedDeps,\n  newPackageFileContent,\n  config,\n}: UpdateArtifact): Promise<UpdateArtifactsResult[] | null> {\n  logger.debug(`apm.updateArtifacts(${packageFileName})`);\n  const { isLockFileMaintenance } = config;\n\n  if (!isNonEmptyArray(updatedDeps) && !isLockFileMaintenance) {\n    logger.debug('apm: no updated deps - returning null');\n    return null;\n  }\n\n  const lockFileName = getSiblingFileName(packageFileName, 'apm.lock.yaml');\n  const existingLockFileContent = await readLocalFile(lockFileName, 'utf8');\n  if (!existingLockFileContent) {\n    logger.debug('apm: no lock file found');\n    return null;\n  }\n\n  try {\n    await writeLocalFile(packageFileName, newPackageFileContent);\n    if (isLockFileMaintenance) {\n      await deleteLocalFile(lockFileName);\n    }\n\n    const execOptions: ExecOptions = {\n      cwdFile: packageFileName,\n      docker: {},\n      toolConstraints: [\n        {\n          toolName: 'apm',\n          constraint: await resolveToolConstraint(config, 'apm'),\n        },\n      ],\n    };\n    await exec('apm install', execOptions);\n\n    // `apm install` regenerates the lockfile and re-deploys the harness\n    // directories (`.github/`, `.claude/`, ...) that APM consumers commit, so\n    // return every file it changed - not just the lockfile - or the committed\n    // instruction files go stale after a bump. `apm_modules/` is the gitignored\n    // cache, so it is not reported here.\n    const status = await getRepoStatus();\n    const res = fileChangesToArtifactResults([\n      ...(await collectFileChanges(status, {\n        include: ['modified', 'not_added'],\n        // the manifest itself is committed as an updated package file\n        filter: (path) => path !== packageFileName,\n      })),\n      ...(await collectFileChanges(status, { include: ['deleted'] })),\n    ]);\n    if (!res.length) {\n      logger.debug('apm: no changed files after install');\n      return null;\n    }\n    return res;\n  } catch (err) {\n    if (err.message === TEMPORARY_ERROR) {\n      throw err;\n    }\n    logger.debug({ err }, `Failed to update ${lockFileName}`);\n    return artifactErrorResult(lockFileName, err);\n  }\n}\n"],"mappings":";;;;;;;;;AAoBA,eAAsB,gBAAgB,EACpC,iBACA,aACA,uBACA,UAC0D;CAC1D,OAAO,MAAM,uBAAuB,gBAAgB,EAAE;CACtD,MAAM,EAAE,0BAA0B;CAElC,IAAI,CAAC,gBAAgB,WAAW,KAAK,CAAC,uBAAuB;EAC3D,OAAO,MAAM,uCAAuC;EACpD,OAAO;CACT;CAEA,MAAM,eAAe,mBAAmB,iBAAiB,eAAe;CAExE,IAAI,CAAC,MADiC,cAAc,cAAc,MAAM,GAC1C;EAC5B,OAAO,MAAM,yBAAyB;EACtC,OAAO;CACT;CAEA,IAAI;EACF,MAAM,eAAe,iBAAiB,qBAAqB;EAC3D,IAAI,uBACF,MAAM,gBAAgB,YAAY;EAGpC,MAAM,cAA2B;GAC/B,SAAS;GACT,QAAQ,CAAC;GACT,iBAAiB,CACf;IACE,UAAU;IACV,YAAY,MAAM,sBAAsB,QAAQ,KAAK;GACvD,CACF;EACF;EACA,MAAM,KAAK,eAAe,WAAW;EAOrC,MAAM,SAAS,MAAM,cAAc;EACnC,MAAM,MAAM,6BAA6B,CACvC,GAAI,MAAM,mBAAmB,QAAQ;GACnC,SAAS,CAAC,YAAY,WAAW;GAEjC,SAAS,SAAS,SAAS;EAC7B,CAAC,GACD,GAAI,MAAM,mBAAmB,QAAQ,EAAE,SAAS,CAAC,SAAS,EAAE,CAAC,CAC/D,CAAC;EACD,IAAI,CAAC,IAAI,QAAQ;GACf,OAAO,MAAM,qCAAqC;GAClD,OAAO;EACT;EACA,OAAO;CACT,SAAS,KAAK;EACZ,IAAI,IAAI,YAAA,mBACN,MAAM;EAER,OAAO,MAAM,EAAE,IAAI,GAAG,oBAAoB,cAAc;EACxD,OAAO,oBAAoB,cAAc,GAAG;CAC9C;AACF"}

package/dist/modules/manager/bun/artifacts.js

@@ -3,7 +3,7 @@ import { GlobalConfig } from "../../../config/global.js";
 import { logger } from "../../../logger/index.js";
 import { deleteLocalFile, readLocalFile, writeLocalFile } from "../../../util/fs/index.js";
 import { exec } from "../../../util/exec/index.js";
-import { resolveToolConstraint } from "../util.js";
+import { artifactErrorResult, fileAddition, resolveToolConstraint } from "../util.js";
 import { processHostRules } from "../npm/post-update/rules.js";
 import { getNpmrcContent, resetNpmrcContent, updateNpmrcContent } from "../npm/utils.js";
 import { isEmptyArray } from "@sindresorhus/is";
@@ -48,21 +48,14 @@ async function updateArtifacts(updateArtifact) {
 		await resetNpmrcContent(pkgFileDir, npmrcContent);
 		const newLockFileContent = await readLocalFile(lockFileName);
 		if (!newLockFileContent || Buffer.compare(oldLockFileContent, newLockFileContent) === 0) return null;
-		return [{ file: {
-			type: "addition",
-			path: lockFileName,
-			contents: newLockFileContent
-		} }];
+		return [fileAddition(lockFileName, newLockFileContent)];
 	} catch (err) {
 		if (err.message === "temporary-error") throw err;
 		logger.warn({
 			lockfile: lockFileName,
 			err
 		}, `Failed to update lock file`);
-		return [{ artifactError: {
-			fileName: lockFileName,
-			stderr: err.message
-		} }];
+		return artifactErrorResult(lockFileName, err);
 	}
 }
 //#endregion

package/dist/modules/manager/bun/artifacts.js.map

@@ -1 +1 @@
-{"version":3,"file":"artifacts.js","names":[],"sources":["../../../../lib/modules/manager/bun/artifacts.ts"],"sourcesContent":["import { isEmptyArray } from '@sindresorhus/is';\nimport upath from 'upath';\nimport { GlobalConfig } from '../../../config/global.ts';\nimport { TEMPORARY_ERROR } from '../../../constants/error-messages.ts';\nimport { logger } from '../../../logger/index.ts';\nimport { exec } from '../../../util/exec/index.ts';\nimport type { ExecOptions } from '../../../util/exec/types.ts';\nimport {\n  deleteLocalFile,\n  readLocalFile,\n  writeLocalFile,\n} from '../../../util/fs/index.ts';\nimport { processHostRules } from '../npm/post-update/rules.ts';\nimport {\n  getNpmrcContent,\n  resetNpmrcContent,\n  updateNpmrcContent,\n} from '../npm/utils.ts';\nimport type { UpdateArtifact, UpdateArtifactsResult } from '../types.ts';\nimport { resolveToolConstraint } from '../util.ts';\n\nexport async function updateArtifacts(\n  updateArtifact: UpdateArtifact,\n): Promise<UpdateArtifactsResult[] | null> {\n  const { packageFileName, updatedDeps, newPackageFileContent, config } =\n    updateArtifact;\n  logger.debug(`bun.updateArtifacts(${packageFileName})`);\n  const { isLockFileMaintenance } = config;\n\n  if (isEmptyArray(updatedDeps) && !isLockFileMaintenance) {\n    logger.debug('No updated bun deps - returning null');\n    return null;\n  }\n\n  // Find the first bun dependency in order to handle mixed manager updates,\n  // eventually falling back to the first lock file from config.\n  const lockFileName =\n    updatedDeps.find((dep) => dep.manager === 'bun')?.lockFiles?.[0] ??\n    config.lockFiles?.[0];\n\n  if (!lockFileName) {\n    logger.debug(`bun: No lock file found`);\n    return null;\n  }\n\n  const oldLockFileContent = await readLocalFile(lockFileName);\n  if (!oldLockFileContent) {\n    logger.debug(`No ${lockFileName} found`);\n    return null;\n  }\n\n  const pkgFileDir = upath.dirname(packageFileName);\n  const npmrcContent = await getNpmrcContent(pkgFileDir);\n  const { additionalNpmrcContent } = processHostRules();\n  await updateNpmrcContent(pkgFileDir, npmrcContent, additionalNpmrcContent);\n\n  try {\n    await writeLocalFile(packageFileName, newPackageFileContent);\n    if (isLockFileMaintenance) {\n      await deleteLocalFile(lockFileName);\n    }\n\n    let cmd = 'bun install';\n\n    if (!GlobalConfig.get('allowScripts') || config.ignoreScripts) {\n      cmd += ' --ignore-scripts';\n    }\n\n    const execOptions: ExecOptions = {\n      cwdFile: lockFileName,\n      docker: {},\n      toolConstraints: [\n        {\n          toolName: 'bun',\n          constraint: await resolveToolConstraint(config, 'bun'),\n        },\n      ],\n    };\n\n    await exec(cmd, execOptions);\n    await resetNpmrcContent(pkgFileDir, npmrcContent);\n\n    const newLockFileContent = await readLocalFile(lockFileName);\n    if (\n      !newLockFileContent ||\n      Buffer.compare(oldLockFileContent, newLockFileContent) === 0\n    ) {\n      return null;\n    }\n    return [\n      {\n        file: {\n          type: 'addition',\n          path: lockFileName,\n          contents: newLockFileContent,\n        },\n      },\n    ];\n  } catch (err) {\n    if (err.message === TEMPORARY_ERROR) {\n      throw err;\n    }\n    logger.warn({ lockfile: lockFileName, err }, `Failed to update lock file`);\n    return [\n      {\n        artifactError: {\n          fileName: lockFileName,\n          stderr: err.message,\n        },\n      },\n    ];\n  }\n}\n"],"mappings":";;;;;;;;;;;AAqBA,eAAsB,gBACpB,gBACyC;CACzC,MAAM,EAAE,iBAAiB,aAAa,uBAAuB,WAC3D;CACF,OAAO,MAAM,uBAAuB,gBAAgB,EAAE;CACtD,MAAM,EAAE,0BAA0B;CAElC,IAAI,aAAa,WAAW,KAAK,CAAC,uBAAuB;EACvD,OAAO,MAAM,sCAAsC;EACnD,OAAO;CACT;CAIA,MAAM,eACJ,YAAY,MAAM,QAAQ,IAAI,YAAY,KAAK,CAAC,EAAE,YAAY,MAC9D,OAAO,YAAY;CAErB,IAAI,CAAC,cAAc;EACjB,OAAO,MAAM,yBAAyB;EACtC,OAAO;CACT;CAEA,MAAM,qBAAqB,MAAM,cAAc,YAAY;CAC3D,IAAI,CAAC,oBAAoB;EACvB,OAAO,MAAM,MAAM,aAAa,OAAO;EACvC,OAAO;CACT;CAEA,MAAM,aAAa,MAAM,QAAQ,eAAe;CAChD,MAAM,eAAe,MAAM,gBAAgB,UAAU;CACrD,MAAM,EAAE,2BAA2B,iBAAiB;CACpD,MAAM,mBAAmB,YAAY,cAAc,sBAAsB;CAEzE,IAAI;EACF,MAAM,eAAe,iBAAiB,qBAAqB;EAC3D,IAAI,uBACF,MAAM,gBAAgB,YAAY;EAGpC,IAAI,MAAM;EAEV,IAAI,CAAC,aAAa,IAAI,cAAc,KAAK,OAAO,eAC9C,OAAO;EAGT,MAAM,cAA2B;GAC/B,SAAS;GACT,QAAQ,CAAC;GACT,iBAAiB,CACf;IACE,UAAU;IACV,YAAY,MAAM,sBAAsB,QAAQ,KAAK;GACvD,CACF;EACF;EAEA,MAAM,KAAK,KAAK,WAAW;EAC3B,MAAM,kBAAkB,YAAY,YAAY;EAEhD,MAAM,qBAAqB,MAAM,cAAc,YAAY;EAC3D,IACE,CAAC,sBACD,OAAO,QAAQ,oBAAoB,kBAAkB,MAAM,GAE3D,OAAO;EAET,OAAO,CACL,EACE,MAAM;GACJ,MAAM;GACN,MAAM;GACN,UAAU;EACZ,EACF,CACF;CACF,SAAS,KAAK;EACZ,IAAI,IAAI,YAAA,mBACN,MAAM;EAER,OAAO,KAAK;GAAE,UAAU;GAAc;EAAI,GAAG,4BAA4B;EACzE,OAAO,CACL,EACE,eAAe;GACb,UAAU;GACV,QAAQ,IAAI;EACd,EACF,CACF;CACF;AACF"}
+{"version":3,"file":"artifacts.js","names":[],"sources":["../../../../lib/modules/manager/bun/artifacts.ts"],"sourcesContent":["import { isEmptyArray } from '@sindresorhus/is';\nimport upath from 'upath';\nimport { GlobalConfig } from '../../../config/global.ts';\nimport { TEMPORARY_ERROR } from '../../../constants/error-messages.ts';\nimport { logger } from '../../../logger/index.ts';\nimport { exec } from '../../../util/exec/index.ts';\nimport type { ExecOptions } from '../../../util/exec/types.ts';\nimport {\n  deleteLocalFile,\n  readLocalFile,\n  writeLocalFile,\n} from '../../../util/fs/index.ts';\nimport { processHostRules } from '../npm/post-update/rules.ts';\nimport {\n  getNpmrcContent,\n  resetNpmrcContent,\n  updateNpmrcContent,\n} from '../npm/utils.ts';\nimport type { UpdateArtifact, UpdateArtifactsResult } from '../types.ts';\nimport {\n  artifactErrorResult,\n  fileAddition,\n  resolveToolConstraint,\n} from '../util.ts';\n\nexport async function updateArtifacts(\n  updateArtifact: UpdateArtifact,\n): Promise<UpdateArtifactsResult[] | null> {\n  const { packageFileName, updatedDeps, newPackageFileContent, config } =\n    updateArtifact;\n  logger.debug(`bun.updateArtifacts(${packageFileName})`);\n  const { isLockFileMaintenance } = config;\n\n  if (isEmptyArray(updatedDeps) && !isLockFileMaintenance) {\n    logger.debug('No updated bun deps - returning null');\n    return null;\n  }\n\n  // Find the first bun dependency in order to handle mixed manager updates,\n  // eventually falling back to the first lock file from config.\n  const lockFileName =\n    updatedDeps.find((dep) => dep.manager === 'bun')?.lockFiles?.[0] ??\n    config.lockFiles?.[0];\n\n  if (!lockFileName) {\n    logger.debug(`bun: No lock file found`);\n    return null;\n  }\n\n  const oldLockFileContent = await readLocalFile(lockFileName);\n  if (!oldLockFileContent) {\n    logger.debug(`No ${lockFileName} found`);\n    return null;\n  }\n\n  const pkgFileDir = upath.dirname(packageFileName);\n  const npmrcContent = await getNpmrcContent(pkgFileDir);\n  const { additionalNpmrcContent } = processHostRules();\n  await updateNpmrcContent(pkgFileDir, npmrcContent, additionalNpmrcContent);\n\n  try {\n    await writeLocalFile(packageFileName, newPackageFileContent);\n    if (isLockFileMaintenance) {\n      await deleteLocalFile(lockFileName);\n    }\n\n    let cmd = 'bun install';\n\n    if (!GlobalConfig.get('allowScripts') || config.ignoreScripts) {\n      cmd += ' --ignore-scripts';\n    }\n\n    const execOptions: ExecOptions = {\n      cwdFile: lockFileName,\n      docker: {},\n      toolConstraints: [\n        {\n          toolName: 'bun',\n          constraint: await resolveToolConstraint(config, 'bun'),\n        },\n      ],\n    };\n\n    await exec(cmd, execOptions);\n    await resetNpmrcContent(pkgFileDir, npmrcContent);\n\n    const newLockFileContent = await readLocalFile(lockFileName);\n    if (\n      !newLockFileContent ||\n      Buffer.compare(oldLockFileContent, newLockFileContent) === 0\n    ) {\n      return null;\n    }\n    return [fileAddition(lockFileName, newLockFileContent)];\n  } catch (err) {\n    if (err.message === TEMPORARY_ERROR) {\n      throw err;\n    }\n    logger.warn({ lockfile: lockFileName, err }, `Failed to update lock file`);\n    return artifactErrorResult(lockFileName, err);\n  }\n}\n"],"mappings":";;;;;;;;;;;AAyBA,eAAsB,gBACpB,gBACyC;CACzC,MAAM,EAAE,iBAAiB,aAAa,uBAAuB,WAC3D;CACF,OAAO,MAAM,uBAAuB,gBAAgB,EAAE;CACtD,MAAM,EAAE,0BAA0B;CAElC,IAAI,aAAa,WAAW,KAAK,CAAC,uBAAuB;EACvD,OAAO,MAAM,sCAAsC;EACnD,OAAO;CACT;CAIA,MAAM,eACJ,YAAY,MAAM,QAAQ,IAAI,YAAY,KAAK,CAAC,EAAE,YAAY,MAC9D,OAAO,YAAY;CAErB,IAAI,CAAC,cAAc;EACjB,OAAO,MAAM,yBAAyB;EACtC,OAAO;CACT;CAEA,MAAM,qBAAqB,MAAM,cAAc,YAAY;CAC3D,IAAI,CAAC,oBAAoB;EACvB,OAAO,MAAM,MAAM,aAAa,OAAO;EACvC,OAAO;CACT;CAEA,MAAM,aAAa,MAAM,QAAQ,eAAe;CAChD,MAAM,eAAe,MAAM,gBAAgB,UAAU;CACrD,MAAM,EAAE,2BAA2B,iBAAiB;CACpD,MAAM,mBAAmB,YAAY,cAAc,sBAAsB;CAEzE,IAAI;EACF,MAAM,eAAe,iBAAiB,qBAAqB;EAC3D,IAAI,uBACF,MAAM,gBAAgB,YAAY;EAGpC,IAAI,MAAM;EAEV,IAAI,CAAC,aAAa,IAAI,cAAc,KAAK,OAAO,eAC9C,OAAO;EAGT,MAAM,cAA2B;GAC/B,SAAS;GACT,QAAQ,CAAC;GACT,iBAAiB,CACf;IACE,UAAU;IACV,YAAY,MAAM,sBAAsB,QAAQ,KAAK;GACvD,CACF;EACF;EAEA,MAAM,KAAK,KAAK,WAAW;EAC3B,MAAM,kBAAkB,YAAY,YAAY;EAEhD,MAAM,qBAAqB,MAAM,cAAc,YAAY;EAC3D,IACE,CAAC,sBACD,OAAO,QAAQ,oBAAoB,kBAAkB,MAAM,GAE3D,OAAO;EAET,OAAO,CAAC,aAAa,cAAc,kBAAkB,CAAC;CACxD,SAAS,KAAK;EACZ,IAAI,IAAI,YAAA,mBACN,MAAM;EAER,OAAO,KAAK;GAAE,UAAU;GAAc;EAAI,GAAG,4BAA4B;EACzE,OAAO,oBAAoB,cAAc,GAAG;CAC9C;AACF"}

package/dist/modules/manager/cargo/artifacts.js

@@ -4,7 +4,7 @@ import { coerceArray } from "../../../util/array.js";
 import { logger } from "../../../logger/index.js";
 import { findLocalSiblingOrParent, readLocalFile, writeLocalFile } from "../../../util/fs/index.js";
 import { CrateDatasource } from "../../datasource/crate/index.js";
-import { resolveToolConstraint } from "../util.js";
+import { artifactErrorResult, fileAddition, resolveToolConstraint } from "../util.js";
 import { withGitEnvironment } from "../../../util/git/exec.js";
 import { extractLockFileContentVersions } from "./locked-version.js";
 import { quote } from "shlex";
@@ -50,11 +50,7 @@ async function updateArtifactsImpl({ packageFileName, updatedDeps, newPackageFil
 	const { isLockFileMaintenance } = config;
 	if (!isLockFileMaintenance && !updatedDeps?.length) {
 		logger.debug("No more dependencies to update");
-		return [{ file: {
-			type: "addition",
-			path: lockFileName,
-			contents: existingLockFileContent
-		} }];
+		return [fileAddition(lockFileName, existingLockFileContent)];
 	}
 	const rustConstraint = await resolveToolConstraint(config, "rust");
 	try {
@@ -76,11 +72,7 @@ async function updateArtifactsImpl({ packageFileName, updatedDeps, newPackageFil
 			logger.debug("Cargo.lock is unchanged");
 			return null;
 		}
-		return [{ file: {
-			type: "addition",
-			path: lockFileName,
-			contents: newCargoLockContent
-		} }];
+		return [fileAddition(lockFileName, newCargoLockContent)];
 	} catch (err) {
 		// istanbul ignore if
 		if (err.message === "temporary-error") throw err;
@@ -100,10 +92,7 @@ async function updateArtifactsImpl({ packageFileName, updatedDeps, newPackageFil
 			}
 		}
 		logger.debug({ err }, "Failed to update Cargo lock file");
-		return [{ artifactError: {
-			fileName: lockFileName,
-			stderr: err.message
-		} }];
+		return artifactErrorResult(lockFileName, err);
 	}
 }
 //#endregion

package/dist/modules/manager/cargo/artifacts.js.map

@@ -1 +1 @@
-{"version":3,"file":"artifacts.js","names":[],"sources":["../../../../lib/modules/manager/cargo/artifacts.ts"],"sourcesContent":["import { quote } from 'shlex';\nimport { TEMPORARY_ERROR } from '../../../constants/error-messages.ts';\nimport { logger } from '../../../logger/index.ts';\nimport { coerceArray } from '../../../util/array.ts';\nimport type { ExecOptions } from '../../../util/exec/types.ts';\nimport {\n  findLocalSiblingOrParent,\n  readLocalFile,\n  writeLocalFile,\n} from '../../../util/fs/index.ts';\nimport { withGitEnvironment } from '../../../util/git/exec.ts';\nimport { regEx } from '../../../util/regex.ts';\nimport { CrateDatasource } from '../../datasource/crate/index.ts';\nimport type {\n  UpdateArtifact,\n  UpdateArtifactsResult,\n  Upgrade,\n} from '../types.ts';\nimport { resolveToolConstraint } from '../util.ts';\nimport { extractLockFileContentVersions } from './locked-version.ts';\n\nconst gitExec = withGitEnvironment(['cargo']);\n\nasync function cargoUpdate(\n  manifestPath: string,\n  isLockFileMaintenance: boolean,\n  constraint: string | undefined,\n): Promise<void> {\n  let cmd = `cargo update --config net.git-fetch-with-cli=true --manifest-path ${quote(\n    manifestPath,\n  )}`;\n  // If we're updating a specific crate, `cargo-update` requires `--workspace`\n  // for more information, see: https://github.com/renovatebot/renovate/issues/12332\n  if (!isLockFileMaintenance) {\n    cmd += ` --workspace`;\n  }\n\n  const execOptions: ExecOptions = {\n    docker: {},\n    toolConstraints: [{ toolName: 'rust', constraint }],\n  };\n  await gitExec(cmd, execOptions);\n}\n\nasync function cargoUpdatePrecise(\n  manifestPath: string,\n  updatedDeps: Upgrade[],\n  constraint: string | undefined,\n): Promise<void> {\n  const cmds = [];\n\n  // First update individual dependencies to their `newVersion`. Necessary when\n  // using the `update-lockfile` rangeStrategy which doesn't touch Cargo.toml.\n  for (const dep of updatedDeps) {\n    // If the range is bumped in Cargo.toml, the old lockedVersion may no longer\n    // exist in Cargo's dependency graph, so let the --workspace update at the\n    // end re-resolve it instead.\n    if (dep.currentValue && dep.newValue && dep.currentValue !== dep.newValue) {\n      continue;\n    }\n\n    cmds.push(\n      `cargo update --config net.git-fetch-with-cli=true` +\n        ` --manifest-path ${quote(manifestPath)}` +\n        ` --package ${quote(`${dep.packageName}@${dep.lockedVersion}`)}` +\n        ` --precise ${quote(dep.newVersion!)}`,\n    );\n  }\n\n  // Then update all dependencies that have been bumped in `Cargo.toml`.\n  cmds.push(\n    `cargo update --config net.git-fetch-with-cli=true --manifest-path ${quote(manifestPath)} --workspace`,\n  );\n\n  const execOptions: ExecOptions = {\n    docker: {},\n    toolConstraints: [{ toolName: 'rust', constraint }],\n  };\n\n  await gitExec(cmds, execOptions);\n}\n\nexport async function updateArtifacts(\n  updateArtifact: UpdateArtifact,\n): Promise<UpdateArtifactsResult[] | null> {\n  return await updateArtifactsImpl(updateArtifact);\n}\n\nasync function updateArtifactsImpl(\n  {\n    packageFileName,\n    updatedDeps,\n    newPackageFileContent,\n    config,\n  }: UpdateArtifact,\n  recursionLimit = 10,\n): Promise<UpdateArtifactsResult[] | null> {\n  logger.debug(`cargo.updateArtifacts(${packageFileName})`);\n\n  // For standalone package crates, the `Cargo.lock` will be in the same\n  // directory as `Cargo.toml` (ie. a sibling). For cargo workspaces, it\n  // will be further up.\n  const lockFileName = await findLocalSiblingOrParent(\n    packageFileName,\n    'Cargo.lock',\n  );\n  const existingLockFileContent = lockFileName\n    ? await readLocalFile(lockFileName)\n    : null;\n  if (!existingLockFileContent || !lockFileName) {\n    logger.debug('No Cargo.lock found');\n    return null;\n  }\n\n  const { isLockFileMaintenance } = config;\n  if (!isLockFileMaintenance && !updatedDeps?.length) {\n    logger.debug('No more dependencies to update');\n    return [\n      {\n        file: {\n          type: 'addition',\n          path: lockFileName,\n          contents: existingLockFileContent,\n        },\n      },\n    ];\n  }\n\n  const rustConstraint = await resolveToolConstraint(config, 'rust');\n\n  try {\n    await writeLocalFile(packageFileName, newPackageFileContent);\n    logger.debug(`Updating ${lockFileName}`);\n\n    if (isLockFileMaintenance) {\n      await cargoUpdate(packageFileName, true, rustConstraint);\n    } else {\n      const hasNonCrateDep = updatedDeps.some(\n        (dep) => dep.datasource !== CrateDatasource.id,\n      );\n      const crateDepWithoutLockedVersion = updatedDeps.find(\n        (dep) => !dep.lockedVersion && dep.datasource === CrateDatasource.id,\n      );\n      // Non-crate dependencies (like git ones) do not have locked versions.\n      // For crate dependencies, a locked version is expected.\n      // In both situations, perform a regular workspace lockfile update.\n      if (hasNonCrateDep || crateDepWithoutLockedVersion) {\n        // v8 ignore else -- needs a workspace update driven only by a non-crate dep\n        if (crateDepWithoutLockedVersion) {\n          // Only warn when a crate dependency has no locked version\n          logger.warn(\n            { dependency: crateDepWithoutLockedVersion.depName },\n            'Missing locked version for dependency',\n          );\n        }\n        await cargoUpdate(packageFileName, false, rustConstraint);\n      } else {\n        // If all dependencies have locked versions then update them precisely.\n        await cargoUpdatePrecise(packageFileName, updatedDeps, rustConstraint);\n      }\n    }\n\n    logger.debug('Returning updated Cargo.lock');\n    const newCargoLockContent = await readLocalFile(lockFileName);\n    if (existingLockFileContent === newCargoLockContent) {\n      logger.debug('Cargo.lock is unchanged');\n      return null;\n    }\n    return [\n      {\n        file: {\n          type: 'addition',\n          path: lockFileName,\n          contents: newCargoLockContent,\n        },\n      },\n    ];\n  } catch (err) {\n    // istanbul ignore if\n    if (err.message === TEMPORARY_ERROR) {\n      throw err;\n    }\n\n    // Sometimes `cargo update` will fail when a preceding dependency update\n    // causes another dependency to update. In this case we can no longer\n    // reference the dependency by its old version, so we filter it out\n    // and retry recursively.\n    const newCargoLockContent = await readLocalFile(lockFileName, 'utf8');\n    if (\n      recursionLimit > 0 &&\n      newCargoLockContent &&\n      regEx(/error: package ID specification/).test(err.stderr)\n    ) {\n      const versions = extractLockFileContentVersions(newCargoLockContent);\n      const newUpdatedDeps = updatedDeps.filter(\n        (dep) =>\n          !coerceArray(versions?.get(dep.packageName!)).includes(\n            dep.newVersion!,\n          ),\n      );\n\n      // v8 ignore else -- this retry only runs when a dep was already current\n      if (newUpdatedDeps.length < updatedDeps.length) {\n        logger.debug(\n          'Dependency already up to date - reattempting recursively',\n        );\n        return updateArtifactsImpl(\n          {\n            packageFileName,\n            updatedDeps: newUpdatedDeps,\n            newPackageFileContent,\n            config,\n          },\n          recursionLimit - 1,\n        );\n      }\n    }\n\n    logger.debug({ err }, 'Failed to update Cargo lock file');\n\n    return [\n      {\n        artifactError: {\n          fileName: lockFileName,\n          stderr: err.message,\n        },\n      },\n    ];\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"artifacts.js","names":[],"sources":["../../../../lib/modules/manager/cargo/artifacts.ts"],"sourcesContent":["import { quote } from 'shlex';\nimport { TEMPORARY_ERROR } from '../../../constants/error-messages.ts';\nimport { logger } from '../../../logger/index.ts';\nimport { coerceArray } from '../../../util/array.ts';\nimport type { ExecOptions } from '../../../util/exec/types.ts';\nimport {\n  findLocalSiblingOrParent,\n  readLocalFile,\n  writeLocalFile,\n} from '../../../util/fs/index.ts';\nimport { withGitEnvironment } from '../../../util/git/exec.ts';\nimport { regEx } from '../../../util/regex.ts';\nimport { CrateDatasource } from '../../datasource/crate/index.ts';\nimport type {\n  UpdateArtifact,\n  UpdateArtifactsResult,\n  Upgrade,\n} from '../types.ts';\nimport {\n  artifactErrorResult,\n  fileAddition,\n  resolveToolConstraint,\n} from '../util.ts';\nimport { extractLockFileContentVersions } from './locked-version.ts';\n\nconst gitExec = withGitEnvironment(['cargo']);\n\nasync function cargoUpdate(\n  manifestPath: string,\n  isLockFileMaintenance: boolean,\n  constraint: string | undefined,\n): Promise<void> {\n  let cmd = `cargo update --config net.git-fetch-with-cli=true --manifest-path ${quote(\n    manifestPath,\n  )}`;\n  // If we're updating a specific crate, `cargo-update` requires `--workspace`\n  // for more information, see: https://github.com/renovatebot/renovate/issues/12332\n  if (!isLockFileMaintenance) {\n    cmd += ` --workspace`;\n  }\n\n  const execOptions: ExecOptions = {\n    docker: {},\n    toolConstraints: [{ toolName: 'rust', constraint }],\n  };\n  await gitExec(cmd, execOptions);\n}\n\nasync function cargoUpdatePrecise(\n  manifestPath: string,\n  updatedDeps: Upgrade[],\n  constraint: string | undefined,\n): Promise<void> {\n  const cmds = [];\n\n  // First update individual dependencies to their `newVersion`. Necessary when\n  // using the `update-lockfile` rangeStrategy which doesn't touch Cargo.toml.\n  for (const dep of updatedDeps) {\n    // If the range is bumped in Cargo.toml, the old lockedVersion may no longer\n    // exist in Cargo's dependency graph, so let the --workspace update at the\n    // end re-resolve it instead.\n    if (dep.currentValue && dep.newValue && dep.currentValue !== dep.newValue) {\n      continue;\n    }\n\n    cmds.push(\n      `cargo update --config net.git-fetch-with-cli=true` +\n        ` --manifest-path ${quote(manifestPath)}` +\n        ` --package ${quote(`${dep.packageName}@${dep.lockedVersion}`)}` +\n        ` --precise ${quote(dep.newVersion!)}`,\n    );\n  }\n\n  // Then update all dependencies that have been bumped in `Cargo.toml`.\n  cmds.push(\n    `cargo update --config net.git-fetch-with-cli=true --manifest-path ${quote(manifestPath)} --workspace`,\n  );\n\n  const execOptions: ExecOptions = {\n    docker: {},\n    toolConstraints: [{ toolName: 'rust', constraint }],\n  };\n\n  await gitExec(cmds, execOptions);\n}\n\nexport async function updateArtifacts(\n  updateArtifact: UpdateArtifact,\n): Promise<UpdateArtifactsResult[] | null> {\n  return await updateArtifactsImpl(updateArtifact);\n}\n\nasync function updateArtifactsImpl(\n  {\n    packageFileName,\n    updatedDeps,\n    newPackageFileContent,\n    config,\n  }: UpdateArtifact,\n  recursionLimit = 10,\n): Promise<UpdateArtifactsResult[] | null> {\n  logger.debug(`cargo.updateArtifacts(${packageFileName})`);\n\n  // For standalone package crates, the `Cargo.lock` will be in the same\n  // directory as `Cargo.toml` (ie. a sibling). For cargo workspaces, it\n  // will be further up.\n  const lockFileName = await findLocalSiblingOrParent(\n    packageFileName,\n    'Cargo.lock',\n  );\n  const existingLockFileContent = lockFileName\n    ? await readLocalFile(lockFileName)\n    : null;\n  if (!existingLockFileContent || !lockFileName) {\n    logger.debug('No Cargo.lock found');\n    return null;\n  }\n\n  const { isLockFileMaintenance } = config;\n  if (!isLockFileMaintenance && !updatedDeps?.length) {\n    logger.debug('No more dependencies to update');\n    return [fileAddition(lockFileName, existingLockFileContent)];\n  }\n\n  const rustConstraint = await resolveToolConstraint(config, 'rust');\n\n  try {\n    await writeLocalFile(packageFileName, newPackageFileContent);\n    logger.debug(`Updating ${lockFileName}`);\n\n    if (isLockFileMaintenance) {\n      await cargoUpdate(packageFileName, true, rustConstraint);\n    } else {\n      const hasNonCrateDep = updatedDeps.some(\n        (dep) => dep.datasource !== CrateDatasource.id,\n      );\n      const crateDepWithoutLockedVersion = updatedDeps.find(\n        (dep) => !dep.lockedVersion && dep.datasource === CrateDatasource.id,\n      );\n      // Non-crate dependencies (like git ones) do not have locked versions.\n      // For crate dependencies, a locked version is expected.\n      // In both situations, perform a regular workspace lockfile update.\n      if (hasNonCrateDep || crateDepWithoutLockedVersion) {\n        // v8 ignore else -- needs a workspace update driven only by a non-crate dep\n        if (crateDepWithoutLockedVersion) {\n          // Only warn when a crate dependency has no locked version\n          logger.warn(\n            { dependency: crateDepWithoutLockedVersion.depName },\n            'Missing locked version for dependency',\n          );\n        }\n        await cargoUpdate(packageFileName, false, rustConstraint);\n      } else {\n        // If all dependencies have locked versions then update them precisely.\n        await cargoUpdatePrecise(packageFileName, updatedDeps, rustConstraint);\n      }\n    }\n\n    logger.debug('Returning updated Cargo.lock');\n    const newCargoLockContent = await readLocalFile(lockFileName);\n    if (existingLockFileContent === newCargoLockContent) {\n      logger.debug('Cargo.lock is unchanged');\n      return null;\n    }\n    return [fileAddition(lockFileName, newCargoLockContent)];\n  } catch (err) {\n    // istanbul ignore if\n    if (err.message === TEMPORARY_ERROR) {\n      throw err;\n    }\n\n    // Sometimes `cargo update` will fail when a preceding dependency update\n    // causes another dependency to update. In this case we can no longer\n    // reference the dependency by its old version, so we filter it out\n    // and retry recursively.\n    const newCargoLockContent = await readLocalFile(lockFileName, 'utf8');\n    if (\n      recursionLimit > 0 &&\n      newCargoLockContent &&\n      regEx(/error: package ID specification/).test(err.stderr)\n    ) {\n      const versions = extractLockFileContentVersions(newCargoLockContent);\n      const newUpdatedDeps = updatedDeps.filter(\n        (dep) =>\n          !coerceArray(versions?.get(dep.packageName!)).includes(\n            dep.newVersion!,\n          ),\n      );\n\n      // v8 ignore else -- this retry only runs when a dep was already current\n      if (newUpdatedDeps.length < updatedDeps.length) {\n        logger.debug(\n          'Dependency already up to date - reattempting recursively',\n        );\n        return updateArtifactsImpl(\n          {\n            packageFileName,\n            updatedDeps: newUpdatedDeps,\n            newPackageFileContent,\n            config,\n          },\n          recursionLimit - 1,\n        );\n      }\n    }\n\n    logger.debug({ err }, 'Failed to update Cargo lock file');\n\n    return artifactErrorResult(lockFileName, err);\n  }\n}\n"],"mappings":"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"}

package/dist/modules/manager/cocoapods/artifacts.js

@@ -1,10 +1,11 @@
 import "../../../constants/error-messages.js";
 import { newlineRegex, regEx } from "../../../util/regex.js";
-import { coerceArray } from "../../../util/array.js";
 import { logger } from "../../../logger/index.js";
 import { ensureCacheDir, getSiblingFileName, readLocalFile, writeLocalFile } from "../../../util/fs/index.js";
 import { exec } from "../../../util/exec/index.js";
 import { getRepoStatus } from "../../../util/git/index.js";
+import { collectFileChanges } from "../../../util/git/file-changes.js";
+import { artifactErrorResult, fileAddition, fileChangesToArtifactResults } from "../util.js";
 import { quote } from "shlex";
 import upath from "upath";
 //#region lib/modules/manager/cocoapods/artifacts.ts
@@ -31,10 +32,7 @@ async function updateArtifacts({ packageFileName, updatedDeps, newPackageFileCon
 		await writeLocalFile(packageFileName, newPackageFileContent);
 	} catch (err) {
 		logger.warn({ err }, "Podfile could not be written");
-		return [{ artifactError: {
-			fileName: lockFileName,
-			stderr: err.message
-		} }];
+		return artifactErrorResult(lockFileName, err);
 	}
 	const existingLockFileContent = await readLocalFile(lockFileName, "utf8");
 	if (!existingLockFileContent) {
@@ -55,34 +53,21 @@ async function updateArtifacts({ packageFileName, updatedDeps, newPackageFileCon
 	try {
 		await exec(cmd, execOptions);
 	} catch (err) {
-		// istanbul ignore if
+		/* v8 ignore if -- defensive rethrow, not reproduced in the cocoapods specs */
 		if (err.message === "temporary-error") throw err;
-		return [{ artifactError: {
-			fileName: lockFileName,
-			stderr: err.stderr ?? err.stdout ?? err.message
-		} }];
+		return artifactErrorResult(lockFileName, err);
 	}
 	const status = await getRepoStatus();
 	if (!status.modified.includes(lockFileName)) return null;
 	logger.debug(`Returning updated lockfile: ${lockFileName}`);
-	const res = [{ file: {
-		type: "addition",
-		path: lockFileName,
-		contents: await readLocalFile(lockFileName)
-	} }];
+	const lockFileContent = await readLocalFile(lockFileName);
+	const res = [fileAddition(lockFileName, lockFileContent)];
 	const podsDir = upath.join(upath.dirname(packageFileName), "Pods");
 	const podsManifestFileName = upath.join(podsDir, "Manifest.lock");
-	if (await readLocalFile(podsManifestFileName, "utf8")) {
-		for (const f of status.modified.concat(status.not_added)) if (f.startsWith(podsDir)) res.push({ file: {
-			type: "addition",
-			path: f,
-			contents: await readLocalFile(f)
-		} });
-		for (const f of coerceArray(status.deleted)) res.push({ file: {
-			type: "deletion",
-			path: f
-		} });
-	}
+	if (await readLocalFile(podsManifestFileName, "utf8")) res.push(...fileChangesToArtifactResults([...await collectFileChanges(status, {
+		include: ["modified", "not_added"],
+		filter: (f) => f.startsWith(podsDir)
+	}), ...await collectFileChanges(status, { include: ["deleted"] })]));
 	return res;
 }
 //#endregion

package/dist/modules/manager/cocoapods/artifacts.js.map

@@ -1 +1 @@
-{"version":3,"file":"artifacts.js","names":[],"sources":["../../../../lib/modules/manager/cocoapods/artifacts.ts"],"sourcesContent":["import { quote } from 'shlex';\nimport upath from 'upath';\nimport { TEMPORARY_ERROR } from '../../../constants/error-messages.ts';\nimport { logger } from '../../../logger/index.ts';\nimport { coerceArray } from '../../../util/array.ts';\nimport { exec } from '../../../util/exec/index.ts';\nimport type { ExecOptions } from '../../../util/exec/types.ts';\nimport {\n  ensureCacheDir,\n  getSiblingFileName,\n  readLocalFile,\n  writeLocalFile,\n} from '../../../util/fs/index.ts';\nimport { getRepoStatus } from '../../../util/git/index.ts';\nimport { newlineRegex, regEx } from '../../../util/regex.ts';\nimport type { UpdateArtifact, UpdateArtifactsResult } from '../types.ts';\n\nconst pluginRegex = regEx(`^\\\\s*plugin\\\\s*(['\"])(?<plugin>[^'\"]+)(['\"])`);\n\nfunction getPluginCommands(content: string): string[] {\n  const result = new Set<string>();\n  const lines: string[] = content.split(newlineRegex);\n  lines.forEach((line) => {\n    const match = pluginRegex.exec(line);\n    if (match?.groups) {\n      const { plugin } = match.groups;\n      result.add(`gem install ${quote(plugin)}`);\n    }\n  });\n  return [...result];\n}\n\nexport async function updateArtifacts({\n  packageFileName,\n  updatedDeps,\n  newPackageFileContent,\n}: UpdateArtifact): Promise<UpdateArtifactsResult[] | null> {\n  logger.debug(`cocoapods.getArtifacts(${packageFileName})`);\n\n  if (updatedDeps.length < 1) {\n    logger.debug('CocoaPods: empty update - returning null');\n    return null;\n  }\n\n  const lockFileName = getSiblingFileName(packageFileName, 'Podfile.lock');\n\n  try {\n    await writeLocalFile(packageFileName, newPackageFileContent);\n  } catch (err) {\n    logger.warn({ err }, 'Podfile could not be written');\n    return [\n      {\n        artifactError: {\n          fileName: lockFileName,\n          stderr: err.message,\n        },\n      },\n    ];\n  }\n\n  const existingLockFileContent = await readLocalFile(lockFileName, 'utf8');\n  if (!existingLockFileContent) {\n    logger.debug(`Lockfile not found: ${lockFileName}`);\n    return null;\n  }\n\n  const match = regEx(/^COCOAPODS: (?<cocoapodsVersion>.*)$/m).exec(\n    existingLockFileContent,\n  );\n  const cocoapods = match?.groups?.cocoapodsVersion ?? null;\n\n  const cmd = [...getPluginCommands(newPackageFileContent), 'pod install'];\n  const execOptions: ExecOptions = {\n    cwdFile: packageFileName,\n    extraEnv: {\n      CP_HOME_DIR: await ensureCacheDir('cocoapods'),\n    },\n    docker: {},\n    toolConstraints: [\n      {\n        toolName: 'ruby',\n      },\n      {\n        toolName: 'cocoapods',\n        constraint: cocoapods,\n      },\n    ],\n  };\n\n  try {\n    await exec(cmd, execOptions);\n  } catch (err) {\n    // istanbul ignore if\n    if (err.message === TEMPORARY_ERROR) {\n      throw err;\n    }\n    return [\n      {\n        artifactError: {\n          fileName: lockFileName,\n          stderr: err.stderr ?? err.stdout ?? err.message,\n        },\n      },\n    ];\n  }\n\n  const status = await getRepoStatus();\n  if (!status.modified.includes(lockFileName)) {\n    return null;\n  }\n  logger.debug(`Returning updated lockfile: ${lockFileName}`);\n  const lockFileContent = await readLocalFile(lockFileName);\n  const res: UpdateArtifactsResult[] = [\n    {\n      file: {\n        type: 'addition',\n        path: lockFileName,\n        contents: lockFileContent,\n      },\n    },\n  ];\n\n  const podsDir = upath.join(upath.dirname(packageFileName), 'Pods');\n  const podsManifestFileName = upath.join(podsDir, 'Manifest.lock');\n  if (await readLocalFile(podsManifestFileName, 'utf8')) {\n    for (const f of status.modified.concat(status.not_added)) {\n      if (f.startsWith(podsDir)) {\n        res.push({\n          file: {\n            type: 'addition',\n            path: f,\n            contents: await readLocalFile(f),\n          },\n        });\n      }\n    }\n    for (const f of coerceArray(status.deleted)) {\n      res.push({\n        file: {\n          type: 'deletion',\n          path: f,\n        },\n      });\n    }\n  }\n  return res;\n}\n"],"mappings":";;;;;;;;;;AAiBA,MAAM,cAAc,MAAM,8CAA8C;AAExE,SAAS,kBAAkB,SAA2B;CACpD,MAAM,yBAAS,IAAI,IAAY;CAE/B,QADgC,MAAM,YAClC,CAAC,CAAC,SAAS,SAAS;EACtB,MAAM,QAAQ,YAAY,KAAK,IAAI;EACnC,IAAI,OAAO,QAAQ;GACjB,MAAM,EAAE,WAAW,MAAM;GACzB,OAAO,IAAI,eAAe,MAAM,MAAM,GAAG;EAC3C;CACF,CAAC;CACD,OAAO,CAAC,GAAG,MAAM;AACnB;AAEA,eAAsB,gBAAgB,EACpC,iBACA,aACA,yBAC0D;CAC1D,OAAO,MAAM,0BAA0B,gBAAgB,EAAE;CAEzD,IAAI,YAAY,SAAS,GAAG;EAC1B,OAAO,MAAM,0CAA0C;EACvD,OAAO;CACT;CAEA,MAAM,eAAe,mBAAmB,iBAAiB,cAAc;CAEvE,IAAI;EACF,MAAM,eAAe,iBAAiB,qBAAqB;CAC7D,SAAS,KAAK;EACZ,OAAO,KAAK,EAAE,IAAI,GAAG,8BAA8B;EACnD,OAAO,CACL,EACE,eAAe;GACb,UAAU;GACV,QAAQ,IAAI;EACd,EACF,CACF;CACF;CAEA,MAAM,0BAA0B,MAAM,cAAc,cAAc,MAAM;CACxE,IAAI,CAAC,yBAAyB;EAC5B,OAAO,MAAM,uBAAuB,cAAc;EAClD,OAAO;CACT;CAKA,MAAM,YAHQ,MAAM,uCAAuC,CAAC,CAAC,KAC3D,uBAEoB,CAAC,EAAE,QAAQ,oBAAoB;CAErD,MAAM,MAAM,CAAC,GAAG,kBAAkB,qBAAqB,GAAG,aAAa;CACvE,MAAM,cAA2B;EAC/B,SAAS;EACT,UAAU,EACR,aAAa,MAAM,eAAe,WAAW,EAC/C;EACA,QAAQ,CAAC;EACT,iBAAiB,CACf,EACE,UAAU,OACZ,GACA;GACE,UAAU;GACV,YAAY;EACd,CACF;CACF;CAEA,IAAI;EACF,MAAM,KAAK,KAAK,WAAW;CAC7B,SAAS,KAAK;;EAEZ,IAAI,IAAI,YAAA,mBACN,MAAM;EAER,OAAO,CACL,EACE,eAAe;GACb,UAAU;GACV,QAAQ,IAAI,UAAU,IAAI,UAAU,IAAI;EAC1C,EACF,CACF;CACF;CAEA,MAAM,SAAS,MAAM,cAAc;CACnC,IAAI,CAAC,OAAO,SAAS,SAAS,YAAY,GACxC,OAAO;CAET,OAAO,MAAM,+BAA+B,cAAc;CAE1D,MAAM,MAA+B,CACnC,EACE,MAAM;EACJ,MAAM;EACN,MAAM;EACN,UAAU,MANc,cAAc,YAAY;CAOpD,EACF,CACF;CAEA,MAAM,UAAU,MAAM,KAAK,MAAM,QAAQ,eAAe,GAAG,MAAM;CACjE,MAAM,uBAAuB,MAAM,KAAK,SAAS,eAAe;CAChE,IAAI,MAAM,cAAc,sBAAsB,MAAM,GAAG;EACrD,KAAK,MAAM,KAAK,OAAO,SAAS,OAAO,OAAO,SAAS,GACrD,IAAI,EAAE,WAAW,OAAO,GACtB,IAAI,KAAK,EACP,MAAM;GACJ,MAAM;GACN,MAAM;GACN,UAAU,MAAM,cAAc,CAAC;EACjC,EACF,CAAC;EAGL,KAAK,MAAM,KAAK,YAAY,OAAO,OAAO,GACxC,IAAI,KAAK,EACP,MAAM;GACJ,MAAM;GACN,MAAM;EACR,EACF,CAAC;CAEL;CACA,OAAO;AACT"}
+{"version":3,"file":"artifacts.js","names":[],"sources":["../../../../lib/modules/manager/cocoapods/artifacts.ts"],"sourcesContent":["import { quote } from 'shlex';\nimport upath from 'upath';\nimport { TEMPORARY_ERROR } from '../../../constants/error-messages.ts';\nimport { logger } from '../../../logger/index.ts';\nimport { exec } from '../../../util/exec/index.ts';\nimport type { ExecOptions } from '../../../util/exec/types.ts';\nimport {\n  ensureCacheDir,\n  getSiblingFileName,\n  readLocalFile,\n  writeLocalFile,\n} from '../../../util/fs/index.ts';\nimport { collectFileChanges } from '../../../util/git/file-changes.ts';\nimport { getRepoStatus } from '../../../util/git/index.ts';\nimport { newlineRegex, regEx } from '../../../util/regex.ts';\nimport type { UpdateArtifact, UpdateArtifactsResult } from '../types.ts';\nimport {\n  artifactErrorResult,\n  fileAddition,\n  fileChangesToArtifactResults,\n} from '../util.ts';\n\nconst pluginRegex = regEx(`^\\\\s*plugin\\\\s*(['\"])(?<plugin>[^'\"]+)(['\"])`);\n\nfunction getPluginCommands(content: string): string[] {\n  const result = new Set<string>();\n  const lines: string[] = content.split(newlineRegex);\n  lines.forEach((line) => {\n    const match = pluginRegex.exec(line);\n    if (match?.groups) {\n      const { plugin } = match.groups;\n      result.add(`gem install ${quote(plugin)}`);\n    }\n  });\n  return [...result];\n}\n\nexport async function updateArtifacts({\n  packageFileName,\n  updatedDeps,\n  newPackageFileContent,\n}: UpdateArtifact): Promise<UpdateArtifactsResult[] | null> {\n  logger.debug(`cocoapods.getArtifacts(${packageFileName})`);\n\n  if (updatedDeps.length < 1) {\n    logger.debug('CocoaPods: empty update - returning null');\n    return null;\n  }\n\n  const lockFileName = getSiblingFileName(packageFileName, 'Podfile.lock');\n\n  try {\n    await writeLocalFile(packageFileName, newPackageFileContent);\n  } catch (err) {\n    logger.warn({ err }, 'Podfile could not be written');\n    return artifactErrorResult(lockFileName, err);\n  }\n\n  const existingLockFileContent = await readLocalFile(lockFileName, 'utf8');\n  if (!existingLockFileContent) {\n    logger.debug(`Lockfile not found: ${lockFileName}`);\n    return null;\n  }\n\n  const match = regEx(/^COCOAPODS: (?<cocoapodsVersion>.*)$/m).exec(\n    existingLockFileContent,\n  );\n  const cocoapods = match?.groups?.cocoapodsVersion ?? null;\n\n  const cmd = [...getPluginCommands(newPackageFileContent), 'pod install'];\n  const execOptions: ExecOptions = {\n    cwdFile: packageFileName,\n    extraEnv: {\n      CP_HOME_DIR: await ensureCacheDir('cocoapods'),\n    },\n    docker: {},\n    toolConstraints: [\n      {\n        toolName: 'ruby',\n      },\n      {\n        toolName: 'cocoapods',\n        constraint: cocoapods,\n      },\n    ],\n  };\n\n  try {\n    await exec(cmd, execOptions);\n  } catch (err) {\n    /* v8 ignore if -- defensive rethrow, not reproduced in the cocoapods specs */\n    if (err.message === TEMPORARY_ERROR) {\n      throw err;\n    }\n    return artifactErrorResult(lockFileName, err);\n  }\n\n  const status = await getRepoStatus();\n  if (!status.modified.includes(lockFileName)) {\n    return null;\n  }\n  logger.debug(`Returning updated lockfile: ${lockFileName}`);\n  const lockFileContent = await readLocalFile(lockFileName);\n  const res: UpdateArtifactsResult[] = [\n    fileAddition(lockFileName, lockFileContent),\n  ];\n\n  const podsDir = upath.join(upath.dirname(packageFileName), 'Pods');\n  const podsManifestFileName = upath.join(podsDir, 'Manifest.lock');\n  if (await readLocalFile(podsManifestFileName, 'utf8')) {\n    res.push(\n      ...fileChangesToArtifactResults([\n        ...(await collectFileChanges(status, {\n          include: ['modified', 'not_added'],\n          filter: (f) => f.startsWith(podsDir),\n        })),\n        ...(await collectFileChanges(status, { include: ['deleted'] })),\n      ]),\n    );\n  }\n  return res;\n}\n"],"mappings":";;;;;;;;;;;AAsBA,MAAM,cAAc,MAAM,8CAA8C;AAExE,SAAS,kBAAkB,SAA2B;CACpD,MAAM,yBAAS,IAAI,IAAY;CAE/B,QADgC,MAAM,YAClC,CAAC,CAAC,SAAS,SAAS;EACtB,MAAM,QAAQ,YAAY,KAAK,IAAI;EACnC,IAAI,OAAO,QAAQ;GACjB,MAAM,EAAE,WAAW,MAAM;GACzB,OAAO,IAAI,eAAe,MAAM,MAAM,GAAG;EAC3C;CACF,CAAC;CACD,OAAO,CAAC,GAAG,MAAM;AACnB;AAEA,eAAsB,gBAAgB,EACpC,iBACA,aACA,yBAC0D;CAC1D,OAAO,MAAM,0BAA0B,gBAAgB,EAAE;CAEzD,IAAI,YAAY,SAAS,GAAG;EAC1B,OAAO,MAAM,0CAA0C;EACvD,OAAO;CACT;CAEA,MAAM,eAAe,mBAAmB,iBAAiB,cAAc;CAEvE,IAAI;EACF,MAAM,eAAe,iBAAiB,qBAAqB;CAC7D,SAAS,KAAK;EACZ,OAAO,KAAK,EAAE,IAAI,GAAG,8BAA8B;EACnD,OAAO,oBAAoB,cAAc,GAAG;CAC9C;CAEA,MAAM,0BAA0B,MAAM,cAAc,cAAc,MAAM;CACxE,IAAI,CAAC,yBAAyB;EAC5B,OAAO,MAAM,uBAAuB,cAAc;EAClD,OAAO;CACT;CAKA,MAAM,YAHQ,MAAM,uCAAuC,CAAC,CAAC,KAC3D,uBAEoB,CAAC,EAAE,QAAQ,oBAAoB;CAErD,MAAM,MAAM,CAAC,GAAG,kBAAkB,qBAAqB,GAAG,aAAa;CACvE,MAAM,cAA2B;EAC/B,SAAS;EACT,UAAU,EACR,aAAa,MAAM,eAAe,WAAW,EAC/C;EACA,QAAQ,CAAC;EACT,iBAAiB,CACf,EACE,UAAU,OACZ,GACA;GACE,UAAU;GACV,YAAY;EACd,CACF;CACF;CAEA,IAAI;EACF,MAAM,KAAK,KAAK,WAAW;CAC7B,SAAS,KAAK;;EAEZ,IAAI,IAAI,YAAA,mBACN,MAAM;EAER,OAAO,oBAAoB,cAAc,GAAG;CAC9C;CAEA,MAAM,SAAS,MAAM,cAAc;CACnC,IAAI,CAAC,OAAO,SAAS,SAAS,YAAY,GACxC,OAAO;CAET,OAAO,MAAM,+BAA+B,cAAc;CAC1D,MAAM,kBAAkB,MAAM,cAAc,YAAY;CACxD,MAAM,MAA+B,CACnC,aAAa,cAAc,eAAe,CAC5C;CAEA,MAAM,UAAU,MAAM,KAAK,MAAM,QAAQ,eAAe,GAAG,MAAM;CACjE,MAAM,uBAAuB,MAAM,KAAK,SAAS,eAAe;CAChE,IAAI,MAAM,cAAc,sBAAsB,MAAM,GAClD,IAAI,KACF,GAAG,6BAA6B,CAC9B,GAAI,MAAM,mBAAmB,QAAQ;EACnC,SAAS,CAAC,YAAY,WAAW;EACjC,SAAS,MAAM,EAAE,WAAW,OAAO;CACrC,CAAC,GACD,GAAI,MAAM,mBAAmB,QAAQ,EAAE,SAAS,CAAC,SAAS,EAAE,CAAC,CAC/D,CAAC,CACH;CAEF,OAAO;AACT"}

package/dist/modules/manager/composer/artifacts.js

@@ -12,7 +12,8 @@ import { exec } from "../../../util/exec/index.js";
 import { getRepoStatus } from "../../../util/git/index.js";
 import { GitTagsDatasource } from "../../datasource/git-tags/index.js";
 import { PackagistDatasource } from "../../datasource/packagist/index.js";
-import { resolveToolConstraint } from "../util.js";
+import { collectFileChanges } from "../../../util/git/file-changes.js";
+import { artifactErrorResult, fileAddition, fileChangesToArtifactResults, resolveToolConstraint } from "../util.js";
 import { findGithubToken, takePersonalAccessTokenIfPossible } from "../../../util/check-token.js";
 import { Lockfile, PackageFile } from "./schema.js";
 import { extractConstraints, getComposerArguments, getComposerUpdateArguments, isArtifactAuthEnabled, requireComposerDependencyInstallation } from "./utils.js";
@@ -127,22 +128,13 @@ async function updateArtifacts({ packageFileName, updatedDeps, newPackageFileCon
 		const status = await getRepoStatus();
 		if (!status.modified.includes(lockFileName)) return null;
 		logger.debug("Returning updated composer.lock");
-		const res = [{ file: {
-			type: "addition",
-			path: lockFileName,
-			contents: await readLocalFile(lockFileName)
-		} }];
+		const res = [fileAddition(lockFileName, await readLocalFile(lockFileName))];
 		if (!commitVendorFiles) return res;
 		logger.debug(`Committing vendor files in ${vendorDir}`);
-		for (const f of [...status.modified, ...status.not_added]) if (f.startsWith(vendorDir)) res.push({ file: {
-			type: "addition",
-			path: f,
-			contents: await readLocalFile(f)
-		} });
-		for (const f of status.deleted) res.push({ file: {
-			type: "deletion",
-			path: f
-		} });
+		res.push(...fileChangesToArtifactResults([...await collectFileChanges(status, {
+			include: ["modified", "not_added"],
+			filter: (f) => f.startsWith(vendorDir)
+		}), ...await collectFileChanges(status, { include: ["deleted"] })]));
 		return res;
 	} catch (err) {
 		// istanbul ignore if
@@ -150,10 +142,7 @@ async function updateArtifacts({ packageFileName, updatedDeps, newPackageFileCon
 		if (err.message?.includes("Your requirements could not be resolved to an installable set of packages.")) logger.info("Composer requirements cannot be resolved");
 		else if (err.message?.includes("write error (disk full?)")) throw new Error(SYSTEM_INSUFFICIENT_DISK_SPACE);
 		else logger.debug({ err }, "Failed to generate composer.lock");
-		return [{ artifactError: {
-			fileName: lockFileName,
-			stderr: err.message
-		} }];
+		return artifactErrorResult(lockFileName, err);
 	}
 }
 //#endregion

package/dist/modules/manager/composer/artifacts.js.map

@@ -1 +1 @@
-{"version":3,"file":"artifacts.js","names":["hostRules.find","hostRules.findAll"],"sources":["../../../../lib/modules/manager/composer/artifacts.ts"],"sourcesContent":["import { isEmptyObject, isString } from '@sindresorhus/is';\nimport { quote } from 'shlex';\nimport { z } from 'zod/v4';\nimport {\n  SYSTEM_INSUFFICIENT_DISK_SPACE,\n  TEMPORARY_ERROR,\n} from '../../../constants/error-messages.ts';\nimport { logger } from '../../../logger/index.ts';\nimport { coerceArray } from '../../../util/array.ts';\nimport {\n  findGithubToken,\n  takePersonalAccessTokenIfPossible,\n} from '../../../util/check-token.ts';\nimport { exec } from '../../../util/exec/index.ts';\nimport type {\n  CommandWithOptions,\n  ExecOptions,\n  ToolConstraint,\n} from '../../../util/exec/types.ts';\nimport {\n  deleteLocalFile,\n  ensureCacheDir,\n  ensureLocalDir,\n  getSiblingFileName,\n  localPathExists,\n  readLocalFile,\n  writeLocalFile,\n} from '../../../util/fs/index.ts';\nimport { getRepoStatus } from '../../../util/git/index.ts';\nimport * as hostRules from '../../../util/host-rules.ts';\nimport { Lazy } from '../../../util/lazy.ts';\nimport { coerceObject } from '../../../util/object.ts';\nimport { regEx } from '../../../util/regex.ts';\nimport { Json } from '../../../util/schema-utils/index.ts';\nimport { coerceString } from '../../../util/string.ts';\nimport { GitTagsDatasource } from '../../datasource/git-tags/index.ts';\nimport { PackagistDatasource } from '../../datasource/packagist/index.ts';\nimport type { UpdateArtifact, UpdateArtifactsResult } from '../types.ts';\nimport { resolveToolConstraint } from '../util.ts';\nimport { Lockfile, PackageFile } from './schema.ts';\nimport type { AuthJson } from './types.ts';\nimport {\n  extractConstraints,\n  getComposerArguments,\n  getComposerUpdateArguments,\n  isArtifactAuthEnabled,\n  requireComposerDependencyInstallation,\n} from './utils.ts';\n\nfunction getAuthJson(): string | null {\n  const authJson: AuthJson = {};\n\n  const githubHostRule = hostRules.find({\n    hostType: 'github',\n    url: 'https://api.github.com/',\n  });\n\n  const gitTagsHostRule = hostRules.find({\n    hostType: GitTagsDatasource.id,\n    url: 'https://github.com',\n  });\n\n  const selectedGithubToken = takePersonalAccessTokenIfPossible(\n    isArtifactAuthEnabled(githubHostRule)\n      ? findGithubToken(githubHostRule)\n      : undefined,\n    isArtifactAuthEnabled(gitTagsHostRule)\n      ? findGithubToken(gitTagsHostRule)\n      : undefined,\n  );\n\n  if (selectedGithubToken) {\n    authJson['github-oauth'] = {\n      'github.com': selectedGithubToken,\n    };\n  }\n\n  for (const gitlabHostRule of hostRules.findAll({ hostType: 'gitlab' })) {\n    if (!isArtifactAuthEnabled(gitlabHostRule)) {\n      continue;\n    }\n\n    // v8 ignore else -- a rule without a token does not pass the check above\n    if (gitlabHostRule?.token) {\n      const host = coerceString(gitlabHostRule.resolvedHost, 'gitlab.com');\n      authJson['gitlab-token'] = coerceObject(authJson['gitlab-token']);\n      authJson['gitlab-token'][host] = gitlabHostRule.token;\n      // https://getcomposer.org/doc/articles/authentication-for-private-packages.md#gitlab-token\n      authJson['gitlab-domains'] = [\n        host,\n        ...coerceArray(authJson['gitlab-domains']),\n      ];\n    }\n  }\n\n  for (const packagistHostRule of hostRules.findAll({\n    hostType: PackagistDatasource.id,\n  })) {\n    if (!isArtifactAuthEnabled(packagistHostRule)) {\n      continue;\n    }\n\n    const { resolvedHost, username, password, token } = packagistHostRule;\n    if (resolvedHost && username && password) {\n      authJson['http-basic'] = coerceObject(authJson['http-basic']);\n      authJson['http-basic'][resolvedHost] = { username, password };\n    } else if (resolvedHost && token) {\n      authJson.bearer = coerceObject(authJson.bearer);\n      authJson.bearer[resolvedHost] = token;\n    }\n  }\n\n  return isEmptyObject(authJson) ? null : JSON.stringify(authJson);\n}\n\nexport async function updateArtifacts({\n  packageFileName,\n  updatedDeps,\n  newPackageFileContent,\n  config,\n}: UpdateArtifact): Promise<UpdateArtifactsResult[] | null> {\n  logger.debug(`composer.updateArtifacts(${packageFileName})`);\n\n  const file = Json.pipe(PackageFile).parse(newPackageFileContent);\n\n  const lockFileName = packageFileName.replace(regEx(/\\.json$/), '.lock');\n  const lockfile = await z\n    .string()\n    .transform((f) => readLocalFile(f, 'utf8'))\n    .pipe(Json)\n    .pipe(Lockfile)\n    .nullable()\n    .catch(null)\n    .parseAsync(lockFileName);\n  if (!lockfile) {\n    logger.debug('Composer: unable to read lockfile');\n    return null;\n  }\n\n  const vendorDir = getSiblingFileName(packageFileName, 'vendor');\n  const commitVendorFiles = await localPathExists(vendorDir);\n  await ensureLocalDir(vendorDir);\n  try {\n    await writeLocalFile(packageFileName, newPackageFileContent);\n\n    // `extractConstraints()` re-reads the updated package file, so its values win\n    // over what extraction saw on the base branch. It only runs when a user\n    // constraint is missing for at least one of the tools.\n    const fileConstraints = new Lazy(() => extractConstraints(file, lockfile));\n\n    const composerToolConstraint: ToolConstraint = {\n      toolName: 'composer',\n      constraint: await resolveToolConstraint(\n        config,\n        'composer',\n        () => fileConstraints.getValue().composer,\n      ),\n    };\n\n    const phpToolConstraint: ToolConstraint = {\n      toolName: 'php',\n      constraint: await resolveToolConstraint(\n        config,\n        'php',\n        () => fileConstraints.getValue().php,\n      ),\n    };\n\n    const execOptions: ExecOptions = {\n      cwdFile: packageFileName,\n      extraEnv: {\n        COMPOSER_CACHE_DIR: await ensureCacheDir('composer'),\n        COMPOSER_AUTH: getAuthJson(),\n      },\n      toolConstraints: [phpToolConstraint, composerToolConstraint],\n      docker: {},\n    };\n\n    const commands: (string | CommandWithOptions)[] = [];\n\n    // Determine whether install is required before update\n    if (requireComposerDependencyInstallation(lockfile)) {\n      const preCmd = 'composer';\n      const preArgs = `install${getComposerArguments(config, composerToolConstraint)}`;\n      logger.trace({ preCmd, preArgs }, 'composer pre-update command');\n      commands.push('git stash -- composer.json');\n      commands.push(`${preCmd} ${preArgs}`);\n      commands.push({ command: ['git', 'stash', 'pop'], ignoreFailure: true });\n    }\n\n    if (config.isLockFileMaintenance) {\n      logger.debug(\n        `Removing ${lockFileName} first due to lock file maintenance upgrade`,\n      );\n      await deleteLocalFile(lockFileName);\n    }\n\n    const cmd = 'composer';\n    let args: string;\n    if (config.isLockFileMaintenance) {\n      args = 'update';\n    } else {\n      args =\n        (\n          'update ' +\n          updatedDeps\n            .map((dep) =>\n              dep.newVersion\n                ? quote(`${dep.depName}:${dep.newVersion}`)\n                : quote(dep.depName!),\n            )\n            .filter(isString)\n            .map((dep) => quote(dep))\n            .join(' ')\n        ).trim() +\n        (config.postUpdateOptions?.includes('composerWithAll')\n          ? ' --with-all-dependencies'\n          : ' --with-dependencies');\n    }\n    args += getComposerUpdateArguments(config, composerToolConstraint);\n    logger.trace({ cmd, args }, 'composer command');\n    commands.push(`${cmd} ${args}`);\n\n    await exec(commands, execOptions);\n    const status = await getRepoStatus();\n    if (!status.modified.includes(lockFileName)) {\n      return null;\n    }\n    logger.debug('Returning updated composer.lock');\n    const res: UpdateArtifactsResult[] = [\n      {\n        file: {\n          type: 'addition',\n          path: lockFileName,\n          contents: await readLocalFile(lockFileName),\n        },\n      },\n    ];\n\n    if (!commitVendorFiles) {\n      return res;\n    }\n\n    logger.debug(`Committing vendor files in ${vendorDir}`);\n    for (const f of [...status.modified, ...status.not_added]) {\n      if (f.startsWith(vendorDir)) {\n        res.push({\n          file: {\n            type: 'addition',\n            path: f,\n            contents: await readLocalFile(f),\n          },\n        });\n      }\n    }\n    for (const f of status.deleted) {\n      res.push({\n        file: {\n          type: 'deletion',\n          path: f,\n        },\n      });\n    }\n\n    return res;\n  } catch (err) {\n    // istanbul ignore if\n    if (err.message === TEMPORARY_ERROR) {\n      throw err;\n    }\n    if (\n      err.message?.includes(\n        'Your requirements could not be resolved to an installable set of packages.',\n      )\n    ) {\n      logger.info('Composer requirements cannot be resolved');\n    } else if (err.message?.includes('write error (disk full?)')) {\n      throw new Error(SYSTEM_INSUFFICIENT_DISK_SPACE);\n    } else {\n      logger.debug({ err }, 'Failed to generate composer.lock');\n    }\n    return [\n      {\n        artifactError: {\n          fileName: lockFileName,\n          stderr: err.message,\n        },\n      },\n    ];\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"artifacts.js","names":["hostRules.find","hostRules.findAll"],"sources":["../../../../lib/modules/manager/composer/artifacts.ts"],"sourcesContent":["import { isEmptyObject, isString } from '@sindresorhus/is';\nimport { quote } from 'shlex';\nimport { z } from 'zod/v4';\nimport {\n  SYSTEM_INSUFFICIENT_DISK_SPACE,\n  TEMPORARY_ERROR,\n} from '../../../constants/error-messages.ts';\nimport { logger } from '../../../logger/index.ts';\nimport { coerceArray } from '../../../util/array.ts';\nimport {\n  findGithubToken,\n  takePersonalAccessTokenIfPossible,\n} from '../../../util/check-token.ts';\nimport { exec } from '../../../util/exec/index.ts';\nimport type {\n  CommandWithOptions,\n  ExecOptions,\n  ToolConstraint,\n} from '../../../util/exec/types.ts';\nimport {\n  deleteLocalFile,\n  ensureCacheDir,\n  ensureLocalDir,\n  getSiblingFileName,\n  localPathExists,\n  readLocalFile,\n  writeLocalFile,\n} from '../../../util/fs/index.ts';\nimport { collectFileChanges } from '../../../util/git/file-changes.ts';\nimport { getRepoStatus } from '../../../util/git/index.ts';\nimport * as hostRules from '../../../util/host-rules.ts';\nimport { Lazy } from '../../../util/lazy.ts';\nimport { coerceObject } from '../../../util/object.ts';\nimport { regEx } from '../../../util/regex.ts';\nimport { Json } from '../../../util/schema-utils/index.ts';\nimport { coerceString } from '../../../util/string.ts';\nimport { GitTagsDatasource } from '../../datasource/git-tags/index.ts';\nimport { PackagistDatasource } from '../../datasource/packagist/index.ts';\nimport type { UpdateArtifact, UpdateArtifactsResult } from '../types.ts';\nimport {\n  artifactErrorResult,\n  fileAddition,\n  fileChangesToArtifactResults,\n  resolveToolConstraint,\n} from '../util.ts';\nimport { Lockfile, PackageFile } from './schema.ts';\nimport type { AuthJson } from './types.ts';\nimport {\n  extractConstraints,\n  getComposerArguments,\n  getComposerUpdateArguments,\n  isArtifactAuthEnabled,\n  requireComposerDependencyInstallation,\n} from './utils.ts';\n\nfunction getAuthJson(): string | null {\n  const authJson: AuthJson = {};\n\n  const githubHostRule = hostRules.find({\n    hostType: 'github',\n    url: 'https://api.github.com/',\n  });\n\n  const gitTagsHostRule = hostRules.find({\n    hostType: GitTagsDatasource.id,\n    url: 'https://github.com',\n  });\n\n  const selectedGithubToken = takePersonalAccessTokenIfPossible(\n    isArtifactAuthEnabled(githubHostRule)\n      ? findGithubToken(githubHostRule)\n      : undefined,\n    isArtifactAuthEnabled(gitTagsHostRule)\n      ? findGithubToken(gitTagsHostRule)\n      : undefined,\n  );\n\n  if (selectedGithubToken) {\n    authJson['github-oauth'] = {\n      'github.com': selectedGithubToken,\n    };\n  }\n\n  for (const gitlabHostRule of hostRules.findAll({ hostType: 'gitlab' })) {\n    if (!isArtifactAuthEnabled(gitlabHostRule)) {\n      continue;\n    }\n\n    // v8 ignore else -- a rule without a token does not pass the check above\n    if (gitlabHostRule?.token) {\n      const host = coerceString(gitlabHostRule.resolvedHost, 'gitlab.com');\n      authJson['gitlab-token'] = coerceObject(authJson['gitlab-token']);\n      authJson['gitlab-token'][host] = gitlabHostRule.token;\n      // https://getcomposer.org/doc/articles/authentication-for-private-packages.md#gitlab-token\n      authJson['gitlab-domains'] = [\n        host,\n        ...coerceArray(authJson['gitlab-domains']),\n      ];\n    }\n  }\n\n  for (const packagistHostRule of hostRules.findAll({\n    hostType: PackagistDatasource.id,\n  })) {\n    if (!isArtifactAuthEnabled(packagistHostRule)) {\n      continue;\n    }\n\n    const { resolvedHost, username, password, token } = packagistHostRule;\n    if (resolvedHost && username && password) {\n      authJson['http-basic'] = coerceObject(authJson['http-basic']);\n      authJson['http-basic'][resolvedHost] = { username, password };\n    } else if (resolvedHost && token) {\n      authJson.bearer = coerceObject(authJson.bearer);\n      authJson.bearer[resolvedHost] = token;\n    }\n  }\n\n  return isEmptyObject(authJson) ? null : JSON.stringify(authJson);\n}\n\nexport async function updateArtifacts({\n  packageFileName,\n  updatedDeps,\n  newPackageFileContent,\n  config,\n}: UpdateArtifact): Promise<UpdateArtifactsResult[] | null> {\n  logger.debug(`composer.updateArtifacts(${packageFileName})`);\n\n  const file = Json.pipe(PackageFile).parse(newPackageFileContent);\n\n  const lockFileName = packageFileName.replace(regEx(/\\.json$/), '.lock');\n  const lockfile = await z\n    .string()\n    .transform((f) => readLocalFile(f, 'utf8'))\n    .pipe(Json)\n    .pipe(Lockfile)\n    .nullable()\n    .catch(null)\n    .parseAsync(lockFileName);\n  if (!lockfile) {\n    logger.debug('Composer: unable to read lockfile');\n    return null;\n  }\n\n  const vendorDir = getSiblingFileName(packageFileName, 'vendor');\n  const commitVendorFiles = await localPathExists(vendorDir);\n  await ensureLocalDir(vendorDir);\n  try {\n    await writeLocalFile(packageFileName, newPackageFileContent);\n\n    // `extractConstraints()` re-reads the updated package file, so its values win\n    // over what extraction saw on the base branch. It only runs when a user\n    // constraint is missing for at least one of the tools.\n    const fileConstraints = new Lazy(() => extractConstraints(file, lockfile));\n\n    const composerToolConstraint: ToolConstraint = {\n      toolName: 'composer',\n      constraint: await resolveToolConstraint(\n        config,\n        'composer',\n        () => fileConstraints.getValue().composer,\n      ),\n    };\n\n    const phpToolConstraint: ToolConstraint = {\n      toolName: 'php',\n      constraint: await resolveToolConstraint(\n        config,\n        'php',\n        () => fileConstraints.getValue().php,\n      ),\n    };\n\n    const execOptions: ExecOptions = {\n      cwdFile: packageFileName,\n      extraEnv: {\n        COMPOSER_CACHE_DIR: await ensureCacheDir('composer'),\n        COMPOSER_AUTH: getAuthJson(),\n      },\n      toolConstraints: [phpToolConstraint, composerToolConstraint],\n      docker: {},\n    };\n\n    const commands: (string | CommandWithOptions)[] = [];\n\n    // Determine whether install is required before update\n    if (requireComposerDependencyInstallation(lockfile)) {\n      const preCmd = 'composer';\n      const preArgs = `install${getComposerArguments(config, composerToolConstraint)}`;\n      logger.trace({ preCmd, preArgs }, 'composer pre-update command');\n      commands.push('git stash -- composer.json');\n      commands.push(`${preCmd} ${preArgs}`);\n      commands.push({ command: ['git', 'stash', 'pop'], ignoreFailure: true });\n    }\n\n    if (config.isLockFileMaintenance) {\n      logger.debug(\n        `Removing ${lockFileName} first due to lock file maintenance upgrade`,\n      );\n      await deleteLocalFile(lockFileName);\n    }\n\n    const cmd = 'composer';\n    let args: string;\n    if (config.isLockFileMaintenance) {\n      args = 'update';\n    } else {\n      args =\n        (\n          'update ' +\n          updatedDeps\n            .map((dep) =>\n              dep.newVersion\n                ? quote(`${dep.depName}:${dep.newVersion}`)\n                : quote(dep.depName!),\n            )\n            .filter(isString)\n            .map((dep) => quote(dep))\n            .join(' ')\n        ).trim() +\n        (config.postUpdateOptions?.includes('composerWithAll')\n          ? ' --with-all-dependencies'\n          : ' --with-dependencies');\n    }\n    args += getComposerUpdateArguments(config, composerToolConstraint);\n    logger.trace({ cmd, args }, 'composer command');\n    commands.push(`${cmd} ${args}`);\n\n    await exec(commands, execOptions);\n    const status = await getRepoStatus();\n    if (!status.modified.includes(lockFileName)) {\n      return null;\n    }\n    logger.debug('Returning updated composer.lock');\n    const res: UpdateArtifactsResult[] = [\n      fileAddition(lockFileName, await readLocalFile(lockFileName)),\n    ];\n\n    if (!commitVendorFiles) {\n      return res;\n    }\n\n    logger.debug(`Committing vendor files in ${vendorDir}`);\n    res.push(\n      ...fileChangesToArtifactResults([\n        ...(await collectFileChanges(status, {\n          include: ['modified', 'not_added'],\n          filter: (f) => f.startsWith(vendorDir),\n        })),\n        ...(await collectFileChanges(status, { include: ['deleted'] })),\n      ]),\n    );\n\n    return res;\n  } catch (err) {\n    // istanbul ignore if\n    if (err.message === TEMPORARY_ERROR) {\n      throw err;\n    }\n    if (\n      err.message?.includes(\n        'Your requirements could not be resolved to an installable set of packages.',\n      )\n    ) {\n      logger.info('Composer requirements cannot be resolved');\n    } else if (err.message?.includes('write error (disk full?)')) {\n      throw new Error(SYSTEM_INSUFFICIENT_DISK_SPACE);\n    } else {\n      logger.debug({ err }, 'Failed to generate composer.lock');\n    }\n    return artifactErrorResult(lockFileName, err);\n  }\n}\n"],"mappings":"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"}