renovate 40.0.0-next.2 → 40.0.0-next.21

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

@@ -125,12 +125,12 @@ export declare const NamedRepo: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
 }, {
     name: z.ZodString;
 }>, "strip", z.ZodTypeAny, {
-    name: string;
     type: "git";
+    name: string;
     url: string;
 }, {
-    name: string;
     type: "git" | "vcs";
+    name: string;
     url: string;
 }>, z.ZodObject<z.objectUtil.extendShape<{
     type: z.ZodLiteral<"path">;
@@ -139,12 +139,12 @@ export declare const NamedRepo: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
 }, {
     name: z.ZodString;
 }>, "strip", z.ZodTypeAny, {
-    name: string;
     type: "path";
+    name: string;
     url: string;
 }, {
-    name: string;
     type: "path";
+    name: string;
     url: string;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"package">;
@@ -181,12 +181,12 @@ export declare const ReposRecord: z.ZodEffects<z.ZodEffects<z.ZodRecord<z.ZodStr
 } | {
     type: "package";
 } | {
-    name: string;
     type: "git";
+    name: string;
     url: string;
 } | {
-    name: string;
     type: "path";
+    name: string;
     url: string;
 } | {
     type: "disable-packagist";
@@ -213,12 +213,12 @@ export declare const ReposArray: z.ZodEffects<z.ZodEffects<z.ZodArray<z.ZodAny,
 } | {
     type: "package";
 } | {
-    name: string;
     type: "git";
+    name: string;
     url: string;
 } | {
-    name: string;
     type: "path";
+    name: string;
     url: string;
 } | {
     type: "disable-packagist";
@@ -243,12 +243,12 @@ export declare const Repos: z.ZodEffects<z.ZodCatch<z.ZodDefault<z.ZodUnion<[z.Z
 } | {
     type: "package";
 } | {
-    name: string;
     type: "git";
+    name: string;
     url: string;
 } | {
-    name: string;
     type: "path";
+    name: string;
     url: string;
 } | {
     type: "disable-packagist";
@@ -273,12 +273,12 @@ export declare const Repos: z.ZodEffects<z.ZodCatch<z.ZodDefault<z.ZodUnion<[z.Z
 } | {
     type: "package";
 } | {
-    name: string;
     type: "git";
+    name: string;
     url: string;
 } | {
-    name: string;
     type: "path";
+    name: string;
     url: string;
 } | {
     type: "disable-packagist";
@@ -334,12 +334,12 @@ export declare const PackageFile: z.ZodEffects<z.ZodObject<{
     } | {
         type: "package";
     } | {
-        name: string;
         type: "git";
+        name: string;
         url: string;
     } | {
-        name: string;
         type: "path";
+        name: string;
         url: string;
     } | {
         type: "disable-packagist";
@@ -364,12 +364,12 @@ export declare const PackageFile: z.ZodEffects<z.ZodObject<{
     } | {
         type: "package";
     } | {
-        name: string;
         type: "git";
+        name: string;
         url: string;
     } | {
-        name: string;
         type: "path";
+        name: string;
         url: string;
     } | {
         type: "disable-packagist";
@@ -389,12 +389,6 @@ export declare const PackageFile: z.ZodEffects<z.ZodObject<{
     require: z.ZodCatch<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodAny>, Record<string, string>, Record<string, any>>>;
     'require-dev': z.ZodCatch<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodAny>, Record<string, string>, Record<string, any>>>;
 }, "strip", z.ZodTypeAny, {
-    require: Record<string, string>;
-    config: {
-        platform: {
-            php: string;
-        };
-    } | null;
     repositories: {
         registryUrls: string[] | null;
         gitRepos: Record<string, {
@@ -408,13 +402,19 @@ export declare const PackageFile: z.ZodEffects<z.ZodObject<{
             name?: string | undefined;
         }>;
     };
+    config: {
+        platform: {
+            php: string;
+        };
+    } | null;
+    require: Record<string, string>;
     'require-dev': Record<string, string>;
     type?: string | undefined;
 }, {
     type?: string | undefined;
-    require?: unknown;
-    config?: unknown;
     repositories?: unknown;
+    config?: unknown;
+    require?: unknown;
     'require-dev'?: unknown;
 }>, {
     composerJsonType: string | undefined;
@@ -440,9 +440,9 @@ export declare const PackageFile: z.ZodEffects<z.ZodObject<{
     requireDev: Record<string, string>;
 }, {
     type?: string | undefined;
-    require?: unknown;
-    config?: unknown;
     repositories?: unknown;
+    config?: unknown;
+    require?: unknown;
     'require-dev'?: unknown;
 }>;
 export type PackageFile = z.infer<typeof PackageFile>;
@@ -541,12 +541,12 @@ export declare const ComposerExtract: z.ZodEffects<z.ZodPipeline<z.ZodEffects<z.
         } | {
             type: "package";
         } | {
-            name: string;
             type: "git";
+            name: string;
             url: string;
         } | {
-            name: string;
             type: "path";
+            name: string;
             url: string;
         } | {
             type: "disable-packagist";
@@ -571,12 +571,12 @@ export declare const ComposerExtract: z.ZodEffects<z.ZodPipeline<z.ZodEffects<z.
         } | {
             type: "package";
         } | {
-            name: string;
             type: "git";
+            name: string;
             url: string;
         } | {
-            name: string;
             type: "path";
+            name: string;
             url: string;
         } | {
             type: "disable-packagist";
@@ -596,12 +596,6 @@ export declare const ComposerExtract: z.ZodEffects<z.ZodPipeline<z.ZodEffects<z.
         require: z.ZodCatch<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodAny>, Record<string, string>, Record<string, any>>>;
         'require-dev': z.ZodCatch<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodAny>, Record<string, string>, Record<string, any>>>;
     }, "strip", z.ZodTypeAny, {
-        require: Record<string, string>;
-        config: {
-            platform: {
-                php: string;
-            };
-        } | null;
         repositories: {
             registryUrls: string[] | null;
             gitRepos: Record<string, {
@@ -615,13 +609,19 @@ export declare const ComposerExtract: z.ZodEffects<z.ZodPipeline<z.ZodEffects<z.
                 name?: string | undefined;
             }>;
         };
+        config: {
+            platform: {
+                php: string;
+            };
+        } | null;
+        require: Record<string, string>;
         'require-dev': Record<string, string>;
         type?: string | undefined;
     }, {
         type?: string | undefined;
-        require?: unknown;
-        config?: unknown;
         repositories?: unknown;
+        config?: unknown;
+        require?: unknown;
         'require-dev'?: unknown;
     }>, {
         composerJsonType: string | undefined;
@@ -647,9 +647,9 @@ export declare const ComposerExtract: z.ZodEffects<z.ZodPipeline<z.ZodEffects<z.
         requireDev: Record<string, string>;
     }, {
         type?: string | undefined;
-        require?: unknown;
-        config?: unknown;
         repositories?: unknown;
+        config?: unknown;
+        require?: unknown;
         'require-dev'?: unknown;
     }>>;
     lockfileName: z.ZodString;

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

@@ -6,7 +6,9 @@ exports.getPhpConstraint = getPhpConstraint;
 exports.requireComposerDependencyInstallation = requireComposerDependencyInstallation;
 exports.extractConstraints = extractConstraints;
 exports.isArtifactAuthEnabled = isArtifactAuthEnabled;
+const tslib_1 = require("tslib");
 // TODO: types (#22198)
+const is_1 = tslib_1.__importDefault(require("@sindresorhus/is"));
 const shlex_1 = require("shlex");
 const global_1 = require("../../../config/global");
 const logger_1 = require("../../../logger");
@@ -18,12 +20,13 @@ function getComposerArguments(config, toolConstraint) {
     let args = '';
     if (config.composerIgnorePlatformReqs) {
         if (config.composerIgnorePlatformReqs.length === 0) {
-            // TODO: toolConstraint.constraint can be null or undefined? (#22198)
-            const major = composer_1.api.getMajor(toolConstraint.constraint);
-            const minor = composer_1.api.getMinor(toolConstraint.constraint);
-            args += composer_1.api.matches(`${major}.${minor}`, '^2.2')
-                ? " --ignore-platform-req='ext-*' --ignore-platform-req='lib-*'"
-                : ' --ignore-platform-reqs';
+            if (is_1.default.string(toolConstraint.constraint) &&
+                composer_1.api.intersects(toolConstraint.constraint, '^2.2')) {
+                args += " --ignore-platform-req='ext-*' --ignore-platform-req='lib-*'";
+            }
+            else {
+                args += ' --ignore-platform-reqs';
+            }
         }
         else {
             config.composerIgnorePlatformReqs.forEach((req) => {

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

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../lib/modules/manager/composer/utils.ts"],"names":[],"mappings":"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","sourcesContent":["// TODO: types (#22198)\nimport { quote } from 'shlex';\nimport { GlobalConfig } from '../../../config/global';\nimport { logger } from '../../../logger';\nimport type { CombinedHostRule } from '../../../types';\nimport type { ToolConstraint } from '../../../util/exec/types';\nimport { coerceNumber } from '../../../util/number';\nimport { api, id as composerVersioningId } from '../../versioning/composer';\nimport type { UpdateArtifactsConfig } from '../types';\nimport type { Lockfile, PackageFile } from './schema';\n\nexport { composerVersioningId };\n\nconst depRequireInstall = new Set(['symfony/flex']);\n\nexport function getComposerArguments(\n  config: UpdateArtifactsConfig,\n  toolConstraint: ToolConstraint,\n): string {\n  let args = '';\n\n  if (config.composerIgnorePlatformReqs) {\n    if (config.composerIgnorePlatformReqs.length === 0) {\n      // TODO: toolConstraint.constraint can be null or undefined? (#22198)\n      const major = api.getMajor(toolConstraint.constraint!);\n      const minor = api.getMinor(toolConstraint.constraint!);\n      args += api.matches(`${major}.${minor}`, '^2.2')\n        ? \" --ignore-platform-req='ext-*' --ignore-platform-req='lib-*'\"\n        : ' --ignore-platform-reqs';\n    } else {\n      config.composerIgnorePlatformReqs.forEach((req) => {\n        args += ' --ignore-platform-req ' + quote(req);\n      });\n    }\n  }\n\n  args += ' --no-ansi --no-interaction';\n  if (!GlobalConfig.get('allowScripts') || config.ignoreScripts) {\n    args += ' --no-scripts --no-autoloader';\n  }\n\n  if (!GlobalConfig.get('allowPlugins') || config.ignorePlugins) {\n    args += ' --no-plugins';\n  }\n\n  return args;\n}\n\nexport function getPhpConstraint(\n  constraints: Record<string, string>,\n): string | null {\n  const { php } = constraints;\n\n  if (php) {\n    logger.debug('Using php constraint from config');\n    return php;\n  }\n\n  return null;\n}\n\nexport function requireComposerDependencyInstallation({\n  packages,\n  packagesDev,\n}: Lockfile): boolean {\n  return (\n    packages.some((p) => depRequireInstall.has(p.name)) === true ||\n    packagesDev.some((p) => depRequireInstall.has(p.name)) === true\n  );\n}\n\nexport function extractConstraints(\n  { config, require, requireDev }: PackageFile,\n  { pluginApiVersion }: Lockfile,\n): Record<string, string> {\n  const res: Record<string, string> = { composer: '1.*' };\n\n  // extract php\n  const phpVersion = config?.platform.php;\n  if (phpVersion) {\n    const major = api.getMajor(phpVersion);\n    const minor = coerceNumber(api.getMinor(phpVersion));\n    const patch = coerceNumber(api.getPatch(phpVersion));\n    res.php = `<=${major}.${minor}.${patch}`;\n  } else if (require.php) {\n    res.php = require.php;\n  }\n\n  // extract direct composer dependency\n  if (require['composer/composer']) {\n    res.composer = require['composer/composer'];\n  } else if (requireDev['composer/composer']) {\n    res.composer = requireDev['composer/composer'];\n  }\n  // composer platform package\n  else if (require.composer) {\n    res.composer = require.composer;\n  } else if (requireDev.composer) {\n    res.composer = requireDev.composer;\n  }\n  // check last used composer version\n  else if (pluginApiVersion) {\n    const major = api.getMajor(pluginApiVersion);\n    const minor = api.getMinor(pluginApiVersion);\n    res.composer = `^${major}.${minor}`;\n  }\n  // check composer api dependency\n  else if (require['composer-runtime-api']) {\n    const major = api.getMajor(require['composer-runtime-api']);\n    const minor = api.getMinor(require['composer-runtime-api']);\n    res.composer = `^${major}.${minor}`;\n  }\n  return res;\n}\n\nexport function isArtifactAuthEnabled(rule: CombinedHostRule): boolean {\n  return !rule.artifactAuth || rule.artifactAuth.includes('composer');\n}\n"]}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../lib/modules/manager/composer/utils.ts"],"names":[],"mappings":"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","sourcesContent":["// TODO: types (#22198)\nimport is from '@sindresorhus/is';\nimport { quote } from 'shlex';\nimport { GlobalConfig } from '../../../config/global';\nimport { logger } from '../../../logger';\nimport type { CombinedHostRule } from '../../../types';\nimport type { ToolConstraint } from '../../../util/exec/types';\nimport { coerceNumber } from '../../../util/number';\nimport { api, id as composerVersioningId } from '../../versioning/composer';\nimport type { UpdateArtifactsConfig } from '../types';\nimport type { Lockfile, PackageFile } from './schema';\n\nexport { composerVersioningId };\n\nconst depRequireInstall = new Set(['symfony/flex']);\n\nexport function getComposerArguments(\n  config: UpdateArtifactsConfig,\n  toolConstraint: ToolConstraint,\n): string {\n  let args = '';\n\n  if (config.composerIgnorePlatformReqs) {\n    if (config.composerIgnorePlatformReqs.length === 0) {\n      if (\n        is.string(toolConstraint.constraint) &&\n        api.intersects!(toolConstraint.constraint, '^2.2')\n      ) {\n        args += \" --ignore-platform-req='ext-*' --ignore-platform-req='lib-*'\";\n      } else {\n        args += ' --ignore-platform-reqs';\n      }\n    } else {\n      config.composerIgnorePlatformReqs.forEach((req) => {\n        args += ' --ignore-platform-req ' + quote(req);\n      });\n    }\n  }\n\n  args += ' --no-ansi --no-interaction';\n  if (!GlobalConfig.get('allowScripts') || config.ignoreScripts) {\n    args += ' --no-scripts --no-autoloader';\n  }\n\n  if (!GlobalConfig.get('allowPlugins') || config.ignorePlugins) {\n    args += ' --no-plugins';\n  }\n\n  return args;\n}\n\nexport function getPhpConstraint(\n  constraints: Record<string, string>,\n): string | null {\n  const { php } = constraints;\n\n  if (php) {\n    logger.debug('Using php constraint from config');\n    return php;\n  }\n\n  return null;\n}\n\nexport function requireComposerDependencyInstallation({\n  packages,\n  packagesDev,\n}: Lockfile): boolean {\n  return (\n    packages.some((p) => depRequireInstall.has(p.name)) === true ||\n    packagesDev.some((p) => depRequireInstall.has(p.name)) === true\n  );\n}\n\nexport function extractConstraints(\n  { config, require, requireDev }: PackageFile,\n  { pluginApiVersion }: Lockfile,\n): Record<string, string> {\n  const res: Record<string, string> = { composer: '1.*' };\n\n  // extract php\n  const phpVersion = config?.platform.php;\n  if (phpVersion) {\n    const major = api.getMajor(phpVersion);\n    const minor = coerceNumber(api.getMinor(phpVersion));\n    const patch = coerceNumber(api.getPatch(phpVersion));\n    res.php = `<=${major}.${minor}.${patch}`;\n  } else if (require.php) {\n    res.php = require.php;\n  }\n\n  // extract direct composer dependency\n  if (require['composer/composer']) {\n    res.composer = require['composer/composer'];\n  } else if (requireDev['composer/composer']) {\n    res.composer = requireDev['composer/composer'];\n  }\n  // composer platform package\n  else if (require.composer) {\n    res.composer = require.composer;\n  } else if (requireDev.composer) {\n    res.composer = requireDev.composer;\n  }\n  // check last used composer version\n  else if (pluginApiVersion) {\n    const major = api.getMajor(pluginApiVersion);\n    const minor = api.getMinor(pluginApiVersion);\n    res.composer = `^${major}.${minor}`;\n  }\n  // check composer api dependency\n  else if (require['composer-runtime-api']) {\n    const major = api.getMajor(require['composer-runtime-api']);\n    const minor = api.getMinor(require['composer-runtime-api']);\n    res.composer = `^${major}.${minor}`;\n  }\n  return res;\n}\n\nexport function isArtifactAuthEnabled(rule: CombinedHostRule): boolean {\n  return !rule.artifactAuth || rule.artifactAuth.includes('composer');\n}\n"]}

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

@@ -10,14 +10,14 @@ export declare const XPKGSchema: z.ZodObject<{
         package: string;
     }>;
 }, "strip", z.ZodTypeAny, {
-    kind: "Function" | "Provider" | "Configuration";
     apiVersion: string;
+    kind: "Provider" | "Configuration" | "Function";
     spec: {
         package: string;
     };
 }, {
-    kind: "Function" | "Provider" | "Configuration";
     apiVersion: string;
+    kind: "Provider" | "Configuration" | "Function";
     spec: {
         package: string;
     };

package/dist/modules/manager/custom/jsonata/index.js

@@ -6,6 +6,7 @@ const tslib_1 = require("tslib");
 const is_1 = tslib_1.__importDefault(require("@sindresorhus/is"));
 const logger_1 = require("../../../../logger");
 const common_1 = require("../../../../util/common");
+const toml_1 = require("../../../../util/toml");
 const yaml_1 = require("../../../../util/yaml");
 const utils_1 = require("../utils");
 const utils_2 = require("./utils");
@@ -25,6 +26,9 @@ async function extractPackageFile(content, packageFile, config) {
             case 'yaml':
                 json = (0, yaml_1.parseYaml)(content);
                 break;
+            case 'toml':
+                json = (0, toml_1.parse)(content);
+                break;
         }
     }
     catch (err) {

package/dist/modules/manager/custom/jsonata/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../lib/modules/manager/custom/jsonata/index.ts"],"names":[],"mappings":";;;AAkBA,gDAgDC;;AAlED,kEAAkC;AAElC,+CAA4C;AAC5C,oDAAoD;AACpD,gDAAkD;AAElD,oCAA4C;AAE5C,mCAAyC;AAE5B,QAAA,UAAU,GAAe,CAAC,QAAQ,CAAC,CAAC;AAEpC,QAAA,aAAa,GAAG;IAC3B,UAAU,EAAE,KAAK;CAClB,CAAC;AACW,QAAA,oBAAoB,GAAG,CAAC,GAAG,CAAC,CAAC;AAC7B,QAAA,WAAW,GAAG,SAAS,CAAC;AAE9B,KAAK,UAAU,kBAAkB,CACtC,OAAe,EACf,WAAmB,EACnB,MAA4B;IAE5B,IAAI,IAAa,CAAC;IAClB,IAAI,CAAC;QACH,QAAQ,MAAM,CAAC,UAAU,EAAE,CAAC;YAC1B,KAAK,MAAM;gBACT,IAAI,GAAG,IAAA,kBAAS,EAAC,OAAO,EAAE,WAAW,CAAC,CAAC;gBACvC,MAAM;YACR,KAAK,MAAM;gBACT,IAAI,GAAG,IAAA,gBAAS,EAAC,OAAO,CAAC,CAAC;gBAC1B,MAAM;QACV,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,eAAM,CAAC,KAAK,CACV,EAAE,GAAG,EAAE,QAAQ,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,EAC7D,0BAA0B,CAC3B,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,YAAE,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC;QAC7B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,IAAA,sBAAc,EAAC,IAAI,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;IAC7D,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACjB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,GAAG,GAAiD;QACxD,IAAI;QACJ,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,UAAU,EAAE,MAAM,CAAC,UAAU;KAC9B,CAAC;IAEF,sCAAsC;IACtC,KAAK,MAAM,KAAK,IAAI,wBAAgB,CAAC,GAAG,CACtC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,UAA2C,CACvD,EAAE,CAAC;QACF,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;YAClB,GAAG,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC","sourcesContent":["import is from '@sindresorhus/is';\nimport type { Category } from '../../../../constants';\nimport { logger } from '../../../../logger';\nimport { parseJson } from '../../../../util/common';\nimport { parseYaml } from '../../../../util/yaml';\nimport type { PackageFileContent } from '../../types';\nimport { validMatchFields } from '../utils';\nimport type { JSONataManagerTemplates, JsonataExtractConfig } from './types';\nimport { handleMatching } from './utils';\n\nexport const categories: Category[] = ['custom'];\n\nexport const defaultConfig = {\n  pinDigests: false,\n};\nexport const supportedDatasources = ['*'];\nexport const displayName = 'JSONata';\n\nexport async function extractPackageFile(\n  content: string,\n  packageFile: string,\n  config: JsonataExtractConfig,\n): Promise<PackageFileContent | null> {\n  let json: unknown;\n  try {\n    switch (config.fileFormat) {\n      case 'json':\n        json = parseJson(content, packageFile);\n        break;\n      case 'yaml':\n        json = parseYaml(content);\n        break;\n    }\n  } catch (err) {\n    logger.debug(\n      { err, fileName: packageFile, fileFormat: config.fileFormat },\n      'Error while parsing file',\n    );\n    return null;\n  }\n\n  if (is.nullOrUndefined(json)) {\n    return null;\n  }\n\n  const deps = await handleMatching(json, packageFile, config);\n  if (!deps.length) {\n    return null;\n  }\n\n  const res: PackageFileContent & JSONataManagerTemplates = {\n    deps,\n    matchStrings: config.matchStrings,\n    fileFormat: config.fileFormat,\n  };\n\n  // copy over templates for autoreplace\n  for (const field of validMatchFields.map(\n    (f) => `${f}Template` as keyof JSONataManagerTemplates,\n  )) {\n    if (config[field]) {\n      res[field] = config[field];\n    }\n  }\n\n  return res;\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../lib/modules/manager/custom/jsonata/index.ts"],"names":[],"mappings":";;;AAmBA,gDAmDC;;AAtED,kEAAkC;AAElC,+CAA4C;AAC5C,oDAAoD;AACpD,gDAA2D;AAC3D,gDAAkD;AAElD,oCAA4C;AAE5C,mCAAyC;AAE5B,QAAA,UAAU,GAAe,CAAC,QAAQ,CAAC,CAAC;AAEpC,QAAA,aAAa,GAAG;IAC3B,UAAU,EAAE,KAAK;CAClB,CAAC;AACW,QAAA,oBAAoB,GAAG,CAAC,GAAG,CAAC,CAAC;AAC7B,QAAA,WAAW,GAAG,SAAS,CAAC;AAE9B,KAAK,UAAU,kBAAkB,CACtC,OAAe,EACf,WAAmB,EACnB,MAA4B;IAE5B,IAAI,IAAa,CAAC;IAClB,IAAI,CAAC;QACH,QAAQ,MAAM,CAAC,UAAU,EAAE,CAAC;YAC1B,KAAK,MAAM;gBACT,IAAI,GAAG,IAAA,kBAAS,EAAC,OAAO,EAAE,WAAW,CAAC,CAAC;gBACvC,MAAM;YACR,KAAK,MAAM;gBACT,IAAI,GAAG,IAAA,gBAAS,EAAC,OAAO,CAAC,CAAC;gBAC1B,MAAM;YACR,KAAK,MAAM;gBACT,IAAI,GAAG,IAAA,YAAS,EAAC,OAAO,CAAC,CAAC;gBAC1B,MAAM;QACV,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,eAAM,CAAC,KAAK,CACV,EAAE,GAAG,EAAE,QAAQ,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,EAC7D,0BAA0B,CAC3B,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,YAAE,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC;QAC7B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,IAAA,sBAAc,EAAC,IAAI,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;IAC7D,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACjB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,GAAG,GAAiD;QACxD,IAAI;QACJ,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,UAAU,EAAE,MAAM,CAAC,UAAU;KAC9B,CAAC;IAEF,sCAAsC;IACtC,KAAK,MAAM,KAAK,IAAI,wBAAgB,CAAC,GAAG,CACtC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,UAA2C,CACvD,EAAE,CAAC;QACF,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;YAClB,GAAG,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC","sourcesContent":["import is from '@sindresorhus/is';\nimport type { Category } from '../../../../constants';\nimport { logger } from '../../../../logger';\nimport { parseJson } from '../../../../util/common';\nimport { parse as parseToml } from '../../../../util/toml';\nimport { parseYaml } from '../../../../util/yaml';\nimport type { PackageFileContent } from '../../types';\nimport { validMatchFields } from '../utils';\nimport type { JSONataManagerTemplates, JsonataExtractConfig } from './types';\nimport { handleMatching } from './utils';\n\nexport const categories: Category[] = ['custom'];\n\nexport const defaultConfig = {\n  pinDigests: false,\n};\nexport const supportedDatasources = ['*'];\nexport const displayName = 'JSONata';\n\nexport async function extractPackageFile(\n  content: string,\n  packageFile: string,\n  config: JsonataExtractConfig,\n): Promise<PackageFileContent | null> {\n  let json: unknown;\n  try {\n    switch (config.fileFormat) {\n      case 'json':\n        json = parseJson(content, packageFile);\n        break;\n      case 'yaml':\n        json = parseYaml(content);\n        break;\n      case 'toml':\n        json = parseToml(content);\n        break;\n    }\n  } catch (err) {\n    logger.debug(\n      { err, fileName: packageFile, fileFormat: config.fileFormat },\n      'Error while parsing file',\n    );\n    return null;\n  }\n\n  if (is.nullOrUndefined(json)) {\n    return null;\n  }\n\n  const deps = await handleMatching(json, packageFile, config);\n  if (!deps.length) {\n    return null;\n  }\n\n  const res: PackageFileContent & JSONataManagerTemplates = {\n    deps,\n    matchStrings: config.matchStrings,\n    fileFormat: config.fileFormat,\n  };\n\n  // copy over templates for autoreplace\n  for (const field of validMatchFields.map(\n    (f) => `${f}Template` as keyof JSONataManagerTemplates,\n  )) {\n    if (config[field]) {\n      res[field] = config[field];\n    }\n  }\n\n  return res;\n}\n"]}

package/dist/modules/manager/custom/jsonata/schema.d.ts

@@ -11,10 +11,10 @@ export declare const QueryResultZodSchema: z.ZodEffects<z.ZodUnion<[z.ZodArray<z
     extractVersion: z.ZodOptional<z.ZodString>;
     indentation: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
-    datasource?: string | undefined;
     currentValue?: string | undefined;
     depName?: string | undefined;
     depType?: string | undefined;
+    datasource?: string | undefined;
     currentDigest?: string | undefined;
     packageName?: string | undefined;
     versioning?: string | undefined;
@@ -22,10 +22,10 @@ export declare const QueryResultZodSchema: z.ZodEffects<z.ZodUnion<[z.ZodArray<z
     indentation?: string | undefined;
     registryUrl?: string | undefined;
 }, {
-    datasource?: string | undefined;
     currentValue?: string | undefined;
     depName?: string | undefined;
     depType?: string | undefined;
+    datasource?: string | undefined;
     currentDigest?: string | undefined;
     packageName?: string | undefined;
     versioning?: string | undefined;
@@ -44,10 +44,10 @@ export declare const QueryResultZodSchema: z.ZodEffects<z.ZodUnion<[z.ZodArray<z
     extractVersion: z.ZodOptional<z.ZodString>;
     indentation: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
-    datasource?: string | undefined;
     currentValue?: string | undefined;
     depName?: string | undefined;
     depType?: string | undefined;
+    datasource?: string | undefined;
     currentDigest?: string | undefined;
     packageName?: string | undefined;
     versioning?: string | undefined;
@@ -55,10 +55,10 @@ export declare const QueryResultZodSchema: z.ZodEffects<z.ZodUnion<[z.ZodArray<z
     indentation?: string | undefined;
     registryUrl?: string | undefined;
 }, {
-    datasource?: string | undefined;
     currentValue?: string | undefined;
     depName?: string | undefined;
     depType?: string | undefined;
+    datasource?: string | undefined;
     currentDigest?: string | undefined;
     packageName?: string | undefined;
     versioning?: string | undefined;
@@ -66,10 +66,10 @@ export declare const QueryResultZodSchema: z.ZodEffects<z.ZodUnion<[z.ZodArray<z
     indentation?: string | undefined;
     registryUrl?: string | undefined;
 }>]>, {
-    datasource?: string | undefined;
     currentValue?: string | undefined;
     depName?: string | undefined;
     depType?: string | undefined;
+    datasource?: string | undefined;
     currentDigest?: string | undefined;
     packageName?: string | undefined;
     versioning?: string | undefined;
@@ -77,10 +77,10 @@ export declare const QueryResultZodSchema: z.ZodEffects<z.ZodUnion<[z.ZodArray<z
     indentation?: string | undefined;
     registryUrl?: string | undefined;
 }[], {
-    datasource?: string | undefined;
     currentValue?: string | undefined;
     depName?: string | undefined;
     depType?: string | undefined;
+    datasource?: string | undefined;
     currentDigest?: string | undefined;
     packageName?: string | undefined;
     versioning?: string | undefined;
@@ -88,10 +88,10 @@ export declare const QueryResultZodSchema: z.ZodEffects<z.ZodUnion<[z.ZodArray<z
     indentation?: string | undefined;
     registryUrl?: string | undefined;
 } | {
-    datasource?: string | undefined;
     currentValue?: string | undefined;
     depName?: string | undefined;
     depType?: string | undefined;
+    datasource?: string | undefined;
     currentDigest?: string | undefined;
     packageName?: string | undefined;
     versioning?: string | undefined;

package/dist/modules/manager/devbox/artifacts.d.ts

@@ -1,2 +1,2 @@
 import type { UpdateArtifact, UpdateArtifactsResult } from '../types';
-export declare function updateArtifacts(updateConfig: UpdateArtifact): Promise<UpdateArtifactsResult[] | null>;
+export declare function updateArtifacts({ config: { constraints, env, isLockFileMaintenance, updateType }, packageFileName, updatedDeps, }: UpdateArtifact): Promise<UpdateArtifactsResult[] | null>;

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

@@ -3,34 +3,52 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateArtifacts = updateArtifacts;
 const tslib_1 = require("tslib");
 const is_1 = tslib_1.__importDefault(require("@sindresorhus/is"));
+const semver_1 = tslib_1.__importDefault(require("semver"));
+const shlex_1 = require("shlex");
 const logger_1 = require("../../../logger");
 const exec_1 = require("../../../util/exec");
 const fs_1 = require("../../../util/fs");
-async function updateArtifacts(updateConfig) {
-    const lockFileName = (0, fs_1.getSiblingFileName)(updateConfig.packageFileName, 'devbox.lock');
+async function updateArtifacts({ config: { constraints, env, isLockFileMaintenance, updateType }, packageFileName, updatedDeps, }) {
+    const lockFileName = (0, fs_1.getSiblingFileName)(packageFileName, 'devbox.lock');
     const existingLockFileContent = await (0, fs_1.readLocalFile)(lockFileName, 'utf8');
     if (!existingLockFileContent) {
         logger_1.logger.debug('No devbox.lock found');
         return null;
     }
+    const supportsNoInstall = constraints?.devbox
+        ? semver_1.default.intersects(constraints.devbox, '>=0.14.0')
+        : true;
     const execOptions = {
-        cwdFile: updateConfig.packageFileName,
+        cwdFile: packageFileName,
         toolConstraints: [
             {
                 toolName: 'devbox',
-                constraint: updateConfig.config.constraints?.devbox,
+                constraint: constraints?.devbox,
             },
         ],
         docker: {},
-        userConfiguredEnv: updateConfig.config.env,
+        userConfiguredEnv: env,
     };
-    let cmd = '';
-    if (updateConfig.config.isLockFileMaintenance ||
-        updateConfig.config.updateType === 'lockFileMaintenance') {
-        cmd += 'devbox update';
+    const cmd = [];
+    if (isLockFileMaintenance) {
+        cmd.push(supportsNoInstall ? 'devbox update --no-install' : 'devbox update');
     }
-    else if (is_1.default.nonEmptyArray(updateConfig.updatedDeps)) {
-        cmd += 'devbox install';
+    else if (is_1.default.nonEmptyArray(updatedDeps)) {
+        if (supportsNoInstall) {
+            const updateCommands = updatedDeps
+                .map((dep) => dep.depName && `devbox update ${(0, shlex_1.quote)(dep.depName)} --no-install`)
+                .filter((dep) => Boolean(dep));
+            if (updateCommands.length) {
+                cmd.push(...updateCommands);
+            }
+            else {
+                logger_1.logger.trace('No updated devbox packages - returning null');
+                return null;
+            }
+        }
+        else {
+            cmd.push('devbox install');
+        }
     }
     else {
         logger_1.logger.trace('No updated devbox packages - returning null');

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

@@ -1 +1 @@
-{"version":3,"file":"artifacts.js","sourceRoot":"","sources":["../../../../lib/modules/manager/devbox/artifacts.ts"],"names":[],"mappings":";;AAOA,0CA0EC;;AAjFD,kEAAkC;AAClC,4CAAyC;AACzC,6CAA0C;AAE1C,yCAAqE;AAG9D,KAAK,UAAU,eAAe,CACnC,YAA4B;IAE5B,MAAM,YAAY,GAAG,IAAA,uBAAkB,EACrC,YAAY,CAAC,eAAe,EAC5B,aAAa,CACd,CAAC;IACF,MAAM,uBAAuB,GAAG,MAAM,IAAA,kBAAa,EAAC,YAAY,EAAE,MAAM,CAAC,CAAC;IAC1E,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAC7B,eAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;QACrC,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,WAAW,GAAgB;QAC/B,OAAO,EAAE,YAAY,CAAC,eAAe;QACrC,eAAe,EAAE;YACf;gBACE,QAAQ,EAAE,QAAQ;gBAClB,UAAU,EAAE,YAAY,CAAC,MAAM,CAAC,WAAW,EAAE,MAAM;aACpD;SACF;QACD,MAAM,EAAE,EAAE;QACV,iBAAiB,EAAE,YAAY,CAAC,MAAM,CAAC,GAAG;KAC3C,CAAC;IAEF,IAAI,GAAG,GAAG,EAAE,CAAC;IACb,IACE,YAAY,CAAC,MAAM,CAAC,qBAAqB;QACzC,YAAY,CAAC,MAAM,CAAC,UAAU,KAAK,qBAAqB,EACxD,CAAC;QACD,GAAG,IAAI,eAAe,CAAC;IACzB,CAAC;SAAM,IAAI,YAAE,CAAC,aAAa,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE,CAAC;QACtD,GAAG,IAAI,gBAAgB,CAAC;IAC1B,CAAC;SAAM,CAAC;QACN,eAAM,CAAC,KAAK,CAAC,6CAA6C,CAAC,CAAC;QAC5D,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,kBAAkB,GAAG,MAAM,IAAA,kBAAa,EAAC,YAAY,CAAC,CAAC;IAC7D,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxB,eAAM,CAAC,KAAK,CAAC,MAAM,YAAY,QAAQ,CAAC,CAAC;QACzC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,CAAC;QACH,MAAM,IAAA,WAAI,EAAC,GAAG,EAAE,WAAW,CAAC,CAAC;QAC7B,MAAM,kBAAkB,GAAG,MAAM,IAAA,kBAAa,EAAC,YAAY,CAAC,CAAC;QAE7D,IACE,CAAC,kBAAkB;YACnB,MAAM,CAAC,OAAO,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,KAAK,CAAC,EAC5D,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QACD,eAAM,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC;QAC9C,OAAO;YACL;gBACE,IAAI,EAAE;oBACJ,IAAI,EAAE,UAAU;oBAChB,IAAI,EAAE,YAAY;oBAClB,QAAQ,EAAE,kBAAkB;iBAC7B;aACF;SACF,CAAC;IACJ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,eAAM,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,4BAA4B,CAAC,CAAC;QACnD,OAAO;YACL;gBACE,aAAa,EAAE;oBACb,QAAQ,EAAE,YAAY;oBACtB,MAAM,EAAE,GAAG,CAAC,OAAO;iBACpB;aACF;SACF,CAAC;IACJ,CAAC;AACH,CAAC","sourcesContent":["import is from '@sindresorhus/is';\nimport { logger } from '../../../logger';\nimport { exec } from '../../../util/exec';\nimport type { ExecOptions } from '../../../util/exec/types';\nimport { getSiblingFileName, readLocalFile } from '../../../util/fs';\nimport type { UpdateArtifact, UpdateArtifactsResult } from '../types';\n\nexport async function updateArtifacts(\n  updateConfig: UpdateArtifact,\n): Promise<UpdateArtifactsResult[] | null> {\n  const lockFileName = getSiblingFileName(\n    updateConfig.packageFileName,\n    'devbox.lock',\n  );\n  const existingLockFileContent = await readLocalFile(lockFileName, 'utf8');\n  if (!existingLockFileContent) {\n    logger.debug('No devbox.lock found');\n    return null;\n  }\n  const execOptions: ExecOptions = {\n    cwdFile: updateConfig.packageFileName,\n    toolConstraints: [\n      {\n        toolName: 'devbox',\n        constraint: updateConfig.config.constraints?.devbox,\n      },\n    ],\n    docker: {},\n    userConfiguredEnv: updateConfig.config.env,\n  };\n\n  let cmd = '';\n  if (\n    updateConfig.config.isLockFileMaintenance ||\n    updateConfig.config.updateType === 'lockFileMaintenance'\n  ) {\n    cmd += 'devbox update';\n  } else if (is.nonEmptyArray(updateConfig.updatedDeps)) {\n    cmd += 'devbox install';\n  } else {\n    logger.trace('No updated devbox packages - returning null');\n    return null;\n  }\n\n  const oldLockFileContent = await readLocalFile(lockFileName);\n  if (!oldLockFileContent) {\n    logger.trace(`No ${lockFileName} found`);\n    return null;\n  }\n\n  try {\n    await exec(cmd, execOptions);\n    const newLockFileContent = await readLocalFile(lockFileName);\n\n    if (\n      !newLockFileContent ||\n      Buffer.compare(oldLockFileContent, newLockFileContent) === 0\n    ) {\n      return null;\n    }\n    logger.trace('Returning updated devbox.lock');\n    return [\n      {\n        file: {\n          type: 'addition',\n          path: lockFileName,\n          contents: newLockFileContent,\n        },\n      },\n    ];\n  } catch (err) {\n    logger.warn({ err }, 'Error updating devbox.lock');\n    return [\n      {\n        artifactError: {\n          lockFile: lockFileName,\n          stderr: err.message,\n        },\n      },\n    ];\n  }\n}\n"]}
+{"version":3,"file":"artifacts.js","sourceRoot":"","sources":["../../../../lib/modules/manager/devbox/artifacts.ts"],"names":[],"mappings":"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","sourcesContent":["import is from '@sindresorhus/is';\nimport semver from 'semver';\nimport { quote } from 'shlex';\nimport { logger } from '../../../logger';\nimport { exec } from '../../../util/exec';\nimport type { ExecOptions } from '../../../util/exec/types';\nimport { getSiblingFileName, readLocalFile } from '../../../util/fs';\nimport type { UpdateArtifact, UpdateArtifactsResult } from '../types';\n\nexport async function updateArtifacts({\n  config: { constraints, env, isLockFileMaintenance, updateType },\n  packageFileName,\n  updatedDeps,\n}: UpdateArtifact): Promise<UpdateArtifactsResult[] | null> {\n  const lockFileName = getSiblingFileName(packageFileName, 'devbox.lock');\n  const existingLockFileContent = await readLocalFile(lockFileName, 'utf8');\n  if (!existingLockFileContent) {\n    logger.debug('No devbox.lock found');\n    return null;\n  }\n\n  const supportsNoInstall = constraints?.devbox\n    ? semver.intersects(constraints.devbox, '>=0.14.0')\n    : true;\n\n  const execOptions: ExecOptions = {\n    cwdFile: packageFileName,\n    toolConstraints: [\n      {\n        toolName: 'devbox',\n        constraint: constraints?.devbox,\n      },\n    ],\n    docker: {},\n    userConfiguredEnv: env,\n  };\n\n  const cmd = [];\n  if (isLockFileMaintenance) {\n    cmd.push(\n      supportsNoInstall ? 'devbox update --no-install' : 'devbox update',\n    );\n  } else if (is.nonEmptyArray(updatedDeps)) {\n    if (supportsNoInstall) {\n      const updateCommands: string[] = updatedDeps\n        .map(\n          (dep) =>\n            dep.depName && `devbox update ${quote(dep.depName)} --no-install`,\n        )\n        .filter((dep): dep is string => Boolean(dep));\n      if (updateCommands.length) {\n        cmd.push(...updateCommands);\n      } else {\n        logger.trace('No updated devbox packages - returning null');\n        return null;\n      }\n    } else {\n      cmd.push('devbox install');\n    }\n  } else {\n    logger.trace('No updated devbox packages - returning null');\n    return null;\n  }\n\n  const oldLockFileContent = await readLocalFile(lockFileName);\n  if (!oldLockFileContent) {\n    logger.trace(`No ${lockFileName} found`);\n    return null;\n  }\n\n  try {\n    await exec(cmd, execOptions);\n    const newLockFileContent = await readLocalFile(lockFileName);\n\n    if (\n      !newLockFileContent ||\n      Buffer.compare(oldLockFileContent, newLockFileContent) === 0\n    ) {\n      return null;\n    }\n    logger.trace('Returning updated devbox.lock');\n    return [\n      {\n        file: {\n          type: 'addition',\n          path: lockFileName,\n          contents: newLockFileContent,\n        },\n      },\n    ];\n  } catch (err) {\n    logger.warn({ err }, 'Error updating devbox.lock');\n    return [\n      {\n        artifactError: {\n          lockFile: lockFileName,\n          stderr: err.message,\n        },\n      },\n    ];\n  }\n}\n"]}