typescript-to-lua 1.3.2 → 1.4.0

package/dist/transformation/visitors/conditional.js

@@ -7,29 +7,30 @@ const preceding_statements_1 = require("../utils/preceding-statements");
 const scope_1 = require("../utils/scope");
 const block_1 = require("./block");
 const typescript_1 = require("../utils/typescript");
-function transformProtectedConditionalExpression(context, expression) {
+function transformProtectedConditionalExpression(context, expression, condition, whenTrue, whenFalse) {
     const tempVar = context.createTempNameForNode(expression.condition);
-    const condition = context.transformExpression(expression.condition);
-    const [trueStatements, val1] = (0, preceding_statements_1.transformInPrecedingStatementScope)(context, () => context.transformExpression(expression.whenTrue));
-    trueStatements.push(lua.createAssignmentStatement(lua.cloneIdentifier(tempVar), val1, expression.whenTrue));
-    const [falseStatements, val2] = (0, preceding_statements_1.transformInPrecedingStatementScope)(context, () => context.transformExpression(expression.whenFalse));
-    falseStatements.push(lua.createAssignmentStatement(lua.cloneIdentifier(tempVar), val2, expression.whenFalse));
+    const trueStatements = whenTrue[0].concat(lua.createAssignmentStatement(lua.cloneIdentifier(tempVar), whenTrue[1], expression.whenTrue));
+    const falseStatements = whenFalse[0].concat(lua.createAssignmentStatement(lua.cloneIdentifier(tempVar), whenFalse[1], expression.whenFalse));
     context.addPrecedingStatements([
         lua.createVariableDeclarationStatement(tempVar, undefined, expression.condition),
-        lua.createIfStatement(condition, lua.createBlock(trueStatements, expression.whenTrue), lua.createBlock(falseStatements, expression.whenFalse), expression),
+        ...condition[0],
+        lua.createIfStatement(condition[1], lua.createBlock(trueStatements, expression.whenTrue), lua.createBlock(falseStatements, expression.whenFalse), expression),
     ]);
     return lua.cloneIdentifier(tempVar);
 }
 const transformConditionalExpression = (expression, context) => {
-    if ((0, typescript_1.canBeFalsy)(context, context.checker.getTypeAtLocation(expression.whenTrue))) {
-        return transformProtectedConditionalExpression(context, expression);
+    const condition = (0, preceding_statements_1.transformInPrecedingStatementScope)(context, () => context.transformExpression(expression.condition));
+    const whenTrue = (0, preceding_statements_1.transformInPrecedingStatementScope)(context, () => context.transformExpression(expression.whenTrue));
+    const whenFalse = (0, preceding_statements_1.transformInPrecedingStatementScope)(context, () => context.transformExpression(expression.whenFalse));
+    if (whenTrue[0].length > 0 ||
+        whenFalse[0].length > 0 ||
+        (0, typescript_1.canBeFalsy)(context, context.checker.getTypeAtLocation(expression.whenTrue))) {
+        return transformProtectedConditionalExpression(context, expression, condition, whenTrue, whenFalse);
     }
-    const condition = context.transformExpression(expression.condition);
-    const val1 = context.transformExpression(expression.whenTrue);
-    const val2 = context.transformExpression(expression.whenFalse);
     // condition and v1 or v2
-    const conditionAnd = lua.createBinaryExpression(condition, val1, lua.SyntaxKind.AndOperator);
-    return lua.createBinaryExpression(conditionAnd, val2, lua.SyntaxKind.OrOperator, expression);
+    context.addPrecedingStatements(condition[0]);
+    const conditionAnd = lua.createBinaryExpression(condition[1], whenTrue[1], lua.SyntaxKind.AndOperator);
+    return lua.createBinaryExpression(conditionAnd, whenFalse[1], lua.SyntaxKind.OrOperator, expression);
 };
 exports.transformConditionalExpression = transformConditionalExpression;
 function transformIfStatement(statement, context) {

package/dist/transformation/visitors/identifier.js

@@ -18,6 +18,7 @@ const range_1 = require("./language-extensions/range");
 const table_1 = require("./language-extensions/table");
 const vararg_1 = require("./language-extensions/vararg");
 const optional_chaining_1 = require("./optional-chaining");
+const typescript_1 = require("../utils/typescript");
 function transformIdentifier(context, identifier) {
     if ((0, optional_chaining_1.isOptionalContinuation)(identifier)) {
         return lua.createIdentifier(identifier.text, undefined, context_1.tempSymbolId);
@@ -47,6 +48,10 @@ function transformIdentifier(context, identifier) {
         (0, lualib_1.importLuaLibFeature)(context, lualib_1.LuaLibFeature.Promise);
         return (0, promise_1.createPromiseIdentifier)(identifier);
     }
+    const type = context.checker.getTypeAtLocation(identifier);
+    if ((0, typescript_1.isStandardLibraryType)(context, type, undefined)) {
+        (0, builtins_1.checkForLuaLibType)(context, type);
+    }
     const text = (0, safe_names_1.hasUnsafeIdentifierName)(context, identifier) ? (0, safe_names_1.createSafeName)(identifier.text) : identifier.text;
     const symbolId = (0, symbols_1.getIdentifierSymbolId)(context, identifier);
     return lua.createIdentifier(text, identifier, symbolId, identifier.text);

package/dist/transformation/visitors/literal.js

@@ -174,10 +174,32 @@ const transformObjectLiteralExpression = (expression, context) => {
     }
 };
 const transformArrayLiteralExpression = (expression, context) => {
+    // Disallow using undefined/null in array literals
+    checkForUndefinedOrNullInArrayLiteral(expression, context);
     const filteredElements = expression.elements.map(e => ts.isOmittedExpression(e) ? ts.factory.createIdentifier("undefined") : e);
     const values = (0, expression_list_1.transformExpressionList)(context, filteredElements).map(e => lua.createTableFieldExpression(e));
     return lua.createTableExpression(values, expression);
 };
+function checkForUndefinedOrNullInArrayLiteral(array, context) {
+    // Look for last non-nil element in literal
+    let lastNonUndefinedIndex = array.elements.length - 1;
+    for (; lastNonUndefinedIndex >= 0; lastNonUndefinedIndex--) {
+        if (!isUndefinedOrNull(array.elements[lastNonUndefinedIndex])) {
+            break;
+        }
+    }
+    // Add diagnostics for non-trailing nil elements in array literal
+    for (let i = 0; i < array.elements.length; i++) {
+        if (i < lastNonUndefinedIndex && isUndefinedOrNull(array.elements[i])) {
+            context.diagnostics.push((0, diagnostics_1.undefinedInArrayLiteral)(array.elements[i]));
+        }
+    }
+}
+function isUndefinedOrNull(node) {
+    return (node.kind === ts.SyntaxKind.UndefinedKeyword ||
+        node.kind === ts.SyntaxKind.NullKeyword ||
+        (ts.isIdentifier(node) && node.text === "undefined"));
+}
 exports.literalVisitors = {
     [ts.SyntaxKind.NullKeyword]: node => lua.createNilLiteral(node),
     [ts.SyntaxKind.TrueKeyword]: node => lua.createBooleanLiteral(true, node),

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

@@ -48,13 +48,8 @@ const transformImportDeclaration = (statement, context) => {
     // require("module")
     if (statement.importClause === undefined) {
         result.push(lua.createExpressionStatement(requireCall));
-        if (scope.importStatements) {
-            scope.importStatements.push(...result);
-            return undefined;
-        }
-        else {
-            return result;
-        }
+        scope.importStatements.push(...result);
+        return undefined;
     }
     const importPath = ts.isStringLiteral(statement.moduleSpecifier)
         ? statement.moduleSpecifier.text.replace(/"/g, "")
@@ -100,13 +95,8 @@ const transformImportDeclaration = (statement, context) => {
     if (usingRequireStatement) {
         result.unshift(lua.createVariableDeclarationStatement(importUniqueName, requireCall, statement));
     }
-    if (scope.importStatements) {
-        scope.importStatements.push(...result);
-        return undefined;
-    }
-    else {
-        return result;
-    }
+    scope.importStatements.push(...result);
+    return undefined;
 };
 exports.transformImportDeclaration = transformImportDeclaration;
 const transformExternalModuleReference = (node, context) => createModuleRequire(context, node.expression, node);

package/dist/transpilation/bundle.js

@@ -85,7 +85,7 @@ function getBundleResult(program, files) {
     const footers = [];
     if (options.sourceMapTraceback) {
         // Generates SourceMapTraceback for the entire file
-        footers.push('require("lualib_bundle")\n');
+        footers.push('local __TS__SourceMapTraceBack = require("lualib_bundle").__TS__SourceMapTraceBack\n');
         footers.push(`${exports.sourceMapTracebackBundlePlaceholder}\n`);
     }
     const sourceChunks = [requireOverride, moduleTable, ...footers, entryPoint];

package/dist/transpilation/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/transpilation/plugins.d.ts

@@ -1,6 +1,9 @@
 import * as ts from "typescript";
+import { EmitHost } from "..";
+import { CompilerOptions } from "../CompilerOptions";
 import { Printer } from "../LuaPrinter";
 import { Visitors } from "../transformation/context";
+import { ProcessedFile } from "./utils";
 export interface Plugin {
     /**
      * An augmentation to the map of visitors that transform TypeScript AST to Lua AST.
@@ -14,5 +17,13 @@ export interface Plugin {
      * At most one custom printer can be provided across all plugins.
      */
     printer?: Printer;
+    /**
+     * This function is called before transpilation of the TypeScript program starts.
+     */
+    beforeTransform?: (program: ts.Program, options: CompilerOptions, emitHost: EmitHost) => ts.Diagnostic[] | void;
+    /**
+     * This function is called after TypeScriptToLua has translated the input program to Lua.
+     */
+    afterPrint?: (program: ts.Program, options: CompilerOptions, emitHost: EmitHost, result: ProcessedFile[]) => ts.Diagnostic[] | void;
 }
 export declare function getPlugins(program: ts.Program, diagnostics: ts.Diagnostic[], customPlugins: Plugin[]): Plugin[];

package/dist/transpilation/resolve.js

@@ -135,14 +135,14 @@ function resolveFileDependencies(file, context) {
         dependencies.push(...resolvedDependency.resolvedFiles);
         diagnostics.push(...resolvedDependency.diagnostics);
     }
-    return { resolvedFiles: dependencies, diagnostics };
+    return { resolvedFiles: deduplicateResolvedFiles(dependencies), diagnostics };
 }
 function resolveDependency(requiringFile, dependency, program, emitHost) {
     var _a;
     const options = program.getCompilerOptions();
     const fileDirectory = path.dirname(requiringFile.fileName);
     if (options.tstlVerbose) {
-        console.log(`Resolving "${dependency}" from ${(0, utils_1.normalizeSlashes)(fileDirectory)}`);
+        console.log(`Resolving "${dependency}" from ${(0, utils_1.normalizeSlashes)(requiringFile.fileName)}`);
     }
     // Check if the import is relative
     const isRelative = ["/", "./", "../"].some(p => dependency.startsWith(p));

package/dist/transpilation/transpile.js

@@ -10,6 +10,7 @@ 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 = [] }) {
+    var _a, _b;
     const options = program.getCompilerOptions();
     if (options.tstlVerbose) {
         console.log("Parsing project settings");
@@ -43,6 +44,12 @@ function getProgramTranspileResult(emitHost, writeFileResult, { program, sourceF
     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 : [];
+            diagnostics.push(...pluginDiagnostics);
+        }
+    }
     const visitorMap = (0, transformation_1.createVisitorMap)(plugins.map(p => p.visitors).filter(utils_1.isNonNull));
     const printer = (0, LuaPrinter_1.createPrinter)(plugins.map(p => p.printer).filter(utils_1.isNonNull));
     const processSourceFile = (sourceFile) => {
@@ -95,6 +102,12 @@ function getProgramTranspileResult(emitHost, writeFileResult, { program, sourceF
     if (options.noEmit || (options.noEmitOnError && diagnostics.length > 0)) {
         transpiledFiles = [];
     }
+    for (const plugin of plugins) {
+        if (plugin.afterPrint) {
+            const pluginDiagnostics = (_b = plugin.afterPrint(program, options, emitHost, transpiledFiles)) !== null && _b !== void 0 ? _b : [];
+            diagnostics.push(...pluginDiagnostics);
+        }
+    }
     return { diagnostics, transpiledFiles };
 }
 exports.getProgramTranspileResult = getProgramTranspileResult;

package/dist/transpilation/transpiler.js

@@ -80,6 +80,7 @@ function getEmitPath(file, program) {
 }
 exports.getEmitPath = getEmitPath;
 function getEmitPathRelativeToOutDir(fileName, program) {
+    var _a;
     const sourceDir = getSourceDir(program);
     // Default output path is relative path in source dir
     let emitPathSplits = path.relative(sourceDir, fileName).split(path.sep);
@@ -89,8 +90,11 @@ function getEmitPathRelativeToOutDir(fileName, program) {
     if (emitPathSplits[0] === "node_modules") {
         emitPathSplits[0] = "lua_modules";
     }
-    // Make extension lua
-    emitPathSplits[emitPathSplits.length - 1] = (0, utils_1.trimExtension)(emitPathSplits[emitPathSplits.length - 1]) + ".lua";
+    // Set extension
+    const extension = ((_a = program.getCompilerOptions().extension) !== null && _a !== void 0 ? _a : "lua").trim();
+    const trimmedExtension = extension.startsWith(".") ? extension.substring(1) : extension;
+    emitPathSplits[emitPathSplits.length - 1] =
+        (0, utils_1.trimExtension)(emitPathSplits[emitPathSplits.length - 1]) + "." + trimmedExtension;
     return path.join(...emitPathSplits);
 }
 exports.getEmitPathRelativeToOutDir = getEmitPathRelativeToOutDir;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "typescript-to-lua",
-    "version": "1.3.2",
+    "version": "1.4.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/",
@@ -18,13 +18,14 @@
         "dist/**/*.js",
         "dist/**/*.lua",
         "dist/**/*.ts",
+        "dist/lualib/*.json",
         "language-extensions/**/*.ts"
     ],
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "scripts": {
         "build": "tsc && npm run build-lualib",
-        "build-lualib": "node build-lualib.js",
+        "build-lualib": "node dist/tstl.js -p src/lualib/tsconfig.json",
         "pretest": "npm run lint && npm run check:language-extensions && npm run build-lualib",
         "test": "jest",
         "lint": "npm run lint:eslint && npm run lint:prettier",
@@ -42,7 +43,7 @@
         "node": ">=12.13.0"
     },
     "peerDependencies": {
-        "typescript": "~4.5.2"
+        "typescript": "~4.6.2"
     },
     "dependencies": {
         "enhanced-resolve": "^5.8.2",
@@ -52,14 +53,14 @@
     "devDependencies": {
         "@types/fs-extra": "^8.1.0",
         "@types/glob": "^7.1.1",
-        "@types/jest": "^25.1.3",
+        "@types/jest": "^27.4.1",
         "@types/node": "^13.7.7",
         "@types/resolve": "1.14.0",
-        "@typescript-eslint/eslint-plugin": "^5.4.0",
-        "@typescript-eslint/parser": "^5.4.0",
-        "eslint": "^7.32.0",
-        "eslint-plugin-import": "^2.24.2",
-        "eslint-plugin-jest": "^24.4.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",
         "fs-extra": "^8.1.0",
         "javascript-stringify": "^2.0.1",
         "jest": "^27.3.0",
@@ -67,8 +68,8 @@
         "lua-types": "2.10.1",
         "lua-wasm-bindings": "^0.2.2",
         "prettier": "^2.3.2",
-        "ts-jest": "^27.0.7",
+        "ts-jest": "^27.1.3",
         "ts-node": "^10.3.0",
-        "typescript": "~4.5.2"
+        "typescript": "~4.6.2"
     }
 }