manual renames

Author: aspeddro

jscomp/core/bs_conditional_initial.ml

@@ -49,7 +49,7 @@ let setup_env () =
 
     Rescript_cpp.replace_directive_bool "BS" true;
   Rescript_cpp.replace_directive_bool "JS" true;
-  Printtyp.print_res_poly_identifier := Res_printer.poly_var_ident_to_string;
+  Printtyp.print_res_poly_identifier := Res_printer.polyvar_ident_to_string;
   Rescript_cpp.replace_directive_string "BS_VERSION"  Bs_version.version
   (*; Switch.cut := 100*) (* tweakable but not very useful *)
 

jscomp/gentype/Annotation.ml

@@ -17,23 +17,23 @@ let to_string annotation =
   | GenTypeOpaque -> "GenTypeOpaque"
   | NoGenType -> "NoGenType"
 
-let tag_is_gen_type s = s = "genType" || s = "gentype"
-let tag_is_gen_type_as s = s = "genType.as" || s = "gentype.as"
+let tag_is_gentype s = s = "genType" || s = "gentype"
+let tag_is_gentype_as s = s = "genType.as" || s = "gentype.as"
 let tag_is_as s = s = "as"
 let tag_is_int s = s = "int"
 let tag_is_string s = s = "string"
 
 let tag_is_tag s = s = "tag"
 
 let tag_is_unboxed s = s = "unboxed" || s = "ocaml.unboxed"
-let tag_is_gen_type_import s = s = "genType.import" || s = "gentype.import"
-let tag_is_gen_type_opaque s = s = "genType.opaque" || s = "gentype.opaque"
+let tag_is_gentype_import s = s = "genType.import" || s = "gentype.import"
+let tag_is_gentype_opaque s = s = "genType.opaque" || s = "gentype.opaque"
 
-let tag_is_one_of_the_gen_type_annotations s =
-  tag_is_gen_type s || tag_is_gen_type_as s || tag_is_gen_type_import s
-  || tag_is_gen_type_opaque s
+let tag_is_one_of_the_gentype_annotations s =
+  tag_is_gentype s || tag_is_gentype_as s || tag_is_gentype_import s
+  || tag_is_gentype_opaque s
 
-let tag_is_gen_type_ignore_interface s =
+let tag_is_gentype_ignore_interface s =
   s = "genType.ignoreInterface" || s = "gentype.ignoreInterface"
 
 let tag_is_doc s =
@@ -98,17 +98,17 @@ let rec get_attribute_payload check_text (attributes : Typedtree.attributes) =
     | Some payload -> Some (loc, payload))
   | _hd :: tl -> get_attribute_payload check_text tl
 
-let get_gen_type_as_renaming attributes =
-  match attributes |> get_attribute_payload tag_is_gen_type_as with
+let get_gentype_as_renaming attributes =
+  match attributes |> get_attribute_payload tag_is_gentype_as with
   | Some (_, StringPayload s) -> Some s
   | None -> (
-    match attributes |> get_attribute_payload tag_is_gen_type with
+    match attributes |> get_attribute_payload tag_is_gentype with
     | Some (_, StringPayload s) -> Some s
     | _ -> None)
   | _ -> None
 
 (* This is not supported anymore: only use to give a warning *)
