typescript-to-lua 1.4.2 → 1.5.0

package/dist/transformation/visitors/errors.js

@@ -5,19 +5,58 @@ const __1 = require("../..");
 const lua = require("../../LuaAST");
 const diagnostics_1 = require("../utils/diagnostics");
 const lua_ast_1 = require("../utils/lua-ast");
+const lualib_1 = require("../utils/lualib");
 const scope_1 = require("../utils/scope");
 const typescript_1 = require("../utils/typescript");
+const async_await_1 = require("./async-await");
 const block_1 = require("./block");
 const identifier_1 = require("./identifier");
 const multi_1 = require("./language-extensions/multi");
 const return_1 = require("./return");
+const transformAsyncTry = (statement, context) => {
+    const [tryBlock] = (0, block_1.transformScopeBlock)(context, statement.tryBlock, scope_1.ScopeType.Try);
+    if (context.options.luaTarget === __1.LuaTarget.Lua51 && !context.options.lua51AllowTryCatchInAsyncAwait) {
+        context.diagnostics.push((0, diagnostics_1.unsupportedForTargetButOverrideAvailable)(statement, "try/catch inside async functions", __1.LuaTarget.Lua51, "lua51AllowTryCatchInAsyncAwait"));
+        return tryBlock.statements;
+    }
+    // __TS__AsyncAwaiter(<catch block>)
+    const awaiter = (0, async_await_1.wrapInAsyncAwaiter)(context, tryBlock.statements, false);
+    const awaiterIdentifier = lua.createIdentifier("____try");
+    const awaiterDefinition = lua.createVariableDeclarationStatement(awaiterIdentifier, awaiter);
+    // local ____try = __TS__AsyncAwaiter(<catch block>)
+    const result = [awaiterDefinition];
+    if (statement.finallyBlock) {
+        const awaiterFinally = lua.createTableIndexExpression(awaiterIdentifier, lua.createStringLiteral("finally"));
+        const finallyFunction = lua.createFunctionExpression(lua.createBlock(context.transformStatements(statement.finallyBlock.statements)));
+        const finallyCall = lua.createCallExpression(awaiterFinally, [awaiterIdentifier, finallyFunction], statement.finallyBlock);
+        // ____try.finally(<finally function>)
+        result.push(lua.createExpressionStatement(finallyCall));
+    }
+    if (statement.catchClause) {
+        // ____try.catch(<catch function>)
+        const [catchFunction] = transformCatchClause(context, statement.catchClause);
+        if (catchFunction.params) {
+            catchFunction.params.unshift(lua.createAnonymousIdentifier());
+        }
+        const awaiterCatch = lua.createTableIndexExpression(awaiterIdentifier, lua.createStringLiteral("catch"));
+        const catchCall = lua.createCallExpression(awaiterCatch, [awaiterIdentifier, catchFunction]);
+        // await ____try.catch(<catch function>)
+        const promiseAwait = (0, lualib_1.transformLuaLibFunction)(context, __1.LuaLibFeature.Await, statement, catchCall);
+        result.push(lua.createExpressionStatement(promiseAwait, statement));
+    }
+    else {
+        // await ____try
+        const promiseAwait = (0, lualib_1.transformLuaLibFunction)(context, __1.LuaLibFeature.Await, statement, awaiterIdentifier);
+        result.push(lua.createExpressionStatement(promiseAwait, statement));
+    }
+    return result;
+};
 const transformTryStatement = (statement, context) => {
     var _a;
-    const [tryBlock, tryScope] = (0, block_1.transformScopeBlock)(context, statement.tryBlock, scope_1.ScopeType.Try);
-    if (context.options.luaTarget === __1.LuaTarget.Lua51 && (0, typescript_1.isInAsyncFunction)(statement)) {
-        context.diagnostics.push((0, diagnostics_1.unsupportedForTarget)(statement, "try/catch inside async functions", __1.LuaTarget.Lua51));
-        return tryBlock.statements;
+    if ((0, typescript_1.isInAsyncFunction)(statement)) {
+        return transformAsyncTry(statement, context);
     }
+    const [tryBlock, tryScope] = (0, block_1.transformScopeBlock)(context, statement.tryBlock, scope_1.ScopeType.Try);
     if (context.options.luaTarget === __1.LuaTarget.Lua51 && (0, typescript_1.isInGeneratorFunction)(statement)) {
         context.diagnostics.push((0, diagnostics_1.unsupportedForTarget)(statement, "try/catch inside generator functions", __1.LuaTarget.Lua51));
         return tryBlock.statements;
@@ -31,11 +70,7 @@ const transformTryStatement = (statement, context) => {
     const tryCall = lua.createCallExpression(pCall, [lua.createFunctionExpression(tryBlock)]);
     if (statement.catchClause && statement.catchClause.block.statements.length > 0) {
         // try with catch
-        const [catchBlock, catchScope] = (0, block_1.transformScopeBlock)(context, statement.catchClause.block, scope_1.ScopeType.Catch);
-        const catchParameter = statement.catchClause.variableDeclaration
-            ? (0, identifier_1.transformIdentifier)(context, statement.catchClause.variableDeclaration.name)
-            : undefined;
-        const catchFunction = lua.createFunctionExpression(catchBlock, catchParameter ? [lua.cloneIdentifier(catchParameter)] : []);
+        const [catchFunction, catchScope] = transformCatchClause(context, statement.catchClause);
         const catchIdentifier = lua.createIdentifier("____catch");
         result.push(lua.createVariableDeclarationStatement(catchIdentifier, catchFunction));
         const hasReturn = (_a = tryScope.functionReturned) !== null && _a !== void 0 ? _a : catchScope.functionReturned;
@@ -94,4 +129,12 @@ const transformThrowStatement = (statement, context) => {
     return lua.createExpressionStatement(lua.createCallExpression(lua.createIdentifier("error"), parameters), statement);
 };
 exports.transformThrowStatement = transformThrowStatement;
+function transformCatchClause(context, catchClause) {
+    const [catchBlock, catchScope] = (0, block_1.transformScopeBlock)(context, catchClause.block, scope_1.ScopeType.Catch);
+    const catchParameter = catchClause.variableDeclaration
+        ? (0, identifier_1.transformIdentifier)(context, catchClause.variableDeclaration.name)
+        : undefined;
+    const catchFunction = lua.createFunctionExpression(catchBlock, catchParameter ? [lua.cloneIdentifier(catchParameter)] : []);
+    return [catchFunction, catchScope];
+}
 //# sourceMappingURL=errors.js.map

package/dist/transformation/visitors/function.js

@@ -46,7 +46,7 @@ function createCallableTable(functionExpression) {
         // so we create a forwarding function to eat the extra argument
         functionExpression = lua.createFunctionExpression(lua.createBlock([
             lua.createReturnStatement([lua.createCallExpression(functionExpression, [lua.createDotsLiteral()])]),
-        ]), [lua.createAnonymousIdentifier()], lua.createDotsLiteral(), lua.FunctionExpressionFlags.Inline);
+        ]), [lua.createAnonymousIdentifier()], lua.createDotsLiteral(), lua.NodeFlags.Inline);
     }
     return lua.createCallExpression(lua.createIdentifier("setmetatable"), [
         lua.createTableExpression(),
@@ -114,7 +114,7 @@ function transformFunctionBody(context, parameters, body, spreadIdentifier, node
     scope.node = node;
     let bodyStatements = transformFunctionBodyContent(context, body);
     if (node && (0, async_await_1.isAsyncFunction)(node)) {
-        bodyStatements = (0, async_await_1.wrapInAsyncAwaiter)(context, bodyStatements);
+        bodyStatements = [lua.createReturnStatement([(0, async_await_1.wrapInAsyncAwaiter)(context, bodyStatements)])];
     }
     const headerStatements = transformFunctionBodyHeader(context, scope, parameters, spreadIdentifier);
     (0, scope_1.popScope)(context);
@@ -169,11 +169,11 @@ function transformFunctionToExpression(context, node) {
             functionContext = (0, lua_ast_1.createSelfIdentifier)();
         }
     }
-    let flags = lua.FunctionExpressionFlags.None;
+    let flags = lua.NodeFlags.None;
     if (!ts.isBlock(node.body))
-        flags |= lua.FunctionExpressionFlags.Inline;
+        flags |= lua.NodeFlags.Inline;
     if (ts.isFunctionDeclaration(node) || ts.isMethodDeclaration(node)) {
-        flags |= lua.FunctionExpressionFlags.Declaration;
+        flags |= lua.NodeFlags.Declaration;
     }
     const [paramNames, dotsLiteral, spreadIdentifier] = transformParameters(context, node.parameters, functionContext);
     const [transformedBody, functionScope] = transformFunctionBody(context, node.parameters, node.body, spreadIdentifier, node);

package/dist/transformation/visitors/modules/import.d.ts

@@ -5,3 +5,4 @@ export declare function createModuleRequire(context: TransformationContext, modu
 export declare const transformImportDeclaration: FunctionVisitor<ts.ImportDeclaration>;
 export declare const transformExternalModuleReference: FunctionVisitor<ts.ExternalModuleReference>;
 export declare const transformImportEqualsDeclaration: FunctionVisitor<ts.ImportEqualsDeclaration>;
+export declare const transformImportExpression: FunctionVisitor<ts.CallExpression>;

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

@@ -1,12 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformImportEqualsDeclaration = exports.transformExternalModuleReference = exports.transformImportDeclaration = exports.createModuleRequire = void 0;
+exports.transformImportExpression = exports.transformImportEqualsDeclaration = exports.transformExternalModuleReference = exports.transformImportDeclaration = exports.createModuleRequire = void 0;
 const path = require("path");
 const ts = require("typescript");
 const lua = require("../../../LuaAST");
+const promise_1 = require("../../builtins/promise");
 const annotations_1 = require("../../utils/annotations");
 const export_1 = require("../../utils/export");
 const lua_ast_1 = require("../../utils/lua-ast");
+const lualib_1 = require("../../utils/lualib");
 const safe_names_1 = require("../../utils/safe-names");
 const scope_1 = require("../../utils/scope");
 const identifier_1 = require("../identifier");
@@ -113,4 +115,10 @@ const transformImportEqualsDeclaration = (node, context) => {
     return (0, lua_ast_1.createHoistableVariableDeclarationStatement)(context, name, expression, node);
 };
 exports.transformImportEqualsDeclaration = transformImportEqualsDeclaration;
+const transformImportExpression = (node, context) => {
+    (0, lualib_1.importLuaLibFeature)(context, lualib_1.LuaLibFeature.Promise);
+    const importPath = node.arguments.map(a => context.transformExpression(a));
+    return lua.createCallExpression((0, promise_1.createStaticPromiseFunctionAccessor)("resolve", node), importPath, node);
+};
+exports.transformImportExpression = transformImportExpression;
 //# sourceMappingURL=import.js.map

package/dist/transformation/visitors/return.js

@@ -61,14 +61,15 @@ const transformReturnStatement = (statement, context) => {
 exports.transformReturnStatement = transformReturnStatement;
 function createReturnStatement(context, values, node) {
     const results = [...values];
+    if ((0, typescript_1.isInAsyncFunction)(node)) {
+        return lua.createReturnStatement([
+            lua.createCallExpression(lua.createIdentifier("____awaiter_resolve"), [lua.createNilLiteral(), ...values]),
+        ]);
+    }
     if (isInTryCatch(context)) {
         // Bubble up explicit return flag and check if we're inside a try/catch block
         results.unshift(lua.createBooleanLiteral(true));
     }
-    else if ((0, typescript_1.isInAsyncFunction)(node)) {
-        // Add nil error handler in async function and not in try
-        results.unshift(lua.createNilLiteral());
-    }
     return lua.createReturnStatement(results, node);
 }
 exports.createReturnStatement = createReturnStatement;

package/dist/transformation/visitors/spread.js

@@ -11,15 +11,9 @@ const typescript_1 = require("../utils/typescript");
 const multi_1 = require("./language-extensions/multi");
 const diagnostics_1 = require("../utils/diagnostics");
 const vararg_1 = require("./language-extensions/vararg");
-function skipOuterExpressionParents(node) {
-    while (ts.isOuterExpression(node)) {
-        node = node.parent;
-    }
-    return node;
-}
 function isOptimizedVarArgSpread(context, symbol, identifier) {
     var _a;
-    if (!ts.isSpreadElement(skipOuterExpressionParents(identifier.parent))) {
+    if (!ts.isSpreadElement((0, typescript_1.findFirstNonOuterParent)(identifier))) {
         return false;
     }
     // Walk up, stopping at any scope types which could stop optimization

package/package.json

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

package/dist/lualib/ArrayShift.lua

@@ -1,3 +0,0 @@
-local function __TS__ArrayShift(arr)
-    return table.remove(arr, 1)
-end

package/dist/lualib/StringConcat.lua

@@ -1,8 +0,0 @@
-local function __TS__StringConcat(str1, ...)
-    local args = {...}
-    local out = str1
-    for ____, arg in ipairs(args) do
-        out = out .. arg
-    end
-    return out
-end