Skip to content

Commit 5559e25

Browse files
dannysufacebook-github-bot
dannysu
authored and
facebook-github-bot
committed
add support for const type parameter
Summary: Original Author: [email protected] Original Git: 3a24531 Original Reviewed By: avp Original Revision: D66739150 Adds support for [`const` modifier on type parameters](microsoft/TypeScript#51865). E.g. ``` function foo<const T>(x: T): [T] {...} ``` We parse an optional `const` keyword right before parsing the variance of a type parameter. ``` cd ~/fbsource/xplat/hermes/unsupported/tools/rustgen buck run //xplat/hermes/unsupported/tools/rustgen:rustgen -- ffi > ../../juno/crates/hermes/src/parser/generated_ffi.rs buck run //xplat/hermes/unsupported/tools/rustgen:rustgen -- cvt > ../../juno/crates/juno/src/hparser/generated_cvt.rs ``` Reviewed By: fbmal7 Differential Revision: D67867901 fbshipit-source-id: 4683aee20adfed18e0a6343b4fdacf8e016015df
1 parent 76ceaa6 commit 5559e25

File tree

8 files changed

+123
-5
lines changed

8 files changed

+123
-5
lines changed

‎include/hermes/AST/ESTree.def

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1111,14 +1111,16 @@ ESTREE_NODE_1_ARGS(
11111111
ESTREE_NODE_1_ARGS(
11121112
TypeParameterDeclaration, Flow,
11131113
NodeList, params, false)
1114-
ESTREE_NODE_5_ARGS(
1114+
ESTREE_NODE_6_ARGS(
11151115
TypeParameter, Flow,
11161116
NodeLabel, name, false,
1117+
NodeBoolean, const, false,
11171118
NodePtr, bound, true,
11181119
NodePtr, variance, true,
11191120
NodePtr, default, true,
11201121
NodeBoolean, usesExtendsBound, false)
11211122
ESTREE_IGNORE_IF_EMPTY(TypeParameter, usesExtendsBound)
1123+
ESTREE_IGNORE_IF_EMPTY(TypeParameter, const)
11221124
ESTREE_NODE_1_ARGS(
11231125
TypeParameterInstantiation, Flow,
11241126
NodeList, params, false)

‎lib/Parser/JSParserImpl-flow.cpp

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2894,7 +2894,7 @@ Optional<ESTree::Node *> JSParserImpl::parsePrimaryTypeAnnotationFlow() {
28942894
start,
28952895
getPrevTokenEndLoc(),
28962896
new (context_) ESTree::TypeParameterNode(
2897-
name, bound, nullptr, nullptr, true))));
2897+
name, false, bound, nullptr, nullptr, true))));
28982898
}
28992899

