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

Jump to bottom

seq()の型定義 #8

Merged
merged 11 commits into from
Aug 6, 2022
Merged

seq()の型定義 #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b9c7629
fix seq()のselect引数有りの場合の型定義
ThinaticSystem Aug 5, 2022
684435a
selectなし
ThinaticSystem Aug 6, 2022
2fb5c86
wip
ThinaticSystem Aug 6, 2022
2e5febb
Merge remote-tracking branch 'upstream/develop' into Thinatic/Add-Typ…
ThinaticSystem Aug 6, 2022
94fb79b
remove test code
ThinaticSystem Aug 6, 2022
1ef5384
三項演算子使うのやめたら型エラー消えた
ThinaticSystem Aug 6, 2022
d1e7b27
ごみ処理(space -> tab)
ThinaticSystem Aug 6, 2022
b5bc56e
関数分割
ThinaticSystem Aug 6, 2022
ee8c1f7
resolve conflict
ThinaticSystem Aug 6, 2022
65bdae0
selectへ明示的に突っ込まれたundefinedは考慮しないように
ThinaticSystem Aug 6, 2022
c99eaf1
fix type
ThinaticSystem Aug 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 14 additions & 4 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,15 @@ export function regexp(pattern: RegExp): Parser<string> {
});
}

export function seq<T extends Parser<any>[]>(parsers: T): Parser<any[]>
export function seq<T extends Parser<any>[]>(parsers: T, select: number): Parser<any>
export function seq<T extends Parser<any>[]>(parsers: T, select?: number): Parser<any[] | any> {
type SeqResultItem<T> = T extends Parser<infer R> ? R : never;
type SeqResult<T> = T extends [infer Head, ...infer Tail] ? [SeqResultItem<Head>, ...SeqResult<Tail>] : [];
export function seq<T extends Parser<any>[]>(parsers: [...T]): Parser<SeqResult<[...T]>>;
export function seq<T extends Parser<any>[], U extends number>(parsers: [...T], select: U): T[U];
export function seq(parsers: Parser<any>[], select?: number) {
return (select == null) ? seqInternal(parsers) : seqInternalWithSelect(parsers, select);
}

function seqInternal<T extends Parser<any>[]>(parsers: [...T]): Parser<SeqResult<[...T]>> {
return new Parser((input, index, state) => {
let result;
let latestIndex = index;
Expand All @@ -138,10 +144,14 @@ export function seq<T extends Parser<any>[]>(parsers: T, select?: number): Parse
latestIndex = result.index;
accum.push(result.value);
}
return success(latestIndex, (select != null ? accum[select] : accum));
return success(latestIndex, (accum as SeqResult<[...T]>));
});
}

function seqInternalWithSelect<T extends Parser<any>[], U extends number>(parsers: [...T], select: U): T[U] {
return seqInternal(parsers).map(values => values[select]);
}

export function alt<T extends Parser<unknown>[]>(parsers: T): T[number] {
return new Parser((input, index, state) => {
let result;
Expand Down