typescript-to-lua 1.20.1 → 1.22.0

package/dist/LuaLib.d.ts

@@ -60,6 +60,7 @@ export declare enum LuaLibFeature {
     New = "New",
     Number = "Number",
     NumberIsFinite = "NumberIsFinite",
+    NumberIsInteger = "NumberIsInteger",
     NumberIsNaN = "NumberIsNaN",
     NumberParseInt = "ParseInt",
     NumberParseFloat = "ParseFloat",

package/dist/LuaLib.js

@@ -65,6 +65,7 @@ var LuaLibFeature;
     LuaLibFeature["New"] = "New";
     LuaLibFeature["Number"] = "Number";
     LuaLibFeature["NumberIsFinite"] = "NumberIsFinite";
+    LuaLibFeature["NumberIsInteger"] = "NumberIsInteger";
     LuaLibFeature["NumberIsNaN"] = "NumberIsNaN";
     LuaLibFeature["NumberParseInt"] = "ParseInt";
     LuaLibFeature["NumberParseFloat"] = "ParseFloat";

package/dist/lualib/5.0/NumberIsInteger.lua

@@ -0,0 +1,3 @@
+local function __TS__NumberIsInteger(value)
+    return __TS__NumberIsFinite(value) and math.floor(value) == value
+end

package/dist/lualib/5.0/Unpack.lua

@@ -1,6 +1,6 @@
 local function __TS__Unpack(list, i, j)
     if i == 1 and j == nil then
-        return unpack(nil, list)
+        return unpack(list)
     else
         if j == nil then
             j = table.getn(list)

package/dist/lualib/5.0/lualib_bundle.lua

@@ -1241,7 +1241,7 @@ end
 
 local function __TS__Unpack(list, i, j)
     if i == 1 and j == nil then
-        return unpack(nil, list)
+        return unpack(list)
     else
         if j == nil then
             j = table.getn(list)
@@ -1526,6 +1526,10 @@ local function __TS__NumberIsFinite(value)
     return type(value) == "number" and value == value and value ~= 1 / 0 and value ~= -(1 / 0)
 end
 
+local function __TS__NumberIsInteger(value)
+    return __TS__NumberIsFinite(value) and math.floor(value) == value
+end
+
 local function __TS__NumberIsNaN(value)
     return value ~= value
 end
@@ -2627,6 +2631,7 @@ return {
   __TS__New = __TS__New,
   __TS__Number = __TS__Number,
   __TS__NumberIsFinite = __TS__NumberIsFinite,
+  __TS__NumberIsInteger = __TS__NumberIsInteger,
   __TS__NumberIsNaN = __TS__NumberIsNaN,
   __TS__ParseInt = __TS__ParseInt,
   __TS__ParseFloat = __TS__ParseFloat,

package/dist/lualib/5.0/lualib_module_info.json

@@ -381,6 +381,14 @@
       "__TS__NumberIsFinite"
     ]
   },
