Make optional props optional properly (#776)

davesnx · web-flow · commit 0a98c07abaee · 2023-09-13T09:00:10.000+02:00
diff --git a/README.md b/README.md
@@ -3,8 +3,6 @@
 
 # [ReasonReact](https://reasonml.github.io/reason-react/)
 
-[![npm version](https://badge.fury.io/js/reason-react.svg)](https://www.npmjs.com/package/reason-react)
-![npm](https://img.shields.io/npm/dt/reason-react)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com)
 ![contributors](https://img.shields.io/github/contributors/reasonml/reason-react)
 [![discord](https://img.shields.io/discord/235176658175262720.svg?logo=discord&colorb=blue)](https://discord.gg/reasonml)
diff --git a/dune-project b/dune-project
@@ -39,7 +39,7 @@
    (>= 1.0.0))
   reason-react-ppx
   (reason
-   (>= 3.6.0))
+   (and (>= 3.6.0) (< 3.10.0)))
   (ocaml-lsp-server :with-test)
   (merlin
    (and
@@ -62,7 +62,7 @@
   (ocaml
    (>= 4.13.0))
   (reason
-   (>= 3.9.0))
+   (and (>= 3.6.0) (< 3.10.0)))
   (ppxlib
    (>= 0.28.0))
   (merlin :with-test)
diff --git a/ppx/reason_react_ppx.ml b/ppx/reason_react_ppx.ml
@@ -99,9 +99,7 @@ let safeTypeFromValue valueStr =
   match String.sub valueStr 0 1 with "_" -> "T" ^ valueStr | _ -> valueStr
 [@@raises Invalid_argument]
 
-let keyType loc =
-  Builder.ptyp_constr ~loc { loc; txt = optionIdent }
-    [ Builder.ptyp_constr ~loc { loc; txt = Lident "string" } [] ]
+let keyType loc = Builder.ptyp_constr ~loc { loc; txt = Lident "string" } []
 
 type 'a children = ListLiteral of 'a | Exact of 'a
 type componentConfig = { propsName : string }
@@ -318,21 +316,17 @@ let rec recursivelyMakeNamedArgsForExternal list args =
            (match (label, interiorType, default) with
            (* ~foo=1 *)
            | label, None, Some _ ->
-               {
-                 ptyp_desc = Ptyp_var (safeTypeFromValue label);
-                 ptyp_loc = loc;
-                 ptyp_loc_stack = [];
-                 ptyp_attributes = [];
-               }
+               Builder.ptyp_var ~loc (safeTypeFromValue label)
            (* ~foo: int=1 *)
            | _label, Some type_, Some _ -> type_
            (* ~foo: option(int)=? *)
-           | ( label,
+           | ( _label,
                Some
                  {
                    ptyp_desc = Ptyp_constr ({ txt = Lident "option" }, [ type_ ]);
                  },
-               _ )
+               _ ) ->
+               Builder.ptyp_constr ~loc { loc; txt = optionIdent } [ type_ ]
            | ( label,
                Some
                  {
@@ -341,27 +335,15 @@ let rec recursivelyMakeNamedArgsForExternal list args =
                        ({ txt = Ldot (Lident "*predef*", "option") }, [ type_ ]);
                  },
                _ )
-           (* ~foo: int=? - note this isnt valid. but we want to get a type
-              error *)
-           | label, Some type_, _
              when isOptional label ->
                type_
+           (* ~foo: int=? - note this isnt valid. but we want to get a type error *)
+           | label, Some type_, _ when isOptional label -> type_
            (* ~foo=? *)
            | label, None, _ when isOptional label ->
-               {
-                 ptyp_desc = Ptyp_var (safeTypeFromValue label);
-                 ptyp_loc = loc;
-                 ptyp_loc_stack = [];
-                 ptyp_attributes = [];
-               }
+               Builder.ptyp_var ~loc (safeTypeFromValue label)
            (* ~foo *)
-           | label, None, _ ->
-               {
-                 ptyp_desc = Ptyp_var (safeTypeFromValue label);
-                 ptyp_loc_stack = [];
-                 ptyp_loc = loc;
-                 ptyp_attributes = [];
-               }
+           | label, None, _ -> Builder.ptyp_var ~loc (safeTypeFromValue label)
            | _label, Some type_, _ -> type_)
            args)
   | [] -> args
diff --git a/ppx/test/ppx.sh b/ppx/test/ppx.sh
@@ -7,10 +7,10 @@ function usage() {
   echo "       $(basename "$0") --output ml [file.re]"
 }
 
-# if [ -z "$3" ]; then
-  # usage
-  # exit
-# fi
+if [ -z "$3" ]; then
+  usage
+  exit
+fi
 
 refmt --parse re --print ml "$3" > output.ml
 reason-react-ppx --impl output.ml -o temp.ml
diff --git a/ppx/test/ppx_with_refmt.sh b/ppx/test/ppx_with_refmt.sh
diff --git a/ppx/test/signature.t/input.re b/ppx/test/signature.t/input.re
@@ -0,0 +1,22 @@
+module Example = {
+  [@react.component]
+  external make:
+    (
+      ~cond: bool,
+      ~noWrap: bool=?,
+      ~href: string,
+      ~id: string=?,
+      ~color: color,
+      ~mode: linkMode=?,
+      ~children: React.element
+    ) =>
+    React.element;
+};
+
+module MyPropIsOptionBool = {
+  [@react.component] external make: (~myProp: bool=?) => React.element = "A";
+};
+
+module MyPropIsOptionOptionBool = {
+  [@react.component] external make: (~myProp: option(bool)=?) => React.element = "B";
+};
diff --git a/ppx/test/signature.t/run.t b/ppx/test/signature.t/run.t
@@ -0,0 +1,57 @@
+  $ ../ppx.sh --output re input.re
+  module Example = {
+    [@bs.obj]
+    external makeProps:
+      (
+        ~cond: bool,
+        ~noWrap: bool=?,
+        ~href: string,
+        ~id: string=?,
+        ~color: color,
+        ~mode: linkMode=?,
+        ~children: React.element,
+        ~key: string=?,
+        unit
+      ) =>
+      {
+        .
+        "cond": bool,
+        "noWrap": option(bool),
+        "href": string,
+        "id": option(string),
+        "color": color,
+        "mode": option(linkMode),
+        "children": React.element,
+      };
+    external make:
+      React.componentLike(
+        {
+          .
+          "cond": bool,
+          "noWrap": option(bool),
+          "href": string,
+          "id": option(string),
+          "color": color,
+          "mode": option(linkMode),
+          "children": React.element,
+        },
+        React.element,
+      );
+  };
+  module MyPropIsOptionBool = {
+    [@bs.obj]
+    external makeProps:
+      (~myProp: bool=?, ~key: string=?, unit) => {. "myProp": option(bool)};
+    external make:
+      React.componentLike({. "myProp": option(bool)}, React.element) =
+      "A";
+  };
+  module MyPropIsOptionOptionBool = {
+    [@bs.obj]
+    external makeProps:
+      (~myProp: option(bool)=?, ~key: string=?, unit) =>
+      {. "myProp": option(option(bool))};
+    external make:
+      React.componentLike({. "myProp": option(option(bool))}, React.element) =
+      "B";
+  };
diff --git a/reason-react-ppx.opam b/reason-react-ppx.opam
@@ -16,7 +16,7 @@ bug-reports: "https://github.com/reasonml/reason-react/issues"
 depends: [
   "dune" {>= "3.8"}
   "ocaml" {>= "4.13.0"}
-  "reason" {>= "3.9.0"}
+  "reason" {>= "3.6.0" & < "3.10.0"}
   "ppxlib" {>= "0.28.0"}
   "merlin" {with-test}
   "ocamlformat" {= "0.24.0" & with-dev-setup}
diff --git a/reason-react.opam b/reason-react.opam
@@ -21,7 +21,7 @@ depends: [
   "ocaml" {>= "4.13.0"}
   "melange" {>= "1.0.0"}
   "reason-react-ppx"
-  "reason" {>= "3.6.0"}
+  "reason" {>= "3.6.0" & < "3.10.0"}
   "ocaml-lsp-server" {with-test}
   "merlin" {= "4.10-414" & with-test}
   "opam-check-npm-deps" {= "1.0.0" & with-dev-setup}
diff --git a/website/README.md b/website/README.md
@@ -1,4 +1,4 @@
-# ReasonReact Website
+# ReasonReact Documentation Website
 
 This code is used to generate [https://reasonml.github.io/reason-react](https://reasonml.github.io/reason-react). It pulls in files from `../docs` and the current directory to generate the final static html files that's served on the site.
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# ReasonReact Website`
	`1`	`+# ReasonReact Documentation Website`
`2`	`2`
`3`	`3`	This code is used to generate [https://reasonml.github.io/reason-react](https://reasonml.github.io/reason-react). It pulls in files from `../docs` and the current directory to generate the final static html files that's served on the site.
`4`	`4`