React JSX PPX: generalize calling expressions to all identifiers (rescript-lang#67)

Author: anmonteiro

jscomp/napkin/reactjs_jsx_ppx_v3.ml

@@ -275,7 +275,7 @@ let makeExternalDecl fnName loc namedArgListWithKeyAndRef namedTypeList =
 let jsxMapper () =
   let jsxVersion = ref None in
 
-  let transformUppercaseCall3 modulePath mapper loc attrs _ callArguments =
+  let transformUppercaseCall3 ~caller modulePath mapper loc attrs _ callArguments =
     let children, argsWithLabels = extractChildren ~loc ~removeLastPositionUnit:true callArguments in
     let argsForMake = argsWithLabels in
     let childrenExpr = transformChildrenIfListUpper ~loc ~mapper children in
@@ -302,8 +302,8 @@ let jsxMapper () =
     in
     let ident =
       match modulePath with
-      | Lident _ -> Ldot (modulePath, "make")
-      | Ldot (_modulePath, value) as fullPath when isCap value -> Ldot (fullPath, "make")
+      | Lident _ -> Ldot (modulePath, caller)
+      | Ldot (_modulePath, value) as fullPath when isCap value -> Ldot (fullPath, caller)
       | modulePath -> modulePath
     in
     let propsIdent =
@@ -834,7 +834,7 @@ let jsxMapper () =
         (* Foo.createElement(~prop1=foo, ~prop2=bar, ~children=[], ()) *)
         | { loc; txt = Ldot (modulePath, ("createElement" | "make")) } -> (
             match !jsxVersion with
-            | None | Some 3 -> transformUppercaseCall3 modulePath mapper loc attrs callExpression callArguments
+            | None | Some 3 -> transformUppercaseCall3 ~caller:"make" modulePath mapper loc attrs callExpression callArguments
             | Some _ -> raise (Invalid_argument "JSX: the JSX version must be  3") )
         (* div(~prop1=foo, ~prop2=bar, ~children=[bla], ()) *)
         (* turn that into
@@ -843,11 +843,13 @@ let jsxMapper () =
             match !jsxVersion with
             | None | Some 3 -> transformLowercaseCall3 mapper loc attrs callArguments id
             | Some _ -> raise (Invalid_argument "JSX: the JSX version must be 3") )
-        | { txt = Ldot (_, anythingNotCreateElementOrMake) } ->
-            raise
-              (Invalid_argument
-                 ( "JSX: the JSX attribute should be attached to a `YourModuleName.createElement` or \
-                    `YourModuleName.make` call. We saw `" ^ anythingNotCreateElementOrMake ^ "` instead" ))
+        (* Foo.bar(~prop1=foo, ~prop2=bar, ~children=[], ()) *)
+        (* Not only "createElement" or "make". See
+           https://github.com/reasonml/reason/pull/2541 *)
+        | { loc; txt = Ldot (modulePath, anythingNotCreateElementOrMake) } -> (
+            match !jsxVersion with
+            | None | Some 3 -> transformUppercaseCall3 ~caller:anythingNotCreateElementOrMake modulePath mapper loc attrs callExpression callArguments
+            | Some _ -> raise (Invalid_argument "JSX: the JSX version must be  3") )
         | { txt = Lapply _ } ->
             (* don't think there's ever a case where this is reached *)
             raise (Invalid_argument "JSX: encountered a weird case while processing the code. Please report this!") )

jscomp/test/dune.gen

@@ -6746,6 +6746,19 @@
      (run bsc -bs-cmi -bs-cmj -bs-no-version-header  -bs-cross-module-opt -make-runtime-test -bs-package-output commonjs:jscomp/test  -w -3-6-26-27-29-30-32..40-44-45-60-67-68-106+104 -warn-error A  -I ../runtime -I ../stdlib-412/stdlib_modules -nopervasives -open Stdlib__no_aliases -I ../others -I . %{inputs})))
 
 
+  (rule
+    (targets reactjs_ppx_custom.cmi reactjs_ppx_custom.cmj reactjs_ppx_custom.js)
+    (deps (:inputs reactjs_ppx_custom.re) ../stdlib-412/stdlib.cmj)
+
+  (mode
+   (promote
+    (until-clean)
+    (only reactjs_ppx_custom.js)))
+
+    (action
+     (run bsc -bs-cmi -bs-cmj -bs-no-version-header  -bs-cross-module-opt -make-runtime-test -bs-package-output commonjs:jscomp/test  -w -3-6-26-27-29-30-32..40-44-45-60-67-68-106+104 -warn-error A  -I ../runtime -I ../stdlib-412/stdlib_modules -nopervasives -open Stdlib__no_aliases -I ../others -I . %{inputs})))
+
+
   (rule
     (targets reasonReact.cmj reasonReact.js)
     (deps (:inputs reasonReact.re) ../stdlib-412/stdlib.cmj react.cmj reasonReact.cmi reasonReactOptimizedCreateClass.cmj reasonReactRouter.cmj)

jscomp/test/reactjs_ppx_custom.js

@@ -0,0 +1,29 @@
+'use strict';
+
+var React = require("react");
+
+function Reactjs_ppx_custom$Internal$header(Props) {
+  throw {
+        RE_EXN_ID: "Assert_failure",
+        _1: [
+          "reactjs_ppx_custom.re",
+          5,
+          21
+        ],
+        Error: new Error()
+      };
+}
+
+var Internal = {
+  header: Reactjs_ppx_custom$Internal$header
+};
+
+function Reactjs_ppx_custom(Props) {
+  return React.createElement(Reactjs_ppx_custom$Internal$header, {});
+}
+
+var make = Reactjs_ppx_custom;
+
+exports.Internal = Internal;
+exports.make = make;
+/* react Not a pure module */

jscomp/test/reactjs_ppx_custom.re

@@ -0,0 +1,9 @@
+[@bs.config {flags: [|"-bs-jsx", "3"|]}];
+
+module Internal = {
+  [@react.component]
+  let header = () => assert(false);
+};
+
+[@react.component]
+let make = () => <Internal.header />;