Merge branch 'master' into escape-json-control-characters

Author: mediremi

compiler/core/js_dump.ml

@@ -1124,7 +1124,9 @@ and print_jsx cxt ?(spread_props : J.expression option)
     else
       (List.fold_left (fun acc (n, x) ->
            P.space f;
-           P.string f n;
+           let prop_name = Js_dump_property.property_key_string n in
+
+           P.string f prop_name;
            P.string f "=";
            P.string f "{";
            let next = expression ~level:0 acc f x in

compiler/core/js_dump_property.ml

@@ -81,9 +81,11 @@ let property_access f s =
         | _ -> Js_dump_string.pp_string f s
         | exception _ -> Js_dump_string.pp_string f s)
 
+let property_key_string (s : string) : string =
+  let s = Ext_ident.unwrap_uppercase_exotic s in
+  if obj_property_no_need_quot s then s else Js_dump_string.escape_to_string s
+
 let property_key (s : J.property_name) : string =
   match s with
-  | Lit s ->
-    let s = Ext_ident.unwrap_uppercase_exotic s in
-    if obj_property_no_need_quot s then s else Js_dump_string.escape_to_string s
+  | Lit s -> property_key_string s
   | Symbol_name -> {|[Symbol.for("name")]|}

compiler/core/js_dump_property.mli

@@ -25,3 +25,5 @@
 val property_access : Ext_pp.t -> string -> unit
 
 val property_key : J.property_name -> string
+
+val property_key_string : string -> string

compiler/frontend/bs_syntaxerr.ml

@@ -33,16 +33,12 @@ type error =
   | Expect_string_literal
   | Expect_int_or_string_or_json_literal
   | Unhandled_poly_type
-  | Unregistered of string
   | Invalid_underscore_type_in_external
   | Invalid_bs_string_type
   | Invalid_bs_int_type
   | Invalid_bs_unwrap_type
   | Conflict_ffi_attribute of string
-  | Not_supported_in_bs_deriving
-  | Canot_infer_arity_by_syntax
   | Illegal_attribute
-  | Inconsistent_arity of int * int
   (* we still rqeuire users to have explicit annotation to avoid
      {[ (((int -> int) -> int) -> int )]}
   *)
@@ -66,12 +62,6 @@ let pp_error fmt err =
        syntax wise `_ option` for safety"
     | Not_supported_directive_in_bs_return -> "Not supported return directive"
     | Illegal_attribute -> "Illegal attributes"
-    | Canot_infer_arity_by_syntax ->
-      "Cannot infer the arity through the syntax, either [%@uncurry n] or \n\
-       write it in arrow syntax "
-    | Inconsistent_arity (arity, n) ->
-      Printf.sprintf "Inconsistent arity %d vs %d" arity n
-    | Not_supported_in_bs_deriving -> "not supported in deriving"
     | Unsupported_predicates -> "unsupported predicates"
     | Conflict_bs_bs_this_bs_meth ->
       "%@this, %@bs, %@meth can not be applied at the same time"
@@ -82,7 +72,6 @@ let pp_error fmt err =
     | Expect_int_or_string_or_json_literal ->
       "expect int, string literal or json literal {json|text here|json} "
     | Unhandled_poly_type -> "Unhandled poly type"
-    | Unregistered str -> "Unregistered " ^ str
     | Invalid_underscore_type_in_external ->
       "_ is not allowed in combination with external optional type"
     | Invalid_bs_string_type -> "Not a valid type for %@string"

compiler/frontend/bs_syntaxerr.mli

@@ -33,16 +33,12 @@ type error =
   | Expect_string_literal
   | Expect_int_or_string_or_json_literal
   | Unhandled_poly_type
-  | Unregistered of string
   | Invalid_underscore_type_in_external
   | Invalid_bs_string_type
   | Invalid_bs_int_type
   | Invalid_bs_unwrap_type
   | Conflict_ffi_attribute of string
-  | Not_supported_in_bs_deriving
-  | Canot_infer_arity_by_syntax
   | Illegal_attribute
-  | Inconsistent_arity of int * int
   (* we still rqeuire users to have explicit annotation to avoid
      {[ (((int -> int) -> int) -> int )]}
   *)

tests/tests/src/preserve_jsx_test.mjs

@@ -111,6 +111,19 @@ let _external_component_with_children = <QueryClientProvider>
 <Preserve_jsx_test$B/>
 </QueryClientProvider>;
 
+function make(props) {
+  return <p>
+  {"foo"}
+  {props["\\\"MyWeirdProp\""]}
+  </p>;
+}
+
+let MyWeirdComponent = {
+  make: make
+};
+
+let _escaped_jsx_prop = <make MyWeirdProp={"bar"}/>;
+
 export {
   React,
   ReactDOM,
@@ -133,5 +146,7 @@ export {
   A,
   B,
   _external_component_with_children,
+  MyWeirdComponent,
+  _escaped_jsx_prop,
 }
 /* _single_element_child Not a pure module */

tests/tests/src/preserve_jsx_test.res

@@ -155,3 +155,15 @@ let _external_component_with_children =
     <strong />
     <B />
   </A>
+
+module MyWeirdComponent = {
+  type props = {\"MyWeirdProp": string}
+
+  let make = props =>
+    <p>
+      {React.string("foo")}
+      {React.string(props.\"MyWeirdProp")}
+    </p>
+}
+
+let _escaped_jsx_prop = <MyWeirdComponent \"MyWeirdProp"="bar" />