typescript-to-lua 1.2.0 → 1.3.3

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

@@ -10,6 +10,7 @@ const export_1 = require("../utils/export");
 const lua_ast_1 = require("../utils/lua-ast");
 const lualib_1 = require("../utils/lualib");
 const preceding_statements_1 = require("../utils/preceding-statements");
+const function_1 = require("./function");
 const identifier_1 = require("./identifier");
 const multi_1 = require("./language-extensions/multi");
 const literal_1 = require("./literal");
@@ -183,7 +184,10 @@ function transformVariableDeclaration(context, statement) {
         // Find variable identifier
         const identifierName = (0, identifier_1.transformIdentifier)(context, statement.name);
         const value = statement.initializer && context.transformExpression(statement.initializer);
-        return (0, lua_ast_1.createLocalOrExportedOrGlobalDeclaration)(context, identifierName, value, statement);
+        // Wrap functions being assigned to a type that contains additional properties in a callable table
+        // This catches 'const foo = function() {}; foo.bar = "FOOBAR";'
+        const wrappedValue = value && shouldWrapInitializerInCallableTable() ? (0, function_1.createCallableTable)(value) : value;
+        return (0, lua_ast_1.createLocalOrExportedOrGlobalDeclaration)(context, identifierName, wrappedValue, statement);
     }
     else if (ts.isArrayBindingPattern(statement.name) || ts.isObjectBindingPattern(statement.name)) {
         return transformBindingVariableDeclaration(context, statement.name, statement.initializer);
@@ -191,6 +195,17 @@ function transformVariableDeclaration(context, statement) {
     else {
         return (0, utils_1.assertNever)(statement.name);
     }
+    function shouldWrapInitializerInCallableTable() {
+        (0, utils_1.assert)(statement.initializer);
+        const initializer = ts.skipOuterExpressions(statement.initializer);
+        // do not wrap if not a function expression
+        if (!ts.isFunctionExpression(initializer) && !ts.isArrowFunction(initializer))
+            return false;
+        // Skip named function expressions because they will have been wrapped already
+        if (ts.isFunctionExpression(initializer) && initializer.name)
+            return false;
+        return (0, function_1.isFunctionTypeWithProperties)(context.checker.getTypeAtLocation(statement.name));
+    }
 }
 exports.transformVariableDeclaration = transformVariableDeclaration;
 function checkVariableDeclarationList(context, node) {

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

@@ -1,6 +1,3 @@
 import * as ts from "typescript";
-import * as lua from "../../LuaAST";
-import { TransformationContext } from "../context";
-import { FunctionVisitor } from "../context/visitors";
+import { FunctionVisitor } from "../context";
 export declare const transformVoidExpression: FunctionVisitor<ts.VoidExpression>;
-export declare const transformVoidExpressionStatement: (node: ts.VoidExpression, context: TransformationContext) => lua.VariableDeclarationStatement;

package/dist/transformation/visitors/void.js

@@ -1,20 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformVoidExpressionStatement = exports.transformVoidExpression = void 0;
+exports.transformVoidExpression = void 0;
 const ts = require("typescript");
 const lua = require("../../LuaAST");
+const expression_statement_1 = require("./expression-statement");
 // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/void
 const transformVoidExpression = (node, context) => {
     // If content is a literal it is safe to replace the entire expression with nil
     if (!ts.isLiteralExpression(node.expression)) {
-        // local ____ = <expression>
-        context.addPrecedingStatements(lua.createVariableDeclarationStatement(lua.createAnonymousIdentifier(), context.transformExpression(node.expression)));
+        const statements = (0, expression_statement_1.transformExpressionToStatement)(context, node.expression);
+        if (statements)
+            context.addPrecedingStatements(statements);
     }
-    return lua.createNilLiteral(node);
+    return lua.createNilLiteral();
 };
 exports.transformVoidExpression = transformVoidExpression;
-const transformVoidExpressionStatement = (node, context) => 
-// In case of a void expression statement we can omit the IIFE
-lua.createVariableDeclarationStatement(lua.createAnonymousIdentifier(), context.transformExpression(node.expression), node);
-exports.transformVoidExpressionStatement = transformVoidExpressionStatement;
 //# sourceMappingURL=void.js.map

package/language-extensions/index.d.ts

@@ -78,6 +78,16 @@ declare type LuaIterable<TValue, TState = undefined> = Iterable<TValue> &
     LuaIterator<TValue, TState> &
     LuaExtension<"__luaIterableBrand">;
 
+/**
+ * Represents an object that can be iterated with pairs()
+ * For more information see: https://typescripttolua.github.io/docs/advanced/language-extensions
+ *
+ * @param TKey The type of the key returned each iteration.
+ * @param TValue The type of the value returned each iteration.
+ */
+declare type LuaPairsIterable<TKey extends AnyNotNil, TValue> = Iterable<[TKey, TValue]> &
+    LuaExtension<"__luaPairsIterableBrand">;
+
 /**
  * Calls to functions with this type are translated to `left + right`.
  * For more information see: https://typescripttolua.github.io/docs/advanced/language-extensions
@@ -535,7 +545,7 @@ declare type LuaTableDeleteMethod<TKey extends AnyNotNil> = ((key: TKey) => bool
  * @param TKey The type of the keys used to access the table.
  * @param TValue The type of the values stored in the table.
  */
-declare interface LuaTable<TKey extends AnyNotNil = AnyNotNil, TValue = any> {
+declare interface LuaTable<TKey extends AnyNotNil = AnyNotNil, TValue = any> extends LuaPairsIterable<TKey, TValue> {
     length: LuaLengthMethod<number>;
     get: LuaTableGetMethod<TKey, TValue>;
     set: LuaTableSetMethod<TKey, TValue>;

package/package.json

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