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

fix(ts): skip func-type param start on parsing #14293

Merged
merged 2 commits into from Feb 23, 2022
Merged

fix(ts): skip func-type param start on parsing #14293

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
32dcbbe
fix(ts): skip func-type param start on parsing
JLHwung Feb 22, 2022
cb694b6
fix: tt.braceL is consumed in parseObjectLike
JLHwung Feb 23, 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
41 changes: 20 additions & 21 deletions packages/babel-parser/src/plugins/typescript/index.js
View file
Open in desktop
Expand Up @@ -1233,33 +1233,32 @@ export default (superClass: Class<Parser>): Class<Parser> =>
}

if (this.match(tt.braceL)) {
let braceStackCounter = 1;
this.next();

while (braceStackCounter > 0) {
if (this.match(tt.braceL)) {
++braceStackCounter;
} else if (this.match(tt.braceR)) {
--braceStackCounter;
}
this.next();
// Return true if we can parse an object pattern without errors
const { errors } = this.state;
const previousErrorCount = errors.length;
try {
this.parseObjectLike(tt.braceR, true);
return errors.length === previousErrorCount;
} catch {
return false;
}
return true;
}

if (this.match(tt.bracketL)) {
let braceStackCounter = 1;
this.next();

while (braceStackCounter > 0) {
if (this.match(tt.bracketL)) {
++braceStackCounter;
} else if (this.match(tt.bracketR)) {
--braceStackCounter;
}
this.next();
// Return true if we can parse an array pattern without errors
const { errors } = this.state;
const previousErrorCount = errors.length;
try {
this.parseBindingList(
tt.bracketR,
charCodes.rightSquareBracket,
true,
);
return errors.length === previousErrorCount;
} catch {
return false;
}
return true;
}

return false;
Expand Down
1 change: 1 addition & 0 deletions ...est/fixtures/typescript/types-arrow-function-babel-7/array-pattern-with-es-tuple/input.ts
View file
Open in desktop
@@ -0,0 +1 @@
type F = ([ x = #[0] ]) => {}
4 changes: 4 additions & 0 deletions ...fixtures/typescript/types-arrow-function-babel-7/array-pattern-with-es-tuple/options.json
View file
Open in desktop
@@ -0,0 +1,4 @@
{
"sourceType": "module",
"plugins": ["typescript", ["recordAndTuple", { "syntaxType": "hash" }]]
}
67 changes: 67 additions & 0 deletions .../fixtures/typescript/types-arrow-function-babel-7/array-pattern-with-es-tuple/output.json
View file
Open in desktop
@@ -0,0 +1,67 @@
{
"type": "File",
"start":0,"end":29,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":29,"index":29}},
"program": {
"type": "Program",
"start":0,"end":29,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":29,"index":29}},
"sourceType": "module",
"interpreter": null,
"body": [
{
"type": "TSTypeAliasDeclaration",
"start":0,"end":29,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":29,"index":29}},
"id": {
"type": "Identifier",
"start":5,"end":6,"loc":{"start":{"line":1,"column":5,"index":5},"end":{"line":1,"column":6,"index":6},"identifierName":"F"},
"name": "F"
},
"typeAnnotation": {
"type": "TSFunctionType",
"start":9,"end":29,"loc":{"start":{"line":1,"column":9,"index":9},"end":{"line":1,"column":29,"index":29}},
"parameters": [
{
"type": "ArrayPattern",
"start":10,"end":22,"loc":{"start":{"line":1,"column":10,"index":10},"end":{"line":1,"column":22,"index":22}},
"elements": [
{
"type": "AssignmentPattern",
"start":12,"end":20,"loc":{"start":{"line":1,"column":12,"index":12},"end":{"line":1,"column":20,"index":20}},
"left": {
"type": "Identifier",
"start":12,"end":13,"loc":{"start":{"line":1,"column":12,"index":12},"end":{"line":1,"column":13,"index":13},"identifierName":"x"},
"name": "x"
},
"right": {
"type": "TupleExpression",
"start":16,"end":20,"loc":{"start":{"line":1,"column":16,"index":16},"end":{"line":1,"column":20,"index":20}},
"elements": [
{
"type": "NumericLiteral",
"start":18,"end":19,"loc":{"start":{"line":1,"column":18,"index":18},"end":{"line":1,"column":19,"index":19}},
"extra": {
"rawValue": 0,
"raw": "0"
},
"value": 0
}
]
}
}
]
}
],
"typeAnnotation": {
"type": "TSTypeAnnotation",
"start":24,"end":29,"loc":{"start":{"line":1,"column":24,"index":24},"end":{"line":1,"column":29,"index":29}},
"typeAnnotation": {
"type": "TSTypeLiteral",
"start":27,"end":29,"loc":{"start":{"line":1,"column":27,"index":27},"end":{"line":1,"column":29,"index":29}},
"members": []
}
}
}
}
],
"directives": []
}
}
1 change: 1 addition & 0 deletions ...t/fixtures/typescript/types-arrow-function-babel-7/invalid-incomplete-array-like/input.ts
View file
Open in desktop
@@ -0,0 +1 @@
type F = ([
3 changes: 3 additions & 0 deletions ...xtures/typescript/types-arrow-function-babel-7/invalid-incomplete-array-like/options.json
View file
Open in desktop
@@ -0,0 +1,3 @@
{
"throws": "Unexpected token (1:11)"
}
1 change: 1 addition & 0 deletions .../fixtures/typescript/types-arrow-function-babel-7/invalid-incomplete-object-like/input.ts
View file
Open in desktop
@@ -0,0 +1 @@
type F = ({
3 changes: 3 additions & 0 deletions ...tures/typescript/types-arrow-function-babel-7/invalid-incomplete-object-like/options.json
View file
Open in desktop
@@ -0,0 +1,3 @@
{
"throws": "Unexpected token (1:11)"
}
1 change: 1 addition & 0 deletions ...t/fixtures/typescript/types-arrow-function-babel-7/object-pattern-with-es-record/input.ts
View file
Open in desktop
@@ -0,0 +1 @@
type F = ({ x = #{} }) => {}
12 changes: 12 additions & 0 deletions ...xtures/typescript/types-arrow-function-babel-7/object-pattern-with-es-record/options.json
View file
Open in desktop
@@ -0,0 +1,12 @@
{
"sourceType": "module",
"plugins": [
"typescript",
[
"recordAndTuple",
{
"syntaxType": "hash"
}
]
]
}
72 changes: 72 additions & 0 deletions ...ixtures/typescript/types-arrow-function-babel-7/object-pattern-with-es-record/output.json
View file
Open in desktop
@@ -0,0 +1,72 @@
{
"type": "File",
"start":0,"end":28,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":28,"index":28}},
"program": {
"type": "Program",
"start":0,"end":28,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":28,"index":28}},
"sourceType": "module",
"interpreter": null,
"body": [
{
"type": "TSTypeAliasDeclaration",
"start":0,"end":28,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":28,"index":28}},
"id": {
"type": "Identifier",
"start":5,"end":6,"loc":{"start":{"line":1,"column":5,"index":5},"end":{"line":1,"column":6,"index":6},"identifierName":"F"},
"name": "F"
},
"typeAnnotation": {
"type": "TSFunctionType",
"start":9,"end":28,"loc":{"start":{"line":1,"column":9,"index":9},"end":{"line":1,"column":28,"index":28}},
"parameters": [
{
"type": "ObjectPattern",
"start":10,"end":21,"loc":{"start":{"line":1,"column":10,"index":10},"end":{"line":1,"column":21,"index":21}},
"properties": [
{
"type": "ObjectProperty",
"start":12,"end":19,"loc":{"start":{"line":1,"column":12,"index":12},"end":{"line":1,"column":19,"index":19}},
"key": {
"type": "Identifier",
"start":12,"end":13,"loc":{"start":{"line":1,"column":12,"index":12},"end":{"line":1,"column":13,"index":13},"identifierName":"x"},
"name": "x"
},
"computed": false,
"method": false,
"shorthand": true,
"value": {
"type": "AssignmentPattern",
"start":12,"end":19,"loc":{"start":{"line":1,"column":12,"index":12},"end":{"line":1,"column":19,"index":19}},
"left": {
"type": "Identifier",
"start":12,"end":13,"loc":{"start":{"line":1,"column":12,"index":12},"end":{"line":1,"column":13,"index":13},"identifierName":"x"},
"name": "x"
},
"right": {
"type": "RecordExpression",
"start":16,"end":19,"loc":{"start":{"line":1,"column":16,"index":16},"end":{"line":1,"column":19,"index":19}},
"properties": []
}
},
"extra": {
"shorthand": true
}
}
]
}
],
"typeAnnotation": {
"type": "TSTypeAnnotation",
"start":23,"end":28,"loc":{"start":{"line":1,"column":23,"index":23},"end":{"line":1,"column":28,"index":28}},
"typeAnnotation": {
"type": "TSTypeLiteral",
"start":26,"end":28,"loc":{"start":{"line":1,"column":26,"index":26},"end":{"line":1,"column":28,"index":28}},
"members": []
}
}
}
}
],
"directives": []
}
}
1 change: 1 addition & 0 deletions ...st/fixtures/typescript/types-arrow-function-babel-7/object-pattern-with-template/input.ts
View file
Open in desktop
@@ -0,0 +1 @@
type F = ({ x = `${0}` }) => {}
106 changes: 106 additions & 0 deletions ...fixtures/typescript/types-arrow-function-babel-7/object-pattern-with-template/output.json
View file
Open in desktop
@@ -0,0 +1,106 @@
{
"type": "File",
"start":0,"end":31,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":31,"index":31}},
"program": {
"type": "Program",
"start":0,"end":31,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":31,"index":31}},
"sourceType": "module",
"interpreter": null,
"body": [
{
"type": "TSTypeAliasDeclaration",
"start":0,"end":31,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":31,"index":31}},
"id": {
"type": "Identifier",
"start":5,"end":6,"loc":{"start":{"line":1,"column":5,"index":5},"end":{"line":1,"column":6,"index":6},"identifierName":"F"},
"name": "F"
},
"typeAnnotation": {
"type": "TSFunctionType",
"start":9,"end":31,"loc":{"start":{"line":1,"column":9,"index":9},"end":{"line":1,"column":31,"index":31}},
"parameters": [
{
"type": "ObjectPattern",
"start":10,"end":24,"loc":{"start":{"line":1,"column":10,"index":10},"end":{"line":1,"column":24,"index":24}},
"properties": [
{
"type": "ObjectProperty",
"start":12,"end":22,"loc":{"start":{"line":1,"column":12,"index":12},"end":{"line":1,"column":22,"index":22}},
"key": {
"type": "Identifier",
"start":12,"end":13,"loc":{"start":{"line":1,"column":12,"index":12},"end":{"line":1,"column":13,"index":13},"identifierName":"x"},
"name": "x"
},
"computed": false,
"method": false,
"shorthand": true,
"value": {
"type": "AssignmentPattern",
"start":12,"end":22,"loc":{"start":{"line":1,"column":12,"index":12},"end":{"line":1,"column":22,"index":22}},
"left": {
"type": "Identifier",
"start":12,"end":13,"loc":{"start":{"line":1,"column":12,"index":12},"end":{"line":1,"column":13,"index":13},"identifierName":"x"},
"name": "x"
},
"right": {
"type": "TemplateLiteral",
"start":16,"end":22,"loc":{"start":{"line":1,"column":16,"index":16},"end":{"line":1,"column":22,"index":22}},
"expressions": [
{
"type": "TSLiteralType",
"start":19,"end":20,"loc":{"start":{"line":1,"column":19,"index":19},"end":{"line":1,"column":20,"index":20}},
"literal": {
"type": "NumericLiteral",
"start":19,"end":20,"loc":{"start":{"line":1,"column":19,"index":19},"end":{"line":1,"column":20,"index":20}},
"extra": {
"rawValue": 0,
"raw": "0"
},
"value": 0
}
}
],
"quasis": [
{
"type": "TemplateElement",
"start":17,"end":17,"loc":{"start":{"line":1,"column":17,"index":17},"end":{"line":1,"column":17,"index":17}},
"value": {
"raw": "",
"cooked": ""
},
"tail": false
},
{
"type": "TemplateElement",
"start":21,"end":21,"loc":{"start":{"line":1,"column":21,"index":21},"end":{"line":1,"column":21,"index":21}},
"value": {
"raw": "",
"cooked": ""
},
"tail": true
}
]
}
},
"extra": {
"shorthand": true
}
}
]
}
],
"typeAnnotation": {
"type": "TSTypeAnnotation",
"start":26,"end":31,"loc":{"start":{"line":1,"column":26,"index":26},"end":{"line":1,"column":31,"index":31}},
"typeAnnotation": {
"type": "TSTypeLiteral",
"start":29,"end":31,"loc":{"start":{"line":1,"column":29,"index":29},"end":{"line":1,"column":31,"index":31}},
"members": []
}
}
}
}
],
"directives": []
}
}
5 changes: 5 additions & 0 deletions packages/babel-parser/test/fixtures/typescript/types-arrow-function-babel-7/options.json
View file
Open in desktop
@@ -0,0 +1,5 @@
{
"sourceType": "module",
"plugins": ["typescript"],
"BABEL_8_BREAKING": false
}
1 change: 1 addition & 0 deletions ...parser/test/fixtures/typescript/types-arrow-function/array-pattern-with-es-tuple/input.ts
View file
Open in desktop
@@ -0,0 +1 @@
type F = ([ x = #[0] ]) => {}
4 changes: 4 additions & 0 deletions ...er/test/fixtures/typescript/types-arrow-function/array-pattern-with-es-tuple/options.json
View file
Open in desktop
@@ -0,0 +1,4 @@
{
"sourceType": "module",
"plugins": ["typescript", ["recordAndTuple", { "syntaxType": "hash" }]]
}