JSX PPX V4 part2

cli/reactjs_jsx_ppx.ml

@@ -1118,7 +1118,7 @@ module V3 = struct
                   ],
                   None )
               | Nonrecursive ->
-                ( [{binding with pvb_expr = expression; pvb_attributes = []}],
+                ( [{binding with pvb_expr = expression}],
                   Some (bindingWrapper fullExpression) )
             in
             (Some externalDecl, bindings, newBinding)
@@ -2457,7 +2457,6 @@ module V4 = struct
                   {
                     binding with
                     pvb_expr = expression;
-                    pvb_attributes = [];
                     pvb_pat = Pat.var {txt = fnName; loc = Location.none};
                   };
                 ],

tests/ppx/react/expected/commentAtTop.res.txt

@@ -1,5 +1,6 @@
 type props<'msg> = {key?: string, msg: 'msg} // test React JSX file
 
+@react.component
 let make = ({msg, _}: props<'msg>) => {
   ReactDOM.jsx("div", {children: {msg->React.string}})
 }

tests/ppx/react/expected/fileLevelConfig.res.txt

@@ -1,6 +1,7 @@
 @@jsxConfig({version: 3})
 @obj external makeProps: (~msg: 'msg, ~key: string=?, unit) => {"msg": 'msg} = ""
 
