genType: treat option<t> as t | undefined

This produces strictly fewer conversion functions, as it does not need to transform `null` to `undefined`.

Author: cristianoc

jscomp/gentype/Converter.ml

@@ -5,7 +5,6 @@ type t =
   | CircularC of string * t
   | FunctionC of functionC
   | IdentC
-  | NullableC of t
   | ObjectC of fieldsC
   | OptionC of t
   | PromiseC of t
@@ -68,7 +67,6 @@ let rec toString converter =
       |> String.concat ", ")
     ^ " -> " ^ toString retConverter ^ ")"
   | IdentC -> "id"
-  | NullableC c -> "nullable(" ^ toString c ^ ")"
   | ObjectC fieldsC | RecordC fieldsC ->
     let dot =
       match converter with
@@ -120,8 +118,7 @@ let typeGetConverterNormalized ~config ~inline ~lookupId ~typeNameIsInterface
     | Array (t, mutable_) ->
       let tConverter, tNormalized = t |> visit ~visited in
       (ArrayC tConverter, Array (tNormalized, mutable_))
-    | Dict _ ->
-      (IdentC, normalized_)
+    | Dict _ -> (IdentC, normalized_)
     | Function
         ({argTypes; componentName; retType; typeVars; uncurried} as function_)
       ->
@@ -191,10 +188,10 @@ let typeGetConverterNormalized ~config ~inline ~lookupId ~typeNameIsInterface
           else (IdentC, normalized_))
     | Null t ->
       let tConverter, tNormalized = t |> visit ~visited in
-      (NullableC tConverter, Null tNormalized)
+      (OptionC tConverter, Null tNormalized)
     | Nullable t ->
       let tConverter, tNormalized = t |> visit ~visited in
-      (NullableC tConverter, Nullable tNormalized)
+      (OptionC tConverter, Nullable tNormalized)
     | Object (closedFlag, fields) ->
       let fieldsConverted =
         fields
@@ -248,9 +245,6 @@ let typeGetConverterNormalized ~config ~inline ~lookupId ~typeNameIsInterface
       in
       (TupleC innerConversions, Tuple normalizedList)
     | TypeVar _ -> (IdentC, normalized_)
-    | Undefined t ->
-      let tConverter, tNormalized = t |> visit ~visited in
-      (NullableC tConverter, Undefined tNormalized)
     | Variant variant ->
       let allowUnboxed = not variant.polymorphic in
       let withPayloads, normalized, unboxed =
@@ -384,7 +378,6 @@ let rec converterIsIdentity ~config ~toJS converter =
                 argConverter |> converterIsIdentity ~config ~toJS:(not toJS)
               | GroupConverter _ -> false)
   | IdentC -> true
-  | NullableC c -> c |> converterIsIdentity ~config ~toJS
   | ObjectC fieldsC ->
     fieldsC
     |> List.for_all (fun {lblJS; lblRE; c} ->
@@ -393,7 +386,7 @@ let rec converterIsIdentity ~config ~toJS converter =
            match c with
            | OptionC c1 -> c1 |> converterIsIdentity ~config ~toJS
            | _ -> c |> converterIsIdentity ~config ~toJS)
-  | OptionC c -> if toJS then c |> converterIsIdentity ~config ~toJS else false
+  | OptionC c -> c |> converterIsIdentity ~config ~toJS
   | PromiseC c -> c |> converterIsIdentity ~config ~toJS
   | RecordC _ -> false
   | TupleC innerTypesC ->
@@ -523,13 +516,6 @@ let rec apply ~config ~converter ~indent ~nameGen ~toJS ~variantTables value =
     EmitText.funDef ~bodyArgs ~functionName:componentName ~funParams ~indent
       ~mkBody ~typeVars
   | IdentC -> value
-  | NullableC c ->
-    EmitText.parens
-      [
-        value ^ " == null ? " ^ value ^ " : "
-        ^ (value
-          |> apply ~config ~converter:c ~indent ~nameGen ~toJS ~variantTables);
-      ]
   | ObjectC fieldsC ->
     let simplifyFieldConverted fieldConverter =
       match fieldConverter with
@@ -558,22 +544,12 @@ let rec apply ~config ~converter ~indent ~nameGen ~toJS ~variantTables value =
     in
     "{" ^ fieldValues ^ "}"
   | OptionC c ->
-    if toJS then
-      EmitText.parens
-        [
-          value ^ " == null ? " ^ value ^ " : "
-          ^ (value
-            |> apply ~config ~converter:c ~indent ~nameGen ~toJS ~variantTables
-            );
-        ]
-    else
-      EmitText.parens
-        [
-          value ^ " == null ? undefined : "
-          ^ (value
-            |> apply ~config ~converter:c ~indent ~nameGen ~toJS ~variantTables
-            );
-        ]
+    EmitText.parens
+      [
+        value ^ " == null ? " ^ value ^ " : "
+        ^ (value
+          |> apply ~config ~converter:c ~indent ~nameGen ~toJS ~variantTables);
+      ]
   | PromiseC c ->
     let x = "$promise" |> EmitText.name ~nameGen in
     value ^ ".then(function _element("

