typescript-to-lua 1.4.3 → 1.6.0

package/dist/transformation/visitors/errors.js

@@ -5,21 +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 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.options.lua51AllowTryCatchInAsyncAwait) {
+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;
+    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;
@@ -33,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;
@@ -96,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

@@ -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);

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/transpilation/index.js

@@ -19,6 +19,7 @@ const fs = require("fs");
 const path = require("path");
 const ts = require("typescript");
 const tsconfig_1 = require("../cli/tsconfig");
+const utils_1 = require("../utils");
 const output_collector_1 = require("./output-collector");
 const transpiler_1 = require("./transpiler");
 __exportStar(require("./transpile"), exports);
@@ -44,8 +45,12 @@ exports.transpileProject = transpileProject;
 const libCache = {};
 /** @internal */
 function createVirtualProgram(input, options = {}) {
+    const normalizedFiles = {};
+    for (const [path, file] of Object.entries(input)) {
+        normalizedFiles[(0, utils_1.normalizeSlashes)(path)] = file;
+    }
     const compilerHost = {
-        fileExists: fileName => fileName in input || ts.sys.fileExists(fileName),
+        fileExists: fileName => fileName in normalizedFiles || ts.sys.fileExists(fileName),
         getCanonicalFileName: fileName => fileName,
         getCurrentDirectory: () => "",
         getDefaultLibFileName: ts.getDefaultLibFileName,
@@ -54,8 +59,8 @@ function createVirtualProgram(input, options = {}) {
         useCaseSensitiveFileNames: () => false,
         writeFile() { },
         getSourceFile(fileName) {
-            if (fileName in input) {
-                return ts.createSourceFile(fileName, input[fileName], ts.ScriptTarget.Latest, false);
+            if (fileName in normalizedFiles) {
+                return ts.createSourceFile(fileName, normalizedFiles[fileName], ts.ScriptTarget.Latest, false);
             }
             let filePath;
             if (fileName.startsWith("lib.")) {
@@ -75,7 +80,7 @@ function createVirtualProgram(input, options = {}) {
             }
         },
     };
-    return ts.createProgram(Object.keys(input), options, compilerHost);
+    return ts.createProgram(Object.keys(normalizedFiles), options, compilerHost);
 }
 exports.createVirtualProgram = createVirtualProgram;
 function transpileVirtualProject(files, options = {}) {

package/dist/transpilation/resolve.js

@@ -115,8 +115,8 @@ function resolveFileDependencies(file, context) {
     const dependencies = [];
     const diagnostics = [];
     for (const required of findRequiredPaths(file.code)) {
-        // Do no resolve lualib
-        if (required === "lualib_bundle") {
+        // Do no resolve lualib, unless it is included from node_modules
+        if (required === "lualib_bundle" && !isNodeModulesFile(file.fileName)) {
             dependencies.push({ fileName: "lualib_bundle", code: "" });
             continue;
         }

package/dist/transpilation/transpiler.js

@@ -16,9 +16,10 @@ class Transpiler {
     }
     emit(emitOptions) {
         var _a, _b;
-        const { program, writeFile = this.emitHost.writeFile } = emitOptions;
+        const { program, writeFile = this.emitHost.writeFile, plugins: optionsPlugins = [] } = emitOptions;
         const options = program.getCompilerOptions();
-        const { diagnostics: getPluginsDiagnostics, plugins } = (0, plugins_1.getPlugins)(program);
+        const { diagnostics: getPluginsDiagnostics, plugins: configPlugins } = (0, plugins_1.getPlugins)(program);
+        const plugins = [...optionsPlugins, ...configPlugins];
         const { diagnostics, transpiledFiles: freshFiles } = (0, transpile_1.getProgramTranspileResult)(this.emitHost, writeFile, {
             ...emitOptions,
             plugins,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "typescript-to-lua",
-    "version": "1.4.3",
+    "version": "1.6.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/",
@@ -43,7 +43,7 @@
         "node": ">=12.13.0"
     },
     "peerDependencies": {
-        "typescript": "~4.6.2"
+        "typescript": "~4.7.3"
     },
     "dependencies": {
         "enhanced-resolve": "^5.8.2",
@@ -53,14 +53,14 @@
     "devDependencies": {
         "@types/fs-extra": "^8.1.0",
         "@types/glob": "^7.1.1",
-        "@types/jest": "^27.4.1",
+        "@types/jest": "^27.5.2",
         "@types/node": "^13.7.7",
         "@types/resolve": "1.14.0",
-        "@typescript-eslint/eslint-plugin": "^5.13.0",
-        "@typescript-eslint/parser": "^5.13.0",
-        "eslint": "^8.10.0",
-        "eslint-plugin-import": "^2.25.4",
-        "eslint-plugin-jest": "^26.1.1",
+        "@typescript-eslint/eslint-plugin": "^5.27.0",
+        "@typescript-eslint/parser": "^5.27.0",
+        "eslint": "^8.17.0",
+        "eslint-plugin-import": "^2.26.0",
+        "eslint-plugin-jest": "^26.4.6",
         "fs-extra": "^8.1.0",
         "javascript-stringify": "^2.0.1",
         "jest": "^27.3.0",
@@ -70,6 +70,6 @@
         "prettier": "^2.3.2",
         "ts-jest": "^27.1.3",
         "ts-node": "^10.3.0",
-        "typescript": "~4.6.2"
+        "typescript": "~4.7.3"
     }
 }