-let check_unsupported_gen_type_as_renaming attributes =
+let check_unsupported_gentype_as_renaming attributes =
   let error ~loc =
     Log_.Color.setup ();
     Log_.info ~loc ~name:"Warning genType" (fun ppf () ->
@@ -117,10 +117,10 @@ let check_unsupported_gen_type_as_renaming attributes =
            @genType.as is not supported anymore in type definitions. Use @as \
            from the language.")
   in
-  match attributes |> get_attribute_payload tag_is_gen_type_as with
+  match attributes |> get_attribute_payload tag_is_gentype_as with
   | Some (loc, _) -> error ~loc
   | None -> (
-    match attributes |> get_attribute_payload tag_is_gen_type with
+    match attributes |> get_attribute_payload tag_is_gentype with
     | Some (loc, _) -> error ~loc
     | None -> ())
 
@@ -136,18 +136,18 @@ let get_as_int attributes =
   | _ -> None
 
 let get_attribute_import_renaming attributes =
-  let attribute_import = attributes |> get_attribute_payload tag_is_gen_type_import in
-  let gen_type_as_renaming = attributes |> get_gen_type_as_renaming in
-  match (attribute_import, gen_type_as_renaming) with
+  let attribute_import = attributes |> get_attribute_payload tag_is_gentype_import in
+  let gentype_as_renaming = attributes |> get_gentype_as_renaming in
+  match (attribute_import, gentype_as_renaming) with
   | Some (_, StringPayload import_string), _ ->
-    (Some import_string, gen_type_as_renaming)
+    (Some import_string, gentype_as_renaming)
   | ( Some
         ( _,
           TuplePayload [StringPayload import_string; StringPayload rename_string]
         ),
       _ ) ->
     (Some import_string, Some rename_string)
-  | _ -> (None, gen_type_as_renaming)
+  | _ -> (None, gentype_as_renaming)
 
 let get_tag attributes =
   match attributes |> get_attribute_payload tag_is_tag with
@@ -168,10 +168,10 @@ let has_attribute check_text (attributes : Typedtree.attributes) =
 let from_attributes ~(config : GenTypeConfig.t) ~loc
     (attributes : Typedtree.attributes) =
   let default = if config.everything then GenType else NoGenType in
-  if has_attribute tag_is_gen_type_opaque attributes then GenTypeOpaque
-  else if has_attribute (fun s -> tag_is_gen_type s || tag_is_gen_type_as s) attributes
+  if has_attribute tag_is_gentype_opaque attributes then GenTypeOpaque
+  else if has_attribute (fun s -> tag_is_gentype s || tag_is_gentype_as s) attributes
   then (
-    (match attributes |> get_attribute_payload tag_is_gen_type with
+    (match attributes |> get_attribute_payload tag_is_gentype with
     | Some (_, UnrecognizedPayload) -> ()
     | Some _ ->
       Log_.Color.setup ();
@@ -293,6 +293,6 @@ let import_from_string import_string : import =
   {import_path}
 
 let update_config_for_module ~(config : GenTypeConfig.t) attributes =
-  if attributes |> has_attribute tag_is_gen_type then
+  if attributes |> has_attribute tag_is_gentype then
     {config with everything = true}
   else config

jscomp/gentype/EmitJs.ml

@@ -72,13 +72,13 @@ let emit_export_type ~emitters ~config ~type_name_is_interface
     {CodeItem.loc; name_as; opaque; type_; type_vars; resolved_type_name; doc_string}
     =
   let free_type_vars = TypeVars.free type_ in
-  let is_g_a_d_t =
+  let is_gadt =
     free_type_vars |> List.exists (fun s -> not (List.mem s type_vars))
   in
   let opaque =
     match opaque with
     | Some true -> opaque
-    | _ when is_g_a_d_t ->
+    | _ when is_gadt ->
       Log_.Color.setup ();
       Log_.info ~loc ~name:"Warning genType" (fun ppf () ->
           Format.fprintf ppf
@@ -163,7 +163,7 @@ let emit_code_item ~config ~emitters ~module_items_emitter ~env ~file_name
           fields
           |> List.map (fun (field : field) ->
                  match
-                   field.name_j_s = "children"
+                   field.name_js = "children"
                    && field.type_ |> EmitType.is_type_react_element
                  with
                  | true -> {field with type_ = EmitType.type_react_child}
@@ -186,7 +186,7 @@ let emit_code_item ~config ~emitters ~module_items_emitter ~env ~file_name
           (* JSX V3 *)
           let fields =
             Ext_list.filter_map fields (fun (field : field) ->
-                match field.name_j_s with
+                match field.name_js with
                 | "children" when field.type_ |> EmitType.is_type_react_element ->
                   Some {field with type_ = EmitType.type_react_child}
                 | "key" ->
@@ -280,7 +280,7 @@ let emit_code_item ~config ~emitters ~module_items_emitter ~env ~file_name
             fields
             |> List.map (fun (field : field) ->
                    match
-                     field.name_j_s = "children"
+                     field.name_js = "children"
                      && field.type_ |> EmitType.is_type_react_element
                    with
                    | true -> {field with type_ = EmitType.type_react_child}
@@ -314,7 +314,7 @@ let emit_code_item ~config ~emitters ~module_items_emitter ~env ~file_name
             let props_type =
               let fields =
                 Ext_list.filter_map fields (fun (field : field) ->
-                    match field.name_j_s with
+                    match field.name_js with
                     | "children" when field.type_ |> EmitType.is_type_react_element
                       ->
                       Some {field with type_ = EmitType.type_react_child}

jscomp/gentype/EmitType.ml

@@ -44,7 +44,7 @@ let type_react_ref ~type_ =
       [
         {
           mutable_ = Mutable;
-          name_j_s = react_ref_current;
+          name_js = react_ref_current;
           optional = Mandatory;
           type_ = Null type_;
           doc_string = DocString.empty;
@@ -53,8 +53,8 @@ let type_react_ref ~type_ =
 
 let is_type_react_ref ~fields =
   match fields with
-  | [{mutable_ = Mutable; name_j_s; optional = Mandatory}] ->
-    name_j_s == react_ref_current
+  | [{mutable_ = Mutable; name_js; optional = Mandatory}] ->
+    name_js == react_ref_current
   | _ -> false
 
 let is_type_function_component ~fields type_ =
@@ -162,11 +162,11 @@ let rec render_type ~(config : Config.t) ?(indent = None) ~type_name_is_interfac
       |> List.map (fun type_ ->
              type_ |> render_type ~config ~indent ~type_name_is_interface ~in_fun_type)
     in
-    let no_payloads_rendered = no_payloads |> List.map label_j_s_to_string in
+    let no_payloads_rendered = no_payloads |> List.map label_js_to_string in
     let field ~name value =
       {
         mutable_ = Mutable;
-        name_j_s = name;
+        name_js = name;
         optional = Mandatory;
         type_ = TypeVar value;
         doc_string = DocString.empty;
@@ -182,7 +182,7 @@ let rec render_type ~(config : Config.t) ?(indent = None) ~type_name_is_interfac
                t |> render_type ~config ~indent ~type_name_is_interface ~in_fun_type
              in
              let tag_field =
-               case |> label_j_s_to_string
+               case |> label_js_to_string
                |> field ~name:(Runtime.js_variant_tag ~polymorphic:false ~tag)
              in
              match (unboxed, type_) with
@@ -197,7 +197,7 @@ let rec render_type ~(config : Config.t) ?(indent = None) ~type_name_is_interfac
              | false, type_ when polymorphic ->
                (* poly variant *)
                [
-                 case |> label_j_s_to_string
+                 case |> label_js_to_string
                  |> field ~name:(Runtime.js_variant_tag ~polymorphic ~tag);
                  type_ |> render
                  |> field ~name:(Runtime.js_variant_value ~polymorphic);
@@ -234,7 +234,7 @@ let rec render_type ~(config : Config.t) ?(indent = None) ~type_name_is_interfac
            ^ "| "))
 
 and render_field ~config ~indent ~type_name_is_interface ~in_fun_type
-    {mutable_; name_j_s = lbl; optional; type_; doc_string} =
+    {mutable_; name_js = lbl; optional; type_; doc_string} =
   let opt_marker =
     match optional == Optional with
     | true -> "?"
@@ -246,7 +246,7 @@ and render_field ~config ~indent ~type_name_is_interface ~in_fun_type
     | false -> ""
   in
   let lbl =
-    match is_j_s_safe_property_name lbl with
+    match is_js_safe_property_name lbl with
     | true -> lbl
     | false -> EmitText.quotes lbl
   in

jscomp/gentype/ExportModule.ml

@@ -40,7 +40,7 @@ and export_module_item_to_fields =
          let field_for_type =
            {
              mutable_ = Mutable;
-             name_j_s = field_name;
+             name_js = field_name;
              optional = Mandatory;
              type_ = type_for_type;
              doc_string;

jscomp/gentype/GenIdent.ml

@@ -12,7 +12,7 @@ type type_vars_gen = {
 
 let create_type_vars_gen () = {type_name_map = IntMap.empty; type_name_counter = 0}
 
-let js_type_name_for_anonymous_type_i_d ~type_vars_gen id =
+let js_type_name_for_anonymous_type_id ~type_vars_gen id =
   try type_vars_gen.type_name_map |> IntMap.find id
   with Not_found ->
     type_vars_gen.type_name_counter <- type_vars_gen.type_name_counter + 1;

jscomp/gentype/GenTypeCommon.ml

@@ -18,17 +18,17 @@ let log_not_implemented x =
 type optional = Mandatory | Optional
 type mutable_ = Immutable | Mutable
 
-type label_j_s =
+type label_js =
   | NullLabel
   | UndefinedLabel
   | BoolLabel of bool
   | FloatLabel of string
   | IntLabel of string
   | StringLabel of string
 
-type case = {label_j_s: label_j_s}
+type case = {label_js: label_js}
 
-let is_j_s_safe_property_name name =
+let is_js_safe_property_name name =
   name = ""
   || (match name.[0] [@doesNotRaise] with
      | 'A' .. 'z' -> true
@@ -53,8 +53,8 @@ let is_number s =
   done;
   res.contents
 
-let label_j_s_to_string case =
-  match case.label_j_s with
+let label_js_to_string case =
+  match case.label_js with
   | NullLabel -> "null"
   | UndefinedLabel -> "undefined"
   | BoolLabel b -> b |> string_of_bool
@@ -83,7 +83,7 @@ and arg_type = {a_name: string; a_type: type_}
 
 and field = {
   mutable_: mutable_;
-  name_j_s: string;
+  name_js: string;
   optional: optional;
   type_: type_;
   doc_string: DocString.t;