fix getConstructorTypeOfClassLikeDeclaration

Author: ajafff

CHANGELOG.md

@@ -1,3 +1,13 @@
+# 3.19.0
+
+**Features:**
+
+* `getSymbolOfClassLikeDeclaration` to retrieve the symbol of class declarations and expressions regardless whether they have a name or not
+
+**Bugfixes:**
+
+* `getConstructorTypeOfClassLikeDeclaration` now really returns the constructor type (the static side of the class), previously it returned the instance type
+
 # 3.18.0
 
 **Features:**

util/type.ts

@@ -285,16 +285,20 @@ export function getPropertyNameFromType(type: ts.Type): PropertyName | undefined
         };
 }
 
+export function getSymbolOfClassLikeDeclaration(node: ts.ClassLikeDeclaration, checker: ts.TypeChecker) {
+    return node.name !== undefined ? checker.getSymbolAtLocation(node.name)! : checker.getTypeAtLocation(node).symbol!;
+}
+
 export function getConstructorTypeOfClassLikeDeclaration(node: ts.ClassLikeDeclaration, checker: ts.TypeChecker) {
-    return checker.getDeclaredTypeOfSymbol(
-        node.name !== undefined ? checker.getSymbolAtLocation(node.name)! : checker.getTypeAtLocation(node).symbol!,
-    );
+    return node.kind === ts.SyntaxKind.ClassExpression
+        ? checker.getTypeAtLocation(node)
+        : checker.getTypeOfSymbolAtLocation(getSymbolOfClassLikeDeclaration(node, checker), node);
 }
 
 export function getInstanceTypeOfClassLikeDeclaration(node: ts.ClassLikeDeclaration, checker: ts.TypeChecker) {
     return node.kind === ts.SyntaxKind.ClassDeclaration
         ? checker.getTypeAtLocation(node)
-        : checker.getTypeOfSymbolAtLocation(checker.getTypeAtLocation(node).getProperty('prototype')!, node);
+        : checker.getDeclaredTypeOfSymbol(getSymbolOfClassLikeDeclaration(node, checker));
 }
 
 export function getIteratorYieldResultFromIteratorResult(type: ts.Type, node: ts.Node, checker: ts.TypeChecker): ts.Type {