renovate 40.0.0-next.4 → 40.0.0-next.41

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

@@ -1,165 +1,54 @@
 import { z } from 'zod';
-export declare const CircleCiDocker: z.ZodObject<{
+export declare const CircleCiDocker: z.ZodEffects<z.ZodObject<{
     image: z.ZodString;
 }, "strip", z.ZodTypeAny, {
     image: string;
 }, {
     image: string;
+}>, string, {
+    image: string;
 }>;
-export declare const CircleCiJob: z.ZodObject<{
-    docker: z.ZodOptional<z.ZodArray<z.ZodObject<{
-        image: z.ZodString;
-    }, "strip", z.ZodTypeAny, {
-        image: string;
-    }, {
-        image: string;
-    }>, "many">>;
+export declare const CircleCiJob: z.ZodEffects<z.ZodObject<{
+    docker: z.ZodCatch<z.ZodEffects<z.ZodArray<z.ZodAny, "many">, string[], any[]>>;
 }, "strip", z.ZodTypeAny, {
-    docker?: {
-        image: string;
-    }[] | undefined;
+    docker: string[];
 }, {
-    docker?: {
-        image: string;
-    }[] | undefined;
+    docker?: unknown;
+}>, string[], {
+    docker?: unknown;
 }>;
 export type CircleCiJob = z.infer<typeof CircleCiJob>;
-declare const baseOrb: z.ZodObject<{
-    executors: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
-        docker: z.ZodOptional<z.ZodArray<z.ZodObject<{
-            image: z.ZodString;
-        }, "strip", z.ZodTypeAny, {
-            image: string;
-        }, {
-            image: string;
-        }>, "many">>;
-    }, "strip", z.ZodTypeAny, {
-        docker?: {
-            image: string;
-        }[] | undefined;
-    }, {
-        docker?: {
-            image: string;
-        }[] | undefined;
-    }>>>;
-    jobs: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
-        docker: z.ZodOptional<z.ZodArray<z.ZodObject<{
-            image: z.ZodString;
-        }, "strip", z.ZodTypeAny, {
-            image: string;
-        }, {
-            image: string;
-        }>, "many">>;
-    }, "strip", z.ZodTypeAny, {
-        docker?: {
-            image: string;
-        }[] | undefined;
-    }, {
-        docker?: {
-            image: string;
-        }[] | undefined;
-    }>>>;
+declare const BaseOrb: z.ZodObject<{
+    executors: z.ZodCatch<z.ZodEffects<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodAny>, Record<string, string[]>, Record<string, any>>, string[], Record<string, any>>>;
+    jobs: z.ZodCatch<z.ZodEffects<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodAny>, Record<string, string[]>, Record<string, any>>, string[], Record<string, any>>>;
 }, "strip", z.ZodTypeAny, {
-    jobs?: Record<string, {
-        docker?: {
-            image: string;
-        }[] | undefined;
-    }> | undefined;
-    executors?: Record<string, {
-        docker?: {
-            image: string;
-        }[] | undefined;
-    }> | undefined;
+    jobs: string[];
+    executors: string[];
 }, {
-    jobs?: Record<string, {
-        docker?: {
-            image: string;
-        }[] | undefined;
-    }> | undefined;
-    executors?: Record<string, {
-        docker?: {
-            image: string;
-        }[] | undefined;
-    }> | undefined;
+    jobs?: unknown;
+    executors?: unknown;
 }>;
-type Orb = z.infer<typeof baseOrb> & {
-    orbs?: Record<string, string | Orb>;
+type Orb = z.infer<typeof BaseOrb> & {
+    orbs: Record<string, string | Orb>;
 };
 export declare const CircleCiOrb: z.ZodType<Orb>;
 export type CircleCiOrb = z.infer<typeof CircleCiOrb>;
-export declare const CircleCiFile: z.ZodObject<{
-    aliases: z.ZodOptional<z.ZodArray<z.ZodObject<{
-        image: z.ZodString;
-    }, "strip", z.ZodTypeAny, {
-        image: string;
-    }, {
-        image: string;
-    }>, "many">>;
-    executors: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
-        docker: z.ZodOptional<z.ZodArray<z.ZodObject<{
-            image: z.ZodString;
-        }, "strip", z.ZodTypeAny, {
-            image: string;
-        }, {
-            image: string;
-        }>, "many">>;
-    }, "strip", z.ZodTypeAny, {
-        docker?: {
-            image: string;
-        }[] | undefined;
-    }, {
-        docker?: {
-            image: string;
-        }[] | undefined;
-    }>>>;
-    jobs: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
-        docker: z.ZodOptional<z.ZodArray<z.ZodObject<{
-            image: z.ZodString;
-        }, "strip", z.ZodTypeAny, {
-            image: string;
-        }, {
-            image: string;
-        }>, "many">>;
-    }, "strip", z.ZodTypeAny, {
-        docker?: {
-            image: string;
-        }[] | undefined;
-    }, {
-        docker?: {
-            image: string;
-        }[] | undefined;
-    }>>>;
-    orbs: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodString, z.ZodType<Orb, z.ZodTypeDef, Orb>]>>>;
+export declare const CircleCiFile: z.ZodPipeline<z.ZodEffects<z.ZodUnknown, unknown, unknown>, z.ZodObject<{
+    executors: z.ZodCatch<z.ZodEffects<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodAny>, Record<string, string[]>, Record<string, any>>, string[], Record<string, any>>>;
+    jobs: z.ZodCatch<z.ZodEffects<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodAny>, Record<string, string[]>, Record<string, any>>, string[], Record<string, any>>>;
+} & {
+    aliases: z.ZodCatch<z.ZodEffects<z.ZodArray<z.ZodAny, "many">, string[], any[]>>;
+    orbs: z.ZodCatch<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodAny>, Record<string, string | Orb>, Record<string, any>>>;
 }, "strip", z.ZodTypeAny, {
-    aliases?: {
-        image: string;
-    }[] | undefined;
-    jobs?: Record<string, {
-        docker?: {
-            image: string;
-        }[] | undefined;
-    }> | undefined;
-    executors?: Record<string, {
-        docker?: {
-            image: string;
-        }[] | undefined;
-    }> | undefined;
-    orbs?: Record<string, string | Orb> | undefined;
+    aliases: string[];
+    jobs: string[];
+    executors: string[];
+    orbs: Record<string, string | Orb>;
 }, {
-    aliases?: {
-        image: string;
-    }[] | undefined;
-    jobs?: Record<string, {
-        docker?: {
-            image: string;
-        }[] | undefined;
-    }> | undefined;
-    executors?: Record<string, {
-        docker?: {
-            image: string;
-        }[] | undefined;
-    }> | undefined;
-    orbs?: Record<string, string | Orb> | undefined;
-}>;
+    aliases?: unknown;
+    jobs?: unknown;
+    executors?: unknown;
+    orbs?: unknown;
+}>>;
 export type CircleCiFile = z.infer<typeof CircleCiFile>;
 export {};

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

