renovate 41.72.0 → 42.0.0-next.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (220) hide show
  1. package/dist/modules/datasource/aws-eks-addon/schema.d.ts +8 -1
  2. package/dist/modules/datasource/aws-eks-addon/schema.js +5 -7
  3. package/dist/modules/datasource/aws-eks-addon/schema.js.map +1 -1
  4. package/dist/modules/datasource/buildpacks-registry/index.js +1 -1
  5. package/dist/modules/datasource/buildpacks-registry/index.js.map +1 -1
  6. package/dist/modules/datasource/buildpacks-registry/schema.d.ts +1 -1
  7. package/dist/modules/datasource/buildpacks-registry/schema.js +2 -2
  8. package/dist/modules/datasource/buildpacks-registry/schema.js.map +1 -1
  9. package/dist/modules/datasource/cdnjs/index.js +2 -2
  10. package/dist/modules/datasource/cdnjs/index.js.map +1 -1
  11. package/dist/modules/datasource/cdnjs/schema.d.ts +2 -2
  12. package/dist/modules/datasource/cdnjs/schema.js +3 -3
  13. package/dist/modules/datasource/cdnjs/schema.js.map +1 -1
  14. package/dist/modules/datasource/conda/prefix-dev.js +1 -1
  15. package/dist/modules/datasource/conda/prefix-dev.js.map +1 -1
  16. package/dist/modules/datasource/conda/schema/prefix-dev.d.ts +1 -1
  17. package/dist/modules/datasource/conda/schema/prefix-dev.js +2 -2
  18. package/dist/modules/datasource/conda/schema/prefix-dev.js.map +1 -1
  19. package/dist/modules/datasource/cpan/schema.js +2 -2
  20. package/dist/modules/datasource/cpan/schema.js.map +1 -1
  21. package/dist/modules/datasource/crate/index.js +1 -1
  22. package/dist/modules/datasource/crate/index.js.map +1 -1
  23. package/dist/modules/datasource/crate/schema.d.ts +1 -1
  24. package/dist/modules/datasource/crate/schema.js +2 -2
  25. package/dist/modules/datasource/crate/schema.js.map +1 -1
  26. package/dist/modules/datasource/custom/index.d.ts +1 -1
  27. package/dist/modules/datasource/custom/index.js +2 -2
  28. package/dist/modules/datasource/custom/index.js.map +1 -1
  29. package/dist/modules/datasource/custom/schema.d.ts +1 -1
  30. package/dist/modules/datasource/custom/schema.js +2 -2
  31. package/dist/modules/datasource/custom/schema.js.map +1 -1
  32. package/dist/modules/datasource/forgejo-releases/index.js +3 -3
  33. package/dist/modules/datasource/forgejo-releases/index.js.map +1 -1
  34. package/dist/modules/datasource/forgejo-releases/schema.d.ts +2 -2
  35. package/dist/modules/datasource/forgejo-releases/schema.js +3 -3
  36. package/dist/modules/datasource/forgejo-releases/schema.js.map +1 -1
  37. package/dist/modules/datasource/forgejo-tags/index.js +3 -3
  38. package/dist/modules/datasource/forgejo-tags/index.js.map +1 -1
  39. package/dist/modules/datasource/forgejo-tags/schema.d.ts +4 -4
  40. package/dist/modules/datasource/forgejo-tags/schema.js +7 -7
  41. package/dist/modules/datasource/forgejo-tags/schema.js.map +1 -1
  42. package/dist/modules/datasource/gitea-releases/index.js +3 -3
  43. package/dist/modules/datasource/gitea-releases/index.js.map +1 -1
  44. package/dist/modules/datasource/gitea-releases/schema.d.ts +2 -2
  45. package/dist/modules/datasource/gitea-releases/schema.js +3 -3
  46. package/dist/modules/datasource/gitea-releases/schema.js.map +1 -1
  47. package/dist/modules/datasource/gitea-tags/index.js +3 -3
  48. package/dist/modules/datasource/gitea-tags/index.js.map +1 -1
  49. package/dist/modules/datasource/gitea-tags/schema.d.ts +4 -4
  50. package/dist/modules/datasource/gitea-tags/schema.js +7 -7
  51. package/dist/modules/datasource/gitea-tags/schema.js.map +1 -1
  52. package/dist/modules/datasource/helm/index.js +1 -1
  53. package/dist/modules/datasource/helm/index.js.map +1 -1
  54. package/dist/modules/datasource/helm/schema.d.ts +2 -2
  55. package/dist/modules/datasource/helm/schema.js +4 -4
  56. package/dist/modules/datasource/helm/schema.js.map +1 -1
  57. package/dist/modules/manager/argocd/extract.js +1 -1
  58. package/dist/modules/manager/argocd/extract.js.map +1 -1
  59. package/dist/modules/manager/argocd/schema.d.ts +1 -1
  60. package/dist/modules/manager/argocd/schema.js +2 -2
  61. package/dist/modules/manager/argocd/schema.js.map +1 -1
  62. package/dist/modules/manager/batect/extract.js +1 -1
  63. package/dist/modules/manager/batect/extract.js.map +1 -1
  64. package/dist/modules/manager/batect/schema.d.ts +2 -2
  65. package/dist/modules/manager/batect/schema.js +2 -2
  66. package/dist/modules/manager/batect/schema.js.map +1 -1
  67. package/dist/modules/manager/bazel-module/parser/fragments.d.ts +21 -21
  68. package/dist/modules/manager/bazel-module/parser/fragments.js +32 -32
  69. package/dist/modules/manager/bazel-module/parser/fragments.js.map +1 -1
  70. package/dist/modules/manager/bazel-module/parser/maven.js +7 -7
  71. package/dist/modules/manager/bazel-module/parser/maven.js.map +1 -1
  72. package/dist/modules/manager/bazel-module/parser/oci.js +5 -5
  73. package/dist/modules/manager/bazel-module/parser/oci.js.map +1 -1
  74. package/dist/modules/manager/bazel-module/rules.js +18 -18
  75. package/dist/modules/manager/bazel-module/rules.js.map +1 -1
  76. package/dist/modules/manager/cargo/extract.js +2 -2
  77. package/dist/modules/manager/cargo/extract.js.map +1 -1
  78. package/dist/modules/manager/cargo/locked-version.d.ts +2 -2
  79. package/dist/modules/manager/cargo/locked-version.js +1 -1
  80. package/dist/modules/manager/cargo/locked-version.js.map +1 -1
  81. package/dist/modules/manager/cargo/schema.d.ts +32 -5
  82. package/dist/modules/manager/cargo/schema.js +8 -7
  83. package/dist/modules/manager/cargo/schema.js.map +1 -1
  84. package/dist/modules/manager/crossplane/extract.js +1 -1
  85. package/dist/modules/manager/crossplane/extract.js.map +1 -1
  86. package/dist/modules/manager/crossplane/schema.d.ts +2 -2
  87. package/dist/modules/manager/crossplane/schema.js +2 -2
  88. package/dist/modules/manager/crossplane/schema.js.map +1 -1
  89. package/dist/modules/manager/custom/jsonata/schema.d.ts +1 -1
  90. package/dist/modules/manager/custom/jsonata/schema.js +4 -4
  91. package/dist/modules/manager/custom/jsonata/schema.js.map +1 -1
  92. package/dist/modules/manager/custom/jsonata/utils.js +1 -1
  93. package/dist/modules/manager/custom/jsonata/utils.js.map +1 -1
  94. package/dist/modules/manager/devbox/extract.js +1 -1
  95. package/dist/modules/manager/devbox/extract.js.map +1 -1
  96. package/dist/modules/manager/devbox/schema.d.ts +1 -1
  97. package/dist/modules/manager/devbox/schema.js +2 -2
  98. package/dist/modules/manager/devbox/schema.js.map +1 -1
  99. package/dist/modules/manager/fingerprint.generated.js +2 -2
  100. package/dist/modules/manager/fingerprint.generated.js.map +1 -1
  101. package/dist/modules/manager/github-actions/community.js +10 -10
  102. package/dist/modules/manager/github-actions/community.js.map +1 -1
  103. package/dist/modules/manager/github-actions/extract.js +1 -1
  104. package/dist/modules/manager/github-actions/extract.js.map +1 -1
  105. package/dist/modules/manager/github-actions/schema.d.ts +3 -3
  106. package/dist/modules/manager/github-actions/schema.js +7 -7
  107. package/dist/modules/manager/github-actions/schema.js.map +1 -1
  108. package/dist/modules/manager/helmfile/extract.js.map +1 -1
  109. package/dist/modules/manager/mise/backends.d.ts +2 -2
  110. package/dist/modules/manager/mise/backends.js.map +1 -1
  111. package/dist/modules/manager/mise/extract.js.map +1 -1
  112. package/dist/modules/manager/mise/schema.d.ts +29 -6
  113. package/dist/modules/manager/mise/schema.js +8 -7
  114. package/dist/modules/manager/mise/schema.js.map +1 -1
  115. package/dist/modules/manager/mise/utils.d.ts +2 -2
  116. package/dist/modules/manager/mise/utils.js +1 -1
  117. package/dist/modules/manager/mise/utils.js.map +1 -1
  118. package/dist/modules/manager/npm/extract/index.js.map +1 -1
  119. package/dist/modules/manager/npm/extract/pnpm.d.ts +3 -4
  120. package/dist/modules/manager/npm/extract/pnpm.js +1 -1
  121. package/dist/modules/manager/npm/extract/pnpm.js.map +1 -1
  122. package/dist/modules/manager/npm/extract/yarnrc.d.ts +4 -4
  123. package/dist/modules/manager/npm/extract/yarnrc.js +2 -1
  124. package/dist/modules/manager/npm/extract/yarnrc.js.map +1 -1
  125. package/dist/modules/manager/npm/post-update/types.d.ts +5 -5
  126. package/dist/modules/manager/npm/post-update/types.js.map +1 -1
  127. package/dist/modules/manager/npm/post-update/utils.d.ts +4 -4
  128. package/dist/modules/manager/npm/post-update/utils.js.map +1 -1
  129. package/dist/modules/manager/npm/schema.d.ts +92 -10
  130. package/dist/modules/manager/npm/schema.js +16 -15
  131. package/dist/modules/manager/npm/schema.js.map +1 -1
  132. package/dist/modules/manager/npm/update/dependency/pnpm.js +1 -1
  133. package/dist/modules/manager/npm/update/dependency/pnpm.js.map +1 -1
  134. package/dist/modules/manager/nuget/schema.d.ts +55 -2
  135. package/dist/modules/manager/nuget/schema.js +6 -5
  136. package/dist/modules/manager/nuget/schema.js.map +1 -1
  137. package/dist/modules/manager/ocb/extract.js +1 -1
  138. package/dist/modules/manager/ocb/extract.js.map +1 -1
  139. package/dist/modules/manager/ocb/schema.d.ts +4 -4
  140. package/dist/modules/manager/ocb/schema.js +9 -9
  141. package/dist/modules/manager/ocb/schema.js.map +1 -1
  142. package/dist/modules/manager/pep621/extract.d.ts +1 -1
  143. package/dist/modules/manager/pep621/extract.js +1 -1
  144. package/dist/modules/manager/pep621/extract.js.map +1 -1
  145. package/dist/modules/manager/pep621/processors/pdm.js +1 -1
  146. package/dist/modules/manager/pep621/processors/pdm.js.map +1 -1
  147. package/dist/modules/manager/pep621/processors/uv.js +1 -1
  148. package/dist/modules/manager/pep621/processors/uv.js.map +1 -1
  149. package/dist/modules/manager/pep621/schema.d.ts +247 -9
  150. package/dist/modules/manager/pep621/schema.js +12 -10
  151. package/dist/modules/manager/pep621/schema.js.map +1 -1
  152. package/dist/modules/manager/pep723/extract.js +1 -1
  153. package/dist/modules/manager/pep723/extract.js.map +1 -1
  154. package/dist/modules/manager/pep723/schema.d.ts +1 -1
  155. package/dist/modules/manager/pep723/schema.js +2 -2
  156. package/dist/modules/manager/pep723/schema.js.map +1 -1
  157. package/dist/modules/manager/pixi/extract.js +7 -4
  158. package/dist/modules/manager/pixi/extract.js.map +1 -1
  159. package/dist/modules/manager/pixi/schema.d.ts +4 -296
  160. package/dist/modules/manager/pixi/schema.js +4 -11
  161. package/dist/modules/manager/pixi/schema.js.map +1 -1
  162. package/dist/modules/manager/poetry/artifacts.js +2 -2
  163. package/dist/modules/manager/poetry/artifacts.js.map +1 -1
  164. package/dist/modules/manager/poetry/extract.js +1 -1
  165. package/dist/modules/manager/poetry/extract.js.map +1 -1
  166. package/dist/modules/manager/poetry/schema.d.ts +107 -4
  167. package/dist/modules/manager/poetry/schema.js +6 -5
  168. package/dist/modules/manager/poetry/schema.js.map +1 -1
  169. package/dist/modules/manager/poetry/update-locked.js +2 -2
  170. package/dist/modules/manager/poetry/update-locked.js.map +1 -1
  171. package/dist/modules/manager/pub/extract.js.map +1 -1
  172. package/dist/modules/manager/pub/schema.d.ts +82 -4
  173. package/dist/modules/manager/pub/schema.js +10 -8
  174. package/dist/modules/manager/pub/schema.js.map +1 -1
  175. package/dist/modules/manager/pub/utils.d.ts +3 -3
  176. package/dist/modules/manager/pub/utils.js +2 -2
  177. package/dist/modules/manager/pub/utils.js.map +1 -1
  178. package/dist/modules/manager/renovate-config-presets/extract.js +1 -1
  179. package/dist/modules/manager/renovate-config-presets/extract.js.map +1 -1
  180. package/dist/modules/manager/renovate-config-presets/schema.d.ts +1 -1
  181. package/dist/modules/manager/renovate-config-presets/schema.js +2 -2
  182. package/dist/modules/manager/renovate-config-presets/schema.js.map +1 -1
  183. package/dist/modules/platform/azure/azure-helper.js +1 -1
  184. package/dist/modules/platform/azure/azure-helper.js.map +1 -1
  185. package/dist/modules/platform/azure/schema.d.ts +3 -3
  186. package/dist/modules/platform/azure/schema.js +4 -4
  187. package/dist/modules/platform/azure/schema.js.map +1 -1
  188. package/dist/modules/platform/bitbucket/schema.d.ts +1 -1
  189. package/dist/modules/platform/bitbucket/schema.js +7 -7
  190. package/dist/modules/platform/bitbucket/schema.js.map +1 -1
  191. package/dist/modules/platform/bitbucket-server/index.js +2 -2
  192. package/dist/modules/platform/bitbucket-server/index.js.map +1 -1
  193. package/dist/modules/platform/bitbucket-server/schema.d.ts +2 -2
  194. package/dist/modules/platform/bitbucket-server/schema.js +6 -6
  195. package/dist/modules/platform/bitbucket-server/schema.js.map +1 -1
  196. package/dist/modules/platform/gitea/schema.d.ts +3 -3
  197. package/dist/modules/platform/gitea/schema.js +3 -3
  198. package/dist/modules/platform/gitea/schema.js.map +1 -1
  199. package/dist/modules/platform/github/index.js +1 -1
  200. package/dist/modules/platform/github/index.js.map +1 -1
  201. package/dist/modules/platform/github/schema.d.ts +1 -2
  202. package/dist/modules/platform/github/schema.js +8 -8
  203. package/dist/modules/platform/github/schema.js.map +1 -1
  204. package/dist/util/cache/repository/http-cache.js +1 -1
  205. package/dist/util/cache/repository/http-cache.js.map +1 -1
  206. package/dist/util/emoji.js +2 -2
  207. package/dist/util/emoji.js.map +1 -1
  208. package/dist/util/http/cache/abstract-http-cache-provider.d.ts +1 -1
  209. package/dist/util/http/cache/abstract-http-cache-provider.js +2 -2
  210. package/dist/util/http/cache/abstract-http-cache-provider.js.map +1 -1
  211. package/dist/util/http/cache/schema.d.ts +2 -2
  212. package/dist/util/http/cache/schema.js +2 -2
  213. package/dist/util/http/cache/schema.js.map +1 -1
  214. package/dist/workers/repository/update/pr/changelog/bitbucket/index.js +1 -1
  215. package/dist/workers/repository/update/pr/changelog/bitbucket/index.js.map +1 -1
  216. package/dist/workers/repository/update/pr/changelog/forgejo/index.js +3 -3
  217. package/dist/workers/repository/update/pr/changelog/forgejo/index.js.map +1 -1
  218. package/dist/workers/repository/update/pr/changelog/gitea/index.js +3 -3
  219. package/dist/workers/repository/update/pr/changelog/gitea/index.js.map +1 -1
  220. package/package.json +1 -1
