typescript-to-lua 1.4.0 → 1.4.1

package/dist/LuaLib.d.ts

@@ -8,6 +8,7 @@ export declare enum LuaLibFeature {
     ArrayForEach = "ArrayForEach",
     ArrayFind = "ArrayFind",
     ArrayFindIndex = "ArrayFindIndex",
+    ArrayFrom = "ArrayFrom",
     ArrayIncludes = "ArrayIncludes",
     ArrayIndexOf = "ArrayIndexOf",
     ArrayIsArray = "ArrayIsArray",

package/dist/LuaLib.js

@@ -12,6 +12,7 @@ var LuaLibFeature;
     LuaLibFeature["ArrayForEach"] = "ArrayForEach";
     LuaLibFeature["ArrayFind"] = "ArrayFind";
     LuaLibFeature["ArrayFindIndex"] = "ArrayFindIndex";
+    LuaLibFeature["ArrayFrom"] = "ArrayFrom";
     LuaLibFeature["ArrayIncludes"] = "ArrayIncludes";
     LuaLibFeature["ArrayIndexOf"] = "ArrayIndexOf";
     LuaLibFeature["ArrayIsArray"] = "ArrayIsArray";

package/dist/LuaPrinter.js

@@ -129,28 +129,28 @@ class LuaPrinter {
     }
     printFile(file) {
         var _a;
-        let header = file.trivia;
+        let sourceChunks = [file.trivia];
         if (!this.options.noHeader) {
-            header += exports.tstlHeader;
+            sourceChunks.push(exports.tstlHeader);
         }
-        let statements = file.statements;
         const luaLibImport = (_a = this.options.luaLibImport) !== null && _a !== void 0 ? _a : CompilerOptions_1.LuaLibImportKind.Require;
         if (luaLibImport === CompilerOptions_1.LuaLibImportKind.Require && file.luaLibFeatures.size > 0) {
             // Import lualib features
-            const importStatements = (0, LuaLib_1.loadImportedLualibFeatures)(file.luaLibFeatures, this.emitHost);
-            statements = importStatements.concat(statements);
+            sourceChunks = this.printStatementArray((0, LuaLib_1.loadImportedLualibFeatures)(file.luaLibFeatures, this.emitHost));
         }
         else if (luaLibImport === CompilerOptions_1.LuaLibImportKind.Inline && file.luaLibFeatures.size > 0) {
             // Inline lualib features
-            header += "-- Lua Library inline imports\n";
-            header += (0, LuaLib_1.loadInlineLualibFeatures)(file.luaLibFeatures, this.emitHost);
+            sourceChunks.push("-- Lua Library inline imports\n");
+            sourceChunks.push((0, LuaLib_1.loadInlineLualibFeatures)(file.luaLibFeatures, this.emitHost));
         }
         if (this.options.sourceMapTraceback && !(0, CompilerOptions_1.isBundleEnabled)(this.options)) {
             // In bundle mode the traceback is being generated for the entire file in getBundleResult
             // Otherwise, traceback is being generated locally
-            header += `${LuaPrinter.sourceMapTracebackPlaceholder}\n`;
+            sourceChunks.push(`${LuaPrinter.sourceMapTracebackPlaceholder}\n`);
         }
-        return this.concatNodes(header, ...this.printStatementArray(statements));
+        // Print reest of the statements in file
+        sourceChunks.push(...this.printStatementArray(file.statements));
+        return this.concatNodes(...sourceChunks);
     }
     pushIndent() {
         this.currentIndent += "    ";

package/dist/index.d.ts

@@ -8,4 +8,4 @@ export { LuaLibFeature } from "./LuaLib";
 export * from "./LuaPrinter";
 export * from "./transformation/context";
 export * from "./transpilation";
-export { ProcessedFile } from "./transpilation/utils";
+export { EmitHost, EmitFile, ProcessedFile } from "./transpilation/utils";

package/dist/lualib/ArrayFrom.lua

@@ -0,0 +1,32 @@
+local __TS__ArrayFrom
+do
+    local function arrayLikeStep(self, index)
+        index = index + 1
+        if index > self.length then
+            return
+        end
+        return index, self[index]
+    end
+    local function arrayLikeIterator(arr)
+        if type(arr.length) == "number" then
+            return arrayLikeStep, arr, 0
+        end
+        return __TS__Iterator(arr)
+    end
+    function __TS__ArrayFrom(arrayLike, mapFn, thisArg)
+        local result = {}
+        if mapFn == nil then
+            for ____, v in arrayLikeIterator(arrayLike) do
+                __TS__ArrayPush(result, v)
+            end
+        else
+            for i, v in arrayLikeIterator(arrayLike) do
+                __TS__ArrayPush(
+                    result,
+                    mapFn(thisArg, v, i - 1)
+                )
+            end
+        end
+        return result
+    end
+end

package/dist/lualib/lualib_bundle.lua

@@ -115,6 +115,88 @@ local function __TS__ArrayFindIndex(arr, callbackFn)
     return -1
 end
 
+local function __TS__ArrayPush(arr, ...)
+    local items = {...}
+    for ____, item in ipairs(items) do
+        arr[#arr + 1] = item
+    end
+    return #arr
+end
+
+local __TS__Iterator
+do
+    local function iteratorGeneratorStep(self)
+        local co = self.____coroutine
+        local status, value = coroutine.resume(co)
+        if not status then
+            error(value, 0)
+        end
+        if coroutine.status(co) == "dead" then
+            return
+        end
+        return true, value
+    end
+    local function iteratorIteratorStep(self)
+        local result = self:next()
+        if result.done then
+            return
+        end
+        return true, result.value
+    end
+    local function iteratorStringStep(self, index)
+        index = index + 1
+        if index > #self then
+            return
+        end
+        return index, string.sub(self, index, index)
+    end
+    function __TS__Iterator(iterable)
+        if type(iterable) == "string" then
+            return iteratorStringStep, iterable, 0
+        elseif iterable.____coroutine ~= nil then
+            return iteratorGeneratorStep, iterable
+        elseif iterable[Symbol.iterator] then
+            local iterator = iterable[Symbol.iterator](iterable)
+            return iteratorIteratorStep, iterator
+        else
+            return ipairs(iterable)
+        end
+    end
+end
+
+local __TS__ArrayFrom
+do
+    local function arrayLikeStep(self, index)
+        index = index + 1
+        if index > self.length then
+            return
+        end
+        return index, self[index]
+    end
+    local function arrayLikeIterator(arr)
+        if type(arr.length) == "number" then
+            return arrayLikeStep, arr, 0
+        end
+        return __TS__Iterator(arr)
+    end
+    function __TS__ArrayFrom(arrayLike, mapFn, thisArg)
+        local result = {}
+        if mapFn == nil then
+            for ____, v in arrayLikeIterator(arrayLike) do
+                __TS__ArrayPush(result, v)
+            end
+        else
+            for i, v in arrayLikeIterator(arrayLike) do
+                __TS__ArrayPush(
+                    result,
+                    mapFn(thisArg, v, i - 1)
+                )
+            end
+        end
+        return result
+    end
+end
+
 local function __TS__ArrayIncludes(self, searchElement, fromIndex)
     if fromIndex == nil then
         fromIndex = 0
@@ -194,14 +276,6 @@ local function __TS__ArrayMap(arr, callbackfn)
     return newArray
 end
 
-local function __TS__ArrayPush(arr, ...)
-    local items = {...}
-    for ____, item in ipairs(items) do
-        arr[#arr + 1] = item
-    end
-    return #arr
-end
-
 local function __TS__ArrayReduce(arr, callbackFn, ...)
     local len = #arr
     local k = 0
@@ -1158,47 +1232,6 @@ local function __TS__InstanceOfObject(value)
     return valueType == "table" or valueType == "function"
 end
 
-local __TS__Iterator
-do
-    local function iteratorGeneratorStep(self)
-        local co = self.____coroutine
-        local status, value = coroutine.resume(co)
-        if not status then
-            error(value, 0)
-        end
-        if coroutine.status(co) == "dead" then
-            return
-        end
-        return true, value
-    end
-    local function iteratorIteratorStep(self)
-        local result = self:next()
-        if result.done then
-            return
-        end
-        return true, result.value
-    end
-    local function iteratorStringStep(self, index)
-        index = index + 1
-        if index > #self then
-            return
-        end
-        return index, string.sub(self, index, index)
-    end
-    function __TS__Iterator(iterable)
-        if type(iterable) == "string" then
-            return iteratorStringStep, iterable, 0
-        elseif iterable.____coroutine ~= nil then
-            return iteratorGeneratorStep, iterable
-        elseif iterable[Symbol.iterator] then
-            local iterator = iterable[Symbol.iterator](iterable)
-            return iteratorIteratorStep, iterator
-        else
-            return ipairs(iterable)
-        end
-    end
-end
-
 local Map
 do
     Map = __TS__Class()
@@ -2372,6 +2405,7 @@ return {
   __TS__ArrayForEach = __TS__ArrayForEach,
   __TS__ArrayFind = __TS__ArrayFind,
   __TS__ArrayFindIndex = __TS__ArrayFindIndex,
+  __TS__ArrayFrom = __TS__ArrayFrom,
   __TS__ArrayIncludes = __TS__ArrayIncludes,
   __TS__ArrayIndexOf = __TS__ArrayIndexOf,
   __TS__ArrayIsArray = __TS__ArrayIsArray,

package/dist/lualib/lualib_module_info.json

@@ -40,6 +40,15 @@
       "__TS__ArrayFindIndex"
     ]
   },
+  "ArrayFrom": {
+    "exports": [
+      "__TS__ArrayFrom"
+    ],
+    "dependencies": [
+      "ArrayPush",
+      "Iterator"
+    ]
+  },
   "ArrayIncludes": {
     "exports": [
       "__TS__ArrayIncludes"

package/dist/transformation/builtins/array.d.ts

@@ -2,6 +2,6 @@ import * as ts from "typescript";
 import * as lua from "../../LuaAST";
 import { TransformationContext } from "../context";
 import { PropertyCallExpression } from "../visitors/call";
-export declare function transformArrayConstructorCall(context: TransformationContext, node: PropertyCallExpression): lua.CallExpression | undefined;
+export declare function transformArrayConstructorCall(context: TransformationContext, node: PropertyCallExpression): lua.Expression | undefined;
 export declare function transformArrayPrototypeCall(context: TransformationContext, node: PropertyCallExpression): lua.CallExpression | undefined;
 export declare function transformArrayProperty(context: TransformationContext, node: ts.PropertyAccessExpression): lua.UnaryExpression | undefined;

package/dist/transformation/builtins/array.js

@@ -6,14 +6,19 @@ const diagnostics_1 = require("../utils/diagnostics");
 const lualib_1 = require("../utils/lualib");
 const call_1 = require("../visitors/call");
 const typescript_1 = require("../utils/typescript");
+const lua_ast_1 = require("../utils/lua-ast");
 function transformArrayConstructorCall(context, node) {
     const expression = node.expression;
     const signature = context.checker.getResolvedSignature(node);
     const params = (0, call_1.transformArguments)(context, node.arguments, signature);
     const expressionName = expression.name.text;
     switch (expressionName) {
+        case "from":
+            return (0, lualib_1.transformLuaLibFunction)(context, lualib_1.LuaLibFeature.ArrayFrom, node, ...params);
         case "isArray":
             return (0, lualib_1.transformLuaLibFunction)(context, lualib_1.LuaLibFeature.ArrayIsArray, node, ...params);
+        case "of":
+            return (0, lua_ast_1.wrapInTable)(...params);
         default:
             context.diagnostics.push((0, diagnostics_1.unsupportedProperty)(expression.name, "Array", expressionName));
     }

package/dist/transpilation/plugins.d.ts

@@ -3,7 +3,7 @@ import { EmitHost } from "..";
 import { CompilerOptions } from "../CompilerOptions";
 import { Printer } from "../LuaPrinter";
 import { Visitors } from "../transformation/context";
-import { ProcessedFile } from "./utils";
+import { EmitFile, ProcessedFile } from "./utils";
 export interface Plugin {
     /**
      * An augmentation to the map of visitors that transform TypeScript AST to Lua AST.
@@ -22,8 +22,15 @@ export interface Plugin {
      */
     beforeTransform?: (program: ts.Program, options: CompilerOptions, emitHost: EmitHost) => ts.Diagnostic[] | void;
     /**
-     * This function is called after TypeScriptToLua has translated the input program to Lua.
+     * This function is called after translating the input program to Lua, but before resolving dependencies or bundling.
      */
     afterPrint?: (program: ts.Program, options: CompilerOptions, emitHost: EmitHost, result: ProcessedFile[]) => ts.Diagnostic[] | void;
+    /**
+     * 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;
 }
-export declare function getPlugins(program: ts.Program, diagnostics: ts.Diagnostic[], customPlugins: Plugin[]): Plugin[];
+export declare function getPlugins(program: ts.Program): {
+    diagnostics: ts.Diagnostic[];
+    plugins: Plugin[];
+};

package/dist/transpilation/plugins.js

@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPlugins = void 0;
 const utils_1 = require("./utils");
-function getPlugins(program, diagnostics, customPlugins) {
+function getPlugins(program) {
     var _a;
+    const diagnostics = [];
     const pluginsFromOptions = [];
     const options = program.getCompilerOptions();
     for (const [index, pluginOption] of ((_a = options.luaPlugins) !== null && _a !== void 0 ? _a : []).entries()) {
@@ -16,7 +17,10 @@ function getPlugins(program, diagnostics, customPlugins) {
         const plugin = typeof factory === "function" ? factory(pluginOption) : factory;
         pluginsFromOptions.push(plugin);
     }
-    return [...customPlugins, ...pluginsFromOptions];
+    if (options.tstlVerbose) {
+        console.log(`Loaded ${pluginsFromOptions.length} plugins`);
+    }
+    return { diagnostics, plugins: pluginsFromOptions };
 }
 exports.getPlugins = getPlugins;
 //# sourceMappingURL=plugins.js.map

package/dist/transpilation/transpile.d.ts

@@ -11,4 +11,4 @@ export interface TranspileResult {
     diagnostics: ts.Diagnostic[];
     transpiledFiles: ProcessedFile[];
 }
-export declare function getProgramTranspileResult(emitHost: EmitHost, writeFileResult: ts.WriteFileCallback, { program, sourceFiles: targetSourceFiles, customTransformers, plugins: customPlugins }: TranspileOptions): TranspileResult;
+export declare function getProgramTranspileResult(emitHost: EmitHost, writeFileResult: ts.WriteFileCallback, { program, sourceFiles: targetSourceFiles, customTransformers, plugins }: TranspileOptions): TranspileResult;

package/dist/transpilation/transpile.js

@@ -7,9 +7,8 @@ const CompilerOptions_1 = require("../CompilerOptions");
 const LuaPrinter_1 = require("../LuaPrinter");
 const transformation_1 = require("../transformation");
 const utils_1 = require("../utils");
-const plugins_1 = require("./plugins");
 const transformers_1 = require("./transformers");
-function getProgramTranspileResult(emitHost, writeFileResult, { program, sourceFiles: targetSourceFiles, customTransformers = {}, plugins: customPlugins = [] }) {
+function getProgramTranspileResult(emitHost, writeFileResult, { program, sourceFiles: targetSourceFiles, customTransformers = {}, plugins = [] }) {
     var _a, _b;
     const options = program.getCompilerOptions();
     if (options.tstlVerbose) {
@@ -40,10 +39,6 @@ function getProgramTranspileResult(emitHost, writeFileResult, { program, sourceF
             return { diagnostics: preEmitDiagnostics, transpiledFiles };
         }
     }
-    const plugins = (0, plugins_1.getPlugins)(program, diagnostics, customPlugins);
-    if (options.tstlVerbose) {
-        console.log(`Successfully loaded ${plugins.length} plugins`);
-    }
     for (const plugin of plugins) {
         if (plugin.beforeTransform) {
             const pluginDiagnostics = (_a = plugin.beforeTransform(program, options, emitHost)) !== null && _a !== void 0 ? _a : [];

package/dist/transpilation/transpiler.js

@@ -7,6 +7,7 @@ const CompilerOptions_1 = require("../CompilerOptions");
 const LuaLib_1 = require("../LuaLib");
 const utils_1 = require("../utils");
 const bundle_1 = require("./bundle");
+const plugins_1 = require("./plugins");
 const resolve_1 = require("./resolve");
 const transpile_1 = require("./transpile");
 class Transpiler {
@@ -14,18 +15,27 @@ class Transpiler {
         this.emitHost = emitHost;
     }
     emit(emitOptions) {
-        var _a;
+        var _a, _b;
         const { program, writeFile = this.emitHost.writeFile } = emitOptions;
-        const verbose = program.getCompilerOptions().tstlVerbose;
-        const { diagnostics, transpiledFiles: freshFiles } = (0, transpile_1.getProgramTranspileResult)(this.emitHost, writeFile, emitOptions);
+        const options = program.getCompilerOptions();
+        const { diagnostics: getPluginsDiagnostics, plugins } = (0, plugins_1.getPlugins)(program);
+        const { diagnostics, transpiledFiles: freshFiles } = (0, transpile_1.getProgramTranspileResult)(this.emitHost, writeFile, {
+            ...emitOptions,
+            plugins,
+        });
         const { emitPlan } = this.getEmitPlan(program, diagnostics, freshFiles);
-        if (verbose) {
+        if (options.tstlVerbose) {
             console.log("Emitting output");
         }
-        const options = program.getCompilerOptions();
-        const emitBOM = (_a = options.emitBOM) !== null && _a !== void 0 ? _a : false;
+        for (const plugin of plugins) {
+            if (plugin.beforeEmit) {
+                const beforeEmitPluginDiagnostics = (_a = plugin.beforeEmit(program, options, this.emitHost, emitPlan)) !== null && _a !== void 0 ? _a : [];
+                diagnostics.push(...beforeEmitPluginDiagnostics);
+            }
+        }
+        const emitBOM = (_b = options.emitBOM) !== null && _b !== void 0 ? _b : false;
         for (const { outputPath, code, sourceMap, sourceFiles } of emitPlan) {
-            if (verbose) {
+            if (options.tstlVerbose) {
                 console.log(`Emitting ${(0, utils_1.normalizeSlashes)(outputPath)}`);
             }
             writeFile(outputPath, code, emitBOM, undefined, sourceFiles);
@@ -33,10 +43,10 @@ class Transpiler {
                 writeFile(outputPath + ".map", sourceMap, emitBOM, undefined, sourceFiles);
             }
         }
-        if (verbose) {
+        if (options.tstlVerbose) {
             console.log("Emit finished!");
         }
-        return { diagnostics, emitSkipped: emitPlan.length === 0 };
+        return { diagnostics: getPluginsDiagnostics.concat(diagnostics), emitSkipped: emitPlan.length === 0 };
     }
     getEmitPlan(program, diagnostics, files) {
         const options = program.getCompilerOptions();

package/dist/transpilation/utils.d.ts

@@ -1,3 +1,4 @@
+import { SourceNode } from "source-map";
 import * as ts from "typescript";
 import * as lua from "../LuaAST";
 export interface EmitHost {
@@ -15,6 +16,7 @@ interface BaseFile {
 export interface ProcessedFile extends BaseFile {
     fileName: string;
     luaAst?: lua.File;
+    sourceMapNode?: SourceNode;
 }
 export interface EmitFile extends BaseFile {
     outputPath: string;

package/package.json

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