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

[typescript] parsing template literal as type #9748

Merged
merged 4 commits into from Mar 25, 2019
Merged

[typescript] parsing template literal as type #9748

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d1b9187
! added test case
tanhauhau Mar 20, 2019
be7d36e
template literal as type
tanhauhau Mar 22, 2019
074450b
fix code review
tanhauhau Mar 24, 2019
3cc0310
fix flow
tanhauhau Mar 24, 2019
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
29 changes: 29 additions & 0 deletions packages/babel-parser/src/plugins/typescript.js
View file
Open in desktop
Expand Up @@ -659,6 +659,33 @@ export default (superClass: Class<Parser>): Class<Parser> =>
return this.finishNode(node, "TSLiteralType");
}

tsParseTemplateLiteralType(): N.TsType {
const node: N.TsLiteralType = this.startNode();
const startPosition = this.state.start;
const startLocation = this.state.startLoc;
const templateNode = this.parseTemplate(false);
if (
templateNode.expressions.length === 0 &&
templateNode.quasis.length === 1
) {
const value = templateNode.quasis[0].value.raw;
const noSubstitutionTemplateLiteralNode = this.startNodeAt(
startPosition,
startLocation,
);
this.addExtra(node, "rawValue", value);
this.addExtra(node, "raw", value);
node.value = value;
node.literal = this.finishNode(
noSubstitutionTemplateLiteralNode,
"NoSubstitutionTemplateLiteral",
);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see why we need a new node type here. We can just re-use TemplateLiteral: if node.expressions.length === 0, then it doesn't have any substitution.

} else {
throw this.unexpected(startPosition);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
throw this.unexpected(startPosition);
throw this.raise(templateNode.expressions[0].start, "Template literal types cannot have any substitution");

}
return this.finishNode(node, "TSLiteralType");
}

tsParseNonArrayType(): N.TsType {
switch (this.state.type) {
case tt.name:
Expand Down Expand Up @@ -717,6 +744,8 @@ export default (superClass: Class<Parser>): Class<Parser> =>
return this.tsParseTupleType();
case tt.parenL:
return this.tsParseParenthesizedType();
case tt.backQuote:
return this.tsParseTemplateLiteralType();
}

throw this.unexpected();
Expand Down
1 change: 1 addition & 0 deletions packages/babel-parser/test/fixtures/typescript/types/literal-string-1/input.js
View file
Open in desktop
@@ -0,0 +1 @@
let x: `foo`;
136 changes: 136 additions & 0 deletions packages/babel-parser/test/fixtures/typescript/types/literal-string-1/output.json
View file
Open in desktop
@@ -0,0 +1,136 @@
{
"type": "File",
"start": 0,
"end": 13,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 13
}
},
"program": {
"type": "Program",
"start": 0,
"end": 13,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 13
}
},
"sourceType": "module",
"interpreter": null,
"body": [
{
"type": "VariableDeclaration",
"start": 0,
"end": 13,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 13
}
},
"declarations": [
{
"type": "VariableDeclarator",
"start": 4,
"end": 12,
"loc": {
"start": {
"line": 1,
"column": 4
},
"end": {
"line": 1,
"column": 12
}
},
"id": {
"type": "Identifier",
"start": 4,
"end": 12,
"loc": {
"start": {
"line": 1,
"column": 4
},
"end": {
"line": 1,
"column": 12
},
"identifierName": "x"
},
"name": "x",
"typeAnnotation": {
"type": "TSTypeAnnotation",
"start": 5,
"end": 12,
"loc": {
"start": {
"line": 1,
"column": 5
},
"end": {
"line": 1,
"column": 12
}
},
"typeAnnotation": {
"type": "TSLiteralType",
"start": 7,
"end": 12,
"loc": {
"start": {
"line": 1,
"column": 7
},
"end": {
"line": 1,
"column": 12
}
},
"extra": {
"rawValue": "foo",
"raw": "foo"
},
"value": "foo",
"literal": {
"type": "NoSubstitutionTemplateLiteral",
"start": 7,
"end": 12,
"loc": {
"start": {
"line": 1,
"column": 7
},
"end": {
"line": 1,
"column": 12
}
}
}
}
}
},
"init": null
}
],
"kind": "let"
}
],
"directives": []
}
}
1 change: 1 addition & 0 deletions packages/babel-parser/test/fixtures/typescript/types/literal-string-2/input.js
View file
Open in desktop
@@ -0,0 +1 @@
let x: `foo-${bar}`;
7 changes: 7 additions & 0 deletions packages/babel-parser/test/fixtures/typescript/types/literal-string-2/options.json
View file
Open in desktop
@@ -0,0 +1,7 @@
{
"sourceType": "module",
"plugins": [
"typescript"
],
"throws": "Unexpected token (1:7)"
}