typescript-to-lua 1.0.0 → 1.2.0

package/CHANGELOG.md

@@ -1,5 +1,39 @@
 # Changelog
 
+## 1.2.0
+
+- Upgraded to TypeScript 4.5.x.
+- Improved general output formatting.
+- Added support for more complicated (nested) destructuring patterns, also fixing an exception they caused before.
+- Fixed incorrect interactions between standard library functionality and optional chaining, e.g. `myArray?.forEach()`.
+- Fixed rejected promises sometimes not getting the correct rejection reason.
+- Fixed some `delete` behavior that was different in Lua compared to JS.
+- Fixed a bug causing exported classes to lose their decorators.
+- Fixed plugins checking for ts-node from the wrong location (tsconfig directory), plugins will now check for ts-node relative to the tstl directory.
+
+Under the hood:
+
+- We can now transform using preceding statements, allowing all kinds of optimizations and improvements to output Lua.
+- Updated various language constructs to use preceding statements instead of inline immediately-invoked functions.
+
+## 1.1.0
+
+- **[Breaking]** We now use TypeScript's JSX transformer instead of maintaining our own. As a result, `React.createElement` now requires a self parameter, so remove `@noSelf`, `this: void` if necessary.
+- **[Breaking(-ish)]** Due to limitations in 5.1, try/catch can no longer be used in async or generator functions when targetting Lua 5.1. This was already broken but now tstl will explicitly give an error if you try.
+- Added support for the `switch` statement in all versions! (Before they were not supported in 5.1 and universal).
+- Added support for `string.prototype.replaceAll` and improved `string.prototype.replace` implementation.
+- Added `noResolvePaths` tsconfig option to disable module resolution for environment-provided modules.
+- Implemented support for void expressions, i.e `void(0)` or `void(ignoreThisReturnValue())`.
+- Upgraded TypeScript to 4.4.4 and made it a peer dependency to hopefully avoid plugin issues due to mismatching TypeScript versions.
+- The `$vararg` language extension can be used to access CLI arguments, now also in bundles.
+- Fixed a bug regarding `baseUrl` and relative imports.
+- Fixed `sourceMapTraceback: true` not working correctly for bundles.
+- Fixed an issue regarding hoisting in switch case clauses.
+- Added missing function context validation cases for object literals.
+- Fixed a problem where awaiting rejected promises in try/catch would give the wrong result.
+- Fixed an issue where chained `.then` calls on already-resolved or already-rejected promises would cause some callbacks to not fire while they should.
+- Fixed source file paths in source maps being absolute, they are now relative again.
+
 ## 1.0.0
 
 - **[Breaking]** `/* @tupleReturn */` has been removed and will no longer have any effect. You will get an error if you try ot use it or if you use declarations that use it.

package/dist/CompilerOptions.d.ts

@@ -17,15 +17,16 @@ export interface LuaPluginImport {
 }
 export declare type CompilerOptions = OmitIndexSignature<ts.CompilerOptions> & {
     buildMode?: BuildMode;
-    noImplicitSelf?: boolean;
-    noHeader?: boolean;
     luaBundle?: string;
     luaBundleEntry?: string;
     luaTarget?: LuaTarget;
     luaLibImport?: LuaLibImportKind;
-    sourceMapTraceback?: boolean;
     luaPlugins?: LuaPluginImport[];
+    noImplicitSelf?: boolean;
+    noHeader?: boolean;
+    noResolvePaths?: string[];
     plugins?: Array<ts.PluginImport | TransformerImport>;
+    sourceMapTraceback?: boolean;
     tstlVerbose?: boolean;
     [option: string]: any;
 };

package/dist/LuaAST.d.ts

@@ -216,6 +216,7 @@ export interface StringLiteral extends Expression {
 }
 export declare function isStringLiteral(node: Node): node is StringLiteral;
 export declare function createStringLiteral(value: string, tsOriginal?: ts.Node): StringLiteral;
