typescript-to-lua 1.20.1 → 1.21.0

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/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.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;
@@ -89,7 +90,13 @@ function transformContextualCallExpression(context, node, args, signature) {
         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)) {

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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "typescript-to-lua",
-    "version": "1.20.1",
+    "version": "1.21.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/",