typescript-to-lua 1.26.1 → 1.27.0

package/dist/lualib/5.0/ArrayFrom.lua

@@ -20,8 +20,14 @@ do
                 result[table.getn(result) + 1] = v
             end
         else
-            for i, v in arrayLikeIterator(arrayLike) do
-                result[table.getn(result) + 1] = mapFn(thisArg, v, i - 1)
+            local i = 0
+            for ____, v in arrayLikeIterator(arrayLike) do
+                local ____mapFn_3 = mapFn
+                local ____thisArg_1 = thisArg
+                local ____v_2 = v
+                local ____i_0 = i
+                i = ____i_0 + 1
+                result[table.getn(result) + 1] = ____mapFn_3(____thisArg_1, ____v_2, ____i_0)
             end
         end
         return result

package/dist/lualib/5.0/Using.lua

@@ -2,10 +2,7 @@ local function __TS__Using(self, cb, ...)
     local args = arg
     local thrownError
     local ok, result = xpcall(
-        function() return cb(
-            nil,
-            unpack(args)
-        ) end,
+        function() return cb(unpack(args)) end,
         function(err)
             thrownError = err
             return thrownError

package/dist/lualib/5.0/lualib_bundle.lua

@@ -193,8 +193,14 @@ do
                 result[table.getn(result) + 1] = v
             end
         else
-            for i, v in arrayLikeIterator(arrayLike) do
-                result[table.getn(result) + 1] = mapFn(thisArg, v, i - 1)
+            local i = 0
+            for ____, v in arrayLikeIterator(arrayLike) do
+                local ____mapFn_3 = mapFn
+                local ____thisArg_1 = thisArg
+                local ____v_2 = v
+                local ____i_0 = i
+                i = ____i_0 + 1
+                result[table.getn(result) + 1] = ____mapFn_3(____thisArg_1, ____v_2, ____i_0)
             end
         end
         return result
@@ -2602,10 +2608,7 @@ local function __TS__Using(self, cb, ...)
     local args = arg
     local thrownError
     local ok, result = xpcall(
-        function() return cb(
-            nil,
-            unpack(args)
-        ) end,
+        function() return cb(unpack(args)) end,
         function(err)
             thrownError = err
             return thrownError

package/dist/lualib/universal/ArrayFrom.lua

@@ -20,8 +20,14 @@ do
                 result[#result + 1] = v
             end
         else
-            for i, v in arrayLikeIterator(arrayLike) do
-                result[#result + 1] = mapFn(thisArg, v, i - 1)
+            local i = 0
+            for ____, v in arrayLikeIterator(arrayLike) do
+                local ____mapFn_3 = mapFn
+                local ____thisArg_1 = thisArg
+                local ____v_2 = v
+                local ____i_0 = i
+                i = ____i_0 + 1
+                result[#result + 1] = ____mapFn_3(____thisArg_1, ____v_2, ____i_0)
             end
         end
         return result

package/dist/lualib/universal/Using.lua

@@ -2,10 +2,7 @@ local function __TS__Using(self, cb, ...)
     local args = {...}
     local thrownError
     local ok, result = xpcall(
-        function() return cb(
-            nil,
-            __TS__Unpack(args)
-        ) end,
+        function() return cb(__TS__Unpack(args)) end,
         function(err)
             thrownError = err
             return thrownError

package/dist/lualib/universal/lualib_bundle.lua

@@ -193,8 +193,14 @@ do
                 result[#result + 1] = v
             end
         else
-            for i, v in arrayLikeIterator(arrayLike) do
-                result[#result + 1] = mapFn(thisArg, v, i - 1)
+            local i = 0
+            for ____, v in arrayLikeIterator(arrayLike) do
+                local ____mapFn_3 = mapFn
+                local ____thisArg_1 = thisArg
+                local ____v_2 = v
+                local ____i_0 = i
+                i = ____i_0 + 1
+                result[#result + 1] = ____mapFn_3(____thisArg_1, ____v_2, ____i_0)
             end
         end
         return result
@@ -2542,10 +2548,7 @@ local function __TS__Using(self, cb, ...)
     local args = {...}
     local thrownError
     local ok, result = xpcall(
-        function() return cb(
-            nil,
-            __TS__Unpack(args)
-        ) end,
+        function() return cb(__TS__Unpack(args)) end,
         function(err)
             thrownError = err
             return thrownError

package/dist/transformation/pre-transformers/using-transformer.js

@@ -18,7 +18,7 @@ function usingTransformer(context) {
                         ts.setParent(node2, parent[parent.length - 1]);
                         parent.push(node2);
                         ts.visitEachChild(node2, setParent, ctx);
-                        parent.push();
+                        parent.pop();
                         return node2;
                     }
                     ts.visitEachChild(updatedBlock, setParent, ctx);
@@ -54,7 +54,10 @@ function transformBlockWithUsing(context, statements, block) {
             const followingStatements = statements.slice(i + 1);
             const [followingHasUsings, replacedFollowingStatements] = transformBlockWithUsing(context, followingStatements, block);
             const callbackBody = ts.factory.createBlock(followingHasUsings ? replacedFollowingStatements : followingStatements);
-            const callback = ts.factory.createFunctionExpression(undefined, undefined, undefined, undefined, variableNames, undefined, callbackBody);
+            const callback = ts.factory.createFunctionExpression(
+            // Put async keyword in front of callback when we are in an async using
+            isAwaitUsing ? [ts.factory.createModifier(ts.SyntaxKind.AsyncKeyword)] : undefined, undefined, undefined, undefined, variableNames, ts.factory.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword), // Required for TS to not freak out trying to infer the type of synthetic nodes
+            callbackBody);
             // Replace using variable list with call to lualib function with callback and followed by all variable initializers
             const functionIdentifier = ts.factory.createIdentifier(isAwaitUsing ? "__TS__UsingAsync" : "__TS__Using");
             let call = ts.factory.createCallExpression(functionIdentifier, [], [

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

@@ -119,6 +119,9 @@ function computeDeclarationContextType(context, signatureDeclaration) {
         }
         return ContextType.NonVoid;
     }
+    if (signatureDeclaration.parent && ts.isTypeParameterDeclaration(signatureDeclaration.parent)) {
+        return ContextType.NonVoid;
+    }
     // When using --noImplicitSelf and the signature is defined in a file targeted by the program apply the @noSelf rule.
     const program = context.program;
     const options = program.getCompilerOptions();

package/dist/transformation/visitors/access.js

@@ -20,6 +20,7 @@ const multi_1 = require("./language-extensions/multi");
 const optional_chaining_1 = require("./optional-chaining");
 const typescript_2 = require("typescript");
 const identifier_1 = require("./identifier");
+const export_1 = require("../utils/export");
 function addOneToArrayAccessArgument(context, node, index) {
     const type = context.checker.getTypeAtLocation(node.expression);
     const argumentType = context.checker.getTypeAtLocation(node.argumentExpression);
@@ -108,7 +109,16 @@ function transformPropertyAccessExpressionWithCapture(context, node, thisValueCa
             return { expression };
         }
         else {
-            return { expression: lua.createIdentifier(property, node) };
+            // Check if we need to account for enum being exported int his file
+            if ((0, export_1.isSymbolExported)(context, type.symbol) &&
+                (0, export_1.getSymbolExportScope)(context, type.symbol) === node.expression.getSourceFile()) {
+                return {
+                    expression: lua.createTableIndexExpression((0, lua_ast_1.createExportsIdentifier)(), lua.createStringLiteral(property), node),
+                };
+            }
+            else {
+                return { expression: lua.createIdentifier(property, node) };
+            }
         }
     }
     const builtinResult = (0, builtins_1.transformBuiltinPropertyAccessExpression)(context, node);

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

@@ -115,7 +115,10 @@ function transformClassLikeDeclaration(classDeclaration, context, nameOverride)
     for (const member of classDeclaration.members) {
         if (ts.isAccessor(member)) {
             // Accessors
-            const accessors = getAllAccessorDeclarations(classDeclaration);
+            const symbol = context.checker.getSymbolAtLocation(member.name);
+            if (!symbol)
+                continue;
+            const accessors = getAllAccessorDeclarations(classDeclaration, symbol, context);
             if (accessors.firstAccessor !== member)
                 continue;
             const accessorsResult = (0, accessors_1.transformAccessorDeclarations)(context, accessors, localClassName);
@@ -161,9 +164,9 @@ function transformClassLikeDeclaration(classDeclaration, context, nameOverride)
     context.classSuperInfos.pop();
     return { statements: result, name: className };
 }
-function getAllAccessorDeclarations(classDeclaration) {
-    const getAccessor = classDeclaration.members.find(ts.isGetAccessor);
-    const setAccessor = classDeclaration.members.find(ts.isSetAccessor);
+function getAllAccessorDeclarations(classDeclaration, symbol, context) {
+    const getAccessor = classDeclaration.members.find((m) => ts.isGetAccessor(m) && context.checker.getSymbolAtLocation(m.name) === symbol);
+    const setAccessor = classDeclaration.members.find((m) => ts.isSetAccessor(m) && context.checker.getSymbolAtLocation(m.name) === symbol);
     // Get the first of the two (that is not undefined)
     const firstAccessor = getAccessor && (!setAccessor || getAccessor.pos < setAccessor.pos) ? getAccessor : setAccessor;
     return {

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

@@ -6,11 +6,10 @@ const lua = require("../../../LuaAST");
 const utils_1 = require("../../../utils");
 const export_1 = require("../../utils/export");
 const lua_ast_1 = require("../../utils/lua-ast");
-const scope_1 = require("../../utils/scope");
-const block_1 = require("../block");
-const identifier_1 = require("../identifier");
 const literal_1 = require("../literal");
 const import_1 = require("./import");
+const safe_names_1 = require("../../utils/safe-names");
+const path = require("path");
 const transformExportAssignment = (node, context) => {
     if (!context.resolver.isValueAliasDeclaration(node)) {
         return undefined;
@@ -62,30 +61,53 @@ function transformExportAll(context, node) {
     // Wrap this in a DoStatement to prevent polluting the scope.
     return lua.createDoStatement(result, node);
 }
-const isDefaultExportSpecifier = (node) => (node.name && ts.identifierToKeywordKind(node.name) === ts.SyntaxKind.DefaultKeyword) ||
-    (node.propertyName && ts.identifierToKeywordKind(node.propertyName) === ts.SyntaxKind.DefaultKeyword);
+const isDefaultExportSpecifier = (node) => (node.name &&
+    ts.isIdentifier(node.name) &&
+    ts.identifierToKeywordKind(node.name) === ts.SyntaxKind.DefaultKeyword) ||
+    (node.propertyName &&
+        ts.isIdentifier(node.propertyName) &&
+        ts.identifierToKeywordKind(node.propertyName) === ts.SyntaxKind.DefaultKeyword);
 function transformExportSpecifier(context, node) {
-    const exportedSymbol = context.checker.getExportSpecifierLocalTargetSymbol(node);
-    const exportedIdentifier = node.propertyName ? node.propertyName : node.name;
-    const exportedExpression = (0, literal_1.createShorthandIdentifier)(context, exportedSymbol, exportedIdentifier);
-    const isDefault = isDefaultExportSpecifier(node);
-    const exportAssignmentLeftHandSide = isDefault
-        ? (0, export_1.createDefaultExportExpression)(node)
-        : (0, export_1.createExportedIdentifier)(context, (0, identifier_1.transformIdentifier)(context, node.name));
-    return lua.createAssignmentStatement(exportAssignmentLeftHandSide, exportedExpression, node);
+    var _a;
+    const exportedName = node.name;
+    const exportedValue = (_a = node.propertyName) !== null && _a !== void 0 ? _a : node.name;
+    let rhs;
+    if (ts.isIdentifier(exportedValue)) {
+        const exportedSymbol = context.checker.getExportSpecifierLocalTargetSymbol(node);
+        rhs = (0, literal_1.createShorthandIdentifier)(context, exportedSymbol, exportedValue);
+    }
+    else {
+        rhs = lua.createStringLiteral(exportedName.text, exportedValue);
+    }
+    if (isDefaultExportSpecifier(node)) {
+        const lhs = (0, export_1.createDefaultExportExpression)(node);
+        return lua.createAssignmentStatement(lhs, rhs, node);
+    }
+    else {
+        const exportsTable = (0, lua_ast_1.createExportsIdentifier)();
+        const lhs = lua.createTableIndexExpression(exportsTable, lua.createStringLiteral(exportedName.text), exportedName);
+        return lua.createAssignmentStatement(lhs, rhs, 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.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;
-    // Now the module is imported, add the imports to the export table
+    var _a;
+    const result = [];
+    const importPath = ts.isStringLiteral(moduleSpecifier) ? moduleSpecifier.text.replace(/"/g, "") : "module";
+    // Create the require statement to extract values.
+    // local ____module = require("module")
+    const importUniqueName = lua.createIdentifier((0, safe_names_1.createSafeName)(path.basename(importPath)));
+    const requireCall = (0, import_1.createModuleRequire)(context, moduleSpecifier);
+    result.push(lua.createVariableDeclarationStatement(importUniqueName, requireCall, statement));
     for (const specifier of exportSpecifiers) {
-        result.push(lua.createAssignmentStatement((0, export_1.createExportedIdentifier)(context, (0, identifier_1.transformIdentifier)(context, specifier.name)), (0, identifier_1.transformIdentifier)(context, specifier.name)));
+        // Assign to exports table
+        const exportsTable = (0, lua_ast_1.createExportsIdentifier)();
+        const exportedName = specifier.name;
+        const exportedNameTransformed = (0, literal_1.transformPropertyName)(context, exportedName);
+        const lhs = lua.createTableIndexExpression(exportsTable, exportedNameTransformed, exportedName);
+        const exportedValue = (_a = specifier.propertyName) !== null && _a !== void 0 ? _a : specifier.name;
+        const rhs = lua.createTableIndexExpression(lua.cloneIdentifier(importUniqueName), (0, literal_1.transformPropertyName)(context, exportedValue), specifier);
+        result.push(lua.createAssignmentStatement(lhs, rhs, specifier));
     }
-    // Wrap this in a DoStatement to prevent polluting the scope.
     return lua.createDoStatement(result, statement);
 }
 const getExported = (context, exportSpecifiers) => exportSpecifiers.elements.filter(exportSpecifier => context.resolver.isValueAliasDeclaration(exportSpecifier));

package/dist/transformation/visitors/optional-chaining.js

@@ -124,6 +124,18 @@ function transformOptionalChainWithCapture(context, tsNode, thisValueCapture, is
         }
         return result;
     });
+    // handle super calls by passing self as context
+    function getLeftMostChainItem(node) {
+        if (ts.isPropertyAccessExpression(node)) {
+            return getLeftMostChainItem(node.expression);
+        }
+        else {
+            return node;
+        }
+    }
+    if (getLeftMostChainItem(tsLeftExpression).kind === ts.SyntaxKind.SuperKeyword) {
+        capturedThisValue = lua.createIdentifier("self");
+    }
     // handle context
     if (rightContextualCall) {
         if (capturedThisValue) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "typescript-to-lua",
-    "version": "1.26.1",
+    "version": "1.27.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": "5.5.2"
+        "typescript": "5.6.2"
     },
     "dependencies": {
         "@typescript-to-lua/language-extensions": "1.19.0",
@@ -67,10 +67,10 @@
         "jest-circus": "^29.5.0",
         "lua-types": "^2.13.0",
         "lua-wasm-bindings": "^0.3.1",
-        "prettier": "^2.8.4",
+        "prettier": "^2.8.8",
         "ts-jest": "^29.1.0",
         "ts-node": "^10.9.1",
-        "typescript": "^5.5.2",
+        "typescript": "^5.6.2",
         "typescript-eslint": "^7.13.1"
     }
 }