renovate 39.257.1 → 39.257.3

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

@@ -27,9 +27,7 @@ export declare const KubernetesResource: z.ZodObject<{
     };
     kind: string;
 }>;
-export declare const HelmRelease: z.ZodObject<z.objectUtil.extendShape<{
-    apiVersion: z.ZodString;
-    kind: z.ZodString;
+export declare const HelmRelease: z.ZodObject<{
     metadata: z.ZodObject<{
         name: z.ZodString;
         namespace: z.ZodOptional<z.ZodString>;
@@ -40,7 +38,7 @@ export declare const HelmRelease: z.ZodObject<z.objectUtil.extendShape<{
         name: string;
         namespace?: string | undefined;
     }>;
-}, {
+} & {
     apiVersion: z.ZodString;
     kind: z.ZodLiteral<"HelmRelease">;
     spec: z.ZodObject<{
@@ -150,7 +148,7 @@ export declare const HelmRelease: z.ZodObject<z.objectUtil.extendShape<{
             kind?: string | undefined;
         } | undefined;
     }>;
-}>, "strip", z.ZodTypeAny, {
+}, "strip", z.ZodTypeAny, {
     apiVersion: string;
     metadata: {
         name: string;
@@ -204,9 +202,7 @@ export declare const HelmRelease: z.ZodObject<z.objectUtil.extendShape<{
     };
 }>;
 export type HelmRelease = z.infer<typeof HelmRelease>;
-export declare const HelmRepository: z.ZodObject<z.objectUtil.extendShape<{
-    apiVersion: z.ZodString;
-    kind: z.ZodString;
+export declare const HelmRepository: z.ZodObject<{
     metadata: z.ZodObject<{
         name: z.ZodString;
         namespace: z.ZodOptional<z.ZodString>;
@@ -217,7 +213,7 @@ export declare const HelmRepository: z.ZodObject<z.objectUtil.extendShape<{
         name: string;
         namespace?: string | undefined;
     }>;
-}, {
+} & {
     apiVersion: z.ZodString;
     kind: z.ZodLiteral<"HelmRepository">;
     spec: z.ZodObject<{
@@ -230,7 +226,7 @@ export declare const HelmRepository: z.ZodObject<z.objectUtil.extendShape<{
         url: string;
         type?: "default" | "oci" | undefined;
     }>;
-}>, "strip", z.ZodTypeAny, {
+}, "strip", z.ZodTypeAny, {
     apiVersion: string;
     metadata: {
         name: string;
@@ -254,9 +250,7 @@ export declare const HelmRepository: z.ZodObject<z.objectUtil.extendShape<{
     };
 }>;
 export type HelmRepository = z.infer<typeof HelmRepository>;
-export declare const HelmChart: z.ZodObject<z.objectUtil.extendShape<{
-    apiVersion: z.ZodString;
-    kind: z.ZodString;
+export declare const HelmChart: z.ZodObject<{
     metadata: z.ZodObject<{
         name: z.ZodString;
         namespace: z.ZodOptional<z.ZodString>;
@@ -267,7 +261,7 @@ export declare const HelmChart: z.ZodObject<z.objectUtil.extendShape<{
         name: string;
         namespace?: string | undefined;
     }>;
-}, {
+} & {
     apiVersion: z.ZodString;
     kind: z.ZodLiteral<"HelmChart">;
     spec: z.ZodObject<{
@@ -298,7 +292,7 @@ export declare const HelmChart: z.ZodObject<z.objectUtil.extendShape<{
         };
         version?: string | undefined;
     }>;
-}>, "strip", z.ZodTypeAny, {
+}, "strip", z.ZodTypeAny, {
     apiVersion: string;
     metadata: {
         name: string;
@@ -330,9 +324,7 @@ export declare const HelmChart: z.ZodObject<z.objectUtil.extendShape<{
     };
 }>;
 export type HelmChart = z.infer<typeof HelmChart>;
-export declare const GitRepository: z.ZodObject<z.objectUtil.extendShape<{
-    apiVersion: z.ZodString;
-    kind: z.ZodString;
+export declare const GitRepository: z.ZodObject<{
     metadata: z.ZodObject<{
         name: z.ZodString;
         namespace: z.ZodOptional<z.ZodString>;
@@ -343,7 +335,7 @@ export declare const GitRepository: z.ZodObject<z.objectUtil.extendShape<{
         name: string;
         namespace?: string | undefined;
     }>;
-}, {
+} & {
     apiVersion: z.ZodString;
     kind: z.ZodLiteral<"GitRepository">;
     spec: z.ZodObject<{
@@ -371,7 +363,7 @@ export declare const GitRepository: z.ZodObject<z.objectUtil.extendShape<{
             tag?: string | undefined;
         } | undefined;
     }>;
-}>, "strip", z.ZodTypeAny, {
+}, "strip", z.ZodTypeAny, {
     apiVersion: string;
     metadata: {
         name: string;
@@ -400,9 +392,7 @@ export declare const GitRepository: z.ZodObject<z.objectUtil.extendShape<{
         } | undefined;
     };
 }>;
-export declare const OCIRepository: z.ZodObject<z.objectUtil.extendShape<{
-    apiVersion: z.ZodString;
-    kind: z.ZodString;
+export declare const OCIRepository: z.ZodObject<{
     metadata: z.ZodObject<{
         name: z.ZodString;
         namespace: z.ZodOptional<z.ZodString>;
@@ -413,7 +403,7 @@ export declare const OCIRepository: z.ZodObject<z.objectUtil.extendShape<{
         name: string;
         namespace?: string | undefined;
     }>;
-}, {
+} & {
     apiVersion: z.ZodString;
     kind: z.ZodLiteral<"OCIRepository">;
     spec: z.ZodObject<{
@@ -441,7 +431,7 @@ export declare const OCIRepository: z.ZodObject<z.objectUtil.extendShape<{
             tag?: string | undefined;
         } | undefined;
     }>;
-}>, "strip", z.ZodTypeAny, {
+}, "strip", z.ZodTypeAny, {
     apiVersion: string;
     metadata: {
         name: string;
@@ -470,9 +460,7 @@ export declare const OCIRepository: z.ZodObject<z.objectUtil.extendShape<{
         } | undefined;
     };
 }>;
-export declare const Kustomization: z.ZodObject<z.objectUtil.extendShape<{
-    apiVersion: z.ZodString;
-    kind: z.ZodString;
+export declare const Kustomization: z.ZodObject<{
     metadata: z.ZodObject<{
         name: z.ZodString;
         namespace: z.ZodOptional<z.ZodString>;
@@ -483,7 +471,7 @@ export declare const Kustomization: z.ZodObject<z.objectUtil.extendShape<{
         name: string;
         namespace?: string | undefined;
     }>;
-}, {
+} & {
     apiVersion: z.ZodString;
     kind: z.ZodLiteral<"Kustomization">;
     spec: z.ZodObject<{
@@ -518,7 +506,7 @@ export declare const Kustomization: z.ZodObject<z.objectUtil.extendShape<{
             newTag?: string | undefined;
         }[] | undefined;
     }>;
-}>, "strip", z.ZodTypeAny, {
+}, "strip", z.ZodTypeAny, {
     apiVersion: string;
     metadata: {
         name: string;
@@ -549,9 +537,7 @@ export declare const Kustomization: z.ZodObject<z.objectUtil.extendShape<{
         }[] | undefined;
     };
 }>;
-export declare const FluxResource: z.ZodUnion<[z.ZodUnion<[z.ZodUnion<[z.ZodUnion<[z.ZodUnion<[z.ZodObject<z.objectUtil.extendShape<{
-    apiVersion: z.ZodString;
-    kind: z.ZodString;
+export declare const FluxResource: z.ZodUnion<[z.ZodUnion<[z.ZodUnion<[z.ZodUnion<[z.ZodUnion<[z.ZodObject<{
     metadata: z.ZodObject<{
         name: z.ZodString;
         namespace: z.ZodOptional<z.ZodString>;
@@ -562,7 +548,7 @@ export declare const FluxResource: z.ZodUnion<[z.ZodUnion<[z.ZodUnion<[z.ZodUnio
         name: string;
         namespace?: string | undefined;
     }>;
-}, {
+} & {
     apiVersion: z.ZodString;
     kind: z.ZodLiteral<"HelmRelease">;
     spec: z.ZodObject<{
@@ -672,7 +658,7 @@ export declare const FluxResource: z.ZodUnion<[z.ZodUnion<[z.ZodUnion<[z.ZodUnio
             kind?: string | undefined;
         } | undefined;
     }>;
-}>, "strip", z.ZodTypeAny, {
+}, "strip", z.ZodTypeAny, {
     apiVersion: string;
     metadata: {
         name: string;
@@ -724,9 +710,7 @@ export declare const FluxResource: z.ZodUnion<[z.ZodUnion<[z.ZodUnion<[z.ZodUnio
             kind?: string | undefined;
         } | undefined;
     };
-}>, z.ZodObject<z.objectUtil.extendShape<{
-    apiVersion: z.ZodString;
-    kind: z.ZodString;
+}>, z.ZodObject<{
     metadata: z.ZodObject<{
         name: z.ZodString;
         namespace: z.ZodOptional<z.ZodString>;
@@ -737,7 +721,7 @@ export declare const FluxResource: z.ZodUnion<[z.ZodUnion<[z.ZodUnion<[z.ZodUnio
         name: string;
         namespace?: string | undefined;
     }>;
-}, {
+} & {
     apiVersion: z.ZodString;
     kind: z.ZodLiteral<"HelmRepository">;
     spec: z.ZodObject<{
@@ -750,7 +734,7 @@ export declare const FluxResource: z.ZodUnion<[z.ZodUnion<[z.ZodUnion<[z.ZodUnio
         url: string;
         type?: "default" | "oci" | undefined;
     }>;
-}>, "strip", z.ZodTypeAny, {
+}, "strip", z.ZodTypeAny, {
     apiVersion: string;
     metadata: {
         name: string;
@@ -772,9 +756,7 @@ export declare const FluxResource: z.ZodUnion<[z.ZodUnion<[z.ZodUnion<[z.ZodUnio
         url: string;
         type?: "default" | "oci" | undefined;
     };
-}>]>, z.ZodObject<z.objectUtil.extendShape<{
-    apiVersion: z.ZodString;
-    kind: z.ZodString;
+}>]>, z.ZodObject<{
     metadata: z.ZodObject<{
         name: z.ZodString;
         namespace: z.ZodOptional<z.ZodString>;
@@ -785,7 +767,7 @@ export declare const FluxResource: z.ZodUnion<[z.ZodUnion<[z.ZodUnion<[z.ZodUnio
         name: string;
         namespace?: string | undefined;
     }>;
-}, {
+} & {
     apiVersion: z.ZodString;
     kind: z.ZodLiteral<"HelmChart">;
     spec: z.ZodObject<{
@@ -816,7 +798,7 @@ export declare const FluxResource: z.ZodUnion<[z.ZodUnion<[z.ZodUnion<[z.ZodUnio
         };
         version?: string | undefined;
     }>;
-}>, "strip", z.ZodTypeAny, {
+}, "strip", z.ZodTypeAny, {
     apiVersion: string;
     metadata: {
         name: string;
@@ -846,9 +828,7 @@ export declare const FluxResource: z.ZodUnion<[z.ZodUnion<[z.ZodUnion<[z.ZodUnio
         };
         version?: string | undefined;
     };
-}>]>, z.ZodObject<z.objectUtil.extendShape<{
-    apiVersion: z.ZodString;
-    kind: z.ZodString;
+}>]>, z.ZodObject<{
     metadata: z.ZodObject<{
         name: z.ZodString;
         namespace: z.ZodOptional<z.ZodString>;
@@ -859,7 +839,7 @@ export declare const FluxResource: z.ZodUnion<[z.ZodUnion<[z.ZodUnion<[z.ZodUnio
         name: string;
         namespace?: string | undefined;
     }>;
-}, {
+} & {
     apiVersion: z.ZodString;
     kind: z.ZodLiteral<"GitRepository">;
     spec: z.ZodObject<{
@@ -887,7 +867,7 @@ export declare const FluxResource: z.ZodUnion<[z.ZodUnion<[z.ZodUnion<[z.ZodUnio
             tag?: string | undefined;
         } | undefined;
     }>;
-}>, "strip", z.ZodTypeAny, {
+}, "strip", z.ZodTypeAny, {
     apiVersion: string;
     metadata: {
         name: string;
@@ -915,9 +895,7 @@ export declare const FluxResource: z.ZodUnion<[z.ZodUnion<[z.ZodUnion<[z.ZodUnio
             tag?: string | undefined;
         } | undefined;
     };
-}>]>, z.ZodObject<z.objectUtil.extendShape<{
-    apiVersion: z.ZodString;
-    kind: z.ZodString;
+}>]>, z.ZodObject<{
     metadata: z.ZodObject<{
         name: z.ZodString;
         namespace: z.ZodOptional<z.ZodString>;
@@ -928,7 +906,7 @@ export declare const FluxResource: z.ZodUnion<[z.ZodUnion<[z.ZodUnion<[z.ZodUnio
         name: string;
         namespace?: string | undefined;
     }>;
-}, {
+} & {
     apiVersion: z.ZodString;
     kind: z.ZodLiteral<"OCIRepository">;
     spec: z.ZodObject<{
@@ -956,7 +934,7 @@ export declare const FluxResource: z.ZodUnion<[z.ZodUnion<[z.ZodUnion<[z.ZodUnio
             tag?: string | undefined;
         } | undefined;
     }>;
-}>, "strip", z.ZodTypeAny, {
+}, "strip", z.ZodTypeAny, {
     apiVersion: string;
     metadata: {
         name: string;
@@ -984,9 +962,7 @@ export declare const FluxResource: z.ZodUnion<[z.ZodUnion<[z.ZodUnion<[z.ZodUnio
             tag?: string | undefined;
         } | undefined;
     };
-}>]>, z.ZodObject<z.objectUtil.extendShape<{
-    apiVersion: z.ZodString;
-    kind: z.ZodString;
+}>]>, z.ZodObject<{
     metadata: z.ZodObject<{
         name: z.ZodString;
         namespace: z.ZodOptional<z.ZodString>;
@@ -997,7 +973,7 @@ export declare const FluxResource: z.ZodUnion<[z.ZodUnion<[z.ZodUnion<[z.ZodUnio
         name: string;
         namespace?: string | undefined;
     }>;
-}, {
+} & {
     apiVersion: z.ZodString;
     kind: z.ZodLiteral<"Kustomization">;
     spec: z.ZodObject<{
@@ -1032,7 +1008,7 @@ export declare const FluxResource: z.ZodUnion<[z.ZodUnion<[z.ZodUnion<[z.ZodUnio
             newTag?: string | undefined;
         }[] | undefined;
     }>;
-}>, "strip", z.ZodTypeAny, {
+}, "strip", z.ZodTypeAny, {
     apiVersion: string;
     metadata: {
         name: string;

package/dist/modules/manager/gomod/update.js

@@ -5,7 +5,9 @@ exports.updateDependency = updateDependency;
 const logger_1 = require("../../../logger");
 const regex_1 = require("../../../util/regex");
 function getNameWithNoVersion(name) {
-    let nameNoVersion = name.split('/').slice(0, 3).join('/');
+    // remove version suffixes like /v1 or /v2
+    let nameNoVersion = name.replace(/\/v\d+$/, '');
+    // gopkg.in is a special case where the major version is added with a dot rather than a slash
     if (nameNoVersion.startsWith('gopkg.in')) {
         nameNoVersion = nameNoVersion.replace((0, regex_1.regEx)(/\.v\d+$/), '');
     }

package/dist/modules/manager/gomod/update.js.map

@@ -1 +1 @@
-{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../lib/modules/manager/gomod/update.ts"],"names":[],"mappings":"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","sourcesContent":["// TODO: types (#22198)\nimport { logger } from '../../../logger';\nimport { newlineRegex, regEx } from '../../../util/regex';\nimport type { UpdateDependencyConfig } from '../types';\n\nfunction getNameWithNoVersion(name: string): string {\n  let nameNoVersion = name.split('/').slice(0, 3).join('/');\n  if (nameNoVersion.startsWith('gopkg.in')) {\n    nameNoVersion = nameNoVersion.replace(regEx(/\\.v\\d+$/), '');\n  }\n  return nameNoVersion;\n}\n\nexport function updateDependency({\n  fileContent,\n  upgrade,\n}: UpdateDependencyConfig): string | null {\n  try {\n    logger.debug(`gomod.updateDependency: ${upgrade.newValue}`);\n    const { depType, updateType } = upgrade;\n    const currentName = upgrade.depName;\n    if (updateType === 'replacement') {\n      logger.warn('gomod manager does not support replacement updates yet');\n      return null;\n    }\n    /* v8 ignore next 3 -- should never happen */\n    if (!currentName || !upgrade.managerData) {\n      return null;\n    }\n    const currentNameNoVersion = getNameWithNoVersion(currentName);\n    const lines = fileContent.split(newlineRegex);\n    /* v8 ignore next 4 -- hard to test */\n    if (lines.length <= upgrade.managerData.lineNumber) {\n      logger.warn('go.mod current line no longer exists after update');\n      return null;\n    }\n    const lineToChange = lines[upgrade.managerData.lineNumber];\n    logger.trace({ upgrade, lineToChange }, 'go.mod current line');\n    if (\n      !lineToChange.includes(currentNameNoVersion) &&\n      !lineToChange.includes('rethinkdb/rethinkdb-go.v5')\n    ) {\n      logger.debug(\n        { lineToChange, depName: currentName },\n        \"go.mod current line doesn't contain dependency\",\n      );\n      return null;\n    }\n    let updateLineExp: RegExp | undefined;\n\n    if (depType === 'golang' || depType === 'toolchain') {\n      updateLineExp = regEx(\n        /(?<depPart>(?:toolchain )?go)(?<divider>\\s*)([^\\s]+|[\\w]+)/,\n      );\n    }\n    if (depType === 'replace') {\n      if (upgrade.managerData.multiLine) {\n        updateLineExp = regEx(\n          /^(?<depPart>\\s+[^\\s]+[\\s]+[=][>]+\\s+)(?<divider>[^\\s]+\\s+)[^\\s]+/,\n        );\n      } else {\n        updateLineExp = regEx(\n          /^(?<depPart>replace\\s+[^\\s]+[\\s]+[=][>]+\\s+)(?<divider>[^\\s]+\\s+)[^\\s]+/,\n        );\n      }\n    } else if (depType === 'require' || depType === 'indirect') {\n      if (upgrade.managerData.multiLine) {\n        updateLineExp = regEx(/^(?<depPart>\\s+[^\\s]+)(?<divider>\\s+)[^\\s]+/);\n      } else {\n        updateLineExp = regEx(\n          /^(?<depPart>require\\s+[^\\s]+)(?<divider>\\s+)[^\\s]+/,\n        );\n      }\n    }\n    if (updateLineExp && !updateLineExp.test(lineToChange)) {\n      logger.debug('No line found to update');\n      return null;\n    }\n    let newLine: string;\n    if (upgrade.updateType === 'digest') {\n      const newDigestRightSized = upgrade.newDigest!.substring(\n        0,\n        upgrade.currentDigest!.length,\n      );\n      if (lineToChange.includes(newDigestRightSized)) {\n        return fileContent;\n      }\n      logger.debug(\n        { depName: currentName, lineToChange, newDigestRightSized },\n        'gomod: need to update digest',\n      );\n      newLine = lineToChange.replace(\n        // TODO: can be undefined? (#22198)\n        updateLineExp!,\n        `$<depPart>$<divider>${newDigestRightSized}`,\n      );\n    } else {\n      newLine = lineToChange.replace(\n        // TODO: can be undefined? (#22198)\n        updateLineExp!,\n        `$<depPart>$<divider>${upgrade.newValue}`,\n      );\n    }\n    if (upgrade.updateType === 'major') {\n      logger.debug(`gomod: major update for ${currentName}`);\n      if (currentName.startsWith('gopkg.in/')) {\n        const oldV = currentName.split('.').pop();\n        newLine = newLine.replace(`.${oldV}`, `.v${upgrade.newMajor}`);\n        // Package renames - I couldn't think of a better place to do this\n        newLine = newLine.replace(\n          'gorethink/gorethink.v5',\n          'rethinkdb/rethinkdb-go.v5',\n        );\n      } else if (\n        upgrade.newMajor! > 1 &&\n        !newLine.includes(`/v${upgrade.newMajor}`) &&\n        !upgrade.newValue!.endsWith('+incompatible')\n      ) {\n        if (currentName === currentNameNoVersion) {\n          // If package currently has no version, pin to latest one.\n          newLine = newLine.replace(\n            currentName,\n            `${currentName}/v${upgrade.newMajor}`,\n          );\n        } else {\n          // Replace version\n          const [oldV] = upgrade.currentValue!.split('.');\n          newLine = newLine.replace(\n            regEx(`/${oldV}(\\\\s+)`, undefined, false),\n            `/v${upgrade.newMajor}$1`,\n          );\n        }\n      }\n    }\n    if (\n      lineToChange.endsWith('+incompatible') &&\n      !upgrade.newValue?.endsWith('+incompatible')\n    ) {\n      let toAdd = '+incompatible';\n\n      if (upgrade.updateType === 'major' && upgrade.newMajor! >= 2) {\n        toAdd = '';\n      }\n      newLine += toAdd;\n    }\n    if (newLine === lineToChange) {\n      logger.debug('No changes necessary');\n      return fileContent;\n    }\n\n    if (depType === 'indirect') {\n      newLine = newLine.replace(\n        regEx(/\\s*(?:\\/\\/\\s*indirect(?:\\s*;)?\\s*)*$/),\n        ' // indirect',\n      );\n    }\n\n    lines[upgrade.managerData.lineNumber] = newLine;\n    return lines.join('\\n');\n  } catch (err) {\n    logger.debug({ err }, 'Error setting new go.mod version');\n    return null;\n  }\n}\n"]}
+{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../lib/modules/manager/gomod/update.ts"],"names":[],"mappings":";;AAeA,4CAsJC;AArKD,uBAAuB;AACvB,4CAAyC;AACzC,+CAA0D;AAG1D,SAAS,oBAAoB,CAAC,IAAY;IACxC,0CAA0C;IAC1C,IAAI,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;IAChD,6FAA6F;IAC7F,IAAI,aAAa,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QACzC,aAAa,GAAG,aAAa,CAAC,OAAO,CAAC,IAAA,aAAK,EAAC,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;IAC9D,CAAC;IACD,OAAO,aAAa,CAAC;AACvB,CAAC;AAED,SAAgB,gBAAgB,CAAC,EAC/B,WAAW,EACX,OAAO,GACgB;IACvB,IAAI,CAAC;QACH,eAAM,CAAC,KAAK,CAAC,2BAA2B,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC5D,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;QACxC,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;QACpC,IAAI,UAAU,KAAK,aAAa,EAAE,CAAC;YACjC,eAAM,CAAC,IAAI,CAAC,wDAAwD,CAAC,CAAC;YACtE,OAAO,IAAI,CAAC;QACd,CAAC;QACD,6CAA6C;QAC7C,IAAI,CAAC,WAAW,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;YACzC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,oBAAoB,GAAG,oBAAoB,CAAC,WAAW,CAAC,CAAC;QAC/D,MAAM,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,oBAAY,CAAC,CAAC;QAC9C,sCAAsC;QACtC,IAAI,KAAK,CAAC,MAAM,IAAI,OAAO,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC;YACnD,eAAM,CAAC,IAAI,CAAC,mDAAmD,CAAC,CAAC;YACjE,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QAC3D,eAAM,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,qBAAqB,CAAC,CAAC;QAC/D,IACE,CAAC,YAAY,CAAC,QAAQ,CAAC,oBAAoB,CAAC;YAC5C,CAAC,YAAY,CAAC,QAAQ,CAAC,2BAA2B,CAAC,EACnD,CAAC;YACD,eAAM,CAAC,KAAK,CACV,EAAE,YAAY,EAAE,OAAO,EAAE,WAAW,EAAE,EACtC,gDAAgD,CACjD,CAAC;YACF,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,aAAiC,CAAC;QAEtC,IAAI,OAAO,KAAK,QAAQ,IAAI,OAAO,KAAK,WAAW,EAAE,CAAC;YACpD,aAAa,GAAG,IAAA,aAAK,EACnB,4DAA4D,CAC7D,CAAC;QACJ,CAAC;QACD,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,IAAI,OAAO,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC;gBAClC,aAAa,GAAG,IAAA,aAAK,EACnB,kEAAkE,CACnE,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,aAAa,GAAG,IAAA,aAAK,EACnB,yEAAyE,CAC1E,CAAC;YACJ,CAAC;QACH,CAAC;aAAM,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,UAAU,EAAE,CAAC;YAC3D,IAAI,OAAO,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC;gBAClC,aAAa,GAAG,IAAA,aAAK,EAAC,6CAA6C,CAAC,CAAC;YACvE,CAAC;iBAAM,CAAC;gBACN,aAAa,GAAG,IAAA,aAAK,EACnB,oDAAoD,CACrD,CAAC;YACJ,CAAC;QACH,CAAC;QACD,IAAI,aAAa,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;YACvD,eAAM,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;YACxC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,OAAe,CAAC;QACpB,IAAI,OAAO,CAAC,UAAU,KAAK,QAAQ,EAAE,CAAC;YACpC,MAAM,mBAAmB,GAAG,OAAO,CAAC,SAAU,CAAC,SAAS,CACtD,CAAC,EACD,OAAO,CAAC,aAAc,CAAC,MAAM,CAC9B,CAAC;YACF,IAAI,YAAY,CAAC,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAC;gBAC/C,OAAO,WAAW,CAAC;YACrB,CAAC;YACD,eAAM,CAAC,KAAK,CACV,EAAE,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,mBAAmB,EAAE,EAC3D,8BAA8B,CAC/B,CAAC;YACF,OAAO,GAAG,YAAY,CAAC,OAAO;YAC5B,mCAAmC;YACnC,aAAc,EACd,uBAAuB,mBAAmB,EAAE,CAC7C,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,OAAO,GAAG,YAAY,CAAC,OAAO;YAC5B,mCAAmC;YACnC,aAAc,EACd,uBAAuB,OAAO,CAAC,QAAQ,EAAE,CAC1C,CAAC;QACJ,CAAC;QACD,IAAI,OAAO,CAAC,UAAU,KAAK,OAAO,EAAE,CAAC;YACnC,eAAM,CAAC,KAAK,CAAC,2BAA2B,WAAW,EAAE,CAAC,CAAC;YACvD,IAAI,WAAW,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;gBACxC,MAAM,IAAI,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;gBAC1C,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,EAAE,KAAK,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAC/D,kEAAkE;gBAClE,OAAO,GAAG,OAAO,CAAC,OAAO,CACvB,wBAAwB,EACxB,2BAA2B,CAC5B,CAAC;YACJ,CAAC;iBAAM,IACL,OAAO,CAAC,QAAS,GAAG,CAAC;gBACrB,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,OAAO,CAAC,QAAQ,EAAE,CAAC;gBAC1C,CAAC,OAAO,CAAC,QAAS,CAAC,QAAQ,CAAC,eAAe,CAAC,EAC5C,CAAC;gBACD,IAAI,WAAW,KAAK,oBAAoB,EAAE,CAAC;oBACzC,0DAA0D;oBAC1D,OAAO,GAAG,OAAO,CAAC,OAAO,CACvB,WAAW,EACX,GAAG,WAAW,KAAK,OAAO,CAAC,QAAQ,EAAE,CACtC,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACN,kBAAkB;oBAClB,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,YAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;oBAChD,OAAO,GAAG,OAAO,CAAC,OAAO,CACvB,IAAA,aAAK,EAAC,IAAI,IAAI,QAAQ,EAAE,SAAS,EAAE,KAAK,CAAC,EACzC,KAAK,OAAO,CAAC,QAAQ,IAAI,CAC1B,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;QACD,IACE,YAAY,CAAC,QAAQ,CAAC,eAAe,CAAC;YACtC,CAAC,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,eAAe,CAAC,EAC5C,CAAC;YACD,IAAI,KAAK,GAAG,eAAe,CAAC;YAE5B,IAAI,OAAO,CAAC,UAAU,KAAK,OAAO,IAAI,OAAO,CAAC,QAAS,IAAI,CAAC,EAAE,CAAC;gBAC7D,KAAK,GAAG,EAAE,CAAC;YACb,CAAC;YACD,OAAO,IAAI,KAAK,CAAC;QACnB,CAAC;QACD,IAAI,OAAO,KAAK,YAAY,EAAE,CAAC;YAC7B,eAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;YACrC,OAAO,WAAW,CAAC;QACrB,CAAC;QAED,IAAI,OAAO,KAAK,UAAU,EAAE,CAAC;YAC3B,OAAO,GAAG,OAAO,CAAC,OAAO,CACvB,IAAA,aAAK,EAAC,sCAAsC,CAAC,EAC7C,cAAc,CACf,CAAC;QACJ,CAAC;QAED,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC;QAChD,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,eAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE,kCAAkC,CAAC,CAAC;QAC1D,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC","sourcesContent":["// TODO: types (#22198)\nimport { logger } from '../../../logger';\nimport { newlineRegex, regEx } from '../../../util/regex';\nimport type { UpdateDependencyConfig } from '../types';\n\nfunction getNameWithNoVersion(name: string): string {\n  // remove version suffixes like /v1 or /v2\n  let nameNoVersion = name.replace(/\\/v\\d+$/, '');\n  // gopkg.in is a special case where the major version is added with a dot rather than a slash\n  if (nameNoVersion.startsWith('gopkg.in')) {\n    nameNoVersion = nameNoVersion.replace(regEx(/\\.v\\d+$/), '');\n  }\n  return nameNoVersion;\n}\n\nexport function updateDependency({\n  fileContent,\n  upgrade,\n}: UpdateDependencyConfig): string | null {\n  try {\n    logger.debug(`gomod.updateDependency: ${upgrade.newValue}`);\n    const { depType, updateType } = upgrade;\n    const currentName = upgrade.depName;\n    if (updateType === 'replacement') {\n      logger.warn('gomod manager does not support replacement updates yet');\n      return null;\n    }\n    /* v8 ignore next 3 -- should never happen */\n    if (!currentName || !upgrade.managerData) {\n      return null;\n    }\n    const currentNameNoVersion = getNameWithNoVersion(currentName);\n    const lines = fileContent.split(newlineRegex);\n    /* v8 ignore next 4 -- hard to test */\n    if (lines.length <= upgrade.managerData.lineNumber) {\n      logger.warn('go.mod current line no longer exists after update');\n      return null;\n    }\n    const lineToChange = lines[upgrade.managerData.lineNumber];\n    logger.trace({ upgrade, lineToChange }, 'go.mod current line');\n    if (\n      !lineToChange.includes(currentNameNoVersion) &&\n      !lineToChange.includes('rethinkdb/rethinkdb-go.v5')\n    ) {\n      logger.debug(\n        { lineToChange, depName: currentName },\n        \"go.mod current line doesn't contain dependency\",\n      );\n      return null;\n    }\n    let updateLineExp: RegExp | undefined;\n\n    if (depType === 'golang' || depType === 'toolchain') {\n      updateLineExp = regEx(\n        /(?<depPart>(?:toolchain )?go)(?<divider>\\s*)([^\\s]+|[\\w]+)/,\n      );\n    }\n    if (depType === 'replace') {\n      if (upgrade.managerData.multiLine) {\n        updateLineExp = regEx(\n          /^(?<depPart>\\s+[^\\s]+[\\s]+[=][>]+\\s+)(?<divider>[^\\s]+\\s+)[^\\s]+/,\n        );\n      } else {\n        updateLineExp = regEx(\n          /^(?<depPart>replace\\s+[^\\s]+[\\s]+[=][>]+\\s+)(?<divider>[^\\s]+\\s+)[^\\s]+/,\n        );\n      }\n    } else if (depType === 'require' || depType === 'indirect') {\n      if (upgrade.managerData.multiLine) {\n        updateLineExp = regEx(/^(?<depPart>\\s+[^\\s]+)(?<divider>\\s+)[^\\s]+/);\n      } else {\n        updateLineExp = regEx(\n          /^(?<depPart>require\\s+[^\\s]+)(?<divider>\\s+)[^\\s]+/,\n        );\n      }\n    }\n    if (updateLineExp && !updateLineExp.test(lineToChange)) {\n      logger.debug('No line found to update');\n      return null;\n    }\n    let newLine: string;\n    if (upgrade.updateType === 'digest') {\n      const newDigestRightSized = upgrade.newDigest!.substring(\n        0,\n        upgrade.currentDigest!.length,\n      );\n      if (lineToChange.includes(newDigestRightSized)) {\n        return fileContent;\n      }\n      logger.debug(\n        { depName: currentName, lineToChange, newDigestRightSized },\n        'gomod: need to update digest',\n      );\n      newLine = lineToChange.replace(\n        // TODO: can be undefined? (#22198)\n        updateLineExp!,\n        `$<depPart>$<divider>${newDigestRightSized}`,\n      );\n    } else {\n      newLine = lineToChange.replace(\n        // TODO: can be undefined? (#22198)\n        updateLineExp!,\n        `$<depPart>$<divider>${upgrade.newValue}`,\n      );\n    }\n    if (upgrade.updateType === 'major') {\n      logger.debug(`gomod: major update for ${currentName}`);\n      if (currentName.startsWith('gopkg.in/')) {\n        const oldV = currentName.split('.').pop();\n        newLine = newLine.replace(`.${oldV}`, `.v${upgrade.newMajor}`);\n        // Package renames - I couldn't think of a better place to do this\n        newLine = newLine.replace(\n          'gorethink/gorethink.v5',\n          'rethinkdb/rethinkdb-go.v5',\n        );\n      } else if (\n        upgrade.newMajor! > 1 &&\n        !newLine.includes(`/v${upgrade.newMajor}`) &&\n        !upgrade.newValue!.endsWith('+incompatible')\n      ) {\n        if (currentName === currentNameNoVersion) {\n          // If package currently has no version, pin to latest one.\n          newLine = newLine.replace(\n            currentName,\n            `${currentName}/v${upgrade.newMajor}`,\n          );\n        } else {\n          // Replace version\n          const [oldV] = upgrade.currentValue!.split('.');\n          newLine = newLine.replace(\n            regEx(`/${oldV}(\\\\s+)`, undefined, false),\n            `/v${upgrade.newMajor}$1`,\n          );\n        }\n      }\n    }\n    if (\n      lineToChange.endsWith('+incompatible') &&\n      !upgrade.newValue?.endsWith('+incompatible')\n    ) {\n      let toAdd = '+incompatible';\n\n      if (upgrade.updateType === 'major' && upgrade.newMajor! >= 2) {\n        toAdd = '';\n      }\n      newLine += toAdd;\n    }\n    if (newLine === lineToChange) {\n      logger.debug('No changes necessary');\n      return fileContent;\n    }\n\n    if (depType === 'indirect') {\n      newLine = newLine.replace(\n        regEx(/\\s*(?:\\/\\/\\s*indirect(?:\\s*;)?\\s*)*$/),\n        ' // indirect',\n      );\n    }\n\n    lines[upgrade.managerData.lineNumber] = newLine;\n    return lines.join('\\n');\n  } catch (err) {\n    logger.debug({ err }, 'Error setting new go.mod version');\n    return null;\n  }\n}\n"]}

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

@@ -34,9 +34,7 @@ export declare const SveltosHelmSpec: z.ZodObject<{
     helmCharts?: any[] | undefined;
 }>;
 export type SveltosHelmSpec = z.infer<typeof SveltosHelmSpec>;
-export declare const ClusterProfile: z.ZodObject<z.objectUtil.extendShape<{
-    apiVersion: z.ZodString;
-    kind: z.ZodString;
+export declare const ClusterProfile: z.ZodObject<{
     metadata: z.ZodObject<{
         name: z.ZodString;
         namespace: z.ZodOptional<z.ZodString>;
@@ -47,7 +45,7 @@ export declare const ClusterProfile: z.ZodObject<z.objectUtil.extendShape<{
         name: string;
         namespace?: string | undefined;
     }>;
-}, {
+} & {
     apiVersion: z.ZodString;
     kind: z.ZodLiteral<"ClusterProfile">;
     spec: z.ZodObject<{
@@ -67,7 +65,7 @@ export declare const ClusterProfile: z.ZodObject<z.objectUtil.extendShape<{
     }, {
         helmCharts?: any[] | undefined;
     }>;
-}>, "strip", z.ZodTypeAny, {
+}, "strip", z.ZodTypeAny, {
     apiVersion: string;
     metadata: {
         name: string;
@@ -93,9 +91,7 @@ export declare const ClusterProfile: z.ZodObject<z.objectUtil.extendShape<{
         helmCharts?: any[] | undefined;
     };
 }>;
-export declare const Profile: z.ZodObject<z.objectUtil.extendShape<{
-    apiVersion: z.ZodString;
-    kind: z.ZodString;
+export declare const Profile: z.ZodObject<{
     metadata: z.ZodObject<{
         name: z.ZodString;
         namespace: z.ZodOptional<z.ZodString>;
@@ -106,7 +102,7 @@ export declare const Profile: z.ZodObject<z.objectUtil.extendShape<{
         name: string;
         namespace?: string | undefined;
     }>;
-}, {
+} & {
     apiVersion: z.ZodString;
     kind: z.ZodLiteral<"Profile">;
     spec: z.ZodObject<{
@@ -126,7 +122,7 @@ export declare const Profile: z.ZodObject<z.objectUtil.extendShape<{
     }, {
         helmCharts?: any[] | undefined;
     }>;
-}>, "strip", z.ZodTypeAny, {
+}, "strip", z.ZodTypeAny, {
     apiVersion: string;
     metadata: {
         name: string;
@@ -152,9 +148,7 @@ export declare const Profile: z.ZodObject<z.objectUtil.extendShape<{
         helmCharts?: any[] | undefined;
     };
 }>;
-export declare const EventTrigger: z.ZodObject<z.objectUtil.extendShape<{
-    apiVersion: z.ZodString;
-    kind: z.ZodString;
+export declare const EventTrigger: z.ZodObject<{
     metadata: z.ZodObject<{
         name: z.ZodString;
         namespace: z.ZodOptional<z.ZodString>;
@@ -165,7 +159,7 @@ export declare const EventTrigger: z.ZodObject<z.objectUtil.extendShape<{
         name: string;
         namespace?: string | undefined;
     }>;
-}, {
+} & {
     apiVersion: z.ZodString;
     kind: z.ZodLiteral<"EventTrigger">;
     spec: z.ZodObject<{
@@ -185,7 +179,7 @@ export declare const EventTrigger: z.ZodObject<z.objectUtil.extendShape<{
     }, {
         helmCharts?: any[] | undefined;
     }>;
-}>, "strip", z.ZodTypeAny, {
+}, "strip", z.ZodTypeAny, {
     apiVersion: string;
     metadata: {
         name: string;
@@ -211,9 +205,7 @@ export declare const EventTrigger: z.ZodObject<z.objectUtil.extendShape<{
         helmCharts?: any[] | undefined;
     };
 }>;
-export declare const ProfileDefinition: z.ZodUnion<[z.ZodObject<z.objectUtil.extendShape<{
-    apiVersion: z.ZodString;
-    kind: z.ZodString;
+export declare const ProfileDefinition: z.ZodUnion<[z.ZodObject<{
     metadata: z.ZodObject<{
         name: z.ZodString;
         namespace: z.ZodOptional<z.ZodString>;
@@ -224,7 +216,7 @@ export declare const ProfileDefinition: z.ZodUnion<[z.ZodObject<z.objectUtil.ext
         name: string;
         namespace?: string | undefined;
     }>;
-}, {
+} & {
     apiVersion: z.ZodString;
     kind: z.ZodLiteral<"Profile">;
     spec: z.ZodObject<{
@@ -244,7 +236,7 @@ export declare const ProfileDefinition: z.ZodUnion<[z.ZodObject<z.objectUtil.ext
     }, {
         helmCharts?: any[] | undefined;
     }>;
-}>, "strip", z.ZodTypeAny, {
+}, "strip", z.ZodTypeAny, {
     apiVersion: string;
     metadata: {
         name: string;
@@ -269,9 +261,7 @@ export declare const ProfileDefinition: z.ZodUnion<[z.ZodObject<z.objectUtil.ext
     spec: {
         helmCharts?: any[] | undefined;
     };
-}>, z.ZodObject<z.objectUtil.extendShape<{
-    apiVersion: z.ZodString;
-    kind: z.ZodString;
+}>, z.ZodObject<{
     metadata: z.ZodObject<{
         name: z.ZodString;
         namespace: z.ZodOptional<z.ZodString>;
@@ -282,7 +272,7 @@ export declare const ProfileDefinition: z.ZodUnion<[z.ZodObject<z.objectUtil.ext
         name: string;
         namespace?: string | undefined;
     }>;
-}, {
+} & {
     apiVersion: z.ZodString;
     kind: z.ZodLiteral<"ClusterProfile">;
     spec: z.ZodObject<{
@@ -302,7 +292,7 @@ export declare const ProfileDefinition: z.ZodUnion<[z.ZodObject<z.objectUtil.ext
     }, {
         helmCharts?: any[] | undefined;
     }>;
-}>, "strip", z.ZodTypeAny, {
+}, "strip", z.ZodTypeAny, {
     apiVersion: string;
     metadata: {
         name: string;
@@ -327,9 +317,7 @@ export declare const ProfileDefinition: z.ZodUnion<[z.ZodObject<z.objectUtil.ext
     spec: {
         helmCharts?: any[] | undefined;
     };
-}>, z.ZodObject<z.objectUtil.extendShape<{
-    apiVersion: z.ZodString;
-    kind: z.ZodString;
+}>, z.ZodObject<{
     metadata: z.ZodObject<{
         name: z.ZodString;
         namespace: z.ZodOptional<z.ZodString>;
@@ -340,7 +328,7 @@ export declare const ProfileDefinition: z.ZodUnion<[z.ZodObject<z.objectUtil.ext
         name: string;
         namespace?: string | undefined;
     }>;
-}, {
+} & {
     apiVersion: z.ZodString;
     kind: z.ZodLiteral<"EventTrigger">;
     spec: z.ZodObject<{
@@ -360,7 +348,7 @@ export declare const ProfileDefinition: z.ZodUnion<[z.ZodObject<z.objectUtil.ext
     }, {
         helmCharts?: any[] | undefined;
     }>;
-}>, "strip", z.ZodTypeAny, {
+}, "strip", z.ZodTypeAny, {
     apiVersion: string;
     metadata: {
         name: string;

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

@@ -251,10 +251,10 @@ export declare const Contents: z.ZodUnion<[z.ZodObject<{
         slug: string;
     };
 }>]>;
-export declare const Vendir: z.ZodObject<z.objectUtil.extendShape<{
+export declare const Vendir: z.ZodObject<{
     apiVersion: z.ZodLiteral<"vendir.k14s.io/v1alpha1">;
     kind: z.ZodLiteral<"Config">;
-}, {
+} & {
     directories: z.ZodArray<z.ZodObject<{
         path: z.ZodString;
         contents: z.ZodEffects<z.ZodArray<z.ZodAny, "many">, ({
@@ -309,7 +309,7 @@ export declare const Vendir: z.ZodObject<z.objectUtil.extendShape<{
         path: string;
         contents: any[];
     }>, "many">;
-}>, "strip", z.ZodTypeAny, {
+}, "strip", z.ZodTypeAny, {
     apiVersion: "vendir.k14s.io/v1alpha1";
     kind: "Config";
     directories: {

package/dist/modules/platform/bitbucket/schema.d.ts

@@ -1,10 +1,10 @@
 import { z } from 'zod';
-export declare const PagedSourceResultsSchema: z.ZodObject<z.objectUtil.extendShape<{
+export declare const PagedSourceResultsSchema: z.ZodObject<{
     page: z.ZodOptional<z.ZodNumber>;
     pagelen: z.ZodNumber;
     size: z.ZodOptional<z.ZodNumber>;
     next: z.ZodOptional<z.ZodString>;
-}, {
+} & {
     values: z.ZodArray<z.ZodObject<{
         path: z.ZodString;
         type: z.ZodEnum<["commit_directory", "commit_file"]>;
@@ -28,7 +28,7 @@ export declare const PagedSourceResultsSchema: z.ZodObject<z.objectUtil.extendSh
         };
         type: "commit_directory" | "commit_file";
     }>, "many">;
-}>, "strip", z.ZodTypeAny, {
+}, "strip", z.ZodTypeAny, {
     values: {
         path: string;
         commit: {

package/dist/modules/platform/github/issue.d.ts

@@ -1,12 +1,12 @@
 import { z } from 'zod';
-export declare const GithubIssue: z.ZodUnion<[z.ZodEffects<z.ZodObject<z.objectUtil.extendShape<{
+export declare const GithubIssue: z.ZodUnion<[z.ZodEffects<z.ZodObject<{
     number: z.ZodNumber;
     state: z.ZodEffects<z.ZodString, string, string>;
     title: z.ZodString;
     body: z.ZodString;
-}, {
+} & {
     updatedAt: z.ZodString;
-}>, "strip", z.ZodTypeAny, {
+}, "strip", z.ZodTypeAny, {
     number: number;
     body: string;
     state: string;
@@ -30,14 +30,14 @@ export declare const GithubIssue: z.ZodUnion<[z.ZodEffects<z.ZodObject<z.objectU
     state: string;
     updatedAt: string;
     title: string;
-}>, z.ZodEffects<z.ZodObject<z.objectUtil.extendShape<{
+}>, z.ZodEffects<z.ZodObject<{
     number: z.ZodNumber;
     state: z.ZodEffects<z.ZodString, string, string>;
     title: z.ZodString;
     body: z.ZodString;
-}, {
+} & {
     updated_at: z.ZodString;
-}>, "strip", z.ZodTypeAny, {
+}, "strip", z.ZodTypeAny, {
     number: number;
     body: string;
     state: string;