Add new -bs-jsx-preserve flag

Author: nojaf

compiler/bsc/rescript_compiler_main.ml

@@ -255,6 +255,9 @@ let buckle_script_flags : (string * Bsc_args.spec * string) array =
     ( "-bs-jsx-mode",
       string_call ignore,
       "*internal* Set jsx mode, this is no longer used and is a no-op." );
+    ( "-bs-jsx-preserve",
+      unit_call (fun _ -> Js_config.jsx_preserve := true),
+      "*internal* Preserve jsx" );
     ( "-bs-package-output",
       string_call Js_packages_state.update_npm_package_path,
       "*internal* Set npm-output-path: [opt_module]:path, for example: \

compiler/common/js_config.ml

@@ -50,6 +50,7 @@ let force_cmi = ref false
 let force_cmj = ref false
 let jsx_version = ref None
 let jsx_module = ref React
+let jsx_preserve = ref false
 let js_stdout = ref true
 let all_module_aliases = ref false
 let no_stdlib = ref false

compiler/common/js_config.mli

@@ -80,6 +80,8 @@ val jsx_version : jsx_version option ref
 
 val jsx_module : jsx_module ref
 
+val jsx_preserve : bool ref
+
 val js_stdout : bool ref
 
 val all_module_aliases : bool ref

compiler/frontend/ppx_entry.ml

@@ -34,7 +34,8 @@ let rewrite_signature (ast : Parsetree.signature) : Parsetree.signature =
       let open Js_config in
       let jsx_version = int_of_jsx_version jsx_version_ in
       let jsx_module = string_of_jsx_module !jsx_module in
-      Jsx_ppx.rewrite_signature ~jsx_version ~jsx_module ast
+      let jsx_preserve = !jsx_preserve in
+      Jsx_ppx.rewrite_signature ~jsx_version ~jsx_module ~jsx_preserve ast
   in
   if !Js_config.no_builtin_ppx then ast
   else
@@ -53,7 +54,8 @@ let rewrite_implementation (ast : Parsetree.structure) : Parsetree.structure =
       let open Js_config in
       let jsx_version = int_of_jsx_version jsx_version_ in
       let jsx_module = string_of_jsx_module !jsx_module in
-      Jsx_ppx.rewrite_implementation ~jsx_version ~jsx_module ast
+      let jsx_preserve = !jsx_preserve in
+      Jsx_ppx.rewrite_implementation ~jsx_version ~jsx_module ~jsx_preserve ast
   in
   if !Js_config.no_builtin_ppx then ast
   else

compiler/syntax/cli/res_cli.ml

@@ -163,6 +163,7 @@ module ResClflags : sig
   val interface : bool ref
   val jsx_version : int ref
   val jsx_module : string ref
+  val jsx_preserve : bool ref
   val typechecker : bool ref
   val test_ast_conversion : bool ref
 
@@ -175,6 +176,7 @@ end = struct
   let interface = ref false
   let jsx_version = ref (-1)
   let jsx_module = ref "react"
+  let jsx_preserve = ref false
   let file = ref ""
   let typechecker = ref false
   let test_ast_conversion = ref false
@@ -225,7 +227,7 @@ module CliArgProcessor = struct
   [@@unboxed]
 
   let process_file ~is_interface ~width ~recover ~target ~jsx_version
-      ~jsx_module ~typechecker ~test_ast_conversion filename =
+      ~jsx_module ~jsx_preserve ~typechecker ~test_ast_conversion filename =
     let len = String.length filename in
     let process_interface =
       is_interface
@@ -277,7 +279,8 @@ module CliArgProcessor = struct
               Ast_mapper_from0.default_mapper tree0
         in
         let parsetree =
-          Jsx_ppx.rewrite_signature ~jsx_version ~jsx_module parsetree
+          Jsx_ppx.rewrite_signature ~jsx_version ~jsx_module ~jsx_preserve
+            parsetree
         in
         print_engine.print_interface ~width ~filename
           ~comments:parse_result.comments parsetree
@@ -302,7 +305,8 @@ module CliArgProcessor = struct
               Ast_mapper_from0.default_mapper tree0
         in
         let parsetree =
-          Jsx_ppx.rewrite_implementation ~jsx_version ~jsx_module parsetree
+          Jsx_ppx.rewrite_implementation ~jsx_version ~jsx_module ~jsx_preserve
+            parsetree
         in
         print_engine.print_implementation ~width ~filename
           ~comments:parse_result.comments parsetree
@@ -315,7 +319,7 @@ let () =
     CliArgProcessor.process_file ~is_interface:!ResClflags.interface
       ~width:!ResClflags.width ~recover:!ResClflags.recover
       ~target:!ResClflags.print ~jsx_version:!ResClflags.jsx_version
-      ~jsx_module:!ResClflags.jsx_module ~typechecker:!ResClflags.typechecker
-      !ResClflags.file
+      ~jsx_module:!ResClflags.jsx_module ~jsx_preserve:!ResClflags.jsx_preserve
+      ~typechecker:!ResClflags.typechecker !ResClflags.file
       ~test_ast_conversion:!ResClflags.test_ast_conversion)
 [@@raises exit]

compiler/syntax/src/jsx_common.ml

@@ -6,6 +6,7 @@ type jsx_config = {
   mutable module_: string;
   mutable nested_modules: string list;
   mutable has_component: bool;
+  mutable preserve: bool;
 }
 
 (* Helper method to look up the [@react.component] attribute *)

compiler/syntax/src/jsx_ppx.ml

@@ -135,27 +135,29 @@ let get_mapper ~config =
 
   {default_mapper with expr; module_binding; signature; structure}
 