jscomp/gentype/EmitJs.ml

@@ -626,7 +626,7 @@ let propagateAnnotationToSubTypes ~codeItems (typeMap : CodeItem.exportTypeMap)
         retType |> visit
       | GroupOfLabeledArgs fields | Object (_, fields) | Record fields ->
         fields |> List.iter (fun {type_} -> type_ |> visit)
-      | Option t | Null t | Nullable t | Promise t | Undefined t -> t |> visit
+      | Option t | Null t | Nullable t | Promise t -> t |> visit
       | Tuple innerTypes -> innerTypes |> List.iter visit
       | TypeVar _ -> ()
       | Variant {inherits; payloads} ->

jscomp/gentype/EmitType.ml

@@ -140,7 +140,7 @@ let rec renderType ~(config : Config.t) ?(indent = None) ~typeNameIsInterface
     "(null | "
     ^ (type_ |> renderType ~config ~indent ~typeNameIsInterface ~inFunType)
     ^ ")"
-  | Nullable type_ | Option type_ ->
+  | Nullable type_ ->
     let useParens x =
       match type_ with
       | Function _ | Variant _ -> EmitText.parens [x]
@@ -150,6 +150,16 @@ let rec renderType ~(config : Config.t) ?(indent = None) ~typeNameIsInterface
     ^ useParens
         (type_ |> renderType ~config ~indent ~typeNameIsInterface ~inFunType)
     ^ ")"
+  | Option type_ ->
+    let useParens x =
+      match type_ with
+      | Function _ | Variant _ -> EmitText.parens [x]
+      | _ -> x
+    in
+    "(undefined | "
+    ^ useParens
+        (type_ |> renderType ~config ~indent ~typeNameIsInterface ~inFunType)
+    ^ ")"
   | Promise type_ ->
     "Promise" ^ "<"
     ^ (type_ |> renderType ~config ~indent ~typeNameIsInterface ~inFunType)
@@ -161,10 +171,6 @@ let rec renderType ~(config : Config.t) ?(indent = None) ~typeNameIsInterface
       |> String.concat ", ")
     ^ "]"
   | TypeVar s -> s
-  | Undefined type_ ->
-    "(undefined | "
-    ^ (type_ |> renderType ~config ~indent ~typeNameIsInterface ~inFunType)
-    ^ ")"
   | Variant {inherits; noPayloads; payloads; polymorphic; unboxed} ->
     let inheritsRendered =
       inherits

jscomp/gentype/GenTypeCommon.ml

@@ -71,7 +71,6 @@ type type_ =
   | Record of fields
   | Tuple of type_ list
   | TypeVar of string
-  | Undefined of type_
   | Variant of variant
 
 and fields = field list
@@ -122,7 +121,6 @@ let typeIsObject type_ =
   | Record _ -> true
   | Tuple _ -> true
   | TypeVar _ -> false
-  | Undefined _ -> false
   | Variant _ -> false
 
 type label = Nolabel | Label of string | OptLabel of string

jscomp/gentype/TranslateTypeExprFromTypes.ml

@@ -230,7 +230,7 @@ let translateConstr ~config ~paramsTranslation ~(path : Path.t) ~typeEnv =
     {paramTranslation with type_ = Option paramTranslation.type_}
   | ( (["Js"; "Undefined"; "t"] | ["Undefined"; "t"] | ["Js"; "undefined"]),
       [paramTranslation] ) ->
-    {paramTranslation with type_ = Undefined paramTranslation.type_}
+    {paramTranslation with type_ = Option paramTranslation.type_}
   | (["Js"; "Null"; "t"] | ["Null"; "t"] | ["Js"; "null"]), [paramTranslation]
     ->
     {paramTranslation with type_ = Null paramTranslation.type_}

jscomp/gentype/TypeVars.ml

@@ -68,7 +68,6 @@ let rec substitute ~f type0 =
     match f s with
     | None -> type0
     | Some type1 -> type1)
