typescript-to-lua 1.6.1 → 1.7.0

package/dist/transformation/visitors/language-extensions/iterable.d.ts

@@ -1,7 +1,6 @@
 import * as ts from "typescript";
 import * as lua from "../../../LuaAST";
 import { TransformationContext } from "../../context";
-export declare function isIterableType(type: ts.Type): boolean;
-export declare function returnsIterableType(context: TransformationContext, node: ts.CallExpression): boolean;
-export declare function isIterableExpression(context: TransformationContext, expression: ts.Expression): boolean;
 export declare function transformForOfIterableStatement(context: TransformationContext, statement: ts.ForOfStatement, block: lua.Block): lua.Statement;
+export declare function transformForOfPairsIterableStatement(context: TransformationContext, statement: ts.ForOfStatement, block: lua.Block): lua.Statement;
+export declare function transformForOfPairsKeyIterableStatement(context: TransformationContext, statement: ts.ForOfStatement, block: lua.Block): lua.Statement;

package/dist/transformation/visitors/language-extensions/iterable.js

@@ -1,31 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformForOfIterableStatement = exports.isIterableExpression = exports.returnsIterableType = exports.isIterableType = void 0;
+exports.transformForOfPairsKeyIterableStatement = exports.transformForOfPairsIterableStatement = exports.transformForOfIterableStatement = void 0;
 const ts = require("typescript");
 const lua = require("../../../LuaAST");
-const extensions = require("../../utils/language-extensions");
 const utils_1 = require("../loops/utils");
 const variable_declaration_1 = require("../variable-declaration");
 const diagnostics_1 = require("../../utils/diagnostics");
 const utils_2 = require("../../../utils");
 const multi_1 = require("./multi");