-let rewrite_implementation ~jsx_version ~jsx_module (code : Parsetree.structure)
-    : Parsetree.structure =
+let rewrite_implementation ~jsx_version ~jsx_module ~jsx_preserve
+    (code : Parsetree.structure) : Parsetree.structure =
   let config =
     {
       Jsx_common.version = jsx_version;
       module_ = jsx_module;
       nested_modules = [];
       has_component = false;
+      preserve = jsx_preserve;
     }
   in
   let mapper = get_mapper ~config in
   mapper.structure mapper code
 
-let rewrite_signature ~jsx_version ~jsx_module (code : Parsetree.signature) :
-    Parsetree.signature =
+let rewrite_signature ~jsx_version ~jsx_module ~jsx_preserve
+    (code : Parsetree.signature) : Parsetree.signature =
   let config =
     {
       Jsx_common.version = jsx_version;
       module_ = jsx_module;
       nested_modules = [];
       has_component = false;
+      preserve = jsx_preserve;
     }
   in
   let mapper = get_mapper ~config in

compiler/syntax/src/jsx_ppx.mli

@@ -11,11 +11,13 @@
 val rewrite_implementation :
   jsx_version:int ->
   jsx_module:string ->
+  jsx_preserve:bool ->
   Parsetree.structure ->
   Parsetree.structure
 
 val rewrite_signature :
   jsx_version:int ->
   jsx_module:string ->
+  jsx_preserve:bool ->
   Parsetree.signature ->
   Parsetree.signature

compiler/syntax/src/jsx_v4.ml

@@ -1277,7 +1277,7 @@ let mk_react_jsx (config : Jsx_common.jsx_config) mapper loc attrs
         [key_prop; (nolabel, unit_expr ~loc:Location.none)] )
   in
   let args = [(nolabel, elementTag); (nolabel, props_record)] @ key_and_unit in
-  Exp.apply ~loc ~attrs ~transformed_jsx:true jsx_expr args
+  Exp.apply ~loc ~attrs ~transformed_jsx:config.preserve jsx_expr args
 
 (* In most situations, the component name is the make function from a module. 
     However, if the name contains a lowercase letter, it means it probably an external component.

tests/tests/src/nojaf.mjs

@@ -0,0 +1,24 @@
+// Generated by ReScript, PLEASE EDIT WITH CARE
+
+import * as JsxRuntime from "react/jsx-runtime";
+
+let React = {};
+
+let ReactDOM = {};
+
+function Nojaf$Icon(props) {
+  return <strong/>;
+}
+
+let Icon = {
+  make: Nojaf$Icon
+};
+
+<div><h1>{"Hello, world!"}</h1><Nojaf$Icon/></div>;
+
+export {
+  React,
+  ReactDOM,
+  Icon,
+}
+/*  Not a pure module */

tests/tests/src/nojaf.res

@@ -0,0 +1,80 @@
+@@config({
+  flags: ["-bs-jsx", "4", "-bs-jsx-preserve"],
+})
+
+module React = {
+  type element = Jsx.element
+
+  @val external null: element = "null"
+
+  external float: float => element = "%identity"
+  external int: int => element = "%identity"
+  external string: string => element = "%identity"
+
+  external array: array<element> => element = "%identity"
+
+  type componentLike<'props, 'return> = Jsx.componentLike<'props, 'return>
+
+  type component<'props> = Jsx.component<'props>
+
+  external component: componentLike<'props, element> => component<'props> = "%identity"
+
+  @module("react")
+  external createElement: (component<'props>, 'props) => element = "createElement"
+
+  @module("react")
+  external cloneElement: (element, 'props) => element = "cloneElement"
+
+  @module("react")
+  external isValidElement: 'a => bool = "isValidElement"
+
+  @variadic @module("react")
+  external createElementVariadic: (component<'props>, 'props, array<element>) => element =
+    "createElement"
+
+  @module("react/jsx-runtime")
+  external jsx: (component<'props>, 'props) => element = "jsx"
+
+  @module("react/jsx-runtime")
+  external jsxKeyed: (component<'props>, 'props, ~key: string=?, @ignore unit) => element = "jsx"
+
+  @module("react/jsx-runtime")
+  external jsxs: (component<'props>, 'props) => element = "jsxs"
+
+  @module("react/jsx-runtime")
+  external jsxsKeyed: (component<'props>, 'props, ~key: string=?, @ignore unit) => element = "jsxs"
+
+  type fragmentProps = {children?: element}
+
+  @module("react/jsx-runtime") external jsxFragment: component<fragmentProps> = "Fragment"
+}
+
+module ReactDOM = {
+  external someElement: React.element => option<React.element> = "%identity"
+
+  @module("react/jsx-runtime")
+  external jsx: (string, JsxDOM.domProps) => Jsx.element = "jsx"
+
+  @module("react/jsx-runtime")
+  external jsxKeyed: (string, JsxDOM.domProps, ~key: string=?, @ignore unit) => Jsx.element = "jsx"
+
+  @module("react/jsx-runtime")
+  external jsxs: (string, JsxDOM.domProps) => Jsx.element = "jsxs"
+
+  @module("react/jsx-runtime")
+  external jsxsKeyed: (string, JsxDOM.domProps, ~key: string=?, @ignore unit) => Jsx.element =
+    "jsxs"
+}
+
+module Icon = {
+  @react.component
+  let make = () => {
+    <strong />
+  }
+}
+
+let _ =
+  <div>
+    <h1> {React.string("Hello, world!")} </h1>
+    <Icon />
+  </div>