Move checkForLualibType to identifier

GlassBricks · GlassBricks · commit 8d5283c31e0f · 2022-02-07T19:22:59.000-08:00
diff --git a/src/transformation/builtins/error.ts b/src/transformation/builtins/error.ts
diff --git a/src/transformation/builtins/index.ts b/src/transformation/builtins/index.ts
@@ -14,7 +14,6 @@ import {
     isStringType,
 } from "../utils/typescript";
 import { PropertyCallExpression } from "../visitors/call";
-import { checkForLuaLibType } from "../visitors/class/new";
 import { transformArrayConstructorCall, transformArrayProperty, transformArrayPrototypeCall } from "./array";
 import { transformConsoleCall } from "./console";
 import { transformFunctionPrototypeCall, transformFunctionProperty } from "./function";
@@ -67,7 +66,6 @@ export function transformBuiltinCallExpression(
     const expressionType = context.checker.getTypeAtLocation(node.expression);
     if (ts.isIdentifier(node.expression) && isStandardLibraryType(context, expressionType, undefined)) {
         // TODO:
-        checkForLuaLibType(context, expressionType);
         const result = transformGlobalCall(context, node);
         if (result) {
             if (isOptionalCall) return unsupportedOptionalCall();
@@ -159,3 +157,46 @@ export function transformBuiltinIdentifierExpression(
             return lua.createIdentifier("_G", node, getIdentifierSymbolId(context, node), "globalThis");
     }
 }
+
+const builtinErrorTypeNames = new Set([
+    "Error",
+    "ErrorConstructor",
+    "RangeError",
+    "RangeErrorConstructor",
+    "ReferenceError",
+    "ReferenceErrorConstructor",
+    "SyntaxError",
+    "SyntaxErrorConstructor",
+    "TypeError",
+    "TypeErrorConstructor",
+    "URIError",
+    "URIErrorConstructor",
+]);
+
+export function checkForLuaLibType(context: TransformationContext, type: ts.Type): void {
+    if (!type.symbol) return;
+
+    const name = context.checker.getFullyQualifiedName(type.symbol);
+    switch (name) {
+        case "Map":
+        case "MapConstructor":
+            importLuaLibFeature(context, LuaLibFeature.Map);
+            return;
+        case "Set":
+        case "SetConstructor":
+            importLuaLibFeature(context, LuaLibFeature.Set);
+            return;
+        case "WeakMap":
+        case "WeakMapConstructor":
+            importLuaLibFeature(context, LuaLibFeature.WeakMap);
+            return;
+        case "WeakSet":
+        case "WeakSetConstructor":
+            importLuaLibFeature(context, LuaLibFeature.WeakSet);
+            return;
+    }
+
+    if (builtinErrorTypeNames.has(name)) {
+        importLuaLibFeature(context, LuaLibFeature.Error);
+    }
+}
diff --git a/src/transformation/visitors/class/index.ts b/src/transformation/visitors/class/index.ts
@@ -23,9 +23,8 @@ import {
     transformStaticPropertyDeclaration,
 } from "./members/fields";
 import { createMethodDecoratingExpression, transformMethodDeclaration } from "./members/method";
-import { checkForLuaLibType } from "./new";
-import { createClassSetup } from "./setup";
 import { getExtendedNode, getExtendedType, isStaticNode } from "./utils";
+import { createClassSetup } from "./setup";
 
 export const transformClassDeclaration: FunctionVisitor<ts.ClassLikeDeclaration> = (declaration, context) => {
     // If declaration is a default export, transform to export variable assignment instead
@@ -86,10 +85,6 @@ function transformClassLikeDeclaration(
     const superInfo = getOrUpdate(classSuperInfos, context, () => []);
     superInfo.push({ className, extendedTypeNode });
 
-    if (extendedType) {
-        checkForLuaLibType(context, extendedType);
-    }
-
     // Get all properties with value
     const properties = classDeclaration.members.filter(ts.isPropertyDeclaration).filter(member => member.initializer);
 
diff --git a/src/transformation/visitors/class/new.ts b/src/transformation/visitors/class/new.ts
@@ -1,52 +1,12 @@
 import * as ts from "typescript";
 import * as lua from "../../../LuaAST";
-import { FunctionVisitor, TransformationContext } from "../../context";
+import { FunctionVisitor } from "../../context";
 import { AnnotationKind, getTypeAnnotations } from "../../utils/annotations";
 import { annotationInvalidArgumentCount, annotationRemoved } from "../../utils/diagnostics";
-import { importLuaLibFeature, LuaLibFeature, transformLuaLibFunction } from "../../utils/lualib";
+import { LuaLibFeature, transformLuaLibFunction } from "../../utils/lualib";
 import { transformArguments, transformCallAndArguments } from "../call";
 import { isTableNewCall } from "../language-extensions/table";
 
-const builtinErrorTypeNames = new Set([
-    "Error",
-    "ErrorConstructor",
-    "RangeError",
-    "RangeErrorConstructor",
-    "ReferenceError",
-    "ReferenceErrorConstructor",
-    "SyntaxError",
-    "SyntaxErrorConstructor",
-    "TypeError",
-    "TypeErrorConstructor",
-    "URIError",
-    "URIErrorConstructor",
-]);
-
-// TODO: Do it in identifier?
-export function checkForLuaLibType(context: TransformationContext, type: ts.Type): void {
-    if (!type.symbol) return;
-
-    const name = context.checker.getFullyQualifiedName(type.symbol);
-    switch (name) {
-        case "Map":
-            importLuaLibFeature(context, LuaLibFeature.Map);
-            return;
-        case "Set":
-            importLuaLibFeature(context, LuaLibFeature.Set);
-            return;
-        case "WeakMap":
-            importLuaLibFeature(context, LuaLibFeature.WeakMap);
-            return;
-        case "WeakSet":
-            importLuaLibFeature(context, LuaLibFeature.WeakSet);
-            return;
-    }
-
-    if (builtinErrorTypeNames.has(name)) {
-        importLuaLibFeature(context, LuaLibFeature.Error);
-    }
-}
-
 export const transformNewExpression: FunctionVisitor<ts.NewExpression> = (node, context) => {
     const type = context.checker.getTypeAtLocation(node);
 
@@ -68,8 +28,6 @@ export const transformNewExpression: FunctionVisitor<ts.NewExpression> = (node,
         signature
     );
 
-    checkForLuaLibType(context, type);
-
     const customConstructorAnnotation = annotations.get(AnnotationKind.CustomConstructor);
     if (customConstructorAnnotation) {
         if (customConstructorAnnotation.args.length === 1) {
diff --git a/src/transformation/visitors/identifier.ts b/src/transformation/visitors/identifier.ts
@@ -1,6 +1,6 @@
 import * as ts from "typescript";
 import * as lua from "../../LuaAST";
-import { transformBuiltinIdentifierExpression } from "../builtins";
+import { transformBuiltinIdentifierExpression, checkForLuaLibType } from "../builtins";
 import { isPromiseClass } from "../builtins/promise";
 import { FunctionVisitor, tempSymbolId, TransformationContext } from "../context";
 import { AnnotationKind, isForRangeType } from "../utils/annotations";
@@ -22,7 +22,7 @@ import { isRangeFunctionNode } from "./language-extensions/range";
 import { isTableExtensionIdentifier } from "./language-extensions/table";
 import { isVarargConstantNode } from "./language-extensions/vararg";
 import { isOptionalContinuation } from "./optional-chaining";
-import { isErrorClass } from "../builtins/error";
+import { isStandardLibraryType } from "../utils/typescript";
 
 export function transformIdentifier(context: TransformationContext, identifier: ts.Identifier): lua.Identifier {
     if (isOptionalContinuation(identifier)) {
@@ -60,9 +60,9 @@ export function transformIdentifier(context: TransformationContext, identifier:
         importLuaLibFeature(context, LuaLibFeature.Promise);
         return lua.createIdentifier("__TS__Promise", identifier);
     }
-
-    if (isErrorClass(context, identifier)) {
-        importLuaLibFeature(context, LuaLibFeature.Error);
+    const type = context.checker.getTypeAtLocation(identifier);
+    if (isStandardLibraryType(context, type, undefined)) {
+        checkForLuaLibType(context, type);
     }
 
     const text = hasUnsafeIdentifierName(context, identifier) ? createSafeName(identifier.text) : identifier.text;
diff --git a/test/unit/builtins/set.spec.ts b/test/unit/builtins/set.spec.ts
@@ -194,3 +194,10 @@ describe.each(iterationMethods)("set.%s() preserves insertion order", iterationM
         `.expectToMatchJsResult();
     });
 });
+
+test("instanceof Set without creating set", () => {
+    util.testFunction`
+        const myset = 3 as any;
+        return myset instanceof Set;
+    `.expectToMatchJsResult();
+});
