typescript-to-lua 1.16.1 → 1.16.3

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,11 +122,6 @@ function transformClassLikeDeclaration(classDeclaration, context, nameOverride)
                 result.push(accessorsResult);
             }
         }
-        else if (ts.isMethodDeclaration(member)) {
-            // Methods
-            const statements = (0, method_1.transformMethodDeclaration)(context, member, localClassName);
-            result.push(...statements);
-        }
         else if (ts.isPropertyDeclaration(member)) {
             // Properties
             if ((0, utils_1.isStaticNode)(member)) {

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/dist/transformation/visitors/switch.js

@@ -11,11 +11,17 @@ const containsBreakOrReturn = (nodes) => {
         if (ts.isBreakStatement(s) || ts.isReturnStatement(s)) {
             return true;
         }
-        else if (ts.isBlock(s) && containsBreakOrReturn(s.getChildren())) {
+        else if (ts.isBlock(s) && containsBreakOrReturn(s.statements)) {
             return true;
         }
-        else if (s.kind === ts.SyntaxKind.SyntaxList && containsBreakOrReturn(s.getChildren())) {
-            return true;
+        else if (s.kind === ts.SyntaxKind.SyntaxList) {
+            // We cannot use getChildren() because that breaks when using synthetic nodes from transformers
+            // So get children the long way
+            const children = [];
+            ts.forEachChild(s, c => children.push(c));
+            if (containsBreakOrReturn(children)) {
+                return true;
+            }
         }
     }
     return false;

package/dist/transpilation/plugins.d.ts

@@ -29,6 +29,7 @@ export interface Plugin {
      * This function is called after translating the input program to Lua, after resolving dependencies and after bundling.
      */
     beforeEmit?: (program: ts.Program, options: CompilerOptions, emitHost: EmitHost, result: EmitFile[]) => ts.Diagnostic[] | void;
+    moduleResolution?: (moduleIdentifier: string, requiringFile: string, options: CompilerOptions, emitHost: EmitHost) => string | undefined;
 }
 export declare function getPlugins(program: ts.Program): {
     diagnostics: ts.Diagnostic[];

package/dist/transpilation/resolve.d.ts

@@ -1,8 +1,9 @@
 import * as ts from "typescript";
 import { EmitHost, ProcessedFile } from "./utils";
+import { Plugin } from "./plugins";
 interface ResolutionResult {
     resolvedFiles: ProcessedFile[];
     diagnostics: ts.Diagnostic[];
 }
-export declare function resolveDependencies(program: ts.Program, files: ProcessedFile[], emitHost: EmitHost): ResolutionResult;
+export declare function resolveDependencies(program: ts.Program, files: ProcessedFile[], emitHost: EmitHost, plugins: Plugin[]): ResolutionResult;
 export {};

package/dist/transpilation/resolve.js

@@ -19,10 +19,11 @@ const resolver = resolve.ResolverFactory.createResolver({
     symlinks: false, // Do not resolve symlinks to their original paths (that breaks node_modules detection)
 });
 class ResolutionContext {
-    constructor(program, options, emitHost) {
+    constructor(program, options, emitHost, plugins) {
         this.program = program;
         this.options = options;
         this.emitHost = emitHost;
+        this.plugins = plugins;
         this.diagnostics = [];
         this.resolvedFiles = new Map();
         this.processedDependencies = new Set();
@@ -52,6 +53,7 @@ class ResolutionContext {
         }
     }
     resolveImport(file, required) {
+        var _a;
         // Do no resolve lualib - always use the lualib of the application entry point, not the lualib from external packages
         if (required.requirePath === "lualib_bundle") {
             this.resolvedFiles.set("lualib_bundle", { fileName: "lualib_bundle", code: "" });
@@ -63,7 +65,7 @@ class ResolutionContext {
             }
             return;
         }
-        const dependencyPath = this.resolveDependencyPath(file, required.requirePath);
+        const dependencyPath = (_a = this.resolveDependencyPathsWithPlugins(file, required.requirePath)) !== null && _a !== void 0 ? _a : this.resolveDependencyPath(file, required.requirePath);
         if (!dependencyPath)
             return this.couldNotResolveImport(required, file);
         if (this.options.tstlVerbose) {
@@ -77,6 +79,46 @@ class ResolutionContext {
             replaceRequireInSourceMap(file, required, resolvedRequire, this.options.extension);
         }
     }
+    resolveDependencyPathsWithPlugins(requiringFile, dependency) {
+        const requiredFromLuaFile = requiringFile.fileName.endsWith(".lua");
+        for (const plugin of this.plugins) {
+            if (plugin.moduleResolution != null) {
+                const pluginResolvedPath = plugin.moduleResolution(dependency, requiringFile.fileName, this.options, this.emitHost);
+                if (pluginResolvedPath !== undefined) {
+                    // If lua file is in node_module
+                    if (requiredFromLuaFile && isNodeModulesFile(requiringFile.fileName)) {
+                        // If requiring file is in lua module, try to resolve sibling in that file first
+                        const resolvedNodeModulesFile = this.resolveLuaDependencyPathFromNodeModules(requiringFile, pluginResolvedPath);
+                        if (resolvedNodeModulesFile) {
+                            if (this.options.tstlVerbose) {
+                                console.log(`Resolved file path for module ${dependency} to path ${pluginResolvedPath} using plugin.`);
+                            }
+                            return resolvedNodeModulesFile;
+                        }
+                    }
+                    const resolvedPath = this.formatPathToFile(pluginResolvedPath, requiringFile);
+                    const fileFromPath = this.getFileFromPath(resolvedPath);
+                    if (fileFromPath) {
+                        if (this.options.tstlVerbose) {
+                            console.log(`Resolved file path for module ${dependency} to path ${pluginResolvedPath} using plugin.`);
+                        }
+                        return fileFromPath;
+                    }
+                }
+            }
+        }
+    }
+    formatPathToFile(targetPath, required) {
+        var _a;
+        const isRelative = ["/", "./", "../"].some(p => targetPath.startsWith(p));
+        // // If the import is relative, always resolve it relative to the requiring file
+        // // If the import is not relative, resolve it relative to options.baseUrl if it is set
+        const fileDirectory = path.dirname(required.fileName);
+        const relativeTo = isRelative ? fileDirectory : (_a = this.options.baseUrl) !== null && _a !== void 0 ? _a : fileDirectory;
+        // // Check if file is a file in the project
+        const resolvedPath = path.join(relativeTo, targetPath);
+        return resolvedPath;
+    }
     processDependency(dependencyPath) {
         if (this.processedDependencies.has(dependencyPath))
             return;
@@ -102,7 +144,6 @@ class ResolutionContext {
         this.diagnostics.push((0, diagnostics_1.couldNotResolveRequire)(required.requirePath, path.relative((0, transpiler_1.getProjectRoot)(this.program), file.fileName)));
     }
     resolveDependencyPath(requiringFile, dependency) {
-        var _a;
         const fileDirectory = path.dirname(requiringFile.fileName);
         if (this.options.tstlVerbose) {
             console.log(`Resolving "${dependency}" from ${(0, utils_1.normalizeSlashes)(requiringFile.fileName)}`);
@@ -115,13 +156,8 @@ class ResolutionContext {
             if (resolvedNodeModulesFile)
                 return resolvedNodeModulesFile;
         }
-        // Check if the import is relative
-        const isRelative = ["/", "./", "../"].some(p => dependency.startsWith(p));
-        // If the import is relative, always resolve it relative to the requiring file
-        // If the import is not relative, resolve it relative to options.baseUrl if it is set
-        const relativeTo = isRelative ? fileDirectory : (_a = this.options.baseUrl) !== null && _a !== void 0 ? _a : fileDirectory;
         // Check if file is a file in the project
-        const resolvedPath = path.join(relativeTo, dependencyPath);
+        const resolvedPath = this.formatPathToFile(dependencyPath, requiringFile);
         const fileFromPath = this.getFileFromPath(resolvedPath);
         if (fileFromPath)
             return fileFromPath;
@@ -235,9 +271,9 @@ class ResolutionContext {
         }
     }
 }
-function resolveDependencies(program, files, emitHost) {
+function resolveDependencies(program, files, emitHost, plugins) {
     const options = program.getCompilerOptions();
-    const resolutionContext = new ResolutionContext(program, options, emitHost);
+    const resolutionContext = new ResolutionContext(program, options, emitHost, plugins);
     // Resolve dependencies for all processed files
     for (const file of files) {
         if (options.tstlVerbose) {

package/dist/transpilation/transpiler.d.ts

@@ -1,4 +1,5 @@
 import * as ts from "typescript";
+import { Plugin } from "./plugins";
 import { TranspileOptions } from "./transpile";
 import { EmitFile, EmitHost, ProcessedFile } from "./utils";
 export interface TranspilerOptions {
@@ -16,7 +17,7 @@ export declare class Transpiler {
     constructor({ emitHost }?: TranspilerOptions);
     emit(emitOptions: EmitOptions): EmitResult;
     private emitFiles;
-    protected getEmitPlan(program: ts.Program, diagnostics: ts.Diagnostic[], files: ProcessedFile[]): {
+    protected getEmitPlan(program: ts.Program, diagnostics: ts.Diagnostic[], files: ProcessedFile[], plugins: Plugin[]): {
         emitPlan: EmitFile[];
     };
     private getLuaLibBundleContent;

package/dist/transpilation/transpiler.js

@@ -23,7 +23,7 @@ class Transpiler {
             ...emitOptions,
             plugins,
         });
-        const { emitPlan } = this.getEmitPlan(program, transpileDiagnostics, freshFiles);
+        const { emitPlan } = this.getEmitPlan(program, transpileDiagnostics, freshFiles, plugins);
         const emitDiagnostics = this.emitFiles(program, plugins, emitPlan, writeFile);
         return {
             diagnostics: getPluginsDiagnostics.concat(transpileDiagnostics, emitDiagnostics),
@@ -60,14 +60,14 @@ class Transpiler {
         performance.endSection("emit");
         return diagnostics;
     }
-    getEmitPlan(program, diagnostics, files) {
+    getEmitPlan(program, diagnostics, files, plugins) {
         performance.startSection("getEmitPlan");
         const options = program.getCompilerOptions();
         if (options.tstlVerbose) {
             console.log("Constructing emit plan");
         }
         // Resolve imported modules and modify output Lua requires
-        const resolutionResult = (0, resolve_1.resolveDependencies)(program, files, this.emitHost);
+        const resolutionResult = (0, resolve_1.resolveDependencies)(program, files, this.emitHost, plugins);
         diagnostics.push(...resolutionResult.diagnostics);
         const lualibRequired = resolutionResult.resolvedFiles.some(f => f.fileName === "lualib_bundle");
         if (lualibRequired) {

package/package.json

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