typescript-to-lua 1.6.1 → 1.7.0

package/dist/transformation/visitors/literal.js

@@ -5,14 +5,12 @@ const ts = require("typescript");
 const lua = require("../../LuaAST");
 const utils_1 = require("../../utils");
 const diagnostics_1 = require("../utils/diagnostics");
-const export_1 = require("../utils/export");
 const lualib_1 = require("../utils/lualib");
-const safe_names_1 = require("../utils/safe-names");
 const symbols_1 = require("../utils/symbols");
 const typescript_1 = require("../utils/typescript");
 const function_1 = require("./function");
 const expression_list_1 = require("./expression-list");
-const multi_1 = require("./language-extensions/multi");
+const identifier_1 = require("./identifier");
 // TODO: Move to object-literal.ts?
 function transformPropertyName(context, node) {
     if (ts.isComputedPropertyName(node)) {
@@ -30,21 +28,7 @@ function transformPropertyName(context, node) {
 }
 exports.transformPropertyName = transformPropertyName;
 function createShorthandIdentifier(context, valueSymbol, propertyIdentifier) {
-    const propertyName = propertyIdentifier.text;
-    const isUnsafeName = valueSymbol
-        ? (0, safe_names_1.hasUnsafeSymbolName)(context, valueSymbol, propertyIdentifier)
-        : (0, safe_names_1.hasUnsafeIdentifierName)(context, propertyIdentifier, false);
-    const name = isUnsafeName ? (0, safe_names_1.createSafeName)(propertyName) : propertyName;
-    let identifier = context.transformExpression(ts.factory.createIdentifier(name));
-    lua.setNodeOriginal(identifier, propertyIdentifier);
-    if (valueSymbol !== undefined && lua.isIdentifier(identifier)) {
-        identifier.symbolId = (0, symbols_1.getSymbolIdOfSymbol)(context, valueSymbol);
-        const exportScope = (0, export_1.getSymbolExportScope)(context, valueSymbol);
-        if (exportScope) {
-            identifier = (0, export_1.createExportedIdentifier)(context, identifier, exportScope);
-        }
-    }
-    return identifier;
+    return (0, identifier_1.transformIdentifierWithSymbol)(context, propertyIdentifier, valueSymbol);
 }
 exports.createShorthandIdentifier = createShorthandIdentifier;
 const transformNumericLiteralExpression = expression => {
@@ -56,11 +40,6 @@ const transformNumericLiteralExpression = expression => {
     return lua.createNumericLiteral(Number(expression.text), expression);
 };
 const transformObjectLiteralExpression = (expression, context) => {
-    const violations = (0, multi_1.findMultiAssignmentViolations)(context, expression);
-    if (violations.length > 0) {
-        context.diagnostics.push(...violations.map(e => (0, diagnostics_1.invalidMultiFunctionUse)(e)));
-        return lua.createNilLiteral(expression);
-    }
     const properties = [];
     const initializers = [];
     const keyPrecedingStatements = [];

package/dist/transformation/visitors/loops/for-of.js

@@ -3,14 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformForOfStatement = void 0;
 const ts = require("typescript");
 const lua = require("../../../LuaAST");
-const annotations_1 = require("../../utils/annotations");
-const diagnostics_1 = require("../../utils/diagnostics");
 const lualib_1 = require("../../utils/lualib");
 const typescript_1 = require("../../utils/typescript");
 const iterable_1 = require("../language-extensions/iterable");
-const pairsIterable_1 = require("../language-extensions/pairsIterable");
 const range_1 = require("../language-extensions/range");
 const utils_1 = require("./utils");
+const language_extensions_1 = require("../../utils/language-extensions");
+const utils_2 = require("../../../utils");
 function transformForOfArrayStatement(context, statement, block) {
     const valueVariable = (0, utils_1.transformForInitializer)(context, statement.initializer, block);
     const ipairsCall = lua.createCallExpression(lua.createIdentifier("ipairs"), [
@@ -28,24 +27,25 @@ const transformForOfStatement = (node, context) => {
     if (ts.isCallExpression(node.expression) && (0, range_1.isRangeFunction)(context, node.expression)) {
         return (0, range_1.transformRangeStatement)(context, node, body);
     }
-    else if (ts.isCallExpression(node.expression) && (0, annotations_1.isForRangeType)(context, node.expression.expression)) {
-        context.diagnostics.push((0, diagnostics_1.annotationRemoved)(node.expression, annotations_1.AnnotationKind.ForRange));
+    const iterableExtensionType = (0, language_extensions_1.getIterableExtensionKindForNode)(context, node.expression);
+    if (iterableExtensionType) {
+        if (iterableExtensionType === language_extensions_1.IterableExtensionKind.Iterable) {
+            return (0, iterable_1.transformForOfIterableStatement)(context, node, body);
+        }
+        else if (iterableExtensionType === language_extensions_1.IterableExtensionKind.Pairs) {
+            return (0, iterable_1.transformForOfPairsIterableStatement)(context, node, body);
+        }
+        else if (iterableExtensionType === language_extensions_1.IterableExtensionKind.PairsKey) {
+            return (0, iterable_1.transformForOfPairsKeyIterableStatement)(context, node, body);
+        }
+        else {
+            (0, utils_2.assertNever)(iterableExtensionType);
+        }
     }
-    else if ((0, iterable_1.isIterableExpression)(context, node.expression)) {
-        return (0, iterable_1.transformForOfIterableStatement)(context, node, body);
-    }
-    else if ((0, pairsIterable_1.isPairsIterableExpression)(context, node.expression)) {
-        return (0, pairsIterable_1.transformForOfPairsIterableStatement)(context, node, body);
-    }
-    else if ((0, annotations_1.isLuaIteratorType)(context, node.expression)) {
-        context.diagnostics.push((0, diagnostics_1.annotationRemoved)(node.expression, annotations_1.AnnotationKind.LuaIterator));
-    }
-    else if ((0, typescript_1.isArrayType)(context, context.checker.getTypeAtLocation(node.expression))) {
+    if ((0, typescript_1.isArrayType)(context, context.checker.getTypeAtLocation(node.expression))) {
         return transformForOfArrayStatement(context, node, body);
     }
-    else {
-        return transformForOfIteratorStatement(context, node, body);
-    }
+    return transformForOfIteratorStatement(context, node, body);
 };
 exports.transformForOfStatement = transformForOfStatement;
 //# sourceMappingURL=for-of.js.map

package/dist/transformation/visitors/loops/utils.js

@@ -12,9 +12,9 @@ const block_1 = require("../block");
 const identifier_1 = require("../identifier");
 const variable_declaration_1 = require("../variable-declaration");
 function transformLoopBody(context, loop) {
-    (0, scope_1.pushScope)(context, scope_1.ScopeType.Loop);
+    context.pushScope(scope_1.ScopeType.Loop);
     const body = (0, scope_1.performHoisting)(context, (0, block_1.transformBlockOrStatement)(context, loop.statement));
-    const scope = (0, scope_1.popScope)(context);
+    const scope = context.popScope();
     const scopeId = scope.id;
     if (!scope.loopContinued) {
         return body;
@@ -35,7 +35,7 @@ function getVariableDeclarationBinding(context, node) {
 exports.getVariableDeclarationBinding = getVariableDeclarationBinding;
 function transformForInitializer(context, initializer, block) {
     const valueVariable = lua.createIdentifier("____value");
-    (0, scope_1.pushScope)(context, scope_1.ScopeType.LoopInitializer);
+    context.pushScope(scope_1.ScopeType.LoopInitializer);
     if (ts.isVariableDeclarationList(initializer)) {
         // Declaration of new variable
         const binding = getVariableDeclarationBinding(context, initializer);
@@ -45,7 +45,7 @@ function transformForInitializer(context, initializer, block) {
         }
         else {
             // Single variable declared in for loop
-            (0, scope_1.popScope)(context);
+            context.popScope();
             return (0, identifier_1.transformIdentifier)(context, binding);
         }
     }
@@ -55,7 +55,7 @@ function transformForInitializer(context, initializer, block) {
             ? (0, destructuring_assignments_1.transformAssignmentPattern)(context, initializer, valueVariable, false)
             : (0, assignments_1.transformAssignment)(context, initializer, valueVariable)));
     }
-    (0, scope_1.popScope)(context);
+    context.popScope();
     return valueVariable;
 }
 exports.transformForInitializer = transformForInitializer;

package/dist/transformation/visitors/namespace.js

@@ -3,8 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformModuleDeclaration = exports.createModuleLocalNameIdentifier = void 0;
 const ts = require("typescript");
 const lua = require("../../LuaAST");
-const annotations_1 = require("../utils/annotations");
-const diagnostics_1 = require("../utils/diagnostics");
 const export_1 = require("../utils/export");
 const lua_ast_1 = require("../utils/lua-ast");
 const safe_names_1 = require("../utils/safe-names");
@@ -33,16 +31,9 @@ function moduleHasEmittedBody(node) {
     }
     return false;
 }
-// Static context -> namespace dictionary keeping the current namespace for each transformation context
-const currentNamespaces = new WeakMap();
 const transformModuleDeclaration = (node, context) => {
     var _a, _b;
-    const annotations = (0, annotations_1.getTypeAnnotations)(context.checker.getTypeAtLocation(node));
-    // If phantom namespace elide the declaration and return the body
-    if (annotations.has(annotations_1.AnnotationKind.Phantom)) {
-        context.diagnostics.push((0, diagnostics_1.annotationRemoved)(node, annotations_1.AnnotationKind.Phantom));
-    }
-    const currentNamespace = currentNamespaces.get(context);
+    const currentNamespace = context.currentNamespaces;
     const result = [];
     const symbol = context.checker.getSymbolAtLocation(node.name);
     const hasExports = symbol !== undefined && context.checker.getExportsOfModule(symbol).length > 0;
@@ -75,15 +66,15 @@ const transformModuleDeclaration = (node, context) => {
     }
     // Set current namespace for nested NS
     // Keep previous namespace to reset after block transpilation
-    currentNamespaces.set(context, node);
+    context.currentNamespaces = node;
     // Transform moduleblock to block and visit it
     if (moduleHasEmittedBody(node)) {
-        (0, scope_1.pushScope)(context, scope_1.ScopeType.Block);
+        context.pushScope(scope_1.ScopeType.Block);
         const statements = (0, scope_1.performHoisting)(context, context.transformStatements(ts.isModuleBlock(node.body) ? node.body.statements : node.body));
-        (0, scope_1.popScope)(context);
+        context.popScope();
         result.push(lua.createDoStatement(statements));
     }
-    currentNamespaces.set(context, currentNamespace);
+    context.currentNamespaces = currentNamespace;
     return result;
 };
 exports.transformModuleDeclaration = transformModuleDeclaration;

package/dist/transformation/visitors/return.js

@@ -60,7 +60,6 @@ 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]),
@@ -68,9 +67,9 @@ function createReturnStatement(context, values, node) {
     }
     if (isInTryCatch(context)) {
         // Bubble up explicit return flag and check if we're inside a try/catch block
-        results.unshift(lua.createBooleanLiteral(true));
+        values = [lua.createBooleanLiteral(true), ...values];
     }
-    return lua.createReturnStatement(results, node);
+    return lua.createReturnStatement(values, node);
 }
 exports.createReturnStatement = createReturnStatement;
 function isInTryCatch(context) {

package/dist/transformation/visitors/sourceFile.js

@@ -5,7 +5,6 @@ const ts = require("typescript");
 const lua = require("../../LuaAST");
 const utils_1 = require("../../utils");
 const lua_ast_1 = require("../utils/lua-ast");
-const lualib_1 = require("../utils/lualib");
 const preceding_statements_1 = require("../utils/preceding-statements");
 const scope_1 = require("../utils/scope");
 const typescript_1 = require("../utils/typescript");
@@ -28,9 +27,9 @@ const transformSourceFileNode = (node, context) => {
         }
     }
     else {
-        (0, scope_1.pushScope)(context, scope_1.ScopeType.File);
+        context.pushScope(scope_1.ScopeType.File);
         statements = (0, scope_1.performHoisting)(context, context.transformStatements(node.statements));
-        (0, scope_1.popScope)(context);
+        context.popScope();
         if (context.isModule) {
             // If export equals was not used. Create the exports table.
             // local ____exports = {}
@@ -42,7 +41,7 @@ const transformSourceFileNode = (node, context) => {
         }
     }
     const trivia = (_b = (_a = node.getFullText().match(/^#!.*\r?\n/)) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : "";
-    return lua.createFile(statements, (0, lualib_1.getUsedLuaLibFeatures)(context), trivia, node);
+    return lua.createFile(statements, context.usedLuaLibFeatures, trivia, node);
 };
 exports.transformSourceFileNode = transformSourceFileNode;
 //# sourceMappingURL=sourceFile.js.map

package/dist/transformation/visitors/spread.js

@@ -3,13 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformSpreadElement = exports.isOptimizedVarArgSpread = void 0;
 const ts = require("typescript");
 const lua = require("../../LuaAST");
-const annotations_1 = require("../utils/annotations");
 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 multi_1 = require("./language-extensions/multi");
-const diagnostics_1 = require("../utils/diagnostics");
 const vararg_1 = require("./language-extensions/vararg");
 function isOptimizedVarArgSpread(context, symbol, identifier) {
     var _a;
@@ -53,9 +51,6 @@ exports.isOptimizedVarArgSpread = isOptimizedVarArgSpread;
 const transformSpreadElement = (node, context) => {
     const tsInnerExpression = ts.skipOuterExpressions(node.expression);
     if (ts.isIdentifier(tsInnerExpression)) {
-        if ((0, annotations_1.isVarargType)(context, tsInnerExpression)) {
-            context.diagnostics.push((0, diagnostics_1.annotationRemoved)(node, annotations_1.AnnotationKind.Vararg));
-        }
         const symbol = context.checker.getSymbolAtLocation(tsInnerExpression);
         if (symbol && isOptimizedVarArgSpread(context, symbol, tsInnerExpression)) {
             return lua.createDotsLiteral(node);

package/dist/transformation/visitors/switch.js

@@ -39,7 +39,7 @@ const coalesceCondition = (condition, conditionPrecedingStatements, switchVariab
     return [[...conditionPrecedingStatements, ...precedingStatements], comparison];
 };
 const transformSwitchStatement = (statement, context) => {
-    const scope = (0, scope_1.pushScope)(context, scope_1.ScopeType.Switch);
+    const scope = context.pushScope(scope_1.ScopeType.Switch);
     // Give the switch and condition accumulator a unique name to prevent nested switches from acting up.
     const switchName = `____switch${scope.id}`;
     const conditionName = `____cond${scope.id}`;
@@ -158,7 +158,7 @@ const transformSwitchStatement = (statement, context) => {
     if (hoistedIdentifiers.length > 0) {
         statements.unshift(lua.createVariableDeclarationStatement(hoistedIdentifiers));
     }
-    (0, scope_1.popScope)(context);
+    context.popScope();
     // Add the switch expression after hoisting
     const expression = context.transformExpression(statement.expression);
     statements.unshift(lua.createVariableDeclarationStatement(switchVariable, expression));

package/dist/transformation/visitors/variable-declaration.js

@@ -201,7 +201,7 @@ function transformVariableDeclaration(context, statement) {
         // Skip named function expressions because they will have been wrapped already
         if (ts.isFunctionExpression(initializer) && initializer.name)
             return false;
-        return (0, function_1.isFunctionTypeWithProperties)(context.checker.getTypeAtLocation(statement.name));
+        return (0, function_1.isFunctionTypeWithProperties)(context, context.checker.getTypeAtLocation(statement.name));
     }
 }
 exports.transformVariableDeclaration = transformVariableDeclaration;

package/dist/transpilation/index.js

@@ -26,11 +26,9 @@ __exportStar(require("./transpile"), exports);
 __exportStar(require("./transpiler"), exports);
 function transpileFiles(rootNames, options = {}, writeFile) {
     const program = ts.createProgram(rootNames, options);
+    const preEmitDiagnostics = ts.getPreEmitDiagnostics(program);
     const { diagnostics: transpileDiagnostics, emitSkipped } = new transpiler_1.Transpiler().emit({ program, writeFile });
-    const diagnostics = ts.sortAndDeduplicateDiagnostics([
-        ...ts.getPreEmitDiagnostics(program),
-        ...transpileDiagnostics,
-    ]);
+    const diagnostics = ts.sortAndDeduplicateDiagnostics([...preEmitDiagnostics, ...transpileDiagnostics]);
     return { diagnostics: [...diagnostics], emitSkipped };
 }
 exports.transpileFiles = transpileFiles;
@@ -85,12 +83,10 @@ function createVirtualProgram(input, options = {}) {
 exports.createVirtualProgram = createVirtualProgram;
 function transpileVirtualProject(files, options = {}) {
     const program = createVirtualProgram(files, options);
+    const preEmitDiagnostics = ts.getPreEmitDiagnostics(program);
     const collector = (0, output_collector_1.createEmitOutputCollector)();
     const { diagnostics: transpileDiagnostics } = new transpiler_1.Transpiler().emit({ program, writeFile: collector.writeFile });
-    const diagnostics = ts.sortAndDeduplicateDiagnostics([
-        ...ts.getPreEmitDiagnostics(program),
-        ...transpileDiagnostics,
-    ]);
+    const diagnostics = ts.sortAndDeduplicateDiagnostics([...preEmitDiagnostics, ...transpileDiagnostics]);
     return { diagnostics: [...diagnostics], transpiledFiles: collector.files };
 }
 exports.transpileVirtualProject = transpileVirtualProject;

package/dist/transpilation/plugins.js

@@ -2,8 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPlugins = void 0;
 const utils_1 = require("./utils");
+const performance = require("../measure-performance");
 function getPlugins(program) {
     var _a;
+    performance.startSection("getPlugins");
     const diagnostics = [];
     const pluginsFromOptions = [];
     const options = program.getCompilerOptions();
@@ -20,6 +22,7 @@ function getPlugins(program) {
     if (options.tstlVerbose) {
         console.log(`Loaded ${pluginsFromOptions.length} plugins`);
     }
+    performance.endSection("getPlugins");
     return { diagnostics, plugins: pluginsFromOptions };
 }
 exports.getPlugins = getPlugins;