typescript-to-lua 1.16.0 → 1.16.2

package/dist/lualib/5.0/Map.lua

@@ -29,7 +29,6 @@ do
             end
         end
     end
-    Map[Symbol.species] = Map
     function Map.prototype.clear(self)
         self.items = {}
         self.nextKey = {}
@@ -137,4 +136,5 @@ do
             end
         }
     end
+    Map[Symbol.species] = Map
 end

package/dist/lualib/5.0/Set.lua

@@ -27,7 +27,6 @@ do
             end
         end
     end
-    Set[Symbol.species] = Set
     function Set.prototype.add(self, value)
         local isNewValue = not self:has(value)
         if isNewValue then
@@ -127,4 +126,5 @@ do
             end
         }
     end
+    Set[Symbol.species] = Set
 end

package/dist/lualib/5.0/WeakMap.lua

@@ -26,7 +26,6 @@ do
             end
         end
     end
-    WeakMap[Symbol.species] = WeakMap
     function WeakMap.prototype.delete(self, key)
         local contains = self:has(key)
         self.items[key] = nil
@@ -42,4 +41,5 @@ do
         self.items[key] = value
         return self
     end
+    WeakMap[Symbol.species] = WeakMap
 end

package/dist/lualib/5.0/WeakSet.lua

@@ -25,7 +25,6 @@ do
             end
         end
     end
-    WeakSet[Symbol.species] = WeakSet
     function WeakSet.prototype.add(self, value)
         self.items[value] = true
         return self
@@ -38,4 +37,5 @@ do
     function WeakSet.prototype.has(self, value)
         return self.items[value] == true
     end
+    WeakSet[Symbol.species] = WeakSet
 end

package/dist/lualib/5.0/lualib_bundle.lua

@@ -1278,7 +1278,6 @@ do
             end
         end
     end
-    Map[Symbol.species] = Map
     function Map.prototype.clear(self)
         self.items = {}
         self.nextKey = {}
@@ -1386,6 +1385,7 @@ do
             end
         }
     end
+    Map[Symbol.species] = Map
 end
 
 local function __TS__StringSlice(self, start, ____end)
@@ -1902,7 +1902,6 @@ do
             end
         end
     end
-    Set[Symbol.species] = Set
     function Set.prototype.add(self, value)
         local isNewValue = not self:has(value)
         if isNewValue then
@@ -2002,6 +2001,7 @@ do
             end
         }
     end
+    Set[Symbol.species] = Set
 end
 
 local function __TS__SparseArrayNew(...)
@@ -2052,7 +2052,6 @@ do
             end
         end
     end
-    WeakMap[Symbol.species] = WeakMap
     function WeakMap.prototype.delete(self, key)
         local contains = self:has(key)
         self.items[key] = nil
@@ -2068,6 +2067,7 @@ do
         self.items[key] = value
         return self
     end
+    WeakMap[Symbol.species] = WeakMap
 end
 
 local WeakSet
@@ -2097,7 +2097,6 @@ do
             end
         end
     end
-    WeakSet[Symbol.species] = WeakSet
     function WeakSet.prototype.add(self, value)
         self.items[value] = true
         return self
@@ -2110,6 +2109,7 @@ do
     function WeakSet.prototype.has(self, value)
         return self.items[value] == true
     end
+    WeakSet[Symbol.species] = WeakSet
 end
 
 local function __TS__SourceMapTraceBack(fileName, sourceMap)

package/dist/lualib/universal/Map.lua

@@ -29,7 +29,6 @@ do
             end
         end
     end
-    Map[Symbol.species] = Map
     function Map.prototype.clear(self)
         self.items = {}
         self.nextKey = {}
@@ -137,4 +136,5 @@ do
             end
         }
     end
+    Map[Symbol.species] = Map
 end

package/dist/lualib/universal/Set.lua

@@ -27,7 +27,6 @@ do
             end
         end
     end
-    Set[Symbol.species] = Set
     function Set.prototype.add(self, value)
         local isNewValue = not self:has(value)
         if isNewValue then
@@ -127,4 +126,5 @@ do
             end
         }
     end
+    Set[Symbol.species] = Set
 end

package/dist/lualib/universal/WeakMap.lua

@@ -26,7 +26,6 @@ do
             end
         end
     end
-    WeakMap[Symbol.species] = WeakMap
     function WeakMap.prototype.delete(self, key)
         local contains = self:has(key)
         self.items[key] = nil
@@ -42,4 +41,5 @@ do
         self.items[key] = value
         return self
     end
+    WeakMap[Symbol.species] = WeakMap
 end

package/dist/lualib/universal/WeakSet.lua

@@ -25,7 +25,6 @@ do
             end
         end
     end
