renovate 40.0.0-next.3 → 40.0.0-next.30

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

@@ -12,26 +12,26 @@ export declare const QueryResultZodSchema: z.ZodEffects<z.ZodUnion<[z.ZodArray<z
     indentation: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
     datasource?: string | undefined;
+    registryUrl?: string | undefined;
+    packageName?: string | undefined;
     currentValue?: string | undefined;
     depName?: string | undefined;
-    depType?: string | undefined;
     currentDigest?: string | undefined;
-    packageName?: string | undefined;
+    depType?: string | undefined;
     versioning?: string | undefined;
     extractVersion?: string | undefined;
     indentation?: string | undefined;
-    registryUrl?: string | undefined;
 }, {
     datasource?: string | undefined;
+    registryUrl?: string | undefined;
+    packageName?: string | undefined;
     currentValue?: string | undefined;
     depName?: string | undefined;
-    depType?: string | undefined;
     currentDigest?: string | undefined;
-    packageName?: string | undefined;
+    depType?: string | undefined;
     versioning?: string | undefined;
     extractVersion?: string | undefined;
     indentation?: string | undefined;
-    registryUrl?: string | undefined;
 }>, "many">, z.ZodObject<{
     currentValue: z.ZodOptional<z.ZodString>;
     datasource: z.ZodOptional<z.ZodString>;
@@ -45,57 +45,57 @@ export declare const QueryResultZodSchema: z.ZodEffects<z.ZodUnion<[z.ZodArray<z
     indentation: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
     datasource?: string | undefined;
+    registryUrl?: string | undefined;
+    packageName?: string | undefined;
     currentValue?: string | undefined;
     depName?: string | undefined;
-    depType?: string | undefined;
     currentDigest?: string | undefined;
-    packageName?: string | undefined;
+    depType?: string | undefined;
     versioning?: string | undefined;
     extractVersion?: string | undefined;
     indentation?: string | undefined;
-    registryUrl?: string | undefined;
 }, {
     datasource?: string | undefined;
+    registryUrl?: string | undefined;
+    packageName?: string | undefined;
     currentValue?: string | undefined;
     depName?: string | undefined;
-    depType?: string | undefined;
     currentDigest?: string | undefined;
-    packageName?: string | undefined;
+    depType?: string | undefined;
     versioning?: string | undefined;
     extractVersion?: string | undefined;
     indentation?: string | undefined;
-    registryUrl?: string | undefined;
 }>]>, {
     datasource?: string | undefined;
+    registryUrl?: string | undefined;
+    packageName?: string | undefined;
     currentValue?: string | undefined;
     depName?: string | undefined;
-    depType?: string | undefined;
     currentDigest?: string | undefined;
-    packageName?: string | undefined;
+    depType?: string | undefined;
     versioning?: string | undefined;
     extractVersion?: string | undefined;
     indentation?: string | undefined;
-    registryUrl?: string | undefined;
 }[], {
     datasource?: string | undefined;
+    registryUrl?: string | undefined;
+    packageName?: string | undefined;
     currentValue?: string | undefined;
     depName?: string | undefined;
-    depType?: string | undefined;
     currentDigest?: string | undefined;
-    packageName?: string | undefined;
+    depType?: string | undefined;
     versioning?: string | undefined;
     extractVersion?: string | undefined;
     indentation?: string | undefined;
-    registryUrl?: string | undefined;
 } | {
     datasource?: string | undefined;
+    registryUrl?: string | undefined;
+    packageName?: string | undefined;
     currentValue?: string | undefined;
     depName?: string | undefined;
-    depType?: string | undefined;
     currentDigest?: string | undefined;
-    packageName?: string | undefined;
+    depType?: string | undefined;
     versioning?: string | undefined;
     extractVersion?: string | undefined;
     indentation?: string | undefined;
-    registryUrl?: string | undefined;
 }[]>;

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

@@ -4,6 +4,7 @@ exports.displayName = exports.supportedDatasources = exports.defaultConfig = exp
 exports.extractPackageFile = extractPackageFile;
 const tslib_1 = require("tslib");
 const is_1 = tslib_1.__importDefault(require("@sindresorhus/is"));
+const logger_1 = require("../../../../logger");
 const utils_1 = require("../utils");
 const strategies_1 = require("./strategies");
 exports.categories = ['custom'];
@@ -47,6 +48,7 @@ function extractPackageFile(content, packageFile, config) {
         }
         return res;
     }
