Skip to content

Commit 2395170

Browse files
committed
refactoring, reformatting
defined main matching group explicitly, removed `undefined` member type from `value` to reflect it correctly
1 parent d34fe49 commit 2395170

File tree

1 file changed

+16
-2
lines changed

1 file changed

+16
-2
lines changed

src/index.ts

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,13 @@ type ContextualizeToken<TToken extends TokenWithIndex> = TToken extends { type:
343343
: never
344344
;
345345
// Distribution
346-
type Distribute<T extends Record<keyof T & GroupWithIndex['index'], { value: string | undefined, reference: GroupWithIndex['value'] }>> = T extends unknown
346+
type Distribute<T extends Record<
347+
keyof T & GroupWithIndex['index'],
348+
{
349+
value: string,
350+
reference: GroupWithIndex['value']
351+
}
352+
>> = T extends unknown
347353
? unknown extends As<{
348354
[K in keyof T as T[K]['reference']['isCaptured'] extends false
349355
? never
@@ -374,7 +380,15 @@ type Parse<T extends string> = string extends T
374380
namedCaptures: Record<string, string | undefined>;
375381
}
376382
// @ts-expect-error: this should terminate
377-
: Distribute<ContextualizeToken<IndexToken<TokenTree<`(\\\\${T})`>>>>
383+
: Distribute<ContextualizeToken<IndexToken<{
384+
type: 'groups',
385+
groups: [{
386+
isCaptured: true,
387+
isNamed: false,
388+
isOptional: false,
389+
inner: TokenTree<T>
390+
}]
391+
}>>>
378392
;
379393

380394
type Remove<Ts extends unknown[], TMatch extends Ts[number]> = unknown extends AsLinked<Ts, infer First, infer Rest>

0 commit comments

Comments
 (0)