mirror of
https://github.com/swc-project/swc.git
synced 2024-11-24 02:06:08 +03:00
fix(es/parser): Parse const type parameters in arrow function expressions (#7242)
This commit is contained in:
David Sherret
GitHub
parent
2a662350e6
commit
6614886192
@ -105,7 +105,7 @@ impl<I: Tokens> Parser<I> {
|
||||
}
|
||||
}
|
||||
|
||||
let type_parameters = p.parse_ts_type_params(false, false)?;
|
||||
let type_parameters = p.parse_ts_type_params(false, true)?;
|
||||
let mut arrow = p.parse_assignment_expr_base()?;
|
||||
match *arrow {
|
||||
Expr::Arrow(ArrowExpr {
|
||||
|
||||
@ -398,16 +398,16 @@ impl<I: Tokens> Parser<I> {
|
||||
)? {
|
||||
match modifer {
|
||||
"const" => {
|
||||
is_const = true;
|
||||
if !permit_const {
|
||||
self.emit_err(
|
||||
self.input.prev_span(),
|
||||
SyntaxError::TS1277(js_word!("const")),
|
||||
);
|
||||
} else {
|
||||
is_const = true;
|
||||
}
|
||||
}
|
||||
"in" => {
|
||||
is_in = true;
|
||||
if !permit_in_out {
|
||||
self.emit_err(self.input.prev_span(), SyntaxError::TS1274(js_word!("in")));
|
||||
} else if is_in {
|
||||
@ -417,17 +417,14 @@ impl<I: Tokens> Parser<I> {
|
||||
self.input.prev_span(),
|
||||
SyntaxError::TS1029(js_word!("in"), js_word!("out")),
|
||||
);
|
||||
} else {
|
||||
is_in = true;
|
||||
}
|
||||
}
|
||||
"out" => {
|
||||
is_out = true;
|
||||
if !permit_in_out {
|
||||
self.emit_err(self.input.prev_span(), SyntaxError::TS1274(js_word!("out")));
|
||||
} else if is_out {
|
||||
self.emit_err(self.input.prev_span(), SyntaxError::TS1030(js_word!("out")));
|
||||
} else {
|
||||
is_out = true;
|
||||
}
|
||||
}
|
||||
other => self.emit_err(self.input.prev_span(), SyntaxError::TS1273(other.into())),
|
||||
|
||||
@ -1,4 +1,152 @@
|
||||
|
||||
x 'out' modifier already seen.
|
||||
,-[$DIR/tests/typescript-errors/variance-annotations/1/input.ts:1:1]
|
||||
1 | type Covariant<out T> = {
|
||||
: ^^^
|
||||
2 | x: T;
|
||||
`----
|
||||
|
||||
x 'in' modifier already seen.
|
||||
,-[$DIR/tests/typescript-errors/variance-annotations/1/input.ts:10:1]
|
||||
10 |
|
||||
11 | type Contravariant<in T> = {
|
||||
: ^^
|
||||
12 | f: (x: T) => void;
|
||||
`----
|
||||
|
||||
x 'in' modifier already seen.
|
||||
,-[$DIR/tests/typescript-errors/variance-annotations/1/input.ts:20:1]
|
||||
20 |
|
||||
21 | type Invariant<in out T> = {
|
||||
: ^^
|
||||
22 | f: (x: T) => T;
|
||||
`----
|
||||
|
||||
x 'out' modifier already seen.
|
||||
,-[$DIR/tests/typescript-errors/variance-annotations/1/input.ts:20:1]
|
||||
20 |
|
||||
21 | type Invariant<in out T> = {
|
||||
: ^^^
|
||||
22 | f: (x: T) => T;
|
||||
`----
|
||||
|
||||
x 'out' modifier already seen.
|
||||
,-[$DIR/tests/typescript-errors/variance-annotations/1/input.ts:32:1]
|
||||
32 |
|
||||
33 | type T10<out T> = T;
|
||||
: ^^^
|
||||
34 | type T11<in T> = keyof T;
|
||||
`----
|
||||
|
||||
x 'in' modifier already seen.
|
||||
,-[$DIR/tests/typescript-errors/variance-annotations/1/input.ts:33:1]
|
||||
33 | type T10<out T> = T;
|
||||
34 | type T11<in T> = keyof T;
|
||||
: ^^
|
||||
35 | type T12<out T, out K extends keyof T> = T[K];
|
||||
`----
|
||||
|
||||
x 'out' modifier already seen.
|
||||
,-[$DIR/tests/typescript-errors/variance-annotations/1/input.ts:34:1]
|
||||
34 | type T11<in T> = keyof T;
|
||||
35 | type T12<out T, out K extends keyof T> = T[K];
|
||||
: ^^^
|
||||
36 | type T13<in out T> = T[keyof T];
|
||||
`----
|
||||
|
||||
x 'out' modifier already seen.
|
||||
,-[$DIR/tests/typescript-errors/variance-annotations/1/input.ts:34:1]
|
||||
34 | type T11<in T> = keyof T;
|
||||
35 | type T12<out T, out K extends keyof T> = T[K];
|
||||
: ^^^
|
||||
36 | type T13<in out T> = T[keyof T];
|
||||
`----
|
||||
|
||||
x 'in' modifier already seen.
|
||||
,-[$DIR/tests/typescript-errors/variance-annotations/1/input.ts:35:1]
|
||||
35 | type T12<out T, out K extends keyof T> = T[K];
|
||||
36 | type T13<in out T> = T[keyof T];
|
||||
: ^^
|
||||
`----
|
||||
|
||||
x 'out' modifier already seen.
|
||||
,-[$DIR/tests/typescript-errors/variance-annotations/1/input.ts:35:1]
|
||||
35 | type T12<out T, out K extends keyof T> = T[K];
|
||||
36 | type T13<in out T> = T[keyof T];
|
||||
: ^^^
|
||||
`----
|
||||
|
||||
x 'in' modifier already seen.
|
||||
,-[$DIR/tests/typescript-errors/variance-annotations/1/input.ts:39:1]
|
||||
39 |
|
||||
40 | type Covariant1<in T> = { // Error
|
||||
: ^^
|
||||
41 | x: T;
|
||||
`----
|
||||
|
||||
x 'out' modifier already seen.
|
||||
,-[$DIR/tests/typescript-errors/variance-annotations/1/input.ts:43:1]
|
||||
43 |
|
||||
44 | type Contravariant1<out T> = keyof T; // Error
|
||||
: ^^^
|
||||
`----
|
||||
|
||||
x 'out' modifier already seen.
|
||||
,-[$DIR/tests/typescript-errors/variance-annotations/1/input.ts:45:1]
|
||||
45 |
|
||||
46 | type Contravariant2<out T> = { // Error
|
||||
: ^^^
|
||||
47 | f: (x: T) => void;
|
||||
`----
|
||||
|
||||
x 'in' modifier already seen.
|
||||
,-[$DIR/tests/typescript-errors/variance-annotations/1/input.ts:49:1]
|
||||
49 |
|
||||
50 | type Invariant1<in T> = { // Error
|
||||
: ^^
|
||||
51 | f: (x: T) => T;
|
||||
`----
|
||||
|
||||
x 'out' modifier already seen.
|
||||
,-[$DIR/tests/typescript-errors/variance-annotations/1/input.ts:53:1]
|
||||
53 |
|
||||
54 | type Invariant2<out T> = { // Error
|
||||
: ^^^
|
||||
55 | f: (x: T) => T;
|
||||
`----
|
||||
|
||||
x 'in' modifier already seen.
|
||||
,-[$DIR/tests/typescript-errors/variance-annotations/1/input.ts:59:1]
|
||||
59 |
|
||||
60 | type Foo1<in T> = { // Error
|
||||
: ^^
|
||||
61 | x: T;
|
||||
`----
|
||||
|
||||
x 'out' modifier already seen.
|
||||
,-[$DIR/tests/typescript-errors/variance-annotations/1/input.ts:70:1]
|
||||
70 |
|
||||
71 | type Foo2<out T> = { // Error
|
||||
: ^^^
|
||||
72 | x: T;
|
||||
`----
|
||||
|
||||
x 'in' modifier already seen.
|
||||
,-[$DIR/tests/typescript-errors/variance-annotations/1/input.ts:81:1]
|
||||
81 |
|
||||
82 | type Foo3<in out T> = {
|
||||
: ^^
|
||||
83 | x: T;
|
||||
`----
|
||||
|
||||
x 'out' modifier already seen.
|
||||
,-[$DIR/tests/typescript-errors/variance-annotations/1/input.ts:81:1]
|
||||
81 |
|
||||
82 | type Foo3<in out T> = {
|
||||
: ^^^
|
||||
83 | x: T;
|
||||
`----
|
||||
|
||||
x 'public' modifier cannot appear on a type parameter
|
||||
,-[$DIR/tests/typescript-errors/variance-annotations/1/input.ts:94:1]
|
||||
94 |
|
||||
@ -10,11 +158,43 @@
|
||||
x 'in' modifier already seen.
|
||||
,-[$DIR/tests/typescript-errors/variance-annotations/1/input.ts:95:1]
|
||||
95 | type T20<public T> = T; // Error
|
||||
96 | type T21<in out in T> = T; // Error
|
||||
: ^^
|
||||
97 | type T22<in out out T> = T; // Error
|
||||
`----
|
||||
|
||||
x 'out' modifier already seen.
|
||||
,-[$DIR/tests/typescript-errors/variance-annotations/1/input.ts:95:1]
|
||||
95 | type T20<public T> = T; // Error
|
||||
96 | type T21<in out in T> = T; // Error
|
||||
: ^^^
|
||||
97 | type T22<in out out T> = T; // Error
|
||||
`----
|
||||
|
||||
x 'in' modifier already seen.
|
||||
,-[$DIR/tests/typescript-errors/variance-annotations/1/input.ts:95:1]
|
||||
95 | type T20<public T> = T; // Error
|
||||
96 | type T21<in out in T> = T; // Error
|
||||
: ^^
|
||||
97 | type T22<in out out T> = T; // Error
|
||||
`----
|
||||
|
||||
x 'in' modifier already seen.
|
||||
,-[$DIR/tests/typescript-errors/variance-annotations/1/input.ts:96:1]
|
||||
96 | type T21<in out in T> = T; // Error
|
||||
97 | type T22<in out out T> = T; // Error
|
||||
: ^^
|
||||
98 | type T23<out in T> = T; // Error
|
||||
`----
|
||||
|
||||
x 'out' modifier already seen.
|
||||
,-[$DIR/tests/typescript-errors/variance-annotations/1/input.ts:96:1]
|
||||
96 | type T21<in out in T> = T; // Error
|
||||
97 | type T22<in out out T> = T; // Error
|
||||
: ^^^
|
||||
98 | type T23<out in T> = T; // Error
|
||||
`----
|
||||
|
||||
x 'out' modifier already seen.
|
||||
,-[$DIR/tests/typescript-errors/variance-annotations/1/input.ts:96:1]
|
||||
96 | type T21<in out in T> = T; // Error
|
||||
@ -23,7 +203,14 @@
|
||||
98 | type T23<out in T> = T; // Error
|
||||
`----
|
||||
|
||||
x 'in' modifier must precede 'out' modifier.
|
||||
x 'out' modifier already seen.
|
||||
,-[$DIR/tests/typescript-errors/variance-annotations/1/input.ts:97:1]
|
||||
97 | type T22<in out out T> = T; // Error
|
||||
98 | type T23<out in T> = T; // Error
|
||||
: ^^^
|
||||
`----
|
||||
|
||||
x 'in' modifier already seen.
|
||||
,-[$DIR/tests/typescript-errors/variance-annotations/1/input.ts:97:1]
|
||||
97 | type T22<in out out T> = T; // Error
|
||||
98 | type T23<out in T> = T; // Error
|
||||
@ -60,3 +247,42 @@
|
||||
: ^^^
|
||||
106 | }
|
||||
`----
|
||||
|
||||
x 'out' modifier already seen.
|
||||
,-[$DIR/tests/typescript-errors/variance-annotations/1/input.ts:109:1]
|
||||
109 |
|
||||
110 | interface Baz<out T> {}
|
||||
: ^^^
|
||||
111 | interface Baz<in T> {}
|
||||
`----
|
||||
|
||||
x 'in' modifier already seen.
|
||||
,-[$DIR/tests/typescript-errors/variance-annotations/1/input.ts:110:1]
|
||||
110 | interface Baz<out T> {}
|
||||
111 | interface Baz<in T> {}
|
||||
: ^^
|
||||
`----
|
||||
|
||||
x 'out' modifier already seen.
|
||||
,-[$DIR/tests/typescript-errors/variance-annotations/1/input.ts:120:1]
|
||||
120 |
|
||||
121 | interface Parent<out A> {
|
||||
: ^^^
|
||||
122 | child: Child<A> | null;
|
||||
`----
|
||||
|
||||
x 'in' modifier already seen.
|
||||
,-[$DIR/tests/typescript-errors/variance-annotations/1/input.ts:139:1]
|
||||
139 |
|
||||
140 | declare class StateNode<TContext, in out TEvent extends { type: string }> {
|
||||
: ^^
|
||||
141 | _storedEvent: TEvent;
|
||||
`----
|
||||
|
||||
x 'out' modifier already seen.
|
||||
,-[$DIR/tests/typescript-errors/variance-annotations/1/input.ts:139:1]
|
||||
139 |
|
||||
140 | declare class StateNode<TContext, in out TEvent extends { type: string }> {
|
||||
: ^^^
|
||||
141 | _storedEvent: TEvent;
|
||||
`----
|
||||
|
||||
@ -0,0 +1 @@
|
||||
export const fn = <const Data extends Type>(payload: Data) => payload;
|
||||
@ -0,0 +1,162 @@
|
||||
{
|
||||
"type": "Module",
|
||||
"span": {
|
||||
"start": 1,
|
||||
"end": 71,
|
||||
"ctxt": 0
|
||||
},
|
||||
"body": [
|
||||
{
|
||||
"type": "ExportDeclaration",
|
||||
"span": {
|
||||
"start": 1,
|
||||
"end": 71,
|
||||
"ctxt": 0
|
||||
},
|
||||
"declaration": {
|
||||
"type": "VariableDeclaration",
|
||||
"span": {
|
||||
"start": 8,
|
||||
"end": 71,
|
||||
"ctxt": 0
|
||||
},
|
||||
"kind": "const",
|
||||
"declare": false,
|
||||
"declarations": [
|
||||
{
|
||||
"type": "VariableDeclarator",
|
||||
"span": {
|
||||
"start": 14,
|
||||
"end": 70,
|
||||
"ctxt": 0
|
||||
},
|
||||
"id": {
|
||||
"type": "Identifier",
|
||||
"span": {
|
||||
"start": 14,
|
||||
"end": 16,
|
||||
"ctxt": 0
|
||||
},
|
||||
"value": "fn",
|
||||
"optional": false,
|
||||
"typeAnnotation": null
|
||||
},
|
||||
"init": {
|
||||
"type": "ArrowFunctionExpression",
|
||||
"span": {
|
||||
"start": 19,
|
||||
"end": 70,
|
||||
"ctxt": 0
|
||||
},
|
||||
"params": [
|
||||
{
|
||||
"type": "Identifier",
|
||||
"span": {
|
||||
"start": 45,
|
||||
"end": 58,
|
||||
"ctxt": 0
|
||||
},
|
||||
"value": "payload",
|
||||
"optional": false,
|
||||
"typeAnnotation": {
|
||||
"type": "TsTypeAnnotation",
|
||||
"span": {
|
||||
"start": 52,
|
||||
"end": 58,
|
||||
"ctxt": 0
|
||||
},
|
||||
"typeAnnotation": {
|
||||
"type": "TsTypeReference",
|
||||
"span": {
|
||||
"start": 54,
|
||||
"end": 58,
|
||||
"ctxt": 0
|
||||
},
|
||||
"typeName": {
|
||||
"type": "Identifier",
|
||||
"span": {
|
||||
"start": 54,
|
||||
"end": 58,
|
||||
"ctxt": 0
|
||||
},
|
||||
"value": "Data",
|
||||
"optional": false
|
||||
},
|
||||
"typeParams": null
|
||||
}
|
||||
}
|
||||
}
|
||||
],
|
||||
"body": {
|
||||
"type": "Identifier",
|
||||
"span": {
|
||||
"start": 63,
|
||||
"end": 70,
|
||||
"ctxt": 0
|
||||
},
|
||||
"value": "payload",
|
||||
"optional": false
|
||||
},
|
||||
"async": false,
|
||||
"generator": false,
|
||||
"typeParameters": {
|
||||
"type": "TsTypeParameterDeclaration",
|
||||
"span": {
|
||||
"start": 19,
|
||||
"end": 44,
|
||||
"ctxt": 0
|
||||
},
|
||||
"parameters": [
|
||||
{
|
||||
"type": "TsTypeParameter",
|
||||
"span": {
|
||||
"start": 20,
|
||||
"end": 43,
|
||||
"ctxt": 0
|
||||
},
|
||||
"name": {
|
||||
"type": "Identifier",
|
||||
"span": {
|
||||
"start": 26,
|
||||
"end": 30,
|
||||
"ctxt": 0
|
||||
},
|
||||
"value": "Data",
|
||||
"optional": false
|
||||
},
|
||||
"in": false,
|
||||
"out": false,
|
||||
"const": true,
|
||||
"constraint": {
|
||||
"type": "TsTypeReference",
|
||||
"span": {
|
||||
"start": 39,
|
||||
"end": 43,
|
||||
"ctxt": 0
|
||||
},
|
||||
"typeName": {
|
||||
"type": "Identifier",
|
||||
"span": {
|
||||
"start": 39,
|
||||
"end": 43,
|
||||
"ctxt": 0
|
||||
},
|
||||
"value": "Type",
|
||||
"optional": false
|
||||
},
|
||||
"typeParams": null
|
||||
},
|
||||
"default": null
|
||||
}
|
||||
]
|
||||
},
|
||||
"returnType": null
|
||||
},
|
||||
"definite": false
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
],
|
||||
"interpreter": null
|
||||
}
|
||||
@ -3973,7 +3973,7 @@
|
||||
"value": "T",
|
||||
"optional": false
|
||||
},
|
||||
"in": false,
|
||||
"in": true,
|
||||
"out": true,
|
||||
"const": false,
|
||||
"constraint": null,
|
||||
@ -4096,7 +4096,7 @@
|
||||
"value": "T",
|
||||
"optional": false
|
||||
},
|
||||
"in": false,
|
||||
"in": true,
|
||||
"out": false,
|
||||
"const": false,
|
||||
"constraint": null,
|
||||
@ -4171,7 +4171,7 @@
|
||||
"optional": false
|
||||
},
|
||||
"in": false,
|
||||
"out": false,
|
||||
"out": true,
|
||||
"const": false,
|
||||
"constraint": null,
|
||||
"default": null
|
||||
|
||||
@ -3973,7 +3973,7 @@
|
||||
"value": "T",
|
||||
"optional": false
|
||||
},
|
||||
"in": false,
|
||||
"in": true,
|
||||
"out": true,
|
||||
"const": false,
|
||||
"constraint": null,
|
||||
@ -4096,7 +4096,7 @@
|
||||
"value": "T",
|
||||
"optional": false
|
||||
},
|
||||
"in": false,
|
||||
"in": true,
|
||||
"out": false,
|
||||
"const": false,
|
||||
"constraint": null,
|
||||
@ -4171,7 +4171,7 @@
|
||||
"optional": false
|
||||
},
|
||||
"in": false,
|
||||
"out": false,
|
||||
"out": true,
|
||||
"const": false,
|
||||
"constraint": null,
|
||||
"default": null
|
||||
|
||||
Loading…
Reference in New Issue
Block a user