typescript-to-lua 1.13.3 → 1.15.0

package/dist/LuaAST.d.ts

@@ -32,31 +32,32 @@ export declare enum SyntaxKind {
     MethodCallExpression = 28,
     Identifier = 29,
     TableIndexExpression = 30,
-    AdditionOperator = 31,
-    SubtractionOperator = 32,
-    MultiplicationOperator = 33,
-    DivisionOperator = 34,
-    FloorDivisionOperator = 35,
-    ModuloOperator = 36,
-    PowerOperator = 37,
-    NegationOperator = 38,
-    ConcatOperator = 39,
-    LengthOperator = 40,
-    EqualityOperator = 41,
-    InequalityOperator = 42,
-    LessThanOperator = 43,
-    LessEqualOperator = 44,
-    GreaterThanOperator = 45,
-    GreaterEqualOperator = 46,
-    AndOperator = 47,
-    OrOperator = 48,
-    NotOperator = 49,
-    BitwiseAndOperator = 50,
-    BitwiseOrOperator = 51,
-    BitwiseExclusiveOrOperator = 52,
-    BitwiseRightShiftOperator = 53,
-    BitwiseLeftShiftOperator = 54,
-    BitwiseNotOperator = 55
+    ParenthesizedExpression = 31,
+    AdditionOperator = 32,
+    SubtractionOperator = 33,
+    MultiplicationOperator = 34,
+    DivisionOperator = 35,
+    FloorDivisionOperator = 36,
+    ModuloOperator = 37,
+    PowerOperator = 38,
+    NegationOperator = 39,
+    ConcatOperator = 40,
+    LengthOperator = 41,
+    EqualityOperator = 42,
+    InequalityOperator = 43,
+    LessThanOperator = 44,
+    LessEqualOperator = 45,
+    GreaterThanOperator = 46,
+    GreaterEqualOperator = 47,
+    AndOperator = 48,
+    OrOperator = 49,
+    NotOperator = 50,
+    BitwiseAndOperator = 51,
+    BitwiseOrOperator = 52,
+    BitwiseExclusiveOrOperator = 53,
+    BitwiseRightShiftOperator = 54,
+    BitwiseLeftShiftOperator = 55,
+    BitwiseNotOperator = 56
 }
 export type UnaryBitwiseOperator = SyntaxKind.BitwiseNotOperator;
 export type UnaryOperator = SyntaxKind.NegationOperator | SyntaxKind.LengthOperator | SyntaxKind.NotOperator | UnaryBitwiseOperator;
@@ -314,3 +315,8 @@ export type InlineFunctionExpression = FunctionExpression & {
     };
 };
 export declare function isInlineFunctionExpression(expression: FunctionExpression): expression is InlineFunctionExpression;
+export type ParenthesizedExpression = Expression & {
+    expression: Expression;
+};
+export declare function isParenthesizedExpression(node: Node): node is ParenthesizedExpression;
+export declare function createParenthesizedExpression(expression: Expression, tsOriginal?: ts.Node): ParenthesizedExpression;

package/dist/LuaAST.js

@@ -3,7 +3,7 @@
 // https://www.lua.org/manual/5.3/manual.html#9 and the TS AST implementation
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isStringLiteral = exports.createNumericLiteral = exports.isNumericLiteral = exports.createArgLiteral = exports.isArgLiteral = 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.setNodeFlags = exports.getOriginalPos = exports.setNodeOriginal = exports.setNodePosition = exports.cloneNode = exports.createNode = exports.NodeFlags = 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 = exports.isFunctionExpression = exports.isLiteral = exports.createStringLiteral = void 0;
+exports.createParenthesizedExpression = exports.isParenthesizedExpression = 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 = exports.isFunctionExpression = exports.isLiteral = exports.createStringLiteral = 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");
@@ -43,40 +43,41 @@ var SyntaxKind;
     SyntaxKind[SyntaxKind["MethodCallExpression"] = 28] = "MethodCallExpression";
     SyntaxKind[SyntaxKind["Identifier"] = 29] = "Identifier";
     SyntaxKind[SyntaxKind["TableIndexExpression"] = 30] = "TableIndexExpression";
+    SyntaxKind[SyntaxKind["ParenthesizedExpression"] = 31] = "ParenthesizedExpression";
     // Operators
     // Arithmetic