-    WeakSet[Symbol.species] = WeakSet
     function WeakSet.prototype.add(self, value)
         self.items[value] = true
         return self
@@ -38,4 +37,5 @@ do
     function WeakSet.prototype.has(self, value)
         return self.items[value] == true
     end
+    WeakSet[Symbol.species] = WeakSet
 end

package/dist/lualib/universal/lualib_bundle.lua

@@ -1254,7 +1254,6 @@ do
             end
         end
     end
-    Map[Symbol.species] = Map
     function Map.prototype.clear(self)
         self.items = {}
         self.nextKey = {}
@@ -1362,6 +1361,7 @@ do
             end
         }
     end
+    Map[Symbol.species] = Map
 end
 
 local __TS__Match = string.match
@@ -1838,7 +1838,6 @@ do
             end
         end
     end
-    Set[Symbol.species] = Set
     function Set.prototype.add(self, value)
         local isNewValue = not self:has(value)
         if isNewValue then
@@ -1938,6 +1937,7 @@ do
             end
         }
     end
+    Set[Symbol.species] = Set
 end
 
 local function __TS__SparseArrayNew(...)
@@ -1989,7 +1989,6 @@ do
             end
         end
     end
-    WeakMap[Symbol.species] = WeakMap
     function WeakMap.prototype.delete(self, key)
         local contains = self:has(key)
         self.items[key] = nil
@@ -2005,6 +2004,7 @@ do
         self.items[key] = value
         return self
     end
+    WeakMap[Symbol.species] = WeakMap
 end
 
 local WeakSet
@@ -2034,7 +2034,6 @@ do
             end
         end
     end
-    WeakSet[Symbol.species] = WeakSet
     function WeakSet.prototype.add(self, value)
         self.items[value] = true
         return self
@@ -2047,6 +2046,7 @@ do
     function WeakSet.prototype.has(self, value)
         return self.items[value] == true
     end
+    WeakSet[Symbol.species] = WeakSet
 end
 
 local function __TS__SourceMapTraceBack(fileName, sourceMap)

package/dist/transformation/utils/typescript/types.d.ts

@@ -9,6 +9,7 @@ export declare function isNumberType(context: TransformationContext, type: ts.Ty
  */
 export declare function forTypeOrAnySupertype(context: TransformationContext, type: ts.Type, predicate: (type: ts.Type) => boolean): boolean;
 export declare function isArrayType(context: TransformationContext, type: ts.Type): boolean;
+export declare function isAlwaysArrayType(context: TransformationContext, type: ts.Type): boolean;
 export declare function isFunctionType(type: ts.Type): boolean;
 export declare function canBeFalsy(context: TransformationContext, type: ts.Type): boolean;
 export declare function canBeFalsyWhenNotNull(context: TransformationContext, type: ts.Type): boolean;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.canBeFalsyWhenNotNull = exports.canBeFalsy = exports.isFunctionType = exports.isArrayType = exports.forTypeOrAnySupertype = exports.isNumberType = exports.isStringType = exports.typeCanHaveSomeOfFlags = exports.typeAlwaysHasSomeOfFlags = void 0;
+exports.canBeFalsyWhenNotNull = exports.canBeFalsy = exports.isFunctionType = exports.isAlwaysArrayType = exports.isArrayType = exports.forTypeOrAnySupertype = exports.isNumberType = exports.isStringType = exports.typeCanHaveSomeOfFlags = exports.typeAlwaysHasSomeOfFlags = void 0;
 const ts = require("typescript");
 function typeAlwaysHasSomeOfFlags(context, type, flags) {
     const baseConstraint = context.checker.getBaseConstraintOfType(type);
@@ -63,6 +63,20 @@ function isExplicitArrayType(context, type) {
     }
     return false;
 }
+function isAlwaysExplicitArrayType(context, type) {
+    if (context.checker.isArrayType(type) || context.checker.isTupleType(type))
+        return true;
+    if (type.symbol) {
+        const baseConstraint = context.checker.getBaseConstraintOfType(type);
+        if (baseConstraint && baseConstraint !== type) {
+            return isAlwaysExplicitArrayType(context, baseConstraint);
+        }
+    }
+    if (type.isUnionOrIntersection()) {
+        return type.types.every(t => isAlwaysExplicitArrayType(context, t));
+    }
+    return false;
+}
 /**
  * Iterate over a type and its bases until the callback returns true.
  */
@@ -83,6 +97,10 @@ function isArrayType(context, type) {
     return forTypeOrAnySupertype(context, type, t => isExplicitArrayType(context, t));
 }
 exports.isArrayType = isArrayType;
+function isAlwaysArrayType(context, type) {
+    return forTypeOrAnySupertype(context, type, t => isAlwaysExplicitArrayType(context, t));
+}
+exports.isAlwaysArrayType = isAlwaysArrayType;
 function isFunctionType(type) {
     return type.getCallSignatures().length > 0;
 }

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

@@ -102,6 +102,15 @@ function transformClassLikeDeclaration(classDeclaration, context, nameOverride)
         result.push(lua.createAssignmentStatement((0, constructor_1.createConstructorName)(localClassName), constructorFunction, classDeclaration));
     }
     // Transform class members
