Skip to content
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

fix: handling quoted strings and options validation for comma-delimited multiple-flag #614

Merged
merged 5 commits into from
Feb 7, 2023
Merged

fix: handling quoted strings and options validation for comma-delimited multiple-flag #614

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f8d0034
fix: handling quoted strings and options validation for comma-delimit…
mshanemc Feb 7, 2023
dcf796b
chore: comment typo
mshanemc Feb 7, 2023
3864220
refactor: string flags
mshanemc Feb 7, 2023
bd22be1
refactor: single-quotes work, too.
mshanemc Feb 7, 2023
5cf029c
test: interior quote preservation
mshanemc Feb 7, 2023
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
10 changes: 8 additions & 2 deletions src/parser/parse.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,15 +227,21 @@ export class Parser<T extends ParserInput, TFlags extends OutputFlags<T['flags']
flags[token.flag] = await this._parseFlag(flags[token.flag], flag, token)
} else {
const input = token.input
this._validateOptions(flag, input)

if (flag.delimiter && flag.multiple) {
// split, trim, and remove surrounding doubleQuotes (which would hav been needed if the elements contain spaces)
const values = await Promise.all(
input.split(flag.delimiter).map(async v => this._parseFlag(v.trim(), flag, token)),
input.split(flag.delimiter).map(async v => this._parseFlag(v.trim().replace(/^"(.*)"$/, '$1'), flag, token)),
Copy link
Contributor

Choose a reason for hiding this comment

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

@mshanemc should this also consider signle quotes, 'a b' 'c d'?

Copy link
Member Author

Choose a reason for hiding this comment

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

yeah, I think so. posix-shells could

)
// then parse that each element aligns with the `options` property
for (const v of values) {
this._validateOptions(flag, v)
}

flags[token.flag] = flags[token.flag] || []
flags[token.flag].push(...values)
} else {
this._validateOptions(flag, input)
const value = await this._parseFlag(input, flag, token)
if (flag.multiple) {
flags[token.flag] = flags[token.flag] || []
Expand Down
Loading