typescript-to-lua 1.0.1 → 1.3.0

package/dist/transpilation/transformers.js

@@ -48,7 +48,7 @@ exports.noImplicitSelfTransformer = noImplicitSelfTransformer;
 const stripParenthesisExpressionsTransformer = context => sourceFile => {
     // Remove parenthesis expressions before transforming to Lua, so transpiler is not hindered by extra ParenthesizedExpression nodes
     function unwrapParentheses(node) {
-        while (ts.isParenthesizedExpression(node)) {
+        while (ts.isParenthesizedExpression(node) && !ts.isOptionalChain(node.expression)) {
             node = node.expression;
         }
         return node;
@@ -58,6 +58,12 @@ const stripParenthesisExpressionsTransformer = context => sourceFile => {
         if (ts.isCallExpression(node)) {
             return ts.factory.updateCallExpression(node, unwrapParentheses(node.expression), node.typeArguments, node.arguments);
         }
+        else if (ts.isVoidExpression(node)) {
+            return ts.factory.updateVoidExpression(node, unwrapParentheses(node.expression));
+        }
+        else if (ts.isDeleteExpression(node)) {
+            return ts.factory.updateDeleteExpression(node, unwrapParentheses(node.expression));
+        }
         return ts.visitEachChild(node, visit, context);
     }
     return ts.visitNode(sourceFile, visit);
@@ -70,32 +76,46 @@ function loadTransformersFromOptions(program, diagnostics) {
         afterDeclarations: [],
     };
     const options = program.getCompilerOptions();
-    if (!options.plugins)
-        return customTransformers;
-    for (const [index, transformerImport] of options.plugins.entries()) {
-        if (!("transform" in transformerImport))
-            continue;
-        const optionName = `compilerOptions.plugins[${index}]`;
-        const { error: resolveError, result: factory } = utils_1.resolvePlugin("transformer", `${optionName}.transform`, utils_1.getConfigDirectory(options), transformerImport.transform, transformerImport.import);
-        if (resolveError)
-            diagnostics.push(resolveError);
-        if (factory === undefined)
-            continue;
-        const { error: loadError, transformer } = loadTransformer(optionName, program, factory, transformerImport);
-        if (loadError)
-            diagnostics.push(loadError);
-        if (transformer === undefined)
-            continue;
-        if (transformer.before) {
-            customTransformers.before.push(transformer.before);
-        }
-        if (transformer.after) {
-            customTransformers.after.push(transformer.after);
-        }
-        if (transformer.afterDeclarations) {
-            customTransformers.afterDeclarations.push(transformer.afterDeclarations);
+    if (options.plugins) {
+        for (const [index, transformerImport] of options.plugins.entries()) {
+            if (!("transform" in transformerImport))
+                continue;
+            const optionName = `compilerOptions.plugins[${index}]`;
+            const { error: resolveError, result: factory } = (0, utils_1.resolvePlugin)("transformer", `${optionName}.transform`, (0, utils_1.getConfigDirectory)(options), transformerImport.transform, transformerImport.import);
+            if (resolveError)
+                diagnostics.push(resolveError);
+            if (factory === undefined)
+                continue;
+            const { error: loadError, transformer } = loadTransformer(optionName, program, factory, transformerImport);
+            if (loadError)
+                diagnostics.push(loadError);
+            if (transformer === undefined)
+                continue;
+            if (transformer.before) {
+                customTransformers.before.push(transformer.before);
+            }
+            if (transformer.after) {
+                customTransformers.after.push(transformer.after);
+            }
+            if (transformer.afterDeclarations) {
+                customTransformers.afterDeclarations.push(transformer.afterDeclarations);
+            }
         }
     }
+    if (options.jsx === ts.JsxEmit.React) {
+        customTransformers.before.push(context => {
+            // if target < ES2017, typescript generates some unnecessary additional transformations in transformJSX.
+            // We can't control the target compiler option, so we override here.
+            const patchedContext = {
+                ...context,
+                getCompilerOptions: () => ({
+                    ...context.getCompilerOptions(),
+                    target: ts.ScriptTarget.ESNext,
+                }),
+            };
+            return ts.transformJsx(patchedContext);
+        });
+    }
     return customTransformers;
 }
 function loadTransformer(optionPath, program, factory, { transform, after = false, afterDeclarations = false, type = "program", ...extraOptions }) {

package/dist/transpilation/transpile.js

@@ -14,7 +14,7 @@ function getProgramTranspileResult(emitHost, writeFileResult, { program, sourceF
     if (options.tstlVerbose) {
         console.log("Parsing project settings");
     }
-    const diagnostics = CompilerOptions_1.validateOptions(options);
+    const diagnostics = (0, CompilerOptions_1.validateOptions)(options);
     let transpiledFiles = [];
     if (options.noEmitOnError) {
         const preEmitDiagnostics = [
@@ -39,17 +39,17 @@ function getProgramTranspileResult(emitHost, writeFileResult, { program, sourceF
             return { diagnostics: preEmitDiagnostics, transpiledFiles };
         }
     }
-    const plugins = plugins_1.getPlugins(program, diagnostics, customPlugins);
+    const plugins = (0, plugins_1.getPlugins)(program, diagnostics, customPlugins);
     if (options.tstlVerbose) {
         console.log(`Successfully loaded ${plugins.length} plugins`);
     }
-    const visitorMap = transformation_1.createVisitorMap(plugins.map(p => p.visitors).filter(utils_1.isNonNull));
-    const printer = LuaPrinter_1.createPrinter(plugins.map(p => p.printer).filter(utils_1.isNonNull));
+    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) => {
         if (options.tstlVerbose) {
             console.log(`Transforming ${sourceFile.fileName}`);
         }
-        const { file, diagnostics: transformDiagnostics } = transformation_1.transformSourceFile(program, sourceFile, visitorMap);
+        const { file, diagnostics: transformDiagnostics } = (0, transformation_1.transformSourceFile)(program, sourceFile, visitorMap);
         diagnostics.push(...transformDiagnostics);
         if (!options.noEmit && !options.emitDeclarationOnly) {
             if (options.tstlVerbose) {
@@ -64,7 +64,7 @@ function getProgramTranspileResult(emitHost, writeFileResult, { program, sourceF
             });
         }
     };
-    const transformers = transformers_1.getTransformers(program, diagnostics, customTransformers, processSourceFile);
+    const transformers = (0, transformers_1.getTransformers)(program, diagnostics, customTransformers, processSourceFile);
     const isEmittableJsonFile = (sourceFile) => sourceFile.flags & ts.NodeFlags.JsonFile &&
         !options.emitDeclarationOnly &&
         !program.isSourceFileFromExternalLibrary(sourceFile);

package/dist/transpilation/transpiler.js

@@ -17,7 +17,7 @@ class Transpiler {
         var _a;
         const { program, writeFile = this.emitHost.writeFile } = emitOptions;
         const verbose = program.getCompilerOptions().tstlVerbose;
-        const { diagnostics, transpiledFiles: freshFiles } = transpile_1.getProgramTranspileResult(this.emitHost, writeFile, emitOptions);
+        const { diagnostics, transpiledFiles: freshFiles } = (0, transpile_1.getProgramTranspileResult)(this.emitHost, writeFile, emitOptions);
         const { emitPlan } = this.getEmitPlan(program, diagnostics, freshFiles);
         if (verbose) {
             console.log("Emitting output");
@@ -26,7 +26,7 @@ class Transpiler {
         const emitBOM = (_a = options.emitBOM) !== null && _a !== void 0 ? _a : false;
         for (const { outputPath, code, sourceMap, sourceFiles } of emitPlan) {
             if (verbose) {
-                console.log(`Emitting ${utils_1.normalizeSlashes(outputPath)}`);
+                console.log(`Emitting ${(0, utils_1.normalizeSlashes)(outputPath)}`);
             }
             writeFile(outputPath, code, emitBOM, undefined, sourceFiles);
             if (options.sourceMap && sourceMap !== undefined) {
@@ -44,7 +44,7 @@ class Transpiler {
             console.log("Constructing emit plan");
         }
         // Resolve imported modules and modify output Lua requires
-        const resolutionResult = resolve_1.resolveDependencies(program, files, this.emitHost);
+        const resolutionResult = (0, resolve_1.resolveDependencies)(program, files, this.emitHost);
         diagnostics.push(...resolutionResult.diagnostics);
         const lualibRequired = resolutionResult.resolvedFiles.some(f => f.fileName === "lualib_bundle");
         if (lualibRequired) {
@@ -54,12 +54,12 @@ class Transpiler {
                 console.log("Including lualib bundle");
             }
             // Add lualib bundle to source dir 'virtually', will be moved to correct output dir in emitPlan
-            const fileName = utils_1.normalizeSlashes(path.resolve(getSourceDir(program), "lualib_bundle.lua"));
-            resolutionResult.resolvedFiles.unshift({ fileName, code: LuaLib_1.getLuaLibBundle(this.emitHost) });
+            const fileName = (0, utils_1.normalizeSlashes)(path.resolve(getSourceDir(program), "lualib_bundle.lua"));
+            resolutionResult.resolvedFiles.unshift({ fileName, code: (0, LuaLib_1.getLuaLibBundle)(this.emitHost) });
         }
         let emitPlan;
-        if (CompilerOptions_1.isBundleEnabled(options)) {
-            const [bundleDiagnostics, bundleFile] = bundle_1.getBundleResult(program, resolutionResult.resolvedFiles);
+        if ((0, CompilerOptions_1.isBundleEnabled)(options)) {
+            const [bundleDiagnostics, bundleFile] = (0, bundle_1.getBundleResult)(program, resolutionResult.resolvedFiles);
             diagnostics.push(...bundleDiagnostics);
             emitPlan = [bundleFile];
         }
@@ -90,7 +90,7 @@ function getEmitPathRelativeToOutDir(fileName, program) {
         emitPathSplits[0] = "lua_modules";
     }
     // Make extension lua
-    emitPathSplits[emitPathSplits.length - 1] = utils_1.trimExtension(emitPathSplits[emitPathSplits.length - 1]) + ".lua";
+    emitPathSplits[emitPathSplits.length - 1] = (0, utils_1.trimExtension)(emitPathSplits[emitPathSplits.length - 1]) + ".lua";
     return path.join(...emitPathSplits);
 }
 exports.getEmitPathRelativeToOutDir = getEmitPathRelativeToOutDir;

package/dist/transpilation/utils.js

@@ -8,28 +8,30 @@ const cliDiagnostics = require("../cli/diagnostics");
 const diagnosticFactories = require("./diagnostics");
 const getConfigDirectory = (options) => options.configFilePath ? path.dirname(options.configFilePath) : process.cwd();
 exports.getConfigDirectory = getConfigDirectory;
+const getTstlDirectory = () => path.dirname(__dirname);
 function resolvePlugin(kind, optionName, basedir, query, importName = "default") {
     if (typeof query !== "string") {
         return { error: cliDiagnostics.compilerOptionRequiresAValueOfType(optionName, "string") };
     }
+    const isModuleNotFoundError = (error) => error.code === "MODULE_NOT_FOUND";
     let resolved;
     try {
         resolved = resolve.sync(query, { basedir, extensions: [".js", ".ts", ".tsx"] });
     }
     catch (err) {
-        if (err.code !== "MODULE_NOT_FOUND")
+        if (!isModuleNotFoundError(err))
             throw err;
         return { error: diagnosticFactories.couldNotResolveFrom(kind, query, basedir) };
     }
     const hasNoRequireHook = require.extensions[".ts"] === undefined;
     if (hasNoRequireHook && (resolved.endsWith(".ts") || resolved.endsWith(".tsx"))) {
         try {
-            const tsNodePath = resolve.sync("ts-node", { basedir });
+            const tsNodePath = resolve.sync("ts-node", { basedir: getTstlDirectory() });
             const tsNode = require(tsNodePath);
             tsNode.register({ transpileOnly: true });
         }
         catch (err) {
-            if (err.code !== "MODULE_NOT_FOUND")
+            if (!isModuleNotFoundError(err))
                 throw err;
             return { error: diagnosticFactories.toLoadItShouldBeTranspiled(kind, query) };
         }

package/dist/tstl.js

@@ -10,9 +10,9 @@ const report_1 = require("./cli/report");
 const tsconfig_1 = require("./cli/tsconfig");
 const CompilerOptions_1 = require("./CompilerOptions");
 const shouldBePretty = ({ pretty } = {}) => { var _a, _b, _c; return pretty !== undefined ? pretty : (_c = (_b = (_a = ts.sys).writeOutputIsTTY) === null || _b === void 0 ? void 0 : _b.call(_a)) !== null && _c !== void 0 ? _c : false; };
-let reportDiagnostic = report_1.createDiagnosticReporter(false);
+let reportDiagnostic = (0, report_1.createDiagnosticReporter)(false);
 function updateReportDiagnostic(options) {
-    reportDiagnostic = report_1.createDiagnosticReporter(shouldBePretty(options));
+    reportDiagnostic = (0, report_1.createDiagnosticReporter)(shouldBePretty(options));
 }
 function createWatchStatusReporter(options) {
     return ts.createWatchStatusReporter(ts.sys, shouldBePretty(options));
@@ -24,7 +24,7 @@ function executeCommandLine(args) {
             return performBuild(args.slice(1));
         }
     }
-    const commandLine = parse_1.parseCommandLine(args);
+    const commandLine = (0, parse_1.parseCommandLine)(args);
     if (commandLine.options.build) {
         reportDiagnostic(cliDiagnostics.optionBuildMustBeFirstCommandLineArgument());
         return ts.sys.exit(ts.ExitStatus.DiagnosticsPresent_OutputsSkipped);
@@ -41,17 +41,17 @@ function executeCommandLine(args) {
     }
     if (commandLine.options.help) {
         console.log(information_1.versionString);
-        console.log(information_1.getHelpString());
+        console.log((0, information_1.getHelpString)());
         return ts.sys.exit(ts.ExitStatus.Success);
     }
-    const configFileName = tsconfig_1.locateConfigFile(commandLine);
+    const configFileName = (0, tsconfig_1.locateConfigFile)(commandLine);
     if (typeof configFileName === "object") {
         reportDiagnostic(configFileName);
         return ts.sys.exit(ts.ExitStatus.DiagnosticsPresent_OutputsSkipped);
     }
     const commandLineOptions = commandLine.options;
     if (configFileName) {
-        const configParseResult = tsconfig_1.parseConfigFileWithSystem(configFileName, commandLineOptions);
+        const configParseResult = (0, tsconfig_1.parseConfigFileWithSystem)(configFileName, commandLineOptions);
         updateReportDiagnostic(configParseResult.options);
         if (configParseResult.options.watch) {
             createWatchOfConfigFile(configFileName, commandLineOptions);
@@ -106,14 +106,14 @@ function createWatchOfFilesAndCompilerOptions(rootFiles, options) {
 }
 function updateWatchCompilationHost(host, optionsToExtend) {
     let hadErrorLastTime = true;
-    const updateConfigFile = tsconfig_1.createConfigFileUpdater(optionsToExtend);
+    const updateConfigFile = (0, tsconfig_1.createConfigFileUpdater)(optionsToExtend);
     const transpiler = new tstl.Transpiler();
     host.afterProgramCreate = builderProgram => {
         const program = builderProgram.getProgram();
         const options = builderProgram.getCompilerOptions();
         const configFileParsingDiagnostics = updateConfigFile(options);
         let sourceFiles;
-        if (!CompilerOptions_1.isBundleEnabled(options) && !hadErrorLastTime) {
+        if (!(0, CompilerOptions_1.isBundleEnabled)(options) && !hadErrorLastTime) {
             sourceFiles = [];
             while (true) {
                 const currentFile = builderProgram.getSemanticDiagnosticsOfNextAffectedFile();

package/dist/utils.js

@@ -12,7 +12,7 @@ const intersperse = (values, separator) => values.flatMap((value, index) => (ind
 exports.intersperse = intersperse;
 const union = (...values) => [...new Set(...values)];
 exports.union = union;
-const intersection = (first, ...rest) => exports.union(first).filter(x => rest.every(r => r.includes(x)));
+const intersection = (first, ...rest) => (0, exports.union)(first).filter(x => rest.every(r => r.includes(x)));
 exports.intersection = intersection;
 const createDiagnosticFactoryWithCode = (code, create) => Object.assign((...args) => ({
     file: undefined,
@@ -25,7 +25,7 @@ const createDiagnosticFactoryWithCode = (code, create) => Object.assign((...args
 }), { code });
 exports.createDiagnosticFactoryWithCode = createDiagnosticFactoryWithCode;
 let serialDiagnosticCodeCounter = 100000;
-const createSerialDiagnosticFactory = (create) => exports.createDiagnosticFactoryWithCode(serialDiagnosticCodeCounter++, create);
+const createSerialDiagnosticFactory = (create) => (0, exports.createDiagnosticFactoryWithCode)(serialDiagnosticCodeCounter++, create);
 exports.createSerialDiagnosticFactory = createSerialDiagnosticFactory;
 const normalizeSlashes = (filePath) => filePath.replace(/\\/g, "/");
 exports.normalizeSlashes = normalizeSlashes;

package/language-extensions/index.d.ts

@@ -78,6 +78,16 @@ declare type LuaIterable<TValue, TState = undefined> = Iterable<TValue> &
     LuaIterator<TValue, TState> &
     LuaExtension<"__luaIterableBrand">;
 
+/**
+ * Represents an object that can be iterated with pairs()
+ * For more information see: https://typescripttolua.github.io/docs/advanced/language-extensions
+ *
+ * @param TKey The type of the key returned each iteration.
+ * @param TValue The type of the value returned each iteration.
+ */
+declare type LuaPairsIterable<TKey extends AnyNotNil, TValue> = Iterable<[TKey, TValue]> &
+    LuaExtension<"__luaPairsIterableBrand">;
+
 /**
  * Calls to functions with this type are translated to `left + right`.
  * For more information see: https://typescripttolua.github.io/docs/advanced/language-extensions
@@ -535,7 +545,7 @@ declare type LuaTableDeleteMethod<TKey extends AnyNotNil> = ((key: TKey) => bool
  * @param TKey The type of the keys used to access the table.
  * @param TValue The type of the values stored in the table.
  */
-declare interface LuaTable<TKey extends AnyNotNil = AnyNotNil, TValue = any> {
+declare interface LuaTable<TKey extends AnyNotNil = AnyNotNil, TValue = any> extends LuaPairsIterable<TKey, TValue> {
     length: LuaLengthMethod<number>;
     get: LuaTableGetMethod<TKey, TValue>;
     set: LuaTableSetMethod<TKey, TValue>;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "typescript-to-lua",
-    "version": "1.0.1",
+    "version": "1.3.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/",
@@ -41,11 +41,13 @@
     "engines": {
         "node": ">=12.13.0"
     },
+    "peerDependencies": {
+        "typescript": "~4.5.2"
+    },
     "dependencies": {
         "enhanced-resolve": "^5.8.2",
         "resolve": "^1.15.1",
-        "source-map": "^0.7.3",
-        "typescript": "~4.3.5"
+        "source-map": "^0.7.3"
     },
     "devDependencies": {
         "@types/fs-extra": "^8.1.0",
@@ -53,19 +55,20 @@
         "@types/jest": "^25.1.3",
         "@types/node": "^13.7.7",
         "@types/resolve": "1.14.0",
-        "@typescript-eslint/eslint-plugin": "^4.26.1",
-        "@typescript-eslint/parser": "^4.26.1",
-        "eslint": "^7.28.0",
-        "eslint-plugin-import": "^2.20.1",
-        "eslint-plugin-jest": "^23.8.2",
+        "@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",
         "fs-extra": "^8.1.0",
         "javascript-stringify": "^2.0.1",
-        "jest": "^26.0.1",
-        "jest-circus": "^25.1.0",
+        "jest": "^27.3.0",
+        "jest-circus": "^27.3.0",
         "lua-types": "2.10.1",
         "lua-wasm-bindings": "^0.2.2",
         "prettier": "^2.3.2",
-        "ts-jest": "^26.3.0",
-        "ts-node": "^8.6.2"
+        "ts-jest": "^27.0.7",
+        "ts-node": "^10.3.0",
+        "typescript": "~4.5.2"
     }
 }

package/dist/lualib/OptionalChainAccess.lua

@@ -1,6 +0,0 @@
-function __TS__OptionalChainAccess(____table, key)
-    if ____table then
-        return ____table[key]
-    end
-    return nil
-end

package/dist/lualib/OptionalFunctionCall.lua

@@ -1,6 +0,0 @@
-function __TS__OptionalFunctionCall(f, ...)
-    if f then
-        return f(...)
-    end
-    return nil
-end

package/dist/lualib/OptionalMethodCall.lua

@@ -1,11 +0,0 @@
-function __TS__OptionalMethodCall(____table, methodName, isMethodOptional, ...)
-    if ____table then
-        local method = ____table[methodName]
-        if method then
-            return method(____table, ...)
-        elseif not isMethodOptional then
-            error(methodName .. " is not a function", 0)
-        end
-    end
-    return nil
-end

package/dist/transformation/utils/transform.d.ts

@@ -1,8 +0,0 @@
-import * as ts from "typescript";
-import * as lua from "../../LuaAST";
-import { TransformationContext } from "../context";
-export interface ImmediatelyInvokedFunctionParameters {
-    statements: lua.Statement | lua.Statement[];
-    result: lua.Expression | lua.Expression[];
-}
-export declare function transformToImmediatelyInvokedFunctionExpression(context: TransformationContext, transformFunction: () => ImmediatelyInvokedFunctionParameters, tsOriginal?: ts.Node): lua.CallExpression;

package/dist/transformation/utils/transform.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformToImmediatelyInvokedFunctionExpression = void 0;
-const utils_1 = require("../../utils");
-const lua_ast_1 = require("./lua-ast");
-const scope_1 = require("./scope");
-function transformToImmediatelyInvokedFunctionExpression(context, transformFunction, tsOriginal) {
-    scope_1.pushScope(context, scope_1.ScopeType.Function);
-    const { statements, result } = transformFunction();
-    scope_1.popScope(context);
-    return lua_ast_1.createImmediatelyInvokedFunctionExpression(utils_1.castArray(statements), result, tsOriginal);
-}
-exports.transformToImmediatelyInvokedFunctionExpression = transformToImmediatelyInvokedFunctionExpression;
-//# sourceMappingURL=transform.js.map

package/dist/transformation/visitors/jsx/jsx.d.ts

@@ -1,9 +0,0 @@
-import { Visitors } from "../../context";
-/**
- * Format a string in the value position of a JSX prop.
- *
- * Use the same implementation as convertAttribute from
- * babel-helper-builder-react-jsx.
- */
-export declare function formatJSXStringValueLiteral(text: string): string;
-export declare const jsxVisitors: Visitors;