typescript-to-lua 1.8.2 → 1.10.0

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

@@ -39,8 +39,9 @@ function transformBitOperatorToLuaOperator(context, node, operator) {
 function transformBinaryBitOperation(context, node, left, right, operator) {
     switch (context.luaTarget) {
         case CompilerOptions_1.LuaTarget.Universal:
+        case CompilerOptions_1.LuaTarget.Lua50:
         case CompilerOptions_1.LuaTarget.Lua51:
-            context.diagnostics.push((0, diagnostics_1.unsupportedForTarget)(node, "Bitwise operations", CompilerOptions_1.LuaTarget.Lua51));
+            context.diagnostics.push((0, diagnostics_1.unsupportedForTarget)(node, "Bitwise operations", context.luaTarget));
         case CompilerOptions_1.LuaTarget.LuaJIT:
             return transformBinaryBitLibOperation(node, left, right, operator, "bit");
         case CompilerOptions_1.LuaTarget.Lua52:
@@ -65,8 +66,9 @@ function transformUnaryBitLibOperation(node, expression, operator, lib) {
 function transformUnaryBitOperation(context, node, expression, operator) {
     switch (context.luaTarget) {
         case CompilerOptions_1.LuaTarget.Universal:
+        case CompilerOptions_1.LuaTarget.Lua50:
         case CompilerOptions_1.LuaTarget.Lua51:
-            context.diagnostics.push((0, diagnostics_1.unsupportedForTarget)(node, "Bitwise operations", CompilerOptions_1.LuaTarget.Lua51));
+            context.diagnostics.push((0, diagnostics_1.unsupportedForTarget)(node, "Bitwise operations", context.luaTarget));
         case CompilerOptions_1.LuaTarget.LuaJIT:
             return transformUnaryBitLibOperation(node, expression, operator, "bit");
         case CompilerOptions_1.LuaTarget.Lua52:

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformBinaryExpressionStatement = exports.transformBinaryExpression = exports.transformBinaryOperation = exports.createShortCircuitBinaryExpressionPrecedingStatements = void 0;
 const ts = require("typescript");
+const CompilerOptions_1 = require("../../../CompilerOptions");
 const lua = require("../../../LuaAST");
 const lua_ast_1 = require("../../utils/lua-ast");
 const lualib_1 = require("../../utils/lualib");
@@ -42,6 +43,9 @@ function transformBinaryOperationWithNoPrecedingStatements(context, left, right,
         (0, utils_1.assert)(ts.isBinaryExpression(node));
         return transformNullishCoalescingOperationNoPrecedingStatements(context, node, left, right);
     }
+    if (operator === ts.SyntaxKind.PercentToken && context.luaTarget === CompilerOptions_1.LuaTarget.Lua50) {
+        return (0, lualib_1.transformLuaLibFunction)(context, lualib_1.LuaLibFeature.Modulo50, node, left, right);
+    }
     let luaOperator = simpleOperatorsToLua[operator];
     // Check if we need to use string concat operator
     if (operator === ts.SyntaxKind.PlusToken && ts.isBinaryExpression(node)) {

package/dist/transformation/visitors/break-continue.js

@@ -12,8 +12,10 @@ const transformBreakStatement = (breakStatement, context) => {
 exports.transformBreakStatement = transformBreakStatement;
 const transformContinueStatement = (statement, context) => {
     var _a;
-    if (context.luaTarget === CompilerOptions_1.LuaTarget.Universal || context.luaTarget === CompilerOptions_1.LuaTarget.Lua51) {
-        context.diagnostics.push((0, diagnostics_1.unsupportedForTarget)(statement, "Continue statement", CompilerOptions_1.LuaTarget.Lua51));
+    if (context.luaTarget === CompilerOptions_1.LuaTarget.Universal ||
+        context.luaTarget === CompilerOptions_1.LuaTarget.Lua50 ||
+        context.luaTarget === CompilerOptions_1.LuaTarget.Lua51) {
+        context.diagnostics.push((0, diagnostics_1.unsupportedForTarget)(statement, "Continue statement", context.luaTarget));
     }
     const scope = (0, scope_1.findScope)(context, scope_1.ScopeType.Loop);
     if (scope) {

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

@@ -14,6 +14,7 @@ const fields_1 = require("./members/fields");
 const method_1 = require("./members/method");
 const utils_1 = require("./utils");
 const setup_1 = require("./setup");
+const CompilerOptions_1 = require("../../../CompilerOptions");
 const transformClassDeclaration = (declaration, context) => {
     // If declaration is a default export, transform to export variable assignment instead
     if ((0, export_1.hasDefaultExportModifier)(declaration)) {
@@ -34,6 +35,7 @@ function transformClassAsExpression(expression, context) {
 }
 exports.transformClassAsExpression = transformClassAsExpression;
 function transformClassLikeDeclaration(classDeclaration, context, nameOverride) {
+    var _a, _b;
     let className;
     if (nameOverride !== undefined) {
         className = nameOverride;
@@ -79,10 +81,13 @@ function transformClassLikeDeclaration(classDeclaration, context, nameOverride)
     else if (instanceFields.length > 0) {
         // Generate a constructor if none was defined in a class with instance fields that need initialization
         // localClassName.prototype.____constructor = function(self, ...)
-        //     baseClassName.prototype.____constructor(self, ...)
+        //     baseClassName.prototype.____constructor(self, ...)  // or unpack(arg) for Lua 5.0
         //     ...
         const constructorBody = (0, fields_1.transformClassInstanceFields)(context, instanceFields);
-        const superCall = lua.createExpressionStatement(lua.createCallExpression(lua.createTableIndexExpression(context.transformExpression(ts.factory.createSuper()), lua.createStringLiteral("____constructor")), [(0, lua_ast_1.createSelfIdentifier)(), lua.createDotsLiteral()]));
+        const argsExpression = context.luaTarget === CompilerOptions_1.LuaTarget.Lua50
+            ? lua.createCallExpression(lua.createIdentifier("unpack"), [lua.createArgLiteral()])
+            : lua.createDotsLiteral();
+        const superCall = lua.createExpressionStatement(lua.createCallExpression(lua.createTableIndexExpression(context.transformExpression(ts.factory.createSuper()), lua.createStringLiteral("____constructor")), [(0, lua_ast_1.createSelfIdentifier)(), argsExpression]));
         constructorBody.unshift(superCall);
         const constructorFunction = lua.createFunctionExpression(lua.createBlock(constructorBody), [(0, lua_ast_1.createSelfIdentifier)()], lua.createDotsLiteral(), lua.NodeFlags.Declaration);
         result.push(lua.createAssignmentStatement((0, constructor_1.createConstructorName)(localClassName), constructorFunction, classDeclaration));
@@ -129,8 +134,8 @@ function transformClassLikeDeclaration(classDeclaration, context, nameOverride)
     }
     result.push(...decorationStatements);
     // Decorate the class
-    if (classDeclaration.decorators) {
-        const decoratingExpression = (0, decorators_1.createDecoratingExpression)(context, classDeclaration.kind, classDeclaration.decorators.map(d => (0, decorators_1.transformDecoratorExpression)(context, d)), localClassName);
+    if (ts.canHaveDecorators(classDeclaration) && ts.getDecorators(classDeclaration)) {
+        const decoratingExpression = (0, decorators_1.createDecoratingExpression)(context, classDeclaration.kind, (_b = (_a = ts.getDecorators(classDeclaration)) === null || _a === void 0 ? void 0 : _a.map(d => (0, decorators_1.transformDecoratorExpression)(context, d))) !== null && _b !== void 0 ? _b : [], localClassName);
         const decoratingStatement = lua.createAssignmentStatement(localClassName, decoratingExpression);
         result.push(decoratingStatement);
         if ((0, export_1.hasExportModifier)(classDeclaration)) {

package/dist/transformation/visitors/class/members/fields.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformStaticPropertyDeclaration = exports.transformClassInstanceFields = exports.createPropertyDecoratingExpression = void 0;
+const ts = require("typescript");
 const lua = require("../../../../LuaAST");
 const lua_ast_1 = require("../../../utils/lua-ast");
 const preceding_statements_1 = require("../../../utils/preceding-statements");
@@ -8,11 +9,14 @@ const literal_1 = require("../../literal");
 const decorators_1 = require("../decorators");
 const method_1 = require("./method");
 function createPropertyDecoratingExpression(context, node, className) {
-    if (!node.decorators)
+    if (!ts.canHaveDecorators(node))
+        return;
+    const decorators = ts.getDecorators(node);
+    if (!decorators)
         return;
     const propertyName = (0, literal_1.transformPropertyName)(context, node.name);
     const propertyOwnerTable = (0, method_1.transformMemberExpressionOwnerName)(node, className);
-    return (0, decorators_1.createDecoratingExpression)(context, node.kind, node.decorators.map(d => (0, decorators_1.transformDecoratorExpression)(context, d)), propertyOwnerTable, propertyName);
+    return (0, decorators_1.createDecoratingExpression)(context, node.kind, decorators.map(d => (0, decorators_1.transformDecoratorExpression)(context, d)), propertyOwnerTable, propertyName);
 }
 exports.createPropertyDecoratingExpression = createPropertyDecoratingExpression;
 function transformClassInstanceFields(context, instanceFields) {

package/dist/transformation/visitors/class/members/method.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createMethodDecoratingExpression = exports.transformMethodDeclaration = exports.transformMethodName = exports.transformMemberExpressionOwnerName = void 0;
+const ts = require("typescript");
 const lua = require("../../../../LuaAST");
 const function_1 = require("../../function");
 const literal_1 = require("../../literal");
@@ -38,10 +39,11 @@ function createMethodDecoratingExpression(context, node, className) {
     const parameterDecorators = node.parameters
         .flatMap((parameter, index) => {
         var _a;
-        return (_a = parameter.decorators) === null || _a === void 0 ? void 0 : _a.map(decorator => (0, lualib_1.transformLuaLibFunction)(context, lualib_1.LuaLibFeature.DecorateParam, node, lua.createNumericLiteral(index), (0, decorators_1.transformDecoratorExpression)(context, decorator)));
+        return (_a = ts
+            .getDecorators(parameter)) === null || _a === void 0 ? void 0 : _a.map(decorator => (0, lualib_1.transformLuaLibFunction)(context, lualib_1.LuaLibFeature.DecorateParam, node, lua.createNumericLiteral(index), (0, decorators_1.transformDecoratorExpression)(context, decorator)));
     })
         .filter(utils_2.isNonNull);
-    const methodDecorators = (_b = (_a = node.decorators) === null || _a === void 0 ? void 0 : _a.map(d => (0, decorators_1.transformDecoratorExpression)(context, d))) !== null && _b !== void 0 ? _b : [];
+    const methodDecorators = (_b = (_a = ts.getDecorators(node)) === null || _a === void 0 ? void 0 : _a.map(d => (0, decorators_1.transformDecoratorExpression)(context, d))) !== null && _b !== void 0 ? _b : [];
     if (methodDecorators.length > 0 || parameterDecorators.length > 0) {
         const decorateMethod = (0, decorators_1.createDecoratingExpression)(context, node.kind, [...methodDecorators, ...parameterDecorators], methodTable, methodName);
         return lua.createExpressionStatement(decorateMethod);

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

@@ -3,3 +3,4 @@ import * as lua from "../../LuaAST";
 import { FunctionVisitor, TransformationContext } from "../context";
 export declare const transformConditionalExpression: FunctionVisitor<ts.ConditionalExpression>;
 export declare function transformIfStatement(statement: ts.IfStatement, context: TransformationContext): lua.IfStatement;
+export declare function checkOnlyTruthyCondition(condition: ts.Expression, context: TransformationContext): void;

package/dist/transformation/visitors/conditional.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformIfStatement = exports.transformConditionalExpression = void 0;
+exports.checkOnlyTruthyCondition = exports.transformIfStatement = exports.transformConditionalExpression = void 0;
 const ts = require("typescript");
 const lua = require("../../LuaAST");
 const preceding_statements_1 = require("../utils/preceding-statements");
 const scope_1 = require("../utils/scope");
 const block_1 = require("./block");
 const typescript_1 = require("../utils/typescript");
+const diagnostics_1 = require("../utils/diagnostics");
 function transformProtectedConditionalExpression(context, expression, condition, whenTrue, whenFalse) {
     const tempVar = context.createTempNameForNode(expression.condition);
     const trueStatements = whenTrue[0].concat(lua.createAssignmentStatement(lua.cloneIdentifier(tempVar), whenTrue[1], expression.whenTrue));
@@ -19,6 +20,8 @@ function transformProtectedConditionalExpression(context, expression, condition,
     return lua.cloneIdentifier(tempVar);
 }
 const transformConditionalExpression = (expression, context) => {
+    // Check if we need to add diagnostic about Lua truthiness
+    checkOnlyTruthyCondition(expression.condition, context);
     const condition = (0, preceding_statements_1.transformInPrecedingStatementScope)(context, () => context.transformExpression(expression.condition));
     const whenTrue = (0, preceding_statements_1.transformInPrecedingStatementScope)(context, () => context.transformExpression(expression.whenTrue));
     const whenFalse = (0, preceding_statements_1.transformInPrecedingStatementScope)(context, () => context.transformExpression(expression.whenFalse));
@@ -35,6 +38,8 @@ const transformConditionalExpression = (expression, context) => {
 exports.transformConditionalExpression = transformConditionalExpression;
 function transformIfStatement(statement, context) {
     context.pushScope(scope_1.ScopeType.Conditional);
+    // Check if we need to add diagnostic about Lua truthiness
+    checkOnlyTruthyCondition(statement.expression, context);
     const condition = context.transformExpression(statement.expression);
     const statements = (0, scope_1.performHoisting)(context, (0, block_1.transformBlockOrStatement)(context, statement.thenStatement));
     context.popScope();
@@ -70,4 +75,10 @@ function transformIfStatement(statement, context) {
     return lua.createIfStatement(condition, ifBlock);
 }
 exports.transformIfStatement = transformIfStatement;
+function checkOnlyTruthyCondition(condition, context) {
+    if (!(0, typescript_1.canBeFalsy)(context, context.checker.getTypeAtLocation(condition))) {
+        context.diagnostics.push((0, diagnostics_1.truthyOnlyConditionalValue)(condition));
+    }
+}
+exports.checkOnlyTruthyCondition = checkOnlyTruthyCondition;
 //# sourceMappingURL=conditional.js.map

package/dist/transformation/visitors/errors.js

@@ -15,7 +15,8 @@ const multi_1 = require("./language-extensions/multi");
 const return_1 = require("./return");
 const transformAsyncTry = (statement, context) => {
     const [tryBlock] = (0, block_1.transformScopeBlock)(context, statement.tryBlock, scope_1.ScopeType.Try);
-    if (context.options.luaTarget === __1.LuaTarget.Lua51 && !context.options.lua51AllowTryCatchInAsyncAwait) {
+    if ((context.options.luaTarget === __1.LuaTarget.Lua50 || context.options.luaTarget === __1.LuaTarget.Lua51) &&
+        !context.options.lua51AllowTryCatchInAsyncAwait) {
         context.diagnostics.push((0, diagnostics_1.unsupportedForTargetButOverrideAvailable)(statement, "try/catch inside async functions", __1.LuaTarget.Lua51, "lua51AllowTryCatchInAsyncAwait"));
         return tryBlock.statements;
     }
@@ -57,7 +58,8 @@ const transformTryStatement = (statement, context) => {
         return transformAsyncTry(statement, context);
     }
     const [tryBlock, tryScope] = (0, block_1.transformScopeBlock)(context, statement.tryBlock, scope_1.ScopeType.Try);
-    if (context.options.luaTarget === __1.LuaTarget.Lua51 && (0, typescript_1.isInGeneratorFunction)(statement)) {
+    if ((context.options.luaTarget === __1.LuaTarget.Lua50 || context.options.luaTarget === __1.LuaTarget.Lua51) &&
+        (0, typescript_1.isInGeneratorFunction)(statement)) {
         context.diagnostics.push((0, diagnostics_1.unsupportedForTarget)(statement, "try/catch inside generator functions", __1.LuaTarget.Lua51));
         return tryBlock.statements;
     }

package/dist/transformation/visitors/function.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformYieldExpression = exports.transformFunctionDeclaration = exports.transformFunctionLikeDeclaration = exports.transformFunctionToExpression = exports.transformParameters = exports.transformFunctionBody = exports.transformFunctionBodyHeader = exports.transformFunctionBodyContent = exports.isFunctionTypeWithProperties = exports.createCallableTable = void 0;
 const ts = require("typescript");
+const CompilerOptions_1 = require("../../CompilerOptions");
 const lua = require("../../LuaAST");
 const utils_1 = require("../../utils");
 const export_1 = require("../utils/export");
@@ -99,7 +100,7 @@ function transformFunctionBodyHeader(context, bodyScope, parameters, spreadIdent
     }
     // Push spread operator here
     if (spreadIdentifier && isRestParameterReferenced(spreadIdentifier, bodyScope)) {
-        const spreadTable = (0, lua_ast_1.wrapInTable)(lua.createDotsLiteral());
+        const spreadTable = context.luaTarget === CompilerOptions_1.LuaTarget.Lua50 ? lua.createArgLiteral() : (0, lua_ast_1.wrapInTable)(lua.createDotsLiteral());
         headerStatements.push(lua.createVariableDeclarationStatement(spreadIdentifier, spreadTable));
     }
     // Binding pattern statements need to be after spread table is declared

package/dist/transformation/visitors/identifier.js

@@ -28,7 +28,10 @@ function transformNonValueIdentifier(context, identifier, symbol) {
         : (0, language_extensions_1.getExtensionKindForNode)(context, identifier);
     if (extensionKind) {
         if (call_extension_1.callExtensions.has(extensionKind)) {
-            context.diagnostics.push((0, diagnostics_1.invalidCallExtensionUse)(identifier));
+            // Avoid putting duplicate diagnostic on the name of a variable declaration, due to the inferred type
+            if (!(ts.isVariableDeclaration(identifier.parent) && identifier.parent.name === identifier)) {
+                context.diagnostics.push((0, diagnostics_1.invalidCallExtensionUse)(identifier));
+            }
             // fall through
         }
         else if ((0, identifier_1.isIdentifierExtensionValue)(symbol, extensionKind)) {

package/dist/transformation/visitors/language-extensions/operators.js

@@ -101,7 +101,8 @@ function transformUnaryOperator(context, node, kind) {
     return lua.createUnaryExpression(context.transformExpression(arg), luaOperator);
 }
 function checkHasLua53(context, node, kind) {
-    const isBefore53 = context.luaTarget === CompilerOptions_1.LuaTarget.Lua51 ||
+    const isBefore53 = context.luaTarget === CompilerOptions_1.LuaTarget.Lua50 ||
+        context.luaTarget === CompilerOptions_1.LuaTarget.Lua51 ||
         context.luaTarget === CompilerOptions_1.LuaTarget.Lua52 ||
         context.luaTarget === CompilerOptions_1.LuaTarget.LuaJIT ||
         context.luaTarget === CompilerOptions_1.LuaTarget.Universal;

package/dist/transformation/visitors/literal.js

@@ -11,6 +11,7 @@ const typescript_1 = require("../utils/typescript");
 const function_1 = require("./function");
 const expression_list_1 = require("./expression-list");
 const identifier_1 = require("./identifier");
+const CompilerOptions_1 = require("../../CompilerOptions");
 // TODO: Move to object-literal.ts?
 function transformPropertyName(context, node) {
     if (ts.isComputedPropertyName(node)) {
@@ -31,11 +32,18 @@ function createShorthandIdentifier(context, valueSymbol, propertyIdentifier) {
     return (0, identifier_1.transformIdentifierWithSymbol)(context, propertyIdentifier, valueSymbol);
 }
 exports.createShorthandIdentifier = createShorthandIdentifier;
-const transformNumericLiteralExpression = expression => {
+const transformNumericLiteralExpression = (expression, context) => {
     if (expression.text === "Infinity") {
-        const math = lua.createIdentifier("math");
-        const huge = lua.createStringLiteral("huge");
-        return lua.createTableIndexExpression(math, huge, expression);
+        if (context.luaTarget === CompilerOptions_1.LuaTarget.Lua50) {
+            const one = lua.createNumericLiteral(1);
+            const zero = lua.createNumericLiteral(0);
+            return lua.createBinaryExpression(one, zero, lua.SyntaxKind.DivisionOperator);
+        }
+        else {
+            const math = lua.createIdentifier("math");
+            const huge = lua.createStringLiteral("huge");
+            return lua.createTableIndexExpression(math, huge, expression);
+        }
     }
     return lua.createNumericLiteral(Number(expression.text), expression);
 };

package/dist/transformation/visitors/loops/do-while.js

@@ -3,8 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformDoStatement = exports.transformWhileStatement = void 0;
 const lua = require("../../../LuaAST");
 const preceding_statements_1 = require("../../utils/preceding-statements");
+const conditional_1 = require("../conditional");
 const utils_1 = require("./utils");
 const transformWhileStatement = (statement, context) => {
+    // Check if we need to add diagnostic about Lua truthiness
+    (0, conditional_1.checkOnlyTruthyCondition)(statement.expression, context);
     const body = (0, utils_1.transformLoopBody)(context, statement);
     let [conditionPrecedingStatements, condition] = (0, preceding_statements_1.transformInPrecedingStatementScope)(context, () => context.transformExpression(statement.expression));
     // If condition has preceding statements, ensure they are executed every iteration by using the form:
@@ -25,6 +28,8 @@ const transformWhileStatement = (statement, context) => {
 };
 exports.transformWhileStatement = transformWhileStatement;
 const transformDoStatement = (statement, context) => {
+    // Check if we need to add diagnostic about Lua truthiness
+    (0, conditional_1.checkOnlyTruthyCondition)(statement.expression, context);
     const body = lua.createDoStatement((0, utils_1.transformLoopBody)(context, statement));
     let [conditionPrecedingStatements, condition] = (0, preceding_statements_1.transformInPrecedingStatementScope)(context, () => (0, utils_1.invertCondition)(context.transformExpression(statement.expression)));
     // If condition has preceding statements, ensure they are executed every iteration by using the form:

package/dist/transformation/visitors/modules/export.js

@@ -80,7 +80,7 @@ function transformExportSpecifier(context, node) {
 function transformExportSpecifiersFrom(context, statement, moduleSpecifier, exportSpecifiers) {
     // First transpile as import clause
     const importClause = ts.factory.createImportClause(false, undefined, ts.factory.createNamedImports(exportSpecifiers.map(s => ts.factory.createImportSpecifier(statement.isTypeOnly, s.propertyName, s.name))));
-    const importDeclaration = ts.factory.createImportDeclaration(statement.decorators, statement.modifiers, importClause, moduleSpecifier);
+    const importDeclaration = ts.factory.createImportDeclaration(statement.modifiers, importClause, moduleSpecifier);
     // Wrap in block to prevent imports from hoisting out of `do` statement
     const [block] = (0, block_1.transformScopeBlock)(context, ts.factory.createBlock([importDeclaration]), scope_1.ScopeType.Block);
     const result = block.statements;

package/dist/transformation/visitors/spread.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformSpreadElement = exports.isOptimizedVarArgSpread = void 0;
 const ts = require("typescript");
+const CompilerOptions_1 = require("../../CompilerOptions");
 const lua = require("../../LuaAST");
 const language_extensions_1 = require("../utils/language-extensions");
 const lua_ast_1 = require("../utils/lua-ast");
@@ -54,7 +55,9 @@ const transformSpreadElement = (node, context) => {
     if (ts.isIdentifier(tsInnerExpression)) {
         const symbol = context.checker.getSymbolAtLocation(tsInnerExpression);
         if (symbol && isOptimizedVarArgSpread(context, symbol, tsInnerExpression)) {
-            return lua.createDotsLiteral(node);
+            return context.luaTarget === CompilerOptions_1.LuaTarget.Lua50
+                ? (0, lua_ast_1.createUnpackCall)(context, lua.createArgLiteral(), node)
+                : lua.createDotsLiteral(node);
         }
     }
     const innerExpression = context.transformExpression(node.expression);

package/dist/transformation/visitors/typescript.js

@@ -13,6 +13,7 @@ exports.typescriptVisitors = {
     [ts.SyntaxKind.TypeAliasDeclaration]: () => undefined,
     [ts.SyntaxKind.InterfaceDeclaration]: () => undefined,
     [ts.SyntaxKind.NonNullExpression]: (node, context) => context.transformExpression(node.expression),
+    [ts.SyntaxKind.ExpressionWithTypeArguments]: (node, context) => context.transformExpression(node.expression),
     [ts.SyntaxKind.AsExpression]: transformAssertionExpression,
     [ts.SyntaxKind.TypeAssertionExpression]: transformAssertionExpression,
     [ts.SyntaxKind.NotEmittedStatement]: () => undefined,

package/dist/transpilation/bundle.js

@@ -3,13 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBundleResult = exports.printStackTraceBundleOverride = exports.sourceMapTracebackBundlePlaceholder = void 0;
 const path = require("path");
 const source_map_1 = require("source-map");
+const CompilerOptions_1 = require("../CompilerOptions");
 const LuaPrinter_1 = require("../LuaPrinter");
 const utils_1 = require("../utils");
 const diagnostics_1 = require("./diagnostics");
 const transpiler_1 = require("./transpiler");
 const createModulePath = (pathToResolve, program) => (0, LuaPrinter_1.escapeString)((0, utils_1.formatPathToLuaPath)((0, utils_1.trimExtension)((0, transpiler_1.getEmitPathRelativeToOutDir)(pathToResolve, program))));
 // Override `require` to read from ____modules table.
-const requireOverride = `
+function requireOverride(options) {
+    const runModule = options.luaTarget === CompilerOptions_1.LuaTarget.Lua50
+        ? "(table.getn(arg) > 0) and module(unpack(arg)) or module(file)"
+        : '(select("#", ...) > 0) and module(...) or module(file)';
+    return `
 local ____modules = {}
 local ____moduleCache = {}
 local ____originalRequire = require
@@ -19,7 +24,7 @@ local function require(file, ...)
     end
     if ____modules[file] then
         local module = ____modules[file]
-        ____moduleCache[file] = { value = (select("#", ...) > 0) and module(...) or module(file) }
+        ____moduleCache[file] = { value = ${runModule} }
         return ____moduleCache[file].value
     else
         if ____originalRequire then
@@ -30,6 +35,7 @@ local function require(file, ...)
     end
 end
 `;
+}
 exports.sourceMapTracebackBundlePlaceholder = "{#SourceMapTracebackBundle}";
 function printStackTraceBundleOverride(rootNode) {
     const map = {};
@@ -66,14 +72,16 @@ function printStackTraceBundleOverride(rootNode) {
 }
 exports.printStackTraceBundleOverride = printStackTraceBundleOverride;
 function getBundleResult(program, files) {
+    var _a, _b, _c;
     const diagnostics = [];
     const options = program.getCompilerOptions();
     const bundleFile = (0, utils_1.cast)(options.luaBundle, utils_1.isNonNull);
     const entryModule = (0, utils_1.cast)(options.luaBundleEntry, utils_1.isNonNull);
     // Resolve project settings relative to project file.
-    const resolvedEntryModule = path.resolve((0, transpiler_1.getSourceDir)(program), entryModule);
+    const resolvedEntryModule = path.resolve((0, transpiler_1.getProjectRoot)(program), entryModule);
     const outputPath = path.resolve((0, transpiler_1.getEmitOutDir)(program), bundleFile);
-    if (program.getSourceFile(resolvedEntryModule) === undefined && program.getSourceFile(entryModule) === undefined) {
+    const entryModuleFilePath = (_b = (_a = program.getSourceFile(entryModule)) === null || _a === void 0 ? void 0 : _a.fileName) !== null && _b !== void 0 ? _b : (_c = program.getSourceFile(resolvedEntryModule)) === null || _c === void 0 ? void 0 : _c.fileName;
+    if (entryModuleFilePath === undefined) {
         diagnostics.push((0, diagnostics_1.couldNotFindBundleEntryPoint)(entryModule));
     }
     // For each file: ["<module path>"] = function() <lua content> end,
@@ -81,14 +89,15 @@ function getBundleResult(program, files) {
     // Create ____modules table containing all entries from moduleTableEntries
     const moduleTable = createModuleTableNode(moduleTableEntries);
     // return require("<entry module path>")
-    const entryPoint = `return require(${createModulePath(entryModule, program)}, ...)\n`;
+    const args = options.luaTarget === CompilerOptions_1.LuaTarget.Lua50 ? "unpack(arg == nil and {} or arg)" : "...";
+    const entryPoint = `return require(${createModulePath(entryModuleFilePath !== null && entryModuleFilePath !== void 0 ? entryModuleFilePath : entryModule, program)}, ${args})\n`;
     const footers = [];
     if (options.sourceMapTraceback) {
         // Generates SourceMapTraceback for the entire file
         footers.push('local __TS__SourceMapTraceBack = require("lualib_bundle").__TS__SourceMapTraceBack\n');
         footers.push(`${exports.sourceMapTracebackBundlePlaceholder}\n`);
     }
-    const sourceChunks = [requireOverride, moduleTable, ...footers, entryPoint];
+    const sourceChunks = [requireOverride(options), moduleTable, ...footers, entryPoint];
     if (!options.noHeader) {
         sourceChunks.unshift(LuaPrinter_1.tstlHeader);
     }

package/dist/transpilation/resolve.js

@@ -260,11 +260,11 @@ function isBuildModeLibrary(program) {
 function findRequiredPaths(code) {
     // Find all require("<path>") paths in a lua code string
     const paths = [];
-    const pattern = /(^|\s|;|=|\()require\("(.+?)"\)/g;
+    const pattern = /(^|\s|;|=|\()require\s*\(?(["|'])(.+?)\2\)?/g;
     // eslint-disable-next-line @typescript-eslint/ban-types
     let match;
     while ((match = pattern.exec(code))) {
-        paths.push(match[2]);
+        paths.push(match[3]);
     }
     return paths;
 }
@@ -272,7 +272,7 @@ function replaceRequireInCode(file, originalRequire, newRequire) {
     const requirePath = (0, utils_1.formatPathToLuaPath)(newRequire.replace(".lua", ""));
     // Escape special characters to prevent the regex from breaking...
     const escapedRequire = originalRequire.replace(/[-/\\^$*+?.()|[\]{}]/g, "\\$&");
-    file.code = file.code.replace(new RegExp(`(^|\\s|;|=|\\()require\\("${escapedRequire}"\\)`), `$1require("${requirePath}")`);
+    file.code = file.code.replace(new RegExp(`(^|\\s|;|=|\\()require\\s*\\(?["|']${escapedRequire}["|']\\)?`), `$1require("${requirePath}")`);
 }
 function replaceRequireInSourceMap(file, originalRequire, newRequire) {
     const requirePath = (0, utils_1.formatPathToLuaPath)(newRequire.replace(".lua", ""));

package/dist/transpilation/transpiler.js

@@ -61,6 +61,7 @@ class Transpiler {
         return diagnostics;
     }
     getEmitPlan(program, diagnostics, files) {
+        var _a;
         performance.startSection("getEmitPlan");
         const options = program.getCompilerOptions();
         if (options.tstlVerbose) {
@@ -78,7 +79,8 @@ class Transpiler {
             }
             // Add lualib bundle to source dir 'virtually', will be moved to correct output dir in emitPlan
             const fileName = (0, utils_1.normalizeSlashes)(path.resolve(getSourceDir(program), "lualib_bundle.lua"));
-            resolutionResult.resolvedFiles.unshift({ fileName, code: (0, LuaLib_1.getLuaLibBundle)(this.emitHost) });
+            const luaTarget = (_a = options.luaTarget) !== null && _a !== void 0 ? _a : CompilerOptions_1.LuaTarget.Universal;
+            resolutionResult.resolvedFiles.unshift({ fileName, code: (0, LuaLib_1.getLuaLibBundle)(luaTarget, this.emitHost) });
         }
         let emitPlan;
         if ((0, CompilerOptions_1.isBundleEnabled)(options)) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "typescript-to-lua",
-    "version": "1.8.2",
+    "version": "1.10.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/",
@@ -18,21 +18,20 @@
         "dist/**/*.js",
         "dist/**/*.lua",
         "dist/**/*.ts",
-        "dist/lualib/*.json",
-        "language-extensions/**/*.ts"
+        "dist/lualib/**/*.json"
     ],
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "scripts": {
         "build": "tsc && npm run build-lualib",
-        "build-lualib": "node dist/tstl.js -p src/lualib/tsconfig.json",
+        "build-lualib": "node dist/tstl.js -p src/lualib/tsconfig.json && node dist/tstl.js -p src/lualib/tsconfig.lua50.json",
         "pretest": "npm run lint && npm run check:language-extensions && npm run build-lualib",
         "test": "jest",
         "lint": "npm run lint:eslint && npm run lint:prettier",
         "lint:prettier": "prettier --check . || (echo 'Run `npm run fix:prettier` to fix it.' && exit 1)",
         "lint:eslint": "eslint . --ext .js,.ts",
         "fix:prettier": "prettier --write .",
-        "check:language-extensions": "tsc language-extensions/index.d.ts",
+        "check:language-extensions": "tsc --strict language-extensions/index.d.ts",
         "preversion": "npm run build && npm test",
         "postversion": "git push && git push --tags"
     },
@@ -40,12 +39,13 @@
         "tstl": "dist/tstl.js"
     },
     "engines": {
-        "node": ">=12.13.0"
+        "node": ">=16.10.0"
     },
     "peerDependencies": {
-        "typescript": "~4.7.3"
+        "typescript": "~4.8.2"
     },
     "dependencies": {
+        "@typescript-to-lua/language-extensions": "1.0.0",
         "enhanced-resolve": "^5.8.2",
         "resolve": "^1.15.1",
         "source-map": "^0.7.3"
@@ -56,20 +56,20 @@
         "@types/jest": "^27.5.2",
         "@types/node": "^13.7.7",
         "@types/resolve": "1.14.0",
-        "@typescript-eslint/eslint-plugin": "^5.27.0",
-        "@typescript-eslint/parser": "^5.27.0",
-        "eslint": "^8.17.0",
+        "@typescript-eslint/eslint-plugin": "^5.36.1",
+        "@typescript-eslint/parser": "^5.36.1",
+        "eslint": "^8.23.0",
         "eslint-plugin-import": "^2.26.0",
-        "eslint-plugin-jest": "^26.4.6",
+        "eslint-plugin-jest": "^26.8.7",
         "fs-extra": "^8.1.0",
         "javascript-stringify": "^2.0.1",
-        "jest": "^27.3.0",
-        "jest-circus": "^27.3.0",
-        "lua-types": "^2.11.0",
-        "lua-wasm-bindings": "^0.2.2",
+        "jest": "^28.1.3",
+        "jest-circus": "^29.0.1",
+        "lua-types": "^2.13.0",
+        "lua-wasm-bindings": "^0.3.1",
         "prettier": "^2.3.2",
-        "ts-jest": "^27.1.3",
-        "ts-node": "^10.3.0",
-        "typescript": "~4.7.3"
+        "ts-jest": "^28.0.8",
+        "ts-node": "^10.9.1",
+        "typescript": "~4.8.2"
     }
 }