Add untagged variant support to genType.

Author: cristianoc

jscomp/gentype/GenTypeCommon.ml

@@ -68,7 +68,7 @@ type type_ =
   | Promise of type_
   | Tuple of type_ list
   | TypeVar of string
-  | Variant of variant
+  | Variant of variant (* ordinary and polymorphic variants *)
 
 and fields = field list
 and argType = {aName: string; aType: type_}
@@ -95,7 +95,7 @@ and variant = {
   inherits: type_ list;
   noPayloads: case list;
   payloads: payload list;
-  polymorphic: bool;
+  polymorphic: bool; (* If true, this is a polymorphic variant *)
   unboxed: bool;
 }
 
@@ -165,8 +165,8 @@ let rec depToResolvedName (dep : dep) =
   | Internal resolvedName -> resolvedName
   | Dot (p, s) -> ResolvedName.dot s (p |> depToResolvedName)
 
-let createVariant ~bsStringOrInt ~inherits ~noPayloads ~payloads ~polymorphic =
-  let unboxed = payloads = [] in
+let createVariant ~bsStringOrInt ~inherits ~noPayloads ~payloads ~polymorphic
+    ~unboxed =
   Variant {bsStringOrInt; inherits; noPayloads; payloads; polymorphic; unboxed}
 
 let ident ?(builtin = true) ?(typeArgs = []) name =

jscomp/gentype/TranslateCoreType.ml

@@ -225,7 +225,7 @@ and translateCoreType_ ~config ~typeVarsGen
       let inherits = inheritsTranslations |> List.map (fun {type_} -> type_) in
       let type_ =
         createVariant ~bsStringOrInt:(asString || asInt) ~noPayloads ~payloads
-          ~inherits ~polymorphic:true
+          ~inherits ~polymorphic:true ~unboxed:false
       in
       let dependencies =
         (inheritsTranslations

jscomp/gentype/TranslateTypeDeclarations.ml

@@ -26,9 +26,9 @@ let createCase (label, attributes) =
       (match
          attributes |> Annotation.getAttributePayload Annotation.tagIsAs
        with
-       | Some (_, IdentPayload (Lident "null")) -> NullLabel
-       | Some (_, IdentPayload (Lident "undefined")) -> UndefinedLabel
-       | Some (_, BoolPayload b) -> BoolLabel b
+      | Some (_, IdentPayload (Lident "null")) -> NullLabel
+      | Some (_, IdentPayload (Lident "undefined")) -> UndefinedLabel
+      | Some (_, BoolPayload b) -> BoolLabel b
       | Some (_, FloatPayload s) -> FloatLabel s
       | Some (_, IntPayload i) -> IntLabel i
       | Some (_, StringPayload asLabel) -> StringLabel asLabel
@@ -197,7 +197,7 @@ let traslateDeclarationKind ~config ~loc ~outputFileRelative ~resolver
           else variant.payloads
         in
         createVariant ~bsStringOrInt:false ~inherits:variant.inherits
-          ~noPayloads ~payloads ~polymorphic:true
+          ~noPayloads ~payloads ~polymorphic:true ~unboxed:false
       | _ -> translation.type_
     in
     {translation with type_} |> handleGeneralDeclaration
@@ -311,11 +311,8 @@ let traslateDeclarationKind ~config ~loc ~outputFileRelative ~resolver
              })
     in
     let variantTyp =
-      match (noPayloads, payloads) with
-      | [], [{t = type_}] when unboxedAnnotation -> type_
-      | _ ->
-        createVariant ~bsStringOrInt:false ~inherits:[] ~noPayloads ~payloads
-          ~polymorphic:false
+      createVariant ~bsStringOrInt:false ~inherits:[] ~noPayloads ~payloads
+        ~polymorphic:false ~unboxed:unboxedAnnotation
     in
     let resolvedTypeName = typeName |> TypeEnv.addModulePath ~typeEnv in
     let exportFromTypeDeclaration =

jscomp/gentype/TranslateTypeExprFromTypes.ml

@@ -146,7 +146,7 @@ let translateConstr ~config ~paramsTranslation ~(path : Path.t) ~typeEnv =
             case 0 "Ok" paramTranslation1.type_;
             case 1 "Error" paramTranslation2.type_;
           ]
-        ~polymorphic:false
+        ~polymorphic:false ~unboxed:false
     in
     {
       dependencies =
@@ -408,7 +408,7 @@ and translateTypeExprFromTypes_ ~config ~typeVarsGen ~typeEnv
       in
       let type_ =
         createVariant ~bsStringOrInt:false ~inherits:[] ~noPayloads ~payloads:[]
-          ~polymorphic:true
+          ~polymorphic:true ~unboxed:false
       in
       {dependencies = []; type_}
     | {noPayloads = []; payloads = [(_label, t)]; unknowns = []} ->
@@ -439,7 +439,7 @@ and translateTypeExprFromTypes_ ~config ~typeVarsGen ~typeEnv
       in
       let type_ =
         createVariant ~bsStringOrInt:false ~inherits:[] ~noPayloads ~payloads
-          ~polymorphic:true
+          ~polymorphic:true ~unboxed:false
       in
       let dependencies =
         payloadTranslations

jscomp/test/variantsMatching.gen.tsx

@@ -7,3 +7,15 @@ export type t = "thisIsA" | 42 | null | "D" | 3.14;
 
 // tslint:disable-next-line:interface-over-type-literal
 export type tNU = null | undefined;
+
+// tslint:disable-next-line:interface-over-type-literal
+export type MyUndefined_t<a> = undefined | a;
+
+// tslint:disable-next-line:interface-over-type-literal
+export type MyNull_t<a> = null | a;
+
+// tslint:disable-next-line:interface-over-type-literal
+export type MyNullable_t<a> = null | undefined | a;
+
+// tslint:disable-next-line:interface-over-type-literal
+export type MyNullableExtended_t<a> = null | undefined | "WhyNotAnotherOne" | a;

jscomp/test/variantsMatching.res

@@ -107,7 +107,7 @@ module CustomizeTags = {
 }
 
 module MyUndefined = {
-  @unboxed
+  @genType @unboxed
   type t<'a> = | @as(undefined) Undefined | Present('a)
   // Note: 'a must not have undefined as value
   // There can be only one with payload, with 1 argument, to use unboxed
@@ -125,7 +125,7 @@ module MyUndefined = {
 }
 
 module MyNull = {
-  @unboxed
+  @genType @unboxed
   type t<'a> = | @as(null) Null | Present('a)
   // Note: 'a must not have null as value
   // There can be only one with payload, with 1 argument, to use unboxed
@@ -143,7 +143,7 @@ module MyNull = {
 }
 
 module MyNullable = {
-  @unboxed
+  @genType @unboxed
   type t<'a> =
     | @as(null) Null
     | @as(undefined) Undefined
@@ -176,7 +176,7 @@ module MyNullable = {
 }
 
 module MyNullableExtended = {
-  @unboxed
+  @genType @unboxed
   type t<'a> =
     | @as(null) Null
     | @as(undefined) Undefined