refactor

Author: zth

compiler/gentype/EmitJs.ml

@@ -656,7 +656,7 @@ let emit_translation_as_string ~config ~file_name
   in
   let emitters =
     match config.emit_satisfies_helper with
-    | true -> EmitType.emit_satisfies_helper ~emitters
+    | true -> SatisfiesHelpers.emit_helper_alias ~emitters
     | false -> emitters
   in
   let env, emitters =

compiler/gentype/EmitType.ml

@@ -126,24 +126,21 @@ let rec render_type ~(config : Config.t) ?(indent = None)
       | true -> name |> interface_name ~config
       | false -> name
     in
-    if name = "$RescriptTypeSatisfiesTypeScriptType" then
-      match type_args with
-      | [t1; t2] ->
-        let render_arg t =
-          "  "
-          ^ (t
-            |> render_type ~config ~indent:(Some "  ") ~type_name_is_interface
-                 ~in_fun_type)
-        in
-        rendered_name ^ "<\n" ^ render_arg t1 ^ ",\n" ^ render_arg t2 ^ "\n>"
-      | _ ->
-        rendered_name
-        ^ EmitText.generics_string
-            ~type_vars:
-              (type_args
-              |> List.map
-                   (render_type ~config ~indent ~type_name_is_interface
-                      ~in_fun_type))
+    if SatisfiesHelpers.is_helper_ident name then
+      let rendered_type_args_special =
+        type_args
+        |> List.map
+             (render_type ~config ~indent:(Some "  ") ~type_name_is_interface
+                ~in_fun_type)
+      in
+      let rendered_type_args_default =
+        type_args
+        |> List.map
+             (render_type ~config ~indent ~type_name_is_interface ~in_fun_type)
+      in
+      SatisfiesHelpers.render_helper_ident ~rendered_name
+        ~rendered_type_args:rendered_type_args_special
+        ~rendered_type_args_default
     else
       rendered_name
       ^ EmitText.generics_string
@@ -446,15 +443,6 @@ let require ~early =
 let emit_import_react ~emitters =
   "import * as React from 'react';" |> require ~early:true ~emitters
 
-let emit_satisfies_helper ~emitters =
-  let alias =
-    "export type $RescriptTypeSatisfiesTypeScriptType<\n\
-     RescriptType,\n\
-     TypeScriptType extends RescriptType\n\
-     > = TypeScriptType;"
-  in
-  Emitters.export_early ~emitters alias
-
 let emit_import_type_as ~emitters ~config ~type_name ~as_type_name
     ~type_name_is_interface ~import_path =
   let type_name = sanitize_type_name type_name in

compiler/gentype/SatisfiesHelpers.ml

@@ -0,0 +1,20 @@
+let helper_type_name = "$RescriptTypeSatisfiesTypeScriptType"
+
+let is_helper_ident name = name = helper_type_name
+
+let render_helper_ident ~rendered_name ~rendered_type_args
+    ~rendered_type_args_default =
+  match rendered_type_args with
+  | [a1; a2] ->
+    let render_arg s = "  " ^ s in
+    rendered_name ^ "<\n" ^ render_arg a1 ^ ",\n" ^ render_arg a2 ^ "\n>"
+  | _ -> rendered_name ^ EmitText.generics_string ~type_vars:rendered_type_args_default
+
+let emit_helper_alias ~emitters =
+  let alias =
+    "export type $RescriptTypeSatisfiesTypeScriptType<\n\
+     RescriptType,\n\
+     TypeScriptType extends RescriptType\n\
+     > = TypeScriptType;"
+  in
+  Emitters.export_early ~emitters alias

compiler/gentype/TranslateTypeDeclarations.ml

@@ -84,7 +84,7 @@ let traslate_declaration_kind ~config ~loc ~output_file_relative ~resolver
       in
       let ts_type = ident ~builtin:true inline_import in
       ident ~builtin:true ~type_args:[type_; ts_type]
-        "$RescriptTypeSatisfiesTypeScriptType"
+        SatisfiesHelpers.helper_type_name
   in
   let unboxed_annotation =
     type_attributes |> Annotation.has_attribute Annotation.tag_is_unboxed