typescript-to-lua 1.8.1 → 1.10.0-beta.0

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

@@ -80,7 +80,7 @@ function transformExportSpecifier(context, node) {
 function transformExportSpecifiersFrom(context, statement, moduleSpecifier, exportSpecifiers) {
     // First transpile as import clause
     const importClause = ts.factory.createImportClause(false, undefined, ts.factory.createNamedImports(exportSpecifiers.map(s => ts.factory.createImportSpecifier(statement.isTypeOnly, s.propertyName, s.name))));
-    const importDeclaration = ts.factory.createImportDeclaration(statement.decorators, statement.modifiers, importClause, moduleSpecifier);
+    const importDeclaration = ts.factory.createImportDeclaration(statement.modifiers, importClause, moduleSpecifier);
     // Wrap in block to prevent imports from hoisting out of `do` statement
     const [block] = (0, block_1.transformScopeBlock)(context, ts.factory.createBlock([importDeclaration]), scope_1.ScopeType.Block);
     const result = block.statements;

package/dist/transformation/visitors/return.js

@@ -12,28 +12,33 @@ const diagnostics_1 = require("../utils/diagnostics");
 const typescript_1 = require("../utils/typescript");
 function transformExpressionsInReturn(context, node, insideTryCatch) {
     const expressionType = context.checker.getTypeAtLocation(node);
-    if (ts.isCallExpression(node)) {
+    // skip type assertions
+    // don't skip parenthesis as it may arise confusion with lua behavior (where parenthesis are significant)
+    const innerNode = ts.skipOuterExpressions(node, ts.OuterExpressionKinds.Assertions);
+    if (ts.isCallExpression(innerNode)) {
         // $multi(...)
-        if ((0, multi_1.isMultiFunctionCall)(context, node)) {
+        if ((0, multi_1.isMultiFunctionCall)(context, innerNode)) {
             // Don't allow $multi to be implicitly cast to something other than LuaMultiReturn
             const type = context.checker.getContextualType(node);
             if (type && !(0, multi_1.canBeMultiReturnType)(type)) {
-                context.diagnostics.push((0, diagnostics_1.invalidMultiFunctionReturnType)(node));
+                context.diagnostics.push((0, diagnostics_1.invalidMultiFunctionReturnType)(innerNode));
             }
-            let returnValues = (0, call_1.transformArguments)(context, node.arguments);
+            let returnValues = (0, call_1.transformArguments)(context, innerNode.arguments);
             if (insideTryCatch) {
                 returnValues = [(0, lua_ast_1.wrapInTable)(...returnValues)]; // Wrap results when returning inside try/catch
             }
             return returnValues;
         }
         // Force-wrap LuaMultiReturn when returning inside try/catch
-        if (insideTryCatch && (0, multi_1.returnsMultiType)(context, node) && !(0, multi_1.shouldMultiReturnCallBeWrapped)(context, node)) {
+        if (insideTryCatch &&
+            (0, multi_1.returnsMultiType)(context, innerNode) &&
+            !(0, multi_1.shouldMultiReturnCallBeWrapped)(context, innerNode)) {
             return [(0, lua_ast_1.wrapInTable)(context.transformExpression(node))];
         }
     }
-    else if ((0, multi_1.isInMultiReturnFunction)(context, node) && (0, multi_1.isMultiReturnType)(expressionType)) {
+    else if ((0, multi_1.isInMultiReturnFunction)(context, innerNode) && (0, multi_1.isMultiReturnType)(expressionType)) {
         // Unpack objects typed as LuaMultiReturn
-        return [(0, lua_ast_1.createUnpackCall)(context, context.transformExpression(node), node)];
+        return [(0, lua_ast_1.createUnpackCall)(context, context.transformExpression(innerNode), innerNode)];
     }
     return [context.transformExpression(node)];
 }

package/dist/transformation/visitors/spread.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformSpreadElement = exports.isOptimizedVarArgSpread = void 0;
 const ts = require("typescript");
+const CompilerOptions_1 = require("../../CompilerOptions");
 const lua = require("../../LuaAST");
 const language_extensions_1 = require("../utils/language-extensions");
 const lua_ast_1 = require("../utils/lua-ast");
@@ -54,7 +55,9 @@ const transformSpreadElement = (node, context) => {
     if (ts.isIdentifier(tsInnerExpression)) {
         const symbol = context.checker.getSymbolAtLocation(tsInnerExpression);
         if (symbol && isOptimizedVarArgSpread(context, symbol, tsInnerExpression)) {
-            return lua.createDotsLiteral(node);
+            return context.luaTarget === CompilerOptions_1.LuaTarget.Lua50
+                ? (0, lua_ast_1.createUnpackCall)(context, lua.createArgLiteral(), node)
+                : lua.createDotsLiteral(node);
         }
     }
     const innerExpression = context.transformExpression(node.expression);

package/dist/transformation/visitors/typescript.js

@@ -13,6 +13,7 @@ exports.typescriptVisitors = {
     [ts.SyntaxKind.TypeAliasDeclaration]: () => undefined,
     [ts.SyntaxKind.InterfaceDeclaration]: () => undefined,
     [ts.SyntaxKind.NonNullExpression]: (node, context) => context.transformExpression(node.expression),
+    [ts.SyntaxKind.ExpressionWithTypeArguments]: (node, context) => context.transformExpression(node.expression),
     [ts.SyntaxKind.AsExpression]: transformAssertionExpression,
     [ts.SyntaxKind.TypeAssertionExpression]: transformAssertionExpression,
     [ts.SyntaxKind.NotEmittedStatement]: () => undefined,

package/dist/transpilation/bundle.js

@@ -3,13 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBundleResult = exports.printStackTraceBundleOverride = exports.sourceMapTracebackBundlePlaceholder = void 0;
 const path = require("path");
 const source_map_1 = require("source-map");
+const CompilerOptions_1 = require("../CompilerOptions");
 const LuaPrinter_1 = require("../LuaPrinter");
 const utils_1 = require("../utils");
 const diagnostics_1 = require("./diagnostics");
 const transpiler_1 = require("./transpiler");
 const createModulePath = (pathToResolve, program) => (0, LuaPrinter_1.escapeString)((0, utils_1.formatPathToLuaPath)((0, utils_1.trimExtension)((0, transpiler_1.getEmitPathRelativeToOutDir)(pathToResolve, program))));
 // Override `require` to read from ____modules table.
-const requireOverride = `
+function requireOverride(options) {
+    const runModule = options.luaTarget === CompilerOptions_1.LuaTarget.Lua50
+        ? "(table.getn(arg) > 0) and module(unpack(arg)) or module(file)"
+        : '(select("#", ...) > 0) and module(...) or module(file)';
+    return `
 local ____modules = {}
 local ____moduleCache = {}
 local ____originalRequire = require
@@ -19,7 +24,7 @@ local function require(file, ...)
     end
     if ____modules[file] then
         local module = ____modules[file]
-        ____moduleCache[file] = { value = (select("#", ...) > 0) and module(...) or module(file) }
+        ____moduleCache[file] = { value = ${runModule} }
         return ____moduleCache[file].value
     else
         if ____originalRequire then
@@ -30,6 +35,7 @@ local function require(file, ...)
     end
 end
 `;
+}
 exports.sourceMapTracebackBundlePlaceholder = "{#SourceMapTracebackBundle}";
 function printStackTraceBundleOverride(rootNode) {
     const map = {};
@@ -66,14 +72,16 @@ function printStackTraceBundleOverride(rootNode) {
 }
 exports.printStackTraceBundleOverride = printStackTraceBundleOverride;
 function getBundleResult(program, files) {
+    var _a, _b, _c;
     const diagnostics = [];
     const options = program.getCompilerOptions();
     const bundleFile = (0, utils_1.cast)(options.luaBundle, utils_1.isNonNull);
     const entryModule = (0, utils_1.cast)(options.luaBundleEntry, utils_1.isNonNull);
     // Resolve project settings relative to project file.
-    const resolvedEntryModule = path.resolve((0, transpiler_1.getSourceDir)(program), entryModule);
+    const resolvedEntryModule = path.resolve((0, transpiler_1.getProjectRoot)(program), entryModule);
     const outputPath = path.resolve((0, transpiler_1.getEmitOutDir)(program), bundleFile);
-    if (program.getSourceFile(resolvedEntryModule) === undefined && program.getSourceFile(entryModule) === undefined) {
+    const entryModuleFilePath = (_b = (_a = program.getSourceFile(entryModule)) === null || _a === void 0 ? void 0 : _a.fileName) !== null && _b !== void 0 ? _b : (_c = program.getSourceFile(resolvedEntryModule)) === null || _c === void 0 ? void 0 : _c.fileName;
+    if (entryModuleFilePath === undefined) {
         diagnostics.push((0, diagnostics_1.couldNotFindBundleEntryPoint)(entryModule));
     }
     // For each file: ["<module path>"] = function() <lua content> end,
@@ -81,14 +89,15 @@ function getBundleResult(program, files) {
     // Create ____modules table containing all entries from moduleTableEntries
     const moduleTable = createModuleTableNode(moduleTableEntries);
     // return require("<entry module path>")
-    const entryPoint = `return require(${createModulePath(entryModule, program)}, ...)\n`;
+    const args = options.luaTarget === CompilerOptions_1.LuaTarget.Lua50 ? "unpack(arg == nil and {} or arg)" : "...";
+    const entryPoint = `return require(${createModulePath(entryModuleFilePath !== null && entryModuleFilePath !== void 0 ? entryModuleFilePath : entryModule, program)}, ${args})\n`;
     const footers = [];
     if (options.sourceMapTraceback) {
         // Generates SourceMapTraceback for the entire file
         footers.push('local __TS__SourceMapTraceBack = require("lualib_bundle").__TS__SourceMapTraceBack\n');
         footers.push(`${exports.sourceMapTracebackBundlePlaceholder}\n`);
     }
-    const sourceChunks = [requireOverride, moduleTable, ...footers, entryPoint];
+    const sourceChunks = [requireOverride(options), moduleTable, ...footers, entryPoint];
     if (!options.noHeader) {
         sourceChunks.unshift(LuaPrinter_1.tstlHeader);
     }

package/dist/transpilation/transpiler.js

@@ -61,6 +61,7 @@ class Transpiler {
         return diagnostics;
     }
     getEmitPlan(program, diagnostics, files) {
+        var _a;
         performance.startSection("getEmitPlan");
         const options = program.getCompilerOptions();
         if (options.tstlVerbose) {
@@ -78,7 +79,8 @@ class Transpiler {
             }
             // Add lualib bundle to source dir 'virtually', will be moved to correct output dir in emitPlan
             const fileName = (0, utils_1.normalizeSlashes)(path.resolve(getSourceDir(program), "lualib_bundle.lua"));
-            resolutionResult.resolvedFiles.unshift({ fileName, code: (0, LuaLib_1.getLuaLibBundle)(this.emitHost) });
+            const luaTarget = (_a = options.luaTarget) !== null && _a !== void 0 ? _a : CompilerOptions_1.LuaTarget.Universal;
+            resolutionResult.resolvedFiles.unshift({ fileName, code: (0, LuaLib_1.getLuaLibBundle)(luaTarget, this.emitHost) });
         }
         let emitPlan;
         if ((0, CompilerOptions_1.isBundleEnabled)(options)) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "typescript-to-lua",
-    "version": "1.8.1",
+    "version": "1.10.0-beta.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,21 +18,20 @@
         "dist/**/*.js",
         "dist/**/*.lua",
         "dist/**/*.ts",
-        "dist/lualib/*.json",
-        "language-extensions/**/*.ts"
+        "dist/lualib/**/*.json"
     ],
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "scripts": {
         "build": "tsc && npm run build-lualib",
-        "build-lualib": "node dist/tstl.js -p src/lualib/tsconfig.json",
+        "build-lualib": "node dist/tstl.js -p src/lualib/tsconfig.json && node dist/tstl.js -p src/lualib/tsconfig.lua50.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",
         "lint:prettier": "prettier --check . || (echo 'Run `npm run fix:prettier` to fix it.' && exit 1)",
         "lint:eslint": "eslint . --ext .js,.ts",
         "fix:prettier": "prettier --write .",
-        "check:language-extensions": "tsc language-extensions/index.d.ts",
+        "check:language-extensions": "tsc --strict language-extensions/index.d.ts",
         "preversion": "npm run build && npm test",
         "postversion": "git push && git push --tags"
     },
@@ -40,12 +39,13 @@
         "tstl": "dist/tstl.js"
     },
     "engines": {
-        "node": ">=12.13.0"
+        "node": ">=16.10.0"
     },
     "peerDependencies": {
-        "typescript": "~4.7.3"
+        "typescript": "~4.8.2"
     },
     "dependencies": {
+        "@typescript-to-lua/language-extensions": "1.0.0",
         "enhanced-resolve": "^5.8.2",
         "resolve": "^1.15.1",
         "source-map": "^0.7.3"
@@ -56,20 +56,20 @@
         "@types/jest": "^27.5.2",
         "@types/node": "^13.7.7",
         "@types/resolve": "1.14.0",
-        "@typescript-eslint/eslint-plugin": "^5.27.0",
-        "@typescript-eslint/parser": "^5.27.0",
-        "eslint": "^8.17.0",
+        "@typescript-eslint/eslint-plugin": "^5.36.1",
+        "@typescript-eslint/parser": "^5.36.1",
+        "eslint": "^8.23.0",
         "eslint-plugin-import": "^2.26.0",
-        "eslint-plugin-jest": "^26.4.6",
+        "eslint-plugin-jest": "^26.8.7",
         "fs-extra": "^8.1.0",
         "javascript-stringify": "^2.0.1",
-        "jest": "^27.3.0",
-        "jest-circus": "^27.3.0",
-        "lua-types": "^2.11.0",
-        "lua-wasm-bindings": "^0.2.2",
+        "jest": "^28.1.3",
+        "jest-circus": "^29.0.1",
+        "lua-types": "^2.13.0-beta.0",
+        "lua-wasm-bindings": "^0.3.1",
         "prettier": "^2.3.2",
-        "ts-jest": "^27.1.3",
-        "ts-node": "^10.3.0",
-        "typescript": "~4.7.3"
+        "ts-jest": "^28.0.8",
+        "ts-node": "^10.9.1",
+        "typescript": "~4.8.2"
     }
 }