Split JSON code into its own module

Summary: As title says.

Reviewed By: viratyosin

Differential Revision: D71116587

fbshipit-source-id: 20db8ee36880ccdacf665c529ec7173141eaae2c

Author: Andrew Kennedy

hphp/hack/src/client_and_server/cstSearchService.ml

@@ -491,10 +491,7 @@ let compile_pattern (ctx : Provider_context.t) (json : Hh_json.json) :
     get_obj "subtype_of" (json, keytrace)
     >>= fun (subtype_of_json, subtype_of_keytrace) ->
     let locl_ty =
-      Typing_print.json_to_locl_ty
-        ~keytrace:subtype_of_keytrace
-        ctx
-        subtype_of_json
+      Typing_json.to_locl_ty ~keytrace:subtype_of_keytrace ctx subtype_of_json
     in
     match locl_ty with
     | Ok locl_ty -> Ok (TypePattern { subtype_of = locl_ty })

hphp/hack/src/server/serverIsSubtype.ml

@@ -90,12 +90,12 @@ let rec validate_free_type env locl_ty =
     in
     validate_l env field_tys
   | Tnewtype (_name, tyargs, as_ty) ->
-    (* Typing_print.json_to_locl_ty already validates the name
+    (* Typing_json.to_locl_ty already validates the name
        Interestingly it doesn't validate that the given "as" matches
        the defined one *)
     validate_l env tyargs @ validate_free_type env as_ty
   | Tclass_ptr ty -> validate_free_type env ty
-  (* These aren't even created by Typing_print.json_to_locl_ty *)
+  (* These aren't even created by Typing_json.to_locl_ty *)
   | Tneg _
   | Tvar _
   | Taccess _
@@ -113,7 +113,7 @@ and validate_l env locl_tyl =
   List.concat_map locl_tyl ~f:(validate_free_type env)
 
 let get_type_from_json ctx json : (locl_ty, string list) result =
-  let locl_ty = Typing_print.json_to_locl_ty ~keytrace:[] ctx json in
+  let locl_ty = Typing_json.to_locl_ty ~keytrace:[] ctx json in
   match locl_ty with
   | Ok locl_ty ->
     let env = Typing_env_types.empty ctx Relative_path.default ~droot:None in

hphp/hack/src/typing/dune

@@ -281,6 +281,7 @@
   typing_common
   typing_error_utils
   type_mapper
+  typing_json
   typing_modules)
  (preprocess
   (pps
@@ -457,6 +458,15 @@
  (preprocess
   (pps ppx_deriving.std)))
 
+(library
+ (name typing_json)
+ (wrapped false)
+ (modules
+  typing_json)
+ (libraries decl_provider hackfmt typing_env_types)
+ (preprocess
+  (pps ppx_deriving.std)))
+
 (library
  (name typing_log)
  (wrapped false)

hphp/hack/src/typing/tast_env.ml

@@ -58,9 +58,10 @@ let print_decl_ty_with_identity env ty sym_occurrence sym_definition =
     sym_occurrence
     sym_definition
 
-let ty_to_json env ?show_like_ty ty = Typing_print.to_json env ?show_like_ty ty
+let ty_to_json env ?show_like_ty ty =
+  Typing_json.from_locl_ty env ?show_like_ty ty
 
-let json_to_locl_ty = Typing_print.json_to_locl_ty
+let json_to_locl_ty = Typing_json.to_locl_ty
 
 let get_self_id = Typing_env.get_self_id