Skip to content

fix(grammar): fix secondary compoments grammar #91

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
char0n merged 4 commits into from
Jan 29, 2026
Merged

fix(grammar): fix secondary compoments grammar #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b471814
fix(grammar): fix secondary compoments grammar
char0n Jan 29, 2026
051f8ce
Update src/grammar.js
char0n Jan 29, 2026
5d44792
Update src/grammar.bnf
char0n Jan 29, 2026
80f61c9
Initial plan (#92)
Copilot Jan 29, 2026
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
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,9 +302,9 @@ source-descriptions-reference = 1*CHAR

; Secondary grammar for parsing $components name part
; Format: {field}.{subField}
; Allowed fields: inputs, parameters, successActions, failureActions
; Allowed fields: parameters, successActions, failureActions
Comment thread
char0n marked this conversation as resolved.
components-name = components-field "." components-sub-field
components-field = "inputs" / "parameters" / "successActions" / "failureActions"
components-field = "parameters" / "successActions" / "failureActions"
components-sub-field = 1*(ALPHA / DIGIT / "." / "-" / "_")

; https://datatracker.ietf.org/doc/html/rfc6901#section-3
Expand Down
4 changes: 2 additions & 2 deletions src/grammar.bnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ source-descriptions-reference = 1*CHAR

; Secondary grammar for parsing $components name part
; Format: {field}.{subField}
; Allowed fields: inputs, parameters, successActions, failureActions
; Allowed fields: parameters, successActions, failureActions
components-name = components-field "." components-sub-field
components-field = "inputs" / "parameters" / "successActions" / "failureActions"
components-field = "parameters" / "successActions" / "failureActions"
components-sub-field = 1*(ALPHA / DIGIT / "." / "-" / "_")

; https://datatracker.ietf.org/doc/html/rfc6901#section-3
Expand Down
17 changes: 8 additions & 9 deletions src/grammar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ export default function grammar(){
// SUMMARY
// rules = 36
// udts = 0
// opcodes = 213
// opcodes = 212
// --- ABNF original opcodes
// ALT = 21
// CAT = 24
// REP = 16
// RNM = 55
// TLS = 73
// TLS = 72
// TBS = 12
// TRG = 12
// --- SABNF superset opcodes
Expand Down Expand Up @@ -264,11 +264,10 @@ export default function grammar(){

/* components-field */
this.rules[22].opcodes = [];
this.rules[22].opcodes[0] = { type: 1, children: [1,2,3,4] };// ALT
this.rules[22].opcodes[1] = { type: 7, string: [105,110,112,117,116,115] };// TLS
this.rules[22].opcodes[2] = { type: 7, string: [112,97,114,97,109,101,116,101,114,115] };// TLS
this.rules[22].opcodes[3] = { type: 7, string: [115,117,99,99,101,115,115,97,99,116,105,111,110,115] };// TLS
this.rules[22].opcodes[4] = { type: 7, string: [102,97,105,108,117,114,101,97,99,116,105,111,110,115] };// TLS
this.rules[22].opcodes[0] = { type: 1, children: [1,2,3] };// ALT
this.rules[22].opcodes[1] = { type: 7, string: [112,97,114,97,109,101,116,101,114,115] };// TLS
this.rules[22].opcodes[2] = { type: 7, string: [115,117,99,99,101,115,115,97,99,116,105,111,110,115] };// TLS
this.rules[22].opcodes[3] = { type: 7, string: [102,97,105,108,117,114,101,97,99,116,105,111,110,115] };// TLS

/* components-sub-field */
this.rules[23].opcodes = [];
Expand Down Expand Up @@ -429,9 +428,9 @@ export default function grammar(){
str += "\n";
str += "; Secondary grammar for parsing $components name part\n";
str += "; Format: {field}.{subField}\n";
str += "; Allowed fields: inputs, parameters, successActions, failureActions\n";
str += "; Allowed fields: parameters, successActions, failureActions\n";
str += "components-name = components-field \".\" components-sub-field\n";
str += "components-field = \"inputs\" / \"parameters\" / \"successActions\" / \"failureActions\"\n";
str += "components-field = \"parameters\" / \"successActions\" / \"failureActions\"\n";
str += "components-sub-field = 1*(ALPHA / DIGIT / \".\" / \"-\" / \"_\")\n";
str += "\n";
str += "; https://datatracker.ietf.org/doc/html/rfc6901#section-3\n";
Expand Down
1 change: 0 additions & 1 deletion test/fixtures/expressions-valid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ const validExpressions = [
'$sourceDescriptions.externalService.url',

// Components expression
'$components.inputs.username',
'$components.parameters.petId',
'$components.successActions.notifyUser',
'$components.failureActions.logError',
Expand Down
2 changes: 1 addition & 1 deletion types/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ export interface SourceDescriptionsExpression {
*/
export interface ComponentsExpression {
readonly type: 'ComponentsExpression';
readonly field: 'inputs' | 'parameters' | 'successActions' | 'failureActions';
readonly field: 'parameters' | 'successActions' | 'failureActions';
readonly subField: string;
}

Expand Down