typescript-to-lua 1.31.4 → 1.32.0

package/dist/transformation/utils/lua-ast.d.ts

@@ -8,6 +8,7 @@ export declare function createExportsIdentifier(): lua.Identifier;
 export declare function addToNumericExpression(expression: lua.Expression, change: number): lua.Expression;
 export declare function getNumberLiteralValue(expression?: lua.Expression): number | undefined;
 export declare function createUnpackCall(context: TransformationContext, expression: lua.Expression, tsOriginal?: ts.Node): lua.Expression;
+export declare function createBoundedUnpackCall(context: TransformationContext, expression: lua.Expression, maxUnpackItem: number, tsOriginal?: ts.Node): lua.Expression;
 export declare function isUnpackCall(node: lua.Node): boolean;
 export declare function wrapInTable(...expressions: lua.Expression[]): lua.TableExpression;
 export declare function wrapInToStringForConcat(expression: lua.Expression): lua.Expression;

package/dist/transformation/utils/lua-ast.js

@@ -7,6 +7,7 @@ exports.createExportsIdentifier = createExportsIdentifier;
 exports.addToNumericExpression = addToNumericExpression;
 exports.getNumberLiteralValue = getNumberLiteralValue;
 exports.createUnpackCall = createUnpackCall;
+exports.createBoundedUnpackCall = createBoundedUnpackCall;
 exports.isUnpackCall = isUnpackCall;
 exports.wrapInTable = wrapInTable;
 exports.wrapInToStringForConcat = wrapInToStringForConcat;
@@ -72,6 +73,21 @@ function createUnpackCall(context, expression, tsOriginal) {
         : lua.createTableIndexExpression(lua.createIdentifier("table"), lua.createStringLiteral("unpack"));
     return lua.setNodeFlags(lua.createCallExpression(unpack, [expression], tsOriginal), lua.NodeFlags.TableUnpackCall);
 }
+function createBoundedUnpackCall(context, expression, maxUnpackItem, tsOriginal) {
+    if (context.luaTarget === CompilerOptions_1.LuaTarget.Universal) {
+        return (0, lualib_1.transformLuaLibFunction)(context, LuaLib_1.LuaLibFeature.Unpack, tsOriginal, expression);
+    }
+    // Lua 5.0 does not support this signature, so don't add the arguments there
+    const extraArgs = context.luaTarget === CompilerOptions_1.LuaTarget.Lua50
+        ? []
+        : [lua.createNumericLiteral(1), lua.createNumericLiteral(maxUnpackItem)];
+    const unpack = context.luaTarget === CompilerOptions_1.LuaTarget.Lua50 ||
+        context.luaTarget === CompilerOptions_1.LuaTarget.Lua51 ||
+        context.luaTarget === CompilerOptions_1.LuaTarget.LuaJIT
+        ? lua.createIdentifier("unpack")
+        : lua.createTableIndexExpression(lua.createIdentifier("table"), lua.createStringLiteral("unpack"));
+    return lua.setNodeFlags(lua.createCallExpression(unpack, [expression, ...extraArgs], tsOriginal), lua.NodeFlags.TableUnpackCall);
+}
 function isUnpackCall(node) {
     return lua.isCallExpression(node) && (node.flags & lua.NodeFlags.TableUnpackCall) !== 0;
 }

package/dist/transformation/visitors/access.js