+  "NumberIsInteger": {
+    "exports": [
+      "__TS__NumberIsInteger"
+    ],
+    "dependencies": [
+      "NumberIsFinite"
+    ]
+  },
   "NumberIsNaN": {
     "exports": [
       "__TS__NumberIsNaN"

package/dist/lualib/universal/NumberIsInteger.lua

@@ -0,0 +1,3 @@
+local function __TS__NumberIsInteger(value)
+    return __TS__NumberIsFinite(value) and math.floor(value) == value
+end

package/dist/lualib/universal/lualib_bundle.lua

@@ -1466,6 +1466,10 @@ local function __TS__NumberIsFinite(value)
     return type(value) == "number" and value == value and value ~= math.huge and value ~= -math.huge
 end
 
+local function __TS__NumberIsInteger(value)
+    return __TS__NumberIsFinite(value) and math.floor(value) == value
+end
+
 local function __TS__NumberIsNaN(value)
     return value ~= value
 end
@@ -2567,6 +2571,7 @@ return {
   __TS__New = __TS__New,
   __TS__Number = __TS__Number,
   __TS__NumberIsFinite = __TS__NumberIsFinite,
+  __TS__NumberIsInteger = __TS__NumberIsInteger,
   __TS__NumberIsNaN = __TS__NumberIsNaN,
   __TS__ParseInt = __TS__ParseInt,
   __TS__ParseFloat = __TS__ParseFloat,

package/dist/lualib/universal/lualib_module_info.json

@@ -387,6 +387,14 @@
       "__TS__NumberIsFinite"
     ]
   },
+  "NumberIsInteger": {
+    "exports": [
+      "__TS__NumberIsInteger"
+    ],
+    "dependencies": [
+      "NumberIsFinite"
+    ]
+  },
   "NumberIsNaN": {
     "exports": [
       "__TS__NumberIsNaN"

package/dist/transformation/builtins/number.js

@@ -74,6 +74,8 @@ function transformNumberConstructorCall(context, node, calledMethod) {
     const parameters = (0, call_1.transformArguments)(context, node.arguments);
     const methodName = calledMethod.name.text;
     switch (methodName) {
+        case "isInteger":
+            return (0, lualib_1.transformLuaLibFunction)(context, lualib_1.LuaLibFeature.NumberIsInteger, node, ...parameters);
         case "isNaN":
             return (0, lualib_1.transformLuaLibFunction)(context, lualib_1.LuaLibFeature.NumberIsNaN, node, ...parameters);
         case "isFinite":

package/dist/transformation/utils/annotations.d.ts

@@ -4,6 +4,7 @@ export declare enum AnnotationKind {
     CompileMembersOnly = "compileMembersOnly",
     NoResolution = "noResolution",
     NoSelf = "noSelf",
+    CustomName = "customName",
     NoSelfInFile = "noSelfInFile"
 }
 export interface Annotation {

package/dist/transformation/utils/annotations.js

@@ -8,6 +8,7 @@ var AnnotationKind;
     AnnotationKind["CompileMembersOnly"] = "compileMembersOnly";
     AnnotationKind["NoResolution"] = "noResolution";
     AnnotationKind["NoSelf"] = "noSelf";
+    AnnotationKind["CustomName"] = "customName";
     AnnotationKind["NoSelfInFile"] = "noSelfInFile";
 })(AnnotationKind || (exports.AnnotationKind = AnnotationKind = {}));
 const annotationValues = new Map(Object.values(AnnotationKind).map(k => [k.toLowerCase(), k]));

package/dist/transformation/utils/function-context.d.ts

@@ -6,5 +6,5 @@ export declare enum ContextType {
     NonVoid = 2,
     Mixed = 3
 }
-export declare function getDeclarationContextType(context: TransformationContext, signatureDeclaration: ts.SignatureDeclaration): ContextType;
+export declare function getCallContextType(context: TransformationContext, callExpression: ts.CallLikeExpression): ContextType;
 export declare function getFunctionContextType(context: TransformationContext, type: ts.Type): ContextType;

package/dist/transformation/utils/function-context.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFunctionContextType = exports.getDeclarationContextType = exports.ContextType = void 0;
+exports.getFunctionContextType = exports.getCallContextType = exports.ContextType = void 0;
 const ts = require("typescript");
 const annotations_1 = require("./annotations");
 const typescript_1 = require("./typescript");
@@ -32,8 +32,33 @@ function getExplicitThisParameter(signatureDeclaration) {
         return param;
     }
 }
+const callContextTypes = new WeakMap();
+function getCallContextType(context, callExpression) {
+    const known = callContextTypes.get(callExpression);
+    if (known !== undefined)
+        return known;
+    const signature = context.checker.getResolvedSignature(callExpression);
+    const signatureDeclaration = signature === null || signature === void 0 ? void 0 : signature.getDeclaration();
+    let contextType = ContextType.None;
+    if (signatureDeclaration) {
+        contextType = computeDeclarationContextType(context, signatureDeclaration);
+    }
+    else {
+        // No signature declaration could be resolved, so instead try to see if the declaration is in a
+        // noSelfInFile file
+        const declarations = findRootDeclarations(context, callExpression);
+        contextType = declarations.some(d => (0, annotations_1.getFileAnnotations)(d.getSourceFile()).has(annotations_1.AnnotationKind.NoSelfInFile))
+            ? ContextType.Void
+            : context.options.noImplicitSelf
+                ? ContextType.Void
+                : ContextType.NonVoid;
+    }
+    callContextTypes.set(callExpression, contextType);
+    return contextType;
+}
+exports.getCallContextType = getCallContextType;
 const signatureDeclarationContextTypes = new WeakMap();
-function getDeclarationContextType(context, signatureDeclaration) {
+function getSignatureContextType(context, signatureDeclaration) {
     const known = signatureDeclarationContextTypes.get(signatureDeclaration);
     if (known !== undefined)
         return known;
@@ -41,7 +66,29 @@ function getDeclarationContextType(context, signatureDeclaration) {
     signatureDeclarationContextTypes.set(signatureDeclaration, contextType);
     return contextType;
 }
-exports.getDeclarationContextType = getDeclarationContextType;
+function findRootDeclarations(context, callExpression) {
+    var _a, _b;
+    const calledExpression = ts.isTaggedTemplateExpression(callExpression)
+        ? callExpression.tag
+        : ts.isJsxSelfClosingElement(callExpression)
+            ? callExpression.tagName
+            : ts.isJsxOpeningElement(callExpression)
+                ? callExpression.tagName
+                : callExpression.expression;
+    const calledSymbol = context.checker.getSymbolAtLocation(calledExpression);
+    if (calledSymbol === undefined)
+        return [];
+    return ((_b = (_a = calledSymbol.getDeclarations()) === null || _a === void 0 ? void 0 : _a.flatMap(d => {
+        var _a;
+        if (ts.isImportSpecifier(d)) {
+            const aliasSymbol = context.checker.getAliasedSymbol(calledSymbol);
+            return (_a = aliasSymbol.getDeclarations()) !== null && _a !== void 0 ? _a : [];
+        }
+        else {
+            return [d];
+        }
+    })) !== null && _b !== void 0 ? _b : []);
+}
 function computeDeclarationContextType(context, signatureDeclaration) {
     const thisParameter = getExplicitThisParameter(signatureDeclaration);
     if (thisParameter) {
@@ -140,6 +187,6 @@ function computeFunctionContextType(context, type) {
     if (signatures.length === 0) {
         return ContextType.None;
     }
-    return reduceContextTypes(signatures.flatMap(s => getSignatureDeclarations(context, s)).map(s => getDeclarationContextType(context, s)));
+    return reduceContextTypes(signatures.flatMap(s => getSignatureDeclarations(context, s)).map(s => getSignatureContextType(context, s)));
 }
 //# sourceMappingURL=function-context.js.map

package/dist/transformation/utils/scope.d.ts

@@ -16,6 +16,10 @@ interface FunctionDefinitionInfo {
     referencedSymbols: Map<lua.SymbolId, ts.Node[]>;
     definition?: lua.VariableDeclarationStatement | lua.AssignmentStatement;
 }
+export declare enum LoopContinued {
+    WithGoto = 0,
+    WithRepeatBreak = 1
+}
 export interface Scope {
     type: ScopeType;
     id: number;
@@ -24,7 +28,7 @@ export interface Scope {
     variableDeclarations?: lua.VariableDeclarationStatement[];
     functionDefinitions?: Map<lua.SymbolId, FunctionDefinitionInfo>;
     importStatements?: lua.Statement[];
-    loopContinued?: boolean;
+    loopContinued?: LoopContinued;
     functionReturned?: boolean;
 }
 export interface HoistingResult {

package/dist/transformation/utils/scope.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.performHoisting = exports.separateHoistedStatements = exports.isFunctionScopeWithDefinition = exports.hasReferencedSymbol = exports.hasReferencedUndefinedLocalFunction = exports.addScopeVariableDeclaration = exports.findScope = exports.peekScope = exports.markSymbolAsReferencedInCurrentScopes = exports.walkScopesUp = exports.ScopeType = void 0;
+exports.performHoisting = exports.separateHoistedStatements = exports.isFunctionScopeWithDefinition = exports.hasReferencedSymbol = exports.hasReferencedUndefinedLocalFunction = exports.addScopeVariableDeclaration = exports.findScope = exports.peekScope = exports.markSymbolAsReferencedInCurrentScopes = exports.walkScopesUp = exports.LoopContinued = exports.ScopeType = void 0;
 const ts = require("typescript");
 const lua = require("../../LuaAST");
 const utils_1 = require("../../utils");
@@ -18,6 +18,11 @@ var ScopeType;
     ScopeType[ScopeType["Catch"] = 128] = "Catch";
     ScopeType[ScopeType["LoopInitializer"] = 256] = "LoopInitializer";
 })(ScopeType || (exports.ScopeType = ScopeType = {}));
+var LoopContinued;
+(function (LoopContinued) {
+    LoopContinued[LoopContinued["WithGoto"] = 0] = "WithGoto";
+    LoopContinued[LoopContinued["WithRepeatBreak"] = 1] = "WithRepeatBreak";
+})(LoopContinued || (exports.LoopContinued = LoopContinued = {}));
 function* walkScopesUp(context) {
     const scopeStack = context.scopeStack;
     for (let i = scopeStack.length - 1; i >= 0; --i) {

package/dist/transformation/visitors/break-continue.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformContinueStatement = exports.transformBreakStatement = void 0;
 const CompilerOptions_1 = require("../../CompilerOptions");
 const lua = require("../../LuaAST");
-const diagnostics_1 = require("../utils/diagnostics");
 const scope_1 = require("../utils/scope");
 const transformBreakStatement = (breakStatement, context) => {
     void context;
@@ -12,16 +11,25 @@ const transformBreakStatement = (breakStatement, context) => {
 exports.transformBreakStatement = transformBreakStatement;
 const transformContinueStatement = (statement, context) => {
     var _a;
-    if (context.luaTarget === CompilerOptions_1.LuaTarget.Universal ||
-        context.luaTarget === CompilerOptions_1.LuaTarget.Lua50 ||
-        context.luaTarget === CompilerOptions_1.LuaTarget.Lua51) {
-        context.diagnostics.push((0, diagnostics_1.unsupportedForTarget)(statement, "Continue statement", context.luaTarget));
-    }
     const scope = (0, scope_1.findScope)(context, scope_1.ScopeType.Loop);
+    const continuedWith = context.luaTarget === CompilerOptions_1.LuaTarget.Universal ||
+        context.luaTarget === CompilerOptions_1.LuaTarget.Lua50 ||
+        context.luaTarget === CompilerOptions_1.LuaTarget.Lua51
+        ? scope_1.LoopContinued.WithRepeatBreak
+        : scope_1.LoopContinued.WithGoto;
     if (scope) {
-        scope.loopContinued = true;
+        scope.loopContinued = continuedWith;
+    }
+    const label = `__continue${(_a = scope === null || scope === void 0 ? void 0 : scope.id) !== null && _a !== void 0 ? _a : ""}`;
+    switch (continuedWith) {
+        case scope_1.LoopContinued.WithGoto:
+            return lua.createGotoStatement(label, statement);
+        case scope_1.LoopContinued.WithRepeatBreak:
+            return [
+                lua.createAssignmentStatement(lua.createIdentifier(label), lua.createBooleanLiteral(true), statement),
+                lua.createBreakStatement(statement),
+            ];
     }
-    return lua.createGotoStatement(`__continue${(_a = scope === null || scope === void 0 ? void 0 : scope.id) !== null && _a !== void 0 ? _a : ""}`, statement);
 };
 exports.transformContinueStatement = transformContinueStatement;
 //# sourceMappingURL=break-continue.js.map

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

@@ -4,6 +4,6 @@ import { FunctionVisitor, TransformationContext } from "../context";
 export declare function validateArguments(context: TransformationContext, params: readonly ts.Expression[], signature?: ts.Signature): void;
 export declare function transformArguments(context: TransformationContext, params: readonly ts.Expression[], signature?: ts.Signature, callContext?: ts.Expression): lua.Expression[];
 export declare function transformCallAndArguments(context: TransformationContext, callExpression: ts.Expression, params: readonly ts.Expression[], signature?: ts.Signature, callContext?: ts.Expression): [lua.Expression, lua.Expression[]];
-export declare function transformContextualCallExpression(context: TransformationContext, node: ts.CallExpression | ts.TaggedTemplateExpression, args: ts.Expression[] | ts.NodeArray<ts.Expression>, signature?: ts.Signature): lua.Expression;
+export declare function transformContextualCallExpression(context: TransformationContext, node: ts.CallExpression | ts.TaggedTemplateExpression, args: ts.Expression[] | ts.NodeArray<ts.Expression>): lua.Expression;
 export declare const transformCallExpression: FunctionVisitor<ts.CallExpression>;
 export declare function getCalledExpression(node: ts.CallExpression): ts.Expression;

package/dist/transformation/visitors/call.js

@@ -17,6 +17,7 @@ const preceding_statements_1 = require("../utils/preceding-statements");
 const optional_chaining_1 = require("./optional-chaining");
 const import_1 = require("./modules/import");
 const call_extension_1 = require("./language-extensions/call-extension");
+const identifier_1 = require("./identifier");
 function validateArguments(context, params, signature) {
     if (!signature || signature.parameters.length < params.length) {
         return;
@@ -77,19 +78,25 @@ function transformElementAccessCall(context, left, transformedArguments, argPrec
     }
     return lua.createCallExpression(index, [selfIdentifier, ...transformedArguments]);
 }
-function transformContextualCallExpression(context, node, args, signature) {
+function transformContextualCallExpression(context, node, args) {
     if (ts.isOptionalChain(node)) {
         return (0, optional_chaining_1.transformOptionalChain)(context, node);
     }
     const left = ts.isCallExpression(node) ? getCalledExpression(node) : node.tag;
-    let { precedingStatements: argPrecedingStatements, result: transformedArguments } = (0, preceding_statements_1.transformInPrecedingStatementScope)(context, () => transformArguments(context, args, signature));
+    let { precedingStatements: argPrecedingStatements, result: transformedArguments } = (0, preceding_statements_1.transformInPrecedingStatementScope)(context, () => transformArguments(context, args));
     if (ts.isPropertyAccessExpression(left) &&
         ts.isIdentifier(left.name) &&
         (0, safe_names_1.isValidLuaIdentifier)(left.name.text, context.options) &&
         argPrecedingStatements.length === 0) {
         // table:name()
         const table = context.transformExpression(left.expression);
-        return lua.createMethodCallExpression(table, lua.createIdentifier(left.name.text, left.name), transformedArguments, node);
+        let name = left.name.text;
+        const symbol = context.checker.getSymbolAtLocation(left);
+        const customName = (0, identifier_1.getCustomNameFromSymbol)(symbol);
+        if (customName) {
+            name = customName;
+        }
+        return lua.createMethodCallExpression(table, lua.createIdentifier(name, left.name), transformedArguments, node);
     }
     else if (ts.isElementAccessExpression(left) || ts.isPropertyAccessExpression(left)) {
         if ((0, typescript_1.isExpressionWithEvaluationEffect)(left.expression)) {
@@ -119,10 +126,9 @@ function transformPropertyCall(context, node, calledMethod) {
         const parameters = transformArguments(context, node.arguments, signature, ts.factory.createThis());
         return lua.createCallExpression(context.transformExpression(node.expression), parameters, node);
     }
-    const signatureDeclaration = signature === null || signature === void 0 ? void 0 : signature.getDeclaration();
-    if (!signatureDeclaration || (0, function_context_1.getDeclarationContextType)(context, signatureDeclaration) !== function_context_1.ContextType.Void) {
+    if ((0, function_context_1.getCallContextType)(context, node) !== function_context_1.ContextType.Void) {
         // table:name()
-        return transformContextualCallExpression(context, node, node.arguments, signature);
+        return transformContextualCallExpression(context, node, node.arguments);
     }
     else {
         // table.name()
@@ -131,15 +137,13 @@ function transformPropertyCall(context, node, calledMethod) {
     }
 }
 function transformElementCall(context, node) {
-    const signature = context.checker.getResolvedSignature(node);
-    const signatureDeclaration = signature === null || signature === void 0 ? void 0 : signature.getDeclaration();
-    if (!signatureDeclaration || (0, function_context_1.getDeclarationContextType)(context, signatureDeclaration) !== function_context_1.ContextType.Void) {
+    if ((0, function_context_1.getCallContextType)(context, node) !== function_context_1.ContextType.Void) {
         // A contextual parameter must be given to this call expression
-        return transformContextualCallExpression(context, node, node.arguments, signature);
+        return transformContextualCallExpression(context, node, node.arguments);
     }
     else {
         // No context
-        const [expression, parameters] = transformCallAndArguments(context, node.expression, node.arguments, signature);
+        const [expression, parameters] = transformCallAndArguments(context, node.expression, node.arguments);
         return lua.createCallExpression(expression, parameters, node);
     }
 }
@@ -179,7 +183,7 @@ const transformCallExpression = (node, context) => {
     }
     let callPath;
     let parameters;
-    const isContextualCall = isContextualCallExpression(context, signature);
+    const isContextualCall = (0, function_context_1.getCallContextType)(context, node) !== function_context_1.ContextType.Void;
     if (!isContextualCall) {
         [callPath, parameters] = transformCallAndArguments(context, calledExpression, node.arguments, signature);
     }
@@ -196,13 +200,6 @@ const transformCallExpression = (node, context) => {
     return wrapResultInTable ? (0, lua_ast_1.wrapInTable)(callExpression) : callExpression;
 };
 exports.transformCallExpression = transformCallExpression;
-function isContextualCallExpression(context, signature) {
-    const declaration = signature === null || signature === void 0 ? void 0 : signature.getDeclaration();
-    if (!declaration) {
-        return !context.options.noImplicitSelf;
-    }
-    return (0, function_context_1.getDeclarationContextType)(context, declaration) !== function_context_1.ContextType.Void;
-}
 function getCalledExpression(node) {
     return ts.skipOuterExpressions(node.expression);
 }

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

@@ -17,6 +17,7 @@ const setup_1 = require("./setup");
 const CompilerOptions_1 = require("../../../CompilerOptions");
 const preceding_statements_1 = require("../../utils/preceding-statements");
 const decorators_2 = require("./decorators");
+const typescript_1 = require("../../utils/typescript");
 const transformClassDeclaration = (declaration, context) => {
     // If declaration is a default export, transform to export variable assignment instead
     if ((0, export_1.hasDefaultExportModifier)(declaration)) {
@@ -180,7 +181,14 @@ const transformSuperExpression = (expression, context) => {
         // Use "className.____super" if the base is not a simple identifier
         baseClassName = lua.createTableIndexExpression(className, lua.createStringLiteral("____super"), expression);
     }
-    return lua.createTableIndexExpression(baseClassName, lua.createStringLiteral("prototype"));
+    const f = (0, typescript_1.findFirstNodeAbove)(expression, ts.isFunctionLike);
+    if (f && ts.canHaveModifiers(f) && (0, utils_1.isStaticNode)(f)) {
+        // In static method, don't add prototype to super call
+        return baseClassName;
+    }
+    else {
+        return lua.createTableIndexExpression(baseClassName, lua.createStringLiteral("prototype"));
+    }
 };
 exports.transformSuperExpression = transformSuperExpression;
 //# sourceMappingURL=index.js.map

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

@@ -2,5 +2,6 @@ import * as ts from "typescript";
 import * as lua from "../../LuaAST";
 import { FunctionVisitor, TransformationContext } from "../context";
 export declare function transformIdentifier(context: TransformationContext, identifier: ts.Identifier): lua.Identifier;
+export declare function getCustomNameFromSymbol(symbol?: ts.Symbol): undefined | string;
 export declare function transformIdentifierWithSymbol(context: TransformationContext, node: ts.Identifier, symbol: ts.Symbol | undefined): lua.Expression;
 export declare const transformIdentifierExpression: FunctionVisitor<ts.Identifier>;

package/dist/transformation/visitors/identifier.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformIdentifierExpression = exports.transformIdentifierWithSymbol = exports.transformIdentifier = void 0;
+exports.transformIdentifierExpression = exports.transformIdentifierWithSymbol = exports.getCustomNameFromSymbol = exports.transformIdentifier = void 0;
 const ts = require("typescript");
 const lua = require("../../LuaAST");
 const builtins_1 = require("../builtins");
@@ -15,10 +15,33 @@ const typescript_1 = require("../utils/typescript");
 const language_extensions_1 = require("../utils/language-extensions");
 const call_extension_1 = require("./language-extensions/call-extension");
 const identifier_1 = require("./language-extensions/identifier");
+const annotations_1 = require("../utils/annotations");
 function transformIdentifier(context, identifier) {
     return transformNonValueIdentifier(context, identifier, context.checker.getSymbolAtLocation(identifier));
 }
 exports.transformIdentifier = transformIdentifier;
+function getCustomNameFromSymbol(symbol) {
+    let retVal;
+    if (symbol) {
+        const declarations = symbol.getDeclarations();
+        if (declarations) {
+            let customNameAnnotation = undefined;
+            for (const declaration of declarations) {
+                const nodeAnnotations = (0, annotations_1.getNodeAnnotations)(declaration);
+                const foundAnnotation = nodeAnnotations.get(annotations_1.AnnotationKind.CustomName);
+                if (foundAnnotation) {
+                    customNameAnnotation = foundAnnotation;
+                    break;
+                }
+            }
+            if (customNameAnnotation) {
+                retVal = customNameAnnotation.args[0];
+            }
+        }
+    }
+    return retVal;
+}
+exports.getCustomNameFromSymbol = getCustomNameFromSymbol;
 function transformNonValueIdentifier(context, identifier, symbol) {
     if ((0, optional_chaining_1.isOptionalContinuation)(identifier)) {
         const result = lua.createIdentifier(identifier.text, undefined, context_1.tempSymbolId);
@@ -48,9 +71,10 @@ function transformNonValueIdentifier(context, identifier, symbol) {
             return (0, promise_1.createPromiseIdentifier)(identifier);
         }
     }
-    const text = (0, safe_names_1.hasUnsafeIdentifierName)(context, identifier, symbol)
-        ? (0, safe_names_1.createSafeName)(identifier.text)
-        : identifier.text;
+    let text = (0, safe_names_1.hasUnsafeIdentifierName)(context, identifier, symbol) ? (0, safe_names_1.createSafeName)(identifier.text) : identifier.text;
+    const customName = getCustomNameFromSymbol(symbol);
+    if (customName)
+        text = customName;
     const symbolId = (0, symbols_1.getIdentifierSymbolId)(context, identifier, symbol);
     return lua.createIdentifier(text, identifier, symbolId, identifier.text);
 }

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

@@ -16,13 +16,22 @@ function transformLoopBody(context, loop) {
     const body = (0, scope_1.performHoisting)(context, (0, block_1.transformBlockOrStatement)(context, loop.statement));
     const scope = context.popScope();
     const scopeId = scope.id;
-    if (!scope.loopContinued) {
-        return body;
+    switch (scope.loopContinued) {
+        case undefined:
+            return body;
+        case scope_1.LoopContinued.WithGoto:
+            return [lua.createDoStatement(body), lua.createLabelStatement(`__continue${scopeId}`)];
+        case scope_1.LoopContinued.WithRepeatBreak:
+            const identifier = lua.createIdentifier(`__continue${scopeId}`);
+            const literalTrue = lua.createBooleanLiteral(true);
+            return [
+                lua.createDoStatement([
+                    lua.createVariableDeclarationStatement(identifier),
+                    lua.createRepeatStatement(lua.createBlock([...body, lua.createAssignmentStatement(identifier, literalTrue)]), literalTrue),
+                    lua.createIfStatement(lua.createUnaryExpression(identifier, lua.SyntaxKind.NotOperator), lua.createBlock([lua.createBreakStatement()])),
+                ]),
+            ];
     }
-    const baseResult = [lua.createDoStatement(body)];
-    const continueLabel = lua.createLabelStatement(`__continue${scopeId}`);
-    baseResult.push(continueLabel);
-    return baseResult;
 }
 exports.transformLoopBody = transformLoopBody;
 function getVariableDeclarationBinding(context, node) {

package/dist/transformation/visitors/template.js

@@ -66,14 +66,12 @@ const transformTaggedTemplateExpression = (expression, context) => {
     ]);
     expressions.unshift(stringObject);
     // Evaluate if there is a self parameter to be used.
-    const signature = context.checker.getResolvedSignature(expression);
-    const signatureDeclaration = signature === null || signature === void 0 ? void 0 : signature.getDeclaration();
-    const useSelfParameter = signatureDeclaration && (0, function_context_1.getDeclarationContextType)(context, signatureDeclaration) !== function_context_1.ContextType.Void;
+    const useSelfParameter = (0, function_context_1.getCallContextType)(context, expression) !== function_context_1.ContextType.Void;
     if (useSelfParameter) {
-        return (0, call_1.transformContextualCallExpression)(context, expression, expressions, signature);
+        return (0, call_1.transformContextualCallExpression)(context, expression, expressions);
     }
     // Argument evaluation.
-    const callArguments = (0, call_1.transformArguments)(context, expressions, signature);
+    const callArguments = (0, call_1.transformArguments)(context, expressions);
     const leftHandSideExpression = context.transformExpression(expression.tag);
     return lua.createCallExpression(leftHandSideExpression, callArguments);
 };

package/dist/transpilation/plugins.d.ts

@@ -29,6 +29,14 @@ export interface Plugin {
      * This function is called after translating the input program to Lua, after resolving dependencies and after bundling.
      */
     beforeEmit?: (program: ts.Program, options: CompilerOptions, emitHost: EmitHost, result: EmitFile[]) => ts.Diagnostic[] | void;
+    /**
+     * This function is called after translating the input program to Lua, after resolving dependencies, after bundling and writing files to disk.
+     */
+    afterEmit?: (program: ts.Program, options: CompilerOptions, emitHost: EmitHost, result: EmitFile[]) => ts.Diagnostic[] | void;
+    /**
+     * This function is called when trying to resolve the .lua file corresponding to a Lua require statement. Allows you to provide
+     * your own module resolution logic. If return value is undefined, regular module resolution is done.
+     */
     moduleResolution?: (moduleIdentifier: string, requiringFile: string, options: CompilerOptions, emitHost: EmitHost) => string | undefined;
 }
 export declare function getPlugins(program: ts.Program): {

package/dist/transpilation/transpiler.js

@@ -31,7 +31,7 @@ class Transpiler {
         };
     }
     emitFiles(program, plugins, emitPlan, writeFile) {
-        var _a, _b;
+        var _a, _b, _c;
         performance.startSection("emit");
         const options = program.getCompilerOptions();
         if (options.tstlVerbose) {
@@ -54,6 +54,12 @@ class Transpiler {
                 writeFile(outputPath + ".map", sourceMap, emitBOM, undefined, sourceFiles);
             }
         }
+        for (const plugin of plugins) {
+            if (plugin.afterEmit) {
+                const afterEmitPluginDiagnostics = (_c = plugin.afterEmit(program, options, this.emitHost, emitPlan)) !== null && _c !== void 0 ? _c : [];
+                diagnostics.push(...afterEmitPluginDiagnostics);
+            }
+        }
         if (options.tstlVerbose) {
             console.log("Emit finished!");
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "typescript-to-lua",
-    "version": "1.20.1",
+    "version": "1.22.0",
     "description": "A generic TypeScript to Lua transpiler. Write your code in TypeScript and publish Lua!",
     "repository": "https://github.com/TypeScriptToLua/TypeScriptToLua",
     "homepage": "https://typescripttolua.github.io/",