Merge branch 'master' into diagnostics

ark120202 · ark120202 · commit 75de99d1335b · 2020-03-12T17:31:54.000Z
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -37,7 +37,4 @@ jobs:
         env:
           CI: true
       - if: matrix.os == 'ubuntu-latest'
-        continue-on-error: true
-        uses: codecov/codecov-action@v1.0.0
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
+        uses: codecov/codecov-action@v1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- TypeScript has been updated to 3.8. See [release notes](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-3-8.html) for details.
+
 - Errors reported during transpilation now are created as TypeScript diagnostics, instead of being thrown as JavaScript errors. This makes TypeScriptToLua always try to generate valid code (even in presence of errors) and allows multiple errors to be reported in a single file:
 
   <!-- prettier-ignore -->
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -39,24 +39,24 @@
         "node": ">=12.13.0"
     },
     "dependencies": {
-        "resolve": "^1.13.1",
+        "resolve": "^1.15.1",
         "source-map": "^0.7.3",
-        "typescript": "^3.7.3"
+        "typescript": "^3.8.3"
     },
     "devDependencies": {
-        "@types/fs-extra": "^8.0.1",
+        "@types/fs-extra": "^8.1.0",
         "@types/glob": "^7.1.1",
-        "@types/jest": "^24.0.23",
-        "@types/node": "^12.12.14",
-        "@types/resolve": "0.0.8",
+        "@types/jest": "^25.1.3",
+        "@types/node": "^13.7.7",
+        "@types/resolve": "1.14.0",
         "fengari": "^0.1.4",
         "fs-extra": "^8.1.0",
         "javascript-stringify": "^2.0.1",
-        "jest": "^24.9.0",
-        "jest-circus": "^24.9.0",
+        "jest": "^25.1.0",
+        "jest-circus": "^25.1.0",
         "prettier": "^1.19.1",
-        "ts-jest": "^24.2.0",
-        "ts-node": "^8.5.4",
-        "tslint": "^5.20.1"
+        "ts-jest": "^25.2.1",
+        "ts-node": "^8.6.2",
+        "tslint": "^6.0.0"
     }
 }