-    SyntaxKind[SyntaxKind["AdditionOperator"] = 31] = "AdditionOperator";
-    SyntaxKind[SyntaxKind["SubtractionOperator"] = 32] = "SubtractionOperator";
-    SyntaxKind[SyntaxKind["MultiplicationOperator"] = 33] = "MultiplicationOperator";
-    SyntaxKind[SyntaxKind["DivisionOperator"] = 34] = "DivisionOperator";
-    SyntaxKind[SyntaxKind["FloorDivisionOperator"] = 35] = "FloorDivisionOperator";
-    SyntaxKind[SyntaxKind["ModuloOperator"] = 36] = "ModuloOperator";
-    SyntaxKind[SyntaxKind["PowerOperator"] = 37] = "PowerOperator";
-    SyntaxKind[SyntaxKind["NegationOperator"] = 38] = "NegationOperator";
+    SyntaxKind[SyntaxKind["AdditionOperator"] = 32] = "AdditionOperator";
+    SyntaxKind[SyntaxKind["SubtractionOperator"] = 33] = "SubtractionOperator";
+    SyntaxKind[SyntaxKind["MultiplicationOperator"] = 34] = "MultiplicationOperator";
+    SyntaxKind[SyntaxKind["DivisionOperator"] = 35] = "DivisionOperator";
+    SyntaxKind[SyntaxKind["FloorDivisionOperator"] = 36] = "FloorDivisionOperator";
+    SyntaxKind[SyntaxKind["ModuloOperator"] = 37] = "ModuloOperator";
+    SyntaxKind[SyntaxKind["PowerOperator"] = 38] = "PowerOperator";
+    SyntaxKind[SyntaxKind["NegationOperator"] = 39] = "NegationOperator";
     // Concat
-    SyntaxKind[SyntaxKind["ConcatOperator"] = 39] = "ConcatOperator";
+    SyntaxKind[SyntaxKind["ConcatOperator"] = 40] = "ConcatOperator";
     // Length
-    SyntaxKind[SyntaxKind["LengthOperator"] = 40] = "LengthOperator";
+    SyntaxKind[SyntaxKind["LengthOperator"] = 41] = "LengthOperator";
     // Relational Ops
-    SyntaxKind[SyntaxKind["EqualityOperator"] = 41] = "EqualityOperator";
-    SyntaxKind[SyntaxKind["InequalityOperator"] = 42] = "InequalityOperator";
-    SyntaxKind[SyntaxKind["LessThanOperator"] = 43] = "LessThanOperator";
-    SyntaxKind[SyntaxKind["LessEqualOperator"] = 44] = "LessEqualOperator";
+    SyntaxKind[SyntaxKind["EqualityOperator"] = 42] = "EqualityOperator";
+    SyntaxKind[SyntaxKind["InequalityOperator"] = 43] = "InequalityOperator";
+    SyntaxKind[SyntaxKind["LessThanOperator"] = 44] = "LessThanOperator";
+    SyntaxKind[SyntaxKind["LessEqualOperator"] = 45] = "LessEqualOperator";
     // Syntax Sugar `x > y` <=> `not (y <= x)`
     // but we should probably use them to make the output code more readable
-    SyntaxKind[SyntaxKind["GreaterThanOperator"] = 45] = "GreaterThanOperator";
-    SyntaxKind[SyntaxKind["GreaterEqualOperator"] = 46] = "GreaterEqualOperator";
+    SyntaxKind[SyntaxKind["GreaterThanOperator"] = 46] = "GreaterThanOperator";
+    SyntaxKind[SyntaxKind["GreaterEqualOperator"] = 47] = "GreaterEqualOperator";
     // Logical
-    SyntaxKind[SyntaxKind["AndOperator"] = 47] = "AndOperator";
-    SyntaxKind[SyntaxKind["OrOperator"] = 48] = "OrOperator";
-    SyntaxKind[SyntaxKind["NotOperator"] = 49] = "NotOperator";
+    SyntaxKind[SyntaxKind["AndOperator"] = 48] = "AndOperator";
+    SyntaxKind[SyntaxKind["OrOperator"] = 49] = "OrOperator";
+    SyntaxKind[SyntaxKind["NotOperator"] = 50] = "NotOperator";
     // Bitwise