+export declare function isLiteral(node: Node): node is NilLiteral | DotsLiteral | BooleanLiteral | NumericLiteral | StringLiteral;
 export declare enum FunctionExpressionFlags {
     None = 1,
     Inline = 2,

package/dist/LuaAST.js

@@ -2,8 +2,8 @@
 // Simplified Lua AST based roughly on http://lua-users.org/wiki/MetaLuaAbstractSyntaxTree,
 // https://www.lua.org/manual/5.3/manual.html#9 and the TS AST implementation
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createFunctionExpression = exports.isFunctionExpression = exports.FunctionExpressionFlags = exports.createStringLiteral = exports.isStringLiteral = exports.createNumericLiteral = exports.isNumericLiteral = exports.createDotsLiteral = exports.isDotsLiteral = exports.createBooleanLiteral = exports.isBooleanLiteral = exports.createNilLiteral = exports.isNilLiteral = exports.createExpressionStatement = exports.isExpressionStatement = exports.createBreakStatement = exports.isBreakStatement = exports.createReturnStatement = exports.isReturnStatement = exports.createLabelStatement = exports.isLabelStatement = exports.createGotoStatement = exports.isGotoStatement = exports.createForInStatement = exports.isForInStatement = exports.createForStatement = exports.isForStatement = exports.createRepeatStatement = exports.isRepeatStatement = exports.createWhileStatement = exports.isWhileStatement = exports.isIterationStatement = exports.createIfStatement = exports.isIfStatement = exports.createAssignmentStatement = exports.isAssignmentStatement = exports.createVariableDeclarationStatement = exports.isVariableDeclarationStatement = exports.createDoStatement = exports.isDoStatement = exports.createBlock = exports.isBlock = exports.createFile = exports.isFile = exports.getOriginalPos = exports.setNodeOriginal = exports.setNodePosition = exports.cloneNode = exports.createNode = exports.SyntaxKind = void 0;
-exports.isInlineFunctionExpression = exports.isFunctionDefinition = exports.isAssignmentLeftHandSideExpression = exports.createTableIndexExpression = exports.isTableIndexExpression = exports.createAnonymousIdentifier = exports.cloneIdentifier = exports.createIdentifier = exports.isIdentifier = exports.createMethodCallExpression = exports.isMethodCallExpression = exports.createCallExpression = exports.isCallExpression = exports.createBinaryExpression = exports.isBinaryExpression = exports.createUnaryExpression = exports.isUnaryExpression = exports.createTableExpression = exports.isTableExpression = exports.createTableFieldExpression = exports.isTableFieldExpression = void 0;
+exports.isFunctionExpression = exports.FunctionExpressionFlags = exports.isLiteral = exports.createStringLiteral = exports.isStringLiteral = exports.createNumericLiteral = exports.isNumericLiteral = exports.createDotsLiteral = exports.isDotsLiteral = exports.createBooleanLiteral = exports.isBooleanLiteral = exports.createNilLiteral = exports.isNilLiteral = exports.createExpressionStatement = exports.isExpressionStatement = exports.createBreakStatement = exports.isBreakStatement = exports.createReturnStatement = exports.isReturnStatement = exports.createLabelStatement = exports.isLabelStatement = exports.createGotoStatement = exports.isGotoStatement = exports.createForInStatement = exports.isForInStatement = exports.createForStatement = exports.isForStatement = exports.createRepeatStatement = exports.isRepeatStatement = exports.createWhileStatement = exports.isWhileStatement = exports.isIterationStatement = exports.createIfStatement = exports.isIfStatement = exports.createAssignmentStatement = exports.isAssignmentStatement = exports.createVariableDeclarationStatement = exports.isVariableDeclarationStatement = exports.createDoStatement = exports.isDoStatement = exports.createBlock = exports.isBlock = exports.createFile = exports.isFile = exports.getOriginalPos = exports.setNodeOriginal = exports.setNodePosition = exports.cloneNode = exports.createNode = exports.SyntaxKind = void 0;
+exports.isInlineFunctionExpression = exports.isFunctionDefinition = exports.isAssignmentLeftHandSideExpression = exports.createTableIndexExpression = exports.isTableIndexExpression = exports.createAnonymousIdentifier = exports.cloneIdentifier = exports.createIdentifier = exports.isIdentifier = exports.createMethodCallExpression = exports.isMethodCallExpression = exports.createCallExpression = exports.isCallExpression = exports.createBinaryExpression = exports.isBinaryExpression = exports.createUnaryExpression = exports.isUnaryExpression = exports.createTableExpression = exports.isTableExpression = exports.createTableFieldExpression = exports.isTableFieldExpression = exports.createFunctionExpression = void 0;
 // We can elide a lot of nodes especially tokens and keywords
 // because we don't create the AST from text
 const ts = require("typescript");
@@ -162,9 +162,9 @@ function isVariableDeclarationStatement(node) {
 exports.isVariableDeclarationStatement = isVariableDeclarationStatement;
 function createVariableDeclarationStatement(left, right, tsOriginal) {
     const statement = createNode(SyntaxKind.VariableDeclarationStatement, tsOriginal);
-    statement.left = utils_1.castArray(left);
+    statement.left = (0, utils_1.castArray)(left);
     if (right)
-        statement.right = utils_1.castArray(right);
+        statement.right = (0, utils_1.castArray)(right);
     return statement;
 }
 exports.createVariableDeclarationStatement = createVariableDeclarationStatement;
@@ -174,8 +174,8 @@ function isAssignmentStatement(node) {
 exports.isAssignmentStatement = isAssignmentStatement;
 function createAssignmentStatement(left, right, tsOriginal) {
     const statement = createNode(SyntaxKind.AssignmentStatement, tsOriginal);
-    statement.left = utils_1.castArray(left);
-    statement.right = right ? utils_1.castArray(right) : [];
+    statement.left = (0, utils_1.castArray)(left);
+    statement.right = right ? (0, utils_1.castArray)(right) : [];
     return statement;
 }
 exports.createAssignmentStatement = createAssignmentStatement;
@@ -338,6 +338,14 @@ function createStringLiteral(value, tsOriginal) {
     return expression;
 }
 exports.createStringLiteral = createStringLiteral;
+function isLiteral(node) {
+    return (isNilLiteral(node) ||
+        isDotsLiteral(node) ||
+        isBooleanLiteral(node) ||
+        isNumericLiteral(node) ||
+        isStringLiteral(node));
+}
+exports.isLiteral = isLiteral;
 var FunctionExpressionFlags;
 (function (FunctionExpressionFlags) {
     FunctionExpressionFlags[FunctionExpressionFlags["None"] = 1] = "None";

package/dist/LuaLib.d.ts

@@ -56,9 +56,6 @@ export declare enum LuaLibFeature {
     ObjectKeys = "ObjectKeys",
     ObjectRest = "ObjectRest",
     ObjectValues = "ObjectValues",
-    OptionalChainAccess = "OptionalChainAccess",
-    OptionalFunctionCall = "OptionalFunctionCall",
-    OptionalMethodCall = "OptionalMethodCall",
     ParseFloat = "ParseFloat",
     ParseInt = "ParseInt",
     Promise = "Promise",
@@ -68,6 +65,9 @@ export declare enum LuaLibFeature {
     PromiseRace = "PromiseRace",
     Set = "Set",
     SetDescriptor = "SetDescriptor",
+    SparseArrayNew = "SparseArrayNew",
+    SparseArrayPush = "SparseArrayPush",
+    SparseArraySpread = "SparseArraySpread",
     WeakMap = "WeakMap",
     WeakSet = "WeakSet",
     SourceMapTraceBack = "SourceMapTraceBack",
@@ -81,6 +81,7 @@ export declare enum LuaLibFeature {
     StringPadEnd = "StringPadEnd",
     StringPadStart = "StringPadStart",
     StringReplace = "StringReplace",
+    StringReplaceAll = "StringReplaceAll",
     StringSlice = "StringSlice",
     StringSplit = "StringSplit",
     StringStartsWith = "StringStartsWith",

package/dist/LuaLib.js

@@ -60,9 +60,6 @@ var LuaLibFeature;
     LuaLibFeature["ObjectKeys"] = "ObjectKeys";
     LuaLibFeature["ObjectRest"] = "ObjectRest";
     LuaLibFeature["ObjectValues"] = "ObjectValues";
-    LuaLibFeature["OptionalChainAccess"] = "OptionalChainAccess";
-    LuaLibFeature["OptionalFunctionCall"] = "OptionalFunctionCall";
-    LuaLibFeature["OptionalMethodCall"] = "OptionalMethodCall";
     LuaLibFeature["ParseFloat"] = "ParseFloat";
     LuaLibFeature["ParseInt"] = "ParseInt";
     LuaLibFeature["Promise"] = "Promise";
@@ -72,6 +69,9 @@ var LuaLibFeature;
     LuaLibFeature["PromiseRace"] = "PromiseRace";
     LuaLibFeature["Set"] = "Set";
     LuaLibFeature["SetDescriptor"] = "SetDescriptor";
+    LuaLibFeature["SparseArrayNew"] = "SparseArrayNew";
+    LuaLibFeature["SparseArrayPush"] = "SparseArrayPush";
+    LuaLibFeature["SparseArraySpread"] = "SparseArraySpread";
     LuaLibFeature["WeakMap"] = "WeakMap";
     LuaLibFeature["WeakSet"] = "WeakSet";
     LuaLibFeature["SourceMapTraceBack"] = "SourceMapTraceBack";
@@ -85,6 +85,7 @@ var LuaLibFeature;
     LuaLibFeature["StringPadEnd"] = "StringPadEnd";
     LuaLibFeature["StringPadStart"] = "StringPadStart";
     LuaLibFeature["StringReplace"] = "StringReplace";
+    LuaLibFeature["StringReplaceAll"] = "StringReplaceAll";
     LuaLibFeature["StringSlice"] = "StringSlice";
     LuaLibFeature["StringSplit"] = "StringSplit";
     LuaLibFeature["StringStartsWith"] = "StringStartsWith";
@@ -106,7 +107,7 @@ const luaLibDependencies = {
     Await: [LuaLibFeature.InstanceOf, LuaLibFeature.New],
     Decorate: [LuaLibFeature.ObjectGetOwnPropertyDescriptor, LuaLibFeature.SetDescriptor, LuaLibFeature.ObjectAssign],
     DelegatedYield: [LuaLibFeature.StringAccess],
-    Delete: [LuaLibFeature.ObjectGetOwnPropertyDescriptors],
+    Delete: [LuaLibFeature.ObjectGetOwnPropertyDescriptors, LuaLibFeature.Error, LuaLibFeature.New],
     Error: [LuaLibFeature.Class, LuaLibFeature.ClassExtends, LuaLibFeature.New],
     FunctionBind: [LuaLibFeature.Unpack],
     Generator: [LuaLibFeature.Symbol],

package/dist/LuaPrinter.d.ts

@@ -1,5 +1,6 @@
 import { SourceNode } from "source-map";
 import * as ts from "typescript";
+import { CompilerOptions } from "./CompilerOptions";
 import * as lua from "./LuaAST";
 import { EmitHost } from "./transpilation";
 export declare const escapeString: (value: string) => string;
@@ -14,15 +15,21 @@ export interface PrintResult {
 export declare function createPrinter(printers: Printer[]): Printer;
 export declare class LuaPrinter {
     private emitHost;
+    private program;
+    private sourceFile;
     private static operatorMap;
+    private static operatorPrecedence;
+    private static rightAssociativeOperators;
     private currentIndent;
-    private sourceFile;
-    private options;
-    constructor(emitHost: EmitHost, program: ts.Program, fileName: string);
+    protected luaFile: string;
+    protected relativeSourcePath: string;
+    protected options: CompilerOptions;
+    static readonly sourceMapTracebackPlaceholder = "{#SourceMapTraceback}";
+    constructor(emitHost: EmitHost, program: ts.Program, sourceFile: string);
     print(file: lua.File): PrintResult;
     private printInlineSourceMap;
     private printStackTraceOverride;
-    private printFile;
+    protected printFile(file: lua.File): SourceNode;
     protected pushIndent(): void;
     protected popIndent(): void;
     protected indent(input?: SourceChunk): SourceChunk;
@@ -69,6 +76,10 @@ export declare class LuaPrinter {
     printTableIndexExpression(expression: lua.TableIndexExpression): SourceNode;
     printOperator(kind: lua.Operator): SourceNode;
     protected joinChunksWithComma(chunks: SourceChunk[]): SourceChunk[];
+    /**
+     * Returns true if the expression list (table field or parameters) should be printed on one line.
+     */
+    protected isSimpleExpressionList(expressions: lua.Expression[]): boolean;
     protected printExpressionList(expressions: lua.Expression[]): SourceChunk[];
     private buildSourceMap;
 }

package/dist/LuaPrinter.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LuaPrinter = exports.createPrinter = exports.tstlHeader = exports.escapeString = void 0;
+const path = require("path");
 const source_map_1 = require("source-map");
+const _1 = require(".");
 const CompilerOptions_1 = require("./CompilerOptions");
 const lua = require("./LuaAST");
 const LuaLib_1 = require("./LuaLib");
@@ -71,11 +73,15 @@ function createPrinter(printers) {
 }
 exports.createPrinter = createPrinter;
 class LuaPrinter {
-    constructor(emitHost, program, fileName) {
+    constructor(emitHost, program, sourceFile) {
         this.emitHost = emitHost;
+        this.program = program;
+        this.sourceFile = sourceFile;
         this.currentIndent = "";
         this.options = program.getCompilerOptions();
-        this.sourceFile = fileName;
+        this.luaFile = (0, utils_1.normalizeSlashes)((0, _1.getEmitPath)(this.sourceFile, this.program));
+        // Source nodes contain relative path from mapped lua file to original TS source file
+        this.relativeSourcePath = (0, utils_1.normalizeSlashes)(path.relative(path.dirname(this.luaFile), this.sourceFile));
     }
     print(file) {
         // Add traceback lualib if sourcemap traceback option is enabled
@@ -94,7 +100,7 @@ class LuaPrinter {
         }
         if (this.options.sourceMapTraceback) {
             const stackTraceOverride = this.printStackTraceOverride(rootSourceNode);
-            code = code.replace("{#SourceMapTraceback}", stackTraceOverride);
+            code = code.replace(LuaPrinter.sourceMapTracebackPlaceholder, stackTraceOverride);
         }
         return { code, sourceMap: sourceMap.toString(), sourceMapNode: rootSourceNode };
     }
@@ -136,10 +142,12 @@ class LuaPrinter {
         else if (luaLibImport === CompilerOptions_1.LuaLibImportKind.Inline && file.luaLibFeatures.size > 0) {
             // Inline lualib features
             header += "-- Lua Library inline imports\n";
-            header += LuaLib_1.loadLuaLibFeatures(file.luaLibFeatures, this.emitHost);
+            header += (0, LuaLib_1.loadLuaLibFeatures)(file.luaLibFeatures, this.emitHost);
         }
-        if (this.options.sourceMapTraceback) {
-            header += "{#SourceMapTraceback}\n";
+        if (this.options.sourceMapTraceback && !(0, CompilerOptions_1.isBundleEnabled)(this.options)) {
+            // In bundle mode the traceback is being generated for the entire file in getBundleResult
+            // Otherwise, traceback is being generated locally
+            header += `${LuaPrinter.sourceMapTracebackPlaceholder}\n`;
         }
         return this.concatNodes(header, ...this.printStatementArray(file.statements));
     }
@@ -155,11 +163,11 @@ class LuaPrinter {
     createSourceNode(node, chunks, name) {
         const { line, column } = lua.getOriginalPos(node);
         return line !== undefined && column !== undefined
-            ? new source_map_1.SourceNode(line + 1, column, this.sourceFile, chunks, name)
-            : new source_map_1.SourceNode(null, null, this.sourceFile, chunks, name);
+            ? new source_map_1.SourceNode(line + 1, column, this.relativeSourcePath, chunks, name)
+            : new source_map_1.SourceNode(null, null, this.relativeSourcePath, chunks, name);
     }
     concatNodes(...chunks) {
-        return new source_map_1.SourceNode(null, null, this.sourceFile, chunks);
+        return new source_map_1.SourceNode(null, null, this.relativeSourcePath, chunks);
     }
     printBlock(block) {
         return this.concatNodes(...this.printStatementArray(block.statements));
@@ -195,7 +203,7 @@ class LuaPrinter {
             if (lua.isReturnStatement(statement))
                 break;
         }
-        return statementNodes.length > 0 ? [...utils_1.intersperse(statementNodes, "\n"), "\n"] : [];
+        return statementNodes.length > 0 ? [...(0, utils_1.intersperse)(statementNodes, "\n"), "\n"] : [];
     }
     printStatement(statement) {
         let resultNode = this.printStatementExcludingComments(statement);
@@ -422,7 +430,7 @@ class LuaPrinter {
         }
     }
     printStringLiteral(expression) {
-        return this.createSourceNode(expression, exports.escapeString(expression.value));
+        return this.createSourceNode(expression, (0, exports.escapeString)(expression.value));
     }
     printNumericLiteral(expression) {
         return this.createSourceNode(expression, String(expression.value));
@@ -486,7 +494,7 @@ class LuaPrinter {
         const chunks = [];
         const value = this.printExpression(expression.value);
         if (expression.key) {
-            if (lua.isStringLiteral(expression.key) && safe_names_1.isValidLuaIdentifier(expression.key.value)) {
+            if (lua.isStringLiteral(expression.key) && (0, safe_names_1.isValidLuaIdentifier)(expression.key.value)) {
                 chunks.push(expression.key.value, " = ", value);
             }
             else {
@@ -504,26 +512,31 @@ class LuaPrinter {
     printUnaryExpression(expression) {
         const chunks = [];
         chunks.push(this.printOperator(expression.operator));
-        chunks.push(this.printExpressionInParenthesesIfNeeded(expression.operand));
+        chunks.push(this.printExpressionInParenthesesIfNeeded(expression.operand, LuaPrinter.operatorPrecedence[expression.operator]));
         return this.createSourceNode(expression, chunks);
     }
     printBinaryExpression(expression) {
         const chunks = [];
-        chunks.push(this.printExpressionInParenthesesIfNeeded(expression.left));
+        const isRightAssociative = LuaPrinter.rightAssociativeOperators.has(expression.operator);
+        const precedence = LuaPrinter.operatorPrecedence[expression.operator];
+        chunks.push(this.printExpressionInParenthesesIfNeeded(expression.left, isRightAssociative ? precedence + 1 : precedence));
         chunks.push(" ", this.printOperator(expression.operator), " ");
-        chunks.push(this.printExpressionInParenthesesIfNeeded(expression.right));
+        chunks.push(this.printExpressionInParenthesesIfNeeded(expression.right, isRightAssociative ? precedence : precedence + 1));
         return this.createSourceNode(expression, chunks);
     }
-    printExpressionInParenthesesIfNeeded(expression) {
-        return this.needsParenthesis(expression)
+    printExpressionInParenthesesIfNeeded(expression, minPrecedenceToOmit) {
+        return this.needsParenthesis(expression, minPrecedenceToOmit)
             ? this.createSourceNode(expression, ["(", this.printExpression(expression), ")"])
             : this.printExpression(expression);
     }
-    needsParenthesis(expression) {
-        return (lua.isBinaryExpression(expression) ||
-            lua.isFunctionExpression(expression) ||
-            lua.isTableExpression(expression) ||
-            (lua.isUnaryExpression(expression) && expression.operator === lua.SyntaxKind.NotOperator));
+    needsParenthesis(expression, minPrecedenceToOmit) {
+        if (lua.isBinaryExpression(expression) || lua.isUnaryExpression(expression)) {
+            return (minPrecedenceToOmit === undefined ||
+                LuaPrinter.operatorPrecedence[expression.operator] < minPrecedenceToOmit);
+        }
+        else {
+            return lua.isFunctionExpression(expression) || lua.isTableExpression(expression);
+        }
     }
     printCallExpression(expression) {
         const chunks = [];
@@ -553,7 +566,7 @@ class LuaPrinter {
     printTableIndexExpression(expression) {
         const chunks = [];
         chunks.push(this.printExpressionInParenthesesIfNeeded(expression.table));
-        if (lua.isStringLiteral(expression.index) && safe_names_1.isValidLuaIdentifier(expression.index.value)) {
+        if (lua.isStringLiteral(expression.index) && (0, safe_names_1.isValidLuaIdentifier)(expression.index.value)) {
             chunks.push(".", this.createSourceNode(expression.index, expression.index.value));
         }
         else {
@@ -562,14 +575,24 @@ class LuaPrinter {
         return this.createSourceNode(expression, chunks);
     }
     printOperator(kind) {
-        return new source_map_1.SourceNode(null, null, this.sourceFile, LuaPrinter.operatorMap[kind]);
+        return new source_map_1.SourceNode(null, null, this.relativeSourcePath, LuaPrinter.operatorMap[kind]);
     }
     joinChunksWithComma(chunks) {
-        return utils_1.intersperse(chunks, ", ");
+        return (0, utils_1.intersperse)(chunks, ", ");
+    }
+    /**
+     * Returns true if the expression list (table field or parameters) should be printed on one line.
+     */
+    isSimpleExpressionList(expressions) {
+        if (expressions.length <= 1)
+            return true;
+        if (expressions.length > 4)
+            return false;
+        return expressions.every(isSimpleExpression);
     }
     printExpressionList(expressions) {
         const chunks = [];
-        if (expressions.every(isSimpleExpression)) {
+        if (this.isSimpleExpressionList(expressions)) {
             chunks.push(...this.joinChunksWithComma(expressions.map(e => this.printExpression(e))));
         }
         else {
@@ -588,7 +611,7 @@ class LuaPrinter {
     // will not generate 'empty' mappings in the source map that point to nothing in the original TS.
     buildSourceMap(sourceRoot, rootSourceNode) {
         const map = new source_map_1.SourceMapGenerator({
-            file: utils_1.trimExtension(this.sourceFile) + ".lua",
+            file: path.basename(this.luaFile),
             sourceRoot,
         });
         let generatedLine = 1;
@@ -667,4 +690,33 @@ LuaPrinter.operatorMap = {
     [lua.SyntaxKind.BitwiseLeftShiftOperator]: "<<",
     [lua.SyntaxKind.BitwiseNotOperator]: "~",
 };
+LuaPrinter.operatorPrecedence = {
+    [lua.SyntaxKind.OrOperator]: 1,
+    [lua.SyntaxKind.AndOperator]: 2,
+    [lua.SyntaxKind.EqualityOperator]: 3,
+    [lua.SyntaxKind.InequalityOperator]: 3,
+    [lua.SyntaxKind.LessThanOperator]: 3,
+    [lua.SyntaxKind.LessEqualOperator]: 3,
+    [lua.SyntaxKind.GreaterThanOperator]: 3,
+    [lua.SyntaxKind.GreaterEqualOperator]: 3,
+    [lua.SyntaxKind.BitwiseOrOperator]: 4,
+    [lua.SyntaxKind.BitwiseExclusiveOrOperator]: 5,
+    [lua.SyntaxKind.BitwiseAndOperator]: 6,
+    [lua.SyntaxKind.BitwiseLeftShiftOperator]: 7,
+    [lua.SyntaxKind.BitwiseRightShiftOperator]: 7,
+    [lua.SyntaxKind.ConcatOperator]: 8,
+    [lua.SyntaxKind.AdditionOperator]: 9,
+    [lua.SyntaxKind.SubtractionOperator]: 9,
+    [lua.SyntaxKind.MultiplicationOperator]: 10,
+    [lua.SyntaxKind.DivisionOperator]: 10,
+    [lua.SyntaxKind.FloorDivisionOperator]: 10,
+    [lua.SyntaxKind.ModuloOperator]: 10,
+    [lua.SyntaxKind.NotOperator]: 11,
+    [lua.SyntaxKind.LengthOperator]: 11,
+    [lua.SyntaxKind.NegationOperator]: 11,
+    [lua.SyntaxKind.BitwiseNotOperator]: 11,
+    [lua.SyntaxKind.PowerOperator]: 12,
+};
+LuaPrinter.rightAssociativeOperators = new Set([lua.SyntaxKind.ConcatOperator, lua.SyntaxKind.PowerOperator]);
+LuaPrinter.sourceMapTracebackPlaceholder = "{#SourceMapTraceback}";
 //# sourceMappingURL=LuaPrinter.js.map

package/dist/cli/diagnostics.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.optionBuildMustBeFirstCommandLineArgument = exports.optionCanOnlyBeSpecifiedInTsconfigJsonFile = exports.argumentForOptionMustBe = exports.compilerOptionExpectsAnArgument = exports.theSpecifiedPathDoesNotExist = exports.cannotFindATsconfigJsonAtTheSpecifiedDirectory = exports.optionProjectCannotBeMixedWithSourceFilesOnACommandLine = exports.compilerOptionRequiresAValueOfType = exports.unknownCompilerOption = exports.watchErrorSummary = exports.tstlOptionsAreMovingToTheTstlObject = void 0;
 const ts = require("typescript");
 const utils_1 = require("../utils");
-exports.tstlOptionsAreMovingToTheTstlObject = utils_1.createSerialDiagnosticFactory((tstl) => ({
+exports.tstlOptionsAreMovingToTheTstlObject = (0, utils_1.createSerialDiagnosticFactory)((tstl) => ({
     category: ts.DiagnosticCategory.Warning,
     messageText: 'TSTL options are moving to the "tstl" object. Adjust your tsconfig to look like\n' +
         `"tstl": ${JSON.stringify(tstl, undefined, 4)}`,
@@ -19,7 +19,7 @@ const watchErrorSummary = (errorCount) => ({
         : `Found ${errorCount} errors. Watching for file changes.`,
 });
 exports.watchErrorSummary = watchErrorSummary;
-const createCommandLineError = (code, getMessage) => utils_1.createDiagnosticFactoryWithCode(code, (...args) => ({ messageText: getMessage(...args) }));
+const createCommandLineError = (code, getMessage) => (0, utils_1.createDiagnosticFactoryWithCode)(code, (...args) => ({ messageText: getMessage(...args) }));
 exports.unknownCompilerOption = createCommandLineError(5023, (name) => `Unknown compiler option '${name}'.`);
 exports.compilerOptionRequiresAValueOfType = createCommandLineError(5024, (name, type) => `Compiler option '${name}' requires a value of type ${type}.`);
 exports.optionProjectCannotBeMixedWithSourceFilesOnACommandLine = createCommandLineError(5042, () => "Option 'project' cannot be mixed with source files on a command line.");

package/dist/cli/parse.d.ts

@@ -13,7 +13,7 @@ interface CommandLineOptionOfEnum extends CommandLineOptionBase {
     choices: string[];
 }
 interface CommandLineOptionOfPrimitive extends CommandLineOptionBase {
-    type: "boolean" | "string" | "object";
+    type: "boolean" | "string" | "object" | "array";
 }
 declare type CommandLineOption = CommandLineOptionOfEnum | CommandLineOptionOfPrimitive;
 export declare const optionDeclarations: CommandLineOption[];

package/dist/cli/parse.js

@@ -59,6 +59,11 @@ exports.optionDeclarations = [
         description: "Provide verbose output useful for diagnosing problems.",
         type: "boolean",
     },
+    {
+        name: "noResolvePaths",
+        description: "An array of paths that tstl should not resolve and keep as-is.",
+        type: "array",
+    },
 ];
 function updateParsedConfigFile(parsedConfigFile) {
     let hasRootLevelOptions = false;
@@ -162,6 +167,15 @@ function readValue(option, value) {
             }
             return { value };
         }
+        case "array": {
+            if (!Array.isArray(value)) {
+                return {
+                    value: undefined,
+                    error: cliDiagnostics.compilerOptionRequiresAValueOfType(option.name, option.type),
+                };
+            }
+            return { value };
+        }
         case "enum": {
             if (typeof value !== "string") {
                 return {

package/dist/cli/report.js

@@ -6,7 +6,7 @@ const prepareDiagnosticForFormatting = (diagnostic) => diagnostic.source === "ty
 exports.prepareDiagnosticForFormatting = prepareDiagnosticForFormatting;
 function createDiagnosticReporter(pretty, system = ts.sys) {
     const reporter = ts.createDiagnosticReporter(system, pretty);
-    return diagnostic => reporter(exports.prepareDiagnosticForFormatting(diagnostic));
+    return diagnostic => reporter((0, exports.prepareDiagnosticForFormatting)(diagnostic));
 }
 exports.createDiagnosticReporter = createDiagnosticReporter;
 //# sourceMappingURL=report.js.map

package/dist/cli/tsconfig.js

@@ -12,14 +12,14 @@ function locateConfigFile(commandLine) {
         if (commandLine.fileNames.length > 0) {
             return undefined;
         }
-        const searchPath = utils_1.normalizeSlashes(process.cwd());
+        const searchPath = (0, utils_1.normalizeSlashes)(process.cwd());
         return ts.findConfigFile(searchPath, ts.sys.fileExists);
     }
     if (commandLine.fileNames.length !== 0) {
         return cliDiagnostics.optionProjectCannotBeMixedWithSourceFilesOnACommandLine();
     }
     // TODO: Unlike tsc, this resolves `.` to absolute path
-    const fileOrDirectory = utils_1.normalizeSlashes(path.resolve(process.cwd(), project));
+    const fileOrDirectory = (0, utils_1.normalizeSlashes)(path.resolve(process.cwd(), project));
     if (ts.sys.directoryExists(fileOrDirectory)) {
         const configFileName = path.posix.join(fileOrDirectory, "tsconfig.json");
         if (ts.sys.fileExists(configFileName)) {
@@ -39,7 +39,7 @@ function locateConfigFile(commandLine) {
 exports.locateConfigFile = locateConfigFile;
 function parseConfigFileWithSystem(configFileName, commandLineOptions, system = ts.sys) {
     const parsedConfigFile = ts.parseJsonSourceFileConfigFileContent(ts.readJsonConfigFile(configFileName, system.readFile), system, path.dirname(configFileName), commandLineOptions, configFileName);
-    return parse_1.updateParsedConfigFile(parsedConfigFile);
+    return (0, parse_1.updateParsedConfigFile)(parsedConfigFile);
 }
 exports.parseConfigFileWithSystem = parseConfigFileWithSystem;
 function createConfigFileUpdater(optionsToExtend) {
@@ -49,7 +49,7 @@ function createConfigFileUpdater(optionsToExtend) {
         if (!configFile || !configFilePath)
             return [];
         if (!configFileMap.has(configFile)) {
-            const parsedConfigFile = parse_1.updateParsedConfigFile(ts.parseJsonSourceFileConfigFileContent(configFile, ts.sys, path.dirname(configFilePath), optionsToExtend, configFilePath));
+            const parsedConfigFile = (0, parse_1.updateParsedConfigFile)(ts.parseJsonSourceFileConfigFileContent(configFile, ts.sys, path.dirname(configFilePath), optionsToExtend, configFilePath));
             configFileMap.set(configFile, parsedConfigFile);
         }
         const parsedConfigFile = configFileMap.get(configFile);

package/dist/lualib/ArrayFlat.lua

@@ -4,7 +4,7 @@ function __TS__ArrayFlat(array, depth)
     end
     local result = {}
     for ____, value in ipairs(array) do
-        if (depth > 0) and __TS__ArrayIsArray(value) then
+        if depth > 0 and __TS__ArrayIsArray(value) then
             result = __TS__ArrayConcat(
                 result,
                 __TS__ArrayFlat(value, depth - 1)

package/dist/lualib/ArrayFlatMap.lua

@@ -4,7 +4,7 @@ function __TS__ArrayFlatMap(array, callback)
         local i = 0
         while i < #array do
             local value = callback(_G, array[i + 1], i, array)
-            if (type(value) == "table") and __TS__ArrayIsArray(value) then
+            if type(value) == "table" and __TS__ArrayIsArray(value) then
                 result = __TS__ArrayConcat(result, value)
             else
                 result[#result + 1] = value

package/dist/lualib/ArrayIsArray.lua

@@ -1,3 +1,3 @@
 function __TS__ArrayIsArray(value)
-    return (type(value) == "table") and ((value[1] ~= nil) or (next(value, nil) == nil))
+    return type(value) == "table" and (value[1] ~= nil or next(value, nil) == nil)
 end

package/dist/lualib/ArrayReduce.lua

@@ -11,7 +11,13 @@ function __TS__ArrayReduce(arr, callbackFn, ...)
         error("Reduce of empty array with no initial value", 0)
     end
     for i = k, len - 1 do
-        accumulator = callbackFn(_G, accumulator, arr[i + 1], i, arr)
+        accumulator = callbackFn(
+            _G,
+            accumulator,
+            arr[i + 1],
+            i,
+            arr
+        )
     end
     return accumulator
 end

package/dist/lualib/ArrayReduceRight.lua

@@ -11,7 +11,13 @@ function __TS__ArrayReduceRight(arr, callbackFn, ...)
         error("Reduce of empty array with no initial value", 0)
     end
     for i = k, 0, -1 do
-        accumulator = callbackFn(_G, accumulator, arr[i + 1], i, arr)
+        accumulator = callbackFn(
+            _G,
+            accumulator,
+            arr[i + 1],
+            i,
+            arr
+        )
     end
     return accumulator
 end

package/dist/lualib/ArraySetLength.lua

@@ -1,5 +1,5 @@
 function __TS__ArraySetLength(arr, length)
-    if (((length < 0) or (length ~= length)) or (length == math.huge)) or (math.floor(length) ~= length) then
+    if length < 0 or length ~= length or length == math.huge or math.floor(length) ~= length then
         error(
             "invalid array length: " .. tostring(length),
             0