[flow][estree] make type param "const" property a boolean

Summary: Makes "const" a required boolean property of the TypeParameter estree node. The main change is in estree_translator.ml and custom_ast_types.js. The rest is changes in the expected estree outputs. Changelog: [internal] Reviewed By: SamChou19815 Differential Revision: D66844177 fbshipit-source-id: 88e7c1c1991a695e6bcbae6ea726be4cc6182b86
facebook · Dec 7, 2024 · a03cc27 · a03cc27
1 parent 776e886
commit a03cc27
Show file tree

Hide file tree

Showing 137 changed files with 281 additions and 137 deletions.
diff --git a/packages/flow-parser/test/custom_ast_types.js b/packages/flow-parser/test/custom_ast_types.js
@@ -361,12 +361,11 @@ function custom_ast_types(fork) {
     .field('argument', def('FlowType'));
   def('TypeParameter')
     .field('usesExtendsBound', or(undefined, Boolean))
-    .field('const', or(def('ConstModifier'), null), defaults['null']);
+    .field('const', Boolean);
   def('Variance').field(
     'kind',
     or('plus', 'minus', 'readonly', 'in', 'out', 'in-out'),
   );
-  def('ConstModifier').bases('Node');
   def('AsExpression')
     .bases('Expression')
     .build('expression', 'typeAnnotation')

diff --git a/packages/flow-parser/test/esprima_test_runner.js b/packages/flow-parser/test/esprima_test_runner.js
@@ -283,6 +283,7 @@ function handleSpecialObjectCompare(esprima, flow, env) {
         param.bound = param.typeAnnotation || null;
         param.default = param.default || null;
         param.variance = param.variance || null;
+        param.const = param.const || false;
         delete param.typeAnnotation;
         delete param.optional;
       }

diff --git a/src/parser/estree_translator.ml b/src/parser/estree_translator.ml
@@ -2199,12 +2199,10 @@ with type t = Impl.t = struct
               backwards-compatibility. TODO: change this? *)
            ("name", string name);
            ("bound", hint type_annotation bound);
+           ("const", bool (Option.is_some const));
            ("variance", option variance tp_var);
            ("default", option _type default);
          ]
-        @ (match const with
-          | Some (loc, comments) -> [("const", node ?comments "ConstModifier" loc [])]
-          | None -> [])
         @
         match bound_kind with
         | Type.TypeParam.Colon -> []

diff --git a/src/parser/test/flow/ES6/modules/migrated_0023.tree.json b/src/parser/test/flow/ES6/modules/migrated_0023.tree.json
@@ -94,6 +94,7 @@
               "range":[24,25],
               "name":"T",
               "bound":null,
+              "const":false,
               "variance":null,
               "default":null
             }

diff --git a/src/parser/test/flow/ES6/modules/migrated_0024.tree.json b/src/parser/test/flow/ES6/modules/migrated_0024.tree.json
@@ -18,7 +18,6 @@
           "range":[23,25],
           "body":[]
         },
-        "superClass":null,
         "typeParameters":{
           "type":"TypeParameterDeclaration",
           "loc":{"source":null,"start":{"line":1,"column":20},"end":{"line":1,"column":23}},
@@ -30,11 +29,13 @@
               "range":[21,22],
               "name":"T",
               "bound":null,
+              "const":false,
               "variance":null,
               "default":null
             }
           ]
         },
+        "superClass":null,
         "superTypeParameters":null,
         "implements":[],
         "decorators":[]

diff --git a/src/parser/test/flow/arrow_function/migrated_0006.tree.json b/src/parser/test/flow/arrow_function/migrated_0006.tree.json
@@ -82,6 +82,7 @@
               "range":[1,2],
               "name":"T",
               "bound":null,
+              "const":false,
               "variance":null,
               "default":null
             }

diff --git a/src/parser/test/flow/async_arrow_functions/with_type_parameters.tree.json b/src/parser/test/flow/async_arrow_functions/with_type_parameters.tree.json
@@ -140,6 +140,7 @@
                   "range":[17,18],
                   "name":"T",
                   "bound":null,
+                  "const":false,
                   "variance":null,
                   "default":null
                 },
@@ -149,6 +150,7 @@
                   "range":[20,21],
                   "name":"R",
                   "bound":null,
+                  "const":false,
                   "variance":null,
                   "default":null
                 },
@@ -158,6 +160,7 @@
                   "range":[23,24],
                   "name":"S",
                   "bound":null,
+                  "const":false,
                   "variance":null,
                   "default":null
                 }

diff --git a/src/parser/test/flow/async_await/async_generic_method.tree.json b/src/parser/test/flow/async_await/async_generic_method.tree.json
@@ -52,6 +52,7 @@
                     "range":[9,10],
                     "name":"T",
                     "bound":null,
+                    "const":false,
                     "variance":null,
                     "default":null
                   }

