Explicitly make react the default JSX mode in Context

Summary: Closes facebook#6043

Reviewed By: gabelevi

Differential Revision: D7403293

fbshipit-source-id: d2573cf7c877471b014f717a4bdbbb086e207e35

Author: mroch

src/common/docblock.ml

@@ -8,12 +8,27 @@
 
 type flow_mode = OptIn | OptInStrict | OptInWeak | OptOut
 
+type jsx_pragma =
+  (**
+   * Specifies a function that should be invoked instead of React.createElement
+   * when interpreting JSX syntax. Otherwise, the usual rules of JSX are
+   * followed: children are varargs after a props argument.
+   *)
+  | Jsx_pragma of (string * Loc.t Ast.Expression.t)
+
+  (**
+   * Alternate mode for interpreting JSX syntax. The element name is treated
+   * as a function to be directly invoked, e.g. <Foo /> -> Foo({}).
+   * Children are part of props instead of a separate argument.
+   *)
+  | Csx_pragma
+
 type t = {
   flow: flow_mode option;
   preventMunge: bool option;
   providesModule: string option;
   isDeclarationFile: bool;
-  jsx: Options.jsx_mode option;
+  jsx: jsx_pragma option;
 }
 
 let default_info = {

src/common/options.ml

@@ -19,18 +19,22 @@ type lazy_mode =
 | LAZY_MODE_IDE
 
 type jsx_mode =
+  (* JSX desugars into a `React.createElement(name, props, ...children)` call *)
+  | Jsx_react
+
   (**
    * Specifies a function that should be invoked instead of React.createElement
    * when interpreting JSX syntax. Otherwise, the usual rules of JSX are
    * followed: children are varargs after a props argument.
    *)
-  | JSXPragma of (string * Loc.t Ast.Expression.t)
+  | Jsx_pragma of (string * Loc.t Ast.Expression.t)
+
   (**
    * Alternate mode for interpreting JSX syntax. The element name is treated
    * as a function to be directly invoked, e.g. <Foo /> -> Foo({}).
    * Children are part of props instead of a separate argument.
    *)
-  | CSX
+  | Jsx_csx
 
 type file_watcher =
 | NoFileWatcher

src/flow_dot_js.ml

@@ -127,7 +127,7 @@ let stub_metadata ~root ~checked = { Context.
   munge_underscores = false;
   verbose = None;
   weak = false;
-  jsx = None;
+  jsx = Options.Jsx_react;
   strict = false;
 
   (* global *)

src/parsing/parsing_service_js.ml

@@ -215,7 +215,7 @@ let extract_docblock =
           if info.jsx <> None then
             (csx_loc, MultipleJSXAttributes)::errors, info
           else
-            errors, { info with jsx = Some Options.CSX }
+            errors, { info with jsx = Some Csx_pragma }
         in
         parse_attributes acc xs
     | [jsx_loc, "@jsx"] -> (jsx_loc, InvalidJSXAttribute None)::errors, info
@@ -232,8 +232,7 @@ let extract_docblock =
               let (jsx_expr, _) = Parser_flow.jsx_pragma_expression
                 (padding ^ expr)
                 expr_loc.Loc.source in
-              let jsx_pragma = Options.JSXPragma (expr, jsx_expr) in
-              errors, { info with jsx = Some jsx_pragma }
+              errors, { info with jsx = Some (Jsx_pragma (expr, jsx_expr)) }
             with
             | Parse_error.Error [] ->
                 (expr_loc, InvalidJSXAttribute None)::errors, info

src/typing/context.ml

@@ -21,7 +21,7 @@ type metadata = {
   munge_underscores: bool;
   verbose: Verbose.t option;
   weak: bool;
-  jsx: Options.jsx_mode option;
+  jsx: Options.jsx_mode;
   strict: bool;
 
   (* global *)
@@ -132,7 +132,7 @@ let metadata_of_options options = {
   munge_underscores = Options.should_munge_underscores options;
   verbose = Options.verbose options;
   weak = Options.weak_by_default options;
-  jsx = None;
+  jsx = Options.Jsx_react;
   strict = false;
 
   (* global *)

src/typing/context.mli

@@ -24,7 +24,7 @@ type metadata = {
   munge_underscores: bool;
   verbose: Verbose.t option;
   weak: bool;
-  jsx: Options.jsx_mode option;
+  jsx: Options.jsx_mode;
   strict: bool;
   (* global *)
   enable_const_params: bool;
@@ -104,7 +104,7 @@ val type_graph: t -> Graph_explorer.graph
 val type_table: t -> Type_table.t
 val verbose: t -> Verbose.t option
 val max_workers: t -> int
-val jsx: t -> Options.jsx_mode option
+val jsx: t -> Options.jsx_mode
 val exists_checks: t -> ExistsCheck.t LocMap.t
 val exists_excuses: t -> ExistsCheck.t LocMap.t
 val use_def: t -> Scope_api.info * Ssa_api.values

src/typing/merge_js.ml

@@ -151,7 +151,14 @@ let detect_test_prop_misses cx =
 let apply_docblock_overrides (metadata: Context.metadata) docblock_info =
   let open Context in
 
-  let metadata = { metadata with jsx = Docblock.jsx docblock_info } in
+  let metadata =
+    let jsx = match Docblock.jsx docblock_info with
+    | Some (Docblock.Jsx_pragma (expr, jsx_expr)) -> Options.Jsx_pragma (expr, jsx_expr)
+    | Some Docblock.Csx_pragma -> Options.Jsx_csx
+    | None -> Options.Jsx_react
+    in
+    { metadata with jsx }
+  in
 
   let metadata = match Docblock.flow docblock_info with
   | None -> metadata

src/typing/statement.ml

@@ -3867,7 +3867,7 @@ and jsx_title cx openingElement children locs = Ast.JSX.(
     let fbt_reason = mk_reason RFbt loc_element in
     Flow.get_builtin_type cx fbt_reason facebook_fbt
 
-  | Identifier (loc, { Identifier.name }), _, None ->
+  | Identifier (loc, { Identifier.name }), _, Options.Jsx_react ->
     if Type_inference_hooks_js.dispatch_id_hook cx name loc then AnyT.at loc_element else
     let reason = mk_reason (RReactElement (Some name)) loc_element in
     let c =
@@ -3879,7 +3879,7 @@ and jsx_title cx openingElement children locs = Ast.JSX.(
     let o = jsx_mk_props cx reason c name attributes children in
     jsx_desugar cx name c o attributes children locs
 
-  | Identifier (loc, { Identifier.name }), _, Some Options.JSXPragma _ ->
+  | Identifier (loc, { Identifier.name }), _, Options.Jsx_pragma _ ->
     if Type_inference_hooks_js.dispatch_id_hook cx name loc then AnyT.at loc_element else
     let reason = mk_reason (RJSXElement (Some name)) loc_element in
     let c =
@@ -3891,7 +3891,7 @@ and jsx_title cx openingElement children locs = Ast.JSX.(
     let o = jsx_mk_props cx reason c name attributes children in
     jsx_desugar cx name c o attributes children locs
 
-  | Identifier (loc, { Identifier.name }), _, Some Options.CSX ->
+  | Identifier (loc, { Identifier.name }), _, Options.Jsx_csx ->
     (**
      * It's a bummer to duplicate this case, but CSX does not want the
      * "if name = String.capitalize name" restriction.
@@ -3902,7 +3902,7 @@ and jsx_title cx openingElement children locs = Ast.JSX.(
     let o = jsx_mk_props cx reason c name attributes children in
     jsx_desugar cx name c o attributes children locs
 
-  | MemberExpression member, _, None ->
+  | MemberExpression member, _, Options.Jsx_react ->
     let name = jsx_title_member_to_string member in
     let el = RReactElement (Some name) in
     let reason = mk_reason el loc_element in
@@ -3917,7 +3917,7 @@ and jsx_title cx openingElement children locs = Ast.JSX.(
 )
 
 and jsx_mk_props cx reason c name attributes children = Ast.JSX.(
-  let is_react = Context.jsx cx = None in
+  let is_react = Context.jsx cx = Options.Jsx_react in
   let reason_props = replace_reason_const
     (if is_react then RReactProps else RJSXElementProps name)
     reason in
@@ -4026,7 +4026,7 @@ and jsx_mk_props cx reason c name attributes children = Ast.JSX.(
 and jsx_desugar cx name component_t props attributes children locs =
   let loc_element, loc_opening, loc_children = locs in
   match Context.jsx cx with
-  | None ->
+  | Options.Jsx_react ->
       let reason = mk_reason (RReactElement (Some name)) loc_element in
       let react = Env.var_ref ~lookup_mode:ForValue cx "React" loc_opening in
       let children = List.map (function
@@ -4055,7 +4055,7 @@ and jsx_desugar cx name component_t props attributes children locs =
           None
         ))
       )
-  | Some Options.JSXPragma (raw_jsx_expr, jsx_expr) ->
+  | Options.Jsx_pragma (raw_jsx_expr, jsx_expr) ->
       let reason = mk_reason (RJSXFunctionCall raw_jsx_expr) loc_element in
 
       (* A JSX element with no attributes should pass in null as the second
@@ -4088,7 +4088,7 @@ and jsx_desugar cx name component_t props attributes children locs =
           let f = jsx_pragma_expression cx raw_jsx_expr loc_element jsx_expr in
           func_call cx reason ~use_op ~call_strict_arity:false f argts
       )
-  | Some Options.CSX ->
+  | Options.Jsx_csx ->
       let reason = mk_reason (RJSXFunctionCall name) loc_element in
       let use_op = Op (JSXCreateElement {
         op = reason;

testgen/flowtestgen_utils.ml

@@ -524,7 +524,7 @@ let stub_metadata ~root ~checked = { Context.
      *)
   verbose = None;
   weak = false;
-  jsx = None;
+  jsx = Options.Jsx_react;
   strict = true;
   (* global *)
   enable_const_params = false;