-function isIterableType(type) {
-    return extensions.isExtensionType(type, extensions.ExtensionKind.IterableType);
-}
-exports.isIterableType = isIterableType;
-function returnsIterableType(context, node) {
-    const signature = context.checker.getResolvedSignature(node);
-    const type = signature === null || signature === void 0 ? void 0 : signature.getReturnType();
-    return type ? isIterableType(type) : false;
-}
-exports.returnsIterableType = returnsIterableType;
-function isIterableExpression(context, expression) {
-    const type = context.checker.getTypeAtLocation(expression);
-    return isIterableType(type);
-}
-exports.isIterableExpression = isIterableExpression;
-function transformForOfMultiIterableStatement(context, statement, block) {
-    const luaIterator = context.transformExpression(statement.expression);
+function transformForOfMultiIterableStatement(context, statement, block, luaIterator, invalidMultiUseDiagnostic) {
     let identifiers = [];
     if (ts.isVariableDeclarationList(statement.initializer)) {
         // Variables declared in for loop
@@ -35,7 +18,7 @@ function transformForOfMultiIterableStatement(context, statement, block) {
             identifiers = binding.elements.map(e => (0, variable_declaration_1.transformArrayBindingElement)(context, e));
         }
         else {
-            context.diagnostics.push((0, diagnostics_1.invalidMultiIterableWithoutDestructuring)(binding));
+            context.diagnostics.push(invalidMultiUseDiagnostic(binding));
         }
     }
     else if (ts.isArrayLiteralExpression(statement.initializer)) {
@@ -48,7 +31,7 @@ function transformForOfMultiIterableStatement(context, statement, block) {
         }
     }
     else {
-        context.diagnostics.push((0, diagnostics_1.invalidMultiIterableWithoutDestructuring)(statement.initializer));
+        context.diagnostics.push(invalidMultiUseDiagnostic(statement.initializer));
     }
     if (identifiers.length === 0) {
         identifiers.push(lua.createAnonymousIdentifier());
@@ -59,11 +42,27 @@ function transformForOfIterableStatement(context, statement, block) {
     var _a;
     const type = context.checker.getTypeAtLocation(statement.expression);
     if (((_a = type.aliasTypeArguments) === null || _a === void 0 ? void 0 : _a.length) === 2 && (0, multi_1.isMultiReturnType)(type.aliasTypeArguments[0])) {
-        return transformForOfMultiIterableStatement(context, statement, block);
+        const luaIterator = context.transformExpression(statement.expression);
+        return transformForOfMultiIterableStatement(context, statement, block, luaIterator, diagnostics_1.invalidMultiIterableWithoutDestructuring);
     }
     const luaIterator = context.transformExpression(statement.expression);
     const identifier = (0, utils_1.transformForInitializer)(context, statement.initializer, block);
     return lua.createForInStatement(block, [identifier], [luaIterator], statement);
 }
 exports.transformForOfIterableStatement = transformForOfIterableStatement;
+function transformForOfPairsIterableStatement(context, statement, block) {
+    const pairsCall = lua.createCallExpression(lua.createIdentifier("pairs"), [
+        context.transformExpression(statement.expression),
+    ]);
+    return transformForOfMultiIterableStatement(context, statement, block, pairsCall, diagnostics_1.invalidPairsIterableWithoutDestructuring);
+}
+exports.transformForOfPairsIterableStatement = transformForOfPairsIterableStatement;
+function transformForOfPairsKeyIterableStatement(context, statement, block) {
+    const pairsCall = lua.createCallExpression(lua.createIdentifier("pairs"), [
+        context.transformExpression(statement.expression),
+    ]);
+    const identifier = (0, utils_1.transformForInitializer)(context, statement.initializer, block);
+    return lua.createForInStatement(block, [identifier], [pairsCall], statement);
+}
+exports.transformForOfPairsKeyIterableStatement = transformForOfPairsKeyIterableStatement;
 //# sourceMappingURL=iterable.js.map

package/dist/transformation/visitors/language-extensions/multi.d.ts

@@ -8,4 +8,3 @@ export declare function isMultiReturnCall(context: TransformationContext, expres
 export declare function isMultiFunctionNode(context: TransformationContext, node: ts.Node): boolean;
 export declare function isInMultiReturnFunction(context: TransformationContext, node: ts.Node): boolean;
 export declare function shouldMultiReturnCallBeWrapped(context: TransformationContext, node: ts.CallExpression): boolean;
-export declare function findMultiAssignmentViolations(context: TransformationContext, node: ts.ObjectLiteralExpression): ts.Node[];

package/dist/transformation/visitors/language-extensions/multi.js

@@ -1,17 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findMultiAssignmentViolations = exports.shouldMultiReturnCallBeWrapped = exports.isInMultiReturnFunction = exports.isMultiFunctionNode = exports.isMultiReturnCall = exports.returnsMultiType = exports.isMultiFunctionCall = exports.canBeMultiReturnType = exports.isMultiReturnType = void 0;
+exports.shouldMultiReturnCallBeWrapped = exports.isInMultiReturnFunction = exports.isMultiFunctionNode = exports.isMultiReturnCall = exports.returnsMultiType = exports.isMultiFunctionCall = exports.canBeMultiReturnType = exports.isMultiReturnType = void 0;
 const ts = require("typescript");
 const extensions = require("../../utils/language-extensions");
+const language_extensions_1 = require("../../utils/language-extensions");
 const typescript_1 = require("../../utils/typescript");
-const iterable_1 = require("./iterable");
-const diagnostics_1 = require("../../utils/diagnostics");
+const multiReturnExtensionName = "__tstlMultiReturn";
 function isMultiReturnType(type) {
-    return extensions.isExtensionType(type, extensions.ExtensionKind.MultiType);
+    return type.getProperty(multiReturnExtensionName) !== undefined;
 }
 exports.isMultiReturnType = isMultiReturnType;
 function canBeMultiReturnType(type) {
-    return isMultiReturnType(type) || (type.isUnion() && type.types.some(canBeMultiReturnType));
+    return isMultiReturnType(type) || (type.isUnion() && type.types.some(t => canBeMultiReturnType(t)));
 }
 exports.canBeMultiReturnType = canBeMultiReturnType;
 function isMultiFunctionCall(context, expression) {
@@ -29,8 +29,9 @@ function isMultiReturnCall(context, expression) {
 }
 exports.isMultiReturnCall = isMultiReturnCall;
 function isMultiFunctionNode(context, node) {
-    const symbol = context.checker.getSymbolAtLocation(node);
-    return symbol ? extensions.isExtensionValue(context, symbol, extensions.ExtensionKind.MultiFunction) : false;
+    return (ts.isIdentifier(node) &&
+        node.text === "$multi" &&
+        (0, language_extensions_1.getExtensionKindForNode)(context, node) === extensions.ExtensionKind.MultiFunction);
 }
 exports.isMultiFunctionNode = isMultiFunctionNode;
 function isInMultiReturnFunction(context, node) {
@@ -75,26 +76,11 @@ function shouldMultiReturnCallBeWrapped(context, node) {
         return false;
     }
     // LuaIterable in for...of
-    if (ts.isForOfStatement(node.parent) && (0, iterable_1.isIterableExpression)(context, node)) {
+    if (ts.isForOfStatement(node.parent) &&
+        (0, language_extensions_1.getIterableExtensionKindForNode)(context, node) === language_extensions_1.IterableExtensionKind.Iterable) {
         return false;
     }
     return true;
 }
 exports.shouldMultiReturnCallBeWrapped = shouldMultiReturnCallBeWrapped;
-function findMultiAssignmentViolations(context, node) {
-    const result = [];
-    for (const element of node.properties) {
-        if (!ts.isShorthandPropertyAssignment(element))
-            continue;
-        const valueSymbol = context.checker.getShorthandAssignmentValueSymbol(element);
-        if (valueSymbol) {
-            if (extensions.isExtensionValue(context, valueSymbol, extensions.ExtensionKind.MultiFunction)) {
-                context.diagnostics.push((0, diagnostics_1.invalidMultiFunctionUse)(element));
-                result.push(element);
-            }
-        }
-    }
-    return result;
-}
-exports.findMultiAssignmentViolations = findMultiAssignmentViolations;
 //# sourceMappingURL=multi.js.map

package/dist/transformation/visitors/language-extensions/operators.d.ts

@@ -1,5 +1,2 @@
-import * as ts from "typescript";
-import * as lua from "../../../LuaAST";
-import { TransformationContext } from "../../context";
-export declare function isOperatorMapping(context: TransformationContext, node: ts.CallExpression | ts.Identifier): boolean;
-export declare function transformOperatorMappingExpression(context: TransformationContext, node: ts.CallExpression, isOptionalCall: boolean): lua.Expression | undefined;
+import { LanguageExtensionCallTransformerMap } from "./call-extension";
+export declare const operatorExtensionTransformers: LanguageExtensionCallTransformerMap;

package/dist/transformation/visitors/language-extensions/operators.js

@@ -1,127 +1,120 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformOperatorMappingExpression = exports.isOperatorMapping = void 0;
+exports.operatorExtensionTransformers = void 0;
 const ts = require("typescript");
 const lua = require("../../../LuaAST");
-const extensions = require("../../utils/language-extensions");
 const utils_1 = require("../../../utils");
-const typescript_1 = require("../../utils/typescript");
 const CompilerOptions_1 = require("../../../CompilerOptions");
 const diagnostics_1 = require("../../utils/diagnostics");
+const language_extensions_1 = require("../../utils/language-extensions");
 const binaryOperatorMappings = new Map([
-    [extensions.ExtensionKind.AdditionOperatorType, lua.SyntaxKind.AdditionOperator],
-    [extensions.ExtensionKind.AdditionOperatorMethodType, lua.SyntaxKind.AdditionOperator],
-    [extensions.ExtensionKind.SubtractionOperatorType, lua.SyntaxKind.SubtractionOperator],
-    [extensions.ExtensionKind.SubtractionOperatorMethodType, lua.SyntaxKind.SubtractionOperator],
-    [extensions.ExtensionKind.MultiplicationOperatorType, lua.SyntaxKind.MultiplicationOperator],
-    [extensions.ExtensionKind.MultiplicationOperatorMethodType, lua.SyntaxKind.MultiplicationOperator],
-    [extensions.ExtensionKind.DivisionOperatorType, lua.SyntaxKind.DivisionOperator],
-    [extensions.ExtensionKind.DivisionOperatorMethodType, lua.SyntaxKind.DivisionOperator],
-    [extensions.ExtensionKind.ModuloOperatorType, lua.SyntaxKind.ModuloOperator],
-    [extensions.ExtensionKind.ModuloOperatorMethodType, lua.SyntaxKind.ModuloOperator],
-    [extensions.ExtensionKind.PowerOperatorType, lua.SyntaxKind.PowerOperator],
-    [extensions.ExtensionKind.PowerOperatorMethodType, lua.SyntaxKind.PowerOperator],
-    [extensions.ExtensionKind.FloorDivisionOperatorType, lua.SyntaxKind.FloorDivisionOperator],
-    [extensions.ExtensionKind.FloorDivisionOperatorMethodType, lua.SyntaxKind.FloorDivisionOperator],
-    [extensions.ExtensionKind.BitwiseAndOperatorType, lua.SyntaxKind.BitwiseAndOperator],
-    [extensions.ExtensionKind.BitwiseAndOperatorMethodType, lua.SyntaxKind.BitwiseAndOperator],
-    [extensions.ExtensionKind.BitwiseOrOperatorType, lua.SyntaxKind.BitwiseOrOperator],
-    [extensions.ExtensionKind.BitwiseOrOperatorMethodType, lua.SyntaxKind.BitwiseOrOperator],
-    [extensions.ExtensionKind.BitwiseExclusiveOrOperatorType, lua.SyntaxKind.BitwiseExclusiveOrOperator],
-    [extensions.ExtensionKind.BitwiseExclusiveOrOperatorMethodType, lua.SyntaxKind.BitwiseExclusiveOrOperator],
-    [extensions.ExtensionKind.BitwiseLeftShiftOperatorType, lua.SyntaxKind.BitwiseLeftShiftOperator],
-    [extensions.ExtensionKind.BitwiseLeftShiftOperatorMethodType, lua.SyntaxKind.BitwiseLeftShiftOperator],
-    [extensions.ExtensionKind.BitwiseRightShiftOperatorType, lua.SyntaxKind.BitwiseRightShiftOperator],
-    [extensions.ExtensionKind.BitwiseRightShiftOperatorMethodType, lua.SyntaxKind.BitwiseRightShiftOperator],
-    [extensions.ExtensionKind.ConcatOperatorType, lua.SyntaxKind.ConcatOperator],
-    [extensions.ExtensionKind.ConcatOperatorMethodType, lua.SyntaxKind.ConcatOperator],
-    [extensions.ExtensionKind.LessThanOperatorType, lua.SyntaxKind.LessThanOperator],
-    [extensions.ExtensionKind.LessThanOperatorMethodType, lua.SyntaxKind.LessThanOperator],
-    [extensions.ExtensionKind.GreaterThanOperatorType, lua.SyntaxKind.GreaterThanOperator],
-    [extensions.ExtensionKind.GreaterThanOperatorMethodType, lua.SyntaxKind.GreaterThanOperator],
+    [language_extensions_1.ExtensionKind.AdditionOperatorType, lua.SyntaxKind.AdditionOperator],
+    [language_extensions_1.ExtensionKind.AdditionOperatorMethodType, lua.SyntaxKind.AdditionOperator],
+    [language_extensions_1.ExtensionKind.SubtractionOperatorType, lua.SyntaxKind.SubtractionOperator],
+    [language_extensions_1.ExtensionKind.SubtractionOperatorMethodType, lua.SyntaxKind.SubtractionOperator],
+    [language_extensions_1.ExtensionKind.MultiplicationOperatorType, lua.SyntaxKind.MultiplicationOperator],
+    [language_extensions_1.ExtensionKind.MultiplicationOperatorMethodType, lua.SyntaxKind.MultiplicationOperator],
+    [language_extensions_1.ExtensionKind.DivisionOperatorType, lua.SyntaxKind.DivisionOperator],
+    [language_extensions_1.ExtensionKind.DivisionOperatorMethodType, lua.SyntaxKind.DivisionOperator],
+    [language_extensions_1.ExtensionKind.ModuloOperatorType, lua.SyntaxKind.ModuloOperator],
+    [language_extensions_1.ExtensionKind.ModuloOperatorMethodType, lua.SyntaxKind.ModuloOperator],
+    [language_extensions_1.ExtensionKind.PowerOperatorType, lua.SyntaxKind.PowerOperator],
+    [language_extensions_1.ExtensionKind.PowerOperatorMethodType, lua.SyntaxKind.PowerOperator],
+    [language_extensions_1.ExtensionKind.FloorDivisionOperatorType, lua.SyntaxKind.FloorDivisionOperator],
+    [language_extensions_1.ExtensionKind.FloorDivisionOperatorMethodType, lua.SyntaxKind.FloorDivisionOperator],
+    [language_extensions_1.ExtensionKind.BitwiseAndOperatorType, lua.SyntaxKind.BitwiseAndOperator],
+    [language_extensions_1.ExtensionKind.BitwiseAndOperatorMethodType, lua.SyntaxKind.BitwiseAndOperator],
+    [language_extensions_1.ExtensionKind.BitwiseOrOperatorType, lua.SyntaxKind.BitwiseOrOperator],
+    [language_extensions_1.ExtensionKind.BitwiseOrOperatorMethodType, lua.SyntaxKind.BitwiseOrOperator],
+    [language_extensions_1.ExtensionKind.BitwiseExclusiveOrOperatorType, lua.SyntaxKind.BitwiseExclusiveOrOperator],
+    [language_extensions_1.ExtensionKind.BitwiseExclusiveOrOperatorMethodType, lua.SyntaxKind.BitwiseExclusiveOrOperator],
+    [language_extensions_1.ExtensionKind.BitwiseLeftShiftOperatorType, lua.SyntaxKind.BitwiseLeftShiftOperator],
+    [language_extensions_1.ExtensionKind.BitwiseLeftShiftOperatorMethodType, lua.SyntaxKind.BitwiseLeftShiftOperator],
+    [language_extensions_1.ExtensionKind.BitwiseRightShiftOperatorType, lua.SyntaxKind.BitwiseRightShiftOperator],
+    [language_extensions_1.ExtensionKind.BitwiseRightShiftOperatorMethodType, lua.SyntaxKind.BitwiseRightShiftOperator],
+    [language_extensions_1.ExtensionKind.ConcatOperatorType, lua.SyntaxKind.ConcatOperator],
+    [language_extensions_1.ExtensionKind.ConcatOperatorMethodType, lua.SyntaxKind.ConcatOperator],
+    [language_extensions_1.ExtensionKind.LessThanOperatorType, lua.SyntaxKind.LessThanOperator],
+    [language_extensions_1.ExtensionKind.LessThanOperatorMethodType, lua.SyntaxKind.LessThanOperator],
+    [language_extensions_1.ExtensionKind.GreaterThanOperatorType, lua.SyntaxKind.GreaterThanOperator],
+    [language_extensions_1.ExtensionKind.GreaterThanOperatorMethodType, lua.SyntaxKind.GreaterThanOperator],
 ]);
 const unaryOperatorMappings = new Map([
-    [extensions.ExtensionKind.NegationOperatorType, lua.SyntaxKind.NegationOperator],
-    [extensions.ExtensionKind.NegationOperatorMethodType, lua.SyntaxKind.NegationOperator],
-    [extensions.ExtensionKind.BitwiseNotOperatorType, lua.SyntaxKind.BitwiseNotOperator],
-    [extensions.ExtensionKind.BitwiseNotOperatorMethodType, lua.SyntaxKind.BitwiseNotOperator],
-    [extensions.ExtensionKind.LengthOperatorType, lua.SyntaxKind.LengthOperator],
-    [extensions.ExtensionKind.LengthOperatorMethodType, lua.SyntaxKind.LengthOperator],
+    [language_extensions_1.ExtensionKind.NegationOperatorType, lua.SyntaxKind.NegationOperator],
+    [language_extensions_1.ExtensionKind.NegationOperatorMethodType, lua.SyntaxKind.NegationOperator],
+    [language_extensions_1.ExtensionKind.BitwiseNotOperatorType, lua.SyntaxKind.BitwiseNotOperator],
+    [language_extensions_1.ExtensionKind.BitwiseNotOperatorMethodType, lua.SyntaxKind.BitwiseNotOperator],
+    [language_extensions_1.ExtensionKind.LengthOperatorType, lua.SyntaxKind.LengthOperator],
+    [language_extensions_1.ExtensionKind.LengthOperatorMethodType, lua.SyntaxKind.LengthOperator],
 ]);
-const operatorMapExtensions = [...binaryOperatorMappings.keys(), ...unaryOperatorMappings.keys()];
 const bitwiseOperatorMapExtensions = new Set([
-    extensions.ExtensionKind.BitwiseAndOperatorType,
-    extensions.ExtensionKind.BitwiseAndOperatorMethodType,
-    extensions.ExtensionKind.BitwiseOrOperatorType,
-    extensions.ExtensionKind.BitwiseOrOperatorMethodType,
-    extensions.ExtensionKind.BitwiseExclusiveOrOperatorType,
-    extensions.ExtensionKind.BitwiseExclusiveOrOperatorMethodType,
-    extensions.ExtensionKind.BitwiseLeftShiftOperatorType,
-    extensions.ExtensionKind.BitwiseLeftShiftOperatorMethodType,
-    extensions.ExtensionKind.BitwiseRightShiftOperatorType,
-    extensions.ExtensionKind.BitwiseRightShiftOperatorMethodType,
-    extensions.ExtensionKind.BitwiseNotOperatorType,
-    extensions.ExtensionKind.BitwiseNotOperatorMethodType,
+    language_extensions_1.ExtensionKind.BitwiseAndOperatorType,
+    language_extensions_1.ExtensionKind.BitwiseAndOperatorMethodType,
+    language_extensions_1.ExtensionKind.BitwiseOrOperatorType,
+    language_extensions_1.ExtensionKind.BitwiseOrOperatorMethodType,
+    language_extensions_1.ExtensionKind.BitwiseExclusiveOrOperatorType,
+    language_extensions_1.ExtensionKind.BitwiseExclusiveOrOperatorMethodType,
+    language_extensions_1.ExtensionKind.BitwiseLeftShiftOperatorType,
+    language_extensions_1.ExtensionKind.BitwiseLeftShiftOperatorMethodType,
+    language_extensions_1.ExtensionKind.BitwiseRightShiftOperatorType,
+    language_extensions_1.ExtensionKind.BitwiseRightShiftOperatorMethodType,
+    language_extensions_1.ExtensionKind.BitwiseNotOperatorType,
+    language_extensions_1.ExtensionKind.BitwiseNotOperatorMethodType,
 ]);
-function getOperatorMapExtensionKindForCall(context, node) {
-    const type = (0, typescript_1.getFunctionTypeForCall)(context, node);
-    return type && operatorMapExtensions.find(extensionKind => extensions.isExtensionType(type, extensionKind));
+const requiresLua53 = new Set([
+    ...bitwiseOperatorMapExtensions,
+    language_extensions_1.ExtensionKind.FloorDivisionOperatorType,
+    language_extensions_1.ExtensionKind.FloorDivisionOperatorMethodType,
+]);
+exports.operatorExtensionTransformers = {};
+for (const kind of binaryOperatorMappings.keys()) {
+    exports.operatorExtensionTransformers[kind] = transformBinaryOperator;
+}
+for (const kind of unaryOperatorMappings.keys()) {
+    exports.operatorExtensionTransformers[kind] = transformUnaryOperator;
+}
+function transformBinaryOperator(context, node, kind) {
+    if (requiresLua53.has(kind))
+        checkHasLua53(context, node, kind);
+    let args = node.arguments;
+    if (args.length === 1 &&
+        (ts.isPropertyAccessExpression(node.expression) || ts.isElementAccessExpression(node.expression))) {
+        args = [node.expression.expression, ...args];
+    }
+    const luaOperator = binaryOperatorMappings.get(kind);
+    (0, utils_1.assert)(luaOperator);
+    return lua.createBinaryExpression(context.transformExpression(args[0]), context.transformExpression(args[1]), luaOperator);
 }
-function isOperatorMapping(context, node) {
-    if (ts.isCallExpression(node)) {
-        return getOperatorMapExtensionKindForCall(context, node) !== undefined;
+function transformUnaryOperator(context, node, kind) {
+    if (requiresLua53.has(kind))
+        checkHasLua53(context, node, kind);
+    let arg;
+    if (node.arguments.length === 0 &&
+        (ts.isPropertyAccessExpression(node.expression) || ts.isElementAccessExpression(node.expression))) {
+        arg = node.expression.expression;
     }
     else {
-        const type = context.checker.getTypeAtLocation(node);
-        return operatorMapExtensions.some(extensionKind => extensions.isExtensionType(type, extensionKind));
+        arg = node.arguments[0];
     }
+    const luaOperator = unaryOperatorMappings.get(kind);
+    (0, utils_1.assert)(luaOperator);
+    return lua.createUnaryExpression(context.transformExpression(arg), luaOperator);
 }
-exports.isOperatorMapping = isOperatorMapping;
-function transformOperatorMappingExpression(context, node, isOptionalCall) {
-    const extensionKind = getOperatorMapExtensionKindForCall(context, node);
-    if (!extensionKind)
-        return undefined;
-    if (isOptionalCall) {
-        context.diagnostics.push((0, diagnostics_1.unsupportedBuiltinOptionalCall)(node));
-        return lua.createNilLiteral();
-    }
+function checkHasLua53(context, node, kind) {
     const isBefore53 = context.luaTarget === CompilerOptions_1.LuaTarget.Lua51 ||
         context.luaTarget === CompilerOptions_1.LuaTarget.Lua52 ||
         context.luaTarget === CompilerOptions_1.LuaTarget.LuaJIT ||
         context.luaTarget === CompilerOptions_1.LuaTarget.Universal;
     if (isBefore53) {
         const luaTarget = context.luaTarget === CompilerOptions_1.LuaTarget.Universal ? CompilerOptions_1.LuaTarget.Lua51 : context.luaTarget;
-        if (bitwiseOperatorMapExtensions.has(extensionKind)) {
-            context.diagnostics.push((0, diagnostics_1.unsupportedForTarget)(node, "Native bitwise operations", luaTarget));
-        }
-        else if (extensionKind === extensions.ExtensionKind.FloorDivisionOperatorType ||
-            extensionKind === extensions.ExtensionKind.FloorDivisionOperatorMethodType) {
+        if (kind === language_extensions_1.ExtensionKind.FloorDivisionOperatorType ||
+            kind === language_extensions_1.ExtensionKind.FloorDivisionOperatorMethodType) {
             context.diagnostics.push((0, diagnostics_1.unsupportedForTarget)(node, "Floor division operator", luaTarget));
         }
-    }
-    const args = node.arguments.slice();
-    if (binaryOperatorMappings.has(extensionKind)) {
-        if (args.length === 1 &&
-            (ts.isPropertyAccessExpression(node.expression) || ts.isElementAccessExpression(node.expression))) {
-            args.unshift(node.expression.expression);
-        }
-        const luaOperator = binaryOperatorMappings.get(extensionKind);
-        (0, utils_1.assert)(luaOperator);
-        return lua.createBinaryExpression(context.transformExpression(args[0]), context.transformExpression(args[1]), luaOperator);
-    }
-    else {
-        let arg;
-        if (args.length === 0 &&
-            (ts.isPropertyAccessExpression(node.expression) || ts.isElementAccessExpression(node.expression))) {
-            arg = node.expression.expression;
-        }
         else {
-            arg = args[0];
+            // is bitwise operator
+            context.diagnostics.push((0, diagnostics_1.unsupportedForTarget)(node, "Native bitwise operations", luaTarget));
         }
-        const luaOperator = unaryOperatorMappings.get(extensionKind);
-        (0, utils_1.assert)(luaOperator);
-        return lua.createUnaryExpression(context.transformExpression(arg), luaOperator);
     }
 }
-exports.transformOperatorMappingExpression = transformOperatorMappingExpression;
 //# sourceMappingURL=operators.js.map

package/dist/transformation/visitors/language-extensions/range.js

@@ -9,13 +9,15 @@ const identifier_1 = require("../identifier");
 const call_1 = require("../call");
 const utils_2 = require("../../../utils");
 const diagnostics_1 = require("../../utils/diagnostics");
+const language_extensions_1 = require("../../utils/language-extensions");
 function isRangeFunction(context, expression) {
     return isRangeFunctionNode(context, expression.expression);
 }
 exports.isRangeFunction = isRangeFunction;
 function isRangeFunctionNode(context, node) {
-    const symbol = context.checker.getSymbolAtLocation(node);
-    return symbol ? extensions.isExtensionValue(context, symbol, extensions.ExtensionKind.RangeFunction) : false;
+    return (ts.isIdentifier(node) &&
+        node.text === "$range" &&
+        (0, language_extensions_1.getExtensionKindForNode)(context, node) === extensions.ExtensionKind.RangeFunction);
 }
 exports.isRangeFunctionNode = isRangeFunctionNode;
 function getControlVariable(context, statement) {

package/dist/transformation/visitors/language-extensions/table.d.ts

@@ -1,6 +1,9 @@
 import * as ts from "typescript";
-import * as lua from "../../../LuaAST";
 import { TransformationContext } from "../../context";
-export declare function isTableExtensionIdentifier(context: TransformationContext, node: ts.Identifier): boolean;
+import { ExtensionKind } from "../../utils/language-extensions";
+import { LanguageExtensionCallTransformer } from "./call-extension";
 export declare function isTableNewCall(context: TransformationContext, node: ts.NewExpression): boolean;
-export declare function transformTableExtensionCall(context: TransformationContext, node: ts.CallExpression, isOptionalCall: boolean): lua.Expression | undefined;
+export declare const tableNewExtensions: ExtensionKind[];
+export declare const tableExtensionTransformers: {
+    [P in ExtensionKind]?: LanguageExtensionCallTransformer;
+};

package/dist/transformation/visitors/language-extensions/table.js

@@ -1,109 +1,80 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformTableExtensionCall = exports.isTableNewCall = exports.isTableExtensionIdentifier = void 0;
+exports.tableExtensionTransformers = exports.tableNewExtensions = exports.isTableNewCall = void 0;
 const ts = require("typescript");
 const lua = require("../../../LuaAST");
-const extensions = require("../../utils/language-extensions");
-const typescript_1 = require("../../utils/typescript");
+const language_extensions_1 = require("../../utils/language-extensions");
 const expression_list_1 = require("../expression-list");
-const diagnostics_1 = require("../../utils/diagnostics");
-const tableCallExtensions = [
-    extensions.ExtensionKind.TableDeleteType,
-    extensions.ExtensionKind.TableDeleteMethodType,
-    extensions.ExtensionKind.TableGetType,
-    extensions.ExtensionKind.TableGetMethodType,
-    extensions.ExtensionKind.TableHasType,
-    extensions.ExtensionKind.TableHasMethodType,
-    extensions.ExtensionKind.TableSetType,
-    extensions.ExtensionKind.TableSetMethodType,
-];
-const tableExtensions = [extensions.ExtensionKind.TableNewType, ...tableCallExtensions];
-function getTableExtensionKindForCall(context, node, validExtensions) {
-    const type = (0, typescript_1.getFunctionTypeForCall)(context, node);
-    return type && validExtensions.find(extensionKind => extensions.isExtensionType(type, extensionKind));
-}
-function isTableExtensionIdentifier(context, node) {
-    const type = context.checker.getTypeAtLocation(node);
-    return tableExtensions.some(extensionKind => extensions.isExtensionType(type, extensionKind));
-}
-exports.isTableExtensionIdentifier = isTableExtensionIdentifier;
 function isTableNewCall(context, node) {
-    const type = context.checker.getTypeAtLocation(node.expression);
-    return extensions.isExtensionType(type, extensions.ExtensionKind.TableNewType);
+    return (0, language_extensions_1.getExtensionKindForNode)(context, node.expression) === language_extensions_1.ExtensionKind.TableNewType;
 }
 exports.isTableNewCall = isTableNewCall;
-function transformTableExtensionCall(context, node, isOptionalCall) {
-    const extensionType = getTableExtensionKindForCall(context, node, tableCallExtensions);
-    if (!extensionType)
-        return;
-    if (isOptionalCall) {
-        context.diagnostics.push((0, diagnostics_1.unsupportedBuiltinOptionalCall)(node));
-        return lua.createNilLiteral();
-    }
-    if (extensionType === extensions.ExtensionKind.TableDeleteType ||
-        extensionType === extensions.ExtensionKind.TableDeleteMethodType) {
-        return transformTableDeleteExpression(context, node, extensionType);
-    }
-    if (extensionType === extensions.ExtensionKind.TableGetType ||
-        extensionType === extensions.ExtensionKind.TableGetMethodType) {
-        return transformTableGetExpression(context, node, extensionType);
-    }
-    if (extensionType === extensions.ExtensionKind.TableHasType ||
-        extensionType === extensions.ExtensionKind.TableHasMethodType) {
-        return transformTableHasExpression(context, node, extensionType);
-    }
-    if (extensionType === extensions.ExtensionKind.TableSetType ||
-        extensionType === extensions.ExtensionKind.TableSetMethodType) {
-        return transformTableSetExpression(context, node, extensionType);
-    }
-}
-exports.transformTableExtensionCall = transformTableExtensionCall;
+exports.tableNewExtensions = [language_extensions_1.ExtensionKind.TableNewType];
+exports.tableExtensionTransformers = {
+    [language_extensions_1.ExtensionKind.TableDeleteType]: transformTableDeleteExpression,
+    [language_extensions_1.ExtensionKind.TableDeleteMethodType]: transformTableDeleteExpression,
+    [language_extensions_1.ExtensionKind.TableGetType]: transformTableGetExpression,
+    [language_extensions_1.ExtensionKind.TableGetMethodType]: transformTableGetExpression,
+    [language_extensions_1.ExtensionKind.TableHasType]: transformTableHasExpression,
+    [language_extensions_1.ExtensionKind.TableHasMethodType]: transformTableHasExpression,
+    [language_extensions_1.ExtensionKind.TableSetType]: transformTableSetExpression,
+    [language_extensions_1.ExtensionKind.TableSetMethodType]: transformTableSetExpression,
+    [language_extensions_1.ExtensionKind.TableAddKeyType]: transformTableAddExpression,
+    [language_extensions_1.ExtensionKind.TableAddKeyMethodType]: transformTableAddExpression,
+};
 function transformTableDeleteExpression(context, node, extensionKind) {
     const args = node.arguments.slice();
-    if (extensionKind === extensions.ExtensionKind.TableDeleteMethodType &&
+    if (extensionKind === language_extensions_1.ExtensionKind.TableDeleteMethodType &&
         (ts.isPropertyAccessExpression(node.expression) || ts.isElementAccessExpression(node.expression))) {
         // In case of method (no table argument), push method owner to front of args list
         args.unshift(node.expression.expression);
     }
-    // arg0[arg1] = nil
     const [table, accessExpression] = (0, expression_list_1.transformExpressionList)(context, args);
+    // arg0[arg1] = nil
     context.addPrecedingStatements(lua.createAssignmentStatement(lua.createTableIndexExpression(table, accessExpression), lua.createNilLiteral(), node));
     return lua.createBooleanLiteral(true);
 }
-function transformTableGetExpression(context, node, extensionKind) {
-    const args = node.arguments.slice();
-    if (extensionKind === extensions.ExtensionKind.TableGetMethodType &&
-        (ts.isPropertyAccessExpression(node.expression) || ts.isElementAccessExpression(node.expression))) {
-        // In case of method (no table argument), push method owner to front of args list
-        args.unshift(node.expression.expression);
+function transformWithTableArgument(context, node) {
+    if (ts.isPropertyAccessExpression(node.expression) || ts.isElementAccessExpression(node.expression)) {
+        return (0, expression_list_1.transformExpressionList)(context, [node.expression.expression, ...node.arguments]);
     }
-    const [table, accessExpression] = (0, expression_list_1.transformExpressionList)(context, args);
+    // todo: report diagnostic?
+    return [lua.createNilLiteral(), ...(0, expression_list_1.transformExpressionList)(context, node.arguments)];
+}
+function transformTableGetExpression(context, node, extensionKind) {
+    const args = extensionKind === language_extensions_1.ExtensionKind.TableGetMethodType
+        ? transformWithTableArgument(context, node)
+        : (0, expression_list_1.transformExpressionList)(context, node.arguments);
+    const [table, accessExpression] = args;
     // arg0[arg1]
     return lua.createTableIndexExpression(table, accessExpression, node);
 }
 function transformTableHasExpression(context, node, extensionKind) {
-    const args = node.arguments.slice();
-    if (extensionKind === extensions.ExtensionKind.TableHasMethodType &&
-        (ts.isPropertyAccessExpression(node.expression) || ts.isElementAccessExpression(node.expression))) {
-        // In case of method (no table argument), push method owner to front of args list
-        args.unshift(node.expression.expression);
-    }
+    const args = extensionKind === language_extensions_1.ExtensionKind.TableHasMethodType
+        ? transformWithTableArgument(context, node)
+        : (0, expression_list_1.transformExpressionList)(context, node.arguments);
+    const [table, accessExpression] = args;
     // arg0[arg1]
-    const [table, accessExpression] = (0, expression_list_1.transformExpressionList)(context, args);
     const tableIndexExpression = lua.createTableIndexExpression(table, accessExpression);
     // arg0[arg1] ~= nil
     return lua.createBinaryExpression(tableIndexExpression, lua.createNilLiteral(), lua.SyntaxKind.InequalityOperator, node);
 }
 function transformTableSetExpression(context, node, extensionKind) {
-    const args = node.arguments.slice();
-    if (extensionKind === extensions.ExtensionKind.TableSetMethodType &&
-        (ts.isPropertyAccessExpression(node.expression) || ts.isElementAccessExpression(node.expression))) {
-        // In case of method (no table argument), push method owner to front of args list
-        args.unshift(node.expression.expression);
-    }
+    const args = extensionKind === language_extensions_1.ExtensionKind.TableSetMethodType
+        ? transformWithTableArgument(context, node)
+        : (0, expression_list_1.transformExpressionList)(context, node.arguments);
+    const [table, accessExpression, value] = args;
     // arg0[arg1] = arg2
-    const [table, accessExpression, value] = (0, expression_list_1.transformExpressionList)(context, args);
     context.addPrecedingStatements(lua.createAssignmentStatement(lua.createTableIndexExpression(table, accessExpression), value, node));
     return lua.createNilLiteral();
 }
+function transformTableAddExpression(context, node, extensionKind) {
+    const args = extensionKind === language_extensions_1.ExtensionKind.TableAddKeyMethodType
+        ? transformWithTableArgument(context, node)
+        : (0, expression_list_1.transformExpressionList)(context, node.arguments);
+    const [table, value] = args;
+    // arg0[arg1] = true
+    context.addPrecedingStatements(lua.createAssignmentStatement(lua.createTableIndexExpression(table, value), lua.createBooleanLiteral(true), node));
+    return lua.createNilLiteral();
+}
 //# sourceMappingURL=table.js.map

package/dist/transformation/visitors/language-extensions/vararg.js

@@ -2,15 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isVarargConstantNode = exports.isGlobalVarargConstant = void 0;
 const extensions = require("../../utils/language-extensions");
+const language_extensions_1 = require("../../utils/language-extensions");
 const scope_1 = require("../../utils/scope");
 function isGlobalVarargConstant(context, symbol, scope) {
-    return (scope.type === scope_1.ScopeType.File &&
-        extensions.isExtensionValue(context, symbol, extensions.ExtensionKind.VarargConstant));
+    return scope.type === scope_1.ScopeType.File && isVarargConstantSymbol(context, symbol);
 }
 exports.isGlobalVarargConstant = isGlobalVarargConstant;
+function isVarargConstantSymbol(context, symbol) {
+    return (symbol.getName() === "$vararg" &&
+        (0, language_extensions_1.getExtensionKindForSymbol)(context, symbol) === extensions.ExtensionKind.VarargConstant);
+}
 function isVarargConstantNode(context, node) {
     const symbol = context.checker.getSymbolAtLocation(node);
-    return symbol ? extensions.isExtensionValue(context, symbol, extensions.ExtensionKind.VarargConstant) : false;
+    return symbol !== undefined && isVarargConstantSymbol(context, symbol);
 }
 exports.isVarargConstantNode = isVarargConstantNode;
 //# sourceMappingURL=vararg.js.map