diff --git a/src/parser/test/flow/async_generators/migrated_0001.tree.json b/src/parser/test/flow/async_generators/migrated_0001.tree.json
@@ -65,6 +65,7 @@
             "range":[19,20],
             "name":"T",
             "bound":null,
+            "const":false,
             "variance":null,
             "default":null
           }

diff --git a/src/parser/test/flow/async_generators/migrated_0003.tree.json b/src/parser/test/flow/async_generators/migrated_0003.tree.json
@@ -87,6 +87,7 @@
                     "range":[20,21],
                     "name":"T",
                     "bound":null,
+                    "const":false,
                     "variance":null,
                     "default":null
                   }

diff --git a/src/parser/test/flow/async_generators/migrated_0005.tree.json b/src/parser/test/flow/async_generators/migrated_0005.tree.json
@@ -87,6 +87,7 @@
                     "range":[27,28],
                     "name":"T",
                     "bound":null,
+                    "const":false,
                     "variance":null,
                     "default":null
                   }

diff --git a/src/parser/test/flow/async_generators/migrated_0007.tree.json b/src/parser/test/flow/async_generators/migrated_0007.tree.json
@@ -75,6 +75,7 @@
                   "range":[25,26],
                   "name":"T",
                   "bound":null,
+                  "const":false,
                   "variance":null,
                   "default":null
                 }

diff --git a/src/parser/test/flow/call_properties/migrated_0003.tree.json b/src/parser/test/flow/call_properties/migrated_0003.tree.json
@@ -85,6 +85,7 @@
                             "range":[11,12],
                             "name":"T",
                             "bound":null,
+                            "const":false,
                             "variance":null,
                             "default":null
                           }

diff --git a/src/parser/test/flow/class_expression/anonymous_with_type_params.tree.json b/src/parser/test/flow/class_expression/anonymous_with_type_params.tree.json
@@ -53,6 +53,7 @@
               "range": [8, 9],
               "name": "T",
               "bound": null,
+              "const":false,
               "variance": null,
               "default": null
             }

diff --git a/src/parser/test/flow/class_method_kinds/async_as_id_tparams.tree.json b/src/parser/test/flow/class_method_kinds/async_as_id_tparams.tree.json
@@ -60,6 +60,7 @@
                     "range":[18,19],
                     "name":"T",
                     "bound":null,
+                    "const":false,
                     "variance":null,
                     "default":null
                   }

diff --git a/src/parser/test/flow/class_method_kinds/async_tparams.tree.json b/src/parser/test/flow/class_method_kinds/async_tparams.tree.json
@@ -60,6 +60,7 @@
                     "range":[20,21],
                     "name":"T",
                     "bound":null,
+                    "const":false,
                     "variance":null,
                     "default":null
                   }

diff --git a/src/parser/test/flow/class_method_kinds/get_as_id_tparams.tree.json b/src/parser/test/flow/class_method_kinds/get_as_id_tparams.tree.json
@@ -60,6 +60,7 @@
                     "range":[16,17],
                     "name":"T",
                     "bound":null,
+                    "const":false,
                     "variance":null,
                     "default":null
                   }

diff --git a/src/parser/test/flow/class_method_kinds/static_as_id_tparams.tree.json b/src/parser/test/flow/class_method_kinds/static_as_id_tparams.tree.json
@@ -60,6 +60,7 @@
                     "range":[19,20],
                     "name":"T",
                     "bound":null,
+                    "const":false,
                     "variance":null,
                     "default":null
                   }

diff --git a/src/parser/test/flow/class_method_kinds/static_static_as_id_tparams.tree.json b/src/parser/test/flow/class_method_kinds/static_static_as_id_tparams.tree.json
@@ -60,6 +60,7 @@
                     "range":[26,27],
                     "name":"T",
                     "bound":null,
+                    "const":false,
                     "variance":null,
                     "default":null
                   }

diff --git a/src/parser/test/flow/class_properties/migrated_0014.tree.json b/src/parser/test/flow/class_properties/migrated_0014.tree.json
@@ -60,6 +60,7 @@
                     "range":[23,24],
                     "name":"T",
                     "bound":null,
+                    "const":false,
                     "variance":null,
                     "default":null
                   }

diff --git a/src/parser/test/flow/class_properties/migrated_0019.tree.json b/src/parser/test/flow/class_properties/migrated_0019.tree.json
@@ -60,6 +60,7 @@
                     "range":[23,24],
                     "name":"T",
                     "bound":null,
+                    "const":false,
                     "variance":null,
                     "default":null
                   }

diff --git a/src/parser/test/flow/class_properties/static_with_params.tree.json b/src/parser/test/flow/class_properties/static_with_params.tree.json
@@ -60,6 +60,7 @@
                     "range":[19,20],
                     "name":"T",
                     "bound":null,
+                    "const":false,
                     "variance":null,
                     "default":null
                   }

