Use node instead of just type

This fixes losing the nullability indicator.

Author: epabst

src/main/kotlin/converter/typeUtils.kt

@@ -32,10 +32,14 @@ private fun ObjectTypeToKotlinTypeMapper.mapToEnhancedType(type: Type, declarati
         return resultingDeclaration.unsafeCast<TypeNode>().toEnhancedType(this)
     }
 
-    if (resultingDeclaration?.kind == SyntaxKind.UnionType && TypeFlags.Union !in flags) {
+    if (resultingDeclaration?.kind == SyntaxKind.UnionType) {
         return resultingDeclaration.unsafeCast<UnionTypeNode>().toEnhancedType(this)
     }
 
+    if (TypeFlags.Union in flags) {
+        return mapUnionType(type.unsafeCast<UnionType>())
+    }
+
     if (type in typesInMappingProcess) {
         report(
                 "Recursion is detected when resolve type: \"${type.symbol?.name}\" for the declaration at ${declaration?.location()}",
@@ -70,7 +74,6 @@ private fun ObjectTypeToKotlinTypeMapper.mapToEnhancedType(type: Type, declarati
             SingleKtType(KtType(BOOLEAN, comment = type.unsafeCast<LiteralType>().value))
         }
 
-        TypeFlags.Union in flags -> mapUnionType(type.unsafeCast<UnionType>())
         TypeFlags.Intersection in flags -> mapIntersectionType(type.unsafeCast<IntersectionType>())
 
         TypeFlags.TypeParameter in flags -> SingleKtType(KtType(KtQualifiedName(unescapeIdentifier(type.getSymbol()!!.name))))

testData/misc/missedOverloads.d.kt

@@ -6,8 +6,8 @@ external interface MyEvent
 external interface MyOptions
 external interface JQueryStatic {
     fun get(url: String, success: (() -> Any)? = definedExternally /* null */, dataType: String? = definedExternally /* null */): MyXHR
-    fun get(url: String, data: String? = definedExternally /* null */, success: (() -> Any)? = definedExternally /* null */, dataType: String? = definedExternally /* null */): MyXHR
     fun get(url: String, data: Any? = definedExternally /* null */, success: (() -> Any)? = definedExternally /* null */, dataType: String? = definedExternally /* null */): MyXHR
+    fun get(url: String, data: String? = definedExternally /* null */, success: (() -> Any)? = definedExternally /* null */, dataType: String? = definedExternally /* null */): MyXHR
     fun get(settings: MyOptions): MyXHR
     @nativeInvoke
     operator fun invoke(selector: String, context: Element? = definedExternally /* null */): MyQuery
@@ -33,29 +33,29 @@ external interface JQueryStatic {
 }
 external open class JJ {
     open fun foo(data: String, context: HTMLElement? = definedExternally /* null */, keepScripts: Boolean? = definedExternally /* null */): Array<Any> = definedExternally
-    open fun hide(duration: String? = definedExternally /* null */, complete: Function<*>? = definedExternally /* null */): MyQuery = definedExternally
     open fun hide(duration: Number? = definedExternally /* null */, complete: Function<*>? = definedExternally /* null */): MyQuery = definedExternally
-    open fun hide(duration: String? = definedExternally /* null */, easing: String? = definedExternally /* null */, complete: Function<*>? = definedExternally /* null */): MyQuery = definedExternally
+    open fun hide(duration: String? = definedExternally /* null */, complete: Function<*>? = definedExternally /* null */): MyQuery = definedExternally
     open fun hide(duration: Number? = definedExternally /* null */, easing: String? = definedExternally /* null */, complete: Function<*>? = definedExternally /* null */): MyQuery = definedExternally
+    open fun hide(duration: String? = definedExternally /* null */, easing: String? = definedExternally /* null */, complete: Function<*>? = definedExternally /* null */): MyQuery = definedExternally
     open fun hide(options: MyOptions): MyQuery = definedExternally
-    open fun trigger(eventType: String, extraParameters: Any? = definedExternally /* null */): MyQuery = definedExternally
     open fun trigger(eventType: String, extraParameters: Array<Any>? = definedExternally /* null */): MyQuery = definedExternally
-    open fun trigger(event: MyEvent, extraParameters: Any? = definedExternally /* null */): MyQuery = definedExternally
+    open fun trigger(eventType: String, extraParameters: Any? = definedExternally /* null */): MyQuery = definedExternally
     open fun trigger(event: MyEvent, extraParameters: Array<Any>? = definedExternally /* null */): MyQuery = definedExternally
+    open fun trigger(event: MyEvent, extraParameters: Any? = definedExternally /* null */): MyQuery = definedExternally
     open fun hide(): MyQuery = definedExternally
     open fun trigger(eventType: String): MyQuery = definedExternally
     open fun trigger(event: MyEvent): MyQuery = definedExternally
 }
 external fun foo(data: String, context: HTMLElement? = definedExternally /* null */, keepScripts: Boolean? = definedExternally /* null */): Array<Any> = definedExternally
-external fun hide(duration: String? = definedExternally /* null */, complete: Function<*>? = definedExternally /* null */): MyQuery = definedExternally
 external fun hide(duration: Number? = definedExternally /* null */, complete: Function<*>? = definedExternally /* null */): MyQuery = definedExternally
-external fun hide(duration: String? = definedExternally /* null */, easing: String? = definedExternally /* null */, complete: Function<*>? = definedExternally /* null */): MyQuery = definedExternally
+external fun hide(duration: String? = definedExternally /* null */, complete: Function<*>? = definedExternally /* null */): MyQuery = definedExternally
 external fun hide(duration: Number? = definedExternally /* null */, easing: String? = definedExternally /* null */, complete: Function<*>? = definedExternally /* null */): MyQuery = definedExternally
+external fun hide(duration: String? = definedExternally /* null */, easing: String? = definedExternally /* null */, complete: Function<*>? = definedExternally /* null */): MyQuery = definedExternally
 external fun hide(options: MyOptions): MyQuery = definedExternally
-external fun trigger(eventType: String, extraParameters: Any? = definedExternally /* null */): MyQuery = definedExternally
 external fun trigger(eventType: String, extraParameters: Array<Any>? = definedExternally /* null */): MyQuery = definedExternally
-external fun trigger(event: MyEvent, extraParameters: Any? = definedExternally /* null */): MyQuery = definedExternally
+external fun trigger(eventType: String, extraParameters: Any? = definedExternally /* null */): MyQuery = definedExternally
 external fun trigger(event: MyEvent, extraParameters: Array<Any>? = definedExternally /* null */): MyQuery = definedExternally
+external fun trigger(event: MyEvent, extraParameters: Any? = definedExternally /* null */): MyQuery = definedExternally
 external fun hide(): MyQuery = definedExternally
 external fun trigger(eventType: String): MyQuery = definedExternally
 external fun trigger(event: MyEvent): MyQuery = definedExternally

testData/objectType/generics.d.kt

@@ -18,8 +18,8 @@ external interface `T$2`<T> {
 }
 external interface `T$3`<T, S> {
     fun bar(a: Any): T
-    fun foo(t: String)
     fun foo(t: `T$2`<T>)
+    fun foo(t: String)
     var baz: Any? get() = definedExternally; set(value) = definedExternally
     var boo: S? get() = definedExternally; set(value) = definedExternally
     var show: (overrideChecks: Boolean) -> Unit

testData/unionType/withNullOrUndefined.d.kt

@@ -3,8 +3,8 @@ package withNullOrUndefined
 external var foo: String? = definedExternally
 external var bar: String? = definedExternally
 external fun bar(a: String?): Foo? = definedExternally
-external fun nullOverload(a: String?): dynamic /* Number? | Foo? */ = definedExternally
-external fun nullOverload(a: Number?): dynamic /* Number? | Foo? */ = definedExternally
+external fun nullOverload(a: String?): dynamic /* Foo? | Number? */ = definedExternally
+external fun nullOverload(a: Number?): dynamic /* Foo? | Number? */ = definedExternally
 external fun baz(a: Foo?, b: Number? = definedExternally /* null */): Any? = definedExternally
 external interface `T$0` {
     @nativeGetter