npm - renovate - Versions diffs - 41.72.0 → 42.0.0-next.2 - Mend

renovate 41.72.0 → 42.0.0-next.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (220) hide show

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

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-export declare const PnpmCatalogs: z.ZodObject<{
+export declare const PnpmCatalogsSchema: z.ZodObject<{
     catalog: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
     catalogs: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodString>>>;
 }, "strip", z.ZodTypeAny, {
@@ -9,7 +9,7 @@ export declare const PnpmCatalogs: z.ZodObject<{
     catalog?: Record<string, string> | undefined;
     catalogs?: Record<string, Record<string, string>> | undefined;
 }>;
-export declare const YarnConfig: z.ZodPipeline<z.ZodEffects<z.ZodString, string | number | boolean | import("type-fest").JsonObject | import("type-fest").JsonValue[] | readonly import("type-fest").JsonValue[] | null, string>, z.ZodObject<{
+export declare const YarnrcSchema: z.ZodObject<{
     npmRegistryServer: z.ZodOptional<z.ZodString>;
     npmScopes: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
         npmRegistryServer: z.ZodOptional<z.ZodString>;
@@ -28,9 +28,9 @@ export declare const YarnConfig: z.ZodPipeline<z.ZodEffects<z.ZodString, string
     npmScopes?: Record<string, {
         npmRegistryServer?: string | undefined;
     }> | undefined;
-}>>;
-export type YarnConfig = z.infer<typeof YarnConfig>;
-export declare const PnpmWorkspaceFile: z.ZodIntersection<z.ZodObject<{
+}>;
+export type YarnrcConfig = z.infer<typeof YarnrcSchema>;
+export declare const PnpmWorkspaceFileSchema: z.ZodIntersection<z.ZodObject<{
     packages: z.ZodArray<z.ZodString, "many">;
 }, "strip", z.ZodTypeAny, {
     packages: string[];
@@ -46,11 +46,94 @@ export declare const PnpmWorkspaceFile: z.ZodIntersection<z.ZodObject<{
     catalog?: Record<string, string> | undefined;
     catalogs?: Record<string, Record<string, string>> | undefined;
 }>>;
-export type PnpmWorkspaceFile = z.infer<typeof PnpmWorkspaceFile>;
-export declare const PackageManager: z.ZodEffects<z.ZodEffects<z.ZodString, string[], string>, {
+export declare const PackageManagerSchema: z.ZodEffects<z.ZodEffects<z.ZodString, string[], string>, {
     name: string;
     version: string;
 }, string>;
+export declare const PackageJsonSchema: z.ZodObject<{
+    devEngines: z.ZodOptional<z.ZodObject<{
+        packageManager: z.ZodOptional<z.ZodUnion<[z.ZodObject<{
+            name: z.ZodString;
+            version: z.ZodOptional<z.ZodString>;
+        }, "strip", z.ZodTypeAny, {
+            name: string;
+            version?: string | undefined;
+        }, {
+            name: string;
+            version?: string | undefined;
+        }>, z.ZodArray<z.ZodObject<{
+            name: z.ZodString;
+            version: z.ZodOptional<z.ZodString>;
+        }, "strip", z.ZodTypeAny, {
+            name: string;
+            version?: string | undefined;
+        }, {
+            name: string;
+            version?: string | undefined;
+        }>, "many">]>>;
+    }, "strip", z.ZodTypeAny, {
+        packageManager?: {
+            name: string;
+            version?: string | undefined;
+        } | {
+            name: string;
+            version?: string | undefined;
+        }[] | undefined;
+    }, {
+        packageManager?: {
+            name: string;
+            version?: string | undefined;
+        } | {
+            name: string;
+            version?: string | undefined;
+        }[] | undefined;
+    }>>;
+    engines: z.ZodOptional<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodAny>, Record<string, string>, Record<string, any>>>;
+    dependencies: z.ZodOptional<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodAny>, Record<string, string>, Record<string, any>>>;
+    devDependencies: z.ZodOptional<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodAny>, Record<string, string>, Record<string, any>>>;
+    peerDependencies: z.ZodOptional<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodAny>, Record<string, string>, Record<string, any>>>;
+    packageManager: z.ZodOptional<z.ZodEffects<z.ZodEffects<z.ZodString, string[], string>, {
+        name: string;
+        version: string;
+    }, string>>;
+    volta: z.ZodOptional<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodAny>, Record<string, string>, Record<string, any>>>;
+}, "strip", z.ZodTypeAny, {
+    dependencies?: Record<string, string> | undefined;
+    devDependencies?: Record<string, string> | undefined;
+    peerDependencies?: Record<string, string> | undefined;
+    engines?: Record<string, string> | undefined;
+    packageManager?: {
+        name: string;
+        version: string;
+    } | undefined;
+    volta?: Record<string, string> | undefined;
+    devEngines?: {
+        packageManager?: {
+            name: string;
+            version?: string | undefined;
+        } | {
+            name: string;
+            version?: string | undefined;
+        }[] | undefined;
+    } | undefined;
+}, {
+    dependencies?: Record<string, any> | undefined;
+    devDependencies?: Record<string, any> | undefined;
+    peerDependencies?: Record<string, any> | undefined;
+    engines?: Record<string, any> | undefined;
+    packageManager?: string | undefined;
+    volta?: Record<string, any> | undefined;
+    devEngines?: {
+        packageManager?: {
+            name: string;
+            version?: string | undefined;
+        } | {
+            name: string;
+            version?: string | undefined;
+        }[] | undefined;
+    } | undefined;
+}>;
+export type PackageJsonSchema = z.infer<typeof PackageJsonSchema>;
 export declare const PackageJson: z.ZodPipeline<z.ZodEffects<z.ZodString, string | number | boolean | import("type-fest").JsonObject | import("type-fest").JsonValue[] | readonly import("type-fest").JsonValue[] | null, string>, z.ZodObject<{
     devEngines: z.ZodOptional<z.ZodObject<{
         packageManager: z.ZodOptional<z.ZodUnion<[z.ZodObject<{
@@ -134,8 +217,7 @@ export declare const PackageJson: z.ZodPipeline<z.ZodEffects<z.ZodString, string
         }[] | undefined;
     } | undefined;
 }>>;
-export type PackageJson = z.infer<typeof PackageJson>;
-export declare const PackageLockV3: z.ZodObject<{
+export declare const PackageLockV3Schema: z.ZodObject<{
     lockfileVersion: z.ZodLiteral<3>;
     packages: z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodAny>, Record<string, {
         version: string;
@@ -149,7 +231,7 @@ export declare const PackageLockV3: z.ZodObject<{
     lockfileVersion: 3;
     packages: Record<string, any>;
 }>;
-export declare const PackageLockPreV3: z.ZodEffects<z.ZodObject<{
+export declare const PackageLockPreV3Schema: z.ZodEffects<z.ZodObject<{
     lockfileVersion: z.ZodUnion<[z.ZodLiteral<2>, z.ZodLiteral<1>]>;
     dependencies: z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodAny>, Record<string, {
         version: string;

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

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

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

	@@ -1 +1 @@
1	- {"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../lib/modules/manager/npm/schema.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AACxB,~~6DAAqE~~;~~AAExD~~,QAAA,~~YAAY~~,GAAG,OAAC,CAAC,MAAM,CAAC;~~IACnC~~,OAAO,EAAE,OAAC,CAAC,QAAQ,CAAC,OAAC,CAAC,MAAM,CAAC,OAAC,CAAC,MAAM,EAAE,CAAC,CAAC;IACzC,QAAQ,EAAE,OAAC,CAAC,QAAQ,CAAC,OAAC,CAAC,MAAM,CAAC,OAAC,CAAC,MAAM,CAAC,OAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;CACrD,CAAC,CAAC;AAEU,QAAA,~~UAAU~~,GAAG,~~mBAAI,CAAC,IAAI,CACjC,~~OAAC,CAAC,MAAM,CAAC;~~IACP~~,iBAAiB,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACxC,SAAS,EAAE,OAAC;SACT,MAAM,CACL,OAAC,CAAC,MAAM,CAAC;QACP,iBAAiB,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;KACzC,CAAC,CACH;SACA,QAAQ,EAAE;CACd,CAAC,~~CACH,~~CAAC;~~AAIW~~,QAAA,~~iBAAiB~~,GAAG,OAAC;~~KAC/B~~,MAAM,CAAC;IACN,QAAQ,EAAE,OAAC,CAAC,KAAK,CAAC,OAAC,CAAC,MAAM,EAAE,CAAC;CAC9B,CAAC;KACD,GAAG,CAAC,~~oBAAY~~,CAAC,CAAC;~~AAGR~~,QAAA,~~cAAc~~,GAAG,OAAC;~~KAC5B~~,MAAM,EAAE;KACR,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;KAClC,SAAS,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;AAE7E,MAAM,mBAAmB,GAAG,OAAC,CAAC,MAAM,CAAC;IACnC,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE;IAChB,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAC/B,CAAC,CAAC;AAEH,MAAM,~~SAAS~~,GAAG,OAAC,CAAC,MAAM,CAAC;~~IACzB~~,cAAc,EAAE,mBAAmB,CAAC,EAAE,CACpC,OAAC,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAC7B,CAAC,QAAQ,EAAE;CACb,CAAC,CAAC;AAEU,QAAA,~~WAAW~~,GAAG,~~mBAAI,CAAC,IAAI,CAClC,~~OAAC,CAAC,MAAM,CAAC;~~IACP~~,UAAU,EAAE,~~SAAS~~,CAAC,QAAQ,EAAE;~~IAChC~~,OAAO,EAAE,IAAA,0BAAW,EAAC,OAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;IAC3C,YAAY,EAAE,IAAA,0BAAW,EAAC,OAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;IAChD,eAAe,EAAE,IAAA,0BAAW,EAAC,OAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;IACnD,gBAAgB,EAAE,IAAA,0BAAW,EAAC,OAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;IACpD,cAAc,EAAE,~~sBAAc~~,CAAC,QAAQ,EAAE;~~IACzC~~,KAAK,EAAE,IAAA,0BAAW,EAAC,OAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;CAC1C,CAAC,~~CACH~~,CAAC;~~AAIW~~,QAAA,~~aAAa~~,GAAG,OAAC,CAAC,MAAM,CAAC;~~IACpC~~,eAAe,EAAE,OAAC,CAAC,OAAO,CAAC,CAAC,CAAC;IAC7B,QAAQ,EAAE,IAAA,0BAAW,EACnB,OAAC;SACE,MAAM,EAAE;SACR,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,iBAAiB,EAAE,EAAE,CAAC,CAAC;SAClD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,EACjC,OAAC,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAClC;CACF,CAAC,CAAC;AAEU,QAAA,~~gBAAgB~~,GAAG,OAAC;~~KAC9B~~,MAAM,CAAC;IACN,eAAe,EAAE,OAAC,CAAC,KAAK,CAAC,CAAC,OAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IACtD,YAAY,EAAE,IAAA,0BAAW,EAAC,OAAC,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;CAC7D,CAAC;KACD,SAAS,CAAC,CAAC,EAAE,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;IAC3D,eAAe;IACf,QAAQ;CACT,CAAC,CAAC,CAAC;AAEO,QAAA,WAAW,GAAG,mBAAI,CAAC,IAAI,CAClC,OAAC,CAAC,KAAK,CAAC,CAAC,~~qBAAa~~,EAAE,~~wBAAgB~~,CAAC,CAAC,~~CAC3C~~,CAAC,SAAS,CAAC,CAAC,EAAE,QAAQ,EAAE,eAAe,EAAE,EAAE,EAAE;IAC5C,MAAM,cAAc,GAA2B,EAAE,CAAC;IAClD,KAAK,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QACpD,cAAc,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC;IACtC,CAAC;IACD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,CAAC;AAC7C,CAAC,CAAC,CAAC","sourcesContent":["import { z } from 'zod';\nimport { Json, LooseRecord, ~~Yaml~~ } from '../../../util/schema-utils';\n\nexport const ~~PnpmCatalogs~~ = z.object({\n catalog: z.optional(z.record(z.string())),\n catalogs: z.optional(z.record(z.record(z.string()))),\n});\n\nexport const ~~YarnConfig~~ = ~~Yaml.pipe(\n~~ z.object({\n npmRegistryServer: z.string().optional(),\n npmScopes: z\n .record(\n z.object({\n npmRegistryServer: z.string().optional(),\n }),\n )\n .optional(),\n })~~,\n)~~;\n\nexport type ~~YarnConfig~~ = z.infer<typeof ~~YarnConfig~~>;\n\nexport const ~~PnpmWorkspaceFile~~ = z\n .object({\n packages: z.array(z.string()),\n })\n .and(~~PnpmCatalogs~~);\~~nexport type PnpmWorkspaceFile = z.infer<typeof PnpmWorkspaceFile>;\~~n\nexport const ~~PackageManager~~ = z\n .string()\n .transform((val) => val.split('@'))\n .transform(([name, ...version]) => ({ name, version: version.join('@') }));\n\nconst DevEngineDependency = z.object({\n name: z.string(),\n version: z.string().optional(),\n});\n\nconst ~~DevEngine~~ = z.object({\n packageManager: DevEngineDependency.or(\n z.array(DevEngineDependency),\n ).optional(),\n});\n\nexport const ~~PackageJson~~ = ~~Json.pipe(\n~~ z.object({\n devEngines: ~~DevEngine~~.optional(),\n engines: LooseRecord(z.string()).optional(),\n dependencies: LooseRecord(z.string()).optional(),\n devDependencies: LooseRecord(z.string()).optional(),\n peerDependencies: LooseRecord(z.string()).optional(),\n packageManager: ~~PackageManager~~.optional(),\n volta: LooseRecord(z.string()).optional(),\n })~~,\n)~~;\n\nexport type ~~PackageJson~~ = z.infer<typeof ~~PackageJson~~>;\n\nexport const ~~PackageLockV3~~ = z.object({\n lockfileVersion: z.literal(3),\n packages: LooseRecord(\n z\n .string()\n .transform((x) => x.replace(/^node_modules\\//, ''))\n .refine((x) => x.trim() !== ''),\n z.object({ version: z.string() }),\n ),\n});\n\nexport const ~~PackageLockPreV3~~ = z\n .object({\n lockfileVersion: z.union([z.literal(2), z.literal(1)]),\n dependencies: LooseRecord(z.object({ version: z.string() })),\n })\n .transform(({ lockfileVersion, dependencies: packages }) => ({\n lockfileVersion,\n packages,\n }));\n\nexport const PackageLock = Json.pipe(\n z.union([~~PackageLockV3~~, ~~PackageLockPreV3~~]),\n).transform(({ packages, lockfileVersion }) => {\n const lockedVersions: Record<string, string> = {};\n for (const [entry, val] of Object.entries(packages)) {\n lockedVersions[entry] = val.version;\n }\n return { lockedVersions, lockfileVersion };\n});\n"]}
1	+ {"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../lib/modules/manager/npm/schema.ts"],"names":[],"mappings":"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","sourcesContent":["import { z } from 'zod';\nimport { Json, LooseRecord } from '../../../util/schema-utils';\n\nexport const PnpmCatalogsSchema = z.object({\n catalog: z.optional(z.record(z.string())),\n catalogs: z.optional(z.record(z.record(z.string()))),\n});\n\nexport const YarnrcSchema = z.object({\n npmRegistryServer: z.string().optional(),\n npmScopes: z\n .record(\n z.object({\n npmRegistryServer: z.string().optional(),\n }),\n )\n .optional(),\n});\n\nexport type YarnrcConfig = z.infer<typeof YarnrcSchema>;\n\nexport const PnpmWorkspaceFileSchema = z\n .object({\n packages: z.array(z.string()),\n })\n .and(PnpmCatalogsSchema);\n\nexport const PackageManagerSchema = z\n .string()\n .transform((val) => val.split('@'))\n .transform(([name, ...version]) => ({ name, version: version.join('@') }));\n\nconst DevEngineDependency = z.object({\n name: z.string(),\n version: z.string().optional(),\n});\n\nconst DevEngineSchema = z.object({\n packageManager: DevEngineDependency.or(\n z.array(DevEngineDependency),\n ).optional(),\n});\n\nexport const PackageJsonSchema = z.object({\n devEngines: DevEngineSchema.optional(),\n engines: LooseRecord(z.string()).optional(),\n dependencies: LooseRecord(z.string()).optional(),\n devDependencies: LooseRecord(z.string()).optional(),\n peerDependencies: LooseRecord(z.string()).optional(),\n packageManager: PackageManagerSchema.optional(),\n volta: LooseRecord(z.string()).optional(),\n});\n\nexport type PackageJsonSchema = z.infer<typeof PackageJsonSchema>;\n\nexport const PackageJson = Json.pipe(PackageJsonSchema);\n\nexport const PackageLockV3Schema = z.object({\n lockfileVersion: z.literal(3),\n packages: LooseRecord(\n z\n .string()\n .transform((x) => x.replace(/^node_modules\\//, ''))\n .refine((x) => x.trim() !== ''),\n z.object({ version: z.string() }),\n ),\n});\n\nexport const PackageLockPreV3Schema = z\n .object({\n lockfileVersion: z.union([z.literal(2), z.literal(1)]),\n dependencies: LooseRecord(z.object({ version: z.string() })),\n })\n .transform(({ lockfileVersion, dependencies: packages }) => ({\n lockfileVersion,\n packages,\n }));\n\nexport const PackageLock = Json.pipe(\n z.union([PackageLockV3Schema, PackageLockPreV3Schema]),\n).transform(({ packages, lockfileVersion }) => {\n const lockedVersions: Record<string, string> = {};\n for (const [entry, val] of Object.entries(packages)) {\n lockedVersions[entry] = val.version;\n }\n return { lockedVersions, lockfileVersion };\n});\n"]}

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

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

package/dist/modules/manager/npm/update/dependency/pnpm.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"pnpm.js","sourceRoot":"","sources":["../../../../../../lib/modules/manager/npm/update/dependency/pnpm.ts"],"names":[],"mappings":";;AAQA,kEAkFC;;AA1FD,kEAAkC;AAElC,+BAA0E;AAC1E,kDAA+C;AAE/C,~~yCAA4C~~;~~AAC5C~~,qCAA+D;AAE/D,SAAgB,2BAA2B,CAAC,EAC1C,WAAW,EACX,OAAO,GACgB;IACvB,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAElD,MAAM,WAAW,GAAG,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAE/C,mCAAmC;IACnC,IAAI,CAAC,YAAE,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC;QAC5B,eAAM,CAAC,KAAK,CACV,+DAA+D,CAChE,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,kCAAkC;IAEpC,IAAI,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAE3B,QAAQ,GAAG,IAAA,uBAAc,EAAC,OAAO,CAAC,IAAI,QAAQ,CAAC;IAC/C,QAAQ,GAAG,IAAA,4BAAmB,EAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,QAAQ,CAAC;IAE9D,eAAM,CAAC,KAAK,CACV,sCAAsC,OAAO,IAAI,CAAA,kCAAmC,WAAW,EAAE,WAAW,IAAI,OAAO,MAAM,QAAQ,EAAE,CACxI,CAAC;IAEF,IAAI,QAAQ,CAAC;IACb,IAAI,cAAc,CAAC;IAEnB,IAAI,CAAC;QACH,4EAA4E;QAC5E,2EAA2E;QAC3E,6DAA6D;QAC7D,0EAA0E;QAC1E,0EAA0E;QAC1E,mEAAmE;QACnE,QAAQ,GAAG,IAAA,oBAAa,EAAC,WAAW,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC;QAClE,cAAc,GAAG,~~qBAAY~~,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;~~IACvD~~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","sourcesContent":["import is from '@sindresorhus/is';\nimport type { Document } from 'yaml';\nimport { CST, isCollection, isPair, isScalar, parseDocument } from 'yaml';\nimport { logger } from '../../../../../logger';\nimport type { UpdateDependencyConfig } from '../../../types';\nimport { ~~PnpmCatalogs~~ } from '../../schema';\nimport { getNewGitValue, getNewNpmAliasValue } from './common';\n\nexport function updatePnpmCatalogDependency({\n fileContent,\n upgrade,\n}: UpdateDependencyConfig): string \| null {\n const { depType, managerData, depName } = upgrade;\n\n const catalogName = depType?.split('.').at(-1);\n\n /* v8 ignore start -- needs test /\n if (!is.string(catalogName)) {\n logger.error(\n 'No catalogName was found; this is likely an extraction error.',\n );\n return null;\n } / v8 ignore stop -- needs test /\n\n let { newValue } = upgrade;\n\n newValue = getNewGitValue(upgrade) ?? newValue;\n newValue = getNewNpmAliasValue(newValue, upgrade) ?? newValue;\n\n logger.trace(\n `npm.updatePnpmCatalogDependency(): ${depType}:${/ v8 ignore next -- needs test / managerData?.catalogName}.${depName} = ${newValue}`,\n );\n\n let document;\n let parsedContents;\n\n try {\n // In order to preserve the original formatting as much as possible, we want\n // manipulate the CST directly. Using the AST (the result of parseDocument)\n // does not guarantee that formatting would be the same after\n // stringification. However, the CST is more annoying to query for certain\n // values. Thus, we use both an annotated AST and a JS representation; the\n // former for manipulation, and the latter for querying/validation.\n document = parseDocument(fileContent, { keepSourceTokens: true });\n parsedContents = ~~PnpmCatalogs~~.parse(document.toJS());\n } catch (err) {\n logger.debug({ err }, 'Could not parse pnpm-workspace YAML file.');\n return null;\n }\n\n // In pnpm-workspace.yaml, the default catalog can be either `catalog` or\n // `catalog.default`, but not both (pnpm throws outright with a config error).\n // Thus, we must check which entry is being used, to reference it from / set\n // it in the right place.\n const usesImplicitDefaultCatalog = parsedContents.catalog !== undefined;\n\n const oldVersion =\n catalogName === 'default' && usesImplicitDefaultCatalog\n ? parsedContents.catalog?.[depName!]\n : parsedContents.catalogs?.[catalogName]?.[depName!];\n\n if (oldVersion === newValue) {\n logger.trace('Version is already updated');\n return fileContent;\n }\n\n // Update the value\n const path = getDepPath({\n depName: depName!,\n catalogName,\n usesImplicitDefaultCatalog,\n });\n\n const modifiedDocument = changeDependencyIn(document, path, {\n newValue,\n newName: upgrade.newName,\n });\n\n if (!modifiedDocument) {\n // Case where we are explicitly unable to substitute the key/value, for\n // example if the value was an alias.\n return null;\n }\n\n / v8 ignore next 3 -- this should not happen in practice, but we must satisfy the types /\n if (!modifiedDocument.contents?.srcToken) {\n return null;\n }\n\n return CST.stringify(modifiedDocument.contents.srcToken);\n}\n\n/\n Change the scalar name and/or value of a collection item in a YAML document,\n * while keeping formatting consistent. Mutates the given document.\n /\nfunction changeDependencyIn(\n document: Document,\n path: string[],\n { newName, newValue }: { newName?: string; newValue?: string },\n): Document \| null {\n const parentPath = path.slice(0, -1);\n const relevantItemKey = path.at(-1);\n\n const parentNode = document.getIn(parentPath);\n\n if (!parentNode \|\| !isCollection(parentNode)) {\n return null;\n }\n\n const relevantNode = parentNode.items.find(\n (item) =>\n isPair(item) && isScalar(item.key) && item.key.value === relevantItemKey,\n );\n\n if (!relevantNode \|\| !isPair(relevantNode)) {\n return null;\n }\n\n if (newName) {\n / v8 ignore next 3 -- the try..catch block above already throws if a key is an alias */\n if (!CST.isScalar(relevantNode.srcToken?.key)) {\n return null;\n }\n CST.setScalarValue(relevantNode.srcToken.key, newName);\n }\n\n if (newValue) {\n // We only support scalar values when substituting. This explicitly avoids\n // substituting aliases, since those can be resolved from a shared location,\n // and replacing either the referrent anchor or the alias would be wrong in\n // the general case. We leave this up to the user, e.g. via a Regex custom\n // manager.\n if (!CST.isScalar(relevantNode.srcToken?.value)) {\n return null;\n }\n CST.setScalarValue(relevantNode.srcToken.value, newValue);\n }\n\n return document;\n}\n\nfunction getDepPath({\n catalogName,\n depName,\n usesImplicitDefaultCatalog,\n}: {\n usesImplicitDefaultCatalog: boolean;\n catalogName: string;\n depName: string;\n}): string[] {\n if (catalogName === 'default' && usesImplicitDefaultCatalog) {\n return ['catalog', depName];\n } else {\n return ['catalogs', catalogName, depName];\n }\n}\n"]}
1	+ {"version":3,"file":"pnpm.js","sourceRoot":"","sources":["../../../../../../lib/modules/manager/npm/update/dependency/pnpm.ts"],"names":[],"mappings":"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","sourcesContent":["import is from '@sindresorhus/is';\nimport type { Document } from 'yaml';\nimport { CST, isCollection, isPair, isScalar, parseDocument } from 'yaml';\nimport { logger } from '../../../../../logger';\nimport type { UpdateDependencyConfig } from '../../../types';\nimport { PnpmCatalogsSchema } from '../../schema';\nimport { getNewGitValue, getNewNpmAliasValue } from './common';\n\nexport function updatePnpmCatalogDependency({\n fileContent,\n upgrade,\n}: UpdateDependencyConfig): string \| null {\n const { depType, managerData, depName } = upgrade;\n\n const catalogName = depType?.split('.').at(-1);\n\n /* v8 ignore start -- needs test /\n if (!is.string(catalogName)) {\n logger.error(\n 'No catalogName was found; this is likely an extraction error.',\n );\n return null;\n } / v8 ignore stop -- needs test /\n\n let { newValue } = upgrade;\n\n newValue = getNewGitValue(upgrade) ?? newValue;\n newValue = getNewNpmAliasValue(newValue, upgrade) ?? newValue;\n\n logger.trace(\n `npm.updatePnpmCatalogDependency(): ${depType}:${/ v8 ignore next -- needs test / managerData?.catalogName}.${depName} = ${newValue}`,\n );\n\n let document;\n let parsedContents;\n\n try {\n // In order to preserve the original formatting as much as possible, we want\n // manipulate the CST directly. Using the AST (the result of parseDocument)\n // does not guarantee that formatting would be the same after\n // stringification. However, the CST is more annoying to query for certain\n // values. Thus, we use both an annotated AST and a JS representation; the\n // former for manipulation, and the latter for querying/validation.\n document = parseDocument(fileContent, { keepSourceTokens: true });\n parsedContents = PnpmCatalogsSchema.parse(document.toJS());\n } catch (err) {\n logger.debug({ err }, 'Could not parse pnpm-workspace YAML file.');\n return null;\n }\n\n // In pnpm-workspace.yaml, the default catalog can be either `catalog` or\n // `catalog.default`, but not both (pnpm throws outright with a config error).\n // Thus, we must check which entry is being used, to reference it from / set\n // it in the right place.\n const usesImplicitDefaultCatalog = parsedContents.catalog !== undefined;\n\n const oldVersion =\n catalogName === 'default' && usesImplicitDefaultCatalog\n ? parsedContents.catalog?.[depName!]\n : parsedContents.catalogs?.[catalogName]?.[depName!];\n\n if (oldVersion === newValue) {\n logger.trace('Version is already updated');\n return fileContent;\n }\n\n // Update the value\n const path = getDepPath({\n depName: depName!,\n catalogName,\n usesImplicitDefaultCatalog,\n });\n\n const modifiedDocument = changeDependencyIn(document, path, {\n newValue,\n newName: upgrade.newName,\n });\n\n if (!modifiedDocument) {\n // Case where we are explicitly unable to substitute the key/value, for\n // example if the value was an alias.\n return null;\n }\n\n / v8 ignore next 3 -- this should not happen in practice, but we must satisfy the types /\n if (!modifiedDocument.contents?.srcToken) {\n return null;\n }\n\n return CST.stringify(modifiedDocument.contents.srcToken);\n}\n\n/\n Change the scalar name and/or value of a collection item in a YAML document,\n * while keeping formatting consistent. Mutates the given document.\n /\nfunction changeDependencyIn(\n document: Document,\n path: string[],\n { newName, newValue }: { newName?: string; newValue?: string },\n): Document \| null {\n const parentPath = path.slice(0, -1);\n const relevantItemKey = path.at(-1);\n\n const parentNode = document.getIn(parentPath);\n\n if (!parentNode \|\| !isCollection(parentNode)) {\n return null;\n }\n\n const relevantNode = parentNode.items.find(\n (item) =>\n isPair(item) && isScalar(item.key) && item.key.value === relevantItemKey,\n );\n\n if (!relevantNode \|\| !isPair(relevantNode)) {\n return null;\n }\n\n if (newName) {\n / v8 ignore next 3 -- the try..catch block above already throws if a key is an alias */\n if (!CST.isScalar(relevantNode.srcToken?.key)) {\n return null;\n }\n CST.setScalarValue(relevantNode.srcToken.key, newName);\n }\n\n if (newValue) {\n // We only support scalar values when substituting. This explicitly avoids\n // substituting aliases, since those can be resolved from a shared location,\n // and replacing either the referrent anchor or the alias would be wrong in\n // the general case. We leave this up to the user, e.g. via a Regex custom\n // manager.\n if (!CST.isScalar(relevantNode.srcToken?.value)) {\n return null;\n }\n CST.setScalarValue(relevantNode.srcToken.value, newValue);\n }\n\n return document;\n}\n\nfunction getDepPath({\n catalogName,\n depName,\n usesImplicitDefaultCatalog,\n}: {\n usesImplicitDefaultCatalog: boolean;\n catalogName: string;\n depName: string;\n}): string[] {\n if (catalogName === 'default' && usesImplicitDefaultCatalog) {\n return ['catalog', depName];\n } else {\n return ['catalogs', catalogName, depName];\n }\n}\n"]}

package/dist/modules/manager/nuget/schema.d.ts CHANGED Viewed

@@ -4,13 +4,66 @@ import { z } from 'zod';
  *
  * https://learn.microsoft.com/de-de/dotnet/core/tools/global-json#rollforward
  */
-declare const RollForward: z.ZodEnum<["patch", "feature", "minor", "major", "latestPatch", "latestFeature", "latestMinor", "latestMajor", "disable"]>;
-export type RollForward = z.infer<typeof RollForward>;
+declare const RollForwardSchema: z.ZodEnum<["patch", "feature", "minor", "major", "latestPatch", "latestFeature", "latestMinor", "latestMajor", "disable"]>;
+export type RollForward = z.infer<typeof RollForwardSchema>;
 /**
  * global.json schema
  *
  * https://learn.microsoft.com/en-us/dotnet/core/tools/global-json#allowprerelease
  */
+export declare const GlobalJsonSchema: z.ZodObject<{
+    /**
+     * Specifies information about the .NET SDK to select.
+     */
+    sdk: z.ZodOptional<z.ZodObject<{
+        /**
+         * The version of the .NET SDK to use.
+         *
+         * https://learn.microsoft.com/de-de/dotnet/core/tools/global-json#version
+         */
+        version: z.ZodOptional<z.ZodString>;
+        /**
+         * The roll-forward policy to use when selecting an SDK version, either as a fallback when a specific SDK version is missing or as a directive to use a later version. A version must be specified with a rollForward value, unless you're setting it to latestMajor. The default roll forward behavior is determined by the matching rules.
+         *
+         * https://learn.microsoft.com/de-de/dotnet/core/tools/global-json#rollforward
+         */
+        rollForward: z.ZodOptional<z.ZodEnum<["patch", "feature", "minor", "major", "latestPatch", "latestFeature", "latestMinor", "latestMajor", "disable"]>>;
+        /**
+         * Indicates whether the SDK resolver should consider prerelease versions when selecting the SDK version to use.
+         *
+         * https://learn.microsoft.com/de-de/dotnet/core/tools/global-json#allowprerelease
+         */
+        allowPrerelease: z.ZodOptional<z.ZodBoolean>;
+    }, "strip", z.ZodTypeAny, {
+        version?: string | undefined;
+        rollForward?: "major" | "minor" | "patch" | "feature" | "latestPatch" | "latestFeature" | "latestMinor" | "latestMajor" | "disable" | undefined;
+        allowPrerelease?: boolean | undefined;
+    }, {
+        version?: string | undefined;
+        rollForward?: "major" | "minor" | "patch" | "feature" | "latestPatch" | "latestFeature" | "latestMinor" | "latestMajor" | "disable" | undefined;
+        allowPrerelease?: boolean | undefined;
+    }>>;
+    /**
+     * Lets you control the project SDK version in one place rather than in each individual project. For more information, see How project SDKs are resolved.
+     *
+     * https://learn.microsoft.com/de-de/dotnet/core/tools/global-json#msbuild-sdks
+     */
+    'msbuild-sdks': z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+}, "strip", z.ZodTypeAny, {
+    sdk?: {
+        version?: string | undefined;
+        rollForward?: "major" | "minor" | "patch" | "feature" | "latestPatch" | "latestFeature" | "latestMinor" | "latestMajor" | "disable" | undefined;
+        allowPrerelease?: boolean | undefined;
+    } | undefined;
+    'msbuild-sdks'?: Record<string, string> | undefined;
+}, {
+    sdk?: {
+        version?: string | undefined;
+        rollForward?: "major" | "minor" | "patch" | "feature" | "latestPatch" | "latestFeature" | "latestMinor" | "latestMajor" | "disable" | undefined;
+        allowPrerelease?: boolean | undefined;
+    } | undefined;
+    'msbuild-sdks'?: Record<string, string> | undefined;
+}>;
 export declare const GlobalJson: z.ZodPipeline<z.ZodEffects<z.ZodString, string | number | boolean | import("type-fest").JsonObject | import("type-fest").JsonValue[] | readonly import("type-fest").JsonValue[] | null, string>, z.ZodObject<{
     /**
      * Specifies information about the .NET SDK to select.

package/dist/modules/manager/nuget/schema.js CHANGED Viewed

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GlobalJson = void 0;
+exports.GlobalJson = exports.GlobalJsonSchema = void 0;
 const zod_1 = require("zod");
 const schema_utils_1 = require("../../../util/schema-utils");
 /**
@@ -8,7 +8,7 @@ const schema_utils_1 = require("../../../util/schema-utils");
  *
  * https://learn.microsoft.com/de-de/dotnet/core/tools/global-json#rollforward
  */
-const RollForward = zod_1.z.enum([
+const RollForwardSchema = zod_1.z.enum([
     'patch',
     'feature',
     'minor',
@@ -24,7 +24,7 @@ const RollForward = zod_1.z.enum([
  *
  * https://learn.microsoft.com/en-us/dotnet/core/tools/global-json#allowprerelease
  */
-exports.GlobalJson = schema_utils_1.Jsonc.pipe(zod_1.z.object({
+exports.GlobalJsonSchema = zod_1.z.object({
     /**
      * Specifies information about the .NET SDK to select.
      */
@@ -41,7 +41,7 @@ exports.GlobalJson = schema_utils_1.Jsonc.pipe(zod_1.z.object({
          *
          * https://learn.microsoft.com/de-de/dotnet/core/tools/global-json#rollforward
          */
-        rollForward: RollForward.optional(),
+        rollForward: RollForwardSchema.optional(),
         /**
          * Indicates whether the SDK resolver should consider prerelease versions when selecting the SDK version to use.
          *
@@ -56,5 +56,6 @@ exports.GlobalJson = schema_utils_1.Jsonc.pipe(zod_1.z.object({
      * https://learn.microsoft.com/de-de/dotnet/core/tools/global-json#msbuild-sdks
      */
     'msbuild-sdks': zod_1.z.record(zod_1.z.string()).optional(),
-}));
+});
+exports.GlobalJson = schema_utils_1.Jsonc.pipe(exports.GlobalJsonSchema);
 //# sourceMappingURL=schema.js.map

package/dist/modules/manager/nuget/schema.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../lib/modules/manager/nuget/schema.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AACxB,6DAAmD;AAEnD;;;;GAIG;AACH,MAAM,~~WAAW~~,GAAG,OAAC,CAAC,IAAI,CAAC;~~IACzB~~,OAAO;IACP,SAAS;IACT,OAAO;IACP,OAAO;IACP,aAAa;IACb,eAAe;IACf,aAAa;IACb,aAAa;IACb,SAAS;CACV,CAAC,CAAC;AAGH;;;;GAIG;AACU,QAAA,~~UAAU~~,GAAG,~~oBAAK,CAAC,IAAI,CAClC,~~OAAC,CAAC,MAAM,CAAC;~~IACP~~;;OAEG;IACH,GAAG,EAAE,OAAC;SACH,MAAM,CAAC;QACN;;;;WAIG;QACH,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAC9B;;;;WAIG;QACH,WAAW,EAAE,~~WAAW~~,CAAC,QAAQ,EAAE;~~QACnC~~;;;;WAIG;QACH,eAAe,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;KACxC,CAAC;SACD,QAAQ,EAAE;IAEb;;;;OAIG;IACH,cAAc,EAAE,OAAC,CAAC,MAAM,CAAC,OAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;CAChD,CAAC,~~CACH~~,CAAC","sourcesContent":["import { z } from 'zod';\nimport { Jsonc } from '../../../util/schema-utils';\n\n/*\n The roll-forward policy to use when selecting an SDK version, either as a fallback when a specific SDK version is missing or as a directive to use a later version. A version must be specified with a rollForward value, unless you're setting it to latestMajor. The default roll forward behavior is determined by the matching rules.\n \n https://learn.microsoft.com/de-de/dotnet/core/tools/global-json#rollforward\n /\nconst ~~RollForward~~ = z.enum([\n 'patch',\n 'feature',\n 'minor',\n 'major',\n 'latestPatch',\n 'latestFeature',\n 'latestMinor',\n 'latestMajor',\n 'disable',\n]);\nexport type RollForward = z.infer<typeof ~~RollForward~~>;\n\n/\n global.json schema\n \n https://learn.microsoft.com/en-us/dotnet/core/tools/global-json#allowprerelease\n /\nexport const ~~GlobalJson~~ = ~~Jsonc.pipe(\n~~ z.object({\n /\n Specifies information about the .NET SDK to select.\n /\n sdk: z\n .object({\n /\n The version of the .NET SDK to use.\n \n https://learn.microsoft.com/de-de/dotnet/core/tools/global-json#version\n /\n version: z.string().optional(),\n /\n The roll-forward policy to use when selecting an SDK version, either as a fallback when a specific SDK version is missing or as a directive to use a later version. A version must be specified with a rollForward value, unless you're setting it to latestMajor. The default roll forward behavior is determined by the matching rules.\n \n https://learn.microsoft.com/de-de/dotnet/core/tools/global-json#rollforward\n /\n rollForward: ~~RollForward~~.optional(),\n /\n Indicates whether the SDK resolver should consider prerelease versions when selecting the SDK version to use.\n \n https://learn.microsoft.com/de-de/dotnet/core/tools/global-json#allowprerelease\n /\n allowPrerelease: z.boolean().optional(),\n })\n .optional(),\n\n /\n Lets you control the project SDK version in one place rather than in each individual project. For more information, see How project SDKs are resolved.\n \n https://learn.microsoft.com/de-de/dotnet/core/tools/global-json#msbuild-sdks\n */\n 'msbuild-sdks': z.record(z.string()).optional(),\n })~~,\n)~~;\n\nexport type GlobalJson = z.infer<typeof GlobalJson>;\n"]}
1	+ {"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../lib/modules/manager/nuget/schema.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AACxB,6DAAmD;AAEnD;;;;GAIG;AACH,MAAM,iBAAiB,GAAG,OAAC,CAAC,IAAI,CAAC;IAC/B,OAAO;IACP,SAAS;IACT,OAAO;IACP,OAAO;IACP,aAAa;IACb,eAAe;IACf,aAAa;IACb,aAAa;IACb,SAAS;CACV,CAAC,CAAC;AAGH;;;;GAIG;AACU,QAAA,gBAAgB,GAAG,OAAC,CAAC,MAAM,CAAC;IACvC;;OAEG;IACH,GAAG,EAAE,OAAC;SACH,MAAM,CAAC;QACN;;;;WAIG;QACH,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAC9B;;;;WAIG;QACH,WAAW,EAAE,iBAAiB,CAAC,QAAQ,EAAE;QACzC;;;;WAIG;QACH,eAAe,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;KACxC,CAAC;SACD,QAAQ,EAAE;IAEb;;;;OAIG;IACH,cAAc,EAAE,OAAC,CAAC,MAAM,CAAC,OAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;CAChD,CAAC,CAAC;AAEU,QAAA,UAAU,GAAG,oBAAK,CAAC,IAAI,CAAC,wBAAgB,CAAC,CAAC","sourcesContent":["import { z } from 'zod';\nimport { Jsonc } from '../../../util/schema-utils';\n\n/*\n The roll-forward policy to use when selecting an SDK version, either as a fallback when a specific SDK version is missing or as a directive to use a later version. A version must be specified with a rollForward value, unless you're setting it to latestMajor. The default roll forward behavior is determined by the matching rules.\n \n https://learn.microsoft.com/de-de/dotnet/core/tools/global-json#rollforward\n /\nconst RollForwardSchema = z.enum([\n 'patch',\n 'feature',\n 'minor',\n 'major',\n 'latestPatch',\n 'latestFeature',\n 'latestMinor',\n 'latestMajor',\n 'disable',\n]);\nexport type RollForward = z.infer<typeof RollForwardSchema>;\n\n/\n global.json schema\n \n https://learn.microsoft.com/en-us/dotnet/core/tools/global-json#allowprerelease\n /\nexport const GlobalJsonSchema = z.object({\n /\n Specifies information about the .NET SDK to select.\n /\n sdk: z\n .object({\n /\n The version of the .NET SDK to use.\n \n https://learn.microsoft.com/de-de/dotnet/core/tools/global-json#version\n /\n version: z.string().optional(),\n /\n The roll-forward policy to use when selecting an SDK version, either as a fallback when a specific SDK version is missing or as a directive to use a later version. A version must be specified with a rollForward value, unless you're setting it to latestMajor. The default roll forward behavior is determined by the matching rules.\n \n https://learn.microsoft.com/de-de/dotnet/core/tools/global-json#rollforward\n /\n rollForward: RollForwardSchema.optional(),\n /\n Indicates whether the SDK resolver should consider prerelease versions when selecting the SDK version to use.\n \n https://learn.microsoft.com/de-de/dotnet/core/tools/global-json#allowprerelease\n /\n allowPrerelease: z.boolean().optional(),\n })\n .optional(),\n\n /\n Lets you control the project SDK version in one place rather than in each individual project. For more information, see How project SDKs are resolved.\n \n https://learn.microsoft.com/de-de/dotnet/core/tools/global-json#msbuild-sdks\n */\n 'msbuild-sdks': z.record(z.string()).optional(),\n});\n\nexport const GlobalJson = Jsonc.pipe(GlobalJsonSchema);\nexport type GlobalJson = z.infer<typeof GlobalJson>;\n"]}

package/dist/modules/manager/ocb/extract.js CHANGED Viewed

@@ -13,7 +13,7 @@ function extractPackageFile(content, packageFile, _config) {
     let definition = null;
     try {
         const yaml = (0, yaml_1.parseSingleYaml)(content);
-        const parsed = schema_1.OCBConfig.safeParse(yaml);
+        const parsed = schema_1.OCBConfigSchema.safeParse(yaml);
         if (!parsed.success) {
             logger_1.logger.trace({ packageFile, error: parsed.error }, 'Failed to parse OCB schema');
             return null;

package/dist/modules/manager/ocb/extract.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"extract.js","sourceRoot":"","sources":["../../../../lib/modules/manager/ocb/extract.ts"],"names":[],"mappings":";;AAYA,gDAgDC;AAED,sCAoBC;;AAlFD,kEAAkC;AAClC,4CAAyC;AACzC,+CAA4C;AAC5C,6CAAqD;AACrD,4CAAmD;AAMnD,~~qCAAkD~~;~~AAElD~~,SAAgB,kBAAkB,CAChC,OAAe,EACf,WAAmB,EACnB,OAAuB;IAEvB,IAAI,UAAU,GAAqB,IAAI,CAAC;IACxC,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,IAAA,sBAAe,EAAC,OAAO,CAAC,CAAC;QACtC,MAAM,MAAM,GAAG,~~kBAAS~~,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;~~QACzC~~,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACpB,eAAM,CAAC,KAAK,CACV,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,EACpC,4BAA4B,CAC7B,CAAC;YACF,OAAO,IAAI,CAAC;QACd,CAAC;QAED,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC;IAC3B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,eAAM,CAAC,KAAK,CACV,EAAE,WAAW,EAAE,KAAK,EAAE,EACtB,0CAA0C,CAC3C,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,IAAI,GAAwB,EAAE,CAAC;IACrC,IAAI,UAAU,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC;QACpC,IAAI,CAAC,IAAI,CAAC;YACR,UAAU,EAAE,iBAAY,CAAC,EAAE;YAC3B,OAAO,EAAE,WAAW;YACpB,OAAO,EAAE,+BAA+B;YACxC,YAAY,EAAE,UAAU,CAAC,IAAI,CAAC,eAAe;YAC7C,cAAc,EAAE,oBAAoB;SACrC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,UAAU,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC,CAAC;IACjE,IAAI,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,UAAU,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;IAC7D,IAAI,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,UAAU,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC,CAAC;IACjE,IAAI,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,UAAU,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC,CAAC;IACjE,IAAI,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,UAAU,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC;IAC/D,IAAI,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,UAAU,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC;IAE/D,OAAO;QACL,kBAAkB,EAAE,UAAU,CAAC,IAAI,CAAC,OAAO;QAC3C,IAAI;KACL,CAAC;AACJ,CAAC;AAED,SAAgB,aAAa,CAC3B,MAAc,EACd,OAAe;IAEf,MAAM,IAAI,GAAwB,EAAE,CAAC;IACrC,IAAI,YAAE,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC;QAC/B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,MAAM,OAAO,IAAI,MAAM,EAAE,CAAC;QAC7B,MAAM,CAAC,OAAO,EAAE,YAAY,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,IAAA,aAAK,EAAC,KAAK,CAAC,CAAC,CAAC;QACzE,IAAI,CAAC,IAAI,CAAC;YACR,UAAU,EAAE,iBAAY,CAAC,EAAE;YAC3B,OAAO;YACP,OAAO;YACP,YAAY;SACb,CAAC,CAAC;IACL,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC","sourcesContent":["import is from '@sindresorhus/is';\nimport { logger } from '../../../logger';\nimport { regEx } from '../../../util/regex';\nimport { parseSingleYaml } from '../../../util/yaml';\nimport { GoDatasource } from '../../datasource/go';\nimport type {\n ExtractConfig,\n PackageDependency,\n PackageFileContent,\n} from '../types';\nimport { type Module, OCBConfig } from './schema';\n\nexport function extractPackageFile(\n content: string,\n packageFile: string,\n _config?: ExtractConfig,\n): PackageFileContent \| null {\n let definition: OCBConfig \| null = null;\n try {\n const yaml = parseSingleYaml(content);\n const parsed = ~~OCBConfig~~.safeParse(yaml);\n if (!parsed.success) {\n logger.trace(\n { packageFile, error: parsed.error },\n 'Failed to parse OCB schema',\n );\n return null;\n }\n\n definition = parsed.data;\n } catch (error) {\n logger.debug(\n { packageFile, error },\n 'OCB manager failed to parse file as YAML',\n );\n return null;\n }\n\n const deps: PackageDependency[] = [];\n if (definition.dist.otelcol_version) {\n deps.push({\n datasource: GoDatasource.id,\n depType: 'collector',\n depName: 'go.opentelemetry.io/collector',\n currentValue: definition.dist.otelcol_version,\n extractVersion: '^v(?<version>\\\\S+)',\n });\n }\n\n deps.push(...processModule(definition.connectors, 'connectors'));\n deps.push(...processModule(definition.exporters, 'exports'));\n deps.push(...processModule(definition.extensions, 'extensions'));\n deps.push(...processModule(definition.processors, 'processors'));\n deps.push(...processModule(definition.providers, 'providers'));\n deps.push(...processModule(definition.receivers, 'receivers'));\n\n return {\n packageFileVersion: definition.dist.version,\n deps,\n };\n}\n\nexport function processModule(\n module: Module,\n depType: string,\n): PackageDependency[] {\n const deps: PackageDependency[] = [];\n if (is.nullOrUndefined(module)) {\n return deps;\n }\n\n for (const element of module) {\n const [depName, currentValue] = element.gomod.trim().split(regEx(/\\s+/));\n deps.push({\n datasource: GoDatasource.id,\n depType,\n depName,\n currentValue,\n });\n }\n\n return deps;\n}\n"]}
1	+ {"version":3,"file":"extract.js","sourceRoot":"","sources":["../../../../lib/modules/manager/ocb/extract.ts"],"names":[],"mappings":";;AAYA,gDAgDC;AAED,sCAoBC;;AAlFD,kEAAkC;AAClC,4CAAyC;AACzC,+CAA4C;AAC5C,6CAAqD;AACrD,4CAAmD;AAMnD,qCAAwE;AAExE,SAAgB,kBAAkB,CAChC,OAAe,EACf,WAAmB,EACnB,OAAuB;IAEvB,IAAI,UAAU,GAAqB,IAAI,CAAC;IACxC,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,IAAA,sBAAe,EAAC,OAAO,CAAC,CAAC;QACtC,MAAM,MAAM,GAAG,wBAAe,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC/C,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACpB,eAAM,CAAC,KAAK,CACV,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,EACpC,4BAA4B,CAC7B,CAAC;YACF,OAAO,IAAI,CAAC;QACd,CAAC;QAED,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC;IAC3B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,eAAM,CAAC,KAAK,CACV,EAAE,WAAW,EAAE,KAAK,EAAE,EACtB,0CAA0C,CAC3C,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,IAAI,GAAwB,EAAE,CAAC;IACrC,IAAI,UAAU,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC;QACpC,IAAI,CAAC,IAAI,CAAC;YACR,UAAU,EAAE,iBAAY,CAAC,EAAE;YAC3B,OAAO,EAAE,WAAW;YACpB,OAAO,EAAE,+BAA+B;YACxC,YAAY,EAAE,UAAU,CAAC,IAAI,CAAC,eAAe;YAC7C,cAAc,EAAE,oBAAoB;SACrC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,UAAU,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC,CAAC;IACjE,IAAI,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,UAAU,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;IAC7D,IAAI,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,UAAU,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC,CAAC;IACjE,IAAI,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,UAAU,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC,CAAC;IACjE,IAAI,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,UAAU,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC;IAC/D,IAAI,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,UAAU,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC;IAE/D,OAAO;QACL,kBAAkB,EAAE,UAAU,CAAC,IAAI,CAAC,OAAO;QAC3C,IAAI;KACL,CAAC;AACJ,CAAC;AAED,SAAgB,aAAa,CAC3B,MAAc,EACd,OAAe;IAEf,MAAM,IAAI,GAAwB,EAAE,CAAC;IACrC,IAAI,YAAE,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC;QAC/B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,MAAM,OAAO,IAAI,MAAM,EAAE,CAAC;QAC7B,MAAM,CAAC,OAAO,EAAE,YAAY,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,IAAA,aAAK,EAAC,KAAK,CAAC,CAAC,CAAC;QACzE,IAAI,CAAC,IAAI,CAAC;YACR,UAAU,EAAE,iBAAY,CAAC,EAAE;YAC3B,OAAO;YACP,OAAO;YACP,YAAY;SACb,CAAC,CAAC;IACL,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC","sourcesContent":["import is from '@sindresorhus/is';\nimport { logger } from '../../../logger';\nimport { regEx } from '../../../util/regex';\nimport { parseSingleYaml } from '../../../util/yaml';\nimport { GoDatasource } from '../../datasource/go';\nimport type {\n ExtractConfig,\n PackageDependency,\n PackageFileContent,\n} from '../types';\nimport { type Module, type OCBConfig, OCBConfigSchema } from './schema';\n\nexport function extractPackageFile(\n content: string,\n packageFile: string,\n _config?: ExtractConfig,\n): PackageFileContent \| null {\n let definition: OCBConfig \| null = null;\n try {\n const yaml = parseSingleYaml(content);\n const parsed = OCBConfigSchema.safeParse(yaml);\n if (!parsed.success) {\n logger.trace(\n { packageFile, error: parsed.error },\n 'Failed to parse OCB schema',\n );\n return null;\n }\n\n definition = parsed.data;\n } catch (error) {\n logger.debug(\n { packageFile, error },\n 'OCB manager failed to parse file as YAML',\n );\n return null;\n }\n\n const deps: PackageDependency[] = [];\n if (definition.dist.otelcol_version) {\n deps.push({\n datasource: GoDatasource.id,\n depType: 'collector',\n depName: 'go.opentelemetry.io/collector',\n currentValue: definition.dist.otelcol_version,\n extractVersion: '^v(?<version>\\\\S+)',\n });\n }\n\n deps.push(...processModule(definition.connectors, 'connectors'));\n deps.push(...processModule(definition.exporters, 'exports'));\n deps.push(...processModule(definition.extensions, 'extensions'));\n deps.push(...processModule(definition.processors, 'processors'));\n deps.push(...processModule(definition.providers, 'providers'));\n deps.push(...processModule(definition.receivers, 'receivers'));\n\n return {\n packageFileVersion: definition.dist.version,\n deps,\n };\n}\n\nexport function processModule(\n module: Module,\n depType: string,\n): PackageDependency[] {\n const deps: PackageDependency[] = [];\n if (is.nullOrUndefined(module)) {\n return deps;\n }\n\n for (const element of module) {\n const [depName, currentValue] = element.gomod.trim().split(regEx(/\\s+/));\n deps.push({\n datasource: GoDatasource.id,\n depType,\n depName,\n currentValue,\n });\n }\n\n return deps;\n}\n"]}

package/dist/modules/manager/ocb/schema.d.ts CHANGED Viewed

@@ -1,13 +1,13 @@
 import { z } from 'zod';
-declare const Module: z.ZodOptional<z.ZodArray<z.ZodObject<{
+declare const ModuleSchema: z.ZodOptional<z.ZodArray<z.ZodObject<{
     gomod: z.ZodString;
 }, "strip", z.ZodTypeAny, {
     gomod: string;
 }, {
     gomod: string;
 }>, "many">>;
-export type Module = z.infer<typeof Module>;
-export declare const OCBConfig: z.ZodObject<{
+export type Module = z.infer<typeof ModuleSchema>;
+export declare const OCBConfigSchema: z.ZodObject<{
     dist: z.ZodObject<{
         otelcol_version: z.ZodOptional<z.ZodString>;
         module: z.ZodOptional<z.ZodString>;
@@ -112,5 +112,5 @@ export declare const OCBConfig: z.ZodObject<{
         gomod: string;
     }[] | undefined;
 }>;
-export type OCBConfig = z.infer<typeof OCBConfig>;
+export type OCBConfig = z.infer<typeof OCBConfigSchema>;
 export {};

package/dist/modules/manager/ocb/schema.js CHANGED Viewed

@@ -1,22 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OCBConfig = void 0;
+exports.OCBConfigSchema = void 0;
 const zod_1 = require("zod");
 const Entry = zod_1.z.object({
     gomod: zod_1.z.string(),
 });
-const Module = zod_1.z.array(Entry).optional();
-exports.OCBConfig = zod_1.z.object({
+const ModuleSchema = zod_1.z.array(Entry).optional();
+exports.OCBConfigSchema = zod_1.z.object({
     dist: zod_1.z.object({
         otelcol_version: zod_1.z.string().optional(),
         module: zod_1.z.string().optional(),
         version: zod_1.z.string().optional(),
     }),
-    extensions: Module,
-    exporters: Module,
-    receivers: Module,
-    processors: Module,
-    providers: Module,
-    connectors: Module,
+    extensions: ModuleSchema,
+    exporters: ModuleSchema,
+    receivers: ModuleSchema,
+    processors: ModuleSchema,
+    providers: ModuleSchema,
+    connectors: ModuleSchema,
 });
 //# sourceMappingURL=schema.js.map

package/dist/modules/manager/ocb/schema.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../lib/modules/manager/ocb/schema.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AAExB,MAAM,KAAK,GAAG,OAAC,CAAC,MAAM,CAAC;IACrB,KAAK,EAAE,OAAC,CAAC,MAAM,EAAE;CAClB,CAAC,CAAC;AAEH,MAAM,~~MAAM~~,GAAG,OAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAC;~~AAG5B~~,QAAA,~~SAAS~~,GAAG,OAAC,CAAC,MAAM,CAAC;~~IAChC~~,IAAI,EAAE,OAAC,CAAC,MAAM,CAAC;QACb,eAAe,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QACtC,MAAM,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAC7B,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;KAC/B,CAAC;IACF,UAAU,EAAE,~~MAAM~~;~~IAClB~~,SAAS,EAAE,~~MAAM~~;~~IACjB~~,SAAS,EAAE,~~MAAM~~;~~IACjB~~,UAAU,EAAE,~~MAAM~~;~~IAClB~~,SAAS,EAAE,~~MAAM~~;~~IACjB~~,UAAU,EAAE,~~MAAM~~;~~CACnB~~,CAAC,CAAC","sourcesContent":["import { z } from 'zod';\n\nconst Entry = z.object({\n gomod: z.string(),\n});\n\nconst ~~Module~~ = z.array(Entry).optional();\nexport type Module = z.infer<typeof ~~Module~~>;\n\nexport const ~~OCBConfig~~ = z.object({\n dist: z.object({\n otelcol_version: z.string().optional(),\n module: z.string().optional(),\n version: z.string().optional(),\n }),\n extensions: ~~Module~~,\n exporters: ~~Module~~,\n receivers: ~~Module~~,\n processors: ~~Module~~,\n providers: ~~Module~~,\n connectors: ~~Module~~,\n});\nexport type OCBConfig = z.infer<typeof ~~OCBConfig~~>;\n"]}
1	+ {"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../lib/modules/manager/ocb/schema.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AAExB,MAAM,KAAK,GAAG,OAAC,CAAC,MAAM,CAAC;IACrB,KAAK,EAAE,OAAC,CAAC,MAAM,EAAE;CAClB,CAAC,CAAC;AAEH,MAAM,YAAY,GAAG,OAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAC;AAGlC,QAAA,eAAe,GAAG,OAAC,CAAC,MAAM,CAAC;IACtC,IAAI,EAAE,OAAC,CAAC,MAAM,CAAC;QACb,eAAe,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QACtC,MAAM,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAC7B,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;KAC/B,CAAC;IACF,UAAU,EAAE,YAAY;IACxB,SAAS,EAAE,YAAY;IACvB,SAAS,EAAE,YAAY;IACvB,UAAU,EAAE,YAAY;IACxB,SAAS,EAAE,YAAY;IACvB,UAAU,EAAE,YAAY;CACzB,CAAC,CAAC","sourcesContent":["import { z } from 'zod';\n\nconst Entry = z.object({\n gomod: z.string(),\n});\n\nconst ModuleSchema = z.array(Entry).optional();\nexport type Module = z.infer<typeof ModuleSchema>;\n\nexport const OCBConfigSchema = z.object({\n dist: z.object({\n otelcol_version: z.string().optional(),\n module: z.string().optional(),\n version: z.string().optional(),\n }),\n extensions: ModuleSchema,\n exporters: ModuleSchema,\n receivers: ModuleSchema,\n processors: ModuleSchema,\n providers: ModuleSchema,\n connectors: ModuleSchema,\n});\nexport type OCBConfig = z.infer<typeof OCBConfigSchema>;\n"]}

package/dist/modules/manager/pep621/extract.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
 import type { ExtractConfig, PackageFileContent } from '../types';
-import { PyProject } from './schema';
+import { type PyProject } from './schema';
 export declare function parsePyProject(content: string, packageFile?: string): PyProject | null;
 export declare function extractPackageFile(content: string, packageFile: string, _config?: ExtractConfig): Promise<PackageFileContent | null>;

package/dist/modules/manager/pep621/extract.js CHANGED Viewed

@@ -12,7 +12,7 @@ const schema_1 = require("./schema");
 function parsePyProject(content, packageFile) {
     try {
         const jsonMap = (0, toml_1.parse)((0, toml_1.massage)(content));
-        return schema_1.PyProject.parse(jsonMap);
+        return schema_1.PyProjectSchema.parse(jsonMap);
     }
     catch (err) {
         logger_1.logger.debug({ packageFile, err }, `Failed to parse and validate pyproject file`);

package/dist/modules/manager/pep621/extract.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"extract.js","sourceRoot":"","sources":["../../../../lib/modules/manager/pep621/extract.ts"],"names":[],"mappings":";;AAYA,wCAcC;AAED,gDA+DC;;AA3FD,4CAAyC;AACzC,6CAAgF;AAChF,oEAA0E;AAC1E,wEAAkD;AAMlD,6CAA0C;AAC1C,~~qCAAqC~~;~~AAErC~~,SAAgB,cAAc,CAC5B,OAAe,EACf,WAAoB;IAEpB,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,IAAA,YAAS,EAAC,IAAA,cAAW,EAAC,OAAO,CAAC,CAAC,CAAC;QAChD,OAAO,~~kBAAS~~,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;~~IAClC~~,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,eAAM,CAAC,KAAK,CACV,EAAE,WAAW,EAAE,GAAG,EAAE,EACpB,6CAA6C,CAC9C,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,kBAAkB,CACtC,OAAe,EACf,WAAmB,EACnB,OAAuB;IAEvB,eAAM,CAAC,KAAK,CAAC,6BAA6B,WAAW,GAAG,CAAC,CAAC;IAE1D,MAAM,GAAG,GAAG,cAAc,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACjD,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,IAAI,GAAwB,EAAE,CAAC;IAErC,MAAM,gBAAgB,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC,iBAAiB,CAAC,CAAC;IAC1D,MAAM,oBAAoB,GAA2B,EAAE,CAAC;IACxD,IAAI,gBAAgB,EAAE,CAAC;QACrB,oBAAoB,CAAC,MAAM,GAAG,gBAAgB,CAAC;QAC/C,IAAI,CAAC,IAAI,CAAC;YACR,WAAW,EAAE,QAAQ;YACrB,OAAO,EAAE,iBAAiB;YAC1B,YAAY,EAAE,gBAAgB;YAC9B,kBAAkB,EAAE,QAAQ;YAC5B,UAAU,EAAE,wCAAuB,CAAC,EAAE;YACtC,UAAU,EAAE,MAAM,CAAC,EAAE;SACtB,CAAC,CAAC;IACL,CAAC;IAED,MAAM,mBAAmB,GAAG,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC;IACtD,IAAI,mBAAmB,EAAE,CAAC;QACxB,IAAI,CAAC,IAAI,CAAC,GAAG,mBAAmB,CAAC,CAAC;IACpC,CAAC;IAED,MAAM,gBAAgB,GAAG,GAAG,CAAC,mBAAmB,CAAC,CAAC;IAClD,IAAI,gBAAgB,EAAE,CAAC;QACrB,IAAI,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,CAAC;IACjC,CAAC;IAED,MAAM,2BAA2B,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC,uBAAuB,CAAC,CAAC;IAC3E,IAAI,2BAA2B,EAAE,CAAC;QAChC,IAAI,CAAC,IAAI,CAAC,GAAG,2BAA2B,CAAC,CAAC;IAC5C,CAAC;IAED,MAAM,mBAAmB,GAAG,GAAG,CAAC,cAAc,CAAC,EAAE,QAAQ,CAAC;IAC1D,IAAI,mBAAmB,EAAE,CAAC;QACxB,IAAI,CAAC,IAAI,CAAC,GAAG,mBAAmB,CAAC,CAAC;IACpC,CAAC;IAED,6BAA6B;IAC7B,IAAI,aAAa,GAAG,IAAI,CAAC;IACzB,KAAK,MAAM,SAAS,IAAI,uBAAU,EAAE,CAAC;QACnC,aAAa,GAAG,SAAS,CAAC,OAAO,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;QACtD,aAAa,GAAG,MAAM,SAAS,CAAC,qBAAqB,CACnD,GAAG,EACH,aAAa,EACb,WAAW,CACZ,CAAC;IACJ,CAAC;IAED,MAAM,kBAAkB,GAAG,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC;IAChD,OAAO,aAAa,CAAC,MAAM;QACzB,CAAC,CAAC,EAAE,oBAAoB,EAAE,IAAI,EAAE,aAAa,EAAE,kBAAkB,EAAE;QACnE,CAAC,CAAC,IAAI,CAAC;AACX,CAAC","sourcesContent":["import { logger } from '../../../logger';\nimport { massage as massageToml, parse as parseToml } from '../../../util/toml';\nimport { PythonVersionDatasource } from '../../datasource/python-version';\nimport * as pep440 from '../../versioning/pep440';\nimport type {\n ExtractConfig,\n PackageDependency,\n PackageFileContent,\n} from '../types';\nimport { processors } from './processors';\nimport { PyProject } from './schema';\n\nexport function parsePyProject(\n content: string,\n packageFile?: string,\n): PyProject \| null {\n try {\n const jsonMap = parseToml(massageToml(content));\n return ~~PyProject~~.parse(jsonMap);\n } catch (err) {\n logger.debug(\n { packageFile, err },\n `Failed to parse and validate pyproject file`,\n );\n return null;\n }\n}\n\nexport async function extractPackageFile(\n content: string,\n packageFile: string,\n _config?: ExtractConfig,\n): Promise<PackageFileContent \| null> {\n logger.trace(`pep621.extractPackageFile(${packageFile})`);\n\n const def = parsePyProject(content, packageFile);\n if (!def) {\n return null;\n }\n\n const deps: PackageDependency[] = [];\n\n const pythonConstraint = def.project?.['requires-python'];\n const extractedConstraints: Record<string, string> = {};\n if (pythonConstraint) {\n extractedConstraints.python = pythonConstraint;\n deps.push({\n packageName: 'python',\n depType: 'requires-python',\n currentValue: pythonConstraint,\n commitMessageTopic: 'Python',\n datasource: PythonVersionDatasource.id,\n versioning: pep440.id,\n });\n }\n\n const projectDependencies = def.project?.dependencies;\n if (projectDependencies) {\n deps.push(...projectDependencies);\n }\n\n const dependencyGroups = def['dependency-groups'];\n if (dependencyGroups) {\n deps.push(...dependencyGroups);\n }\n\n const projectOptionalDependencies = def.project?.['optional-dependencies'];\n if (projectOptionalDependencies) {\n deps.push(...projectOptionalDependencies);\n }\n\n const buildSystemRequires = def['build-system']?.requires;\n if (buildSystemRequires) {\n deps.push(...buildSystemRequires);\n }\n\n // process specific tool sets\n let processedDeps = deps;\n for (const processor of processors) {\n processedDeps = processor.process(def, processedDeps);\n processedDeps = await processor.extractLockedVersions(\n def,\n processedDeps,\n packageFile,\n );\n }\n\n const packageFileVersion = def.project?.version;\n return processedDeps.length\n ? { extractedConstraints, deps: processedDeps, packageFileVersion }\n : null;\n}\n"]}
1	+ {"version":3,"file":"extract.js","sourceRoot":"","sources":["../../../../lib/modules/manager/pep621/extract.ts"],"names":[],"mappings":"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","sourcesContent":["import { logger } from '../../../logger';\nimport { massage as massageToml, parse as parseToml } from '../../../util/toml';\nimport { PythonVersionDatasource } from '../../datasource/python-version';\nimport * as pep440 from '../../versioning/pep440';\nimport type {\n ExtractConfig,\n PackageDependency,\n PackageFileContent,\n} from '../types';\nimport { processors } from './processors';\nimport { type PyProject, PyProjectSchema } from './schema';\n\nexport function parsePyProject(\n content: string,\n packageFile?: string,\n): PyProject \| null {\n try {\n const jsonMap = parseToml(massageToml(content));\n return PyProjectSchema.parse(jsonMap);\n } catch (err) {\n logger.debug(\n { packageFile, err },\n `Failed to parse and validate pyproject file`,\n );\n return null;\n }\n}\n\nexport async function extractPackageFile(\n content: string,\n packageFile: string,\n _config?: ExtractConfig,\n): Promise<PackageFileContent \| null> {\n logger.trace(`pep621.extractPackageFile(${packageFile})`);\n\n const def = parsePyProject(content, packageFile);\n if (!def) {\n return null;\n }\n\n const deps: PackageDependency[] = [];\n\n const pythonConstraint = def.project?.['requires-python'];\n const extractedConstraints: Record<string, string> = {};\n if (pythonConstraint) {\n extractedConstraints.python = pythonConstraint;\n deps.push({\n packageName: 'python',\n depType: 'requires-python',\n currentValue: pythonConstraint,\n commitMessageTopic: 'Python',\n datasource: PythonVersionDatasource.id,\n versioning: pep440.id,\n });\n }\n\n const projectDependencies = def.project?.dependencies;\n if (projectDependencies) {\n deps.push(...projectDependencies);\n }\n\n const dependencyGroups = def['dependency-groups'];\n if (dependencyGroups) {\n deps.push(...dependencyGroups);\n }\n\n const projectOptionalDependencies = def.project?.['optional-dependencies'];\n if (projectOptionalDependencies) {\n deps.push(...projectOptionalDependencies);\n }\n\n const buildSystemRequires = def['build-system']?.requires;\n if (buildSystemRequires) {\n deps.push(...buildSystemRequires);\n }\n\n // process specific tool sets\n let processedDeps = deps;\n for (const processor of processors) {\n processedDeps = processor.process(def, processedDeps);\n processedDeps = await processor.extractLockedVersions(\n def,\n processedDeps,\n packageFile,\n );\n }\n\n const packageFileVersion = def.project?.version;\n return processedDeps.length\n ? { extractedConstraints, deps: processedDeps, packageFileVersion }\n : null;\n}\n"]}

package/dist/modules/manager/pep621/processors/pdm.js CHANGED Viewed

@@ -36,7 +36,7 @@ class PdmProcessor {
         const lockFileName = (0, fs_1.getSiblingFileName)(packageFile, 'pdm.lock');
         const lockFileContent = await (0, fs_1.readLocalFile)(lockFileName, 'utf8');
         if (lockFileContent) {
-            const lockFileMapping = result_1.Result.parse(lockFileContent, schema_1.PdmLockfile.transform(({ lock }) => lock)).unwrapOr({});
+            const lockFileMapping = result_1.Result.parse(lockFileContent, schema_1.PdmLockfileSchema.transform(({ lock }) => lock)).unwrapOr({});
             for (const dep of deps) {
                 const packageName = dep.packageName;
                 if (packageName && packageName in lockFileMapping) {