Skip to content

implement bugfix for maybe wrapping named capture groups #643

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

implement bugfix for maybe wrapping named capture groups #643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b350b3
implement bugfix for maybe wrapping named capture groups
Oct 16, 2025
4a646aa
implement bugfix for maybe wrapping named capture groups
Oct 16, 2025
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 src/core/inputs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,11 @@ export function maybe<
Inputs extends InputSource[],
Value extends string = Join<MapToValues<Inputs>, '', ''>,
>(...inputs: Inputs): Input<
IfUnwrapped<Value, `(?:${Value})?`, `${Value}?`>,
`(?:${Value})?`,
MapToGroups<Inputs>,
MapToCapturedGroupsArr<Inputs>
> {
return createInput(`${wrap(exactly(...inputs))}?`)
return createInput(`(?:${exactly(...inputs)})?`)
}

/**
Expand Down
16 changes: 14 additions & 2 deletions test/inputs.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,7 @@ describe('inputs', () => {
expectTypeOf(extractRegExp(input)).toEqualTypeOf<'(?:foo)?'>()

const nestedInputWithGroup = maybe(exactly('foo').groupedAs('groupName'))
expectTypeOf(createRegExp(nestedInputWithGroup)).toEqualTypeOf<
MagicRegExp<'/(?<groupName>foo)?/', 'groupName', ['(?<groupName>foo)'], never>
expectTypeOf(createRegExp(nestedInputWithGroup)).toEqualTypeOf<MagicRegExp<'/(?:(?<groupName>foo))?/', 'groupName', ['(?<groupName>foo)'], never>
>()

const multi = maybe('foo', input.groupedAs('groupName'), 'bar')
Expand All @@ -81,6 +80,19 @@ describe('inputs', () => {
'/\\(\\?:foo\\(\\?<groupName>\\(\\?:foo\\)\\?\\)bar\\)\\?/',
)
expectTypeOf(extractRegExp(multi)).toEqualTypeOf<'(?:foo(?<groupName>(?:foo)?)bar)?'>()

const withCaptureGroup = maybe(charIn('-_.').optionally(), oneOrMore(digit).as('number'))
const regexp3 = new RegExp(withCaptureGroup as any)
expect(regexp3).toMatchInlineSnapshot(`/\\(\\?:\\(\\?:\\[\\\\-_\\.\\]\\)\\?\\(\\?<number>\\\\d\\+\\)\\)\\?/`)
const withCaptureGroup2 = exactly(
anyOf('beta', 'dev'),
maybe(
charIn('-_.').optionally(),
oneOrMore(digit).as('number'),
),
)
const regexp4 = createRegExp(withCaptureGroup2, ['g', 'i'])
expect(regexp4).toMatchInlineSnapshot(`/\\(\\?:beta\\|dev\\)\\(\\?:\\(\\?:\\[\\\\-_\\.\\]\\)\\?\\(\\?<number>\\\\d\\+\\)\\)\\?/gi`)
})
it('oneOrMore', () => {
const input = oneOrMore('foo')
Expand Down