diff --git a/src/parser/test/flow/class_properties/static_with_params_no_types.tree.json b/src/parser/test/flow/class_properties/static_with_params_no_types.tree.json
@@ -66,6 +66,7 @@
                     "range":[19,20],
                     "name":"T",
                     "bound":null,
+                    "const":false,
                     "variance":null,
                     "default":null
                   }

diff --git a/src/parser/test/flow/comment_interning/arrow_function.tree.json b/src/parser/test/flow/comment_interning/arrow_function.tree.json
@@ -222,6 +222,7 @@
               "range":[236,237],
               "name":"T",
               "bound":null,
+              "const":false,
               "variance":null,
               "default":null
             }
@@ -360,6 +361,7 @@
               "range":[395,396],
               "name":"T",
               "bound":null,
+              "const":false,
               "variance":null,
               "default":null
             }

diff --git a/src/parser/test/flow/comment_interning/class_declaration.tree.json b/src/parser/test/flow/comment_interning/class_declaration.tree.json
@@ -142,6 +142,7 @@
             "range":[143,144],
             "name":"T",
             "bound":null,
+            "const":false,
             "variance":null,
             "default":null
           }
@@ -459,6 +460,7 @@
               "range":[603,604],
               "name":"T",
               "bound":null,
+              "const":false,
               "variance":null,
               "default":null
             }
@@ -915,6 +917,7 @@
             "range":[1187,1188],
             "name":"T",
             "bound":null,
+            "const":false,
             "variance":null,
             "default":null
           }
@@ -1022,6 +1025,7 @@
             "range":[1388,1389],
             "name":"T",
             "bound":null,
+            "const":false,
             "variance":null,
             "default":null
           }

diff --git a/src/parser/test/flow/comment_interning/class_expression.tree.json b/src/parser/test/flow/comment_interning/class_expression.tree.json
@@ -92,6 +92,7 @@
               "range":[84,85],
               "name":"T",
               "bound":null,
+              "const":false,
               "variance":null,
               "default":null
             }
@@ -170,6 +171,7 @@
               "range":[195,196],
               "name":"T",
               "bound":null,
+              "const":false,
               "variance":null,
               "default":null
             }

diff --git a/src/parser/test/flow/comment_interning/class_method.tree.json b/src/parser/test/flow/comment_interning/class_method.tree.json
@@ -100,6 +100,7 @@
                     "range":[55,56],
                     "name":"T",
                     "bound":null,
+                    "const":false,
                     "variance":null,
                     "default":null
                   }
@@ -823,6 +824,7 @@
                     "range":[814,815],
                     "name":"T",
                     "bound":null,
+                    "const":false,
                     "variance":null,
                     "default":null
                   }
@@ -939,6 +941,7 @@
                     "range":[933,934],
                     "name":"T",
                     "bound":null,
+                    "const":false,
                     "variance":null,
                     "default":null
                   }

diff --git a/src/parser/test/flow/comment_interning/declare_class.tree.json b/src/parser/test/flow/comment_interning/declare_class.tree.json
@@ -91,6 +91,7 @@
             "range":[147,148],
             "name":"T",
             "bound":null,
+            "const":false,
             "variance":null,
             "default":null
           }
@@ -456,6 +457,7 @@
             "range":[639,640],
             "name":"T",
             "bound":null,
+            "const":false,
             "variance":null,
             "default":null
           }

diff --git a/src/parser/test/flow/comment_interning/declare_function.tree.json b/src/parser/test/flow/comment_interning/declare_function.tree.json
@@ -139,6 +139,7 @@
                   "range":[152,153],
                   "name":"T",
                   "bound":null,
+                  "const":false,
                   "variance":null,
                   "default":null
                 }
@@ -427,6 +428,7 @@
                   "range":[592,593],
                   "name":"T",
                   "bound":null,
+                  "const":false,
                   "variance":null,
                   "default":null
                 }

diff --git a/src/parser/test/flow/comment_interning/declare_type_alias.tree.json b/src/parser/test/flow/comment_interning/declare_type_alias.tree.json
@@ -274,6 +274,7 @@
                 "range":[444,445],
                 "name":"U",
                 "bound":null,
+                "const":false,
                 "variance":null,
                 "default":null
               }
@@ -321,6 +322,7 @@
                 "range":[509,510],
                 "name":"U",
                 "bound":null,
+                "const":false,
                 "variance":null,
                 "default":null
               }

diff --git a/src/parser/test/flow/comment_interning/function_declaration.tree.json b/src/parser/test/flow/comment_interning/function_declaration.tree.json
@@ -179,6 +179,7 @@
             "range":[268,269],
             "name":"T",
             "bound":null,
+            "const":false,
             "variance":null,
             "default":null
           }
@@ -719,6 +720,7 @@
             "range":[936,937],
             "name":"T",
             "bound":null,
+            "const":false,
             "variance":null,
             "default":null
           }
@@ -867,6 +869,7 @@
             "range":[1097,1098],
             "name":"T",
             "bound":null,
+            "const":false,
             "variance":null,
             "default":null
           }