-
Notifications
You must be signed in to change notification settings - Fork 2.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat(config/toml): support jinja templates in toml files #33123
Open
jiaweikho
wants to merge
14
commits into
renovatebot:main
Choose a base branch
from
jiaweikho:feat/toml-template-support
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+80
−5
Open
Changes from 11 commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
069e313
Add template toml test
jiaweikho d912396
Remove jinja delimiters
jiaweikho 87a1410
Add removeTemplate option
jiaweikho 5561282
Remove jinja templates in pep62 pyproject
jiaweikho 0099a48
Remove jinja templates in poetry pyproject
jiaweikho 82157c6
Export TomlOptions interface
jiaweikho 21aea6a
Use replaceAll instead of regex global modifier
jiaweikho 025d60b
Add regex global modifier
jiaweikho 1b30b21
Add poetry pyproject with template test
jiaweikho 8ae8b92
Remove templates when parsing toml schema
jiaweikho 5c7a126
Add pep621 pyproject template test
jiaweikho 099efbb
Inline poetry fixture
jiaweikho c8233e9
Inline pep621 fixture
jiaweikho 2dc582b
Merge branch 'main' into feat/toml-template-support
jiaweikho File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
13 changes: 13 additions & 0 deletions
13
lib/modules/manager/pep621/__fixtures__/pyproject_with_template.toml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
[project] | ||
name = "{{ name }}" | ||
dynamic = ["version"] | ||
requires-python = ">=3.7" | ||
license = {text = "MIT"} | ||
{# comment #} | ||
dependencies = [ | ||
"blinker", | ||
{% if foo %} | ||
"packaging>=20.9,!=22.0", | ||
{% endif %} | ||
] | ||
readme = "README.md" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
[tool.poetry] | ||
name = "{{ name }}" | ||
|
||
{# comment #} | ||
[tool.poetry.dependencies] | ||
python = "^3.9" | ||
{% if foo %} | ||
dep1 = "^1.0.0" | ||
{% endif %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,22 @@ | ||
import { getStaticTOMLValue, parseTOML } from 'toml-eslint-parser'; | ||
import { regEx } from './regex'; | ||
|
||
export function parse(input: string): unknown { | ||
const ast = parseTOML(input); | ||
export interface TomlOptions { | ||
removeTemplates?: boolean; | ||
} | ||
|
||
export function parse(input: string, options?: TomlOptions): unknown { | ||
const massagedContent = massageContent(input, options); | ||
const ast = parseTOML(massagedContent); | ||
return getStaticTOMLValue(ast); | ||
} | ||
|
||
function massageContent(content: string, options?: TomlOptions): string { | ||
if (options?.removeTemplates) { | ||
return content | ||
.replaceAll(regEx(/{%.+?%}/gs), '') | ||
.replaceAll(regEx(/{{.+?}}/gs), '') | ||
.replaceAll(regEx(/{#.+?#}/gs), ''); | ||
} | ||
return content; | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't like to do this by default. @zharinov how to best handle such options 🤔
Maybe we should export a
toml
function which allows to pass parder options? would this help for yaml on gitlab too?