typescript-to-lua 1.0.1 → 1.3.0

package/dist/transformation/visitors/class/decorators.js

@@ -9,9 +9,9 @@ const lualib_1 = require("../../utils/lualib");
 function transformDecoratorExpression(context, decorator) {
     const expression = decorator.expression;
     const type = context.checker.getTypeAtLocation(expression);
-    const callContext = function_context_1.getFunctionContextType(context, type);
+    const callContext = (0, function_context_1.getFunctionContextType)(context, type);
     if (callContext === function_context_1.ContextType.Void) {
-        context.diagnostics.push(diagnostics_1.decoratorInvalidContext(decorator));
+        context.diagnostics.push((0, diagnostics_1.decoratorInvalidContext)(decorator));
     }
     return context.transformExpression(expression);
 }
@@ -26,7 +26,7 @@ function createDecoratingExpression(context, kind, decorators, targetTableName,
             kind === ts.SyntaxKind.SetAccessor;
         trailingExpressions.push(isMethodOrAccessor ? lua.createBooleanLiteral(true) : lua.createNilLiteral());
     }
-    return lualib_1.transformLuaLibFunction(context, lualib_1.LuaLibFeature.Decorate, undefined, ...trailingExpressions);
+    return (0, lualib_1.transformLuaLibFunction)(context, lualib_1.LuaLibFeature.Decorate, undefined, ...trailingExpressions);
 }
 exports.createDecoratingExpression = createDecoratingExpression;
 //# sourceMappingURL=decorators.js.map

package/dist/transformation/visitors/class/index.js

@@ -9,7 +9,6 @@ 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");
-const transform_1 = require("../../utils/transform");
 const identifier_1 = require("../identifier");
 const decorators_1 = require("./decorators");
 const accessors_1 = require("./members/accessors");