+    logger_1.logger.debug({ packageFile }, 'No dependencies found in file for custom regex manager');
     return null;
 }
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../lib/modules/manager/custom/regex/index.ts"],"names":[],"mappings":";;;AAoBA,gDAoDC;;AAxED,kEAAkC;AAQlC,oCAA4C;AAC5C,6CAA6E;AAGhE,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,OAAO,CAAC;AAEnC,SAAgB,kBAAkB,CAChC,OAAe,EACf,WAAmB,EACnB,MAAqB;IAErB,IAAI,IAAyB,CAAC;IAC9B,QAAQ,MAAM,CAAC,oBAAoB,EAAE,CAAC;QACpC,QAAQ;QACR,KAAK,KAAK;YACR,IAAI,GAAG,IAAA,sBAAS,EAAC,OAAO,EAAE,WAAW,EAAE,MAA4B,CAAC,CAAC;YACrE,MAAM;QACR,KAAK,aAAa;YAChB,IAAI,GAAG,IAAA,8BAAiB,EACtB,OAAO,EACP,WAAW,EACX,MAA4B,CAC7B,CAAC;YACF,MAAM;QACR,KAAK,WAAW;YACd,IAAI,GAAG,IAAA,4BAAe,EACpB,OAAO,EACP,WAAW,EACX,MAA4B,CAC7B,CAAC;YACF,MAAM;IACV,CAAC;IAED,yBAAyB;IACzB,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,YAAE,CAAC,MAAM,CAAC,CAAC;IAC9B,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;QAChB,MAAM,GAAG,GAA+C;YACtD,IAAI;YACJ,YAAY,EAAE,MAAM,CAAC,YAAY;SAClC,CAAC;QACF,IAAI,MAAM,CAAC,oBAAoB,EAAE,CAAC;YAChC,GAAG,CAAC,oBAAoB,GAAG,MAAM,CAAC,oBAAoB,CAAC;QACzD,CAAC;QACD,sCAAsC;QACtC,KAAK,MAAM,KAAK,IAAI,wBAAgB,CAAC,GAAG,CACtC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,UAAyC,CACrD,EAAE,CAAC;YACF,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;gBAClB,GAAG,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;YAC7B,CAAC;QACH,CAAC;QACD,IAAI,MAAM,CAAC,yBAAyB,EAAE,CAAC;YACrC,GAAG,CAAC,yBAAyB,GAAG,MAAM,CAAC,yBAAyB,CAAC;QACnE,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC","sourcesContent":["import is from '@sindresorhus/is';\nimport type { Category } from '../../../../constants';\nimport type {\n  ExtractConfig,\n  MaybePromise,\n  PackageDependency,\n  PackageFileContent,\n} from '../../types';\nimport { validMatchFields } from '../utils';\nimport { handleAny, handleCombination, handleRecursive } from './strategies';\nimport type { RegexManagerConfig, RegexManagerTemplates } from './types';\n\nexport const categories: Category[] = ['custom'];\n\nexport const defaultConfig = {\n  pinDigests: false,\n};\nexport const supportedDatasources = ['*'];\nexport const displayName = 'Regex';\n\nexport function extractPackageFile(\n  content: string,\n  packageFile: string,\n  config: ExtractConfig,\n): MaybePromise<PackageFileContent | null> {\n  let deps: PackageDependency[];\n  switch (config.matchStringsStrategy) {\n    default:\n    case 'any':\n      deps = handleAny(content, packageFile, config as RegexManagerConfig);\n      break;\n    case 'combination':\n      deps = handleCombination(\n        content,\n        packageFile,\n        config as RegexManagerConfig,\n      );\n      break;\n    case 'recursive':\n      deps = handleRecursive(\n        content,\n        packageFile,\n        config as RegexManagerConfig,\n      );\n      break;\n  }\n\n  // filter all null values\n  deps = deps.filter(is.truthy);\n  if (deps.length) {\n    const res: PackageFileContent & RegexManagerTemplates = {\n      deps,\n      matchStrings: config.matchStrings,\n    };\n    if (config.matchStringsStrategy) {\n      res.matchStringsStrategy = config.matchStringsStrategy;\n    }\n    // copy over templates for autoreplace\n    for (const field of validMatchFields.map(\n      (f) => `${f}Template` as keyof RegexManagerTemplates,\n    )) {\n      if (config[field]) {\n        res[field] = config[field];\n      }\n    }\n    if (config.autoReplaceStringTemplate) {\n      res.autoReplaceStringTemplate = config.autoReplaceStringTemplate;\n    }\n    return res;\n  }\n\n  return null;\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../lib/modules/manager/custom/regex/index.ts"],"names":[],"mappings":";;;AAqBA,gDAwDC;;AA7ED,kEAAkC;AAElC,+CAA4C;AAO5C,oCAA4C;AAC5C,6CAA6E;AAGhE,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,OAAO,CAAC;AAEnC,SAAgB,kBAAkB,CAChC,OAAe,EACf,WAAmB,EACnB,MAAqB;IAErB,IAAI,IAAyB,CAAC;IAC9B,QAAQ,MAAM,CAAC,oBAAoB,EAAE,CAAC;QACpC,QAAQ;QACR,KAAK,KAAK;YACR,IAAI,GAAG,IAAA,sBAAS,EAAC,OAAO,EAAE,WAAW,EAAE,MAA4B,CAAC,CAAC;YACrE,MAAM;QACR,KAAK,aAAa;YAChB,IAAI,GAAG,IAAA,8BAAiB,EACtB,OAAO,EACP,WAAW,EACX,MAA4B,CAC7B,CAAC;YACF,MAAM;QACR,KAAK,WAAW;YACd,IAAI,GAAG,IAAA,4BAAe,EACpB,OAAO,EACP,WAAW,EACX,MAA4B,CAC7B,CAAC;YACF,MAAM;IACV,CAAC;IAED,yBAAyB;IACzB,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,YAAE,CAAC,MAAM,CAAC,CAAC;IAC9B,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;QAChB,MAAM,GAAG,GAA+C;YACtD,IAAI;YACJ,YAAY,EAAE,MAAM,CAAC,YAAY;SAClC,CAAC;QACF,IAAI,MAAM,CAAC,oBAAoB,EAAE,CAAC;YAChC,GAAG,CAAC,oBAAoB,GAAG,MAAM,CAAC,oBAAoB,CAAC;QACzD,CAAC;QACD,sCAAsC;QACtC,KAAK,MAAM,KAAK,IAAI,wBAAgB,CAAC,GAAG,CACtC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,UAAyC,CACrD,EAAE,CAAC;YACF,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;gBAClB,GAAG,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;YAC7B,CAAC;QACH,CAAC;QACD,IAAI,MAAM,CAAC,yBAAyB,EAAE,CAAC;YACrC,GAAG,CAAC,yBAAyB,GAAG,MAAM,CAAC,yBAAyB,CAAC;QACnE,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IACD,eAAM,CAAC,KAAK,CACV,EAAE,WAAW,EAAE,EACf,wDAAwD,CACzD,CAAC;IAEF,OAAO,IAAI,CAAC;AACd,CAAC","sourcesContent":["import is from '@sindresorhus/is';\nimport type { Category } from '../../../../constants';\nimport { logger } from '../../../../logger';\nimport type {\n  ExtractConfig,\n  MaybePromise,\n  PackageDependency,\n  PackageFileContent,\n} from '../../types';\nimport { validMatchFields } from '../utils';\nimport { handleAny, handleCombination, handleRecursive } from './strategies';\nimport type { RegexManagerConfig, RegexManagerTemplates } from './types';\n\nexport const categories: Category[] = ['custom'];\n\nexport const defaultConfig = {\n  pinDigests: false,\n};\nexport const supportedDatasources = ['*'];\nexport const displayName = 'Regex';\n\nexport function extractPackageFile(\n  content: string,\n  packageFile: string,\n  config: ExtractConfig,\n): MaybePromise<PackageFileContent | null> {\n  let deps: PackageDependency[];\n  switch (config.matchStringsStrategy) {\n    default:\n    case 'any':\n      deps = handleAny(content, packageFile, config as RegexManagerConfig);\n      break;\n    case 'combination':\n      deps = handleCombination(\n        content,\n        packageFile,\n        config as RegexManagerConfig,\n      );\n      break;\n    case 'recursive':\n      deps = handleRecursive(\n        content,\n        packageFile,\n        config as RegexManagerConfig,\n      );\n      break;\n  }\n\n  // filter all null values\n  deps = deps.filter(is.truthy);\n  if (deps.length) {\n    const res: PackageFileContent & RegexManagerTemplates = {\n      deps,\n      matchStrings: config.matchStrings,\n    };\n    if (config.matchStringsStrategy) {\n      res.matchStringsStrategy = config.matchStringsStrategy;\n    }\n    // copy over templates for autoreplace\n    for (const field of validMatchFields.map(\n      (f) => `${f}Template` as keyof RegexManagerTemplates,\n    )) {\n      if (config[field]) {\n        res[field] = config[field];\n      }\n    }\n    if (config.autoReplaceStringTemplate) {\n      res.autoReplaceStringTemplate = config.autoReplaceStringTemplate;\n    }\n    return res;\n  }\n  logger.debug(\n    { packageFile },\n    'No dependencies found in file for custom regex manager',\n  );\n\n  return null;\n}\n"]}

package/dist/modules/manager/deps-edn/extract.js

@@ -4,6 +4,7 @@ exports.extractPackageFile = extractPackageFile;
 const tslib_1 = require("tslib");
 const is_1 = tslib_1.__importDefault(require("@sindresorhus/is"));
 const regex_1 = require("../../../util/regex");
+const url_1 = require("../../../util/url");
 const bitbucket_tags_1 = require("../../datasource/bitbucket-tags");
 const clojure_1 = require("../../datasource/clojure");
 const common_1 = require("../../datasource/clojure/common");
@@ -81,7 +82,7 @@ function resolveGitPackageFromEdnVal(dep, val) {
     }
     dep.datasource = git_refs_1.GitRefsDatasource.id;
     dep.packageName = gitUrl;
-    if (gitUrl.startsWith('https://')) {
+    if ((0, url_1.isHttpUrl)(gitUrl)) {
         dep.sourceUrl = gitUrl.replace(/\.git$/, '');
     }
 }

package/dist/modules/manager/deps-edn/extract.js.map

@@ -1 +1 @@
-{"version":3,"file":"extract.js","sourceRoot":"","sources":["../../../../lib/modules/manager/deps-edn/extract.ts"],"names":[],"mappings":"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","sourcesContent":["import is from '@sindresorhus/is';\nimport { regEx } from '../../../util/regex';\nimport { BitbucketTagsDatasource } from '../../datasource/bitbucket-tags';\nimport { ClojureDatasource } from '../../datasource/clojure';\nimport { CLOJARS_REPO } from '../../datasource/clojure/common';\nimport { GitRefsDatasource } from '../../datasource/git-refs';\nimport { GithubTagsDatasource } from '../../datasource/github-tags';\nimport { GitlabTagsDatasource } from '../../datasource/gitlab-tags';\nimport { MAVEN_REPO } from '../../datasource/maven/common';\nimport type { PackageDependency, PackageFileContent } from '../types';\nimport { parseDepsEdnFile } from './parser';\nimport type {\n  ParsedEdnData,\n  ParsedEdnMetadata,\n  ParsedEdnRecord,\n} from './types';\n\nconst dependencyRegex = regEx(\n  /^(?<groupId>[a-zA-Z][-_a-zA-Z0-9]*(?:\\.[a-zA-Z0-9][-_a-zA-Z0-9]*)*)(?:\\/(?<artifactId>[a-zA-Z][-_a-zA-Z0-9]*(?:\\.[a-zA-Z0-9][-_a-zA-Z0-9]*)*))?$/,\n);\n\nfunction getPackageName(depName: string): string | null {\n  const matchGroups = dependencyRegex.exec(depName)?.groups;\n  if (matchGroups) {\n    const groupId = matchGroups.groupId;\n    const artifactId = matchGroups.artifactId\n      ? matchGroups.artifactId\n      : groupId;\n    return `${groupId}:${artifactId}`;\n  }\n\n  return null;\n}\n\nconst githubDependencyRegex = regEx(\n  /^(?:com|io)\\.github\\.(?<packageName>[^/]+\\/[^/]+)$/,\n);\nconst gitlabDependencyRegex = regEx(\n  /^(?:com|io)\\.gitlab\\.(?<packageName>[^/]+\\/[^/]+)$/,\n);\nconst bitbucketDependencyRegex = regEx(\n  /^(?:org|io)\\.bitbucket\\.(?<packageName>[^/]+\\/[^/]+)$/,\n);\n\nfunction resolveGitPackageFromEdnKey(\n  dep: PackageDependency,\n  key: string,\n): void {\n  if (dep.datasource) {\n    return;\n  }\n\n  const githubDependencyGroups = githubDependencyRegex.exec(key)?.groups;\n  if (githubDependencyGroups?.packageName) {\n    dep.datasource = GithubTagsDatasource.id;\n    dep.packageName = githubDependencyGroups.packageName;\n    return;\n  }\n\n  const gitlabDependencyGroups = gitlabDependencyRegex.exec(key)?.groups;\n  if (gitlabDependencyGroups?.packageName) {\n    dep.datasource = GitlabTagsDatasource.id;\n    dep.packageName = gitlabDependencyGroups.packageName;\n    return;\n  }\n\n  const bitbucketDependencyGroups = bitbucketDependencyRegex.exec(key)?.groups;\n  if (bitbucketDependencyGroups?.packageName) {\n    dep.datasource = BitbucketTagsDatasource.id;\n    dep.packageName = bitbucketDependencyGroups.packageName;\n    return;\n  }\n}\n\nconst githubUrlRegex = regEx(\n  /^(?:https:\\/\\/|git@)github\\.com[/:](?<packageName>[^/]+\\/[^/]+?)(?:\\.git)?$/,\n);\nconst gitlabUrlRegex = regEx(\n  /^(?:https:\\/\\/|git@)gitlab\\.com[/:](?<packageName>[^/]+\\/[^/]+?)(?:\\.git)?$/,\n);\nconst bitbucketUrlRegex = regEx(\n  /^(?:https:\\/\\/|git@)bitbucket\\.org[/:](?<packageName>[^/]+\\/[^/]+?)(?:\\.git)?$/,\n);\n\nfunction resolveGitPackageFromEdnVal(\n  dep: PackageDependency,\n  val: ParsedEdnRecord,\n): void {\n  const gitUrl = val['git/url'];\n  if (!is.string(gitUrl)) {\n    return;\n  }\n\n  const githubMatchGroups = githubUrlRegex.exec(gitUrl)?.groups;\n  if (githubMatchGroups) {\n    dep.datasource = GithubTagsDatasource.id;\n    dep.packageName = githubMatchGroups.packageName;\n    dep.sourceUrl = `https://github.com/${dep.packageName}`;\n    return;\n  }\n\n  const gitlabMatchGroups = gitlabUrlRegex.exec(gitUrl)?.groups;\n  const bitbucketMatchGroups = bitbucketUrlRegex.exec(gitUrl)?.groups;\n\n  if (gitlabMatchGroups) {\n    dep.datasource = GitlabTagsDatasource.id;\n    dep.packageName = gitlabMatchGroups.packageName;\n    dep.sourceUrl = `https://gitlab.com/${dep.packageName}`;\n    return;\n  }\n\n  if (bitbucketMatchGroups) {\n    dep.datasource = GitlabTagsDatasource.id;\n    dep.packageName = bitbucketMatchGroups.packageName;\n    dep.sourceUrl = `https://bitbucket.org/${dep.packageName}`;\n    return;\n  }\n\n  dep.datasource = GitRefsDatasource.id;\n  dep.packageName = gitUrl;\n  if (gitUrl.startsWith('https://')) {\n    dep.sourceUrl = gitUrl.replace(/\\.git$/, '');\n  }\n}\n\nfunction extractDependency(\n  key: string,\n  val: ParsedEdnData,\n  metadata: ParsedEdnMetadata,\n  mavenRegistries: string[],\n  depType?: string,\n): PackageDependency | null {\n  if (!is.plainObject(val)) {\n    return null;\n  }\n\n  const packageName = getPackageName(key);\n  if (!packageName) {\n    return null;\n  }\n  const depName = key;\n\n  const dep: PackageDependency = {\n    depName,\n    packageName,\n    currentValue: null,\n    ...metadata.get(val),\n  };\n\n  if (depType) {\n    dep.depType = depType;\n  }\n\n  const mvnVersion = val['mvn/version'];\n  if (is.string(mvnVersion)) {\n    dep.datasource = ClojureDatasource.id;\n    dep.currentValue = mvnVersion;\n    dep.packageName = packageName.replace('/', ':');\n    dep.registryUrls = [...mavenRegistries];\n    return dep;\n  }\n\n  resolveGitPackageFromEdnVal(dep, val);\n  resolveGitPackageFromEdnKey(dep, key);\n\n  if (dep.datasource) {\n    const gitTag = val['git/tag'];\n    if (is.string(gitTag)) {\n      dep.currentValue = gitTag;\n    }\n\n    const gitSha = val['git/sha'] ?? val.sha;\n    if (is.string(gitSha)) {\n      dep.currentDigest = gitSha;\n      dep.currentDigestShort = gitSha.slice(0, 7);\n    }\n\n    return dep;\n  }\n\n  return null;\n}\n\nfunction extractSection(\n  section: ParsedEdnData,\n  metadata: ParsedEdnMetadata,\n  mavenRegistries: string[],\n  depType?: string,\n): PackageDependency[] {\n  const deps: PackageDependency[] = [];\n  if (is.plainObject(section)) {\n    for (const [key, val] of Object.entries(section)) {\n      const dep = extractDependency(\n        key,\n        val,\n        metadata,\n        mavenRegistries,\n        depType,\n      );\n      if (dep) {\n        deps.push(dep);\n      }\n    }\n  }\n  return deps;\n}\n\nexport function extractPackageFile(content: string): PackageFileContent | null {\n  const parsed = parseDepsEdnFile(content);\n  if (!parsed) {\n    return null;\n  }\n  const { data, metadata } = parsed;\n\n  const deps: PackageDependency[] = [];\n\n  // See: https://clojure.org/reference/deps_and_cli#_modifying_the_default_repositories\n  const registryMap: Record<string, string> = {\n    clojars: CLOJARS_REPO,\n    central: MAVEN_REPO,\n  };\n  const mavenRepos = data['mvn/repos'];\n  if (is.plainObject(mavenRepos)) {\n    for (const [repoName, repoSpec] of Object.entries(mavenRepos)) {\n      if (is.string(repoName)) {\n        if (is.plainObject(repoSpec) && is.string(repoSpec.url)) {\n          registryMap[repoName] = repoSpec.url;\n        } else if (is.string(repoSpec) && repoSpec === 'nil') {\n          delete registryMap[repoName];\n        }\n      }\n    }\n  }\n  const mavenRegistries: string[] = [...Object.values(registryMap)];\n\n  deps.push(...extractSection(data.deps, metadata, mavenRegistries));\n\n  const aliases = data.aliases;\n  if (is.plainObject(aliases)) {\n    for (const [depType, aliasSection] of Object.entries(aliases)) {\n      if (is.plainObject(aliasSection)) {\n        deps.push(\n          ...extractSection(\n            aliasSection['extra-deps'],\n            metadata,\n            mavenRegistries,\n            depType,\n          ),\n        );\n        deps.push(\n          ...extractSection(\n            aliasSection['override-deps'],\n            metadata,\n            mavenRegistries,\n            depType,\n          ),\n        );\n      }\n    }\n  }\n\n  return { deps };\n}\n"]}
+{"version":3,"file":"extract.js","sourceRoot":"","sources":["../../../../lib/modules/manager/deps-edn/extract.ts"],"names":[],"mappings":"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","sourcesContent":["import is from '@sindresorhus/is';\nimport { regEx } from '../../../util/regex';\nimport { isHttpUrl } from '../../../util/url';\nimport { BitbucketTagsDatasource } from '../../datasource/bitbucket-tags';\nimport { ClojureDatasource } from '../../datasource/clojure';\nimport { CLOJARS_REPO } from '../../datasource/clojure/common';\nimport { GitRefsDatasource } from '../../datasource/git-refs';\nimport { GithubTagsDatasource } from '../../datasource/github-tags';\nimport { GitlabTagsDatasource } from '../../datasource/gitlab-tags';\nimport { MAVEN_REPO } from '../../datasource/maven/common';\nimport type { PackageDependency, PackageFileContent } from '../types';\nimport { parseDepsEdnFile } from './parser';\nimport type {\n  ParsedEdnData,\n  ParsedEdnMetadata,\n  ParsedEdnRecord,\n} from './types';\n\nconst dependencyRegex = regEx(\n  /^(?<groupId>[a-zA-Z][-_a-zA-Z0-9]*(?:\\.[a-zA-Z0-9][-_a-zA-Z0-9]*)*)(?:\\/(?<artifactId>[a-zA-Z][-_a-zA-Z0-9]*(?:\\.[a-zA-Z0-9][-_a-zA-Z0-9]*)*))?$/,\n);\n\nfunction getPackageName(depName: string): string | null {\n  const matchGroups = dependencyRegex.exec(depName)?.groups;\n  if (matchGroups) {\n    const groupId = matchGroups.groupId;\n    const artifactId = matchGroups.artifactId\n      ? matchGroups.artifactId\n      : groupId;\n    return `${groupId}:${artifactId}`;\n  }\n\n  return null;\n}\n\nconst githubDependencyRegex = regEx(\n  /^(?:com|io)\\.github\\.(?<packageName>[^/]+\\/[^/]+)$/,\n);\nconst gitlabDependencyRegex = regEx(\n  /^(?:com|io)\\.gitlab\\.(?<packageName>[^/]+\\/[^/]+)$/,\n);\nconst bitbucketDependencyRegex = regEx(\n  /^(?:org|io)\\.bitbucket\\.(?<packageName>[^/]+\\/[^/]+)$/,\n);\n\nfunction resolveGitPackageFromEdnKey(\n  dep: PackageDependency,\n  key: string,\n): void {\n  if (dep.datasource) {\n    return;\n  }\n\n  const githubDependencyGroups = githubDependencyRegex.exec(key)?.groups;\n  if (githubDependencyGroups?.packageName) {\n    dep.datasource = GithubTagsDatasource.id;\n    dep.packageName = githubDependencyGroups.packageName;\n    return;\n  }\n\n  const gitlabDependencyGroups = gitlabDependencyRegex.exec(key)?.groups;\n  if (gitlabDependencyGroups?.packageName) {\n    dep.datasource = GitlabTagsDatasource.id;\n    dep.packageName = gitlabDependencyGroups.packageName;\n    return;\n  }\n\n  const bitbucketDependencyGroups = bitbucketDependencyRegex.exec(key)?.groups;\n  if (bitbucketDependencyGroups?.packageName) {\n    dep.datasource = BitbucketTagsDatasource.id;\n    dep.packageName = bitbucketDependencyGroups.packageName;\n    return;\n  }\n}\n\nconst githubUrlRegex = regEx(\n  /^(?:https:\\/\\/|git@)github\\.com[/:](?<packageName>[^/]+\\/[^/]+?)(?:\\.git)?$/,\n);\nconst gitlabUrlRegex = regEx(\n  /^(?:https:\\/\\/|git@)gitlab\\.com[/:](?<packageName>[^/]+\\/[^/]+?)(?:\\.git)?$/,\n);\nconst bitbucketUrlRegex = regEx(\n  /^(?:https:\\/\\/|git@)bitbucket\\.org[/:](?<packageName>[^/]+\\/[^/]+?)(?:\\.git)?$/,\n);\n\nfunction resolveGitPackageFromEdnVal(\n  dep: PackageDependency,\n  val: ParsedEdnRecord,\n): void {\n  const gitUrl = val['git/url'];\n  if (!is.string(gitUrl)) {\n    return;\n  }\n\n  const githubMatchGroups = githubUrlRegex.exec(gitUrl)?.groups;\n  if (githubMatchGroups) {\n    dep.datasource = GithubTagsDatasource.id;\n    dep.packageName = githubMatchGroups.packageName;\n    dep.sourceUrl = `https://github.com/${dep.packageName}`;\n    return;\n  }\n\n  const gitlabMatchGroups = gitlabUrlRegex.exec(gitUrl)?.groups;\n  const bitbucketMatchGroups = bitbucketUrlRegex.exec(gitUrl)?.groups;\n\n  if (gitlabMatchGroups) {\n    dep.datasource = GitlabTagsDatasource.id;\n    dep.packageName = gitlabMatchGroups.packageName;\n    dep.sourceUrl = `https://gitlab.com/${dep.packageName}`;\n    return;\n  }\n\n  if (bitbucketMatchGroups) {\n    dep.datasource = GitlabTagsDatasource.id;\n    dep.packageName = bitbucketMatchGroups.packageName;\n    dep.sourceUrl = `https://bitbucket.org/${dep.packageName}`;\n    return;\n  }\n\n  dep.datasource = GitRefsDatasource.id;\n  dep.packageName = gitUrl;\n  if (isHttpUrl(gitUrl)) {\n    dep.sourceUrl = gitUrl.replace(/\\.git$/, '');\n  }\n}\n\nfunction extractDependency(\n  key: string,\n  val: ParsedEdnData,\n  metadata: ParsedEdnMetadata,\n  mavenRegistries: string[],\n  depType?: string,\n): PackageDependency | null {\n  if (!is.plainObject(val)) {\n    return null;\n  }\n\n  const packageName = getPackageName(key);\n  if (!packageName) {\n    return null;\n  }\n  const depName = key;\n\n  const dep: PackageDependency = {\n    depName,\n    packageName,\n    currentValue: null,\n    ...metadata.get(val),\n  };\n\n  if (depType) {\n    dep.depType = depType;\n  }\n\n  const mvnVersion = val['mvn/version'];\n  if (is.string(mvnVersion)) {\n    dep.datasource = ClojureDatasource.id;\n    dep.currentValue = mvnVersion;\n    dep.packageName = packageName.replace('/', ':');\n    dep.registryUrls = [...mavenRegistries];\n    return dep;\n  }\n\n  resolveGitPackageFromEdnVal(dep, val);\n  resolveGitPackageFromEdnKey(dep, key);\n\n  if (dep.datasource) {\n    const gitTag = val['git/tag'];\n    if (is.string(gitTag)) {\n      dep.currentValue = gitTag;\n    }\n\n    const gitSha = val['git/sha'] ?? val.sha;\n    if (is.string(gitSha)) {\n      dep.currentDigest = gitSha;\n      dep.currentDigestShort = gitSha.slice(0, 7);\n    }\n\n    return dep;\n  }\n\n  return null;\n}\n\nfunction extractSection(\n  section: ParsedEdnData,\n  metadata: ParsedEdnMetadata,\n  mavenRegistries: string[],\n  depType?: string,\n): PackageDependency[] {\n  const deps: PackageDependency[] = [];\n  if (is.plainObject(section)) {\n    for (const [key, val] of Object.entries(section)) {\n      const dep = extractDependency(\n        key,\n        val,\n        metadata,\n        mavenRegistries,\n        depType,\n      );\n      if (dep) {\n        deps.push(dep);\n      }\n    }\n  }\n  return deps;\n}\n\nexport function extractPackageFile(content: string): PackageFileContent | null {\n  const parsed = parseDepsEdnFile(content);\n  if (!parsed) {\n    return null;\n  }\n  const { data, metadata } = parsed;\n\n  const deps: PackageDependency[] = [];\n\n  // See: https://clojure.org/reference/deps_and_cli#_modifying_the_default_repositories\n  const registryMap: Record<string, string> = {\n    clojars: CLOJARS_REPO,\n    central: MAVEN_REPO,\n  };\n  const mavenRepos = data['mvn/repos'];\n  if (is.plainObject(mavenRepos)) {\n    for (const [repoName, repoSpec] of Object.entries(mavenRepos)) {\n      if (is.string(repoName)) {\n        if (is.plainObject(repoSpec) && is.string(repoSpec.url)) {\n          registryMap[repoName] = repoSpec.url;\n        } else if (is.string(repoSpec) && repoSpec === 'nil') {\n          delete registryMap[repoName];\n        }\n      }\n    }\n  }\n  const mavenRegistries: string[] = [...Object.values(registryMap)];\n\n  deps.push(...extractSection(data.deps, metadata, mavenRegistries));\n\n  const aliases = data.aliases;\n  if (is.plainObject(aliases)) {\n    for (const [depType, aliasSection] of Object.entries(aliases)) {\n      if (is.plainObject(aliasSection)) {\n        deps.push(\n          ...extractSection(\n            aliasSection['extra-deps'],\n            metadata,\n            mavenRegistries,\n            depType,\n          ),\n        );\n        deps.push(\n          ...extractSection(\n            aliasSection['override-deps'],\n            metadata,\n            mavenRegistries,\n            depType,\n          ),\n        );\n      }\n    }\n  }\n\n  return { deps };\n}\n"]}

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, isLockFileMaintenance, updateType }, packageFileName, updatedDeps, }: UpdateArtifact): Promise<UpdateArtifactsResult[] | null>;

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