diff --git a/src/CompilerOptions.ts b/src/CompilerOptions.ts
@@ -26,7 +26,7 @@ export type CompilerOptions = OmitIndexSignature<ts.CompilerOptions> & {
     luaLibImport?: LuaLibImportKind;
     sourceMapTraceback?: boolean;
     plugins?: Array<ts.PluginImport | TransformerImport>;
-    [option: string]: ts.CompilerOptions[string] | Array<ts.PluginImport | TransformerImport>;
+    [option: string]: any;
 };
 
 export enum LuaLibImportKind {
diff --git a/src/lualib/SourceMapTraceBack.ts b/src/lualib/SourceMapTraceBack.ts
@@ -7,7 +7,12 @@ function __TS__SourceMapTraceBack(this: void, fileName: string, sourceMap: { [li
     if (globalThis.__TS__originalTraceback === undefined) {
         globalThis.__TS__originalTraceback = debug.traceback;
         debug.traceback = (thread, message, level) => {
-            const trace = globalThis.__TS__originalTraceback(thread, message, level);
+            let trace: string;
+            if (thread === undefined && message === undefined && level === undefined) {
+                trace = globalThis.__TS__originalTraceback();
+            } else {
+                trace = globalThis.__TS__originalTraceback(thread, message, level);
+            }
 
             if (typeof trace !== "string") {
                 return trace;
diff --git a/src/transformation/visitors/binary-expression/destructuring-assignments.ts b/src/transformation/visitors/binary-expression/destructuring-assignments.ts
@@ -261,7 +261,8 @@ function transformSpreadAssignment(
     for (const property of properties) {
         if (
             (ts.isShorthandPropertyAssignment(property) || ts.isPropertyAssignment(property)) &&
-            !ts.isComputedPropertyName(property.name)
+            !ts.isComputedPropertyName(property.name) &&
+            !ts.isPrivateIdentifier(property.name)
         ) {
             const name = ts.isIdentifier(property.name)
                 ? lua.createStringLiteral(property.name.text)
diff --git a/src/transformation/visitors/call.ts b/src/transformation/visitors/call.ts
@@ -46,7 +46,7 @@ export function transformContextualCallExpression(
     transformedArguments: lua.Expression[]
 ): lua.Expression {
     const left = ts.isCallExpression(node) ? node.expression : node.tag;
-    if (ts.isPropertyAccessExpression(left) && isValidLuaIdentifier(left.name.text)) {
+    if (ts.isPropertyAccessExpression(left) && ts.isIdentifier(left.name) && isValidLuaIdentifier(left.name.text)) {
         // table:name()
         const table = context.transformExpression(left.expression);
 
diff --git a/src/transformation/visitors/function.ts b/src/transformation/visitors/function.ts
@@ -12,7 +12,6 @@ import {
     wrapInTable,
 } from "../utils/lua-ast";
 import { peekScope, performHoisting, popScope, pushScope, Scope, ScopeType } from "../utils/scope";
-import { getSymbolIdOfSymbol } from "../utils/symbols";
 import { transformGeneratorFunctionBody } from "./generator";
 import { transformIdentifier } from "./identifier";
 import { transformBindingPattern } from "./variable-declaration";
@@ -215,9 +214,13 @@ export function transformFunctionLikeDeclaration(
     if (ts.isFunctionExpression(node) && node.name && scope.referencedSymbols) {
         const symbol = context.checker.getSymbolAtLocation(node.name);
         if (symbol) {
-            const symbolId = getSymbolIdOfSymbol(context, symbol);
+            // TODO: Not using symbol ids because of https://github.com/microsoft/TypeScript/issues/37131
+            const isReferenced = [...scope.referencedSymbols].some(([, nodes]) =>
+                nodes.some(n => context.checker.getSymbolAtLocation(n)?.valueDeclaration === symbol.valueDeclaration)
+            );
+
             // Only wrap if the name is actually referenced inside the function
-            if (symbolId !== undefined && scope.referencedSymbols.has(symbolId)) {
+            if (isReferenced) {
                 const nameIdentifier = transformIdentifier(context, node.name);
                 return createImmediatelyInvokedFunctionExpression(
                     [lua.createVariableDeclarationStatement(nameIdentifier, functionExpression)],
diff --git a/src/transformation/visitors/literal.ts b/src/transformation/visitors/literal.ts
@@ -16,6 +16,8 @@ export function transformPropertyName(context: TransformationContext, node: ts.P
         return context.transformExpression(node.expression);
     } else if (ts.isIdentifier(node)) {
         return lua.createStringLiteral(node.text);
+    } else if (ts.isPrivateIdentifier(node)) {
+        throw new Error("PrivateIdentifier is not supported");
     } else {
         return context.transformExpression(node);
     }
diff --git a/src/transformation/visitors/modules/export.ts b/src/transformation/visitors/modules/export.ts
@@ -134,6 +134,11 @@ export const transformExportDeclaration: FunctionVisitor<ts.ExportDeclaration> =
         return undefined;
     }
 
+    if (ts.isNamespaceExport(node.exportClause)) {
+        // export * as ns from "...";
+        throw new Error("NamespaceExport is not supported");
+    }
+
     const exportSpecifiers = getExported(context, node.exportClause);
 
     // export { ... };
diff --git a/test/legacy-utils.ts b/test/legacy-utils.ts
@@ -23,7 +23,7 @@ export function transpileStringsAsProject(
     input: Record<string, string>,
     options: tstl.CompilerOptions = {}
 ): tstl.TranspileResult {
-    const optionsWithDefaults = {
+    const optionsWithDefaults: tstl.CompilerOptions = {
         luaTarget: tstl.LuaTarget.Lua53,
         noHeader: true,
         skipLibCheck: true,
diff --git a/test/unit/builtins/string.spec.ts b/test/unit/builtins/string.spec.ts
@@ -63,7 +63,7 @@ test.each([
     ["hello", "test", "bye"],
     ["hello", 42],
     [42, "hello"],
-])("string.concat[+] (%p)", (...elements) => {
+])("string.concat[+] (%p)", (...elements: any[]) => {
     util.testExpression(elements.map(e => util.formatCode(e)).join(" + ")).expectToMatchJsResult();
 });
 

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@ export function transformPropertyName(context: TransformationContext, node: ts.P`
`16`	`16`	`return context.transformExpression(node.expression);`
`17`	`17`	`} else if (ts.isIdentifier(node)) {`
`18`	`18`	`return lua.createStringLiteral(node.text);`
	`19`	`+ } else if (ts.isPrivateIdentifier(node)) {`
	`20`	`+ throw new Error("PrivateIdentifier is not supported");`
`19`	`21`	`} else {`
`20`	`22`	`return context.transformExpression(node);`
`21`	`23`	`}`