fix type compare

Author: Kingwl

src/compiler/checker.ts

@@ -13548,7 +13548,11 @@ namespace ts {
                 const targetType = !isTypeAny(prototypePropertyType) ? prototypePropertyType : undefined;
                 if (!targetType || isTypeAny(type) && (targetType === globalObjectType || targetType === globalFunctionType)) return type;
 
-                return getNarrowedType(type, targetType, assumeTrue, areTypesComparable);
+                return getNarrowedType(type, targetType, assumeTrue, isConstructedBy);
+
+                function isConstructedBy(source: Type, target: Type) {
+                    return source.flags & TypeFlags.Primitive ? areTypesComparable(source, target) : isTypeDerivedFrom(source, target);
+                }
             }
 
             function narrowTypeByTypeof(type: Type, typeOfExpr: TypeOfExpression, operator: SyntaxKind, literal: LiteralExpression, assumeTrue: boolean): Type {

tests/baselines/reference/typeGuardConstructor.errors.txt

@@ -102,4 +102,16 @@ tests/cases/conformance/expressions/typeGuards/typeGuardConstructor.ts(63,11): e
     if(x.constructor === Array) {
         const c = x[0];
     }
-    
+    
+    
+    class Bar {
+        a: string
+    }
+    
+    class Baz {
+        a: string
+    }
+    var bar: Bar | Baz;
+    if (bar.constructor === Baz) {
+        const baz = bar
+    }

tests/baselines/reference/typeGuardConstructor.js

@@ -80,7 +80,19 @@ if (x.constructor === Boolean) {
 if(x.constructor === Array) {
     const c = x[0];
 }
-
+
+
+class Bar {
+    a: string
+}
+
+class Baz {
+    a: string
+}
+var bar: Bar | Baz;
+if (bar.constructor === Baz) {
+    const baz = bar
+}
 
 //// [typeGuardConstructor.js]
 var __extends = (this && this.__extends) || (function () {
@@ -179,3 +191,17 @@ if (x.constructor === Boolean) {
 if (x.constructor === Array) {
     var c = x[0];
 }
+var Bar = /** @class */ (function () {
+    function Bar() {
+    }
+    return Bar;
+}());
+var Baz = /** @class */ (function () {
+    function Baz() {
+    }
+    return Baz;
+}());
+var bar;
+if (bar.constructor === Baz) {
+    var baz = bar;
+}

tests/baselines/reference/typeGuardConstructor.symbols

@@ -228,3 +228,32 @@ if(x.constructor === Array) {
 >x : Symbol(x, Decl(typeGuardConstructor.ts, 65, 3))
 }
 
+
+class Bar {
+>Bar : Symbol(Bar, Decl(typeGuardConstructor.ts, 80, 1))
+
+    a: string
+>a : Symbol(Bar.a, Decl(typeGuardConstructor.ts, 83, 11))
+}
+
+class Baz {
+>Baz : Symbol(Baz, Decl(typeGuardConstructor.ts, 85, 1))
+
+    a: string
+>a : Symbol(Baz.a, Decl(typeGuardConstructor.ts, 87, 11))
+}
+var bar: Bar | Baz;
+>bar : Symbol(bar, Decl(typeGuardConstructor.ts, 90, 3))
+>Bar : Symbol(Bar, Decl(typeGuardConstructor.ts, 80, 1))
+>Baz : Symbol(Baz, Decl(typeGuardConstructor.ts, 85, 1))
+
+if (bar.constructor === Baz) {
+>bar.constructor : Symbol(Object.constructor, Decl(lib.d.ts, --, --))
+>bar : Symbol(bar, Decl(typeGuardConstructor.ts, 90, 3))
+>constructor : Symbol(Object.constructor, Decl(lib.d.ts, --, --))
+>Baz : Symbol(Baz, Decl(typeGuardConstructor.ts, 85, 1))
+
+    const baz = bar
+>baz : Symbol(baz, Decl(typeGuardConstructor.ts, 92, 9))
+>bar : Symbol(bar, Decl(typeGuardConstructor.ts, 90, 3))
+}

tests/baselines/reference/typeGuardConstructor.types

@@ -256,3 +256,33 @@ if(x.constructor === Array) {
 >0 : 0
 }
 
+
+class Bar {
+>Bar : Bar
+
+    a: string
+>a : string
+}
+
+class Baz {
+>Baz : Baz
+
+    a: string
+>a : string
+}
+var bar: Bar | Baz;
+>bar : Bar | Baz
+>Bar : Bar
+>Baz : Baz
+
+if (bar.constructor === Baz) {
+>bar.constructor === Baz : boolean
+>bar.constructor : Function
+>bar : Bar | Baz
+>constructor : Function
+>Baz : typeof Baz
+
+    const baz = bar
+>baz : Baz
+>bar : Baz
+}

tests/cases/conformance/expressions/typeGuards/typeGuardConstructor.ts

@@ -79,3 +79,16 @@ if (x.constructor === Boolean) {
 if(x.constructor === Array) {
     const c = x[0];
 }
+
+
+class Bar {
+    a: string
+}
+
+class Baz {
+    a: string
+}
+var bar: Bar | Baz;
+if (bar.constructor === Baz) {
+    const baz = bar
+}