29002900
{
@@ -3938,8 +3938,8 @@ Optional<ESTree::Node *> JSParserImpl::parseTypeMappedTypePropertyFlow(
39383938
ESTree::Node *keyTparam = setLocation(
39393939
left,
39403940
left,
3941-
new (context_)
3942-
ESTree::TypeParameterNode(id, nullptr, nullptr, nullptr, false));
3941+
new (context_) ESTree::TypeParameterNode(
3942+
id, false, nullptr, nullptr, nullptr, false));
39433943

39443944
auto optSourceType = parseTypeAnnotationFlow();
39453945
if (!optSourceType)
@@ -4098,7 +4098,12 @@ Optional<ESTree::Node *> JSParserImpl::parseTypeParamsFlow() {
40984098

40994099
Optional<ESTree::Node *> JSParserImpl::parseTypeParamFlow() {
41004100
SMLoc start = tok_->getStartLoc();
4101+
bool isConst = false;
41014102
ESTree::Node *variance = nullptr;
4103+
if (check(TokenKind::rw_const)) {
4104+
isConst = true;
4105+
advance(JSLexer::GrammarContext::Type);
4106+
}
41024107

41034108
if (check(TokenKind::plus, TokenKind::minus)) {
41044109
variance = setLocation(
@@ -4149,7 +4154,7 @@ Optional<ESTree::Node *> JSParserImpl::parseTypeParamFlow() {
41494154
start,
41504155
getPrevTokenEndLoc(),
41514156
new (context_) ESTree::TypeParameterNode(
4152-
name, bound, variance, initializer, usesExtendsBound));
4157+
name, isConst, bound, variance, initializer, usesExtendsBound));
41534158
}
41544159

41554160
Optional<ESTree::Node *> JSParserImpl::parseTypeArgsFlow() {

‎test/Parser/flow/const-type-param-error1.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/**
2+
* Copyright (c) Meta Platforms, Inc. and affiliates.
3+
*
4+
* This source code is licensed under the MIT license found in the
5+
* LICENSE file in the root directory of this source tree.
6+
*/
7+
8+
// RUN: (! %hermesc -parse-flow -dump-ast -pretty-json %s 2>&1) | %FileCheck %s --match-full-lines
9+
10+
function foo<const>() {}
11+
// CHECK: {{.*}}:10:19: error: 'identifier' expected in type parameter

‎test/Parser/flow/const-type-param-error2.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/**
2+
* Copyright (c) Meta Platforms, Inc. and affiliates.
3+
*
4+
* This source code is licensed under the MIT license found in the
5+
* LICENSE file in the root directory of this source tree.
6+
*/
7+
8+
// RUN: (! %hermesc -parse-flow -dump-ast -pretty-json %s 2>&1) | %FileCheck %s --match-full-lines
9+
10+
function foo<const + const>() {}
11+
// CHECK: {{.*}}:10:22: error: 'identifier' expected in type parameter

‎test/Parser/flow/function-typeparams.js

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,81 @@ function foo<T>(x: number): number {}
100100
// CHECK-NEXT: "async": false
101101
// CHECK-NEXT: },
102102
// CHECK-NEXT: "directive": null
103+
// CHECK-NEXT: },
104+
105+
(function<const T>(): void {});
106+
// CHECK-NEXT: {
107+
// CHECK-NEXT: "type": "ExpressionStatement",
108+
// CHECK-NEXT: "expression": {
109+
// CHECK-NEXT: "type": "FunctionExpression",
110+
// CHECK-NEXT: "id": null,
111+
// CHECK-NEXT: "params": [],
112+
// CHECK-NEXT: "body": {
113+
// CHECK-NEXT: "type": "BlockStatement",
114+
// CHECK-NEXT: "body": []
115+
// CHECK-NEXT: },
116+
// CHECK-NEXT: "typeParameters": {
117+
// CHECK-NEXT: "type": "TypeParameterDeclaration",
118+
// CHECK-NEXT: "params": [
119+
// CHECK-NEXT: {
120+
// CHECK-NEXT: "type": "TypeParameter",
121+
// CHECK-NEXT: "name": "T",
122+
// CHECK-NEXT: "const": true,
123+
// CHECK-NEXT: "bound": null,
124+
// CHECK-NEXT: "variance": null,
125+
// CHECK-NEXT: "default": null
126+
// CHECK-NEXT: }
127+
// CHECK-NEXT: ]
128+
// CHECK-NEXT: },
129+
// CHECK-NEXT: "returnType": {
130+
// CHECK-NEXT: "type": "TypeAnnotation",
131+
// CHECK-NEXT: "typeAnnotation": {
132+
// CHECK-NEXT: "type": "VoidTypeAnnotation"
133+
// CHECK-NEXT: }
134+
// CHECK-NEXT: },
135+
// CHECK-NEXT: "generator": false,
136+
// CHECK-NEXT: "async": false
137+
// CHECK-NEXT: },
138+
// CHECK-NEXT: "directive": null
139+
// CHECK-NEXT: },
140+
141+
(function<const +T>(): void {});
142+
// CHECK-NEXT: {
143+
// CHECK-NEXT: "type": "ExpressionStatement",
144+
// CHECK-NEXT: "expression": {
145+
// CHECK-NEXT: "type": "FunctionExpression",
146+
// CHECK-NEXT: "id": null,
147+
// CHECK-NEXT: "params": [],
148+
// CHECK-NEXT: "body": {
149+
// CHECK-NEXT: "type": "BlockStatement",
150+
// CHECK-NEXT: "body": []
151+
// CHECK-NEXT: },
152+
// CHECK-NEXT: "typeParameters": {
153+
// CHECK-NEXT: "type": "TypeParameterDeclaration",
154+
// CHECK-NEXT: "params": [
155+
// CHECK-NEXT: {
156+
// CHECK-NEXT: "type": "TypeParameter",
157+
// CHECK-NEXT: "name": "T",
158+
// CHECK-NEXT: "const": true,
159+
// CHECK-NEXT: "bound": null,
160+
// CHECK-NEXT: "variance": {
161+
// CHECK-NEXT: "type": "Variance",
162+
// CHECK-NEXT: "kind": "plus"
163+
// CHECK-NEXT: },
164+
// CHECK-NEXT: "default": null
165+
// CHECK-NEXT: }
166+
// CHECK-NEXT: ]
167+
// CHECK-NEXT: },
168+
// CHECK-NEXT: "returnType": {
169+
// CHECK-NEXT: "type": "TypeAnnotation",
170+
// CHECK-NEXT: "typeAnnotation": {
171+
// CHECK-NEXT: "type": "VoidTypeAnnotation"
172+
// CHECK-NEXT: }
173+
// CHECK-NEXT: },
174+
// CHECK-NEXT: "generator": false,
175+
// CHECK-NEXT: "async": false
176+
// CHECK-NEXT: },
177+
// CHECK-NEXT: "directive": null
103178
// CHECK-NEXT: }
104179

105180
// CHECK-NEXT: ]

‎test/Parser/flow/type-param-error-const-name.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/**
2+
* Copyright (c) Meta Platforms, Inc. and affiliates.
3+
*
4+
* This source code is licensed under the MIT license found in the
5+
* LICENSE file in the root directory of this source tree.
6+
*/
7+
8+
// RUN: (! %hermesc -parse-flow -dump-ast -pretty-json %s 2>&1) | %FileCheck %s --match-full-lines
9+
10+
function foo<const>() {}
11+
// CHECK: {{.*}}:10:19: error: 'identifier' expected in type parameter

‎unsupported/juno/crates/hermes/src/parser/generated_ffi.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -882,6 +882,7 @@ extern "C" {
882882
pub fn hermes_get_TypeParameterDeclaration_params(node: NodePtr) -> NodeListRef;
883883
// TypeParameter
884884
pub fn hermes_get_TypeParameter_name(node: NodePtr) -> NodeLabel;
885+
pub fn hermes_get_TypeParameter_const(node: NodePtr) -> bool;
885886
pub fn hermes_get_TypeParameter_bound(node: NodePtr) -> NodePtrOpt;
886887
pub fn hermes_get_TypeParameter_variance(node: NodePtr) -> NodePtrOpt;
887888
pub fn hermes_get_TypeParameter_default(node: NodePtr) -> NodePtrOpt;

‎unsupported/juno/crates/juno/src/hparser/generated_cvt.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2172,13 +2172,15 @@ pub unsafe fn cvt_node_ptr<'parser, 'gc>(
21722172
}
21732173
NodeKind::TypeParameter => {
21742174
let name = cvt.cvt_label(gc, hermes_get_TypeParameter_name(n));
2175+
let const = hermes_get_TypeParameter_const(n);
21752176
let bound = cvt_node_ptr_opt(cvt, gc, hermes_get_TypeParameter_bound(n));
21762177
let variance = cvt_node_ptr_opt(cvt, gc, hermes_get_TypeParameter_variance(n));
21772178
let default = cvt_node_ptr_opt(cvt, gc, hermes_get_TypeParameter_default(n));
21782179
let uses_extends_bound = hermes_get_TypeParameter_usesExtendsBound(n);
21792180
let mut template = ast::template::TypeParameter {
21802181
metadata: ast::TemplateMetadata {range, ..Default::default()},
21812182
name,
2183+
const,
21822184
bound,
21832185
variance,
21842186
default,

0 commit comments

Comments
 (0)