@@ -83,7 +83,7 @@ function transformPropertyAccessExpressionWithCapture(context, node, thisValueCa
     const isOptionalLeft = (0, optional_chaining_1.isOptionalContinuation)(node.expression);
     let property = node.name.text;
     const symbol = context.checker.getSymbolAtLocation(node.name);
-    const customName = (0, identifier_1.getCustomNameFromSymbol)(symbol);
+    const customName = (0, identifier_1.getCustomNameFromSymbol)(context, symbol);
     if (customName) {
         property = customName;
     }

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

@@ -165,7 +165,7 @@ function transformAssignmentStatement(context, expression) {
             else {
                 right = context.transformExpression(expression.right);
                 if (!(0, multi_1.isMultiReturnCall)(context, expression.right) && (0, typescript_2.isArrayType)(context, rightType)) {
-                    right = (0, lua_ast_1.createUnpackCall)(context, right, expression.right);
+                    right = (0, lua_ast_1.createBoundedUnpackCall)(context, right, expression.left.elements.length, expression.right);
                 }
             }
             const left = expression.left.elements.map(e => transformAssignmentLeftHandSideExpression(context, e));

package/dist/transformation/visitors/call.js

@@ -94,7 +94,7 @@ function transformContextualCallExpression(context, node, args) {
         const table = context.transformExpression(left.expression);
         let name = left.name.text;
         const symbol = context.checker.getSymbolAtLocation(left);
-        const customName = (0, identifier_1.getCustomNameFromSymbol)(symbol);
+        const customName = (0, identifier_1.getCustomNameFromSymbol)(context, symbol);
         if (customName) {
             name = customName;
         }

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

@@ -2,6 +2,6 @@ import * as ts from "typescript";
 import * as lua from "../../LuaAST";
 import { FunctionVisitor, TransformationContext } from "../context";
 export declare function transformIdentifier(context: TransformationContext, identifier: ts.Identifier): lua.Identifier;
-export declare function getCustomNameFromSymbol(symbol?: ts.Symbol): undefined | string;
+export declare function getCustomNameFromSymbol(context: TransformationContext, symbol?: ts.Symbol): undefined | string;
 export declare function transformIdentifierWithSymbol(context: TransformationContext, node: ts.Identifier, symbol: ts.Symbol | undefined): lua.Expression;
 export declare const transformIdentifierExpression: FunctionVisitor<ts.Identifier>;

package/dist/transformation/visitors/identifier.js

@@ -22,7 +22,7 @@ const annotations_1 = require("../utils/annotations");
 function transformIdentifier(context, identifier) {
     return transformNonValueIdentifier(context, identifier, context.checker.getSymbolAtLocation(identifier));
 }
-function getCustomNameFromSymbol(symbol) {
+function getCustomNameFromSymbol(context, symbol) {
     let retVal;
     if (symbol) {
         const declarations = symbol.getDeclarations();
@@ -35,6 +35,17 @@ function getCustomNameFromSymbol(symbol) {
                     customNameAnnotation = foundAnnotation;
                     break;
                 }
+                // If the symbol is an imported value, check the original declaration
+                // beware of declaration.propertyName, this is the import name alias and should not be renamed!
+                if (ts.isImportSpecifier(declaration) && !declaration.propertyName) {
+                    const importedType = context.checker.getTypeAtLocation(declaration);
+                    if (importedType.symbol) {
+                        const importedCustomName = getCustomNameFromSymbol(context, importedType.symbol);
+                        if (importedCustomName) {
+                            return importedCustomName;
+                        }
+                    }
+                }
             }
             if (customNameAnnotation) {
                 retVal = customNameAnnotation.args[0];
@@ -73,7 +84,7 @@ function transformNonValueIdentifier(context, identifier, symbol) {
         }
     }
     let text = (0, safe_names_1.hasUnsafeIdentifierName)(context, identifier, symbol) ? (0, safe_names_1.createSafeName)(identifier.text) : identifier.text;
-    const customName = getCustomNameFromSymbol(symbol);
+    const customName = getCustomNameFromSymbol(context, symbol);
     if (customName)
         text = customName;
     const symbolId = (0, symbols_1.getIdentifierSymbolId)(context, identifier, symbol);

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

@@ -35,9 +35,14 @@ function shouldBeImported(context, importNode) {
     return context.resolver.isReferencedAliasDeclaration(importNode);
 }
 function transformImportSpecifier(context, importSpecifier, moduleTableName) {
-    var _a;
+    var _a, _b;
+    const type = context.checker.getTypeAtLocation(importSpecifier.name);
     const leftIdentifier = (0, identifier_1.transformIdentifier)(context, importSpecifier.name);
-    const propertyName = (0, literal_1.transformPropertyName)(context, (_a = importSpecifier.propertyName) !== null && _a !== void 0 ? _a : importSpecifier.name);
+    // If imported value has a customName annotation use that, otherwise use regular property
+    const customName = (0, identifier_1.getCustomNameFromSymbol)(context, type.getSymbol());
+    const propertyName = customName
+        ? lua.createStringLiteral(customName, (_a = importSpecifier.propertyName) !== null && _a !== void 0 ? _a : importSpecifier.name)
+        : (0, literal_1.transformPropertyName)(context, (_b = importSpecifier.propertyName) !== null && _b !== void 0 ? _b : importSpecifier.name);
     return lua.createVariableDeclarationStatement(leftIdentifier, lua.createTableIndexExpression(moduleTableName, propertyName), importSpecifier);
 }
 const transformImportDeclaration = (statement, context) => {

package/dist/transformation/visitors/variable-declaration.js

@@ -153,8 +153,8 @@ function transformBindingVariableDeclaration(context, bindingPattern, initialize
             statements.push(...(0, lua_ast_1.createLocalOrExportedOrGlobalDeclaration)(context, vars, values, initializer));
         }
         else {
-            // local vars = this.transpileDestructingAssignmentValue(node.initializer);
-            const unpackedInitializer = (0, lua_ast_1.createUnpackCall)(context, context.transformExpression(initializer), initializer);
+            // use unpack(thing, 1, #bindingItems) to unpack
+            const unpackedInitializer = (0, lua_ast_1.createBoundedUnpackCall)(context, context.transformExpression(initializer), bindingPattern.elements.length, initializer);
             statements.push(...(0, lua_ast_1.createLocalOrExportedOrGlobalDeclaration)(context, vars, unpackedInitializer, initializer));
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "typescript-to-lua",
-    "version": "1.31.4",
+    "version": "1.32.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/",