@@ -21,8 +20,8 @@ const setup_1 = require("./setup");
 const utils_2 = require("./utils");
 const transformClassDeclaration = (declaration, context) => {
     // If declaration is a default export, transform to export variable assignment instead
-    if (export_1.hasDefaultExportModifier(declaration)) {
-        const left = export_1.createExportedIdentifier(context, export_1.createDefaultExportIdentifier(declaration));
+    if ((0, export_1.hasDefaultExportModifier)(declaration)) {
+        const left = (0, export_1.createDefaultExportExpression)(declaration);
         const right = transformClassAsExpression(declaration, context);
         return [lua.createAssignmentStatement(left, right, declaration)];
     }
@@ -30,13 +29,12 @@ const transformClassDeclaration = (declaration, context) => {
     return statements;
 };
 exports.transformClassDeclaration = transformClassDeclaration;
-const transformThisExpression = node => lua_ast_1.createSelfIdentifier(node);
+const transformThisExpression = node => (0, lua_ast_1.createSelfIdentifier)(node);
 exports.transformThisExpression = transformThisExpression;
 function transformClassAsExpression(expression, context) {
-    return transform_1.transformToImmediatelyInvokedFunctionExpression(context, () => {
-        const { statements, name } = transformClassLikeDeclaration(expression, context);
-        return { statements: lua_ast_1.unwrapVisitorResult(statements), result: name };
-    }, expression);
+    const { statements, name } = transformClassLikeDeclaration(expression, context);
+    context.addPrecedingStatements(statements);
+    return name;
 }
 exports.transformClassAsExpression = transformClassAsExpression;
 const classSuperInfos = new WeakMap();
@@ -46,52 +44,51 @@ function transformClassLikeDeclaration(classDeclaration, context, nameOverride)
         className = nameOverride;
     }
     else if (classDeclaration.name !== undefined) {
-        className = identifier_1.transformIdentifier(context, classDeclaration.name);
+        className = (0, identifier_1.transformIdentifier)(context, classDeclaration.name);
     }
     else {
-        // TypeScript error
-        className = lua.createAnonymousIdentifier();
+        className = lua.createIdentifier(context.createTempName("class"), classDeclaration);
     }
-    const annotations = annotations_1.getTypeAnnotations(context.checker.getTypeAtLocation(classDeclaration));
+    const annotations = (0, annotations_1.getTypeAnnotations)(context.checker.getTypeAtLocation(classDeclaration));
     if (annotations.has(annotations_1.AnnotationKind.Extension)) {
-        context.diagnostics.push(diagnostics_1.annotationRemoved(classDeclaration, annotations_1.AnnotationKind.Extension));
+        context.diagnostics.push((0, diagnostics_1.annotationRemoved)(classDeclaration, annotations_1.AnnotationKind.Extension));
     }
     if (annotations.has(annotations_1.AnnotationKind.MetaExtension)) {
-        context.diagnostics.push(diagnostics_1.annotationRemoved(classDeclaration, annotations_1.AnnotationKind.MetaExtension));
+        context.diagnostics.push((0, diagnostics_1.annotationRemoved)(classDeclaration, annotations_1.AnnotationKind.MetaExtension));
     }
     // Get type that is extended
-    const extendedTypeNode = utils_2.getExtendedNode(context, classDeclaration);
-    const extendedType = utils_2.getExtendedType(context, classDeclaration);
-    const superInfo = utils_1.getOrUpdate(classSuperInfos, context, () => []);
+    const extendedTypeNode = (0, utils_2.getExtendedNode)(context, classDeclaration);
+    const extendedType = (0, utils_2.getExtendedType)(context, classDeclaration);
+    const superInfo = (0, utils_1.getOrUpdate)(classSuperInfos, context, () => []);
     superInfo.push({ className, extendedTypeNode });
     if (extendedType) {
-        new_1.checkForLuaLibType(context, extendedType);
+        (0, new_1.checkForLuaLibType)(context, extendedType);
     }
     // Get all properties with value
     const properties = classDeclaration.members.filter(ts.isPropertyDeclaration).filter(member => member.initializer);
     // Divide properties into static and non-static
-    const instanceFields = properties.filter(prop => !utils_2.isStaticNode(prop));
+    const instanceFields = properties.filter(prop => !(0, utils_2.isStaticNode)(prop));
     const result = [];
     let localClassName;
-    if (safe_names_1.isUnsafeName(className.text)) {
-        localClassName = lua.createIdentifier(safe_names_1.createSafeName(className.text), undefined, className.symbolId, className.text);
+    if ((0, safe_names_1.isUnsafeName)(className.text, context.options)) {
+        localClassName = lua.createIdentifier((0, safe_names_1.createSafeName)(className.text), undefined, className.symbolId, className.text);
         lua.setNodePosition(localClassName, className);
     }
     else {
         localClassName = className;
     }
-    result.push(...setup_1.createClassSetup(context, classDeclaration, className, localClassName, extendedType));
+    result.push(...(0, setup_1.createClassSetup)(context, classDeclaration, className, localClassName, extendedType));
     // Find first constructor with body
     const constructor = classDeclaration.members.find((n) => ts.isConstructorDeclaration(n) && n.body !== undefined);
     if (constructor) {
         // Add constructor plus initialization of instance fields
-        const constructorResult = constructor_1.transformConstructorDeclaration(context, constructor, localClassName, instanceFields, classDeclaration);
+        const constructorResult = (0, constructor_1.transformConstructorDeclaration)(context, constructor, localClassName, instanceFields, classDeclaration);
         if (constructorResult)
             result.push(constructorResult);
     }
     else if (!extendedType) {
         // Generate a constructor if none was defined in a base class
-        const constructorResult = constructor_1.transformConstructorDeclaration(context, ts.factory.createConstructorDeclaration([], [], [], ts.factory.createBlock([], true)), localClassName, instanceFields, classDeclaration);
+        const constructorResult = (0, constructor_1.transformConstructorDeclaration)(context, ts.factory.createConstructorDeclaration([], [], [], ts.factory.createBlock([], true)), localClassName, instanceFields, classDeclaration);
         if (constructorResult)
             result.push(constructorResult);
     }
@@ -100,11 +97,11 @@ function transformClassLikeDeclaration(classDeclaration, context, nameOverride)
         // localClassName.prototype.____constructor = function(self, ...)
         //     baseClassName.prototype.____constructor(self, ...)
         //     ...
-        const constructorBody = fields_1.transformClassInstanceFields(context, instanceFields);
-        const superCall = lua.createExpressionStatement(lua.createCallExpression(lua.createTableIndexExpression(context.transformExpression(ts.factory.createSuper()), lua.createStringLiteral("____constructor")), [lua_ast_1.createSelfIdentifier(), lua.createDotsLiteral()]));
+        const constructorBody = (0, fields_1.transformClassInstanceFields)(context, instanceFields);
+        const superCall = lua.createExpressionStatement(lua.createCallExpression(lua.createTableIndexExpression(context.transformExpression(ts.factory.createSuper()), lua.createStringLiteral("____constructor")), [(0, lua_ast_1.createSelfIdentifier)(), lua.createDotsLiteral()]));
         constructorBody.unshift(superCall);
-        const constructorFunction = lua.createFunctionExpression(lua.createBlock(constructorBody), [lua_ast_1.createSelfIdentifier()], lua.createDotsLiteral(), lua.FunctionExpressionFlags.Declaration);
-        result.push(lua.createAssignmentStatement(constructor_1.createConstructorName(localClassName), constructorFunction, classDeclaration));
+        const constructorFunction = lua.createFunctionExpression(lua.createBlock(constructorBody), [(0, lua_ast_1.createSelfIdentifier)()], lua.createDotsLiteral(), lua.FunctionExpressionFlags.Declaration);
+        result.push(lua.createAssignmentStatement((0, constructor_1.createConstructorName)(localClassName), constructorFunction, classDeclaration));
     }
     // Transform accessors
     for (const member of classDeclaration.members) {
@@ -113,7 +110,7 @@ function transformClassLikeDeclaration(classDeclaration, context, nameOverride)
         const accessors = context.resolver.getAllAccessorDeclarations(member);
         if (accessors.firstAccessor !== member)
             continue;
-        const accessorsResult = accessors_1.transformAccessorDeclarations(context, accessors, localClassName);
+        const accessorsResult = (0, accessors_1.transformAccessorDeclarations)(context, accessors, localClassName);
         if (accessorsResult) {
             result.push(accessorsResult);
         }
@@ -121,27 +118,27 @@ function transformClassLikeDeclaration(classDeclaration, context, nameOverride)
     const decorationStatements = [];
     for (const member of classDeclaration.members) {
         if (ts.isAccessor(member)) {
-            const expression = fields_1.createPropertyDecoratingExpression(context, member, localClassName);
+            const expression = (0, fields_1.createPropertyDecoratingExpression)(context, member, localClassName);
             if (expression)
                 decorationStatements.push(lua.createExpressionStatement(expression));
         }
         else if (ts.isMethodDeclaration(member)) {
-            const statement = method_1.transformMethodDeclaration(context, member, localClassName);
+            const statement = (0, method_1.transformMethodDeclaration)(context, member, localClassName);
             if (statement)
                 result.push(statement);
             if (member.body) {
-                const statement = method_1.createMethodDecoratingExpression(context, member, localClassName);
+                const statement = (0, method_1.createMethodDecoratingExpression)(context, member, localClassName);
                 if (statement)
                     decorationStatements.push(statement);
             }
         }
         else if (ts.isPropertyDeclaration(member)) {
-            if (utils_2.isStaticNode(member)) {
-                const statement = fields_1.transformStaticPropertyDeclaration(context, member, localClassName);
+            if ((0, utils_2.isStaticNode)(member)) {
+                const statement = (0, fields_1.transformStaticPropertyDeclaration)(context, member, localClassName);
                 if (statement)
                     decorationStatements.push(statement);
             }
-            const expression = fields_1.createPropertyDecoratingExpression(context, member, localClassName);
+            const expression = (0, fields_1.createPropertyDecoratingExpression)(context, member, localClassName);
             if (expression)
                 decorationStatements.push(lua.createExpressionStatement(expression));
         }
@@ -149,15 +146,22 @@ function transformClassLikeDeclaration(classDeclaration, context, nameOverride)
     result.push(...decorationStatements);
     // Decorate the class
     if (classDeclaration.decorators) {
-        const decoratingExpression = decorators_1.createDecoratingExpression(context, classDeclaration.kind, classDeclaration.decorators.map(d => decorators_1.transformDecoratorExpression(context, d)), localClassName);
+        const decoratingExpression = (0, decorators_1.createDecoratingExpression)(context, classDeclaration.kind, classDeclaration.decorators.map(d => (0, decorators_1.transformDecoratorExpression)(context, d)), localClassName);
         const decoratingStatement = lua.createAssignmentStatement(localClassName, decoratingExpression);
         result.push(decoratingStatement);
+        if ((0, export_1.hasExportModifier)(classDeclaration)) {
+            const exportExpression = (0, export_1.hasDefaultExportModifier)(classDeclaration)
+                ? (0, export_1.createDefaultExportExpression)(classDeclaration)
+                : (0, export_1.createExportedIdentifier)(context, className);
+            const classAssignment = lua.createAssignmentStatement(exportExpression, localClassName);
+            result.push(classAssignment);
+        }
     }
     superInfo.pop();
     return { statements: result, name: className };
 }
 const transformSuperExpression = (expression, context) => {
-    const superInfos = utils_1.getOrUpdate(classSuperInfos, context, () => []);
+    const superInfos = (0, utils_1.getOrUpdate)(classSuperInfos, context, () => []);
     const superInfo = superInfos[superInfos.length - 1];
     if (!superInfo)
         return lua.createAnonymousIdentifier(expression);
@@ -167,9 +171,9 @@ const transformSuperExpression = (expression, context) => {
     let baseClassName;
     if (extendsExpression && ts.isIdentifier(extendsExpression)) {
         const symbol = context.checker.getSymbolAtLocation(extendsExpression);
-        if (symbol && !export_1.isSymbolExported(context, symbol)) {
+        if (symbol && !(0, export_1.isSymbolExported)(context, symbol)) {
             // Use "baseClassName" if base is a simple identifier
-            baseClassName = identifier_1.transformIdentifier(context, extendsExpression);
+            baseClassName = (0, identifier_1.transformIdentifier)(context, extendsExpression);
         }
     }
     if (!baseClassName) {

package/dist/transformation/visitors/class/members/accessors.js

@@ -9,12 +9,12 @@ const literal_1 = require("../../literal");
 const utils_1 = require("../utils");
 const constructor_1 = require("./constructor");
 function transformAccessor(context, node) {
-    const [params, dot, restParam] = function_1.transformParameters(context, node.parameters, lua_ast_1.createSelfIdentifier());
-    const body = node.body ? function_1.transformFunctionBody(context, node.parameters, node.body, restParam)[0] : [];
+    const [params, dot, restParam] = (0, function_1.transformParameters)(context, node.parameters, (0, lua_ast_1.createSelfIdentifier)());
+    const body = node.body ? (0, function_1.transformFunctionBody)(context, node.parameters, node.body, restParam)[0] : [];
     return lua.createFunctionExpression(lua.createBlock(body), params, dot, lua.FunctionExpressionFlags.Declaration);
 }
 function transformAccessorDeclarations(context, { firstAccessor, getAccessor, setAccessor }, className) {
-    const propertyName = literal_1.transformPropertyName(context, firstAccessor.name);
+    const propertyName = (0, literal_1.transformPropertyName)(context, firstAccessor.name);
     const descriptor = lua.createTableExpression([]);
     if (getAccessor) {
         const getterFunction = transformAccessor(context, getAccessor);
@@ -24,13 +24,13 @@ function transformAccessorDeclarations(context, { firstAccessor, getAccessor, se
         const setterFunction = transformAccessor(context, setAccessor);
         descriptor.fields.push(lua.createTableFieldExpression(setterFunction, lua.createStringLiteral("set")));
     }
-    const isStatic = utils_1.isStaticNode(firstAccessor);
-    const target = isStatic ? lua.cloneIdentifier(className) : constructor_1.createPrototypeName(className);
+    const isStatic = (0, utils_1.isStaticNode)(firstAccessor);
+    const target = isStatic ? lua.cloneIdentifier(className) : (0, constructor_1.createPrototypeName)(className);
     const feature = isStatic ? lualib_1.LuaLibFeature.ObjectDefineProperty : lualib_1.LuaLibFeature.SetDescriptor;
     const parameters = [target, propertyName, descriptor];
     if (!isStatic)
         parameters.push(lua.createBooleanLiteral(true));
-    const call = lualib_1.transformLuaLibFunction(context, feature, undefined, ...parameters);
+    const call = (0, lualib_1.transformLuaLibFunction)(context, feature, undefined, ...parameters);
     return lua.createExpressionStatement(call);
 }
 exports.transformAccessorDeclarations = transformAccessorDeclarations;

package/dist/transformation/visitors/class/members/constructor.js

@@ -22,14 +22,14 @@ function transformConstructorDeclaration(context, statement, className, instance
         return undefined;
     }
     // Transform body
-    const scope = scope_1.pushScope(context, scope_1.ScopeType.Function);
-    const body = function_1.transformFunctionBodyContent(context, statement.body);
-    const [params, dotsLiteral, restParamName] = function_1.transformParameters(context, statement.parameters, lua_ast_1.createSelfIdentifier());
+    const scope = (0, scope_1.pushScope)(context, scope_1.ScopeType.Function);
+    const body = (0, function_1.transformFunctionBodyContent)(context, statement.body);
+    const [params, dotsLiteral, restParamName] = (0, function_1.transformParameters)(context, statement.parameters, (0, lua_ast_1.createSelfIdentifier)());
     // Make sure default parameters are assigned before fields are initialized
-    const bodyWithFieldInitializers = function_1.transformFunctionBodyHeader(context, scope, statement.parameters, restParamName);
+    const bodyWithFieldInitializers = (0, function_1.transformFunctionBodyHeader)(context, scope, statement.parameters, restParamName);
     // Check for field declarations in constructor
     const constructorFieldsDeclarations = statement.parameters.filter(p => p.modifiers !== undefined);
-    const classInstanceFields = fields_1.transformClassInstanceFields(context, instanceFields);
+    const classInstanceFields = (0, fields_1.transformClassInstanceFields)(context, instanceFields);
     // If there are field initializers and the first statement is a super call,
     // move super call between default assignments and initializers
     if ((constructorFieldsDeclarations.length > 0 || classInstanceFields.length > 0) &&
@@ -49,7 +49,7 @@ function transformConstructorDeclaration(context, statement, className, instance
     for (const declaration of constructorFieldsDeclarations) {
         if (ts.isIdentifier(declaration.name)) {
             // self.declarationName = declarationName
-            const assignment = lua.createAssignmentStatement(lua.createTableIndexExpression(lua_ast_1.createSelfIdentifier(), lua.createStringLiteral(declaration.name.text)), identifier_1.transformIdentifier(context, declaration.name));
+            const assignment = lua.createAssignmentStatement(lua.createTableIndexExpression((0, lua_ast_1.createSelfIdentifier)(), lua.createStringLiteral(declaration.name.text)), (0, identifier_1.transformIdentifier)(context, declaration.name));
             bodyWithFieldInitializers.push(assignment);
         }
         // else { TypeScript error: A parameter property may not be declared using a binding pattern }
@@ -58,7 +58,7 @@ function transformConstructorDeclaration(context, statement, className, instance
     bodyWithFieldInitializers.push(...body);
     const block = lua.createBlock(bodyWithFieldInitializers);
     const constructorWasGenerated = statement.pos === -1;
-    scope_1.popScope(context);
+    (0, scope_1.popScope)(context);
     return lua.createAssignmentStatement(createConstructorName(className), lua.createFunctionExpression(block, params, dotsLiteral, lua.FunctionExpressionFlags.Declaration), constructorWasGenerated ? classDeclaration : statement);
 }
 exports.transformConstructorDeclaration = transformConstructorDeclaration;

package/dist/transformation/visitors/class/members/fields.js

@@ -9,19 +9,19 @@ const method_1 = require("./method");
 function createPropertyDecoratingExpression(context, node, className) {
     if (!node.decorators)
         return;
-    const propertyName = literal_1.transformPropertyName(context, node.name);
-    const propertyOwnerTable = method_1.transformMemberExpressionOwnerName(node, className);
-    return decorators_1.createDecoratingExpression(context, node.kind, node.decorators.map(d => decorators_1.transformDecoratorExpression(context, d)), propertyOwnerTable, propertyName);
+    const propertyName = (0, literal_1.transformPropertyName)(context, node.name);
+    const propertyOwnerTable = (0, method_1.transformMemberExpressionOwnerName)(node, className);
+    return (0, decorators_1.createDecoratingExpression)(context, node.kind, node.decorators.map(d => (0, decorators_1.transformDecoratorExpression)(context, d)), propertyOwnerTable, propertyName);
 }
 exports.createPropertyDecoratingExpression = createPropertyDecoratingExpression;
 function transformClassInstanceFields(context, instanceFields) {
     const statements = [];
     for (const f of instanceFields) {
         // Get identifier
-        const fieldName = literal_1.transformPropertyName(context, f.name);
+        const fieldName = (0, literal_1.transformPropertyName)(context, f.name);
         const value = f.initializer ? context.transformExpression(f.initializer) : undefined;
         // self[fieldName]
-        const selfIndex = lua.createTableIndexExpression(lua_ast_1.createSelfIdentifier(), fieldName);
+        const selfIndex = lua.createTableIndexExpression((0, lua_ast_1.createSelfIdentifier)(), fieldName);
         // self[fieldName] = value
         const assignClassField = lua.createAssignmentStatement(selfIndex, value, f);
         statements.push(assignClassField);
@@ -32,7 +32,7 @@ exports.transformClassInstanceFields = transformClassInstanceFields;
 function transformStaticPropertyDeclaration(context, field, className) {
     if (!field.initializer)
         return;
-    const fieldName = literal_1.transformPropertyName(context, field.name);
+    const fieldName = (0, literal_1.transformPropertyName)(context, field.name);
     const value = context.transformExpression(field.initializer);
     const classField = lua.createTableIndexExpression(lua.cloneIdentifier(className), fieldName);
     return lua.createAssignmentStatement(classField, value);

package/dist/transformation/visitors/class/members/method.js

@@ -10,11 +10,11 @@ const constructor_1 = require("./constructor");
 const lualib_1 = require("../../../utils/lualib");
 const utils_2 = require("../../../../utils");
 function transformMemberExpressionOwnerName(node, className) {
-    return utils_1.isStaticNode(node) ? lua.cloneIdentifier(className) : constructor_1.createPrototypeName(className);
+    return (0, utils_1.isStaticNode)(node) ? lua.cloneIdentifier(className) : (0, constructor_1.createPrototypeName)(className);
 }
 exports.transformMemberExpressionOwnerName = transformMemberExpressionOwnerName;
 function transformMethodName(context, node) {
-    const methodName = literal_1.transformPropertyName(context, node.name);
+    const methodName = (0, literal_1.transformPropertyName)(context, node.name);
     if (lua.isStringLiteral(methodName) && methodName.value === "toString") {
         return lua.createStringLiteral("__tostring", node.name);
     }
@@ -27,7 +27,7 @@ function transformMethodDeclaration(context, node, className) {
         return;
     const methodTable = transformMemberExpressionOwnerName(node, className);
     const methodName = transformMethodName(context, node);
-    const [functionExpression] = function_1.transformFunctionToExpression(context, node);
+    const [functionExpression] = (0, function_1.transformFunctionToExpression)(context, node);
     return lua.createAssignmentStatement(lua.createTableIndexExpression(methodTable, methodName), functionExpression, node);
 }
 exports.transformMethodDeclaration = transformMethodDeclaration;
@@ -38,12 +38,12 @@ function createMethodDecoratingExpression(context, node, className) {
     const parameterDecorators = node.parameters
         .flatMap((parameter, index) => {
         var _a;
-        return (_a = parameter.decorators) === null || _a === void 0 ? void 0 : _a.map(decorator => lualib_1.transformLuaLibFunction(context, lualib_1.LuaLibFeature.DecorateParam, node, lua.createNumericLiteral(index), decorators_1.transformDecoratorExpression(context, decorator)));
+        return (_a = parameter.decorators) === null || _a === void 0 ? void 0 : _a.map(decorator => (0, lualib_1.transformLuaLibFunction)(context, lualib_1.LuaLibFeature.DecorateParam, node, lua.createNumericLiteral(index), (0, decorators_1.transformDecoratorExpression)(context, decorator)));
     })
         .filter(utils_2.isNonNull);
-    const methodDecorators = (_b = (_a = node.decorators) === null || _a === void 0 ? void 0 : _a.map(d => decorators_1.transformDecoratorExpression(context, d))) !== null && _b !== void 0 ? _b : [];
+    const methodDecorators = (_b = (_a = node.decorators) === null || _a === void 0 ? void 0 : _a.map(d => (0, decorators_1.transformDecoratorExpression)(context, d))) !== null && _b !== void 0 ? _b : [];
     if (methodDecorators.length > 0 || parameterDecorators.length > 0) {
-        const decorateMethod = decorators_1.createDecoratingExpression(context, node.kind, [...methodDecorators, ...parameterDecorators], methodTable, methodName);
+        const decorateMethod = (0, decorators_1.createDecoratingExpression)(context, node.kind, [...methodDecorators, ...parameterDecorators], methodTable, methodName);
         return lua.createExpressionStatement(decorateMethod);
     }
 }

package/dist/transformation/visitors/class/new.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformNewExpression = exports.checkForLuaLibType = void 0;
+const ts = require("typescript");
 const lua = require("../../../LuaAST");
 const annotations_1 = require("../../utils/annotations");
 const diagnostics_1 = require("../../utils/diagnostics");
@@ -28,49 +29,46 @@ function checkForLuaLibType(context, type) {
     const name = context.checker.getFullyQualifiedName(type.symbol);
     switch (name) {
         case "Map":
-            lualib_1.importLuaLibFeature(context, lualib_1.LuaLibFeature.Map);
+            (0, lualib_1.importLuaLibFeature)(context, lualib_1.LuaLibFeature.Map);
             return;
         case "Set":
-            lualib_1.importLuaLibFeature(context, lualib_1.LuaLibFeature.Set);
+            (0, lualib_1.importLuaLibFeature)(context, lualib_1.LuaLibFeature.Set);
             return;
         case "WeakMap":
-            lualib_1.importLuaLibFeature(context, lualib_1.LuaLibFeature.WeakMap);
+            (0, lualib_1.importLuaLibFeature)(context, lualib_1.LuaLibFeature.WeakMap);
             return;
         case "WeakSet":
-            lualib_1.importLuaLibFeature(context, lualib_1.LuaLibFeature.WeakSet);
+            (0, lualib_1.importLuaLibFeature)(context, lualib_1.LuaLibFeature.WeakSet);
             return;
     }
     if (builtinErrorTypeNames.has(name)) {
-        lualib_1.importLuaLibFeature(context, lualib_1.LuaLibFeature.Error);
+        (0, lualib_1.importLuaLibFeature)(context, lualib_1.LuaLibFeature.Error);
     }
 }
 exports.checkForLuaLibType = checkForLuaLibType;
 const transformNewExpression = (node, context) => {
-    var _a;
+    var _a, _b;
     const type = context.checker.getTypeAtLocation(node);
-    const annotations = annotations_1.getTypeAnnotations(type);
+    const annotations = (0, annotations_1.getTypeAnnotations)(type);
     if (annotations.has(annotations_1.AnnotationKind.LuaTable)) {
-        context.diagnostics.push(diagnostics_1.annotationRemoved(node, annotations_1.AnnotationKind.LuaTable));
+        context.diagnostics.push((0, diagnostics_1.annotationRemoved)(node, annotations_1.AnnotationKind.LuaTable));
     }
-    if (table_1.isTableNewCall(context, node)) {
+    if ((0, table_1.isTableNewCall)(context, node)) {
         return lua.createTableExpression(undefined, node);
     }
     const signature = context.checker.getResolvedSignature(node);
-    const params = node.arguments
-        ? call_1.transformArguments(context, node.arguments, signature)
-        : [lua.createBooleanLiteral(true)];
+    const [name, params] = (0, call_1.transformCallAndArguments)(context, node.expression, (_a = node.arguments) !== null && _a !== void 0 ? _a : [ts.factory.createTrue()], signature);
     checkForLuaLibType(context, type);
-    const name = context.transformExpression(node.expression);
     const customConstructorAnnotation = annotations.get(annotations_1.AnnotationKind.CustomConstructor);
     if (customConstructorAnnotation) {
         if (customConstructorAnnotation.args.length === 1) {
-            return lua.createCallExpression(lua.createIdentifier(customConstructorAnnotation.args[0]), call_1.transformArguments(context, (_a = node.arguments) !== null && _a !== void 0 ? _a : []), node);
+            return lua.createCallExpression(lua.createIdentifier(customConstructorAnnotation.args[0]), (0, call_1.transformArguments)(context, (_b = node.arguments) !== null && _b !== void 0 ? _b : []), node);
         }
         else {
-            context.diagnostics.push(diagnostics_1.annotationInvalidArgumentCount(node, annotations_1.AnnotationKind.CustomConstructor, customConstructorAnnotation.args.length, 1));
+            context.diagnostics.push((0, diagnostics_1.annotationInvalidArgumentCount)(node, annotations_1.AnnotationKind.CustomConstructor, customConstructorAnnotation.args.length, 1));
         }
     }
-    return lualib_1.transformLuaLibFunction(context, lualib_1.LuaLibFeature.New, node, name, ...params);
+    return (0, lualib_1.transformLuaLibFunction)(context, lualib_1.LuaLibFeature.New, node, name, ...params);
 };
 exports.transformNewExpression = transformNewExpression;
 //# sourceMappingURL=new.js.map

package/dist/transformation/visitors/class/setup.js

@@ -11,34 +11,34 @@ const utils_2 = require("./utils");
 function createClassSetup(context, statement, className, localClassName, extendsType) {
     const result = [];
     // __TS__Class()
-    const classInitializer = lualib_1.transformLuaLibFunction(context, lualib_1.LuaLibFeature.Class, statement);
-    const defaultExportLeftHandSide = export_1.hasDefaultExportModifier(statement)
-        ? lua.createTableIndexExpression(lua_ast_1.createExportsIdentifier(), export_1.createDefaultExportStringLiteral(statement))
+    const classInitializer = (0, lualib_1.transformLuaLibFunction)(context, lualib_1.LuaLibFeature.Class, statement);
+    const defaultExportLeftHandSide = (0, export_1.hasDefaultExportModifier)(statement)
+        ? lua.createTableIndexExpression((0, lua_ast_1.createExportsIdentifier)(), (0, export_1.createDefaultExportStringLiteral)(statement))
         : undefined;
     // [____exports.]className = __TS__Class()
     if (defaultExportLeftHandSide) {
         result.push(lua.createAssignmentStatement(defaultExportLeftHandSide, classInitializer, statement));
     }
     else {
-        result.push(...lua_ast_1.createLocalOrExportedOrGlobalDeclaration(context, className, classInitializer, statement));
+        result.push(...(0, lua_ast_1.createLocalOrExportedOrGlobalDeclaration)(context, className, classInitializer, statement));
     }
     if (defaultExportLeftHandSide) {
         // local localClassName = ____exports.default
         result.push(lua.createVariableDeclarationStatement(localClassName, defaultExportLeftHandSide));
     }
     else {
-        const exportScope = export_1.getIdentifierExportScope(context, className);
+        const exportScope = (0, export_1.getIdentifierExportScope)(context, className);
         if (exportScope) {
             // local localClassName = ____exports.className
-            result.push(lua.createVariableDeclarationStatement(localClassName, export_1.createExportedIdentifier(context, lua.cloneIdentifier(className), exportScope)));
+            result.push(lua.createVariableDeclarationStatement(localClassName, (0, export_1.createExportedIdentifier)(context, lua.cloneIdentifier(className), exportScope)));
         }
     }
     // localClassName.name = className
     result.push(lua.createAssignmentStatement(lua.createTableIndexExpression(lua.cloneIdentifier(localClassName), lua.createStringLiteral("name")), getReflectionClassName(context, statement, className), statement));
     if (extendsType) {
-        const extendedNode = utils_2.getExtendedNode(context, statement);
-        utils_1.assert(extendedNode);
-        result.push(lua.createExpressionStatement(lualib_1.transformLuaLibFunction(context, lualib_1.LuaLibFeature.ClassExtends, utils_2.getExtendsClause(statement), lua.cloneIdentifier(localClassName), context.transformExpression(extendedNode.expression))));
+        const extendedNode = (0, utils_2.getExtendedNode)(context, statement);
+        (0, utils_1.assert)(extendedNode);
+        result.push(lua.createExpressionStatement((0, lualib_1.transformLuaLibFunction)(context, lualib_1.LuaLibFeature.ClassExtends, (0, utils_2.getExtendsClause)(statement), lua.cloneIdentifier(localClassName), context.transformExpression(extendedNode.expression))));
     }
     return result;
 }
@@ -50,10 +50,10 @@ function getReflectionClassName(context, declaration, className) {
     else if (ts.isVariableDeclaration(declaration.parent) && ts.isIdentifier(declaration.parent.name)) {
         return lua.createStringLiteral(declaration.parent.name.text);
     }
-    else if (export_1.hasDefaultExportModifier(declaration)) {
+    else if ((0, export_1.hasDefaultExportModifier)(declaration)) {
         return lua.createStringLiteral("default");
     }
-    if (utils_2.getExtendedNode(context, declaration)) {
+    if ((0, utils_2.getExtendedNode)(context, declaration)) {
         return lua.createTableIndexExpression(className, lua.createStringLiteral("name"));
     }
     return lua.createStringLiteral("");

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

@@ -19,9 +19,9 @@ function getExtendedNode(context, node) {
     if (!extendsClause)
         return;
     const superType = context.checker.getTypeAtLocation(extendsClause.types[0]);
-    const annotations = annotations_1.getTypeAnnotations(superType);
+    const annotations = (0, annotations_1.getTypeAnnotations)(superType);
     if (annotations.has(annotations_1.AnnotationKind.PureAbstract)) {
-        context.diagnostics.push(diagnostics_1.annotationRemoved(extendsClause, annotations_1.AnnotationKind.PureAbstract));
+        context.diagnostics.push((0, diagnostics_1.annotationRemoved)(extendsClause, annotations_1.AnnotationKind.PureAbstract));
     }
     return extendsClause.types[0];
 }

package/dist/transformation/visitors/conditional.js

@@ -3,47 +3,25 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformIfStatement = exports.transformConditionalExpression = void 0;
 const ts = require("typescript");
 const lua = require("../../LuaAST");
+const preceding_statements_1 = require("../utils/preceding-statements");
 const scope_1 = require("../utils/scope");
 const block_1 = require("./block");
-function canBeFalsy(context, type) {
-    const strictNullChecks = context.options.strict === true || context.options.strictNullChecks === true;
-    const falsyFlags = ts.TypeFlags.Boolean |
-        ts.TypeFlags.BooleanLiteral |
-        ts.TypeFlags.Undefined |
-        ts.TypeFlags.Null |
-        ts.TypeFlags.Never |
-        ts.TypeFlags.Void |
-        ts.TypeFlags.Any;
-    if (type.flags & falsyFlags) {
-        return true;
-    }
-    else if (!strictNullChecks && !type.isLiteral()) {
-        return true;
-    }
-    else if (type.isUnion()) {
-        return type.types.some(subType => canBeFalsy(context, subType));
-    }
-    else {
-        return false;
-    }
-}
-function wrapInFunctionCall(expression) {
-    const returnStatement = lua.createReturnStatement([expression]);
-    return lua.createFunctionExpression(lua.createBlock([returnStatement]), undefined, undefined, lua.FunctionExpressionFlags.Inline);
-}
+const typescript_1 = require("../utils/typescript");
 function transformProtectedConditionalExpression(context, expression) {
+    const tempVar = context.createTempNameForNode(expression.condition);
     const condition = context.transformExpression(expression.condition);
-    const val1 = context.transformExpression(expression.whenTrue);
-    const val2 = context.transformExpression(expression.whenFalse);
-    const val1Function = wrapInFunctionCall(val1);
-    const val2Function = wrapInFunctionCall(val2);
-    // (condition and (() => v1) or (() => v2))()
-    const conditionAnd = lua.createBinaryExpression(condition, val1Function, lua.SyntaxKind.AndOperator);
-    const orExpression = lua.createBinaryExpression(conditionAnd, val2Function, lua.SyntaxKind.OrOperator);
-    return lua.createCallExpression(orExpression, [], expression);
+    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));
+    context.addPrecedingStatements([
+        lua.createVariableDeclarationStatement(tempVar, undefined, expression.condition),
+        lua.createIfStatement(condition, lua.createBlock(trueStatements, expression.whenTrue), lua.createBlock(falseStatements, expression.whenFalse), expression),
+    ]);
+    return lua.cloneIdentifier(tempVar);
 }
 const transformConditionalExpression = (expression, context) => {
-    if (canBeFalsy(context, context.checker.getTypeAtLocation(expression.whenTrue))) {
+    if ((0, typescript_1.canBeFalsy)(context, context.checker.getTypeAtLocation(expression.whenTrue))) {
         return transformProtectedConditionalExpression(context, expression);
     }
     const condition = context.transformExpression(expression.condition);
@@ -55,20 +33,35 @@ const transformConditionalExpression = (expression, context) => {
 };
 exports.transformConditionalExpression = transformConditionalExpression;
 function transformIfStatement(statement, context) {
-    scope_1.pushScope(context, scope_1.ScopeType.Conditional);
+    (0, scope_1.pushScope)(context, scope_1.ScopeType.Conditional);
     const condition = context.transformExpression(statement.expression);
-    const statements = scope_1.performHoisting(context, block_1.transformBlockOrStatement(context, statement.thenStatement));
-    scope_1.popScope(context);
+    const statements = (0, scope_1.performHoisting)(context, (0, block_1.transformBlockOrStatement)(context, statement.thenStatement));
+    (0, scope_1.popScope)(context);
     const ifBlock = lua.createBlock(statements);
     if (statement.elseStatement) {
         if (ts.isIfStatement(statement.elseStatement)) {
-            const elseStatement = transformIfStatement(statement.elseStatement, context);
-            return lua.createIfStatement(condition, ifBlock, elseStatement);
+            const tsElseStatement = statement.elseStatement;
+            const [precedingStatements, elseStatement] = (0, preceding_statements_1.transformInPrecedingStatementScope)(context, () => transformIfStatement(tsElseStatement, context));
+            // If else-if condition generates preceding statements, we can't use elseif, we have to break it down:
+            // if conditionA then
+            //     ...
+            // else
+            //     conditionB's preceding statements
+            //     if conditionB then
+            //     end
+            // end
+            if (precedingStatements.length > 0) {
+                const elseBlock = lua.createBlock([...precedingStatements, elseStatement]);
+                return lua.createIfStatement(condition, ifBlock, elseBlock);
+            }
+            else {
+                return lua.createIfStatement(condition, ifBlock, elseStatement);
+            }
         }
         else {
-            scope_1.pushScope(context, scope_1.ScopeType.Conditional);
-            const elseStatements = scope_1.performHoisting(context, block_1.transformBlockOrStatement(context, statement.elseStatement));
-            scope_1.popScope(context);
+            (0, scope_1.pushScope)(context, scope_1.ScopeType.Conditional);
+            const elseStatements = (0, scope_1.performHoisting)(context, (0, block_1.transformBlockOrStatement)(context, statement.elseStatement));
+            (0, scope_1.popScope)(context);
             const elseBlock = lua.createBlock(elseStatements);
             return lua.createIfStatement(condition, ifBlock, elseBlock);
         }