+@react.component
 let make =
   (@warning("-16") ~msg) => {
     ReactDOMRe.createDOMElementVariadic("div", [{msg->React.string}])
@@ -13,6 +14,7 @@ let make = {
 @@jsxConfig({version: 4, mode: "classic"})
 type props<'msg> = {key?: string, msg: 'msg}
 
+@react.component
 let make = ({msg, _}: props<'msg>) => {
   ReactDOMRe.createDOMElementVariadic("div", [{msg->React.string}])
 }
@@ -24,6 +26,7 @@ let make = {
 @@jsxConfig({version: 4, mode: "automatic"})
 type props<'msg> = {key?: string, msg: 'msg}
 
+@react.component
 let make = ({msg, _}: props<'msg>) => {
   ReactDOM.jsx("div", {children: {msg->React.string}})
 }

tests/ppx/react/expected/forwardRef.res.txt

@@ -10,6 +10,7 @@ module FancyInput = {
     unit,
   ) => {"className": option<'className>, "children": 'children} = ""
 
+  @react.component
   let make =
     (@warning("-16") ~className=?, @warning("-16") ~children) =>
       @warning("-16")
@@ -40,6 +41,7 @@ module FancyInput = {
 }
 @obj external makeProps: (~key: string=?, unit) => {.} = ""
 
+@react.component
 let make = () => {
   let input = React.useRef(Js.Nullable.null)
 
@@ -68,6 +70,7 @@ module FancyInput = {
     ref?: ReactDOM.Ref.currentDomRef,
   }
 
+  @react.component
   let make = ({?className, children, ?ref, _}: props<'className, 'children>) => {
     let ref = Js.Nullable.fromOption(ref)
     let _ = ref
@@ -97,6 +100,7 @@ module FancyInput = {
 }
 type props = {key?: string}
 
+@react.component
 let make = (_: props) => {
   let input = React.useRef(Js.Nullable.null)
 
@@ -125,6 +129,7 @@ module FancyInput = {
     ref?: ReactDOM.Ref.currentDomRef,
   }
 
+  @react.component
   let make = ({?className, children, ?ref, _}: props<'className, 'children>) => {
     let ref = Js.Nullable.fromOption(ref)
     let _ = ref
@@ -154,6 +159,7 @@ module FancyInput = {
 }
 type props = {key?: string}
 
+@react.component
 let make = (_: props) => {
   let input = React.useRef(Js.Nullable.null)
 

tests/ppx/react/expected/innerModule.res.txt

@@ -2,6 +2,7 @@
 module Bar = {
   @obj external makeProps: (~a: 'a, ~b: 'b, ~key: string=?, unit) => {"a": 'a, "b": 'b} = ""
 
+  @react.component
   let make =
     (@warning("-16") ~a, @warning("-16") ~b, _) => {
       Js.log("This function should be named `InnerModule.react$Bar`")
@@ -14,6 +15,7 @@ module Bar = {
   }
   @obj external componentProps: (~a: 'a, ~b: 'b, ~key: string=?, unit) => {"a": 'a, "b": 'b} = ""
 
+  @react.component
   let component =
     (@warning("-16") ~a, @warning("-16") ~b, _) => {
       Js.log("This function should be named `InnerModule.react$Bar$component`")
@@ -31,6 +33,7 @@ module Bar = {
 module Bar = {
   type props<'a, 'b> = {key?: string, a: 'a, b: 'b}
 
+  @react.component
   let make = ({a, b, _}: props<'a, 'b>) => {
     Js.log("This function should be named `InnerModule.react$Bar`")
     ReactDOMRe.createDOMElementVariadic("div", [])
@@ -41,6 +44,7 @@ module Bar = {
   }
   type props<'a, 'b> = {key?: string, a: 'a, b: 'b}
 
+  @react.component
   let component = ({a, b, _}: props<'a, 'b>) => {
     Js.log("This function should be named `InnerModule.react$Bar$component`")
     ReactDOMRe.createDOMElementVariadic("div", [])
@@ -56,6 +60,7 @@ module Bar = {
 module Bar = {
   type props<'a, 'b> = {key?: string, a: 'a, b: 'b}
 
+  @react.component
   let make = ({a, b, _}: props<'a, 'b>) => {
     Js.log("This function should be named `InnerModule.react$Bar`")
     ReactDOM.jsx("div", {key: ?None})
@@ -66,6 +71,7 @@ module Bar = {
   }
   type props<'a, 'b> = {key?: string, a: 'a, b: 'b}
 
+  @react.component
   let component = ({a, b, _}: props<'a, 'b>) => {
     Js.log("This function should be named `InnerModule.react$Bar$component`")
     ReactDOM.jsx("div", {key: ?None})

tests/ppx/react/expected/newtype.res.txt

@@ -8,6 +8,7 @@ external makeProps: (
   unit,
 ) => {"a": '\"type-a", "b": array<option<[#Foo('\"type-a")]>>, "c": 'a} = ""
 
+@react.component
 let make = (type a, ~a: a, ~b: array<option<[#Foo(a)]>>, ~c: 'a, _) =>
   ReactDOMRe.createDOMElementVariadic("div", [])
 let make = {
@@ -19,6 +20,7 @@ let make = {
 @@jsxConfig({version: 4, mode: "classic"})
 type props<'a, 'b, 'c> = {key?: string, a: 'a, b: 'b, c: 'c}
 
+@react.component
 let make = ({a, b, c, _}: props<'\"type-a", array<option<[#Foo('\"type-a")]>>, 'a>) =>
   ReactDOMRe.createDOMElementVariadic("div", [])
 let make = {
@@ -29,6 +31,7 @@ let make = {
 @@jsxConfig({version: 4, mode: "automatic"})
 type props<'a, 'b, 'c> = {key?: string, a: 'a, b: 'b, c: 'c}
 
+@react.component
 let make = ({a, b, c, _}: props<'\"type-a", array<option<[#Foo('\"type-a")]>>, 'a>) =>
   ReactDOM.jsx("div", {key: ?None})
 let make = {

tests/ppx/react/expected/topLevel.res.txt

@@ -1,6 +1,7 @@
 @@jsxConfig({version: 3})
 @obj external makeProps: (~a: 'a, ~b: 'b, ~key: string=?, unit) => {"a": 'a, "b": 'b} = ""
 
+@react.component
 let make =
   (@warning("-16") ~a, @warning("-16") ~b, _) => {
     Js.log("This function should be named 'TopLevel.react'")
@@ -14,6 +15,7 @@ let make = {
 @@jsxConfig({version: 4, mode: "classic"})
 type props<'a, 'b> = {key?: string, a: 'a, b: 'b}
 
+@react.component
 let make = ({a, b, _}: props<'a, 'b>) => {
   Js.log("This function should be named 'TopLevel.react'")
   ReactDOMRe.createDOMElementVariadic("div", [])
@@ -26,6 +28,7 @@ let make = {
 @@jsxConfig({version: 4, mode: "automatic"})
 type props<'a, 'b> = {key?: string, a: 'a, b: 'b}
 
+@react.component
 let make = ({a, b, _}: props<'a, 'b>) => {
   Js.log("This function should be named 'TopLevel.react'")
   ReactDOM.jsx("div", {key: ?None})

tests/ppx/react/expected/typeConstraint.res.txt

@@ -1,6 +1,7 @@
 @@jsxConfig({version: 3})
 @obj external makeProps: (~a: 'a, ~b: 'b, ~key: string=?, unit) => {"a": 'a, "b": 'b} = ""
 
+@react.component
 let make:
   type a. (~a: a, ~b: a, a) => React.element =
   (~a, ~b, _) => ReactDOMRe.createDOMElementVariadic("div", [])
@@ -12,6 +13,7 @@ let make = {
 @@jsxConfig({version: 4, mode: "classic"})
 type props<'a, 'b> = {key?: string, a: 'a, b: 'b}
 
+@react.component
 let make = ({a, b, _}: props<'\"type-a", '\"type-a">) =>
   ReactDOMRe.createDOMElementVariadic("div", [])
 let make = {
@@ -22,6 +24,7 @@ let make = {
 @@jsxConfig({version: 4, mode: "automatic"})
 type props<'a, 'b> = {key?: string, a: 'a, b: 'b}
 
+@react.component
 let make = ({a, b, _}: props<'\"type-a", '\"type-a">) => ReactDOM.jsx("div", {key: ?None})
 let make = {
   let \"TypeConstraint" = (props: props<_>) => make(props)