-  | Undefined type_ -> Undefined (type_ |> substitute ~f)
   | Variant variant ->
     Variant
       {
@@ -96,7 +95,7 @@ let rec free_ type0 : StringSet.t =
     |> List.fold_left
          (fun s typeArg -> StringSet.union s (typeArg |> free_))
          StringSet.empty
-  | Dict type_ | Null type_ | Nullable type_ | Undefined type_ -> type_ |> free_
+  | Dict type_ | Null type_ | Nullable type_ -> type_ |> free_
   | Option type_ | Promise type_ -> type_ |> free_
   | Tuple innerTypes ->
     innerTypes

jscomp/gentype_tests/typescript-react-example/src/Core.bs.js

@@ -2,10 +2,17 @@
 /* eslint-disable import/first */
 
 
+const $$toJS552311971: { [key: string]: any } = {"0": "A"};
+
+const $$toRE552311971: { [key: string]: any } = {"A": 0};
+
 // @ts-ignore: Implicit any on import
 import * as CoreBS__Es6Import from './Core.bs';
 const CoreBS: any = CoreBS__Es6Import;
 
+// tslint:disable-next-line:interface-over-type-literal
+export type variant = "A" | { tag: "B"; value: string };
+
 export const null0: (x:(null | number)) => (null | number) = CoreBS.null0;
 
 export const null1: (x:(null | number)) => (null | number) = CoreBS.null1;
@@ -45,3 +52,14 @@ export const weakmap1: (x:WeakMap<number[],number>) => WeakMap<number[],number>
 export const set1: (x:Set<string>) => Set<string> = CoreBS.set1;
 
 export const weakset1: (x:WeakSet<number[]>) => WeakSet<number[]> = CoreBS.weakset1;
+
+export const option0: (x:(undefined | string)) => (undefined | string) = CoreBS.option0;
+
+export const option1: (x:(undefined | variant)) => (undefined | variant) = function (Arg1: any) {
+  const result = CoreBS.option1((Arg1 == null ? Arg1 : typeof(Arg1) === 'object'
+    ? {TAG: 0, _0:Arg1.value} as any
+    : $$toRE552311971[Arg1]));
+  return (result == null ? result : typeof(result) === 'object'
+    ? {tag:"B", value:result._0}
+    : $$toJS552311971[result])
+};

jscomp/gentype_tests/typescript-react-example/src/Core.gen.tsx

@@ -60,3 +60,11 @@ let set1 = (x: Set.t<string>) => x
 
 @genType
 let weakset1 = (x: WeakSet.t<array<int>>) => x
+
+type variant = A | B(string)
+
+@genType
+let option0 = (x: option<string>) => x
+
+@genType
+let option1 = (x: option<variant>) => x

jscomp/gentype_tests/typescript-react-example/src/Core.res

@@ -6,4 +6,4 @@
 import * as TestImmutableArrayBS__Es6Import from './TestImmutableArray.bs';
 const TestImmutableArrayBS: any = TestImmutableArrayBS__Es6Import;
 
-export const testImmutableArrayGet: <T1>(arr:ReadonlyArray<T1>) => (null | undefined | T1) = TestImmutableArrayBS.testImmutableArrayGet;
+export const testImmutableArrayGet: <T1>(arr:ReadonlyArray<T1>) => (undefined | T1) = TestImmutableArrayBS.testImmutableArrayGet;

jscomp/gentype_tests/typescript-react-example/src/TestImmutableArray.gen.tsx

@@ -21,7 +21,7 @@ export type toPayload = { readonly result: string };
 
 export const convert: (_1:Promise<fromPayload>) => Promise<toPayload> = TestPromiseBS.convert;
 
-export const barx: (_1:{ readonly x?: Promise<(null | undefined | string)> }, _2:void) => boolean = function (Arg1: any, Arg2: any) {
-  const result = Curry._2(TestPromiseBS.barx, (Arg1.x == null ? undefined : Arg1.x.then(function _element($promise: any) { return ($promise == null ? undefined : $promise)})), Arg2);
+export const barx: (_1:{ readonly x?: Promise<(undefined | string)> }, _2:void) => boolean = function (Arg1: any, Arg2: any) {
+  const result = Curry._2(TestPromiseBS.barx, Arg1.x, Arg2);
   return result
 };

jscomp/gentype_tests/typescript-react-example/src/TestPromise.gen.tsx

@@ -10,12 +10,6 @@ import type {t2Alias as TransitiveType2_t2Alias} from './TransitiveType2.gen';
 
 import type {t2 as TransitiveType2_t2} from './TransitiveType2.gen';
 
-export const convert: (x:TransitiveType2_t2) => TransitiveType2_t2 = function (Arg1: any) {
-  const result = TransitiveType1BS.convert((Arg1 == null ? undefined : Arg1));
-  return result
-};
+export const convert: (x:TransitiveType2_t2) => TransitiveType2_t2 = TransitiveType1BS.convert;
 
-export const convertAlias: (x:TransitiveType2_t2Alias) => TransitiveType2_t2Alias = function (Arg1: any) {
-  const result = TransitiveType1BS.convertAlias((Arg1 == null ? undefined : Arg1));
-  return result
-};
+export const convertAlias: (x:TransitiveType2_t2Alias) => TransitiveType2_t2Alias = TransitiveType1BS.convertAlias;

jscomp/gentype_tests/typescript-react-example/src/TransitiveType1.gen.tsx

@@ -5,7 +5,7 @@
 import type {t3 as TransitiveType3_t3} from './TransitiveType3.gen';
 
 // tslint:disable-next-line:interface-over-type-literal
-export type t2 = (null | undefined | TransitiveType3_t3);
+export type t2 = (undefined | TransitiveType3_t3);
 
 // tslint:disable-next-line:interface-over-type-literal
 export type t2Alias = t2;

jscomp/gentype_tests/typescript-react-example/src/TransitiveType2.gen.tsx

@@ -112,7 +112,7 @@ export const id2: (x:x2) => x2 = function (Arg1: any) {
   return $$toJS1061900109[result]
 };
 
-export const polyWithOpt: (foo:string) => (null | undefined | (
+export const polyWithOpt: (foo:string) => (undefined | (
     { NAME: "One"; VAL: string }
   | { NAME: "Two"; VAL: number })) = VariantsBS.polyWithOpt;
 

jscomp/gentype_tests/typescript-react-example/src/Variants.gen.tsx

@@ -11,7 +11,7 @@ import * as TuplesBS__Es6Import from './Tuples.bs';
 const TuplesBS: any = TuplesBS__Es6Import;
 
 // tslint:disable-next-line:interface-over-type-literal
-export type coord = [number, number, (null | undefined | number)];
+export type coord = [number, number, (undefined | number)];
 
 // tslint:disable-next-line:interface-over-type-literal
 export type coord2 = [number, number, (null | undefined | number)];
@@ -24,21 +24,15 @@ export type couple = [person, person];
 
 export const testTuple: (param:[number, number]) => number = TuplesBS.testTuple;
 
-export const origin: [number, number, (null | undefined | number)] = TuplesBS.origin;
+export const origin: [number, number, (undefined | number)] = TuplesBS.origin;
 
-export const computeArea: (param:[number, number, (null | undefined | number)]) => number = function (Arg1: any) {
-  const result = TuplesBS.computeArea([Arg1[0], Arg1[1], (Arg1[2] == null ? undefined : Arg1[2])]);
-  return result
-};
+export const computeArea: (param:[number, number, (undefined | number)]) => number = TuplesBS.computeArea;
 
-export const computeAreaWithIdent: (param:coord) => number = function (Arg1: any) {
-  const result = TuplesBS.computeAreaWithIdent([Arg1[0], Arg1[1], (Arg1[2] == null ? undefined : Arg1[2])]);
-  return result
-};
+export const computeAreaWithIdent: (param:coord) => number = TuplesBS.computeAreaWithIdent;
 
 export const computeAreaNoConverters: (param:[number, number]) => number = TuplesBS.computeAreaNoConverters;
 
-export const coord2d: <T1,T2,T3>(x:T1, y:T2) => [T1, T2, (null | undefined | T3)] = function <T1,T2,T3>(Arg1: any, Arg2: any) {
+export const coord2d: <T1,T2,T3>(x:T1, y:T2) => [T1, T2, (undefined | T3)] = function <T1,T2,T3>(Arg1: any, Arg2: any) {
   const result = Curry._2(TuplesBS.coord2d, Arg1, Arg2);
   return result
 };

jscomp/gentype_tests/typescript-react-example/src/nested/Tuples.gen.tsx

@@ -126,8 +126,8 @@ export const selfRecursiveConverter: (param:selfRecursive) => selfRecursive = Ty
 
 export const mutuallyRecursiveConverter: (param:mutuallyRecursiveA) => mutuallyRecursiveB = TypesBS.mutuallyRecursiveConverter;
 
-export const testFunctionOnOptionsAsArgument: <T1,a>(a:(null | undefined | a), foo:((_1:(null | undefined | a)) => T1)) => T1 = function <T1,a>(Arg1: any, Arg2: any) {
-  const result = Curry._2(TypesBS.testFunctionOnOptionsAsArgument, (Arg1 == null ? undefined : Arg1), Arg2);
+export const testFunctionOnOptionsAsArgument: <T1,a>(a:(undefined | a), foo:((_1:(undefined | a)) => T1)) => T1 = function <T1,a>(Arg1: any, Arg2: any) {
+  const result = Curry._2(TypesBS.testFunctionOnOptionsAsArgument, Arg1, Arg2);
   return result
 };
 
@@ -153,4 +153,4 @@ export const currentTime: Date = TypesBS.currentTime;
 
 export const i64Const: i64B = TypesBS.i64Const;
 
-export const optFunction: (null | undefined | (() => number)) = TypesBS.optFunction;
+export const optFunction: (undefined | (() => number)) = TypesBS.optFunction;