jsx/refactor: use ast_mapper

Author: glennsl

src/reactjs_jsx_ppx_v3.ml

@@ -233,43 +233,15 @@ let makeExternalDecl fnName loc namedArgListWithKeyAndRef namedTypeList =
     (makePropsType ~loc namedTypeList)
   [@@raises Invalid_argument]
 
-let rec newtypeToVar newtype typ =
-  let traverse = newtypeToVar newtype in
-  { typ with ptyp_desc =
+let newtypeToVar newtype type_ =
+  let typ (mapper : Ast_mapper.mapper) typ =
     match typ.ptyp_desc with
-    | Ptyp_constr ({ txt = Lident name }, _) when name = newtype -> Ptyp_var newtype
-    | Ptyp_constr (ident, args) -> Ptyp_constr (ident, List.map traverse args)
-    | Ptyp_arrow (label, typ, rest) -> Ptyp_arrow (label, traverse typ, traverse rest)
-    | Ptyp_tuple (types) -> Ptyp_tuple (List.map traverse types)
-    | Ptyp_class (ident, args) -> Ptyp_class (ident, List.map traverse args)
-    | Ptyp_alias (typ, alias) -> Ptyp_alias (traverse typ, alias)
-    | Ptyp_poly (vars, rest) -> Ptyp_poly (vars, traverse rest)
-    | Ptyp_variant (fields, flag, labels) ->
-      let fields =
-        List.map (function
-          | Rtag (label, attrs, flag, args) -> Rtag (label, attrs, flag,  List.map traverse args)
-          | Rinherit typ -> Rinherit (traverse typ))
-          fields
-      in
-      Ptyp_variant (fields, flag, labels)
-    | Ptyp_object (fields, flag) ->
-      let fields =
-        List.map (function
-          | Otag (label, attrs, typ) -> Otag (label, attrs, traverse typ)
-          | Oinherit typ -> Oinherit (traverse typ))
-          fields
-      in
-      Ptyp_object (fields, flag)
-    | Ptyp_package (ident, substitutions) ->
-      let substitutions =
-        List.map
-          (fun (ident, typ) -> (ident, traverse typ))
-          substitutions
-      in
-      Ptyp_package (ident, substitutions)
-    | Ptyp_extension _ -> Location.raise_errorf "extensions are not allowed in @react.component definitions"
-    | (Ptyp_any | Ptyp_var _) as typ -> typ
-  }
+    | Ptyp_constr ({txt = Lident name}, _) when name = newtype ->
+      {typ with ptyp_desc = Ptyp_var newtype}
+    | _ -> Ast_mapper.default_mapper.typ mapper typ
+  in
+  let mapper = {Ast_mapper.default_mapper with typ} in
+  mapper.typ mapper type_
 
 (* TODO: some line number might still be wrong *)
 let jsxMapper () =