typescript-to-lua 1.36.0 → 1.37.0

package/dist/lualib/5.0/Promise.lua

@@ -74,16 +74,39 @@ do
         return self["then"](self, nil, onRejected)
     end
     function __TS__Promise.prototype.finally(self, onFinally)
+        if type(onFinally) ~= "function" then
+            return self["then"](self, onFinally, onFinally)
+        end
         return self["then"](
             self,
-            onFinally and (function(____, value)
-                onFinally(nil)
-                return value
-            end) or nil,
-            onFinally and (function(____, reason)
-                onFinally(nil)
-                error(reason, 0)
-            end) or nil
+            function(____, x)
+                local ____self_2 = __TS__New(
+                    __TS__Promise,
+                    function(____, resolve) return resolve(
+                        nil,
+                        onFinally(nil)
+                    ) end
+                )
+                return ____self_2["then"](
+                    ____self_2,
+                    function() return x end
+                )
+            end,
+            function(____, e)
+                local ____self_3 = __TS__New(
+                    __TS__Promise,
+                    function(____, resolve) return resolve(
+                        nil,
+                        onFinally(nil)
+                    ) end
+                )
+                return ____self_3["then"](
+                    ____self_3,
+                    function()
+                        error(e, 0)
+                    end
+                )
+            end
         )
     end
     function __TS__Promise.prototype.resolve(self, value)

package/dist/lualib/5.0/lualib_bundle.lua

@@ -706,16 +706,39 @@ do
         return self["then"](self, nil, onRejected)
     end
     function __TS__Promise.prototype.finally(self, onFinally)
+        if type(onFinally) ~= "function" then
+            return self["then"](self, onFinally, onFinally)
+        end
         return self["then"](
             self,
-            onFinally and (function(____, value)
-                onFinally(nil)
-                return value
-            end) or nil,
-            onFinally and (function(____, reason)
-                onFinally(nil)
-                error(reason, 0)
-            end) or nil
+            function(____, x)
+                local ____self_2 = __TS__New(
+                    __TS__Promise,
+                    function(____, resolve) return resolve(
+                        nil,
+                        onFinally(nil)
+                    ) end
+                )
+                return ____self_2["then"](
+                    ____self_2,
+                    function() return x end
+                )
+            end,
+            function(____, e)
+                local ____self_3 = __TS__New(
+                    __TS__Promise,
+                    function(____, resolve) return resolve(
+                        nil,
+                        onFinally(nil)
+                    ) end
+                )
+                return ____self_3["then"](
+                    ____self_3,
+                    function()
+                        error(e, 0)
+                    end
+                )
+            end
         )
     end
     function __TS__Promise.prototype.resolve(self, value)

package/dist/lualib/universal/Promise.lua

@@ -74,16 +74,39 @@ do
         return self["then"](self, nil, onRejected)
     end
     function __TS__Promise.prototype.finally(self, onFinally)
+        if type(onFinally) ~= "function" then
+            return self["then"](self, onFinally, onFinally)
+        end
         return self["then"](
             self,
-            onFinally and (function(____, value)
-                onFinally(nil)
-                return value
-            end) or nil,
-            onFinally and (function(____, reason)
-                onFinally(nil)
-                error(reason, 0)
-            end) or nil
+            function(____, x)
+                local ____self_2 = __TS__New(
+                    __TS__Promise,
+                    function(____, resolve) return resolve(
+                        nil,
+                        onFinally(nil)
+                    ) end
+                )
+                return ____self_2["then"](
+                    ____self_2,
+                    function() return x end
+                )
+            end,
+            function(____, e)
+                local ____self_3 = __TS__New(
+                    __TS__Promise,
+                    function(____, resolve) return resolve(
+                        nil,
+                        onFinally(nil)
+                    ) end
+                )
+                return ____self_3["then"](
+                    ____self_3,
+                    function()
+                        error(e, 0)
+                    end
+                )
+            end
         )
     end
     function __TS__Promise.prototype.resolve(self, value)

package/dist/lualib/universal/lualib_bundle.lua

@@ -702,16 +702,39 @@ do
         return self["then"](self, nil, onRejected)
     end
     function __TS__Promise.prototype.finally(self, onFinally)
