Merge pull request #4474 from rickyvetter/gh-4465

[reactjs] add support for ref argument inside of React.forwardRef type applications (#4465)

Author: bobzhang

jscomp/runtime/release.ninja

@@ -29,19 +29,19 @@ build runtime/caml_hash_primitive.cmj : cc_cmi runtime/caml_hash_primitive.ml |
 build runtime/caml_hash_primitive.cmi : cc runtime/caml_hash_primitive.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 build runtime/caml_int32.cmj : cc_cmi runtime/caml_int32.ml | runtime/caml_int32.cmi runtime/caml_nativeint_extern.cmj
 build runtime/caml_int32.cmi : cc runtime/caml_int32.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-build runtime/caml_int64.cmj : cc_cmi runtime/caml_int64.ml | runtime/caml_float.cmj runtime/caml_float_extern.cmj runtime/caml_int64.cmi runtime/caml_nativeint_extern.cmj runtime/caml_primitive.cmj runtime/caml_string_extern.cmj runtime/js.cmj
+build runtime/caml_int64.cmj : cc_cmi runtime/caml_int64.ml | runtime/caml_float.cmj runtime/caml_float_extern.cmj runtime/caml_int64.cmi runtime/caml_nativeint_extern.cmj runtime/caml_string_extern.cmj runtime/js.cmj
 build runtime/caml_int64.cmi : cc runtime/caml_int64.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-build runtime/caml_io.cmj : cc_cmi runtime/caml_io.ml | runtime/caml_io.cmi runtime/caml_string_extern.cmj runtime/caml_undefined_extern.cmj runtime/curry.cmj runtime/js.cmj
+build runtime/caml_io.cmj : cc_cmi runtime/caml_io.ml | runtime/caml_io.cmi runtime/caml_string_extern.cmj runtime/caml_undefined_extern.cmj runtime/js.cmj
 build runtime/caml_io.cmi : cc runtime/caml_io.mli | runtime/bs_stdlib_mini.cmi runtime/caml_undefined_extern.cmj runtime/js.cmi runtime/js.cmj
 build runtime/caml_lexer.cmj : cc_cmi runtime/caml_lexer.ml | runtime/caml_lexer.cmi
 build runtime/caml_lexer.cmi : cc runtime/caml_lexer.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 build runtime/caml_md5.cmj : cc_cmi runtime/caml_md5.ml | runtime/caml_array_extern.cmj runtime/caml_char.cmj runtime/caml_int32_extern.cmj runtime/caml_md5.cmi runtime/caml_string_extern.cmj
 build runtime/caml_md5.cmi : cc runtime/caml_md5.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 build runtime/caml_module.cmj : cc_cmi runtime/caml_module.ml | runtime/caml_array_extern.cmj runtime/caml_module.cmi runtime/caml_obj.cmj
 build runtime/caml_module.cmi : cc runtime/caml_module.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-build runtime/caml_obj.cmj : cc_cmi runtime/caml_obj.ml | runtime/caml_array_extern.cmj runtime/caml_obj.cmi runtime/caml_option.cmj runtime/caml_primitive.cmj runtime/js.cmj
+build runtime/caml_obj.cmj : cc_cmi runtime/caml_obj.ml | runtime/caml_array_extern.cmj runtime/caml_obj.cmi runtime/caml_option.cmj runtime/js.cmj
 build runtime/caml_obj.cmi : cc runtime/caml_obj.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-build runtime/caml_oo.cmj : cc_cmi runtime/caml_oo.ml | runtime/caml_array.cmj runtime/caml_array_extern.cmj runtime/caml_exceptions.cmj runtime/caml_oo.cmi
+build runtime/caml_oo.cmj : cc_cmi runtime/caml_oo.ml | runtime/caml_array_extern.cmj runtime/caml_exceptions.cmj runtime/caml_oo.cmi
 build runtime/caml_oo.cmi : cc runtime/caml_oo.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 build runtime/caml_option.cmj : cc_cmi runtime/caml_option.ml | runtime/caml_option.cmi runtime/caml_undefined_extern.cmj runtime/js.cmj
 build runtime/caml_option.cmi : cc runtime/caml_option.mli | runtime/bs_stdlib_mini.cmi runtime/caml_undefined_extern.cmj runtime/js.cmi runtime/js.cmj
@@ -63,10 +63,10 @@ build runtime/caml_external_polyfill.cmi runtime/caml_external_polyfill.cmj : cc
 build runtime/caml_float_extern.cmi runtime/caml_float_extern.cmj : cc runtime/caml_float_extern.ml | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 build runtime/caml_int32_extern.cmi runtime/caml_int32_extern.cmj : cc runtime/caml_int32_extern.ml | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 build runtime/caml_int64_extern.cmi runtime/caml_int64_extern.cmj : cc runtime/caml_int64_extern.ml | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-build runtime/caml_js_exceptions.cmi runtime/caml_js_exceptions.cmj : cc runtime/caml_js_exceptions.ml | runtime/bs_stdlib_mini.cmi runtime/caml_exceptions.cmj runtime/caml_option.cmj runtime/js.cmi runtime/js.cmj
+build runtime/caml_js_exceptions.cmi runtime/caml_js_exceptions.cmj : cc runtime/caml_js_exceptions.ml | runtime/bs_stdlib_mini.cmi runtime/caml_exceptions.cmj runtime/js.cmi runtime/js.cmj
 build runtime/caml_nativeint_extern.cmi runtime/caml_nativeint_extern.cmj : cc runtime/caml_nativeint_extern.ml | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 build runtime/caml_oo_curry.cmi runtime/caml_oo_curry.cmj : cc runtime/caml_oo_curry.ml | runtime/bs_stdlib_mini.cmi runtime/caml_oo.cmj runtime/curry.cmj runtime/js.cmi runtime/js.cmj
 build runtime/caml_string_extern.cmi runtime/caml_string_extern.cmj : cc runtime/caml_string_extern.ml | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
 build runtime/caml_undefined_extern.cmi runtime/caml_undefined_extern.cmj : cc runtime/caml_undefined_extern.ml | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-build runtime/curry.cmi runtime/curry.cmj : cc runtime/curry.ml | runtime/bs_stdlib_mini.cmi runtime/caml_array.cmj runtime/caml_array_extern.cmj runtime/js.cmi runtime/js.cmj
+build runtime/curry.cmi runtime/curry.cmj : cc runtime/curry.ml | runtime/bs_stdlib_mini.cmi runtime/caml_array_extern.cmj runtime/js.cmi runtime/js.cmj
 build runtime : phony runtime/bs_stdlib_mini.cmi runtime/js.cmj runtime/js.cmi runtime/caml_array.cmi runtime/caml_array.cmj runtime/caml_bytes.cmi runtime/caml_bytes.cmj runtime/caml_float.cmi runtime/caml_float.cmj runtime/caml_format.cmi runtime/caml_format.cmj runtime/caml_gc.cmi runtime/caml_gc.cmj runtime/caml_hash.cmi runtime/caml_hash.cmj runtime/caml_hash_primitive.cmi runtime/caml_hash_primitive.cmj runtime/caml_int32.cmi runtime/caml_int32.cmj runtime/caml_int64.cmi runtime/caml_int64.cmj runtime/caml_io.cmi runtime/caml_io.cmj runtime/caml_lexer.cmi runtime/caml_lexer.cmj runtime/caml_md5.cmi runtime/caml_md5.cmj runtime/caml_module.cmi runtime/caml_module.cmj runtime/caml_obj.cmi runtime/caml_obj.cmj runtime/caml_oo.cmi runtime/caml_oo.cmj runtime/caml_option.cmi runtime/caml_option.cmj runtime/caml_parser.cmi runtime/caml_parser.cmj runtime/caml_primitive.cmi runtime/caml_primitive.cmj runtime/caml_splice_call.cmi runtime/caml_splice_call.cmj runtime/caml_string.cmi runtime/caml_string.cmj runtime/caml_sys.cmi runtime/caml_sys.cmj runtime/caml_array_extern.cmi runtime/caml_array_extern.cmj runtime/caml_bytes_extern.cmi runtime/caml_bytes_extern.cmj runtime/caml_char.cmi runtime/caml_char.cmj runtime/caml_exceptions.cmi runtime/caml_exceptions.cmj runtime/caml_external_polyfill.cmi runtime/caml_external_polyfill.cmj runtime/caml_float_extern.cmi runtime/caml_float_extern.cmj runtime/caml_int32_extern.cmi runtime/caml_int32_extern.cmj runtime/caml_int64_extern.cmi runtime/caml_int64_extern.cmj runtime/caml_js_exceptions.cmi runtime/caml_js_exceptions.cmj runtime/caml_nativeint_extern.cmi runtime/caml_nativeint_extern.cmj runtime/caml_oo_curry.cmi runtime/caml_oo_curry.cmj runtime/caml_string_extern.cmi runtime/caml_string_extern.cmj runtime/caml_undefined_extern.cmi runtime/caml_undefined_extern.cmj runtime/curry.cmi runtime/curry.cmj

jscomp/syntax/reactjs_jsx_ppx.cppo.ml

@@ -477,9 +477,10 @@ let jsxMapper () =
       recursivelyTransformNamedArgsForMake mapper expression ((arg, default, pattern, alias, pattern.ppat_loc, type_) :: list)
     | Pexp_fun (Nolabel, _, { ppat_desc = (Ppat_construct ({txt = Lident "()"}, _) | Ppat_any)}, _expression) ->
         (list, None)
-    | Pexp_fun (Nolabel, _, { ppat_desc = Ppat_var ({txt})}, _expression) ->
+    | Pexp_fun (Nolabel, _, { ppat_desc = Ppat_var ({txt}) | Ppat_constraint ({ ppat_desc = Ppat_var ({txt})}, _)}, _expression) ->
         (list, Some txt)
-
+    | Pexp_fun (Nolabel, _, pattern, _expression) ->
+        Location.raise_errorf ~loc:pattern.ppat_loc "ReasonReact: react.component refs only support plain arguments and type annotations."
     | _ -> (list, None)
   in
 
@@ -618,6 +619,7 @@ let jsxMapper () =
           spelunkForFunExpression expression
         in
         let modifiedBinding binding =
+          let hasApplication = ref(false) in
           let wrapExpressionWithBinding expressionFn expression =
             Vb.mk
               ~loc:bindingLoc
@@ -641,14 +643,15 @@ let jsxMapper () =
           (* let make = (~prop) => ... *)
           | {
             pexp_desc = Pexp_fun ((Labelled(_) | Optional(_)), _default, _pattern, _internalExpression)
-          } -> ((fun a -> a), false, unerasableIgnoreExp  expression)
+          } -> ((fun a -> a), false, unerasableIgnoreExp expression)
           (* let make = (prop) => ... *)
           | {
-            pexp_desc = Pexp_fun (_nolabel, _default, _pattern, _internalExpression);
-            pexp_loc
+            pexp_desc = Pexp_fun (_nolabel, _default, pattern, _internalExpression)
           } -> 