@@ -17,7 +17,7 @@ function extractPackageFile(content, packageFile) {
17
17
  .split(regex_1.newlineRegex)
18
18
  .map((line) => line.substring(line.startsWith('# ') ? 2 : 1))
19
19
  .join('\n');
20
- const { data: res, error } = schema_1.Pep723.safeParse(parsedToml);
20
+ const { data: res, error } = schema_1.Pep723Schema.safeParse(parsedToml);
21
21
  if (error) {
22
22
  logger_1.logger.debug({ packageFile, error }, `Error parsing PEP 723 inline script metadata`);
23
23
  return null;
@@ -1 +1 @@
1
- {"version":3,"file":"extract.js","sourceRoot":"","sources":["../../../../lib/modules/manager/pep723/extract.ts"],"names":[],"mappings":";;AAWA,gDA4BC;AAvCD,4CAAyC;AACzC,+CAA0D;AAE1D,qCAAkC;AAElC,iKAAiK;AACjK,MAAM,KAAK,GAAG,IAAA,aAAK,EACjB,yEAAyE,EACzE,GAAG,CACJ,CAAC;AAEF,SAAgB,kBAAkB,CAChC,OAAe,EACf,WAAmB;IAEnB,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAClC,MAAM,cAAc,GAAG,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC;IAE9C,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,gKAAgK;IAChK,MAAM,UAAU,GAAG,cAAc;SAC9B,KAAK,CAAC,oBAAY,CAAC;SACnB,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SAC5D,IAAI,CAAC,IAAI,CAAC,CAAC;IAEd,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,eAAM,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IAE1D,IAAI,KAAK,EAAE,CAAC;QACV,eAAM,CAAC,KAAK,CACV,EAAE,WAAW,EAAE,KAAK,EAAE,EACtB,8CAA8C,CAC/C,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;AACtC,CAAC","sourcesContent":["import { logger } from '../../../logger';\nimport { newlineRegex, regEx } from '../../../util/regex';\nimport type { PackageFileContent } from '../types';\nimport { Pep723 } from './schema';\n\n// Adapted regex from the Python reference implementation: https://packaging.python.org/en/latest/specifications/inline-script-metadata/#reference-implementation\nconst regex = regEx(\n /^# \\/\\/\\/ (?<type>[a-zA-Z0-9-]+)$\\s(?<content>(^#(| .*)$\\s)+)^# \\/\\/\\/$/,\n 'm',\n);\n\nexport function extractPackageFile(\n content: string,\n packageFile: string,\n): PackageFileContent | null {\n const match = regex.exec(content);\n const matchedContent = match?.groups?.content;\n\n if (!matchedContent) {\n return null;\n }\n\n // Adapted code from the Python reference implementation: https://packaging.python.org/en/latest/specifications/inline-script-metadata/#reference-implementation\n const parsedToml = matchedContent\n .split(newlineRegex)\n .map((line) => line.substring(line.startsWith('# ') ? 2 : 1))\n .join('\\n');\n\n const { data: res, error } = Pep723.safeParse(parsedToml);\n\n if (error) {\n logger.debug(\n { packageFile, error },\n `Error parsing PEP 723 inline script metadata`,\n );\n return null;\n }\n\n return res.deps.length ? res : null;\n}\n"]}
1
+ {"version":3,"file":"extract.js","sourceRoot":"","sources":["../../../../lib/modules/manager/pep723/extract.ts"],"names":[],"mappings":";;AAWA,gDA4BC;AAvCD,4CAAyC;AACzC,+CAA0D;AAE1D,qCAAwC;AAExC,iKAAiK;AACjK,MAAM,KAAK,GAAG,IAAA,aAAK,EACjB,yEAAyE,EACzE,GAAG,CACJ,CAAC;AAEF,SAAgB,kBAAkB,CAChC,OAAe,EACf,WAAmB;IAEnB,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAClC,MAAM,cAAc,GAAG,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC;IAE9C,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,gKAAgK;IAChK,MAAM,UAAU,GAAG,cAAc;SAC9B,KAAK,CAAC,oBAAY,CAAC;SACnB,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SAC5D,IAAI,CAAC,IAAI,CAAC,CAAC;IAEd,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,qBAAY,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IAEhE,IAAI,KAAK,EAAE,CAAC;QACV,eAAM,CAAC,KAAK,CACV,EAAE,WAAW,EAAE,KAAK,EAAE,EACtB,8CAA8C,CAC/C,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;AACtC,CAAC","sourcesContent":["import { logger } from '../../../logger';\nimport { newlineRegex, regEx } from '../../../util/regex';\nimport type { PackageFileContent } from '../types';\nimport { Pep723Schema } from './schema';\n\n// Adapted regex from the Python reference implementation: https://packaging.python.org/en/latest/specifications/inline-script-metadata/#reference-implementation\nconst regex = regEx(\n /^# \\/\\/\\/ (?<type>[a-zA-Z0-9-]+)$\\s(?<content>(^#(| .*)$\\s)+)^# \\/\\/\\/$/,\n 'm',\n);\n\nexport function extractPackageFile(\n content: string,\n packageFile: string,\n): PackageFileContent | null {\n const match = regex.exec(content);\n const matchedContent = match?.groups?.content;\n\n if (!matchedContent) {\n return null;\n }\n\n // Adapted code from the Python reference implementation: https://packaging.python.org/en/latest/specifications/inline-script-metadata/#reference-implementation\n const parsedToml = matchedContent\n .split(newlineRegex)\n .map((line) => line.substring(line.startsWith('# ') ? 2 : 1))\n .join('\\n');\n\n const { data: res, error } = Pep723Schema.safeParse(parsedToml);\n\n if (error) {\n logger.debug(\n { packageFile, error },\n `Error parsing PEP 723 inline script metadata`,\n );\n return null;\n }\n\n return res.deps.length ? res : null;\n}\n"]}
@@ -1,6 +1,6 @@
1
1
  import { z } from 'zod';
2
2
  import type { PackageFileContent } from '../types';
3
- export declare const Pep723: z.ZodPipeline<z.ZodEffects<z.ZodString, unknown, string>, z.ZodEffects<z.ZodObject<{
3
+ export declare const Pep723Schema: z.ZodPipeline<z.ZodEffects<z.ZodString, unknown, string>, z.ZodEffects<z.ZodObject<{
4
4
  'requires-python': z.ZodOptional<z.ZodString>;
5
5
  dependencies: z.ZodOptional<z.ZodEffects<z.ZodArray<z.ZodEffects<z.ZodString, import("../types").PackageDependency<Record<string, any>> | null, string>, "many">, import("../types").PackageDependency<Record<string, any>>[], string[]>>;
6
6
  }, "strip", z.ZodTypeAny, {
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.Pep723 = void 0;
3
+ exports.Pep723Schema = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  const is_1 = tslib_1.__importDefault(require("@sindresorhus/is"));
6
6
  const zod_1 = require("zod");
@@ -9,7 +9,7 @@ const utils_1 = require("../pep621/utils");
9
9
  const Pep723Dep = zod_1.z
10
10
  .string()
11
11
  .transform((dep) => (0, utils_1.pep508ToPackageDependency)(utils_1.depTypes.dependencies, dep));
12
- exports.Pep723 = schema_utils_1.Toml.pipe(zod_1.z
12
+ exports.Pep723Schema = schema_utils_1.Toml.pipe(zod_1.z
13
13
  .object({
14
14
  'requires-python': zod_1.z.string().optional(),
15
15
  dependencies: zod_1.z
@@ -1 +1 @@
1
- {"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../lib/modules/manager/pep723/schema.ts"],"names":[],"mappings":";;;;AAAA,kEAAkC;AAClC,6BAAwB;AACxB,6DAAkD;AAClD,2CAAsE;AAGtE,MAAM,SAAS,GAAG,OAAC;KAChB,MAAM,EAAE;KACR,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,iCAAyB,EAAC,gBAAQ,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC,CAAC;AAEhE,QAAA,MAAM,GAAG,mBAAI,CAAC,IAAI,CAC7B,OAAC;KACE,MAAM,CAAC;IACN,iBAAiB,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACxC,YAAY,EAAE,OAAC;SACZ,KAAK,CAAC,SAAS,CAAC;SAChB,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;SAChD,QAAQ,EAAE;CACd,CAAC;KACD,SAAS,CAAC,CAAC,EAAE,iBAAiB,EAAE,cAAc,EAAE,YAAY,EAAE,EAAE,EAAE;IACjE,MAAM,GAAG,GAAuB,EAAE,IAAI,EAAE,YAAY,IAAI,EAAE,EAAE,CAAC;IAE7D,IAAI,YAAE,CAAC,cAAc,CAAC,cAAc,CAAC,EAAE,CAAC;QACtC,GAAG,CAAC,oBAAoB,GAAG,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC;IACxD,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC,CAAC,CACL,CAAC","sourcesContent":["import is from '@sindresorhus/is';\nimport { z } from 'zod';\nimport { Toml } from '../../../util/schema-utils';\nimport { depTypes, pep508ToPackageDependency } from '../pep621/utils';\nimport type { PackageFileContent } from '../types';\n\nconst Pep723Dep = z\n .string()\n .transform((dep) => pep508ToPackageDependency(depTypes.dependencies, dep));\n\nexport const Pep723 = Toml.pipe(\n z\n .object({\n 'requires-python': z.string().optional(),\n dependencies: z\n .array(Pep723Dep)\n .transform((deps) => deps.filter((dep) => !!dep))\n .optional(),\n })\n .transform(({ 'requires-python': requiresPython, dependencies }) => {\n const res: PackageFileContent = { deps: dependencies ?? [] };\n\n if (is.nonEmptyString(requiresPython)) {\n res.extractedConstraints = { python: requiresPython };\n }\n\n return res;\n }),\n);\n"]}
1
+ {"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../lib/modules/manager/pep723/schema.ts"],"names":[],"mappings":";;;;AAAA,kEAAkC;AAClC,6BAAwB;AACxB,6DAAkD;AAClD,2CAAsE;AAGtE,MAAM,SAAS,GAAG,OAAC;KAChB,MAAM,EAAE;KACR,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,iCAAyB,EAAC,gBAAQ,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC,CAAC;AAEhE,QAAA,YAAY,GAAG,mBAAI,CAAC,IAAI,CACnC,OAAC;KACE,MAAM,CAAC;IACN,iBAAiB,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACxC,YAAY,EAAE,OAAC;SACZ,KAAK,CAAC,SAAS,CAAC;SAChB,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;SAChD,QAAQ,EAAE;CACd,CAAC;KACD,SAAS,CAAC,CAAC,EAAE,iBAAiB,EAAE,cAAc,EAAE,YAAY,EAAE,EAAE,EAAE;IACjE,MAAM,GAAG,GAAuB,EAAE,IAAI,EAAE,YAAY,IAAI,EAAE,EAAE,CAAC;IAE7D,IAAI,YAAE,CAAC,cAAc,CAAC,cAAc,CAAC,EAAE,CAAC;QACtC,GAAG,CAAC,oBAAoB,GAAG,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC;IACxD,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC,CAAC,CACL,CAAC","sourcesContent":["import is from '@sindresorhus/is';\nimport { z } from 'zod';\nimport { Toml } from '../../../util/schema-utils';\nimport { depTypes, pep508ToPackageDependency } from '../pep621/utils';\nimport type { PackageFileContent } from '../types';\n\nconst Pep723Dep = z\n .string()\n .transform((dep) => pep508ToPackageDependency(depTypes.dependencies, dep));\n\nexport const Pep723Schema = Toml.pipe(\n z\n .object({\n 'requires-python': z.string().optional(),\n dependencies: z\n .array(Pep723Dep)\n .transform((deps) => deps.filter((dep) => !!dep))\n .optional(),\n })\n .transform(({ 'requires-python': requiresPython, dependencies }) => {\n const res: PackageFileContent = { deps: dependencies ?? [] };\n\n if (is.nonEmptyString(requiresPython)) {\n res.extractedConstraints = { python: requiresPython };\n }\n\n return res;\n }),\n);\n"]}
@@ -9,13 +9,16 @@ const logger_1 = require("../../../logger");
9
9
  const array_1 = require("../../../util/array");
10
10
  const fs_1 = require("../../../util/fs");
11
11
  const result_1 = require("../../../util/result");
12
+ const schema_utils_1 = require("../../../util/schema-utils");
12
13
  const url_1 = require("../../../util/url");
13
14
  const common_1 = require("../../datasource/conda/common");
14
- const schema_1 = require("./schema");
15
+ const schema_1 = require("../pep621/schema");
16
+ const schema_2 = require("./schema");
17
+ const PyProjectToml = schema_utils_1.Toml.pipe(schema_1.PyProjectSchema);
15
18
  function getUserPixiConfig(content, packageFile) {
16
19
  if (packageFile === 'pyproject.toml' ||
17
20
  packageFile.endsWith('/pyproject.toml')) {
18
- const { val, err } = result_1.Result.parse(content, schema_1.PixiPyProject).unwrap();
21
+ const { val, err } = result_1.Result.parse(content, PyProjectToml).unwrap();
19
22
  if (err) {
20
23
  logger_1.logger.debug({ packageFile, err }, `error parsing ${packageFile}`);
21
24
  return null;
@@ -23,14 +26,14 @@ function getUserPixiConfig(content, packageFile) {
23
26
  return val.tool?.pixi ?? null;
24
27
  }
25
28
  if (packageFile === 'pixi.toml' || packageFile.endsWith('/pixi.toml')) {
26
- const { val, err } = result_1.Result.parse(content, schema_1.PixiFile).unwrap();
29
+ const { val, err } = result_1.Result.parse(content, schema_2.PixiToml).unwrap();
27
30
  if (err) {
28
31
  logger_1.logger.debug({ packageFile, err }, `error parsing ${packageFile}`);
29
32
  return null;
30
33
  }
31
34
  return val;
32
35
  }
33
- const { val, err } = result_1.Result.parse(content, zod_1.z.union([schema_1.PixiFile, schema_1.PixiPyProject.transform((p) => p.tool?.pixi)])).unwrap();
36
+ const { val, err } = result_1.Result.parse(content, zod_1.z.union([schema_2.PixiToml, PyProjectToml.transform((p) => p.tool?.pixi)])).unwrap();
34
37
  if (err) {
35
38
  logger_1.logger.debug({ packageFile, err }, `error parsing ${packageFile}`);
36
39
  return null;
@@ -1 +1 @@
1
- {"version":3,"file":"extract.js","sourceRoot":"","sources":["../../../../lib/modules/manager/pixi/extract.ts"],"names":[],"mappings":"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","sourcesContent":["import is from '@sindresorhus/is';\nimport { z } from 'zod';\n\nimport { logger } from '../../../logger';\nimport { coerceArray } from '../../../util/array';\nimport { getSiblingFileName, localPathExists } from '../../../util/fs';\nimport { Result } from '../../../util/result';\nimport {\n ensureTrailingSlash,\n isHttpUrl,\n joinUrlParts,\n} from '../../../util/url';\nimport type { RegistryStrategy } from '../../datasource';\nimport { defaultRegistryUrl as defaultCondaRegistryApi } from '../../datasource/conda/common';\nimport type { PackageFileContent } from '../types';\nimport {\n type Channels,\n type PixiConfig,\n PixiFile,\n type PixiPackageDependency,\n PixiPyProject,\n} from './schema';\n\nexport function getUserPixiConfig(\n content: string,\n packageFile: string,\n): null | PixiConfig {\n if (\n packageFile === 'pyproject.toml' ||\n packageFile.endsWith('/pyproject.toml')\n ) {\n const { val, err } = Result.parse(content, PixiPyProject).unwrap();\n if (err) {\n logger.debug({ packageFile, err }, `error parsing ${packageFile}`);\n return null;\n }\n\n return val.tool?.pixi ?? null;\n }\n\n if (packageFile === 'pixi.toml' || packageFile.endsWith('/pixi.toml')) {\n const { val, err } = Result.parse(content, PixiFile).unwrap();\n if (err) {\n logger.debug({ packageFile, err }, `error parsing ${packageFile}`);\n return null;\n }\n\n return val;\n }\n\n const { val, err } = Result.parse(\n content,\n z.union([PixiFile, PixiPyProject.transform((p) => p.tool?.pixi)]),\n ).unwrap();\n\n if (err) {\n logger.debug({ packageFile, err }, `error parsing ${packageFile}`);\n return null;\n }\n return val ?? null;\n}\n\nexport async function extractPackageFile(\n content: string,\n packageFile: string,\n): Promise<PackageFileContent | null> {\n logger.trace(`pixi.extractPackageFile(${packageFile})`);\n\n const val = getUserPixiConfig(content, packageFile);\n if (!val) {\n return null;\n }\n\n const lockfileName = getSiblingFileName(packageFile, 'pixi.lock');\n const lockFiles: string[] = [];\n if (await localPathExists(lockfileName)) {\n lockFiles.push(lockfileName);\n }\n\n const project = val.project;\n\n const channelPriority = project['channel-priority'];\n\n let registryStrategy: RegistryStrategy | undefined;\n\n if (channelPriority === 'disabled') {\n registryStrategy = 'merge';\n }\n\n // resolve channels and build registry urls for each channel with order\n const conda: PixiPackageDependency[] = [];\n\n for (const item of val.conda) {\n conda.push(\n addRegistryUrls({\n ...item,\n channels: project.channels,\n registryStrategy,\n }),\n );\n }\n\n for (const item of val.feature.conda) {\n conda.push(\n addRegistryUrls({\n ...item,\n registryStrategy,\n channels: [...coerceArray(item.channels), ...project.channels],\n }),\n );\n }\n\n return {\n lockFiles,\n deps: [conda, val.pypi, val.feature.pypi].flat(),\n };\n}\n\nfunction addRegistryUrls(item: PixiPackageDependency): PixiPackageDependency {\n const channels = orderChannels(item.channels);\n\n if (item.channel) {\n return {\n ...item,\n channels,\n registryUrls: [channelToRegistryUrl(item.channel)],\n };\n }\n\n if (channels.length === 0) {\n return {\n ...item,\n channels,\n skipStage: 'extract',\n skipReason: 'unknown-registry',\n };\n }\n\n const registryUrls: string[] = [];\n for (const channel of channels) {\n registryUrls.push(channelToRegistryUrl(channel));\n }\n\n return {\n ...item,\n channels,\n registryUrls,\n };\n}\n\nfunction channelToRegistryUrl(channel: string): string {\n if (isHttpUrl(channel)) {\n return ensureTrailingSlash(channel);\n }\n\n return ensureTrailingSlash(joinUrlParts(defaultCondaRegistryApi, channel));\n}\n\nfunction orderChannels(channels: Channels = []): string[] {\n return channels\n .map((channel, index) => {\n if (is.string(channel)) {\n return { channel, priority: 0, index };\n }\n\n return { ...channel, index: 0 };\n })\n .toSorted((a, b) => {\n // first based on priority then based on index\n if (a.priority !== b.priority) {\n return b.priority - a.priority;\n }\n\n return a.index - b.index;\n })\n .map((c) => c.channel);\n}\n"]}
1
+ {"version":3,"file":"extract.js","sourceRoot":"","sources":["../../../../lib/modules/manager/pixi/extract.ts"],"names":[],"mappings":"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","sourcesContent":["import is from '@sindresorhus/is';\nimport { z } from 'zod';\n\nimport { logger } from '../../../logger';\nimport { coerceArray } from '../../../util/array';\nimport { getSiblingFileName, localPathExists } from '../../../util/fs';\nimport { Result } from '../../../util/result';\nimport { Toml } from '../../../util/schema-utils';\nimport {\n ensureTrailingSlash,\n isHttpUrl,\n joinUrlParts,\n} from '../../../util/url';\nimport type { RegistryStrategy } from '../../datasource';\nimport { defaultRegistryUrl as defaultCondaRegistryApi } from '../../datasource/conda/common';\nimport { PyProjectSchema } from '../pep621/schema';\nimport type { PackageFileContent } from '../types';\nimport {\n type Channels,\n type PixiConfig,\n type PixiPackageDependency,\n PixiToml,\n} from './schema';\n\nconst PyProjectToml = Toml.pipe(PyProjectSchema);\n\nexport function getUserPixiConfig(\n content: string,\n packageFile: string,\n): null | PixiConfig {\n if (\n packageFile === 'pyproject.toml' ||\n packageFile.endsWith('/pyproject.toml')\n ) {\n const { val, err } = Result.parse(content, PyProjectToml).unwrap();\n if (err) {\n logger.debug({ packageFile, err }, `error parsing ${packageFile}`);\n return null;\n }\n\n return val.tool?.pixi ?? null;\n }\n\n if (packageFile === 'pixi.toml' || packageFile.endsWith('/pixi.toml')) {\n const { val, err } = Result.parse(content, PixiToml).unwrap();\n if (err) {\n logger.debug({ packageFile, err }, `error parsing ${packageFile}`);\n return null;\n }\n\n return val;\n }\n\n const { val, err } = Result.parse(\n content,\n z.union([PixiToml, PyProjectToml.transform((p) => p.tool?.pixi)]),\n ).unwrap();\n\n if (err) {\n logger.debug({ packageFile, err }, `error parsing ${packageFile}`);\n return null;\n }\n return val ?? null;\n}\n\nexport async function extractPackageFile(\n content: string,\n packageFile: string,\n): Promise<PackageFileContent | null> {\n logger.trace(`pixi.extractPackageFile(${packageFile})`);\n\n const val = getUserPixiConfig(content, packageFile);\n if (!val) {\n return null;\n }\n\n const lockfileName = getSiblingFileName(packageFile, 'pixi.lock');\n const lockFiles: string[] = [];\n if (await localPathExists(lockfileName)) {\n lockFiles.push(lockfileName);\n }\n\n const project = val.project;\n\n const channelPriority = project['channel-priority'];\n\n let registryStrategy: RegistryStrategy | undefined;\n\n if (channelPriority === 'disabled') {\n registryStrategy = 'merge';\n }\n\n // resolve channels and build registry urls for each channel with order\n const conda: PixiPackageDependency[] = [];\n\n for (const item of val.conda) {\n conda.push(\n addRegistryUrls({\n ...item,\n channels: project.channels,\n registryStrategy,\n }),\n );\n }\n\n for (const item of val.feature.conda) {\n conda.push(\n addRegistryUrls({\n ...item,\n registryStrategy,\n channels: [...coerceArray(item.channels), ...project.channels],\n }),\n );\n }\n\n return {\n lockFiles,\n deps: [conda, val.pypi, val.feature.pypi].flat(),\n };\n}\n\nfunction addRegistryUrls(item: PixiPackageDependency): PixiPackageDependency {\n const channels = orderChannels(item.channels);\n\n if (item.channel) {\n return {\n ...item,\n channels,\n registryUrls: [channelToRegistryUrl(item.channel)],\n };\n }\n\n if (channels.length === 0) {\n return {\n ...item,\n channels,\n skipStage: 'extract',\n skipReason: 'unknown-registry',\n };\n }\n\n const registryUrls: string[] = [];\n for (const channel of channels) {\n registryUrls.push(channelToRegistryUrl(channel));\n }\n\n return {\n ...item,\n channels,\n registryUrls,\n };\n}\n\nfunction channelToRegistryUrl(channel: string): string {\n if (isHttpUrl(channel)) {\n return ensureTrailingSlash(channel);\n }\n\n return ensureTrailingSlash(joinUrlParts(defaultCondaRegistryApi, channel));\n}\n\nfunction orderChannels(channels: Channels = []): string[] {\n return channels\n .map((channel, index) => {\n if (is.string(channel)) {\n return { channel, priority: 0, index };\n }\n\n return { ...channel, index: 0 };\n })\n .toSorted((a, b) => {\n // first based on priority then based on index\n if (a.priority !== b.priority) {\n return b.priority - a.priority;\n }\n\n return a.index - b.index;\n })\n .map((c) => c.channel);\n}\n"]}
@@ -18,7 +18,7 @@ export interface PixiPackageDependency extends PackageDependency {
18
18
  /**
19
19
  * `$` of `pixi.toml` or `$.tool.pixi` of `pyproject.toml`
20
20
  */
21
- export declare const PixiConfig: z.ZodIntersection<z.ZodIntersection<z.ZodUnion<[z.ZodEffects<z.ZodObject<{
21
+ export declare const PixiConfigSchema: z.ZodIntersection<z.ZodIntersection<z.ZodUnion<[z.ZodEffects<z.ZodObject<{
22
22
  workspace: z.ZodObject<{
23
23
  channels: z.ZodDefault<z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodObject<{
24
24
  channel: z.ZodString;
@@ -202,8 +202,8 @@ export declare const PixiConfig: z.ZodIntersection<z.ZodIntersection<z.ZodUnion<
202
202
  dependencies?: Record<string, any> | undefined;
203
203
  'pypi-dependencies'?: Record<string, any> | undefined;
204
204
  }>>;
205
- export type PixiConfig = z.infer<typeof PixiConfig>;
206
- export declare const PixiFile: z.ZodPipeline<z.ZodEffects<z.ZodString, unknown, string>, z.ZodIntersection<z.ZodIntersection<z.ZodUnion<[z.ZodEffects<z.ZodObject<{
205
+ export type PixiConfig = z.infer<typeof PixiConfigSchema>;
206
+ export declare const PixiToml: z.ZodPipeline<z.ZodEffects<z.ZodString, unknown, string>, z.ZodIntersection<z.ZodIntersection<z.ZodUnion<[z.ZodEffects<z.ZodObject<{
207
207
  workspace: z.ZodObject<{
208
208
  channels: z.ZodDefault<z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodObject<{
209
209
  channel: z.ZodString;
@@ -387,299 +387,7 @@ export declare const PixiFile: z.ZodPipeline<z.ZodEffects<z.ZodString, unknown,
387
387
  dependencies?: Record<string, any> | undefined;
388
388
  'pypi-dependencies'?: Record<string, any> | undefined;
389
389
  }>>>;
390
- export declare const PixiPyProject: z.ZodPipeline<z.ZodEffects<z.ZodString, unknown, string>, z.ZodObject<{
391
- project: z.ZodCatch<z.ZodOptional<z.ZodObject<{
392
- version: z.ZodCatch<z.ZodOptional<z.ZodString>>;
393
- 'requires-python': z.ZodCatch<z.ZodOptional<z.ZodString>>;
394
- dependencies: z.ZodCatch<z.ZodEffects<z.ZodArray<z.ZodAny, "many">, PackageDependency<Record<string, any>>[], any[]>>;
395
- 'optional-dependencies': z.ZodCatch<z.ZodType<PackageDependency<Record<string, any>>[], z.ZodTypeDef, PackageDependency<Record<string, any>>[]>>;
396
- }, "strip", z.ZodTypeAny, {
397
- dependencies: PackageDependency<Record<string, any>>[];
398
- 'optional-dependencies': PackageDependency<Record<string, any>>[];
399
- version?: string | undefined;
400
- 'requires-python'?: string | undefined;
401
- }, {
402
- version?: unknown;
403
- dependencies?: unknown;
404
- 'requires-python'?: unknown;
405
- 'optional-dependencies'?: unknown;
406
- }>>>;
407
- 'build-system': z.ZodCatch<z.ZodOptional<z.ZodObject<{
408
- requires: z.ZodCatch<z.ZodEffects<z.ZodArray<z.ZodAny, "many">, PackageDependency<Record<string, any>>[], any[]>>;
409
- 'build-backend': z.ZodCatch<z.ZodOptional<z.ZodString>>;
410
- }, "strip", z.ZodTypeAny, {
411
- requires: PackageDependency<Record<string, any>>[];
412
- 'build-backend'?: string | undefined;
413
- }, {
414
- requires?: unknown;
415
- 'build-backend'?: unknown;
416
- }>>>;
417
- 'dependency-groups': z.ZodCatch<z.ZodType<PackageDependency<Record<string, any>>[], z.ZodTypeDef, PackageDependency<Record<string, any>>[]>>;
418
- } & {
419
- tool: z.ZodCatch<z.ZodOptional<z.ZodObject<{
420
- pixi: z.ZodCatch<z.ZodOptional<z.ZodIntersection<z.ZodIntersection<z.ZodUnion<[z.ZodEffects<z.ZodObject<{
421
- workspace: z.ZodObject<{
422
- channels: z.ZodDefault<z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodObject<{
423
- channel: z.ZodString;
424
- priority: z.ZodNumber;
425
- }, "strip", z.ZodTypeAny, {
426
- priority: number;
427
- channel: string;
428
- }, {
429
- priority: number;
430
- channel: string;
431
- }>]>, "many">>;
432
- 'requires-pixi': z.ZodOptional<z.ZodString>;
433
- 'channel-priority': z.ZodDefault<z.ZodUnion<[z.ZodLiteral<"strict">, z.ZodLiteral<"disabled">]>>;
434
- }, "strip", z.ZodTypeAny, {
435
- channels: (string | {
436
- priority: number;
437
- channel: string;
438
- })[];
439
- 'channel-priority': "disabled" | "strict";
440
- 'requires-pixi'?: string | undefined;
441
- }, {
442
- channels?: (string | {
443
- priority: number;
444
- channel: string;
445
- })[] | undefined;
446
- 'requires-pixi'?: string | undefined;
447
- 'channel-priority'?: "disabled" | "strict" | undefined;
448
- }>;
449
- }, "strip", z.ZodTypeAny, {
450
- workspace: {
451
- channels: (string | {
452
- priority: number;
453
- channel: string;
454
- })[];
455
- 'channel-priority': "disabled" | "strict";
456
- 'requires-pixi'?: string | undefined;
457
- };
458
- }, {
459
- workspace: {
460
- channels?: (string | {
461
- priority: number;
462
- channel: string;
463
- })[] | undefined;
464
- 'requires-pixi'?: string | undefined;
465
- 'channel-priority'?: "disabled" | "strict" | undefined;
466
- };
467
- }>, {
468
- project: {
469
- channels: (string | {
470
- priority: number;
471
- channel: string;
472
- })[];
473
- 'channel-priority': "disabled" | "strict";
474
- 'requires-pixi'?: string | undefined;
475
- };
476
- }, {
477
- workspace: {
478
- channels?: (string | {
479
- priority: number;
480
- channel: string;
481
- })[] | undefined;
482
- 'requires-pixi'?: string | undefined;
483
- 'channel-priority'?: "disabled" | "strict" | undefined;
484
- };
485
- }>, z.ZodObject<{
486
- project: z.ZodObject<{
487
- channels: z.ZodDefault<z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodObject<{
488
- channel: z.ZodString;
489
- priority: z.ZodNumber;
490
- }, "strip", z.ZodTypeAny, {
491
- priority: number;
492
- channel: string;
493
- }, {
494
- priority: number;
495
- channel: string;
496
- }>]>, "many">>;
497
- 'requires-pixi': z.ZodOptional<z.ZodString>;
498
- 'channel-priority': z.ZodDefault<z.ZodUnion<[z.ZodLiteral<"strict">, z.ZodLiteral<"disabled">]>>;
499
- }, "strip", z.ZodTypeAny, {
500
- channels: (string | {
501
- priority: number;
502
- channel: string;
503
- })[];
504
- 'channel-priority': "disabled" | "strict";
505
- 'requires-pixi'?: string | undefined;
506
- }, {
507
- channels?: (string | {
508
- priority: number;
509
- channel: string;
510
- })[] | undefined;
511
- 'requires-pixi'?: string | undefined;
512
- 'channel-priority'?: "disabled" | "strict" | undefined;
513
- }>;
514
- }, "strip", z.ZodTypeAny, {
515
- project: {
516
- channels: (string | {
517
- priority: number;
518
- channel: string;
519
- })[];
520
- 'channel-priority': "disabled" | "strict";
521
- 'requires-pixi'?: string | undefined;
522
- };
523
- }, {
524
- project: {
525
- channels?: (string | {
526
- priority: number;
527
- channel: string;
528
- })[] | undefined;
529
- 'requires-pixi'?: string | undefined;
530
- 'channel-priority'?: "disabled" | "strict" | undefined;
531
- };
532
- }>]>, z.ZodObject<{
533
- feature: z.ZodDefault<z.ZodEffects<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodAny>, Record<string, {
534
- channels?: (string | {
535
- priority: number;
536
- channel: string;
537
- })[] | undefined;
538
- } & {
539
- pypi: PixiPackageDependency[];
540
- conda: PixiPackageDependency[];
541
- }>, Record<string, any>>, {
542
- conda: PixiPackageDependency[];
543
- pypi: PixiPackageDependency[];
544
- }, Record<string, any>>>;
545
- }, "strip", z.ZodTypeAny, {
546
- feature: {
547
- conda: PixiPackageDependency[];
548
- pypi: PixiPackageDependency[];
549
- };
550
- }, {
551
- feature?: Record<string, any> | undefined;
552
- }>>, z.ZodEffects<z.ZodObject<{
553
- dependencies: z.ZodDefault<z.ZodOptional<z.ZodEffects<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodAny>, Record<string, {
554
- currentValue: string;
555
- versioning: string;
556
- datasource: string;
557
- channel: string | undefined;
558
- }>, Record<string, any>>, PackageDependency<Record<string, any>>[], Record<string, any>>>>;
559
- 'pypi-dependencies': z.ZodDefault<z.ZodOptional<z.ZodEffects<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodAny>, Record<string, {
560
- currentValue: string;
561
- versioning: string;
562
- datasource: string;
563
- } | {
564
- currentValue: string | undefined;
565
- packageName: string;
566
- datasource: string;
567
- versioning: string;
568
- skipStage: "extract";
569
- skipReason: "unspecified-version";
570
- } | {
571
- currentValue: string;
572
- packageName: string;
573
- datasource: string;
574
- versioning: string;
575
- skipStage?: undefined;
576
- skipReason?: undefined;
577
- }>, Record<string, any>>, PackageDependency<Record<string, any>>[], Record<string, any>>>>;
578
- target: z.ZodDefault<z.ZodOptional<z.ZodEffects<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodAny>, Record<string, {
579
- dependencies: PackageDependency<Record<string, any>>[];
580
- 'pypi-dependencies': PackageDependency<Record<string, any>>[];
581
- }>, Record<string, any>>, {
582
- pypi: PixiPackageDependency[];
583
- conda: PixiPackageDependency[];
584
- }, Record<string, any>>>>;
585
- }, "strip", z.ZodTypeAny, {
586
- target: {
587
- pypi: PixiPackageDependency[];
588
- conda: PixiPackageDependency[];
589
- };
590
- dependencies: PackageDependency<Record<string, any>>[];
591
- 'pypi-dependencies': PackageDependency<Record<string, any>>[];
592
- }, {
593
- target?: Record<string, any> | undefined;
594
- dependencies?: Record<string, any> | undefined;
595
- 'pypi-dependencies'?: Record<string, any> | undefined;
596
- }>, {
597
- pypi: PixiPackageDependency[];
598
- conda: PixiPackageDependency[];
599
- }, {
600
- target?: Record<string, any> | undefined;
601
- dependencies?: Record<string, any> | undefined;
602
- 'pypi-dependencies'?: Record<string, any> | undefined;
603
- }>>>>;
604
- }, "strip", z.ZodTypeAny, {
605
- pixi?: ((({
606
- project: {
607
- channels: (string | {
608
- priority: number;
609
- channel: string;
610
- })[];
611
- 'channel-priority': "disabled" | "strict";
612
- 'requires-pixi'?: string | undefined;
613
- };
614
- } | {
615
- project: {
616
- channels: (string | {
617
- priority: number;
618
- channel: string;
619
- })[];
620
- 'channel-priority': "disabled" | "strict";
621
- 'requires-pixi'?: string | undefined;
622
- };
623
- }) & {
624
- feature: {
625
- conda: PixiPackageDependency[];
626
- pypi: PixiPackageDependency[];
627
- };
628
- }) & {
629
- pypi: PixiPackageDependency[];
630
- conda: PixiPackageDependency[];
631
- }) | undefined;
632
- }, {
633
- pixi?: unknown;
634
- }>>>;
635
- }, "strip", z.ZodTypeAny, {
636
- 'dependency-groups': PackageDependency<Record<string, any>>[];
637
- project?: {
638
- dependencies: PackageDependency<Record<string, any>>[];
639
- 'optional-dependencies': PackageDependency<Record<string, any>>[];
640
- version?: string | undefined;
641
- 'requires-python'?: string | undefined;
642
- } | undefined;
643
- tool?: {
644
- pixi?: ((({
645
- project: {
646
- channels: (string | {
647
- priority: number;
648
- channel: string;
649
- })[];
650
- 'channel-priority': "disabled" | "strict";
651
- 'requires-pixi'?: string | undefined;
652
- };
653
- } | {
654
- project: {
655
- channels: (string | {
656
- priority: number;
657
- channel: string;
658
- })[];
659
- 'channel-priority': "disabled" | "strict";
660
- 'requires-pixi'?: string | undefined;
661
- };
662
- }) & {
663
- feature: {
664
- conda: PixiPackageDependency[];
665
- pypi: PixiPackageDependency[];
666
- };
667
- }) & {
668
- pypi: PixiPackageDependency[];
669
- conda: PixiPackageDependency[];
670
- }) | undefined;
671
- } | undefined;
672
- 'build-system'?: {
673
- requires: PackageDependency<Record<string, any>>[];
674
- 'build-backend'?: string | undefined;
675
- } | undefined;
676
- }, {
677
- project?: unknown;
678
- tool?: unknown;
679
- 'dependency-groups'?: unknown;
680
- 'build-system'?: unknown;
681
- }>>;
682
- export declare const Lockfile: 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<{
390
+ export declare const LockfileYaml: 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<{
683
391
  version: z.ZodNumber;
684
392
  }, "strip", z.ZodTypeAny, {
685
393
  version: number;
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.Lockfile = exports.PixiPyProject = exports.PixiFile = exports.PixiConfig = void 0;
3
+ exports.LockfileYaml = exports.PixiToml = exports.PixiConfigSchema = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  const zod_1 = require("zod");
6
6
  const schema_utils_1 = require("../../../util/schema-utils");
@@ -10,7 +10,6 @@ const pypi_1 = require("../../datasource/pypi");
10
10
  const condaVersion = tslib_1.__importStar(require("../../versioning/conda/"));
11
11
  const git_1 = require("../../versioning/git");
12
12
  const pep440_1 = require("../../versioning/pep440/");
13
- const schema_1 = require("../pep621/schema");
14
13
  const Channel = zod_1.z.union([
15
14
  zod_1.z.string(),
16
15
  zod_1.z.object({ channel: zod_1.z.string(), priority: zod_1.z.number() }),
@@ -137,18 +136,12 @@ const PixiProject = zod_1.z.object({
137
136
  /**
138
137
  * `$` of `pixi.toml` or `$.tool.pixi` of `pyproject.toml`
139
138
  */
140
- exports.PixiConfig = zod_1.z
139
+ exports.PixiConfigSchema = zod_1.z
141
140
  .union([PixiWorkspace, PixiProject])
142
141
  .and(zod_1.z.object({ feature: Features.default({}) }))
143
142
  .and(DependenciesMixin);
144
- exports.PixiFile = schema_utils_1.Toml.pipe(exports.PixiConfig);
145
- exports.PixiPyProject = schema_utils_1.Toml.pipe(schema_1.PyProject.extend({
146
- tool: zod_1.z
147
- .object({ pixi: exports.PixiConfig.optional().catch(undefined) })
148
- .optional()
149
- .catch(undefined),
150
- }));
151
- exports.Lockfile = schema_utils_1.Yaml.pipe(zod_1.z.object({
143
+ exports.PixiToml = schema_utils_1.Toml.pipe(exports.PixiConfigSchema);
144
+ exports.LockfileYaml = schema_utils_1.Yaml.pipe(zod_1.z.object({
152
145
  version: zod_1.z.number(),
153
146
  }));
154
147
  //# sourceMappingURL=schema.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../lib/modules/manager/pixi/schema.ts"],"names":[],"mappings":"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","sourcesContent":["import { z } from 'zod';\nimport { LooseRecord, Toml, Yaml } from '../../../util/schema-utils';\nimport { CondaDatasource } from '../../datasource/conda/';\nimport { GitRefsDatasource } from '../../datasource/git-refs';\nimport { PypiDatasource } from '../../datasource/pypi';\nimport * as condaVersion from '../../versioning/conda/';\nimport { id as gitRefVersionID } from '../../versioning/git';\nimport { id as pep440VersionID } from '../../versioning/pep440/';\nimport { PyProject } from '../pep621/schema';\nimport type { PackageDependency } from '../types';\n\nexport type Channels = z.infer<typeof Channel>[];\n\nconst Channel = z.union([\n z.string(),\n z.object({ channel: z.string(), priority: z.number() }),\n]);\n\nexport interface PixiPackageDependency extends PackageDependency {\n channel?: string;\n channels?: Channels;\n}\n\nfunction collectNamedPackages(\n packages: Record<string, PackageDependency>,\n): PackageDependency[] {\n return Object.entries(packages).map(([depName, config]) => {\n return {\n ...config,\n depName,\n };\n });\n}\n\nconst PypiDependency = z\n .union([\n z.string().transform((version) => ({ version })),\n z.object({ version: z.string() }),\n ])\n .transform(({ version }) => {\n return {\n currentValue: version,\n versioning: pep440VersionID,\n datasource: PypiDatasource.id,\n } satisfies PixiPackageDependency;\n });\n\nconst PypiGitDependency = z\n .object({ git: z.string(), rev: z.optional(z.string()) })\n .transform(({ git, rev }) => {\n // empty ref default to HEAD, so do we not need to do anything\n if (!rev) {\n return {\n currentValue: rev,\n packageName: git,\n datasource: GitRefsDatasource.id,\n versioning: gitRefVersionID,\n skipStage: 'extract',\n skipReason: 'unspecified-version',\n } satisfies PixiPackageDependency;\n }\n\n return {\n currentValue: rev,\n packageName: git,\n datasource: GitRefsDatasource.id,\n versioning: gitRefVersionID,\n } satisfies PixiPackageDependency;\n });\n\nconst PypiDependencies = LooseRecord(\n z.string(),\n z.union([PypiDependency, PypiGitDependency]),\n).transform(collectNamedPackages);\n\nconst CondaDependency = z\n .union([\n z.string().transform((version) => ({ version, channel: undefined })),\n z.object({ version: z.string(), channel: z.optional(z.string()) }),\n ])\n .transform(({ version, channel }) => {\n return {\n currentValue: version,\n versioning: condaVersion.id,\n datasource: CondaDatasource.id,\n channel,\n } satisfies PixiPackageDependency;\n });\n\nconst CondaDependencies = LooseRecord(z.string(), CondaDependency).transform(\n collectNamedPackages,\n);\n\nconst Targets = LooseRecord(\n z.string(),\n z.object({\n dependencies: z.optional(CondaDependencies).default({}),\n 'pypi-dependencies': z.optional(PypiDependencies).default({}),\n }),\n).transform((val) => {\n const conda: PixiPackageDependency[] = [];\n const pypi: PixiPackageDependency[] = [];\n for (const value of Object.values(val)) {\n pypi.push(...value['pypi-dependencies']);\n\n conda.push(...value.dependencies);\n }\n\n return { pypi, conda };\n});\n\nconst Project = z.object({\n channels: z.array(Channel).default([]),\n 'requires-pixi': z.string().optional(),\n 'channel-priority': z\n .union([z.literal('strict'), z.literal('disabled')])\n .default('strict'),\n});\n\nconst DependenciesMixin = z\n .object({\n dependencies: z.optional(CondaDependencies).default({}),\n 'pypi-dependencies': z.optional(PypiDependencies).default({}),\n target: z.optional(Targets).default({}),\n })\n .transform(\n (\n val,\n ): { pypi: PixiPackageDependency[]; conda: PixiPackageDependency[] } => {\n return {\n conda: [...val.dependencies, ...val.target.conda],\n pypi: [...val['pypi-dependencies'], ...val.target.pypi],\n };\n },\n );\n\nconst Features = LooseRecord(\n z.string(),\n z\n .object({\n channels: z.array(Channel).optional(),\n })\n .and(DependenciesMixin),\n).transform(\n (\n features,\n ): {\n conda: PixiPackageDependency[];\n pypi: PixiPackageDependency[];\n } => {\n const pypi: PixiPackageDependency[] = [];\n const conda: PixiPackageDependency[] = [];\n\n for (const [name, feature] of Object.entries(features)) {\n conda.push(\n ...feature.conda.map((item) => {\n return {\n ...item,\n depType: `feature-${name}`,\n channels: feature.channels,\n };\n }),\n );\n\n pypi.push(\n ...feature.pypi.map((item) => ({\n depType: `feature-${name}`,\n ...item,\n })),\n );\n }\n\n return { pypi, conda };\n },\n);\n\nconst PixiWorkspace = z\n .object({\n workspace: Project,\n })\n .transform((val) => {\n return { project: val.workspace };\n });\n\nconst PixiProject = z.object({\n project: Project,\n});\n\n/**\n * `$` of `pixi.toml` or `$.tool.pixi` of `pyproject.toml`\n */\nexport const PixiConfig = z\n .union([PixiWorkspace, PixiProject])\n .and(z.object({ feature: Features.default({}) }))\n .and(DependenciesMixin);\n\nexport type PixiConfig = z.infer<typeof PixiConfig>;\n\nexport const PixiFile = Toml.pipe(PixiConfig);\n\nexport const PixiPyProject = Toml.pipe(\n PyProject.extend({\n tool: z\n .object({ pixi: PixiConfig.optional().catch(undefined) })\n .optional()\n .catch(undefined),\n }),\n);\n\nexport const Lockfile = Yaml.pipe(\n z.object({\n version: z.number(),\n }),\n);\n"]}
1
+ {"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../lib/modules/manager/pixi/schema.ts"],"names":[],"mappings":";;;;AAAA,6BAAwB;AACxB,6DAAqE;AACrE,mDAA0D;AAC1D,wDAA8D;AAC9D,gDAAuD;AACvD,8EAAwD;AACxD,8CAA6D;AAC7D,qDAAiE;AAKjE,MAAM,OAAO,GAAG,OAAC,CAAC,KAAK,CAAC;IACtB,OAAC,CAAC,MAAM,EAAE;IACV,OAAC,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,OAAC,CAAC,MAAM,EAAE,EAAE,CAAC;CACxD,CAAC,CAAC;AAOH,SAAS,oBAAoB,CAC3B,QAA2C;IAE3C,OAAO,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,EAAE;QACxD,OAAO;YACL,GAAG,MAAM;YACT,OAAO;SACR,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,cAAc,GAAG,OAAC;KACrB,KAAK,CAAC;IACL,OAAC,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAChD,OAAC,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE,EAAE,CAAC;CAClC,CAAC;KACD,SAAS,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE;IACzB,OAAO;QACL,YAAY,EAAE,OAAO;QACrB,UAAU,EAAE,WAAe;QAC3B,UAAU,EAAE,qBAAc,CAAC,EAAE;KACE,CAAC;AACpC,CAAC,CAAC,CAAC;AAEL,MAAM,iBAAiB,GAAG,OAAC;KACxB,MAAM,CAAC,EAAE,GAAG,EAAE,OAAC,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,OAAC,CAAC,QAAQ,CAAC,OAAC,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC;KACxD,SAAS,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE;IAC1B,8DAA8D;IAC9D,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO;YACL,YAAY,EAAE,GAAG;YACjB,WAAW,EAAE,GAAG;YAChB,UAAU,EAAE,4BAAiB,CAAC,EAAE;YAChC,UAAU,EAAE,QAAe;YAC3B,SAAS,EAAE,SAAS;YACpB,UAAU,EAAE,qBAAqB;SACF,CAAC;IACpC,CAAC;IAED,OAAO;QACL,YAAY,EAAE,GAAG;QACjB,WAAW,EAAE,GAAG;QAChB,UAAU,EAAE,4BAAiB,CAAC,EAAE;QAChC,UAAU,EAAE,QAAe;KACI,CAAC;AACpC,CAAC,CAAC,CAAC;AAEL,MAAM,gBAAgB,GAAG,IAAA,0BAAW,EAClC,OAAC,CAAC,MAAM,EAAE,EACV,OAAC,CAAC,KAAK,CAAC,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAC,CAC7C,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC;AAElC,MAAM,eAAe,GAAG,OAAC;KACtB,KAAK,CAAC;IACL,OAAC,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAC;IACpE,OAAC,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,OAAC,CAAC,QAAQ,CAAC,OAAC,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC;CACnE,CAAC;KACD,SAAS,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE;IAClC,OAAO;QACL,YAAY,EAAE,OAAO;QACrB,UAAU,EAAE,YAAY,CAAC,EAAE;QAC3B,UAAU,EAAE,uBAAe,CAAC,EAAE;QAC9B,OAAO;KACwB,CAAC;AACpC,CAAC,CAAC,CAAC;AAEL,MAAM,iBAAiB,GAAG,IAAA,0BAAW,EAAC,OAAC,CAAC,MAAM,EAAE,EAAE,eAAe,CAAC,CAAC,SAAS,CAC1E,oBAAoB,CACrB,CAAC;AAEF,MAAM,OAAO,GAAG,IAAA,0BAAW,EACzB,OAAC,CAAC,MAAM,EAAE,EACV,OAAC,CAAC,MAAM,CAAC;IACP,YAAY,EAAE,OAAC,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;IACvD,mBAAmB,EAAE,OAAC,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;CAC9D,CAAC,CACH,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE;IAClB,MAAM,KAAK,GAA4B,EAAE,CAAC;IAC1C,MAAM,IAAI,GAA4B,EAAE,CAAC;IACzC,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;QACvC,IAAI,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,mBAAmB,CAAC,CAAC,CAAC;QAEzC,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC;IACpC,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,MAAM,OAAO,GAAG,OAAC,CAAC,MAAM,CAAC;IACvB,QAAQ,EAAE,OAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;IACtC,eAAe,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACtC,kBAAkB,EAAE,OAAC;SAClB,KAAK,CAAC,CAAC,OAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,OAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;SACnD,OAAO,CAAC,QAAQ,CAAC;CACrB,CAAC,CAAC;AAEH,MAAM,iBAAiB,GAAG,OAAC;KACxB,MAAM,CAAC;IACN,YAAY,EAAE,OAAC,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;IACvD,mBAAmB,EAAE,OAAC,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;IAC7D,MAAM,EAAE,OAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;CACxC,CAAC;KACD,SAAS,CACR,CACE,GAAG,EACgE,EAAE;IACrE,OAAO;QACL,KAAK,EAAE,CAAC,GAAG,GAAG,CAAC,YAAY,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC;QACjD,IAAI,EAAE,CAAC,GAAG,GAAG,CAAC,mBAAmB,CAAC,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC;KACxD,CAAC;AACJ,CAAC,CACF,CAAC;AAEJ,MAAM,QAAQ,GAAG,IAAA,0BAAW,EAC1B,OAAC,CAAC,MAAM,EAAE,EACV,OAAC;KACE,MAAM,CAAC;IACN,QAAQ,EAAE,OAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE;CACtC,CAAC;KACD,GAAG,CAAC,iBAAiB,CAAC,CAC1B,CAAC,SAAS,CACT,CACE,QAAQ,EAIR,EAAE;IACF,MAAM,IAAI,GAA4B,EAAE,CAAC;IACzC,MAAM,KAAK,GAA4B,EAAE,CAAC;IAE1C,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QACvD,KAAK,CAAC,IAAI,CACR,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YAC5B,OAAO;gBACL,GAAG,IAAI;gBACP,OAAO,EAAE,WAAW,IAAI,EAAE;gBAC1B,QAAQ,EAAE,OAAO,CAAC,QAAQ;aAC3B,CAAC;QACJ,CAAC,CAAC,CACH,CAAC;QAEF,IAAI,CAAC,IAAI,CACP,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC7B,OAAO,EAAE,WAAW,IAAI,EAAE;YAC1B,GAAG,IAAI;SACR,CAAC,CAAC,CACJ,CAAC;IACJ,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;AACzB,CAAC,CACF,CAAC;AAEF,MAAM,aAAa,GAAG,OAAC;KACpB,MAAM,CAAC;IACN,SAAS,EAAE,OAAO;CACnB,CAAC;KACD,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE;IACjB,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,SAAS,EAAE,CAAC;AACpC,CAAC,CAAC,CAAC;AAEL,MAAM,WAAW,GAAG,OAAC,CAAC,MAAM,CAAC;IAC3B,OAAO,EAAE,OAAO;CACjB,CAAC,CAAC;AAEH;;GAEG;AACU,QAAA,gBAAgB,GAAG,OAAC;KAC9B,KAAK,CAAC,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;KACnC,GAAG,CAAC,OAAC,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;KAChD,GAAG,CAAC,iBAAiB,CAAC,CAAC;AAIb,QAAA,QAAQ,GAAG,mBAAI,CAAC,IAAI,CAAC,wBAAgB,CAAC,CAAC;AAEvC,QAAA,YAAY,GAAG,mBAAI,CAAC,IAAI,CACnC,OAAC,CAAC,MAAM,CAAC;IACP,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE;CACpB,CAAC,CACH,CAAC","sourcesContent":["import { z } from 'zod';\nimport { LooseRecord, Toml, Yaml } from '../../../util/schema-utils';\nimport { CondaDatasource } from '../../datasource/conda/';\nimport { GitRefsDatasource } from '../../datasource/git-refs';\nimport { PypiDatasource } from '../../datasource/pypi';\nimport * as condaVersion from '../../versioning/conda/';\nimport { id as gitRefVersionID } from '../../versioning/git';\nimport { id as pep440VersionID } from '../../versioning/pep440/';\nimport type { PackageDependency } from '../types';\n\nexport type Channels = z.infer<typeof Channel>[];\n\nconst Channel = z.union([\n z.string(),\n z.object({ channel: z.string(), priority: z.number() }),\n]);\n\nexport interface PixiPackageDependency extends PackageDependency {\n channel?: string;\n channels?: Channels;\n}\n\nfunction collectNamedPackages(\n packages: Record<string, PackageDependency>,\n): PackageDependency[] {\n return Object.entries(packages).map(([depName, config]) => {\n return {\n ...config,\n depName,\n };\n });\n}\n\nconst PypiDependency = z\n .union([\n z.string().transform((version) => ({ version })),\n z.object({ version: z.string() }),\n ])\n .transform(({ version }) => {\n return {\n currentValue: version,\n versioning: pep440VersionID,\n datasource: PypiDatasource.id,\n } satisfies PixiPackageDependency;\n });\n\nconst PypiGitDependency = z\n .object({ git: z.string(), rev: z.optional(z.string()) })\n .transform(({ git, rev }) => {\n // empty ref default to HEAD, so do we not need to do anything\n if (!rev) {\n return {\n currentValue: rev,\n packageName: git,\n datasource: GitRefsDatasource.id,\n versioning: gitRefVersionID,\n skipStage: 'extract',\n skipReason: 'unspecified-version',\n } satisfies PixiPackageDependency;\n }\n\n return {\n currentValue: rev,\n packageName: git,\n datasource: GitRefsDatasource.id,\n versioning: gitRefVersionID,\n } satisfies PixiPackageDependency;\n });\n\nconst PypiDependencies = LooseRecord(\n z.string(),\n z.union([PypiDependency, PypiGitDependency]),\n).transform(collectNamedPackages);\n\nconst CondaDependency = z\n .union([\n z.string().transform((version) => ({ version, channel: undefined })),\n z.object({ version: z.string(), channel: z.optional(z.string()) }),\n ])\n .transform(({ version, channel }) => {\n return {\n currentValue: version,\n versioning: condaVersion.id,\n datasource: CondaDatasource.id,\n channel,\n } satisfies PixiPackageDependency;\n });\n\nconst CondaDependencies = LooseRecord(z.string(), CondaDependency).transform(\n collectNamedPackages,\n);\n\nconst Targets = LooseRecord(\n z.string(),\n z.object({\n dependencies: z.optional(CondaDependencies).default({}),\n 'pypi-dependencies': z.optional(PypiDependencies).default({}),\n }),\n).transform((val) => {\n const conda: PixiPackageDependency[] = [];\n const pypi: PixiPackageDependency[] = [];\n for (const value of Object.values(val)) {\n pypi.push(...value['pypi-dependencies']);\n\n conda.push(...value.dependencies);\n }\n\n return { pypi, conda };\n});\n\nconst Project = z.object({\n channels: z.array(Channel).default([]),\n 'requires-pixi': z.string().optional(),\n 'channel-priority': z\n .union([z.literal('strict'), z.literal('disabled')])\n .default('strict'),\n});\n\nconst DependenciesMixin = z\n .object({\n dependencies: z.optional(CondaDependencies).default({}),\n 'pypi-dependencies': z.optional(PypiDependencies).default({}),\n target: z.optional(Targets).default({}),\n })\n .transform(\n (\n val,\n ): { pypi: PixiPackageDependency[]; conda: PixiPackageDependency[] } => {\n return {\n conda: [...val.dependencies, ...val.target.conda],\n pypi: [...val['pypi-dependencies'], ...val.target.pypi],\n };\n },\n );\n\nconst Features = LooseRecord(\n z.string(),\n z\n .object({\n channels: z.array(Channel).optional(),\n })\n .and(DependenciesMixin),\n).transform(\n (\n features,\n ): {\n conda: PixiPackageDependency[];\n pypi: PixiPackageDependency[];\n } => {\n const pypi: PixiPackageDependency[] = [];\n const conda: PixiPackageDependency[] = [];\n\n for (const [name, feature] of Object.entries(features)) {\n conda.push(\n ...feature.conda.map((item) => {\n return {\n ...item,\n depType: `feature-${name}`,\n channels: feature.channels,\n };\n }),\n );\n\n pypi.push(\n ...feature.pypi.map((item) => ({\n depType: `feature-${name}`,\n ...item,\n })),\n );\n }\n\n return { pypi, conda };\n },\n);\n\nconst PixiWorkspace = z\n .object({\n workspace: Project,\n })\n .transform((val) => {\n return { project: val.workspace };\n });\n\nconst PixiProject = z.object({\n project: Project,\n});\n\n/**\n * `$` of `pixi.toml` or `$.tool.pixi` of `pyproject.toml`\n */\nexport const PixiConfigSchema = z\n .union([PixiWorkspace, PixiProject])\n .and(z.object({ feature: Features.default({}) }))\n .and(DependenciesMixin);\n\nexport type PixiConfig = z.infer<typeof PixiConfigSchema>;\n\nexport const PixiToml = Toml.pipe(PixiConfigSchema);\n\nexport const LockfileYaml = Yaml.pipe(\n z.object({\n version: z.number(),\n }),\n);\n"]}
@@ -21,7 +21,7 @@ const util_1 = require("../../datasource/util");
21
21
  const schema_1 = require("./schema");
22
22
  function getPythonConstraint(pyProjectContent, existingLockFileContent) {
23
23
  // Read Python version from `pyproject.toml` first as it could have been updated
24
- const pyprojectPythonConstraint = result_1.Result.parse((0, toml_1.massage)(pyProjectContent), schema_1.PoetryPyProject.transform(({ packageFileContent }) => packageFileContent.deps.find((dep) => dep.depName === 'python')
24
+ const pyprojectPythonConstraint = result_1.Result.parse((0, toml_1.massage)(pyProjectContent), schema_1.PoetrySchemaToml.transform(({ packageFileContent }) => packageFileContent.deps.find((dep) => dep.depName === 'python')
25
25
  ?.currentValue)).unwrapOrNull();
26
26
  if (pyprojectPythonConstraint) {
27
27
  logger_1.logger.debug('Using python version from pyproject.toml');
@@ -48,7 +48,7 @@ function getPoetryRequirement(pyProjectContent, existingLockFileContent) {
48
48
  logger_1.logger.debug(`Using poetry version ${lockfilePoetryConstraint} from poetry.lock metadata`);
49
49
  return lockfilePoetryConstraint;
50
50
  }
51
- const { val: pyprojectPoetryConstraint } = result_1.Result.parse((0, toml_1.massage)(pyProjectContent), schema_1.PoetryPyProject.transform(({ poetryRequirement }) => poetryRequirement)).unwrap();
51
+ const { val: pyprojectPoetryConstraint } = result_1.Result.parse((0, toml_1.massage)(pyProjectContent), schema_1.PoetrySchemaToml.transform(({ poetryRequirement }) => poetryRequirement)).unwrap();
52
52
  if (pyprojectPoetryConstraint) {
53
53
  logger_1.logger.debug(`Using poetry version ${pyprojectPoetryConstraint} from pyproject.toml`);
54
54
  return pyprojectPoetryConstraint;