Skip to content

fix(api): liquid digest step variable parsing fixes NV-6757 #9280

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Oct 2, 2025
Merged

fix(api): liquid digest step variable parsing fixes NV-6757 #9280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions apps/api/src/app/shared/utils/template-parser/new-liquid-parser.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,24 @@ describe('extractLiquidTemplateVariables', () => {
expect(invalidVariables[0].name).to.equal('invalid');
});

it('should handle variables with hyphens in if conditions', () => {
const template = '{% if steps.digest-step.events[0].id %}Hello{% endif %}';
const variableSchema: JSONSchemaDto = {
type: JsonSchemaTypeEnum.OBJECT,
properties: {
steps: {
type: JsonSchemaTypeEnum.OBJECT,
additionalProperties: true,
},
},
};
const { validVariables, invalidVariables } = extractLiquidTemplateVariables({ template, variableSchema });

expect(validVariables).to.have.lengthOf(1);
expect(invalidVariables).to.have.lengthOf(0);
expect(validVariables[0].name).to.equal('steps.digest-step.events[0].id');
});

it('should handle unless statements with invalid condition', () => {
const template = '{% unless user.banned %}Show content{{invalid}}{% endunless %}';
const { validVariables, invalidVariables } = extractLiquidTemplateVariables({ template });
Expand Down
2 changes: 1 addition & 1 deletion apps/api/src/app/shared/utils/template-parser/new-liquid-parser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,7 +788,7 @@ function extractVariablesFromCondition(condition: string): string[] {
processedCondition = processedCondition.replace(/\|\s*[a-zA-Z_][a-zA-Z0-9_]*(?:\s*:[^|%}]*)?/g, '');

// Now match variable patterns from the processed condition
const variableMatches = processedCondition.match(/[a-zA-Z_][a-zA-Z0-9_]*(?:\.[a-zA-Z_][a-zA-Z0-9_]*)*(?:\[\d+\])*/g);
const variableMatches = processedCondition.match(/[a-zA-Z_][a-zA-Z0-9_[\].-]+/g);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

More permissive regex, since we later have a validation of extracted variables against schema, its safer approach to rather extract even potentially invalid ones like "steps.events..[abc]" and then disallow them later as opposed to do complicated regex and risk missing extraction of even valid ones.


if (variableMatches) {
variables.push(
Expand Down
Loading