+        if type(onFinally) ~= "function" then
+            return self["then"](self, onFinally, onFinally)
+        end
         return self["then"](
             self,
-            onFinally and (function(____, value)
-                onFinally(nil)
-                return value
-            end) or nil,
-            onFinally and (function(____, reason)
-                onFinally(nil)
-                error(reason, 0)
-            end) or nil
+            function(____, x)
+                local ____self_2 = __TS__New(
+                    __TS__Promise,
+                    function(____, resolve) return resolve(
+                        nil,
+                        onFinally(nil)
+                    ) end
+                )
+                return ____self_2["then"](
+                    ____self_2,
+                    function() return x end
+                )
+            end,
+            function(____, e)
+                local ____self_3 = __TS__New(
+                    __TS__Promise,
+                    function(____, resolve) return resolve(
+                        nil,
+                        onFinally(nil)
+                    ) end
+                )
+                return ____self_3["then"](
+                    ____self_3,
+                    function()
+                        error(e, 0)
+                    end
+                )
+            end
         )
     end
     function __TS__Promise.prototype.resolve(self, value)

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

@@ -83,6 +83,12 @@ export declare const notAllowedOptionalAssignment: ((node: ts.Node, ...args: any
 export declare const awaitMustBeInAsyncFunction: ((node: ts.Node, ...args: any[]) => ts.Diagnostic) & {
     code: number;
 };
+export declare const unsupportedAsyncGenerator: ((node: ts.Node, ...args: any[]) => ts.Diagnostic) & {
+    code: number;
+};
+export declare const unsupportedForAwaitOf: ((node: ts.Node, ...args: any[]) => ts.Diagnostic) & {
+    code: number;
+};
 export declare const unsupportedBuiltinOptionalCall: ((node: ts.Node, ...args: any[]) => ts.Diagnostic) & {
     code: number;
 };

package/dist/transformation/utils/diagnostics.js

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.unsupportedArrayWithLengthConstructor = exports.incompleteFieldDecoratorWarning = exports.cannotAssignToNodeOfKind = exports.invalidSpreadInCallExtension = exports.invalidMethodCallExtensionUse = exports.undefinedInArrayLiteral = exports.unsupportedOptionalCompileMembersOnly = exports.unsupportedBuiltinOptionalCall = exports.awaitMustBeInAsyncFunction = exports.notAllowedOptionalAssignment = exports.truthyOnlyConditionalValue = exports.annotationDeprecated = exports.invalidCallExtensionUse = exports.invalidMultiReturnAccess = exports.invalidMultiFunctionReturnType = exports.invalidMultiFunctionUse = exports.unsupportedVarDeclaration = exports.invalidAmbientIdentifierName = exports.unsupportedProperty = exports.unsupportedForTargetButOverrideAvailable = exports.unsupportedForTarget = exports.unsupportedRightShiftOperator = exports.unsupportedAccessorInObjectLiteral = exports.invalidPairsIterableWithoutDestructuring = exports.invalidMultiIterableWithoutDestructuring = exports.invalidRangeControlVariable = exports.invalidVarargUse = exports.invalidRangeUse = exports.annotationInvalidArgumentCount = exports.decoratorInvalidContext = exports.unsupportedOverloadAssignment = exports.unsupportedSelfFunctionConversion = exports.unsupportedNoSelfFunctionConversion = exports.forbiddenForIn = exports.unsupportedNodeKind = void 0;
+exports.unsupportedArrayWithLengthConstructor = exports.incompleteFieldDecoratorWarning = exports.cannotAssignToNodeOfKind = exports.invalidSpreadInCallExtension = exports.invalidMethodCallExtensionUse = exports.undefinedInArrayLiteral = exports.unsupportedOptionalCompileMembersOnly = exports.unsupportedBuiltinOptionalCall = exports.unsupportedForAwaitOf = exports.unsupportedAsyncGenerator = exports.awaitMustBeInAsyncFunction = exports.notAllowedOptionalAssignment = exports.truthyOnlyConditionalValue = exports.annotationDeprecated = exports.invalidCallExtensionUse = exports.invalidMultiReturnAccess = exports.invalidMultiFunctionReturnType = exports.invalidMultiFunctionUse = exports.unsupportedVarDeclaration = exports.invalidAmbientIdentifierName = exports.unsupportedProperty = exports.unsupportedForTargetButOverrideAvailable = exports.unsupportedForTarget = exports.unsupportedRightShiftOperator = exports.unsupportedAccessorInObjectLiteral = exports.invalidPairsIterableWithoutDestructuring = exports.invalidMultiIterableWithoutDestructuring = exports.invalidRangeControlVariable = exports.invalidVarargUse = exports.invalidRangeUse = exports.annotationInvalidArgumentCount = exports.decoratorInvalidContext = exports.unsupportedOverloadAssignment = exports.unsupportedSelfFunctionConversion = exports.unsupportedNoSelfFunctionConversion = exports.forbiddenForIn = exports.unsupportedNodeKind = void 0;
 const ts = __importStar(require("typescript"));
 const lua = __importStar(require("../../LuaAST"));
 const CompilerOptions_1 = require("../../CompilerOptions");
@@ -72,7 +72,7 @@ exports.invalidRangeControlVariable = createErrorDiagnosticFactory("For loop usi
 exports.invalidMultiIterableWithoutDestructuring = createErrorDiagnosticFactory("LuaIterable with a LuaMultiReturn return value type must be destructured.");
 exports.invalidPairsIterableWithoutDestructuring = createErrorDiagnosticFactory("LuaPairsIterable type must be destructured in a for...of statement.");
 exports.unsupportedAccessorInObjectLiteral = createErrorDiagnosticFactory("Accessors in object literal are not supported.");
-exports.unsupportedRightShiftOperator = createErrorDiagnosticFactory("Right shift operator is not supported for target Lua 5.3. Use `>>>` instead.");
+exports.unsupportedRightShiftOperator = createErrorDiagnosticFactory("Signed right shift `>>` is not supported on Lua 5.3+: Lua's native `>>` is logical (zero-fill) on 64-bit integers, with no built-in arithmetic shift. Use `>>>` if you don't need sign extension, or write your own helper.");
 const getLuaTargetName = (version) => (version === CompilerOptions_1.LuaTarget.LuaJIT ? "LuaJIT" : `Lua ${version}`);
 exports.unsupportedForTarget = createErrorDiagnosticFactory((functionality, version) => `${functionality} is/are not supported for target ${getLuaTargetName(version)}.`);
 exports.unsupportedForTargetButOverrideAvailable = createErrorDiagnosticFactory((functionality, version, optionName) => `As a precaution, ${functionality} is/are not supported for target ${getLuaTargetName(version)} due to language features/limitations. ` +
@@ -90,6 +90,8 @@ exports.annotationDeprecated = createWarningDiagnosticFactory((kind) => `'@${kin
 exports.truthyOnlyConditionalValue = createWarningDiagnosticFactory("Only false and nil evaluate to 'false' in Lua, everything else is considered 'true'. Explicitly compare the value with ===.");
 exports.notAllowedOptionalAssignment = createErrorDiagnosticFactory("The left-hand side of an assignment expression may not be an optional property access.");
 exports.awaitMustBeInAsyncFunction = createErrorDiagnosticFactory("Await can only be used inside async functions.");
+exports.unsupportedAsyncGenerator = createErrorDiagnosticFactory("Async generator functions are not supported.");
+exports.unsupportedForAwaitOf = createErrorDiagnosticFactory("'for await...of' loops are not supported.");
 exports.unsupportedBuiltinOptionalCall = createErrorDiagnosticFactory("Optional calls are not supported for builtin or language extension functions.");
 exports.unsupportedOptionalCompileMembersOnly = createErrorDiagnosticFactory("Optional calls are not supported on enums marked with @compileMembersOnly.");
 exports.undefinedInArrayLiteral = createErrorDiagnosticFactory("Array literals may not contain undefined or null.");

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

@@ -155,6 +155,13 @@ function computeDeclarationContextType(context, signatureDeclaration) {
     if (signatureDeclaration.parent && ts.isTypeParameterDeclaration(signatureDeclaration.parent)) {
         return ContextType.NonVoid;
     }
+    // Call signature inside a class or interface respects @noSelf on the enclosing class/interface
+    if (ts.isCallSignatureDeclaration(signatureDeclaration)) {
+        const scopeDeclaration = (0, typescript_1.findFirstNodeAbove)(signatureDeclaration, (n) => ts.isClassDeclaration(n) || ts.isClassExpression(n) || ts.isInterfaceDeclaration(n));
+        if (scopeDeclaration !== undefined && (0, annotations_1.getNodeAnnotations)(scopeDeclaration).has(annotations_1.AnnotationKind.NoSelf)) {
+            return ContextType.Void;
+        }
+    }
     // When using --noImplicitSelf and the signature is defined in a file targeted by the program apply the @noSelf rule.
     const program = context.program;
     const options = program.getCompilerOptions();

package/dist/transformation/visitors/function.js

@@ -54,6 +54,7 @@ const lualib_1 = require("../utils/lualib");
 const preceding_statements_1 = require("../utils/preceding-statements");
 const scope_1 = require("../utils/scope");
 const typescript_1 = require("../utils/typescript");
+const diagnostics_1 = require("../utils/diagnostics");
 const async_await_1 = require("./async-await");
 const identifier_1 = require("./identifier");
 const return_1 = require("./return");
@@ -197,6 +198,9 @@ function transformParameters(context, parameters, functionContext) {
 function transformFunctionToExpression(context, node) {
     var _a;
     (0, utils_1.assert)(node.body);
+    if (node.asteriskToken && (0, async_await_1.isAsyncFunction)(node)) {
+        context.diagnostics.push((0, diagnostics_1.unsupportedAsyncGenerator)(node));
+    }
     const type = context.checker.getTypeAtLocation(node);
     let functionContext;
     const firstParam = node.parameters[0];

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

@@ -42,6 +42,7 @@ const iterable_1 = require("../language-extensions/iterable");
 const range_1 = require("../language-extensions/range");
 const utils_1 = require("./utils");
 const language_extensions_1 = require("../../utils/language-extensions");
+const diagnostics_1 = require("../../utils/diagnostics");
 const utils_2 = require("../../../utils");
 function transformForOfArrayStatement(context, statement, block) {
     const valueVariable = (0, utils_1.transformForInitializer)(context, statement.initializer, block);
@@ -56,6 +57,9 @@ function transformForOfIteratorStatement(context, statement, block) {
     return lua.createForInStatement(block, [lua.createAnonymousIdentifier(), valueVariable], [iterable], statement);
 }
 const transformForOfStatement = (node, context) => {
+    if (node.awaitModifier) {
+        context.diagnostics.push((0, diagnostics_1.unsupportedForAwaitOf)(node.awaitModifier));
+    }
     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);

package/dist/transpilation/resolve.js

@@ -36,6 +36,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveDependencies = resolveDependencies;
 const path = __importStar(require("path"));
 const resolve = __importStar(require("enhanced-resolve"));
+const ts = __importStar(require("typescript"));
 const fs = __importStar(require("fs"));
 const source_map_1 = require("source-map");
 const transpiler_1 = require("./transpiler");
@@ -195,13 +196,9 @@ class ResolutionContext {
             if (resolvedNodeModulesFile)
                 return resolvedNodeModulesFile;
         }
-        // Check if file is a file in the project
-        const resolvedPath = this.formatPathToFile(dependencyPath, requiringFile);
-        const fileFromPath = this.getFileFromPath(resolvedPath);
-        if (fileFromPath)
-            return fileFromPath;
-        if (this.options.paths) {
-            // If no file found yet and paths are present, try to find project file via paths mappings
+        // Bare specifiers: check paths mappings first, matching TypeScript's resolution order.
+        // TS never applies paths to relative imports, so skip for those.
+        if (!ts.isExternalModuleNameRelative(dependencyPath) && this.options.paths) {
             // When baseUrl is not set, resolve paths relative to the tsconfig directory (TS 6.0+ behavior)
             const pathsBase = (_a = this.options.baseUrl) !== null && _a !== void 0 ? _a : (this.options.configFilePath ? path.dirname(this.options.configFilePath) : undefined);
             if (pathsBase) {
@@ -210,6 +207,11 @@ class ResolutionContext {
                     return fileFromPaths;
             }
         }
+        // Check if file is a file in the project
+        const resolvedPath = this.formatPathToFile(dependencyPath, requiringFile);
+        const fileFromPath = this.getFileFromPath(resolvedPath);
+        if (fileFromPath)
+            return fileFromPath;
         // Not a TS file in our project sources, use resolver to check if we can find dependency
         try {
             const resolveResult = resolver.resolveSync({}, fileDirectory, dependencyPath);

package/package.json

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