typescript-to-lua 1.0.0 → 1.2.0

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

@@ -1,7 +1,6 @@
 import * as ts from "typescript";
 import * as lua from "../../LuaAST";
-import { FunctionVisitor, TransformationContext, Visitors } from "../context";
+import { TransformationContext, Visitors } from "../context";
 export declare function transformPropertyName(context: TransformationContext, node: ts.PropertyName): lua.Expression;
 export declare function createShorthandIdentifier(context: TransformationContext, valueSymbol: ts.Symbol | undefined, propertyIdentifier: ts.Identifier): lua.Expression;
-export declare const transformJsxAttributes: FunctionVisitor<ts.JsxAttributes>;
 export declare const literalVisitors: Visitors;

package/dist/transformation/visitors/literal.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.literalVisitors = exports.transformJsxAttributes = exports.createShorthandIdentifier = exports.transformPropertyName = void 0;
+exports.literalVisitors = exports.createShorthandIdentifier = exports.transformPropertyName = void 0;
 const ts = require("typescript");
 const lua = require("../../LuaAST");
 const utils_1 = require("../../utils");
@@ -11,9 +11,8 @@ 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 call_1 = require("./call");
+const expression_list_1 = require("./expression-list");
 const multi_1 = require("./language-extensions/multi");
-const jsx_1 = require("./jsx/jsx");
 // TODO: Move to object-literal.ts?
 function transformPropertyName(context, node) {
     if (ts.isComputedPropertyName(node)) {
@@ -33,16 +32,16 @@ exports.transformPropertyName = transformPropertyName;
 function createShorthandIdentifier(context, valueSymbol, propertyIdentifier) {
     const propertyName = propertyIdentifier.text;
     const isUnsafeName = valueSymbol
-        ? safe_names_1.hasUnsafeSymbolName(context, valueSymbol, propertyIdentifier)
-        : safe_names_1.hasUnsafeIdentifierName(context, propertyIdentifier, false);
-    const name = isUnsafeName ? safe_names_1.createSafeName(propertyName) : propertyName;
+        ? (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 = symbols_1.getSymbolIdOfSymbol(context, valueSymbol);
-        const exportScope = export_1.getSymbolExportScope(context, valueSymbol);
+        identifier.symbolId = (0, symbols_1.getSymbolIdOfSymbol)(context, valueSymbol);
+        const exportScope = (0, export_1.getSymbolExportScope)(context, valueSymbol);
         if (exportScope) {
-            identifier = export_1.createExportedIdentifier(context, identifier, exportScope);
+            identifier = (0, export_1.createExportedIdentifier)(context, identifier, exportScope);
         }
     }
     return identifier;
@@ -56,96 +55,127 @@ const transformNumericLiteralExpression = expression => {
     }
     return lua.createNumericLiteral(Number(expression.text), expression);
 };
-const transformObjectLiteralExpressionOrJsxAttributes = (expression, context) => {
-    const violations = multi_1.findMultiAssignmentViolations(context, expression);
+const transformObjectLiteralExpression = (expression, context) => {
+    const violations = (0, multi_1.findMultiAssignmentViolations)(context, expression);
     if (violations.length > 0) {
-        context.diagnostics.push(...violations.map(e => diagnostics_1.invalidMultiFunctionUse(e)));
+        context.diagnostics.push(...violations.map(e => (0, diagnostics_1.invalidMultiFunctionUse)(e)));
         return lua.createNilLiteral(expression);
     }
-    let properties = [];
-    const tableExpressions = [];
-    for (const element of expression.properties) {
+    const properties = [];
+    const initializers = [];
+    const keyPrecedingStatements = [];
+    const valuePrecedingStatements = [];
+    let lastPrecedingStatementsIndex = -1;
+    for (let i = 0; i < expression.properties.length; ++i) {
+        const element = expression.properties[i];
+        // Transform key and cache preceding statements
+        context.pushPrecedingStatements();
         const name = element.name ? transformPropertyName(context, element.name) : undefined;
+        let precedingStatements = context.popPrecedingStatements();
+        keyPrecedingStatements.push(precedingStatements);
+        if (precedingStatements.length > 0) {
+            lastPrecedingStatementsIndex = i;
+        }
+        // Transform value and cache preceding statements
+        context.pushPrecedingStatements();
         if (ts.isPropertyAssignment(element)) {
             const expression = context.transformExpression(element.initializer);
             properties.push(lua.createTableFieldExpression(expression, name, element));
-        }
-        else if (ts.isJsxAttribute(element)) {
-            const initializer = element.initializer;
-            let expression;
-            if (initializer === undefined) {
-                expression = lua.createBooleanLiteral(true);
-            }
-            else if (ts.isStringLiteral(initializer)) {
-                const text = jsx_1.formatJSXStringValueLiteral(initializer.text);
-                expression = lua.createStringLiteral(text, initializer);
-            }
-            else if (ts.isJsxExpression(initializer)) {
-                expression = initializer.expression
-                    ? context.transformExpression(initializer.expression)
-                    : lua.createBooleanLiteral(true);
-            }
-            else {
-                utils_1.assertNever(initializer);
-            }
-            properties.push(lua.createTableFieldExpression(expression, name, element));
+            initializers.push(element.initializer);
         }
         else if (ts.isShorthandPropertyAssignment(element)) {
             const valueSymbol = context.checker.getShorthandAssignmentValueSymbol(element);
             if (valueSymbol) {
-                symbols_1.trackSymbolReference(context, valueSymbol, element.name);
+                (0, symbols_1.trackSymbolReference)(context, valueSymbol, element.name);
             }
             const identifier = createShorthandIdentifier(context, valueSymbol, element.name);
             properties.push(lua.createTableFieldExpression(identifier, name, element));
+            initializers.push(element);
         }
         else if (ts.isMethodDeclaration(element)) {
-            const expression = function_1.transformFunctionLikeDeclaration(element, context);
+            const expression = (0, function_1.transformFunctionLikeDeclaration)(element, context);
             properties.push(lua.createTableFieldExpression(expression, name, element));
+            initializers.push(element);
         }
-        else if (ts.isSpreadAssignment(element) || ts.isJsxSpreadAttribute(element)) {
-            // Create a table for preceding properties to preserve property order
-            // { x: 0, ...{ y: 2 }, y: 1, z: 2 } --> __TS__ObjectAssign({x = 0}, {y = 2}, {y = 1, z = 2})
-            if (properties.length > 0) {
-                const tableExpression = lua.createTableExpression(properties, expression);
-                tableExpressions.push(tableExpression);
-                properties = [];
-            }
+        else if (ts.isSpreadAssignment(element)) {
             const type = context.checker.getTypeAtLocation(element.expression);
             let tableExpression;
-            if (typescript_1.isArrayType(context, type)) {
-                tableExpression = lualib_1.transformLuaLibFunction(context, lualib_1.LuaLibFeature.ArrayToObject, element.expression, context.transformExpression(element.expression));
+            if ((0, typescript_1.isArrayType)(context, type)) {
+                tableExpression = (0, lualib_1.transformLuaLibFunction)(context, lualib_1.LuaLibFeature.ArrayToObject, element.expression, context.transformExpression(element.expression));
             }
             else {
                 tableExpression = context.transformExpression(element.expression);
             }
-            tableExpressions.push(tableExpression);
+            properties.push(tableExpression);
+            initializers.push(element.expression);
         }
         else if (ts.isAccessor(element)) {
-            context.diagnostics.push(diagnostics_1.unsupportedAccessorInObjectLiteral(element));
+            context.diagnostics.push((0, diagnostics_1.unsupportedAccessorInObjectLiteral)(element));
         }
         else {
-            utils_1.assertNever(element);
+            (0, utils_1.assertNever)(element);
+        }
+        precedingStatements = context.popPrecedingStatements();
+        valuePrecedingStatements.push(precedingStatements);
+        if (precedingStatements.length > 0) {
+            lastPrecedingStatementsIndex = i;
+        }
+    }
+    // Expressions referenced before others that produced preceding statements need to be cached in temps
+    if (lastPrecedingStatementsIndex >= 0) {
+        for (let i = 0; i < properties.length; ++i) {
+            const property = properties[i];
+            // Bubble up key's preceding statements
+            context.addPrecedingStatements(keyPrecedingStatements[i]);
+            // Cache computed property name in temp if before the last expression that generated preceding statements
+            if (i <= lastPrecedingStatementsIndex && lua.isTableFieldExpression(property) && property.key) {
+                property.key = (0, expression_list_1.moveToPrecedingTemp)(context, property.key, expression.properties[i].name);
+            }
+            // Bubble up value's preceding statements
+            context.addPrecedingStatements(valuePrecedingStatements[i]);
+            // Cache property value in temp if before the last expression that generated preceding statements
+            if (i < lastPrecedingStatementsIndex) {
+                if (lua.isTableFieldExpression(property)) {
+                    property.value = (0, expression_list_1.moveToPrecedingTemp)(context, property.value, initializers[i]);
+                }
+                else {
+                    properties[i] = (0, expression_list_1.moveToPrecedingTemp)(context, property, initializers[i]);
+                }
+            }
+        }
+    }
+    // Sort into field expressions and tables to pass into __TS__ObjectAssign
+    let fields = [];
+    const tableExpressions = [];
+    for (const property of properties) {
+        if (lua.isTableFieldExpression(property)) {
+            fields.push(property);
+        }
+        else {
+            if (fields.length > 0) {
+                tableExpressions.push(lua.createTableExpression(fields));
+            }
+            tableExpressions.push(property);
+            fields = [];
         }
     }
     if (tableExpressions.length === 0) {
-        return lua.createTableExpression(properties, expression);
+        return lua.createTableExpression(fields, expression);
     }
     else {
-        if (properties.length > 0) {
-            const tableExpression = lua.createTableExpression(properties, expression);
+        if (fields.length > 0) {
+            const tableExpression = lua.createTableExpression(fields, expression);
             tableExpressions.push(tableExpression);
         }
         if (tableExpressions[0].kind !== lua.SyntaxKind.TableExpression) {
             tableExpressions.unshift(lua.createTableExpression(undefined, expression));
         }
-        return lualib_1.transformLuaLibFunction(context, lualib_1.LuaLibFeature.ObjectAssign, expression, ...tableExpressions);
+        return (0, lualib_1.transformLuaLibFunction)(context, lualib_1.LuaLibFeature.ObjectAssign, expression, ...tableExpressions);
     }
 };
-const transformObjectLiteralExpression = transformObjectLiteralExpressionOrJsxAttributes;
-exports.transformJsxAttributes = transformObjectLiteralExpressionOrJsxAttributes;
 const transformArrayLiteralExpression = (expression, context) => {
     const filteredElements = expression.elements.map(e => ts.isOmittedExpression(e) ? ts.factory.createIdentifier("undefined") : e);
-    const values = call_1.flattenSpreadExpressions(context, filteredElements).map(e => lua.createTableFieldExpression(e));
+    const values = (0, expression_list_1.transformExpressionList)(context, filteredElements).map(e => lua.createTableFieldExpression(e));
     return lua.createTableExpression(values, expression);
 };
 exports.literalVisitors = {

package/dist/transformation/visitors/loops/do-while.js

@@ -2,19 +2,45 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformDoStatement = exports.transformWhileStatement = void 0;
 const lua = require("../../../LuaAST");
+const preceding_statements_1 = require("../../utils/preceding-statements");
 const utils_1 = require("./utils");
-const transformWhileStatement = (statement, context) => lua.createWhileStatement(lua.createBlock(utils_1.transformLoopBody(context, statement)), context.transformExpression(statement.expression), statement);
+const transformWhileStatement = (statement, context) => {
+    const body = (0, utils_1.transformLoopBody)(context, statement);
+    let [conditionPrecedingStatements, condition] = (0, preceding_statements_1.transformInPrecedingStatementScope)(context, () => context.transformExpression(statement.expression));
+    // If condition has preceding statements, ensure they are executed every iteration by using the form:
+    //
+    // while true do
+    //     condition's preceding statements
+    //     if not condition then
+    //         break
+    //     end
+    //     ...
+    // end
+    if (conditionPrecedingStatements.length > 0) {
+        conditionPrecedingStatements.push(lua.createIfStatement((0, utils_1.invertCondition)(condition), lua.createBlock([lua.createBreakStatement()]), undefined, statement.expression));
+        body.unshift(...conditionPrecedingStatements);
+        condition = lua.createBooleanLiteral(true);
+    }
+    return lua.createWhileStatement(lua.createBlock(body), condition, statement);
+};
 exports.transformWhileStatement = transformWhileStatement;
 const transformDoStatement = (statement, context) => {
-    const body = lua.createDoStatement(utils_1.transformLoopBody(context, statement));
-    let condition = context.transformExpression(statement.expression);
-    if (lua.isUnaryExpression(condition) && condition.operator === lua.SyntaxKind.NotOperator) {
-        condition = condition.operand;
-    }
-    else {
-        condition = lua.createUnaryExpression(condition, lua.SyntaxKind.NotOperator);
+    const body = lua.createDoStatement((0, utils_1.transformLoopBody)(context, statement));
+    let [conditionPrecedingStatements, condition] = (0, preceding_statements_1.transformInPrecedingStatementScope)(context, () => (0, utils_1.invertCondition)(context.transformExpression(statement.expression)));
+    // If condition has preceding statements, ensure they are executed every iteration by using the form:
+    //
+    // repeat
+    //     ...
+    //     condition's preceding statements
+    //     if condition then
+    //         break
+    //     end
+    // end
+    if (conditionPrecedingStatements.length > 0) {
+        conditionPrecedingStatements.push(lua.createIfStatement(condition, lua.createBlock([lua.createBreakStatement()]), undefined, statement.expression));
+        condition = lua.createBooleanLiteral(false);
     }
-    return lua.createRepeatStatement(lua.createBlock([body]), condition, statement);
+    return lua.createRepeatStatement(lua.createBlock([body, ...conditionPrecedingStatements]), condition, statement);
 };
 exports.transformDoStatement = transformDoStatement;
 //# sourceMappingURL=do-while.js.map

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

@@ -6,15 +6,15 @@ const diagnostics_1 = require("../../utils/diagnostics");
 const typescript_1 = require("../../utils/typescript");
 const utils_1 = require("./utils");
 const transformForInStatement = (statement, context) => {
-    if (typescript_1.isArrayType(context, context.checker.getTypeAtLocation(statement.expression))) {
-        context.diagnostics.push(diagnostics_1.forbiddenForIn(statement));
+    if ((0, typescript_1.isArrayType)(context, context.checker.getTypeAtLocation(statement.expression))) {
+        context.diagnostics.push((0, diagnostics_1.forbiddenForIn)(statement));
     }
     // Transpile expression
     const pairsIdentifier = lua.createIdentifier("pairs");
     const expression = context.transformExpression(statement.expression);
     const pairsCall = lua.createCallExpression(pairsIdentifier, [expression]);
-    const body = lua.createBlock(utils_1.transformLoopBody(context, statement));
-    const valueVariable = utils_1.transformForInitializer(context, statement.initializer, body);
+    const body = lua.createBlock((0, utils_1.transformLoopBody)(context, statement));
+    const valueVariable = (0, utils_1.transformForInitializer)(context, statement.initializer, body);
     return lua.createForInStatement(body, [valueVariable], [pairsCall], statement);
 };
 exports.transformForInStatement = transformForInStatement;

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

@@ -11,32 +11,32 @@ const iterable_1 = require("../language-extensions/iterable");
 const range_1 = require("../language-extensions/range");
 const utils_1 = require("./utils");
 function transformForOfArrayStatement(context, statement, block) {
-    const valueVariable = utils_1.transformForInitializer(context, statement.initializer, block);
+    const valueVariable = (0, utils_1.transformForInitializer)(context, statement.initializer, block);
     const ipairsCall = lua.createCallExpression(lua.createIdentifier("ipairs"), [
         context.transformExpression(statement.expression),
     ]);
     return lua.createForInStatement(block, [lua.createAnonymousIdentifier(), valueVariable], [ipairsCall], statement);
 }
 function transformForOfIteratorStatement(context, statement, block) {
-    const valueVariable = utils_1.transformForInitializer(context, statement.initializer, block);
-    const iterable = lualib_1.transformLuaLibFunction(context, lualib_1.LuaLibFeature.Iterator, statement.expression, context.transformExpression(statement.expression));
+    const valueVariable = (0, utils_1.transformForInitializer)(context, statement.initializer, block);
+    const iterable = (0, lualib_1.transformLuaLibFunction)(context, lualib_1.LuaLibFeature.Iterator, statement.expression, context.transformExpression(statement.expression));
     return lua.createForInStatement(block, [lua.createAnonymousIdentifier(), valueVariable], [iterable], statement);
 }
 const transformForOfStatement = (node, context) => {
-    const body = lua.createBlock(utils_1.transformLoopBody(context, node));
-    if (ts.isCallExpression(node.expression) && range_1.isRangeFunction(context, node.expression)) {
-        return range_1.transformRangeStatement(context, node, body);
+    const body = lua.createBlock((0, utils_1.transformLoopBody)(context, node));
+    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) && annotations_1.isForRangeType(context, node.expression.expression)) {
-        context.diagnostics.push(diagnostics_1.annotationRemoved(node.expression, annotations_1.AnnotationKind.ForRange));
+    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));
     }
-    else if (iterable_1.isIterableExpression(context, node.expression)) {
-        return iterable_1.transformForOfIterableStatement(context, node, body);
+    else if ((0, iterable_1.isIterableExpression)(context, node.expression)) {
+        return (0, iterable_1.transformForOfIterableStatement)(context, node, body);
     }
-    else if (annotations_1.isLuaIteratorType(context, node.expression)) {
-        context.diagnostics.push(diagnostics_1.annotationRemoved(node.expression, annotations_1.AnnotationKind.LuaIterator));
+    else if ((0, annotations_1.isLuaIteratorType)(context, node.expression)) {
+        context.diagnostics.push((0, diagnostics_1.annotationRemoved)(node.expression, annotations_1.AnnotationKind.LuaIterator));
     }
-    else if (typescript_1.isArrayType(context, context.checker.getTypeAtLocation(node.expression))) {
+    else if ((0, typescript_1.isArrayType)(context, context.checker.getTypeAtLocation(node.expression))) {
         return transformForOfArrayStatement(context, node, body);
     }
     else {

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

@@ -3,30 +3,50 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformForStatement = void 0;
 const ts = require("typescript");
 const lua = require("../../../LuaAST");
+const preceding_statements_1 = require("../../utils/preceding-statements");
 const variable_declaration_1 = require("../variable-declaration");
 const utils_1 = require("./utils");
 const transformForStatement = (statement, context) => {
     const result = [];
     if (statement.initializer) {
         if (ts.isVariableDeclarationList(statement.initializer)) {
-            variable_declaration_1.checkVariableDeclarationList(context, statement.initializer);
+            (0, variable_declaration_1.checkVariableDeclarationList)(context, statement.initializer);
             // local initializer = value
-            result.push(...statement.initializer.declarations.flatMap(d => variable_declaration_1.transformVariableDeclaration(context, d)));
+            result.push(...statement.initializer.declarations.flatMap(d => (0, variable_declaration_1.transformVariableDeclaration)(context, d)));
         }
         else {
             result.push(...context.transformStatements(ts.factory.createExpressionStatement(statement.initializer)));
         }
     }
-    const condition = statement.condition
-        ? context.transformExpression(statement.condition)
-        : lua.createBooleanLiteral(true);
-    // Add body
-    const body = utils_1.transformLoopBody(context, statement);
+    const body = (0, utils_1.transformLoopBody)(context, statement);
+    let condition;
+    if (statement.condition) {
+        let conditionPrecedingStatements;
+        const tsCondition = statement.condition;
+        [conditionPrecedingStatements, condition] = (0, preceding_statements_1.transformInPrecedingStatementScope)(context, () => context.transformExpression(tsCondition));
+        // If condition has preceding statements, ensure they are executed every iteration by using the form:
+        //
+        // while true do
+        //     condition's preceding statements
+        //     if not condition then
+        //         break
+        //     end
+        //     ...
+        // end
+        if (conditionPrecedingStatements.length > 0) {
+            conditionPrecedingStatements.push(lua.createIfStatement((0, utils_1.invertCondition)(condition), lua.createBlock([lua.createBreakStatement()]), undefined, statement.condition));
+            body.unshift(...conditionPrecedingStatements);
+            condition = lua.createBooleanLiteral(true);
+        }
+    }
+    else {
+        condition = lua.createBooleanLiteral(true);
+    }
     if (statement.incrementor) {
         body.push(...context.transformStatements(ts.factory.createExpressionStatement(statement.incrementor)));
     }
     // while (condition) do ... end
-    result.push(lua.createWhileStatement(lua.createBlock(body), condition));
+    result.push(lua.createWhileStatement(lua.createBlock(body), condition, statement));
     return lua.createDoStatement(result, statement);
 };
 exports.transformForStatement = transformForStatement;

package/dist/transformation/visitors/loops/utils.d.ts

@@ -4,3 +4,4 @@ import { TransformationContext } from "../../context";
 export declare function transformLoopBody(context: TransformationContext, loop: ts.WhileStatement | ts.DoStatement | ts.ForStatement | ts.ForOfStatement | ts.ForInOrOfStatement): lua.Statement[];
 export declare function getVariableDeclarationBinding(context: TransformationContext, node: ts.VariableDeclarationList): ts.BindingName;
 export declare function transformForInitializer(context: TransformationContext, initializer: ts.ForInitializer, block: lua.Block): lua.Identifier;
+export declare function invertCondition(expression: lua.Expression): lua.Expression;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformForInitializer = exports.getVariableDeclarationBinding = exports.transformLoopBody = void 0;
+exports.invertCondition = exports.transformForInitializer = exports.getVariableDeclarationBinding = exports.transformLoopBody = void 0;
 const ts = require("typescript");
 const lua = require("../../../LuaAST");
 const scope_1 = require("../../utils/scope");
@@ -11,9 +11,9 @@ const block_1 = require("../block");
 const identifier_1 = require("../identifier");
 const variable_declaration_1 = require("../variable-declaration");
 function transformLoopBody(context, loop) {
-    scope_1.pushScope(context, scope_1.ScopeType.Loop);
-    const body = scope_1.performHoisting(context, block_1.transformBlockOrStatement(context, loop.statement));
-    const scope = scope_1.popScope(context);
+    (0, scope_1.pushScope)(context, 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 scopeId = scope.id;
     if (!scope.loopContinued) {
         return body;
@@ -25,7 +25,7 @@ function transformLoopBody(context, loop) {
 }
 exports.transformLoopBody = transformLoopBody;
 function getVariableDeclarationBinding(context, node) {
-    variable_declaration_1.checkVariableDeclarationList(context, node);
+    (0, variable_declaration_1.checkVariableDeclarationList)(context, node);
     if (node.declarations.length === 0) {
         return ts.factory.createIdentifier("____");
     }
@@ -38,20 +38,31 @@ function transformForInitializer(context, initializer, block) {
         // Declaration of new variable
         const binding = getVariableDeclarationBinding(context, initializer);
         if (ts.isArrayBindingPattern(binding) || ts.isObjectBindingPattern(binding)) {
-            block.statements.unshift(...variable_declaration_1.transformBindingPattern(context, binding, valueVariable));
+            block.statements.unshift(...(0, variable_declaration_1.transformBindingPattern)(context, binding, valueVariable));
         }
         else {
             // Single variable declared in for loop
-            return identifier_1.transformIdentifier(context, binding);
+            return (0, identifier_1.transformIdentifier)(context, binding);
         }
     }
     else {
         // Assignment to existing variable(s)
-        block.statements.unshift(...(typescript_1.isAssignmentPattern(initializer)
-            ? destructuring_assignments_1.transformAssignmentPattern(context, initializer, valueVariable)
-            : assignments_1.transformAssignment(context, initializer, valueVariable)));
+        block.statements.unshift(...((0, typescript_1.isAssignmentPattern)(initializer)
+            ? (0, destructuring_assignments_1.transformAssignmentPattern)(context, initializer, valueVariable, false)
+            : (0, assignments_1.transformAssignment)(context, initializer, valueVariable)));
     }
     return valueVariable;
 }
 exports.transformForInitializer = transformForInitializer;
+function invertCondition(expression) {
+    if (lua.isUnaryExpression(expression) && expression.operator === lua.SyntaxKind.NotOperator) {
+        return expression.operand;
+    }
+    else {
+        const notExpression = lua.createUnaryExpression(expression, lua.SyntaxKind.NotOperator);
+        lua.setNodePosition(notExpression, lua.getOriginalPos(expression));
+        return notExpression;
+    }
+}
+exports.invertCondition = invertCondition;
 //# sourceMappingURL=utils.js.map

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

@@ -19,25 +19,25 @@ const transformExportAssignment = (node, context) => {
     // export = [expression];
     // ____exports = [expression];
     if (node.isExportEquals) {
-        return lua.createVariableDeclarationStatement(lua_ast_1.createExportsIdentifier(), exportedValue, node);
+        return lua.createVariableDeclarationStatement((0, lua_ast_1.createExportsIdentifier)(), exportedValue, node);
     }
     else {
         // export default [expression];
         // ____exports.default = [expression];
-        return lua.createAssignmentStatement(lua.createTableIndexExpression(lua_ast_1.createExportsIdentifier(), export_1.createDefaultExportStringLiteral(node)), exportedValue, node);
+        return lua.createAssignmentStatement(lua.createTableIndexExpression((0, lua_ast_1.createExportsIdentifier)(), (0, export_1.createDefaultExportStringLiteral)(node)), exportedValue, node);
     }
 };
 exports.transformExportAssignment = transformExportAssignment;
 function transformExportAll(context, node) {
-    utils_1.assert(node.moduleSpecifier);
+    (0, utils_1.assert)(node.moduleSpecifier);
     if (!context.resolver.moduleExportsSomeValue(node.moduleSpecifier)) {
         return undefined;
     }
-    const moduleRequire = import_1.createModuleRequire(context, node.moduleSpecifier);
+    const moduleRequire = (0, import_1.createModuleRequire)(context, node.moduleSpecifier);
     // export * as ns from "...";
     // exports.ns = require(...)
     if (node.exportClause && ts.isNamespaceExport(node.exportClause)) {
-        const assignToExports = lua.createAssignmentStatement(lua.createTableIndexExpression(lua_ast_1.createExportsIdentifier(), lua.createStringLiteral(node.exportClause.name.text)), moduleRequire);
+        const assignToExports = lua.createAssignmentStatement(lua.createTableIndexExpression((0, lua_ast_1.createExportsIdentifier)(), lua.createStringLiteral(node.exportClause.name.text)), moduleRequire);
         return assignToExports;
     }
     // export * from "...";
@@ -50,7 +50,7 @@ function transformExportAll(context, node) {
     // ____exports[____exportKey] = ____exportValue
     const forKey = lua.createIdentifier("____exportKey");
     const forValue = lua.createIdentifier("____exportValue");
-    const leftAssignment = lua.createAssignmentStatement(lua.createTableIndexExpression(lua_ast_1.createExportsIdentifier(), forKey), forValue);
+    const leftAssignment = lua.createAssignmentStatement(lua.createTableIndexExpression((0, lua_ast_1.createExportsIdentifier)(), forKey), forValue);
     // if key ~= "default" then
     //  -- export the value, do not export "default" values
     // end
@@ -70,24 +70,23 @@ const isDefaultExportSpecifier = (node) => (node.name && node.name.originalKeywo
 function transformExportSpecifier(context, node) {
     const exportedSymbol = context.checker.getExportSpecifierLocalTargetSymbol(node);
     const exportedIdentifier = node.propertyName ? node.propertyName : node.name;
-    const exportedExpression = literal_1.createShorthandIdentifier(context, exportedSymbol, exportedIdentifier);
+    const exportedExpression = (0, literal_1.createShorthandIdentifier)(context, exportedSymbol, exportedIdentifier);
     const isDefault = isDefaultExportSpecifier(node);
-    const identifierToExport = isDefault
-        ? export_1.createDefaultExportIdentifier(node)
-        : identifier_1.transformIdentifier(context, node.name);
-    const exportAssignmentLeftHandSide = export_1.createExportedIdentifier(context, identifierToExport);
+    const exportAssignmentLeftHandSide = isDefault
+        ? (0, export_1.createDefaultExportExpression)(node)
+        : (0, export_1.createExportedIdentifier)(context, (0, identifier_1.transformIdentifier)(context, node.name));
     return lua.createAssignmentStatement(exportAssignmentLeftHandSide, exportedExpression, 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(s.propertyName, s.name))));
+    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);
     // Wrap in block to prevent imports from hoisting out of `do` statement
-    const [block] = block_1.transformScopeBlock(context, ts.factory.createBlock([importDeclaration]), scope_1.ScopeType.Block);
+    const [block] = (0, block_1.transformScopeBlock)(context, ts.factory.createBlock([importDeclaration]), scope_1.ScopeType.Block);
     const result = block.statements;
     // Now the module is imported, add the imports to the export table
     for (const specifier of exportSpecifiers) {
-        result.push(lua.createAssignmentStatement(export_1.createExportedIdentifier(context, identifier_1.transformIdentifier(context, specifier.name)), identifier_1.transformIdentifier(context, specifier.name)));
+        result.push(lua.createAssignmentStatement((0, export_1.createExportedIdentifier)(context, (0, identifier_1.transformIdentifier)(context, specifier.name)), (0, identifier_1.transformIdentifier)(context, specifier.name)));
     }
     // Wrap this in a DoStatement to prevent polluting the scope.
     return lua.createDoStatement(result, statement);
@@ -106,7 +105,7 @@ const transformExportDeclaration = (node, context) => {
         // export * as ns from "...";
         return transformExportAll(context, node);
     }
-    const exportSpecifiers = exports.getExported(context, node.exportClause);
+    const exportSpecifiers = (0, exports.getExported)(context, node.exportClause);
     // export { ... };
     if (!node.moduleSpecifier) {
         return exportSpecifiers.map(exportSpecifier => transformExportSpecifier(context, exportSpecifier));

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

@@ -15,7 +15,7 @@ function isNoResolutionPath(context, moduleSpecifier) {
     const moduleOwnerSymbol = context.checker.getSymbolAtLocation(moduleSpecifier);
     if (!moduleOwnerSymbol)
         return false;
-    const annotations = annotations_1.getSymbolAnnotations(moduleOwnerSymbol);
+    const annotations = (0, annotations_1.getSymbolAnnotations)(moduleOwnerSymbol);
     return annotations.has(annotations_1.AnnotationKind.NoResolution);
 }
 function createModuleRequire(context, moduleSpecifier, tsOriginal = moduleSpecifier) {
@@ -33,12 +33,12 @@ function shouldBeImported(context, importNode) {
     return context.resolver.isReferencedAliasDeclaration(importNode);
 }
 function transformImportSpecifier(context, importSpecifier, moduleTableName) {
-    const leftIdentifier = identifier_1.transformIdentifier(context, importSpecifier.name);
-    const propertyName = literal_1.transformPropertyName(context, importSpecifier.propertyName ? importSpecifier.propertyName : importSpecifier.name);
+    const leftIdentifier = (0, identifier_1.transformIdentifier)(context, importSpecifier.name);
+    const propertyName = (0, literal_1.transformPropertyName)(context, importSpecifier.propertyName ? importSpecifier.propertyName : importSpecifier.name);
     return lua.createVariableDeclarationStatement(leftIdentifier, lua.createTableIndexExpression(moduleTableName, propertyName), importSpecifier);
 }
 const transformImportDeclaration = (statement, context) => {
-    const scope = scope_1.peekScope(context);
+    const scope = (0, scope_1.peekScope)(context);
     if (!scope.importStatements) {
         scope.importStatements = [];
     }
@@ -61,14 +61,14 @@ const transformImportDeclaration = (statement, context) => {
         : "module";
     // Create the require statement to extract values.
     // local ____module = require("module")
-    const importUniqueName = lua.createIdentifier(safe_names_1.createSafeName(path.basename(importPath)));
+    const importUniqueName = lua.createIdentifier((0, safe_names_1.createSafeName)(path.basename(importPath)));
     let usingRequireStatement = false;
     // import defaultValue from "./module";
     // local defaultValue = __module.default
     if (statement.importClause.name) {
         if (shouldBeImported(context, statement.importClause)) {
-            const propertyName = export_1.createDefaultExportStringLiteral(statement.importClause.name);
-            const defaultImportAssignmentStatement = lua.createVariableDeclarationStatement(identifier_1.transformIdentifier(context, statement.importClause.name), lua.createTableIndexExpression(importUniqueName, propertyName), statement.importClause.name);
+            const propertyName = (0, export_1.createDefaultExportStringLiteral)(statement.importClause.name);
+            const defaultImportAssignmentStatement = lua.createVariableDeclarationStatement((0, identifier_1.transformIdentifier)(context, statement.importClause.name), lua.createTableIndexExpression(importUniqueName, propertyName), statement.importClause.name);
             result.push(defaultImportAssignmentStatement);
             usingRequireStatement = true;
         }
@@ -77,7 +77,7 @@ const transformImportDeclaration = (statement, context) => {
     // local module = require("module")
     if (statement.importClause.namedBindings && ts.isNamespaceImport(statement.importClause.namedBindings)) {
         if (context.resolver.isReferencedAliasDeclaration(statement.importClause.namedBindings)) {
-            const requireStatement = lua.createVariableDeclarationStatement(identifier_1.transformIdentifier(context, statement.importClause.namedBindings.name), requireCall, statement);
+            const requireStatement = lua.createVariableDeclarationStatement((0, identifier_1.transformIdentifier)(context, statement.importClause.namedBindings.name), requireCall, statement);
             result.push(requireStatement);
         }
     }
@@ -118,9 +118,9 @@ const transformImportEqualsDeclaration = (node, context) => {
             !context.resolver.isTopLevelValueImportEqualsWithEntityName(node))) {
         return undefined;
     }
-    const name = identifier_1.transformIdentifier(context, node.name);
+    const name = (0, identifier_1.transformIdentifier)(context, node.name);
     const expression = context.transformExpression(node.moduleReference);
-    return lua_ast_1.createHoistableVariableDeclarationStatement(context, name, expression, node);
+    return (0, lua_ast_1.createHoistableVariableDeclarationStatement)(context, name, expression, node);
 };
 exports.transformImportEqualsDeclaration = transformImportEqualsDeclaration;
 //# sourceMappingURL=import.js.map