@@ -3,34 +3,51 @@ 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, 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,
     };
-    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, 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  };\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"]}

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

@@ -41,5 +41,5 @@ exports.DevboxSchema = schema_utils_1.Jsonc.pipe(zod_1.z.object({
         .pipe((0, schema_utils_1.LooseArray)(DevboxEntry)),
 }))
     .transform(({ packages }) => packages)
-    .catch((0, schema_utils_1.withDebugMessage)([], 'Devbox: error parsing file'));
+    .catch((0, schema_utils_1.withDebugMessage)([], 'Devbox: does not match schema'));
 //# sourceMappingURL=schema.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../lib/modules/manager/devbox/schema.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AACxB,4CAAyC;AACzC,6DAKoC;AACpC,oDAA2D;AAC3D,oDAAkE;AAGlE,MAAM,WAAW,GAAG,OAAC;KAClB,KAAK,CAAC,OAAC,CAAC,MAAM,EAAE,CAAC;KACjB,GAAG,CAAC,CAAC,CAAC;KACN,SAAS,CAAC,CAAC,CAAC,OAAO,EAAE,YAAY,CAAC,EAAE,EAAE;IACrC,MAAM,GAAG,GAAsB;QAC7B,UAAU,EAAE,yBAAgB,CAAC,EAAE;QAC/B,OAAO;KACR,CAAC;IAEF,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,eAAM,CAAC,KAAK,CACV,EAAE,OAAO,EAAE,EACX,iEAAiE,CAClE,CAAC;QACF,GAAG,CAAC,UAAU,GAAG,eAAe,CAAC;QACjC,OAAO,GAAG,CAAC;IACb,CAAC;IAED,GAAG,CAAC,YAAY,GAAG,YAAY,CAAC;IAEhC,IAAI,CAAC,YAAgB,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;QAC5C,eAAM,CAAC,KAAK,CACV,EAAE,OAAO,EAAE,EACX,iEAAiE,CAClE,CAAC;QACF,GAAG,CAAC,UAAU,GAAG,iBAAiB,CAAC;QACnC,OAAO,GAAG,CAAC;IACb,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC,CAAC,CAAC;AAEQ,QAAA,YAAY,GAAG,oBAAK,CAAC,IAAI,CACpC,OAAC,CAAC,MAAM,CAAC;IACP,QAAQ,EAAE,OAAC;SACR,KAAK,CAAC;QACL,IAAA,yBAAU,EAAC,OAAC,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;QACzD,IAAA,0BAAW,EACT,OAAC,CAAC,KAAK,CAAC;YACN,OAAC,CAAC,MAAM,EAAE;YACV,OAAC;iBACE,MAAM,CAAC,EAAE,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE,EAAE,CAAC;iBAC/B,SAAS,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC;SACvC,CAAC,CACH,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;KAC1C,CAAC;SACD,IAAI,CAAC,IAAA,yBAAU,EAAC,WAAW,CAAC,CAAC;CACjC,CAAC,CACH;KACE,SAAS,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,QAAQ,CAAC;KACrC,KAAK,CAAC,IAAA,+BAAgB,EAAC,EAAE,EAAE,4BAA4B,CAAC,CAAC,CAAC","sourcesContent":["import { z } from 'zod';\nimport { logger } from '../../../logger';\nimport {\n  Jsonc,\n  LooseArray,\n  LooseRecord,\n  withDebugMessage,\n} from '../../../util/schema-utils';\nimport { DevboxDatasource } from '../../datasource/devbox';\nimport { api as devboxVersioning } from '../../versioning/devbox';\nimport type { PackageDependency } from '../types';\n\nconst DevboxEntry = z\n  .array(z.string())\n  .min(1)\n  .transform(([depName, currentValue]) => {\n    const dep: PackageDependency = {\n      datasource: DevboxDatasource.id,\n      depName,\n    };\n\n    if (!currentValue) {\n      logger.trace(\n        { depName },\n        'Devbox: skipping invalid devbox dependency in devbox JSON file.',\n      );\n      dep.skipReason = 'not-a-version';\n      return dep;\n    }\n\n    dep.currentValue = currentValue;\n\n    if (!devboxVersioning.isValid(currentValue)) {\n      logger.debug(\n        { depName },\n        'Devbox: skipping invalid devbox dependency in devbox JSON file.',\n      );\n      dep.skipReason = 'invalid-version';\n      return dep;\n    }\n\n    return dep;\n  });\n\nexport const DevboxSchema = Jsonc.pipe(\n  z.object({\n    packages: z\n      .union([\n        LooseArray(z.string().transform((pkg) => pkg.split('@'))),\n        LooseRecord(\n          z.union([\n            z.string(),\n            z\n              .object({ version: z.string() })\n              .transform(({ version }) => version),\n          ]),\n        ).transform((obj) => Object.entries(obj)),\n      ])\n      .pipe(LooseArray(DevboxEntry)),\n  }),\n)\n  .transform(({ packages }) => packages)\n  .catch(withDebugMessage([], 'Devbox: error parsing file'));\n"]}
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../lib/modules/manager/devbox/schema.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AACxB,4CAAyC;AACzC,6DAKoC;AACpC,oDAA2D;AAC3D,oDAAkE;AAGlE,MAAM,WAAW,GAAG,OAAC;KAClB,KAAK,CAAC,OAAC,CAAC,MAAM,EAAE,CAAC;KACjB,GAAG,CAAC,CAAC,CAAC;KACN,SAAS,CAAC,CAAC,CAAC,OAAO,EAAE,YAAY,CAAC,EAAE,EAAE;IACrC,MAAM,GAAG,GAAsB;QAC7B,UAAU,EAAE,yBAAgB,CAAC,EAAE;QAC/B,OAAO;KACR,CAAC;IAEF,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,eAAM,CAAC,KAAK,CACV,EAAE,OAAO,EAAE,EACX,iEAAiE,CAClE,CAAC;QACF,GAAG,CAAC,UAAU,GAAG,eAAe,CAAC;QACjC,OAAO,GAAG,CAAC;IACb,CAAC;IAED,GAAG,CAAC,YAAY,GAAG,YAAY,CAAC;IAEhC,IAAI,CAAC,YAAgB,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;QAC5C,eAAM,CAAC,KAAK,CACV,EAAE,OAAO,EAAE,EACX,iEAAiE,CAClE,CAAC;QACF,GAAG,CAAC,UAAU,GAAG,iBAAiB,CAAC;QACnC,OAAO,GAAG,CAAC;IACb,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC,CAAC,CAAC;AAEQ,QAAA,YAAY,GAAG,oBAAK,CAAC,IAAI,CACpC,OAAC,CAAC,MAAM,CAAC;IACP,QAAQ,EAAE,OAAC;SACR,KAAK,CAAC;QACL,IAAA,yBAAU,EAAC,OAAC,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;QACzD,IAAA,0BAAW,EACT,OAAC,CAAC,KAAK,CAAC;YACN,OAAC,CAAC,MAAM,EAAE;YACV,OAAC;iBACE,MAAM,CAAC,EAAE,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE,EAAE,CAAC;iBAC/B,SAAS,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC;SACvC,CAAC,CACH,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;KAC1C,CAAC;SACD,IAAI,CAAC,IAAA,yBAAU,EAAC,WAAW,CAAC,CAAC;CACjC,CAAC,CACH;KACE,SAAS,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,QAAQ,CAAC;KACrC,KAAK,CAAC,IAAA,+BAAgB,EAAC,EAAE,EAAE,+BAA+B,CAAC,CAAC,CAAC","sourcesContent":["import { z } from 'zod';\nimport { logger } from '../../../logger';\nimport {\n  Jsonc,\n  LooseArray,\n  LooseRecord,\n  withDebugMessage,\n} from '../../../util/schema-utils';\nimport { DevboxDatasource } from '../../datasource/devbox';\nimport { api as devboxVersioning } from '../../versioning/devbox';\nimport type { PackageDependency } from '../types';\n\nconst DevboxEntry = z\n  .array(z.string())\n  .min(1)\n  .transform(([depName, currentValue]) => {\n    const dep: PackageDependency = {\n      datasource: DevboxDatasource.id,\n      depName,\n    };\n\n    if (!currentValue) {\n      logger.trace(\n        { depName },\n        'Devbox: skipping invalid devbox dependency in devbox JSON file.',\n      );\n      dep.skipReason = 'not-a-version';\n      return dep;\n    }\n\n    dep.currentValue = currentValue;\n\n    if (!devboxVersioning.isValid(currentValue)) {\n      logger.debug(\n        { depName },\n        'Devbox: skipping invalid devbox dependency in devbox JSON file.',\n      );\n      dep.skipReason = 'invalid-version';\n      return dep;\n    }\n\n    return dep;\n  });\n\nexport const DevboxSchema = Jsonc.pipe(\n  z.object({\n    packages: z\n      .union([\n        LooseArray(z.string().transform((pkg) => pkg.split('@'))),\n        LooseRecord(\n          z.union([\n            z.string(),\n            z\n              .object({ version: z.string() })\n              .transform(({ version }) => version),\n          ]),\n        ).transform((obj) => Object.entries(obj)),\n      ])\n      .pipe(LooseArray(DevboxEntry)),\n  }),\n)\n  .transform(({ packages }) => packages)\n  .catch(withDebugMessage([], 'Devbox: does not match schema'));\n"]}