-            Location.raise_errorf ~loc:pexp_loc 
-               "Make sure to use labeled arguments for props, if your component doesn't take any props use () or _ instead of a name as your argument"
+            if (hasApplication.contents) then
+              ((fun a -> a), false, unerasableIgnoreExp expression)
+            else
+              Location.raise_errorf ~loc:pattern.ppat_loc "ReasonReact: props need to be labelled arguments.\n  If you are working with refs be sure to wrap with React.forwardRef.\n  If your component doesn't have any props use () or _ instead of a name."
           (* let make = {let foo = bar in (~prop) => ...} *)
           | {
               pexp_desc = Pexp_let (recursive, vbs, internalExpression)
@@ -658,6 +661,7 @@ let jsxMapper () =
             (wrap, hasUnit, {expression with pexp_desc = Pexp_let (recursive, vbs, exp)})
           (* let make = React.forwardRef((~prop) => ...) *)
           | { pexp_desc = Pexp_apply (wrapperExpression, [(Nolabel, internalExpression)]) } ->
+            let () = hasApplication := true in
             let (_, hasUnit, exp) = spelunkForFunExpression internalExpression in
             ((fun exp -> Exp.apply wrapperExpression [(nolabel, exp)]), hasUnit, exp)
           | {

lib/4.06.1/unstable/js_compiler.ml

@@ -409997,9 +409997,10 @@ let jsxMapper () =
       recursivelyTransformNamedArgsForMake mapper expression ((arg, default, pattern, alias, pattern.ppat_loc, type_) :: list)
     | Pexp_fun (Nolabel, _, { ppat_desc = (Ppat_construct ({txt = Lident "()"}, _) | Ppat_any)}, _expression) ->
         (list, None)
-    | Pexp_fun (Nolabel, _, { ppat_desc = Ppat_var ({txt})}, _expression) ->
+    | Pexp_fun (Nolabel, _, { ppat_desc = Ppat_var ({txt}) | Ppat_constraint ({ ppat_desc = Ppat_var ({txt})}, _)}, _expression) ->
         (list, Some txt)
-
+    | Pexp_fun (Nolabel, _, pattern, _expression) ->
+        Location.raise_errorf ~loc:pattern.ppat_loc "ReasonReact: react.component refs only support plain arguments and type annotations."
     | _ -> (list, None)
   in
 
@@ -410138,6 +410139,7 @@ let jsxMapper () =
           spelunkForFunExpression expression
         in
         let modifiedBinding binding =
+          let hasApplication = ref(false) in
           let wrapExpressionWithBinding expressionFn expression =
             Vb.mk
               ~loc:bindingLoc
@@ -410161,14 +410163,15 @@ let jsxMapper () =
           (* let make = (~prop) => ... *)
           | {
             pexp_desc = Pexp_fun ((Labelled(_) | Optional(_)), _default, _pattern, _internalExpression)
-          } -> ((fun a -> a), false, unerasableIgnoreExp  expression)
+          } -> ((fun a -> a), false, unerasableIgnoreExp expression)
           (* let make = (prop) => ... *)
           | {
-            pexp_desc = Pexp_fun (_nolabel, _default, _pattern, _internalExpression);
-            pexp_loc
+            pexp_desc = Pexp_fun (_nolabel, _default, pattern, _internalExpression)
           } -> 
-            Location.raise_errorf ~loc:pexp_loc 
-               "Make sure to use labeled arguments for props, if your component doesn't take any props use () or _ instead of a name as your argument"
+            if (hasApplication.contents) then
+              ((fun a -> a), false, unerasableIgnoreExp expression)
+            else
+              Location.raise_errorf ~loc:pattern.ppat_loc "ReasonReact: props need to be labelled arguments.\n  If you are working with refs be sure to wrap with React.forwardRef.\n  If your component doesn't have any props use () or _ instead of a name."
           (* let make = {let foo = bar in (~prop) => ...} *)
           | {
               pexp_desc = Pexp_let (recursive, vbs, internalExpression)
@@ -410178,6 +410181,7 @@ let jsxMapper () =
             (wrap, hasUnit, {expression with pexp_desc = Pexp_let (recursive, vbs, exp)})
           (* let make = React.forwardRef((~prop) => ...) *)
           | { pexp_desc = Pexp_apply (wrapperExpression, [(Nolabel, internalExpression)]) } ->
+            let () = hasApplication := true in
             let (_, hasUnit, exp) = spelunkForFunExpression internalExpression in
             ((fun exp -> Exp.apply wrapperExpression [(nolabel, exp)]), hasUnit, exp)
           | {

lib/4.06.1/unstable/js_refmt_compiler.ml

@@ -409997,9 +409997,10 @@ let jsxMapper () =
       recursivelyTransformNamedArgsForMake mapper expression ((arg, default, pattern, alias, pattern.ppat_loc, type_) :: list)
     | Pexp_fun (Nolabel, _, { ppat_desc = (Ppat_construct ({txt = Lident "()"}, _) | Ppat_any)}, _expression) ->
         (list, None)
-    | Pexp_fun (Nolabel, _, { ppat_desc = Ppat_var ({txt})}, _expression) ->
+    | Pexp_fun (Nolabel, _, { ppat_desc = Ppat_var ({txt}) | Ppat_constraint ({ ppat_desc = Ppat_var ({txt})}, _)}, _expression) ->
         (list, Some txt)
-
+    | Pexp_fun (Nolabel, _, pattern, _expression) ->
+        Location.raise_errorf ~loc:pattern.ppat_loc "ReasonReact: react.component refs only support plain arguments and type annotations."
     | _ -> (list, None)
   in
 
@@ -410138,6 +410139,7 @@ let jsxMapper () =
           spelunkForFunExpression expression
         in
         let modifiedBinding binding =
+          let hasApplication = ref(false) in
           let wrapExpressionWithBinding expressionFn expression =
             Vb.mk
               ~loc:bindingLoc
@@ -410161,14 +410163,15 @@ let jsxMapper () =
           (* let make = (~prop) => ... *)
           | {
             pexp_desc = Pexp_fun ((Labelled(_) | Optional(_)), _default, _pattern, _internalExpression)
-          } -> ((fun a -> a), false, unerasableIgnoreExp  expression)
+          } -> ((fun a -> a), false, unerasableIgnoreExp expression)
           (* let make = (prop) => ... *)
           | {
-            pexp_desc = Pexp_fun (_nolabel, _default, _pattern, _internalExpression);
-            pexp_loc
+            pexp_desc = Pexp_fun (_nolabel, _default, pattern, _internalExpression)
           } -> 
-            Location.raise_errorf ~loc:pexp_loc 
-               "Make sure to use labeled arguments for props, if your component doesn't take any props use () or _ instead of a name as your argument"
+            if (hasApplication.contents) then
+              ((fun a -> a), false, unerasableIgnoreExp expression)
+            else
+              Location.raise_errorf ~loc:pattern.ppat_loc "ReasonReact: props need to be labelled arguments.\n  If you are working with refs be sure to wrap with React.forwardRef.\n  If your component doesn't have any props use () or _ instead of a name."
           (* let make = {let foo = bar in (~prop) => ...} *)
           | {
               pexp_desc = Pexp_let (recursive, vbs, internalExpression)
@@ -410178,6 +410181,7 @@ let jsxMapper () =
             (wrap, hasUnit, {expression with pexp_desc = Pexp_let (recursive, vbs, exp)})
           (* let make = React.forwardRef((~prop) => ...) *)
           | { pexp_desc = Pexp_apply (wrapperExpression, [(Nolabel, internalExpression)]) } ->
+            let () = hasApplication := true in
             let (_, hasUnit, exp) = spelunkForFunExpression internalExpression in
             ((fun exp -> Exp.apply wrapperExpression [(nolabel, exp)]), hasUnit, exp)
           | {