@@ -2,23 +2,27 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CircleCiFile = exports.CircleCiOrb = exports.CircleCiJob = exports.CircleCiDocker = void 0;
 const zod_1 = require("zod");
-exports.CircleCiDocker = zod_1.z.object({
-    image: zod_1.z.string(),
+const schema_utils_1 = require("../../../util/schema-utils");
+exports.CircleCiDocker = zod_1.z
+    .object({ image: zod_1.z.string() })
+    .transform(({ image }) => image);
+exports.CircleCiJob = zod_1.z
+    .object({
+    docker: (0, schema_utils_1.LooseArray)(exports.CircleCiDocker).catch([]),
+})
+    .transform(({ docker }) => docker);
+const CircleCiJobList = (0, schema_utils_1.LooseRecord)(exports.CircleCiJob)
+    .transform((x) => Object.values(x).flat())
+    .catch([]);
+const BaseOrb = zod_1.z.object({
+    executors: CircleCiJobList,
+    jobs: CircleCiJobList,
 });
-exports.CircleCiJob = zod_1.z.object({
-    docker: zod_1.z.array(exports.CircleCiDocker).optional(),
-});
-const baseOrb = zod_1.z.object({
-    executors: zod_1.z.record(zod_1.z.string(), exports.CircleCiJob).optional(),
-    jobs: zod_1.z.record(zod_1.z.string(), exports.CircleCiJob).optional(),
-});
-exports.CircleCiOrb = baseOrb.extend({
-    orbs: zod_1.z.lazy(() => zod_1.z.record(zod_1.z.string(), zod_1.z.union([zod_1.z.string(), exports.CircleCiOrb])).optional()),
-});
-exports.CircleCiFile = zod_1.z.object({
-    aliases: zod_1.z.array(exports.CircleCiDocker).optional(),
-    executors: zod_1.z.record(zod_1.z.string(), exports.CircleCiJob).optional(),
-    jobs: zod_1.z.record(zod_1.z.string(), exports.CircleCiJob).optional(),
-    orbs: zod_1.z.record(zod_1.z.string(), zod_1.z.union([zod_1.z.string(), exports.CircleCiOrb])).optional(),
+exports.CircleCiOrb = BaseOrb.extend({
+    orbs: (0, schema_utils_1.LooseRecord)(zod_1.z.union([zod_1.z.string(), zod_1.z.lazy(() => exports.CircleCiOrb)])).catch({}),
 });
+exports.CircleCiFile = schema_utils_1.NotCircular.pipe(BaseOrb.extend({
+    aliases: (0, schema_utils_1.LooseArray)(exports.CircleCiDocker).catch([]),
+    orbs: (0, schema_utils_1.LooseRecord)(zod_1.z.union([zod_1.z.string(), exports.CircleCiOrb])).catch({}),
+}));
 //# sourceMappingURL=schema.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../lib/modules/manager/circleci/schema.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AAEX,QAAA,cAAc,GAAG,OAAC,CAAC,MAAM,CAAC;IACrC,KAAK,EAAE,OAAC,CAAC,MAAM,EAAE;CAClB,CAAC,CAAC;AAEU,QAAA,WAAW,GAAG,OAAC,CAAC,MAAM,CAAC;IAClC,MAAM,EAAE,OAAC,CAAC,KAAK,CAAC,sBAAc,CAAC,CAAC,QAAQ,EAAE;CAC3C,CAAC,CAAC;AAGH,MAAM,OAAO,GAAG,OAAC,CAAC,MAAM,CAAC;IACvB,SAAS,EAAE,OAAC,CAAC,MAAM,CAAC,OAAC,CAAC,MAAM,EAAE,EAAE,mBAAW,CAAC,CAAC,QAAQ,EAAE;IACvD,IAAI,EAAE,OAAC,CAAC,MAAM,CAAC,OAAC,CAAC,MAAM,EAAE,EAAE,mBAAW,CAAC,CAAC,QAAQ,EAAE;CACnD,CAAC,CAAC;AAMU,QAAA,WAAW,GAAmB,OAAO,CAAC,MAAM,CAAC;IACxD,IAAI,EAAE,OAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAChB,OAAC,CAAC,MAAM,CAAC,OAAC,CAAC,MAAM,EAAE,EAAE,OAAC,CAAC,KAAK,CAAC,CAAC,OAAC,CAAC,MAAM,EAAE,EAAE,mBAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CACpE;CACF,CAAC,CAAC;AAGU,QAAA,YAAY,GAAG,OAAC,CAAC,MAAM,CAAC;IACnC,OAAO,EAAE,OAAC,CAAC,KAAK,CAAC,sBAAc,CAAC,CAAC,QAAQ,EAAE;IAC3C,SAAS,EAAE,OAAC,CAAC,MAAM,CAAC,OAAC,CAAC,MAAM,EAAE,EAAE,mBAAW,CAAC,CAAC,QAAQ,EAAE;IACvD,IAAI,EAAE,OAAC,CAAC,MAAM,CAAC,OAAC,CAAC,MAAM,EAAE,EAAE,mBAAW,CAAC,CAAC,QAAQ,EAAE;IAClD,IAAI,EAAE,OAAC,CAAC,MAAM,CAAC,OAAC,CAAC,MAAM,EAAE,EAAE,OAAC,CAAC,KAAK,CAAC,CAAC,OAAC,CAAC,MAAM,EAAE,EAAE,mBAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;CAC1E,CAAC,CAAC","sourcesContent":["import { z } from 'zod';\n\nexport const CircleCiDocker = z.object({\n  image: z.string(),\n});\n\nexport const CircleCiJob = z.object({\n  docker: z.array(CircleCiDocker).optional(),\n});\nexport type CircleCiJob = z.infer<typeof CircleCiJob>;\n\nconst baseOrb = z.object({\n  executors: z.record(z.string(), CircleCiJob).optional(),\n  jobs: z.record(z.string(), CircleCiJob).optional(),\n});\n\ntype Orb = z.infer<typeof baseOrb> & {\n  orbs?: Record<string, string | Orb>;\n};\n\nexport const CircleCiOrb: z.ZodType<Orb> = baseOrb.extend({\n  orbs: z.lazy(() =>\n    z.record(z.string(), z.union([z.string(), CircleCiOrb])).optional(),\n  ),\n});\nexport type CircleCiOrb = z.infer<typeof CircleCiOrb>;\n\nexport const CircleCiFile = z.object({\n  aliases: z.array(CircleCiDocker).optional(),\n  executors: z.record(z.string(), CircleCiJob).optional(),\n  jobs: z.record(z.string(), CircleCiJob).optional(),\n  orbs: z.record(z.string(), z.union([z.string(), CircleCiOrb])).optional(),\n});\nexport type CircleCiFile = z.infer<typeof CircleCiFile>;\n"]}
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../lib/modules/manager/circleci/schema.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AACxB,6DAIoC;AAEvB,QAAA,cAAc,GAAG,OAAC;KAC5B,MAAM,CAAC,EAAE,KAAK,EAAE,OAAC,CAAC,MAAM,EAAE,EAAE,CAAC;KAC7B,SAAS,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;AAEtB,QAAA,WAAW,GAAG,OAAC;KACzB,MAAM,CAAC;IACN,MAAM,EAAE,IAAA,yBAAU,EAAC,sBAAc,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;CAC7C,CAAC;KACD,SAAS,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC;AAGrC,MAAM,eAAe,GAAG,IAAA,0BAAW,EAAC,mBAAW,CAAC;KAC7C,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;KACzC,KAAK,CAAC,EAAE,CAAC,CAAC;AAEb,MAAM,OAAO,GAAG,OAAC,CAAC,MAAM,CAAC;IACvB,SAAS,EAAE,eAAe;IAC1B,IAAI,EAAE,eAAe;CACtB,CAAC,CAAC;AAMU,QAAA,WAAW,GAAmB,OAAO,CAAC,MAAM,CAAC;IACxD,IAAI,EAAE,IAAA,0BAAW,EAAC,OAAC,CAAC,KAAK,CAAC,CAAC,OAAC,CAAC,MAAM,EAAE,EAAE,OAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,mBAAW,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;CAC9E,CAAU,CAAC;AAGC,QAAA,YAAY,GAAG,0BAAW,CAAC,IAAI,CAC1C,OAAO,CAAC,MAAM,CAAC;IACb,OAAO,EAAE,IAAA,yBAAU,EAAC,sBAAc,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;IAC7C,IAAI,EAAE,IAAA,0BAAW,EAAC,OAAC,CAAC,KAAK,CAAC,CAAC,OAAC,CAAC,MAAM,EAAE,EAAE,mBAAW,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;CAChE,CAAC,CACH,CAAC","sourcesContent":["import { z } from 'zod';\nimport {\n  LooseArray,\n  LooseRecord,\n  NotCircular,\n} from '../../../util/schema-utils';\n\nexport const CircleCiDocker = z\n  .object({ image: z.string() })\n  .transform(({ image }) => image);\n\nexport const CircleCiJob = z\n  .object({\n    docker: LooseArray(CircleCiDocker).catch([]),\n  })\n  .transform(({ docker }) => docker);\nexport type CircleCiJob = z.infer<typeof CircleCiJob>;\n\nconst CircleCiJobList = LooseRecord(CircleCiJob)\n  .transform((x) => Object.values(x).flat())\n  .catch([]);\n\nconst BaseOrb = z.object({\n  executors: CircleCiJobList,\n  jobs: CircleCiJobList,\n});\n\ntype Orb = z.infer<typeof BaseOrb> & {\n  orbs: Record<string, string | Orb>;\n};\n\nexport const CircleCiOrb: z.ZodType<Orb> = BaseOrb.extend({\n  orbs: LooseRecord(z.union([z.string(), z.lazy(() => CircleCiOrb)])).catch({}),\n}) as never;\nexport type CircleCiOrb = z.infer<typeof CircleCiOrb>;\n\nexport const CircleCiFile = NotCircular.pipe(\n  BaseOrb.extend({\n    aliases: LooseArray(CircleCiDocker).catch([]),\n    orbs: LooseRecord(z.union([z.string(), CircleCiOrb])).catch({}),\n  }),\n);\nexport type CircleCiFile = z.infer<typeof CircleCiFile>;\n"]}

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

@@ -54,7 +54,6 @@ async function updateArtifacts({ packageFileName, updatedDeps, newPackageFileCon
     const cocoapods = match?.groups?.cocoapodsVersion ?? null;
     const cmd = [...getPluginCommands(newPackageFileContent), 'pod install'];
     const execOptions = {
-        userConfiguredEnv: config.env,
         cwdFile: packageFileName,
         extraEnv: {
             CP_HOME_DIR: await (0, fs_1.ensureCacheDir)('cocoapods'),
@@ -82,7 +81,7 @@ async function updateArtifacts({ packageFileName, updatedDeps, newPackageFileCon
             {
                 artifactError: {
                     lockFile: lockFileName,
-                    stderr: err.stderr || err.stdout || err.message,
+                    stderr: err.stderr ?? err.stdout ?? err.message,
                 },
             },
         ];

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

@@ -1 +1 @@
-{"version":3,"file":"artifacts.js","sourceRoot":"","sources":["../../../../lib/modules/manager/cocoapods/artifacts.ts"],"names":[],"mappings":"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","sourcesContent":["import { quote } from 'shlex';\nimport upath from 'upath';\nimport { TEMPORARY_ERROR } from '../../../constants/error-messages';\nimport { logger } from '../../../logger';\nimport { coerceArray } from '../../../util/array';\nimport { exec } from '../../../util/exec';\nimport type { ExecOptions } from '../../../util/exec/types';\nimport {\n  ensureCacheDir,\n  getSiblingFileName,\n  readLocalFile,\n  writeLocalFile,\n} from '../../../util/fs';\nimport { getRepoStatus } from '../../../util/git';\nimport { newlineRegex, regEx } from '../../../util/regex';\nimport type { UpdateArtifact, UpdateArtifactsResult } from '../types';\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  config,\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          lockFile: 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    userConfiguredEnv: config.env,\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          lockFile: 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"]}
+{"version":3,"file":"artifacts.js","sourceRoot":"","sources":["../../../../lib/modules/manager/cocoapods/artifacts.ts"],"names":[],"mappings":"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","sourcesContent":["import { quote } from 'shlex';\nimport upath from 'upath';\nimport { TEMPORARY_ERROR } from '../../../constants/error-messages';\nimport { logger } from '../../../logger';\nimport { coerceArray } from '../../../util/array';\nimport { exec } from '../../../util/exec';\nimport type { ExecOptions } from '../../../util/exec/types';\nimport {\n  ensureCacheDir,\n  getSiblingFileName,\n  readLocalFile,\n  writeLocalFile,\n} from '../../../util/fs';\nimport { getRepoStatus } from '../../../util/git';\nimport { newlineRegex, regEx } from '../../../util/regex';\nimport type { UpdateArtifact, UpdateArtifactsResult } from '../types';\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  config,\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          lockFile: 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          lockFile: 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"]}

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

@@ -107,7 +107,6 @@ async function updateArtifacts({ packageFileName, updatedDeps, newPackageFileCon
         };
         const execOptions = {
             cwdFile: packageFileName,
-            userConfiguredEnv: config.env,
             extraEnv: {
                 COMPOSER_CACHE_DIR: await (0, fs_1.ensureCacheDir)('composer'),
                 COMPOSER_AUTH: getAuthJson(),
@@ -141,7 +140,7 @@ async function updateArtifacts({ packageFileName, updatedDeps, newPackageFileCon
                         .map((dep) => (0, shlex_1.quote)(dep))
                         .join(' ')).trim() + ' --with-dependencies';
         }
-        args += (0, utils_1.getComposerArguments)(config, composerToolConstraint);
+        args += (0, utils_1.getComposerUpdateArguments)(config, composerToolConstraint);
         logger_1.logger.trace({ cmd, args }, 'composer command');
         commands.push(`${cmd} ${args}`);
         await (0, exec_1.exec)(commands, execOptions);

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

@@ -1 +1 @@
-{"version":3,"file":"artifacts.js","sourceRoot":"","sources":["../../../../lib/modules/manager/composer/artifacts.ts"],"names":[],"mappings":"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","sourcesContent":["import is from '@sindresorhus/is';\nimport { quote } from 'shlex';\nimport { z } from 'zod';\nimport {\n  SYSTEM_INSUFFICIENT_DISK_SPACE,\n  TEMPORARY_ERROR,\n} from '../../../constants/error-messages';\nimport { logger } from '../../../logger';\nimport {\n  findGithubToken,\n  takePersonalAccessTokenIfPossible,\n} from '../../../util/check-token';\nimport { exec } from '../../../util/exec';\nimport type { ExecOptions, ToolConstraint } from '../../../util/exec/types';\nimport {\n  ensureCacheDir,\n  ensureLocalDir,\n  getSiblingFileName,\n  localPathExists,\n  readLocalFile,\n  writeLocalFile,\n} from '../../../util/fs';\nimport { getRepoStatus } from '../../../util/git';\nimport * as hostRules from '../../../util/host-rules';\nimport { regEx } from '../../../util/regex';\nimport { Json } from '../../../util/schema-utils';\nimport { coerceString } from '../../../util/string';\nimport { GitTagsDatasource } from '../../datasource/git-tags';\nimport { PackagistDatasource } from '../../datasource/packagist';\nimport type { UpdateArtifact, UpdateArtifactsResult } from '../types';\nimport { Lockfile, PackageFile } from './schema';\nimport type { AuthJson } from './types';\nimport {\n  extractConstraints,\n  getComposerArguments,\n  getPhpConstraint,\n  isArtifactAuthEnabled,\n  requireComposerDependencyInstallation,\n} from './utils';\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    if (gitlabHostRule?.token) {\n      const host = coerceString(gitlabHostRule.resolvedHost, 'gitlab.com');\n      authJson['gitlab-token'] = 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        ...(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'] = authJson['http-basic'] ?? {};\n      authJson['http-basic'][resolvedHost] = { username, password };\n    } else if (resolvedHost && token) {\n      authJson.bearer = authJson.bearer ?? {};\n      authJson.bearer[resolvedHost] = token;\n    }\n  }\n\n  return is.emptyObject(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    const constraints = {\n      ...extractConstraints(file, lockfile),\n      ...config.constraints,\n    };\n\n    const composerToolConstraint: ToolConstraint = {\n      toolName: 'composer',\n      constraint: constraints.composer,\n    };\n\n    const phpToolConstraint: ToolConstraint = {\n      toolName: 'php',\n      constraint: getPhpConstraint(constraints),\n    };\n\n    const execOptions: ExecOptions = {\n      cwdFile: packageFileName,\n      userConfiguredEnv: config.env,\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[] = [];\n\n    // Determine whether install is required before update\n    if (requireComposerDependencyInstallation(lockfile)) {\n      const preCmd = 'composer';\n      const preArgs =\n        '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('git stash pop || true');\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(is.string)\n            .map((dep) => quote(dep))\n            .join(' ')\n        ).trim() + ' --with-dependencies';\n    }\n    args += getComposerArguments(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          lockFile: lockFileName,\n          stderr: err.message,\n        },\n      },\n    ];\n  }\n}\n"]}
+{"version":3,"file":"artifacts.js","sourceRoot":"","sources":["../../../../lib/modules/manager/composer/artifacts.ts"],"names":[],"mappings":"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","sourcesContent":["import is from '@sindresorhus/is';\nimport { quote } from 'shlex';\nimport { z } from 'zod';\nimport {\n  SYSTEM_INSUFFICIENT_DISK_SPACE,\n  TEMPORARY_ERROR,\n} from '../../../constants/error-messages';\nimport { logger } from '../../../logger';\nimport {\n  findGithubToken,\n  takePersonalAccessTokenIfPossible,\n} from '../../../util/check-token';\nimport { exec } from '../../../util/exec';\nimport type { ExecOptions, ToolConstraint } from '../../../util/exec/types';\nimport {\n  ensureCacheDir,\n  ensureLocalDir,\n  getSiblingFileName,\n  localPathExists,\n  readLocalFile,\n  writeLocalFile,\n} from '../../../util/fs';\nimport { getRepoStatus } from '../../../util/git';\nimport * as hostRules from '../../../util/host-rules';\nimport { regEx } from '../../../util/regex';\nimport { Json } from '../../../util/schema-utils';\nimport { coerceString } from '../../../util/string';\nimport { GitTagsDatasource } from '../../datasource/git-tags';\nimport { PackagistDatasource } from '../../datasource/packagist';\nimport type { UpdateArtifact, UpdateArtifactsResult } from '../types';\nimport { Lockfile, PackageFile } from './schema';\nimport type { AuthJson } from './types';\nimport {\n  extractConstraints,\n  getComposerArguments,\n  getComposerUpdateArguments,\n  getPhpConstraint,\n  isArtifactAuthEnabled,\n  requireComposerDependencyInstallation,\n} from './utils';\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    if (gitlabHostRule?.token) {\n      const host = coerceString(gitlabHostRule.resolvedHost, 'gitlab.com');\n      authJson['gitlab-token'] = 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        ...(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'] = authJson['http-basic'] ?? {};\n      authJson['http-basic'][resolvedHost] = { username, password };\n    } else if (resolvedHost && token) {\n      authJson.bearer = authJson.bearer ?? {};\n      authJson.bearer[resolvedHost] = token;\n    }\n  }\n\n  return is.emptyObject(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    const constraints = {\n      ...extractConstraints(file, lockfile),\n      ...config.constraints,\n    };\n\n    const composerToolConstraint: ToolConstraint = {\n      toolName: 'composer',\n      constraint: constraints.composer,\n    };\n\n    const phpToolConstraint: ToolConstraint = {\n      toolName: 'php',\n      constraint: getPhpConstraint(constraints),\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[] = [];\n\n    // Determine whether install is required before update\n    if (requireComposerDependencyInstallation(lockfile)) {\n      const preCmd = 'composer';\n      const preArgs =\n        '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('git stash pop || true');\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(is.string)\n            .map((dep) => quote(dep))\n            .join(' ')\n        ).trim() + ' --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          lockFile: lockFileName,\n          stderr: err.message,\n        },\n      },\n    ];\n  }\n}\n"]}

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

@@ -118,34 +118,32 @@ export declare const NamedRepo: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
 }, {
     type: "composer";
     url: string;
-}>, z.ZodObject<z.objectUtil.extendShape<{
+}>, z.ZodObject<{
     type: z.ZodEffects<z.ZodEnum<["vcs", "git"]>, "git", "git" | "vcs">;
     url: z.ZodString;
-    name: z.ZodOptional<z.ZodString>;
-}, {
+} & {
     name: z.ZodString;
-}>, "strip", z.ZodTypeAny, {
-    name: string;
+}, "strip", z.ZodTypeAny, {
     type: "git";
     url: string;
-}, {
     name: string;
+}, {
     type: "git" | "vcs";
     url: string;
-}>, z.ZodObject<z.objectUtil.extendShape<{
+    name: string;
+}>, z.ZodObject<{
     type: z.ZodLiteral<"path">;
     url: z.ZodString;
-    name: z.ZodOptional<z.ZodString>;
-}, {
+} & {
     name: z.ZodString;
-}>, "strip", z.ZodTypeAny, {
-    name: string;
+}, "strip", z.ZodTypeAny, {
     type: "path";
     url: string;
-}, {
     name: string;
+}, {
     type: "path";
     url: string;
+    name: string;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"package">;
 }, "strip", z.ZodTypeAny, {
@@ -181,13 +179,13 @@ export declare const ReposRecord: z.ZodEffects<z.ZodEffects<z.ZodRecord<z.ZodStr
 } | {
     type: "package";
 } | {
-    name: string;
     type: "git";
     url: string;
-} | {
     name: string;
+} | {
     type: "path";
     url: string;
+    name: string;
 } | {
     type: "disable-packagist";
 })[], Record<string, any>>;
@@ -213,13 +211,13 @@ export declare const ReposArray: z.ZodEffects<z.ZodEffects<z.ZodArray<z.ZodAny,
 } | {
     type: "package";
 } | {
-    name: string;
     type: "git";
     url: string;
-} | {
     name: string;
+} | {
     type: "path";
     url: string;
+    name: string;
 } | {
     type: "disable-packagist";
 })[], any[]>;
@@ -243,13 +241,13 @@ export declare const Repos: z.ZodEffects<z.ZodCatch<z.ZodDefault<z.ZodUnion<[z.Z
 } | {
     type: "package";
 } | {
-    name: string;
     type: "git";
     url: string;
-} | {
     name: string;
+} | {
     type: "path";
     url: string;
+    name: string;
 } | {
     type: "disable-packagist";
 })[], Record<string, any>>, z.ZodEffects<z.ZodEffects<z.ZodArray<z.ZodAny, "many">, ({
@@ -273,13 +271,13 @@ export declare const Repos: z.ZodEffects<z.ZodCatch<z.ZodDefault<z.ZodUnion<[z.Z
 } | {
     type: "package";
 } | {
-    name: string;
     type: "git";
     url: string;
-} | {
     name: string;
+} | {
     type: "path";
     url: string;
+    name: string;
 } | {
     type: "disable-packagist";
 })[], any[]>]>>>, {
@@ -334,13 +332,13 @@ export declare const PackageFile: z.ZodEffects<z.ZodObject<{
     } | {
         type: "package";
     } | {
-        name: string;
         type: "git";
         url: string;
-    } | {
         name: string;
+    } | {
         type: "path";
         url: string;
+        name: string;
     } | {
         type: "disable-packagist";
     })[], Record<string, any>>, z.ZodEffects<z.ZodEffects<z.ZodArray<z.ZodAny, "many">, ({
@@ -364,13 +362,13 @@ export declare const PackageFile: z.ZodEffects<z.ZodObject<{
     } | {
         type: "package";
     } | {
-        name: string;
         type: "git";
         url: string;
-    } | {
         name: string;
+    } | {
         type: "path";
         url: string;
+        name: string;
     } | {
         type: "disable-packagist";
     })[], any[]>]>>>, {
@@ -389,12 +387,12 @@ export declare const PackageFile: z.ZodEffects<z.ZodObject<{
     require: z.ZodCatch<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodAny>, Record<string, string>, Record<string, any>>>;
     'require-dev': z.ZodCatch<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodAny>, Record<string, string>, Record<string, any>>>;
 }, "strip", z.ZodTypeAny, {
-    require: Record<string, string>;
     config: {
         platform: {
             php: string;
         };
     } | null;
+    require: Record<string, string>;
     repositories: {
         registryUrls: string[] | null;
         gitRepos: Record<string, {
@@ -412,8 +410,8 @@ export declare const PackageFile: z.ZodEffects<z.ZodObject<{
     type?: string | undefined;
 }, {
     type?: string | undefined;
-    require?: unknown;
     config?: unknown;
+    require?: unknown;
     repositories?: unknown;
     'require-dev'?: unknown;
 }>, {
@@ -440,8 +438,8 @@ export declare const PackageFile: z.ZodEffects<z.ZodObject<{
     requireDev: Record<string, string>;
 }, {
     type?: string | undefined;
-    require?: unknown;
     config?: unknown;
+    require?: unknown;
     repositories?: unknown;
     'require-dev'?: unknown;
 }>;
@@ -541,13 +539,13 @@ export declare const ComposerExtract: z.ZodEffects<z.ZodPipeline<z.ZodEffects<z.
         } | {
             type: "package";
         } | {
-            name: string;
             type: "git";
             url: string;
-        } | {
             name: string;
+        } | {
             type: "path";
             url: string;
+            name: string;
         } | {
             type: "disable-packagist";
         })[], Record<string, any>>, z.ZodEffects<z.ZodEffects<z.ZodArray<z.ZodAny, "many">, ({
@@ -571,13 +569,13 @@ export declare const ComposerExtract: z.ZodEffects<z.ZodPipeline<z.ZodEffects<z.
         } | {
             type: "package";
         } | {
-            name: string;
             type: "git";
             url: string;
-        } | {
             name: string;
+        } | {
             type: "path";
             url: string;
+            name: string;
         } | {
             type: "disable-packagist";
         })[], any[]>]>>>, {
@@ -596,12 +594,12 @@ export declare const ComposerExtract: z.ZodEffects<z.ZodPipeline<z.ZodEffects<z.
         require: z.ZodCatch<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodAny>, Record<string, string>, Record<string, any>>>;
         'require-dev': z.ZodCatch<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodAny>, Record<string, string>, Record<string, any>>>;
     }, "strip", z.ZodTypeAny, {
-        require: Record<string, string>;
         config: {
             platform: {
                 php: string;
             };
         } | null;
+        require: Record<string, string>;
         repositories: {
             registryUrls: string[] | null;
             gitRepos: Record<string, {
@@ -619,8 +617,8 @@ export declare const ComposerExtract: z.ZodEffects<z.ZodPipeline<z.ZodEffects<z.
         type?: string | undefined;
     }, {
         type?: string | undefined;
-        require?: unknown;
         config?: unknown;
+        require?: unknown;
         repositories?: unknown;
         'require-dev'?: unknown;
     }>, {
@@ -647,8 +645,8 @@ export declare const ComposerExtract: z.ZodEffects<z.ZodPipeline<z.ZodEffects<z.
         requireDev: Record<string, string>;
     }, {
         type?: string | undefined;
-        require?: unknown;
         config?: unknown;
+        require?: unknown;
         repositories?: unknown;
         'require-dev'?: unknown;
     }>>;

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

@@ -187,7 +187,7 @@ exports.ComposerExtract = zod_1.z
             .pipe(schema_utils_1.Json)
             .pipe(exports.Lockfile)
             .nullable()
-            .catch((0, schema_utils_1.withDebugMessage)(null, 'Composer: lockfile parsing error')),
+            .catch((0, schema_utils_1.withDebugMessage)(null, 'Composer: does not match schema')),
     ])),
 }))
     .transform(({ file, lockfile, lockfileName }) => {