-    SyntaxKind[SyntaxKind["BitwiseAndOperator"] = 50] = "BitwiseAndOperator";
-    SyntaxKind[SyntaxKind["BitwiseOrOperator"] = 51] = "BitwiseOrOperator";
-    SyntaxKind[SyntaxKind["BitwiseExclusiveOrOperator"] = 52] = "BitwiseExclusiveOrOperator";
-    SyntaxKind[SyntaxKind["BitwiseRightShiftOperator"] = 53] = "BitwiseRightShiftOperator";
-    SyntaxKind[SyntaxKind["BitwiseLeftShiftOperator"] = 54] = "BitwiseLeftShiftOperator";
-    SyntaxKind[SyntaxKind["BitwiseNotOperator"] = 55] = "BitwiseNotOperator";
+    SyntaxKind[SyntaxKind["BitwiseAndOperator"] = 51] = "BitwiseAndOperator";
+    SyntaxKind[SyntaxKind["BitwiseOrOperator"] = 52] = "BitwiseOrOperator";
+    SyntaxKind[SyntaxKind["BitwiseExclusiveOrOperator"] = 53] = "BitwiseExclusiveOrOperator";
+    SyntaxKind[SyntaxKind["BitwiseRightShiftOperator"] = 54] = "BitwiseRightShiftOperator";
+    SyntaxKind[SyntaxKind["BitwiseLeftShiftOperator"] = 55] = "BitwiseLeftShiftOperator";
+    SyntaxKind[SyntaxKind["BitwiseNotOperator"] = 56] = "BitwiseNotOperator";
 })(SyntaxKind = exports.SyntaxKind || (exports.SyntaxKind = {}));
 var NodeFlags;
 (function (NodeFlags) {
@@ -500,4 +501,14 @@ function isInlineFunctionExpression(expression) {
         (expression.flags & NodeFlags.Inline) !== 0);
 }
 exports.isInlineFunctionExpression = isInlineFunctionExpression;
+function isParenthesizedExpression(node) {
+    return node.kind === SyntaxKind.ParenthesizedExpression;
+}
+exports.isParenthesizedExpression = isParenthesizedExpression;
+function createParenthesizedExpression(expression, tsOriginal) {
+    const parenthesizedExpression = createNode(SyntaxKind.ParenthesizedExpression, tsOriginal);
+    parenthesizedExpression.expression = expression;
+    return parenthesizedExpression;
+}
+exports.createParenthesizedExpression = createParenthesizedExpression;
 //# sourceMappingURL=LuaAST.js.map

package/dist/LuaPrinter.d.ts

@@ -75,6 +75,7 @@ export declare class LuaPrinter {
     printMethodCallExpression(expression: lua.MethodCallExpression): SourceNode;
     printIdentifier(expression: lua.Identifier): SourceNode;
     printTableIndexExpression(expression: lua.TableIndexExpression): SourceNode;
+    printParenthesizedExpression(expression: lua.ParenthesizedExpression): SourceNode;
     printOperator(kind: lua.Operator): SourceNode;
     protected joinChunksWithComma(chunks: SourceChunk[]): SourceChunk[];
     /**

package/dist/LuaPrinter.js

@@ -430,6 +430,8 @@ class LuaPrinter {
                 return this.printIdentifier(expression);
             case lua.SyntaxKind.TableIndexExpression:
                 return this.printTableIndexExpression(expression);
+            case lua.SyntaxKind.ParenthesizedExpression:
+                return this.printParenthesizedExpression(expression);
             default:
                 throw new Error(`Tried to print unknown statement kind: ${lua.SyntaxKind[expression.kind]}`);
         }
@@ -582,6 +584,9 @@ class LuaPrinter {
         }
         return this.createSourceNode(expression, chunks);
     }
+    printParenthesizedExpression(expression) {
+        return this.createSourceNode(expression, ["(", this.printExpression(expression.expression), ")"]);
+    }
     printOperator(kind) {
         return new source_map_1.SourceNode(null, null, this.relativeSourcePath, LuaPrinter.operatorMap[kind]);
     }
@@ -670,7 +675,6 @@ class LuaPrinter {
         return map;
     }
 }
-exports.LuaPrinter = LuaPrinter;
 LuaPrinter.operatorMap = {
     [lua.SyntaxKind.AdditionOperator]: "+",
     [lua.SyntaxKind.SubtractionOperator]: "-",
@@ -727,4 +731,5 @@ LuaPrinter.operatorPrecedence = {
 };
 LuaPrinter.rightAssociativeOperators = new Set([lua.SyntaxKind.ConcatOperator, lua.SyntaxKind.PowerOperator]);
 LuaPrinter.sourceMapTracebackPlaceholder = "{#SourceMapTraceback}";
+exports.LuaPrinter = LuaPrinter;
 //# sourceMappingURL=LuaPrinter.js.map

package/dist/cli/tsconfig.js

@@ -38,10 +38,45 @@ 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);
+    var _a;
+    const configRootDir = path.dirname(configFileName);
+    const parsedConfigFile = ts.parseJsonSourceFileConfigFileContent(ts.readJsonConfigFile(configFileName, system.readFile), system, configRootDir, commandLineOptions, configFileName);
+    const cycleCache = new Set();
+    const extendedTstlOptions = getExtendedTstlOptions(configFileName, configRootDir, cycleCache, system);
+    parsedConfigFile.raw.tstl = Object.assign(extendedTstlOptions, (_a = parsedConfigFile.raw.tstl) !== null && _a !== void 0 ? _a : {});
     return (0, parse_1.updateParsedConfigFile)(parsedConfigFile);
 }
 exports.parseConfigFileWithSystem = parseConfigFileWithSystem;
+function getExtendedTstlOptions(configFilePath, configRootDir, cycleCache, system) {
+    const absolutePath = path.isAbsolute(configFilePath) ? configFilePath : path.resolve(configRootDir, configFilePath);
+    const newConfigRoot = path.dirname(absolutePath);
+    if (cycleCache.has(absolutePath)) {
+        return {};
+    }
+    cycleCache.add(absolutePath);
+    const fileContent = system.readFile(absolutePath);
+    const options = {};
+    if (fileContent) {
+        const { config: parsedConfig } = ts.parseConfigFileTextToJson(configFilePath, fileContent);
+        if (!parsedConfig) {
+            return {};
+        }
+        if (parsedConfig.extends) {
+            if (Array.isArray(parsedConfig.extends)) {
+                for (const extendedConfigFile of parsedConfig.extends) {
+                    Object.assign(options, getExtendedTstlOptions(extendedConfigFile, newConfigRoot, cycleCache, system));
+                }
+            }
+            else {
+                Object.assign(options, getExtendedTstlOptions(parsedConfig.extends, newConfigRoot, cycleCache, system));
+            }
+        }
+        if (parsedConfig.tstl) {
+            Object.assign(options, parsedConfig.tstl);
+        }
+    }
+    return options;
+}
 function createConfigFileUpdater(optionsToExtend) {
     const configFileMap = new WeakMap();
     return options => {

package/dist/lualib/5.0/ParseFloat.lua

@@ -3,6 +3,6 @@ local function __TS__ParseFloat(numberString)
     if infinityMatch ~= nil then
         return __TS__StringAccess(infinityMatch, 0) == "-" and -(1 / 0) or 1 / 0
     end
-    local number = tonumber(__TS__Match(numberString, "^%s*(-?%d+%.?%d*)"))
+    local number = tonumber((__TS__Match(numberString, "^%s*(-?%d+%.?%d*)")))
     return number or 0 / 0
 end

package/dist/lualib/5.0/ParseInt.lua

@@ -7,7 +7,7 @@ do
             local hexMatch = __TS__Match(numberString, "^%s*-?0[xX]")
             if hexMatch ~= nil then
                 base = 16
-                numberString = __TS__Match(hexMatch, "-") and "-" .. __TS__StringSubstring(
+                numberString = (__TS__Match(hexMatch, "-")) and "-" .. __TS__StringSubstring(
                     numberString,
                     string.len(hexMatch)
                 ) or __TS__StringSubstring(
@@ -21,10 +21,7 @@ do
         end
         local allowedDigits = base <= 10 and __TS__StringSubstring(parseIntBasePattern, 0, base) or __TS__StringSubstring(parseIntBasePattern, 0, 10 + 2 * (base - 10))
         local pattern = ("^%s*(-?[" .. allowedDigits) .. "]*)"
-        local number = tonumber(
-            __TS__Match(numberString, pattern),
-            base
-        )
+        local number = tonumber((__TS__Match(numberString, pattern)), base)
         if number == nil then
             return 0 / 0
         end

package/dist/lualib/5.0/SourceMapTraceBack.lua

@@ -35,7 +35,7 @@ local function __TS__SourceMapTraceBack(fileName, sourceMap)
             local function stringReplacer(____, file, line)
                 local fileSourceMap = _G.__TS__sourcemap[file]
                 if fileSourceMap ~= nil and fileSourceMap[line] ~= nil then
-                    local chunkName = __TS__Match(file, "%[string \"([^\"]+)\"%]")
+                    local chunkName = (__TS__Match(file, "%[string \"([^\"]+)\"%]"))
                     local sourceName = string.gsub(chunkName, ".lua$", ".ts")
                     local data = fileSourceMap[line]
                     if type(data) == "number" then

package/dist/lualib/5.0/lualib_bundle.lua

@@ -1632,7 +1632,7 @@ local function __TS__ParseFloat(numberString)
     if infinityMatch ~= nil then
         return __TS__StringAccess(infinityMatch, 0) == "-" and -(1 / 0) or 1 / 0
     end
-    local number = tonumber(__TS__Match(numberString, "^%s*(-?%d+%.?%d*)"))
+    local number = tonumber((__TS__Match(numberString, "^%s*(-?%d+%.?%d*)")))
     return number or 0 / 0
 end
 
@@ -1663,7 +1663,7 @@ do
             local hexMatch = __TS__Match(numberString, "^%s*-?0[xX]")
             if hexMatch ~= nil then
                 base = 16
-                numberString = __TS__Match(hexMatch, "-") and "-" .. __TS__StringSubstring(
+                numberString = (__TS__Match(hexMatch, "-")) and "-" .. __TS__StringSubstring(
                     numberString,
                     string.len(hexMatch)
                 ) or __TS__StringSubstring(
@@ -1677,10 +1677,7 @@ do
         end
         local allowedDigits = base <= 10 and __TS__StringSubstring(parseIntBasePattern, 0, base) or __TS__StringSubstring(parseIntBasePattern, 0, 10 + 2 * (base - 10))
         local pattern = ("^%s*(-?[" .. allowedDigits) .. "]*)"
-        local number = tonumber(
-            __TS__Match(numberString, pattern),
-            base
-        )
+        local number = tonumber((__TS__Match(numberString, pattern)), base)
         if number == nil then
             return 0 / 0
         end
@@ -2133,7 +2130,7 @@ local function __TS__SourceMapTraceBack(fileName, sourceMap)
             local function stringReplacer(____, file, line)
                 local fileSourceMap = _G.__TS__sourcemap[file]
                 if fileSourceMap ~= nil and fileSourceMap[line] ~= nil then
-                    local chunkName = __TS__Match(file, "%[string \"([^\"]+)\"%]")
+                    local chunkName = (__TS__Match(file, "%[string \"([^\"]+)\"%]"))
                     local sourceName = string.gsub(chunkName, ".lua$", ".ts")
                     local data = fileSourceMap[line]
                     if type(data) == "number" then

package/dist/lualib/universal/ParseFloat.lua

@@ -3,6 +3,6 @@ local function __TS__ParseFloat(numberString)
     if infinityMatch ~= nil then
         return __TS__StringAccess(infinityMatch, 0) == "-" and -math.huge or math.huge
     end
-    local number = tonumber(__TS__Match(numberString, "^%s*(-?%d+%.?%d*)"))
+    local number = tonumber((__TS__Match(numberString, "^%s*(-?%d+%.?%d*)")))
     return number or 0 / 0
 end

package/dist/lualib/universal/ParseInt.lua

@@ -7,7 +7,7 @@ do
             local hexMatch = __TS__Match(numberString, "^%s*-?0[xX]")
             if hexMatch ~= nil then
                 base = 16
-                numberString = __TS__Match(hexMatch, "-") and "-" .. __TS__StringSubstring(numberString, #hexMatch) or __TS__StringSubstring(numberString, #hexMatch)
+                numberString = (__TS__Match(hexMatch, "-")) and "-" .. __TS__StringSubstring(numberString, #hexMatch) or __TS__StringSubstring(numberString, #hexMatch)
             end
         end
         if base < 2 or base > 36 then
@@ -15,10 +15,7 @@ do
         end
         local allowedDigits = base <= 10 and __TS__StringSubstring(parseIntBasePattern, 0, base) or __TS__StringSubstring(parseIntBasePattern, 0, 10 + 2 * (base - 10))
         local pattern = ("^%s*(-?[" .. allowedDigits) .. "]*)"
-        local number = tonumber(
-            __TS__Match(numberString, pattern),
-            base
-        )
+        local number = tonumber((__TS__Match(numberString, pattern)), base)
         if number == nil then
             return 0 / 0
         end

package/dist/lualib/universal/SourceMapTraceBack.lua

@@ -35,7 +35,7 @@ local function __TS__SourceMapTraceBack(fileName, sourceMap)
             local function stringReplacer(____, file, line)
                 local fileSourceMap = _G.__TS__sourcemap[file]
                 if fileSourceMap ~= nil and fileSourceMap[line] ~= nil then
-                    local chunkName = __TS__Match(file, "%[string \"([^\"]+)\"%]")
+                    local chunkName = (__TS__Match(file, "%[string \"([^\"]+)\"%]"))
                     local sourceName = string.gsub(chunkName, ".lua$", ".ts")
                     local data = fileSourceMap[line]
                     if type(data) == "number" then

package/dist/lualib/universal/lualib_bundle.lua

@@ -1574,7 +1574,7 @@ local function __TS__ParseFloat(numberString)
     if infinityMatch ~= nil then
         return __TS__StringAccess(infinityMatch, 0) == "-" and -math.huge or math.huge
     end
-    local number = tonumber(__TS__Match(numberString, "^%s*(-?%d+%.?%d*)"))
+    local number = tonumber((__TS__Match(numberString, "^%s*(-?%d+%.?%d*)")))
     return number or 0 / 0
 end
 
@@ -1605,7 +1605,7 @@ do
             local hexMatch = __TS__Match(numberString, "^%s*-?0[xX]")
             if hexMatch ~= nil then
                 base = 16
-                numberString = __TS__Match(hexMatch, "-") and "-" .. __TS__StringSubstring(numberString, #hexMatch) or __TS__StringSubstring(numberString, #hexMatch)
+                numberString = (__TS__Match(hexMatch, "-")) and "-" .. __TS__StringSubstring(numberString, #hexMatch) or __TS__StringSubstring(numberString, #hexMatch)
             end
         end
         if base < 2 or base > 36 then
@@ -1613,10 +1613,7 @@ do
         end
         local allowedDigits = base <= 10 and __TS__StringSubstring(parseIntBasePattern, 0, base) or __TS__StringSubstring(parseIntBasePattern, 0, 10 + 2 * (base - 10))
         local pattern = ("^%s*(-?[" .. allowedDigits) .. "]*)"
-        local number = tonumber(
-            __TS__Match(numberString, pattern),
-            base
-        )
+        local number = tonumber((__TS__Match(numberString, pattern)), base)
         if number == nil then
             return 0 / 0
         end
@@ -2070,7 +2067,7 @@ local function __TS__SourceMapTraceBack(fileName, sourceMap)
             local function stringReplacer(____, file, line)
                 local fileSourceMap = _G.__TS__sourcemap[file]
                 if fileSourceMap ~= nil and fileSourceMap[line] ~= nil then
-                    local chunkName = __TS__Match(file, "%[string \"([^\"]+)\"%]")
+                    local chunkName = (__TS__Match(file, "%[string \"([^\"]+)\"%]"))
                     local sourceName = string.gsub(chunkName, ".lua$", ".ts")
                     local data = fileSourceMap[line]
                     if type(data) == "number" then

package/dist/transformation/utils/export.js

@@ -103,7 +103,7 @@ function createExportedIdentifier(context, identifier, exportScope) {
         return identifier;
     }
     const exportTable = exportScope && ts.isModuleDeclaration(exportScope)
-        ? (0, namespace_1.createModuleLocalNameIdentifier)(context, exportScope)
+        ? (0, namespace_1.createModuleLocalName)(context, exportScope)
         : (0, lua_ast_1.createExportsIdentifier)();
     return lua.createTableIndexExpression(exportTable, lua.createStringLiteral(identifier.text));
 }

package/dist/transformation/utils/function-context.js

@@ -94,7 +94,13 @@ function reduceContextTypes(contexts) {
     return type;
 }
 function getSignatureDeclarations(context, signature) {
+    if (signature.compositeSignatures) {
+        return signature.compositeSignatures.flatMap(s => getSignatureDeclarations(context, s));
+    }
     const signatureDeclaration = signature.getDeclaration();
+    if (signatureDeclaration === undefined) {
+        return [];
+    }
     let inferredType;
     if (ts.isMethodDeclaration(signatureDeclaration) &&
         ts.isObjectLiteralExpression(signatureDeclaration.parent) &&

package/dist/transformation/utils/typescript/nodes.js

@@ -30,7 +30,12 @@ function isInAsyncFunction(node) {
     if (!declaration) {
         return false;
     }
-    return (_b = (_a = declaration.modifiers) === null || _a === void 0 ? void 0 : _a.some(m => m.kind === ts.SyntaxKind.AsyncKeyword)) !== null && _b !== void 0 ? _b : false;
+    if (ts.canHaveModifiers(declaration)) {
+        return (_b = (_a = ts.getModifiers(declaration)) === null || _a === void 0 ? void 0 : _a.some(m => m.kind === ts.SyntaxKind.AsyncKeyword)) !== null && _b !== void 0 ? _b : false;
+    }
+    else {
+        return false;
+    }
 }
 exports.isInAsyncFunction = isInAsyncFunction;
 function isInGeneratorFunction(node) {

package/dist/transformation/visitors/access.js

@@ -53,14 +53,14 @@ function transformElementAccessExpressionWithCapture(context, node, thisValueCap
         if (!(0, typescript_1.isNumberType)(context, accessType)) {
             context.diagnostics.push((0, diagnostics_1.invalidMultiReturnAccess)(node));
         }
-        // When selecting the first element, we can shortcut
-        if (ts.isNumericLiteral(node.argumentExpression) && node.argumentExpression.text === "0") {
-            return { expression: table };
-        }
-        else {
-            const selectIdentifier = lua.createIdentifier("select");
-            return { expression: lua.createCallExpression(selectIdentifier, [updatedAccessExpression, table]) };
+        const canOmitSelect = ts.isNumericLiteral(node.argumentExpression) && node.argumentExpression.text === "0";
+        if (canOmitSelect) {
+            // wrapping in parenthesis ensures only the first return value is used
+            // https://www.lua.org/manual/5.1/manual.html#2.5
+            return { expression: lua.createParenthesizedExpression(table) };
         }
+        const selectIdentifier = lua.createIdentifier("select");
+        return { expression: lua.createCallExpression(selectIdentifier, [updatedAccessExpression, table]) };
     }
     if (thisValueCapture) {
         const thisValue = (0, optional_chaining_1.captureThisValue)(context, table, thisValueCapture, node.expression);

package/dist/transformation/visitors/binary-expression/compound.js

@@ -9,6 +9,7 @@ const index_1 = require("./index");
 const assignments_1 = require("./assignments");
 const destructuring_assignments_1 = require("./destructuring-assignments");
 const lualib_1 = require("../../utils/lualib");
+const diagnostics_1 = require("../../utils/diagnostics");
 function isLuaExpressionWithSideEffect(expression) {
     return !(lua.isLiteral(expression) || lua.isIdentifier(expression));
 }
@@ -43,7 +44,11 @@ function transformCompoundAssignment(context, expression, lhs, rhs, operator, is
         const { precedingStatements, result: lengthSetterStatement } = transformCompoundLengthSetter(context, expression, lhs, rhs, operator);
         return { precedingStatements, result: lengthSetterStatement.expression };
     }
-    const left = (0, utils_1.cast)(context.transformExpression(lhs), lua.isAssignmentLeftHandSideExpression);
+    const left = context.transformExpression(lhs);
+    if (!lua.isAssignmentLeftHandSideExpression(left)) {
+        context.diagnostics.push((0, diagnostics_1.cannotAssignToNodeOfKind)(expression, left.kind));
+        return { precedingStatements: [], result: left };
+    }
     const { precedingStatements: rightPrecedingStatements, result: right } = (0, preceding_statements_1.transformInPrecedingStatementScope)(context, () => context.transformExpression(rhs));
     if (lua.isTableIndexExpression(left)) {
         // Complex property/element accesses need to cache object/index expressions to avoid repeating side-effects
@@ -128,7 +133,11 @@ function transformCompoundAssignmentStatement(context, node, lhs, rhs, operator)
         const { precedingStatements, result: lengthSetterStatement } = transformCompoundLengthSetter(context, node, lhs, rhs, operator);
         return [...precedingStatements, lengthSetterStatement];
     }
-    const left = (0, utils_1.cast)(context.transformExpression(lhs), lua.isAssignmentLeftHandSideExpression);
+    const left = context.transformExpression(lhs);
+    if (!lua.isAssignmentLeftHandSideExpression(left)) {
+        context.diagnostics.push((0, diagnostics_1.cannotAssignToNodeOfKind)(node, left.kind));
+        return [];
+    }
     const { precedingStatements: rightPrecedingStatements, result: right } = (0, preceding_statements_1.transformInPrecedingStatementScope)(context, () => context.transformExpression(rhs));
     if (lua.isTableIndexExpression(left) && shouldCacheTableIndexExpressions(left, rightPrecedingStatements)) {
         // Complex property/element accesses need to cache object/index expressions to avoid repeating side-effects

package/dist/transformation/visitors/class/new.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformNewExpression = void 0;
-const ts = require("typescript");
 const lua = require("../../../LuaAST");
 const annotations_1 = require("../../utils/annotations");
 const diagnostics_1 = require("../../utils/diagnostics");
@@ -14,7 +13,7 @@ const transformNewExpression = (node, context) => {
         return lua.createTableExpression(undefined, node);
     }
     const signature = context.checker.getResolvedSignature(node);
-    const [name, params] = (0, call_1.transformCallAndArguments)(context, node.expression, (_a = node.arguments) !== null && _a !== void 0 ? _a : [ts.factory.createTrue()], signature);
+    const [name, params] = (0, call_1.transformCallAndArguments)(context, node.expression, (_a = node.arguments) !== null && _a !== void 0 ? _a : [], signature);
     const type = context.checker.getTypeAtLocation(node);
     const annotations = (0, annotations_1.getTypeAnnotations)(type);
     const customConstructorAnnotation = annotations.get(annotations_1.AnnotationKind.CustomConstructor);

package/dist/transformation/visitors/function.js

@@ -18,10 +18,14 @@ const identifier_1 = require("./identifier");
 const return_1 = require("./return");
 const variable_declaration_1 = require("./variable-declaration");
 function transformParameterDefaultValueDeclaration(context, parameterName, value, tsOriginal) {
-    const parameterValue = value ? context.transformExpression(value) : undefined;
-    const assignment = lua.createAssignmentStatement(parameterName, parameterValue);
+    const { precedingStatements: statements, result: parameterValue } = (0, preceding_statements_1.transformInPrecedingStatementScope)(context, () => context.transformExpression(value));
+    if (!lua.isNilLiteral(parameterValue)) {
+        statements.push(lua.createAssignmentStatement(parameterName, parameterValue));
+    }
+    if (statements.length === 0)
+        return undefined;
     const nilCondition = lua.createBinaryExpression(parameterName, lua.createNilLiteral(), lua.SyntaxKind.EqualityOperator);
-    const ifBlock = lua.createBlock([assignment]);
+    const ifBlock = lua.createBlock(statements, tsOriginal);
     return lua.createIfStatement(nilCondition, ifBlock, undefined, tsOriginal);
 }
 function isRestParameterReferenced(identifier, scope) {
@@ -86,7 +90,9 @@ function transformFunctionBodyHeader(context, bodyScope, parameters, spreadIdent
             const identifier = lua.createIdentifier(`____bindingPattern${bindPatternIndex++}`);
             if (declaration.initializer !== undefined) {
                 // Default binding parameter
-                headerStatements.push(transformParameterDefaultValueDeclaration(context, identifier, declaration.initializer));
+                const initializer = transformParameterDefaultValueDeclaration(context, identifier, declaration.initializer);
+                if (initializer)
+                    headerStatements.push(initializer);
             }
             // Binding pattern
             const name = declaration.name;
@@ -95,7 +101,9 @@ function transformFunctionBodyHeader(context, bodyScope, parameters, spreadIdent
         }
         else if (declaration.initializer !== undefined) {
             // Default parameter
-            headerStatements.push(transformParameterDefaultValueDeclaration(context, (0, identifier_1.transformIdentifier)(context, declaration.name), declaration.initializer));
+            const initializer = transformParameterDefaultValueDeclaration(context, (0, identifier_1.transformIdentifier)(context, declaration.name), declaration.initializer);
+            if (initializer)
+                headerStatements.push(initializer);
         }
     }
     // Push spread operator here

package/dist/transformation/visitors/namespace.d.ts

@@ -1,5 +1,6 @@
 import * as ts from "typescript";
 import * as lua from "../../LuaAST";
 import { FunctionVisitor, TransformationContext } from "../context";
+export declare function createModuleLocalName(context: TransformationContext, module: ts.ModuleDeclaration): lua.Expression;
 export declare function createModuleLocalNameIdentifier(context: TransformationContext, declaration: ts.ModuleDeclaration): lua.Identifier;
 export declare const transformModuleDeclaration: FunctionVisitor<ts.ModuleDeclaration>;

package/dist/transformation/visitors/namespace.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformModuleDeclaration = exports.createModuleLocalNameIdentifier = void 0;
+exports.transformModuleDeclaration = exports.createModuleLocalNameIdentifier = exports.createModuleLocalName = void 0;
 const ts = require("typescript");
 const lua = require("../../LuaAST");
 const export_1 = require("../utils/export");
@@ -9,12 +9,20 @@ const safe_names_1 = require("../utils/safe-names");
 const scope_1 = require("../utils/scope");
 const symbols_1 = require("../utils/symbols");
 const identifier_1 = require("./identifier");
+function createModuleLocalName(context, module) {
+    if (!ts.isSourceFile(module.parent) && ts.isModuleDeclaration(module.parent)) {
+        const parentDeclaration = createModuleLocalName(context, module.parent);
+        const name = createModuleLocalNameIdentifier(context, module);
+        return lua.createTableIndexExpression(parentDeclaration, lua.createStringLiteral(name.text), module.name);
+    }
+    return createModuleLocalNameIdentifier(context, module);
+}
+exports.createModuleLocalName = createModuleLocalName;
 function createModuleLocalNameIdentifier(context, declaration) {
     const moduleSymbol = context.checker.getSymbolAtLocation(declaration.name);
     if (moduleSymbol !== undefined && (0, safe_names_1.isUnsafeName)(moduleSymbol.name, context.options)) {
         return lua.createIdentifier((0, safe_names_1.createSafeName)(declaration.name.text), declaration.name, moduleSymbol && (0, symbols_1.getSymbolIdOfSymbol)(context, moduleSymbol), declaration.name.text);
     }
-    // TODO: Should synthetic name nodes be escaped as well?
     return (0, identifier_1.transformIdentifier)(context, declaration.name);
 }
 exports.createModuleLocalNameIdentifier = createModuleLocalNameIdentifier;

package/dist/transformation/visitors/spread.js

@@ -31,7 +31,8 @@ function isOptimizedVarArgSpread(context, symbol, identifier) {
         return false;
     }
     // Scope cannot be an async function
-    if ((_a = scope.node.modifiers) === null || _a === void 0 ? void 0 : _a.some(m => m.kind === ts.SyntaxKind.AsyncKeyword)) {
+    if (ts.canHaveModifiers(scope.node) &&
+        ((_a = ts.getModifiers(scope.node)) === null || _a === void 0 ? void 0 : _a.some(m => m.kind === ts.SyntaxKind.AsyncKeyword))) {
         return false;
     }
     // Identifier must be a vararg in the local function scope's parameters

package/dist/transpilation/transformers.js

@@ -66,7 +66,7 @@ const stripParenthesisExpressionsTransformer = context => sourceFile => {
         }
         return ts.visitEachChild(node, visit, context);
     }
-    return ts.visitNode(sourceFile, visit);
+    return ts.visitEachChild(sourceFile, visit, context);
 };
 exports.stripParenthesisExpressionsTransformer = stripParenthesisExpressionsTransformer;
 function loadTransformersFromOptions(program, diagnostics) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "typescript-to-lua",
-    "version": "1.13.3",
+    "version": "1.15.0",
     "description": "A generic TypeScript to Lua transpiler. Write your code in TypeScript and publish Lua!",
     "repository": "https://github.com/TypeScriptToLua/TypeScriptToLua",
     "homepage": "https://typescripttolua.github.io/",
@@ -42,7 +42,7 @@
         "node": ">=16.10.0"
     },
     "peerDependencies": {
-        "typescript": "~4.9.3"
+        "typescript": "^5.0.2"
     },
     "dependencies": {
         "@typescript-to-lua/language-extensions": "1.0.0",
@@ -56,20 +56,20 @@
         "@types/jest": "^27.5.2",
         "@types/node": "^13.7.7",
         "@types/resolve": "1.14.0",
-        "@typescript-eslint/eslint-plugin": "^5.52.0",
-        "@typescript-eslint/parser": "^5.52.0",
-        "eslint": "^8.34.0",
+        "@typescript-eslint/eslint-plugin": "^5.55.0",
+        "@typescript-eslint/parser": "^5.55.0",
+        "eslint": "^8.36.0",
         "eslint-plugin-import": "^2.27.5",
         "eslint-plugin-jest": "^26.9.0",
         "fs-extra": "^8.1.0",
         "javascript-stringify": "^2.0.1",
-        "jest": "^28.1.3",
-        "jest-circus": "^29.4.2",
+        "jest": "^29.5.0",
+        "jest-circus": "^29.5.0",
         "lua-types": "^2.13.0",
         "lua-wasm-bindings": "^0.3.1",
-        "prettier": "^2.3.2",
-        "ts-jest": "^28.0.8",
+        "prettier": "^2.8.4",
+        "ts-jest": "^29.1.0",
         "ts-node": "^10.9.1",
-        "typescript": "~4.9.3"
+        "typescript": "^5.0.2"
     }
 }