+    // First transform the methods, in case the static properties call them
+    for (const member of classDeclaration.members) {
+        if (ts.isMethodDeclaration(member)) {
+            // Methods
+            const statements = (0, method_1.transformMethodDeclaration)(context, member, localClassName);
+            result.push(...statements);
+        }
+    }
+    // Then transform the rest
     for (const member of classDeclaration.members) {
         if (ts.isAccessor(member)) {
             // Accessors
@@ -113,12 +122,6 @@ function transformClassLikeDeclaration(classDeclaration, context, nameOverride)
                 result.push(accessorsResult);
             }
         }
-        else if (ts.isMethodDeclaration(member)) {
-            // Methods
-            const statement = (0, method_1.transformMethodDeclaration)(context, member, localClassName);
-            if (statement)
-                result.push(statement);
-        }
         else if (ts.isPropertyDeclaration(member)) {
             // Properties
             if ((0, utils_1.isStaticNode)(member)) {

package/dist/transformation/visitors/class/members/method.d.ts

@@ -3,4 +3,4 @@ import * as lua from "../../../../LuaAST";
 import { TransformationContext } from "../../../context";
 export declare function transformMemberExpressionOwnerName(node: ts.PropertyDeclaration | ts.MethodDeclaration | ts.AccessorDeclaration, className: lua.Identifier): lua.Expression;
 export declare function transformMethodName(context: TransformationContext, node: ts.MethodDeclaration): lua.Expression;
-export declare function transformMethodDeclaration(context: TransformationContext, node: ts.MethodDeclaration, className: lua.Identifier): lua.Statement | undefined;
+export declare function transformMethodDeclaration(context: TransformationContext, node: ts.MethodDeclaration, className: lua.Identifier): lua.Statement[];

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

@@ -24,7 +24,7 @@ function transformMethodDeclaration(context, node, className) {
     var _a, _b;
     // Don't transform methods without body (overload declarations)
     if (!node.body)
-        return;
+        return [];
     const methodTable = transformMemberExpressionOwnerName(node, className);
     const methodName = transformMethodName(context, node);
     const [functionExpression] = (0, function_1.transformFunctionToExpression)(context, node);
@@ -33,14 +33,21 @@ function transformMethodDeclaration(context, node, className) {
     if (methodHasDecorators || methodHasParameterDecorators) {
         if (context.options.experimentalDecorators) {
             // Legacy decorator statement
-            return lua.createExpressionStatement((0, decorators_1.createClassMethodDecoratingExpression)(context, node, functionExpression, className));
+            return [
+                lua.createAssignmentStatement(lua.createTableIndexExpression(methodTable, methodName), functionExpression),
+                lua.createExpressionStatement((0, decorators_1.createClassMethodDecoratingExpression)(context, node, functionExpression, className)),
+            ];
         }
         else {
-            return lua.createAssignmentStatement(lua.createTableIndexExpression(methodTable, methodName), (0, decorators_1.createClassMethodDecoratingExpression)(context, node, functionExpression, className), node);
+            return [
+                lua.createAssignmentStatement(lua.createTableIndexExpression(methodTable, methodName), (0, decorators_1.createClassMethodDecoratingExpression)(context, node, functionExpression, className), node),
+            ];
         }
     }
     else {
-        return lua.createAssignmentStatement(lua.createTableIndexExpression(methodTable, methodName), functionExpression, node);
+        return [
+            lua.createAssignmentStatement(lua.createTableIndexExpression(methodTable, methodName), functionExpression, node),
+        ];
     }
 }
 exports.transformMethodDeclaration = transformMethodDeclaration;

package/dist/transformation/visitors/spread.js

@@ -83,7 +83,8 @@ const transformSpreadElement = (node, context) => {
         }
     }
     const type = context.checker.getTypeAtLocation(node.expression); // not ts-inner expression, in case of casts
-    if ((0, typescript_1.isArrayType)(context, type)) {
+    if ((0, typescript_1.isAlwaysArrayType)(context, type)) {
+        // All union members must be arrays to be able to shortcut to unpack call
         return (0, lua_ast_1.createUnpackCall)(context, innerExpression, node);
     }
     return (0, lualib_1.transformLuaLibFunction)(context, lualib_1.LuaLibFeature.Spread, node, innerExpression);

package/package.json

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