Clean up unused Record and RecordC.

Author: cristianoc

jscomp/gentype/Converter.ml

@@ -9,7 +9,6 @@ type t =
   | ObjectC of fieldsC
   | OptionC of t
   | PromiseC of t
-  | RecordC of fieldsC
   | TupleC of t list
   | VariantC of variantC
 
@@ -69,7 +68,7 @@ let rec toString converter =
     ^ " -> " ^ toString retConverter ^ ")"
   | IdentC -> "id"
   | NullableC c -> "nullable(" ^ toString c ^ ")"
-  | ObjectC fieldsC | RecordC fieldsC ->
+  | ObjectC fieldsC ->
     let dot =
       match converter with
       | ObjectC _ -> ". "
@@ -222,26 +221,6 @@ let typeGetConverterNormalized ~config ~inline ~lookupId ~typeNameIsInterface
     | Promise t ->
       let tConverter, tNormalized = t |> visit ~visited in
       (PromiseC tConverter, Promise tNormalized)
-    | Record fields ->
-      let fieldsConverted =
-        fields
-        |> List.map (fun ({type_} as field) -> (field, type_ |> visit ~visited))
-      in
-      ( RecordC
-          (fieldsConverted
-          |> List.map (fun ({nameJS; nameRE; optional}, (converter, _)) ->
-                 {
-                   lblJS = nameJS;
-                   lblRE = nameRE;
-                   c =
-                     (match optional = Mandatory with
-                     | true -> converter
-                     | false -> OptionC converter);
-                 })),
-        Record
-          (fieldsConverted
-          |> List.map (fun (field, (_, tNormalized)) ->
-                 {field with type_ = tNormalized})) )
     | Tuple innerTypes ->
       let innerConversions, normalizedList =
         innerTypes |> List.map (visit ~visited) |> List.split
@@ -395,7 +374,6 @@ let rec converterIsIdentity ~config ~toJS converter =
            | _ -> c |> converterIsIdentity ~config ~toJS)
   | OptionC c -> if toJS then c |> converterIsIdentity ~config ~toJS else false
   | PromiseC c -> c |> converterIsIdentity ~config ~toJS
-  | RecordC _ -> false
   | TupleC innerTypesC ->
     innerTypesC |> List.for_all (converterIsIdentity ~config ~toJS)
   | VariantC {withPayloads; useVariantTables} ->
@@ -581,39 +559,6 @@ let rec apply ~config ~converter ~indent ~nameGen ~toJS ~variantTables value =
     ^ ") { return "
     ^ (x |> apply ~config ~converter:c ~indent ~nameGen ~toJS ~variantTables)
     ^ "})"
-  | RecordC fieldsC ->
-    let simplifyFieldConverted fieldConverter =
-      match fieldConverter with
-      | OptionC converter1 when converter1 |> converterIsIdentity ~config ~toJS
-        ->
-        IdentC
-      | _ -> fieldConverter
-    in
-    if toJS then
-      let fieldValues =
-        fieldsC
-        |> List.mapi (fun index {lblJS; c = fieldConverter} ->
-               lblJS ^ ":"
-               ^ (value
-                 |> EmitText.arrayAccess ~index
-                 |> apply ~config
-                      ~converter:(fieldConverter |> simplifyFieldConverted)
-                      ~indent ~nameGen ~toJS ~variantTables))
-        |> String.concat ", "
-      in
-      "{" ^ fieldValues ^ "}"
-    else
-      let fieldValues =
-        fieldsC
-        |> List.map (fun {lblJS; c = fieldConverter} ->
-               value
-               |> EmitText.fieldAccess ~label:lblJS
-               |> apply ~config
-                    ~converter:(fieldConverter |> simplifyFieldConverted)
-                    ~indent ~nameGen ~toJS ~variantTables)
-        |> String.concat ", "
-      in
-      "[" ^ fieldValues ^ "]"
   | TupleC innerTypesC ->
     "["
     ^ (innerTypesC

jscomp/gentype/EmitJs.ml

@@ -101,7 +101,7 @@ let typeNameIsInterface ~(exportTypeMap : CodeItem.exportTypeMap)
     ~(exportTypeMapFromOtherFiles : CodeItem.exportTypeMap) typeName =
   let typeIsInterface type_ =
     match type_ with
-    | Object _ | Record _ -> true
+    | Object _ -> true
     | _ -> false
   in
   match exportTypeMap |> StringMap.find typeName with
@@ -624,7 +624,7 @@ let propagateAnnotationToSubTypes ~codeItems (typeMap : CodeItem.exportTypeMap)
       | Function {argTypes; retType} ->
         argTypes |> List.iter (fun {aType} -> visit aType);
         retType |> visit
-      | GroupOfLabeledArgs fields | Object (_, fields) | Record fields ->
+      | GroupOfLabeledArgs fields | Object (_, fields) ->
         fields |> List.iter (fun {type_} -> type_ |> visit)
       | Option t | Null t | Nullable t | Promise t | Undefined t -> t |> visit
       | Tuple innerTypes -> innerTypes |> List.iter visit

jscomp/gentype/EmitType.ml

@@ -120,7 +120,7 @@ let rec renderType ~(config : Config.t) ?(indent = None) ~typeNameIsInterface
   | Function {argTypes; retType; typeVars} ->
     renderFunType ~config ~indent ~inFunType ~typeNameIsInterface ~typeVars
       argTypes retType
-  | GroupOfLabeledArgs fields | Object (_, fields) | Record fields ->
+  | GroupOfLabeledArgs fields | Object (_, fields) ->
     let indent1 = fields |> Indent.heuristicFields ~indent in
     fields
     |> renderFields ~config ~indent:indent1 ~inFunType ~typeNameIsInterface

jscomp/gentype/GenTypeCommon.ml

@@ -68,7 +68,6 @@ type type_ =
   | Object of closedFlag * fields
   | Option of type_
   | Promise of type_
-  | Record of fields
   | Tuple of type_ list
   | TypeVar of string
   | Undefined of type_
@@ -119,7 +118,6 @@ let typeIsObject type_ =
   | Object _ -> true
   | Option _ -> false
   | Promise _ -> true
-  | Record _ -> true
   | Tuple _ -> true
   | TypeVar _ -> false
   | Undefined _ -> false

jscomp/gentype/TypeVars.ml

@@ -58,11 +58,6 @@ let rec substitute ~f type0 =
                {field with type_ = field.type_ |> substitute ~f}) )
   | Option type_ -> Option (type_ |> substitute ~f)
   | Promise type_ -> Promise (type_ |> substitute ~f)
-  | Record fields ->
-    Record
-      (fields
-      |> List.map (fun field ->
-             {field with type_ = field.type_ |> substitute ~f}))
   | Tuple innerTypes -> Tuple (innerTypes |> List.map (substitute ~f))
   | TypeVar s -> (
     match f s with
@@ -86,7 +81,7 @@ let rec free_ type0 : StringSet.t =
     StringSet.diff
       ((argTypes |> freeOfList_) +++ (retType |> free_))
       (typeVars |> StringSet.of_list)
-  | GroupOfLabeledArgs fields | Object (_, fields) | Record fields ->
+  | GroupOfLabeledArgs fields | Object (_, fields) ->
     fields
     |> List.fold_left
          (fun s {type_} -> StringSet.union s (type_ |> free_))