package/dist/modules/manager/devcontainer/extract.js

@@ -2,6 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractPackageFile = extractPackageFile;
 const logger_1 = require("../../../logger");
+const golang_version_1 = require("../../datasource/golang-version");
+const node_version_1 = require("../../datasource/node-version");
+const python_version_1 = require("../../datasource/python-version");
+const ruby_version_1 = require("../../datasource/ruby-version");
 const utils_1 = require("../custom/utils");
 const extract_1 = require("../dockerfile/extract");
 const schema_1 = require("./schema");
@@ -20,12 +24,50 @@ function extractPackageFile(content, packageFile, extractConfig) {
         }
         const features = file.features;
         if (features) {
-            for (const feature of Object.keys(features)) {
+            for (const [feature, value] of Object.entries(features)) {
                 const featureDep = getDep(feature, packageFile, extractConfig.registryAliases);
                 if (featureDep) {
                     featureDep.depType = 'feature';
                     featureDep.pinDigests = false;
                     deps.push(featureDep);
+                    let dep;
+                    switch (featureDep.depName) {
+                        case 'ghcr.io/devcontainers/features/node':
+                            dep = {
+                                depName: 'node',
+                                datasource: node_version_1.NodeVersionDatasource.id,
+                                currentValue: value.version,
+                            };
+                            break;
+                        case 'ghcr.io/devcontainers/features/go':
+                            dep = {
+                                depName: 'go',
+                                datasource: golang_version_1.GolangVersionDatasource.id,
+                                currentValue: value.version,
+                            };
+                            break;
+                        case 'ghcr.io/devcontainers/features/python':
+                            dep = {
+                                depName: 'python',
+                                datasource: python_version_1.PythonVersionDatasource.id,
+                                currentValue: value.version,
+                            };
+                            break;
+                        case 'ghcr.io/devcontainers/features/ruby':
+                            dep = {
+                                depName: 'ruby',
+                                datasource: ruby_version_1.RubyVersionDatasource.id,
+                                currentValue: value.version,
+                            };
+                            break;
+                        default:
+                            // skip additional checks if not a known feature
+                            continue;
+                    }
+                    if (!value.version) {
+                        dep.skipReason = 'unspecified-version';
+                    }
+                    deps.push(dep);
                     continue;
                 }
                 logger_1.logger.trace({ feature, packageFile }, 'Skipping invalid dependency in dev container JSON file.');

package/dist/modules/manager/devcontainer/extract.js.map

@@ -1 +1 @@
-{"version":3,"file":"extract.js","sourceRoot":"","sources":["../../../../lib/modules/manager/devcontainer/extract.ts"],"names":[],"mappings":";;AAUA,gDA4DC;AAtED,4CAAyC;AACzC,2CAAoD;AACpD,mDAA+D;AAM/D,qCAA4C;AAE5C,SAAgB,kBAAkB,CAChC,OAAe,EACf,WAAmB,EACnB,aAA4B;IAE5B,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,yBAAgB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC7C,MAAM,IAAI,GAAwB,EAAE,CAAC;QAErC,MAAM,KAAK,GAAG,IAAI,EAAE,KAAK,IAAI,IAAI,CAAC;QAClC,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,EAAE,WAAW,EAAE,aAAa,CAAC,eAAe,CAAC,CAAC;QAE3E,IAAI,QAAQ,EAAE,CAAC;YACb,QAAQ,CAAC,OAAO,GAAG,OAAO,CAAC;YAC3B,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACtB,CAAC;aAAM,CAAC;YACN,eAAM,CAAC,KAAK,CACV,EAAE,WAAW,EAAE,EACf,8CAA8C,CAC/C,CAAC;QACJ,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAE/B,IAAI,QAAQ,EAAE,CAAC;YACb,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC5C,MAAM,UAAU,GAAG,MAAM,CACvB,OAAO,EACP,WAAW,EACX,aAAa,CAAC,eAAe,CAC9B,CAAC;gBACF,IAAI,UAAU,EAAE,CAAC;oBACf,UAAU,CAAC,OAAO,GAAG,SAAS,CAAC;oBAC/B,UAAU,CAAC,UAAU,GAAG,KAAK,CAAC;oBAC9B,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;oBACtB,SAAS;gBACX,CAAC;gBACD,eAAM,CAAC,KAAK,CACV,EAAE,OAAO,EAAE,WAAW,EAAE,EACxB,yDAAyD,CAC1D,CAAC;YACJ,CAAC;QACH,CAAC;QAED,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpB,eAAM,CAAC,KAAK,CACV,EAAE,WAAW,EAAE,EACf,yDAAyD,CAC1D,CAAC;YACF,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,EAAE,IAAI,EAAE,CAAC;IAClB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,eAAM,CAAC,KAAK,CACV,EAAE,GAAG,EAAE,WAAW,EAAE,EACpB,2CAA2C,CAC5C,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,SAAS,MAAM,CACb,OAAsB,EACtB,WAAmB,EACnB,eAAwC;IAExC,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,GAAG,GAAG,IAAA,gBAAY,EAAC,OAAO,EAAE,IAAI,EAAE,eAAe,CAAC,CAAC;IACzD,IAAI,CAAC,IAAA,yBAAiB,EAAC,GAAG,CAAC,EAAE,CAAC;QAC5B,eAAM,CAAC,KAAK,CACV,EAAE,OAAO,EAAE,WAAW,EAAE,EACxB,gEAAgE,CACjE,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC","sourcesContent":["import { logger } from '../../../logger';\nimport { isValidDependency } from '../custom/utils';\nimport { getDep as getDockerDep } from '../dockerfile/extract';\nimport type {\n  ExtractConfig,\n  PackageDependency,\n  PackageFileContent,\n} from '../types';\nimport { DevContainerFile } from './schema';\n\nexport function extractPackageFile(\n  content: string,\n  packageFile: string,\n  extractConfig: ExtractConfig,\n): PackageFileContent | null {\n  try {\n    const file = DevContainerFile.parse(content);\n    const deps: PackageDependency[] = [];\n\n    const image = file?.image ?? null;\n    const imageDep = getDep(image, packageFile, extractConfig.registryAliases);\n\n    if (imageDep) {\n      imageDep.depType = 'image';\n      deps.push(imageDep);\n    } else {\n      logger.trace(\n        { packageFile },\n        'No image defined in dev container JSON file.',\n      );\n    }\n\n    const features = file.features;\n\n    if (features) {\n      for (const feature of Object.keys(features)) {\n        const featureDep = getDep(\n          feature,\n          packageFile,\n          extractConfig.registryAliases,\n        );\n        if (featureDep) {\n          featureDep.depType = 'feature';\n          featureDep.pinDigests = false;\n          deps.push(featureDep);\n          continue;\n        }\n        logger.trace(\n          { feature, packageFile },\n          'Skipping invalid dependency in dev container JSON file.',\n        );\n      }\n    }\n\n    if (deps.length < 1) {\n      logger.trace(\n        { packageFile },\n        'No dependencies to process for dev container JSON file.',\n      );\n      return null;\n    }\n\n    return { deps };\n  } catch (err) {\n    logger.debug(\n      { err, packageFile },\n      'Error extracting dev container JSON file.',\n    );\n    return null;\n  }\n}\n\nfunction getDep(\n  subject: string | null,\n  packageFile: string,\n  registryAliases?: Record<string, string>,\n): PackageDependency | null {\n  if (!subject) {\n    return null;\n  }\n  const dep = getDockerDep(subject, true, registryAliases);\n  if (!isValidDependency(dep)) {\n    logger.trace(\n      { subject, packageFile },\n      'Skipping invalid docker dependency in dev container JSON file.',\n    );\n    return null;\n  }\n  return dep;\n}\n"]}
+{"version":3,"file":"extract.js","sourceRoot":"","sources":["../../../../lib/modules/manager/devcontainer/extract.ts"],"names":[],"mappings":"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","sourcesContent":["import { logger } from '../../../logger';\nimport { GolangVersionDatasource } from '../../datasource/golang-version';\nimport { NodeVersionDatasource } from '../../datasource/node-version';\nimport { PythonVersionDatasource } from '../../datasource/python-version';\nimport { RubyVersionDatasource } from '../../datasource/ruby-version';\nimport { isValidDependency } from '../custom/utils';\nimport { getDep as getDockerDep } from '../dockerfile/extract';\nimport type {\n  ExtractConfig,\n  PackageDependency,\n  PackageFileContent,\n} from '../types';\nimport { DevContainerFile } from './schema';\n\nexport function extractPackageFile(\n  content: string,\n  packageFile: string,\n  extractConfig: ExtractConfig,\n): PackageFileContent | null {\n  try {\n    const file = DevContainerFile.parse(content);\n    const deps: PackageDependency[] = [];\n\n    const image = file?.image ?? null;\n    const imageDep = getDep(image, packageFile, extractConfig.registryAliases);\n\n    if (imageDep) {\n      imageDep.depType = 'image';\n      deps.push(imageDep);\n    } else {\n      logger.trace(\n        { packageFile },\n        'No image defined in dev container JSON file.',\n      );\n    }\n\n    const features = file.features;\n\n    if (features) {\n      for (const [feature, value] of Object.entries(features)) {\n        const featureDep = getDep(\n          feature,\n          packageFile,\n          extractConfig.registryAliases,\n        );\n        if (featureDep) {\n          featureDep.depType = 'feature';\n          featureDep.pinDigests = false;\n          deps.push(featureDep);\n\n          let dep: PackageDependency;\n          switch (featureDep.depName) {\n            case 'ghcr.io/devcontainers/features/node':\n              dep = {\n                depName: 'node',\n                datasource: NodeVersionDatasource.id,\n                currentValue: value.version,\n              };\n              break;\n            case 'ghcr.io/devcontainers/features/go':\n              dep = {\n                depName: 'go',\n                datasource: GolangVersionDatasource.id,\n                currentValue: value.version,\n              };\n              break;\n            case 'ghcr.io/devcontainers/features/python':\n              dep = {\n                depName: 'python',\n                datasource: PythonVersionDatasource.id,\n                currentValue: value.version,\n              };\n              break;\n            case 'ghcr.io/devcontainers/features/ruby':\n              dep = {\n                depName: 'ruby',\n                datasource: RubyVersionDatasource.id,\n                currentValue: value.version,\n              };\n              break;\n            default:\n              // skip additional checks if not a known feature\n              continue;\n          }\n          if (!value.version) {\n            dep.skipReason = 'unspecified-version';\n          }\n          deps.push(dep);\n          continue;\n        }\n        logger.trace(\n          { feature, packageFile },\n          'Skipping invalid dependency in dev container JSON file.',\n        );\n      }\n    }\n\n    if (deps.length < 1) {\n      logger.trace(\n        { packageFile },\n        'No dependencies to process for dev container JSON file.',\n      );\n      return null;\n    }\n\n    return { deps };\n  } catch (err) {\n    logger.debug(\n      { err, packageFile },\n      'Error extracting dev container JSON file.',\n    );\n    return null;\n  }\n}\n\nfunction getDep(\n  subject: string | null,\n  packageFile: string,\n  registryAliases?: Record<string, string>,\n): PackageDependency | null {\n  if (!subject) {\n    return null;\n  }\n  const dep = getDockerDep(subject, true, registryAliases);\n  if (!isValidDependency(dep)) {\n    logger.trace(\n      { subject, packageFile },\n      'Skipping invalid docker dependency in dev container JSON file.',\n    );\n    return null;\n  }\n  return dep;\n}\n"]}

package/dist/modules/manager/devcontainer/index.js

@@ -2,6 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.supportedDatasources = exports.defaultConfig = exports.categories = exports.url = exports.name = exports.extractPackageFile = void 0;
 const docker_1 = require("../../datasource/docker");
+const golang_version_1 = require("../../datasource/golang-version");
+const node_version_1 = require("../../datasource/node-version");
+const python_version_1 = require("../../datasource/python-version");
+const ruby_version_1 = require("../../datasource/ruby-version");
 var extract_1 = require("./extract");
 Object.defineProperty(exports, "extractPackageFile", { enumerable: true, get: function () { return extract_1.extractPackageFile; } });
 exports.name = 'Dev Container';
@@ -10,5 +14,11 @@ exports.categories = ['docker'];
 exports.defaultConfig = {
     fileMatch: ['^.devcontainer/devcontainer.json$', '^.devcontainer.json$'],
 };
-exports.supportedDatasources = [docker_1.DockerDatasource.id];
+exports.supportedDatasources = [
+    docker_1.DockerDatasource.id,
+    golang_version_1.GolangVersionDatasource.id,
+    node_version_1.NodeVersionDatasource.id,
+    python_version_1.PythonVersionDatasource.id,
+    ruby_version_1.RubyVersionDatasource.id,
+];
 //# sourceMappingURL=index.js.map

package/dist/modules/manager/devcontainer/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../lib/modules/manager/devcontainer/index.ts"],"names":[],"mappings":";;;AACA,oDAA2D;AAC3D,qCAA+C;AAAtC,6GAAA,kBAAkB,OAAA;AAEd,QAAA,IAAI,GAAG,eAAe,CAAC;AACvB,QAAA,GAAG,GACd,6DAA6D,CAAC;AACnD,QAAA,UAAU,GAAe,CAAC,QAAQ,CAAC,CAAC;AAEpC,QAAA,aAAa,GAAG;IAC3B,SAAS,EAAE,CAAC,mCAAmC,EAAE,sBAAsB,CAAC;CACzE,CAAC;AAEW,QAAA,oBAAoB,GAAG,CAAC,yBAAgB,CAAC,EAAE,CAAC,CAAC","sourcesContent":["import type { Category } from '../../../constants';\nimport { DockerDatasource } from '../../datasource/docker';\nexport { extractPackageFile } from './extract';\n\nexport const name = 'Dev Container';\nexport const url =\n  'https://code.visualstudio.com/docs/devcontainers/containers';\nexport const categories: Category[] = ['docker'];\n\nexport const defaultConfig = {\n  fileMatch: ['^.devcontainer/devcontainer.json$', '^.devcontainer.json$'],\n};\n\nexport const supportedDatasources = [DockerDatasource.id];\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../lib/modules/manager/devcontainer/index.ts"],"names":[],"mappings":";;;AACA,oDAA2D;AAC3D,oEAA0E;AAC1E,gEAAsE;AACtE,oEAA0E;AAC1E,gEAAsE;AACtE,qCAA+C;AAAtC,6GAAA,kBAAkB,OAAA;AAEd,QAAA,IAAI,GAAG,eAAe,CAAC;AACvB,QAAA,GAAG,GACd,6DAA6D,CAAC;AACnD,QAAA,UAAU,GAAe,CAAC,QAAQ,CAAC,CAAC;AAEpC,QAAA,aAAa,GAAG;IAC3B,SAAS,EAAE,CAAC,mCAAmC,EAAE,sBAAsB,CAAC;CACzE,CAAC;AAEW,QAAA,oBAAoB,GAAG;IAClC,yBAAgB,CAAC,EAAE;IACnB,wCAAuB,CAAC,EAAE;IAC1B,oCAAqB,CAAC,EAAE;IACxB,wCAAuB,CAAC,EAAE;IAC1B,oCAAqB,CAAC,EAAE;CACzB,CAAC","sourcesContent":["import type { Category } from '../../../constants';\nimport { DockerDatasource } from '../../datasource/docker';\nimport { GolangVersionDatasource } from '../../datasource/golang-version';\nimport { NodeVersionDatasource } from '../../datasource/node-version';\nimport { PythonVersionDatasource } from '../../datasource/python-version';\nimport { RubyVersionDatasource } from '../../datasource/ruby-version';\nexport { extractPackageFile } from './extract';\n\nexport const name = 'Dev Container';\nexport const url =\n  'https://code.visualstudio.com/docs/devcontainers/containers';\nexport const categories: Category[] = ['docker'];\n\nexport const defaultConfig = {\n  fileMatch: ['^.devcontainer/devcontainer.json$', '^.devcontainer.json$'],\n};\n\nexport const supportedDatasources = [\n  DockerDatasource.id,\n  GolangVersionDatasource.id,\n  NodeVersionDatasource.id,\n  PythonVersionDatasource.id,\n  RubyVersionDatasource.id,\n];\n"]}

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

@@ -1,12 +1,16 @@
 import { z } from 'zod';
 export declare const DevContainerFile: 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<{
     image: z.ZodOptional<z.ZodString>;
-    features: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
+    features: z.ZodOptional<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodAny>, Record<string, {
+        version?: string | undefined;
+    }>, Record<string, any>>>;
 }, "strip", z.ZodTypeAny, {
     image?: string | undefined;
-    features?: Record<string, unknown> | undefined;
+    features?: Record<string, {
+        version?: string | undefined;
+    }> | undefined;
 }, {
     image?: string | undefined;
-    features?: Record<string, unknown> | undefined;
+    features?: Record<string, any> | undefined;
 }>>;
 export type DevContainerFile = z.infer<typeof DevContainerFile>;

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

@@ -5,6 +5,8 @@ const zod_1 = require("zod");
 const schema_utils_1 = require("../../../util/schema-utils");
 exports.DevContainerFile = schema_utils_1.Jsonc.pipe(zod_1.z.object({
     image: zod_1.z.string().optional(),
-    features: zod_1.z.record(zod_1.z.unknown()).optional(),
+    features: (0, schema_utils_1.LooseRecord)(zod_1.z.object({
+        version: zod_1.z.string().optional(),
+    })).optional(),
 }));
 //# sourceMappingURL=schema.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../lib/modules/manager/devcontainer/schema.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AACxB,6DAAmD;AAEtC,QAAA,gBAAgB,GAAG,oBAAK,CAAC,IAAI,CACxC,OAAC,CAAC,MAAM,CAAC;IACP,KAAK,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC5B,QAAQ,EAAE,OAAC,CAAC,MAAM,CAAC,OAAC,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,EAAE;CAC3C,CAAC,CACH,CAAC","sourcesContent":["import { z } from 'zod';\nimport { Jsonc } from '../../../util/schema-utils';\n\nexport const DevContainerFile = Jsonc.pipe(\n  z.object({\n    image: z.string().optional(),\n    features: z.record(z.unknown()).optional(),\n  }),\n);\n\nexport type DevContainerFile = z.infer<typeof DevContainerFile>;\n"]}
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../lib/modules/manager/devcontainer/schema.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AACxB,6DAAgE;AAEnD,QAAA,gBAAgB,GAAG,oBAAK,CAAC,IAAI,CACxC,OAAC,CAAC,MAAM,CAAC;IACP,KAAK,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC5B,QAAQ,EAAE,IAAA,0BAAW,EACnB,OAAC,CAAC,MAAM,CAAC;QACP,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;KAC/B,CAAC,CACH,CAAC,QAAQ,EAAE;CACb,CAAC,CACH,CAAC","sourcesContent":["import { z } from 'zod';\nimport { Jsonc, LooseRecord } from '../../../util/schema-utils';\n\nexport const DevContainerFile = Jsonc.pipe(\n  z.object({\n    image: z.string().optional(),\n    features: LooseRecord(\n      z.object({\n        version: z.string().optional(),\n      }),\n    ).optional(),\n  }),\n);\n\nexport type DevContainerFile = z.infer<typeof DevContainerFile>;\n"]}

package/dist/modules/manager/docker-compose/schema.d.ts

@@ -14,34 +14,34 @@ export declare const DockerComposeFile: z.ZodUnion<[z.ZodObject<{
             dockerfile?: string | undefined;
         }>]>>;
     }, "strip", z.ZodTypeAny, {
-        image?: string | undefined;
         build?: string | {
             context?: string | undefined;
             dockerfile?: string | undefined;
         } | undefined;
-    }, {
         image?: string | undefined;
+    }, {
         build?: string | {
             context?: string | undefined;
             dockerfile?: string | undefined;
         } | undefined;
+        image?: string | undefined;
     }>>;
 }, "strip", z.ZodTypeAny, {
     services: Record<string, {
-        image?: string | undefined;
         build?: string | {
             context?: string | undefined;
             dockerfile?: string | undefined;
         } | undefined;
+        image?: string | undefined;
     }>;
     version?: string | undefined;
 }, {
     services: Record<string, {
-        image?: string | undefined;
         build?: string | {
             context?: string | undefined;
             dockerfile?: string | undefined;
         } | undefined;
+        image?: string | undefined;
     }>;
     version?: string | undefined;
 }>, z.ZodRecord<z.ZodString, z.ZodObject<{
@@ -57,16 +57,16 @@ export declare const DockerComposeFile: z.ZodUnion<[z.ZodObject<{
         dockerfile?: string | undefined;
     }>]>>;
 }, "strip", z.ZodTypeAny, {
-    image?: string | undefined;
     build?: string | {
         context?: string | undefined;
         dockerfile?: string | undefined;
     } | undefined;
-}, {
     image?: string | undefined;
+}, {
     build?: string | {
         context?: string | undefined;
         dockerfile?: string | undefined;
     } | undefined;
+    image?: string | undefined;
 }>>]>;
 export type DockerComposeFile = z.infer<typeof DockerComposeFile>;