typescript-to-lua 1.37.0 → 1.37.1

package/dist/transformation/visitors/errors.js

@@ -147,6 +147,7 @@ const transformTryStatement = (statement, context) => {
     }
     const tryResultIdentifier = lua.createIdentifier("____try");
     const returnValueIdentifier = lua.createIdentifier("____returnValue");
+    const rethrowIdentifier = lua.createIdentifier("____rethrow");
     const result = [];
     const returnedIdentifier = lua.createIdentifier("____hasReturned");
     let returnCondition;
@@ -167,12 +168,18 @@ const transformTryStatement = (statement, context) => {
             }
         }
         result.push(lua.createVariableDeclarationStatement(tryReturnIdentifiers, tryCall));
+        if (statement.finallyBlock) {
+            result.push(lua.createVariableDeclarationStatement(rethrowIdentifier));
+        }
         const catchCall = lua.createCallExpression(catchIdentifier, statement.catchClause.variableDeclaration ? [lua.cloneIdentifier(returnedIdentifier)] : []);
         const catchCallStatement = hasReturn
             ? lua.createAssignmentStatement([lua.cloneIdentifier(returnedIdentifier), lua.cloneIdentifier(returnValueIdentifier)], catchCall)
             : lua.createExpressionStatement(catchCall);
+        const catchCallFunction = lua.createFunctionExpression(lua.createBlock([catchCallStatement]));
+        const tryCatchCall = lua.createCallExpression(pCall, [catchCallFunction]);
+        const tryCatchCallStatement = lua.createAssignmentStatement([lua.cloneIdentifier(tryResultIdentifier), lua.cloneIdentifier(rethrowIdentifier)], tryCatchCall);
         const notTryCondition = lua.createUnaryExpression(tryResultIdentifier, lua.SyntaxKind.NotOperator);
-        result.push(lua.createIfStatement(notTryCondition, lua.createBlock([catchCallStatement])));
+        result.push(lua.createIfStatement(notTryCondition, lua.createBlock(statement.finallyBlock ? [tryCatchCallStatement] : [catchCallStatement])));
     }
     else if (tryScope.functionReturned) {
         // try with return, but no catch
@@ -194,16 +201,26 @@ const transformTryStatement = (statement, context) => {
     if (statement.finallyBlock && statement.finallyBlock.statements.length > 0) {
         result.push(...context.transformStatements(statement.finallyBlock));
     }
-    // Re-throw error if try had no catch but had a finally.
+    // Re-throw error if try had a finally.
     // On pcall failure the error is the second return value, which lands in
     // ____hasReturned (when functionReturned) or ____error (otherwise).
-    if (!statement.catchClause && statement.finallyBlock) {
+    if (statement.finallyBlock) {
         const notTryCondition = lua.createUnaryExpression(lua.cloneIdentifier(tryResultIdentifier), lua.SyntaxKind.NotOperator);
-        const errorIdentifier = tryScope.functionReturned
-            ? lua.cloneIdentifier(returnedIdentifier)
-            : lua.createIdentifier("____error");
-        const rethrow = lua.createExpressionStatement(lua.createCallExpression(lua.createIdentifier("error"), [errorIdentifier, lua.createNumericLiteral(0)]));
-        result.push(lua.createIfStatement(notTryCondition, lua.createBlock([rethrow])));
+        if (!statement.catchClause) {
+            const errorIdentifier = tryScope.functionReturned
+                ? lua.cloneIdentifier(returnedIdentifier)
+                : lua.createIdentifier("____error");
+            const rethrow = lua.createExpressionStatement(lua.createCallExpression(lua.createIdentifier("error"), [errorIdentifier, lua.createNumericLiteral(0)]));
+            result.push(lua.createIfStatement(notTryCondition, lua.createBlock([rethrow])));
+        }
+        else if (statement.catchClause.block.statements.length > 0) {
+            // Re-throw is possible only from non-empty blocks.
+            const rethrow = lua.createExpressionStatement(lua.createCallExpression(lua.createIdentifier("error"), [
+                rethrowIdentifier,
+                lua.createNumericLiteral(0),
+            ]));
+            result.push(lua.createIfStatement(notTryCondition, lua.createBlock([rethrow])));
+        }
     }
     if (returnCondition && returnedIdentifier) {
         const returnValues = [];

package/package.json

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