Add conversion test for Js.t

Author: chenglou

src/res_ast_conversion.ml

@@ -385,19 +385,10 @@ let normalize =
     end;
     typ = (fun mapper typ ->
       match typ.ptyp_desc with
-      | Ptyp_constr(
-          {txt = Longident.Ldot(Longident.Lident "Js", "t")},
-          [{ptyp_desc = Ptyp_object (fields, openFlag)} as objectType]
-        ) ->
-        (* Js.t({"a": b}) -> {"a": b}. Since compiler >9.0.1 objects don't
-           need Js.t wrapping anymore *)
-        let newFields = fields |> List.map (fun (field: Parsetree.object_field) ->
-          match field with
-          | Otag (label, attributes, typ) -> Parsetree.Otag (label, attributes, mapper.typ mapper typ)
-          | Oinherit typ -> Oinherit (mapper.typ mapper typ)
-        )
-        in
-        {objectType with ptyp_desc = Ptyp_object (newFields, openFlag)}
+      | Ptyp_constr({txt = Longident.Ldot(Longident.Lident "Js", "t")}, [arg]) ->
+        (* Js.t({"a": b}) -> {"a": b}
+          Since compiler >9.0.1 objects don't need Js.t wrapping anymore *)
+         mapper.typ mapper arg
       | _ -> default_mapper.typ mapper typ
     );
     expr = (fun mapper expr ->

tests/conversion/reason/__snapshots__/render.spec.js.snap

@@ -1257,6 +1257,27 @@ let element = props[\\"element\\"]
 
 let y = {\\"age\\": 30}
 let y = {\\"age\\": 30, \\"name\\": \\"steve\\"}
+
+type propField<'a> = {.}
+type propField<'a> = {..} as 'a
+type propField<'a> = {..} as 'a
+type propField<'a> = Js.nullable<{..} as 'a>
+
+type propField<'a> = {\\"a\\": b}
+type propField<'a> = {..\\"a\\": b}
+type propField<'a> = {\\"a\\": {\\"b\\": c}}
+"
+`;
+
+exports[`jsObject.rei 1`] = `
+"type propField<'a> = {.}
+type propField<'a> = {..} as 'a
+type propField<'a> = {..} as 'a
+type propField<'a> = Js.nullable<{..} as 'a>
+
+type propField<'a> = {\\"a\\": b}
+type propField<'a> = {..\\"a\\": b}
+type propField<'a> = {\\"a\\": {\\"b\\": c}}
 "
 `;
 

tests/conversion/reason/jsObject.re

@@ -4,3 +4,12 @@ let element = props##element
 
 let y = {"age": 30}
 let y = {"age": 30, "name": "steve"}
+
+type propField('a) = Js.t({.})
+type propField('a) = Js.t({..} as 'a)
+type propField('a) = Js.t({..}) as 'a
+type propField('a) = Js.nullable(Js.t({..} as 'a))
+
+type propField('a) = {. "a": b}
+type propField('a) = {.. "a": b}
+type propField('a) = Js.t(Js.t({. "a": Js.t({. "b": c})}))

tests/conversion/reason/jsObject.rei

@@ -0,0 +1,8 @@
+type propField('a) = Js.t({.})
+type propField('a) = Js.t({..} as 'a)
+type propField('a) = Js.t({..}) as 'a
+type propField('a) = Js.nullable(Js.t({..} as 'a))
+
+type propField('a) = {. "a": b}
+type propField('a) = {.. "a": b}
+type propField('a) = Js.t(Js.t({. "a": Js.t({. "b": c})}))