Remove @optional from JSX and use ns.optional.

Author: cristianoc

cli/reactjs_jsx_ppx_v4.ml

@@ -33,7 +33,7 @@ let getLabel str =
 
 let optionIdent = Lident "option"
 
-let optionalAttr = [({txt = "optional"; loc = Location.none}, PStr [])]
+let optionalAttr = [({txt = "ns.optional"; loc = Location.none}, PStr [])]
 
 let constantString ~loc str =
   Ast_helper.Exp.constant ~loc (Pconst_string (str, None))

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

@@ -1,4 +1,4 @@
-type props<'msg> = {@optional key: string, msg: 'msg} // test React JSX file
+type props<'msg> = {key?: string, msg: 'msg} // test React JSX file
 
 let make = ({msg}: props<'msg>) => {
   ReactDOMRe.createDOMElementVariadic("div", [{msg->React.string}])

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

@@ -1,4 +1,4 @@
-type props<'msg> = {@optional key: string, msg: 'msg} // test React JSX file
+type props<'msg> = {key?: string, msg: 'msg} // test React JSX file
 
 let make = ({msg}: props<'msg>) => {
   ReactDOMRe.createDOMElementVariadic("div", [{msg->React.string}])

tests/ppx/react/expected/externalWithCustomName.res_v4_auto.txt

@@ -1,5 +1,5 @@
 module Foo = {
-  type props<'a, 'b> = {@optional key: string, a: 'a, b: 'b}
+  type props<'a, 'b> = {key?: string, a: 'a, b: 'b}
   @module("Foo")
   external component: React.componentLike<props<'a, 'b>, React.element> = "component"
 }

tests/ppx/react/expected/externalWithCustomName.res_v4_cls.txt

@@ -1,5 +1,5 @@
 module Foo = {
-  type props<'a, 'b> = {@optional key: string, a: 'a, b: 'b}
+  type props<'a, 'b> = {key?: string, a: 'a, b: 'b}
   @module("Foo")
   external component: React.componentLike<props<'a, 'b>, React.element> = "component"
 }

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

@@ -1,9 +1,9 @@
 module FancyInput = {
   type props<'className, 'children> = {
-    @optional key: string,
-    @optional className: 'className,
+    key?: string,
+    className?: 'className,
     children: 'children,
-    @optional ref: ReactDOM.Ref.currentDomRef,
+    ref?: ReactDOM.Ref.currentDomRef,
   }
   let make = ({className, children, ref}: props<'className, 'children>) => {
     let ref = Js.Nullable.fromOption(ref)
@@ -28,11 +28,11 @@ module FancyInput = {
   }
   let make = React.forwardRef({
     let \"ForwardRef$FancyInput" = (props: props<_>, ref) =>
-      make({...props, ref: @optional Js.Nullable.toOption(ref)})
+      make({...props, ref: ?Js.Nullable.toOption(ref)})
     \"ForwardRef$FancyInput"
   })
 }
-type props = {@optional key: string}
+type props = {key?: string}
 
 let make = (_: props) => {
   let input = React.useRef(Js.Nullable.null)

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

@@ -1,9 +1,9 @@
 module FancyInput = {
   type props<'className, 'children> = {
-    @optional key: string,
-    @optional className: 'className,
+    key?: string,
+    className?: 'className,
     children: 'children,
-    @optional ref: ReactDOM.Ref.currentDomRef,
+    ref?: ReactDOM.Ref.currentDomRef,
   }
   let make = ({className, children, ref}: props<'className, 'children>) => {
     let ref = Js.Nullable.fromOption(ref)
@@ -28,11 +28,11 @@ module FancyInput = {
   }
   let make = React.forwardRef({
     let \"ForwardRef$FancyInput" = (props: props<_>, ref) =>
-      make({...props, ref: @optional Js.Nullable.toOption(ref)})
+      make({...props, ref: ?Js.Nullable.toOption(ref)})
     \"ForwardRef$FancyInput"
   })
 }
-type props = {@optional key: string}
+type props = {key?: string}
 
 let make = (_: props) => {
   let input = React.useRef(Js.Nullable.null)

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

@@ -1,5 +1,5 @@
 module Bar = {
-  type props<'a, 'b> = {@optional key: string, a: 'a, b: 'b}
+  type props<'a, 'b> = {key?: string, a: 'a, b: 'b}
   let make = ({a, b}: props<'a, 'b>) => {
     Js.log("This function should be named `InnerModule.react$Bar`")
     ReactDOMRe.createDOMElementVariadic("div", [])
@@ -8,7 +8,7 @@ module Bar = {
     let \"InnerModule$Bar" = (props: props<_>) => make(props)
     \"InnerModule$Bar"
   }
-  type props<'a, 'b> = {@optional key: string, a: 'a, b: 'b}
+  type props<'a, 'b> = {key?: string, a: 'a, b: 'b}
 
   let component = ({a, b}: props<'a, 'b>) => {
     Js.log("This function should be named `InnerModule.react$Bar$component`")

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

@@ -1,5 +1,5 @@
 module Bar = {
-  type props<'a, 'b> = {@optional key: string, a: 'a, b: 'b}
+  type props<'a, 'b> = {key?: string, a: 'a, b: 'b}
   let make = ({a, b}: props<'a, 'b>) => {
     Js.log("This function should be named `InnerModule.react$Bar`")
     ReactDOMRe.createDOMElementVariadic("div", [])
@@ -8,7 +8,7 @@ module Bar = {
     let \"InnerModule$Bar" = (props: props<_>) => make(props)
     \"InnerModule$Bar"
   }
-  type props<'a, 'b> = {@optional key: string, a: 'a, b: 'b}
+  type props<'a, 'b> = {key?: string, a: 'a, b: 'b}
 
   let component = ({a, b}: props<'a, 'b>) => {
     Js.log("This function should be named `InnerModule.react$Bar$component`")

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

@@ -1,4 +1,4 @@
-type props<'a, 'b, 'c> = {@optional key: string, a: 'a, b: 'b, c: 'c}
+type props<'a, 'b, 'c> = {key?: string, a: 'a, b: 'b, c: 'c}
 let make = (_: props<'a, 'b, 'c>, type a, ~a: a, ~b: array<option<[#Foo(a)]>>, ~c: 'a, _) =>
   ReactDOMRe.createDOMElementVariadic("div", [])
 let make = {

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

@@ -1,4 +1,4 @@
-type props<'a, 'b, 'c> = {@optional key: string, a: 'a, b: 'b, c: 'c}
+type props<'a, 'b, 'c> = {key?: string, a: 'a, b: 'b, c: 'c}
 let make = (_: props<'a, 'b, 'c>, type a, ~a: a, ~b: array<option<[#Foo(a)]>>, ~c: 'a, _) =>
   ReactDOMRe.createDOMElementVariadic("div", [])
 let make = {

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

@@ -1,4 +1,4 @@
-type props<'a, 'b> = {@optional key: string, a: 'a, b: 'b}
+type props<'a, 'b> = {key?: string, a: 'a, b: 'b}
 let make = ({a, b}: props<'a, 'b>) => {
   Js.log("This function should be named 'TopLevel.react'")
   ReactDOMRe.createDOMElementVariadic("div", [])

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

@@ -1,4 +1,4 @@
-type props<'a, 'b> = {@optional key: string, a: 'a, b: 'b}
+type props<'a, 'b> = {key?: string, a: 'a, b: 'b}
 let make = ({a, b}: props<'a, 'b>) => {
   Js.log("This function should be named 'TopLevel.react'")
   ReactDOMRe.createDOMElementVariadic("div", [])

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

@@ -1,4 +1,4 @@
-type props<'a, 'b> = {@optional key: string, a: 'a, b: 'b}
+type props<'a, 'b> = {key?: string, a: 'a, b: 'b}
 let make: 'a. (~a: 'a, ~b: 'a, 'a) => React.element = (_: props<'a, 'b>, type a): (
   (~a: a, ~b: a, a) => React.element
 ) => (~a, ~b, _) => ReactDOMRe.createDOMElementVariadic("div", [])

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

@@ -1,4 +1,4 @@
-type props<'a, 'b> = {@optional key: string, a: 'a, b: 'b}
+type props<'a, 'b> = {key?: string, a: 'a, b: 'b}
 let make: 'a. (~a: 'a, ~b: 'a, 'a) => React.element = (_: props<'a, 'b>, type a): (
   (~a: a, ~b: a, a) => React.element
 ) => (~a, ~b, _) => ReactDOMRe.createDOMElementVariadic("div", [])