Fixed incorrect error on intersected number and string types

Perryvw · Perryvw · commit f9bc20a5a525 · 2020-01-02T18:02:59.000+01:00
diff --git a/src/transformation/builtins/index.ts b/src/transformation/builtins/index.ts
@@ -4,7 +4,14 @@ import { assume } from "../../utils";
 import { TransformationContext } from "../context";
 import { importLuaLibFeature, LuaLibFeature } from "../utils/lualib";
 import { getIdentifierSymbolId } from "../utils/symbols";
-import { isArrayType, isFunctionType, isNumberType, isStandardLibraryType, isStringType } from "../utils/typescript";
+import {
+    hasStandardLibrarySignature,
+    isArrayType,
+    isFunctionType,
+    isNumberType,
+    isStandardLibraryType,
+    isStringType,
+} from "../utils/typescript";
 import { PropertyCallExpression } from "../visitors/call";
 import { checkForLuaLibType } from "../visitors/class/new";
 import { transformArrayProperty, transformArrayPrototypeCall } from "./array";
@@ -85,11 +92,11 @@ export function transformBuiltinCallExpression(
         }
     }
 
-    if (isStringType(context, ownerType)) {
+    if (isStringType(context, ownerType) && hasStandardLibrarySignature(context, node)) {
         return transformStringPrototypeCall(context, node);
     }
 
-    if (isNumberType(context, ownerType)) {
+    if (isNumberType(context, ownerType) && hasStandardLibrarySignature(context, node)) {
         return transformNumberPrototypeCall(context, node);
     }
 
diff --git a/src/transformation/utils/typescript/index.ts b/src/transformation/utils/typescript/index.ts
@@ -43,6 +43,15 @@ export function isFirstDeclaration(context: TransformationContext, node: ts.Vari
     return firstDeclaration === node;
 }
 
+function isStandardLibraryDeclaration(context: TransformationContext, declaration: ts.Declaration): boolean {
+    const sourceFile = declaration.getSourceFile();
+    if (!sourceFile) {
+        return false;
+    }
+
+    return context.program.isSourceFileDefaultLibrary(sourceFile);
+}
+
 export function isStandardLibraryType(
     context: TransformationContext,
     type: ts.Type,
@@ -59,12 +68,16 @@ export function isStandardLibraryType(
         return true;
     }
 
-    const sourceFile = declaration.getSourceFile();
-    if (!sourceFile) {
-        return false;
-    }
+    return isStandardLibraryDeclaration(context, declaration);
+}
 
-    return context.program.isSourceFileDefaultLibrary(sourceFile);
+export function hasStandardLibrarySignature(
+    context: TransformationContext,
+    callExpression: ts.CallExpression
+): boolean {
+    const signature = context.checker.getResolvedSignature(callExpression);
+
+    return signature && signature.declaration ? isStandardLibraryDeclaration(context, signature.declaration) : false;
 }
 
 export function inferAssignedType(context: TransformationContext, expression: ts.Expression): ts.Type {
diff --git a/test/unit/builtins/numbers.spec.ts b/test/unit/builtins/numbers.spec.ts
@@ -67,3 +67,10 @@ test.each(cases)("isNaN(%p)", value => {
 test.each(cases)("isFinite(%p)", value => {
     util.testExpressionTemplate`isFinite(${value} as any)`.expectToMatchJsResult();
 });
+
+test("number intersected method", () => {
+    util.testFunction`
+        type Vector = number & { normalize(): Vector };
+        return ({ normalize: () => 3 } as Vector).normalize();
+        `.expectToMatchJsResult();
+});
diff --git a/test/unit/builtins/string.spec.ts b/test/unit/builtins/string.spec.ts
@@ -1,22 +1,7 @@
-import { UnsupportedProperty } from "../../../src/transformation/utils/errors";
 import * as util from "../../util";
 
-test("Unsupported string function", () => {
-    util.testExpression`"test".testThisIsNoMember()`
-        .disableSemanticCheck()
-        .expectToHaveDiagnosticOfError(UnsupportedProperty("string", "testThisIsNoMember", util.nodeStub));
-});
-
 test("Supported lua string function", () => {
-    const tsHeader = `
-        declare global {
-            interface String {
-                upper(): string;
-            }
-        }
-    `;
-
-    util.testExpression`"test".upper()`.setTsHeader(tsHeader).expectToEqual("TEST");
+    util.testExpression`"test".toUpperCase()`.expectToEqual("TEST");
 });
 
 test.each([[], [65], [65, 66], [65, 66, 67]])("String.fromCharCode (%p)", (...args) => {
@@ -287,3 +272,10 @@ describe.each(["trim", "trimEnd", "trimRight", "trimStart", "trimLeft"])("string
         util.testExpression`${util.formatCode(testString)}.${trim}()`.expectToMatchJsResult();
     });
 });
+
+test("string intersected method", () => {
+    util.testFunction`
+        type Vector = string & { abc(): Vector };
+        return ({ abc: () => "a" } as Vector).abc();
+        `.expectToMatchJsResult();
+});
