typescript-to-lua 1.2.0 → 1.3.3

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 1.3.0
+
+- Added `LuaPairsIterable` language extension to mark objects as iterable with Lua's `pairs`.
+- Added support for properties on functions.
+- Unicode is no longer escaped and used as-is for `"luaTarget": "JIT"`.
+- Fixed some bugs related to destructuring in loops and function parameters.
+- Fixed incorrect global being generated for some `try` statements.
+- Fixed some incorrect behavior for `??` and `? :` when generic types were involved.
+- Added missing `...` optimization in cases where casts or parentheses are used.
+- Fixed a bug for `Promise` when resolving with another Promise. This also fixes some unexpected behavior with `async` which is built with Promises.
+- Fixed `async` functions not aborting after returning from a `catch` block.
+
 ## 1.2.0
 
 - Upgraded to TypeScript 4.5.x.

package/dist/LuaLib.d.ts

@@ -42,6 +42,7 @@ export declare enum LuaLibFeature {
     Iterator = "Iterator",
     Map = "Map",
     MathAtan2 = "MathAtan2",
+    MathSign = "MathSign",
     New = "New",
     Number = "Number",
     NumberIsFinite = "NumberIsFinite",

package/dist/LuaLib.js

@@ -46,6 +46,7 @@ var LuaLibFeature;
     LuaLibFeature["Iterator"] = "Iterator";
     LuaLibFeature["Map"] = "Map";
     LuaLibFeature["MathAtan2"] = "MathAtan2";
+    LuaLibFeature["MathSign"] = "MathSign";
     LuaLibFeature["New"] = "New";
     LuaLibFeature["Number"] = "Number";
     LuaLibFeature["NumberIsFinite"] = "NumberIsFinite";
@@ -104,7 +105,7 @@ const luaLibDependencies = {
     ArrayConcat: [LuaLibFeature.ArrayIsArray],
     ArrayFlat: [LuaLibFeature.ArrayConcat, LuaLibFeature.ArrayIsArray],
     ArrayFlatMap: [LuaLibFeature.ArrayConcat, LuaLibFeature.ArrayIsArray],
-    Await: [LuaLibFeature.InstanceOf, LuaLibFeature.New],
+    Await: [LuaLibFeature.InstanceOf, LuaLibFeature.New, LuaLibFeature.Promise],
     Decorate: [LuaLibFeature.ObjectGetOwnPropertyDescriptor, LuaLibFeature.SetDescriptor, LuaLibFeature.ObjectAssign],
     DelegatedYield: [LuaLibFeature.StringAccess],
     Delete: [LuaLibFeature.ObjectGetOwnPropertyDescriptors, LuaLibFeature.Error, LuaLibFeature.New],

package/dist/LuaPrinter.js

@@ -32,7 +32,7 @@ exports.tstlHeader = "--[[ Generated with https://github.com/TypeScriptToLua/Typ
  * `foo.bar` => passes (`function foo.bar()` is valid)
  * `getFoo().bar` => fails (`function getFoo().bar()` would be illegal)
  */
-const isValidLuaFunctionDeclarationName = (str) => /^[a-zA-Z0-9_.]+$/.test(str);
+const isValidLuaFunctionDeclarationName = (str, options) => ((0, safe_names_1.shouldAllowUnicode)(options) ? /^[a-zA-Z0-9_\u00FF-\uFFFD.]+$/ : /^[a-zA-Z0-9_.]+$/).test(str);
 /**
  * Returns true if expression contains no function calls.
  */
@@ -294,7 +294,7 @@ class LuaPrinter {
             (statement.right[0].flags & lua.FunctionExpressionFlags.Declaration) !== 0) {
             // Use `function foo()` instead of `foo = function()`
             const name = this.printExpression(statement.left[0]);
-            if (isValidLuaFunctionDeclarationName(name.toString())) {
+            if (isValidLuaFunctionDeclarationName(name.toString(), this.options)) {
                 chunks.push(this.printFunctionDefinition(statement));
                 return this.createSourceNode(statement, chunks);
             }
@@ -494,7 +494,7 @@ class LuaPrinter {
         const chunks = [];
         const value = this.printExpression(expression.value);
         if (expression.key) {
-            if (lua.isStringLiteral(expression.key) && (0, safe_names_1.isValidLuaIdentifier)(expression.key.value)) {
+            if (lua.isStringLiteral(expression.key) && (0, safe_names_1.isValidLuaIdentifier)(expression.key.value, this.options)) {
                 chunks.push(expression.key.value, " = ", value);
             }
             else {
@@ -566,7 +566,7 @@ class LuaPrinter {
     printTableIndexExpression(expression) {
         const chunks = [];
         chunks.push(this.printExpressionInParenthesesIfNeeded(expression.table));
-        if (lua.isStringLiteral(expression.index) && (0, safe_names_1.isValidLuaIdentifier)(expression.index.value)) {
+        if (lua.isStringLiteral(expression.index) && (0, safe_names_1.isValidLuaIdentifier)(expression.index.value, this.options)) {
             chunks.push(".", this.createSourceNode(expression.index, expression.index.value));
         }
         else {

package/dist/lualib/Await.lua

@@ -23,11 +23,15 @@ function __TS__AsyncAwaiter(generator)
             function rejected(self, handler)
                 if handler then
                     return function(____, value)
-                        local success, valueOrError = pcall(handler, value)
+                        local success, hasReturnedOrError, returnedValue = pcall(handler, value)
                         if success then
-                            step(_G, valueOrError, handler)
+                            if hasReturnedOrError then
+                                resolve(_G, returnedValue)
+                            else
+                                step(_G, hasReturnedOrError, handler)
+                            end
                         else
-                            reject(_G, valueOrError)
+                            reject(_G, hasReturnedOrError)
                         end
                     end
                 else

package/dist/lualib/CloneDescriptor.lua

@@ -1,10 +1,10 @@
-local value
-local writable
-local set
-local get
-local configurable
-local enumerable
 function __TS__CloneDescriptor(____bindingPattern0)
+    local value
+    local writable
+    local set
+    local get
+    local configurable
+    local enumerable
     enumerable = ____bindingPattern0.enumerable
     configurable = ____bindingPattern0.configurable
     get = ____bindingPattern0.get

package/dist/lualib/MathSign.lua

@@ -0,0 +1,8 @@
+function __TS__MathSign(val)
+    if val > 0 then
+        return 1
+    elseif val < 0 then
+        return -1
+    end
+    return 0
+end

package/dist/lualib/Promise.lua

@@ -39,7 +39,7 @@ function __TS__Promise.prototype.____constructor(self, executor)
             )
         end)
         if not ____try then
-            ____hasReturned, ____returnValue = ____catch(____hasReturned)
+            ____catch(____hasReturned)
         end
     end
 end
@@ -110,6 +110,14 @@ function __TS__Promise.prototype.finally(self, onFinally)
     return self
 end
 function __TS__Promise.prototype.resolve(self, data)
+    if __TS__InstanceOf(data, __TS__Promise) then
+        data["then"](
+            data,
+            function(____, v) return self:resolve(v) end,
+            function(____, err) return self:reject(err) end
+        )
+        return
+    end
     if self.state == __TS__PromiseState.Pending then
         self.state = __TS__PromiseState.Fulfilled
         self.value = data
@@ -147,7 +155,7 @@ function __TS__Promise.prototype.createPromiseResolvingCallback(self, f, resolve
                 )
             end)
             if not ____try then
-                ____hasReturned, ____returnValue = ____catch(____hasReturned)
+                ____catch(____hasReturned)
             end
         end
     end

package/dist/lualib/lualib_bundle.lua

@@ -504,6 +504,210 @@ function __TS__New(target, ...)
     return instance
 end
 
+function __TS__Class(self)
+    local c = {prototype = {}}
+    c.prototype.__index = c.prototype
+    c.prototype.constructor = c
+    return c
+end
+
+__TS__Unpack = table.unpack or unpack
+
+function __TS__FunctionBind(fn, thisArg, ...)
+    local boundArgs = {...}
+    return function(____, ...)
+        local args = {...}
+        do
+            local i = 0
+            while i < #boundArgs do
+                table.insert(args, i + 1, boundArgs[i + 1])
+                i = i + 1
+            end
+        end
+        return fn(
+            thisArg,
+            __TS__Unpack(args)
+        )
+    end
+end
+
+__TS__PromiseState = __TS__PromiseState or ({})
+__TS__PromiseState.Pending = 0
+__TS__PromiseState[__TS__PromiseState.Pending] = "Pending"
+__TS__PromiseState.Fulfilled = 1
+__TS__PromiseState[__TS__PromiseState.Fulfilled] = "Fulfilled"
+__TS__PromiseState.Rejected = 2
+__TS__PromiseState[__TS__PromiseState.Rejected] = "Rejected"
+function __TS__PromiseDeferred(self)
+    local resolve
+    local reject
+    local promise = __TS__New(
+        __TS__Promise,
+        function(____, res, rej)
+            resolve = res
+            reject = rej
+        end
+    )
+    return {promise = promise, resolve = resolve, reject = reject}
+end
+function __TS__IsPromiseLike(self, thing)
+    return __TS__InstanceOf(thing, __TS__Promise)
+end
+__TS__Promise = __TS__Class()
+__TS__Promise.name = "__TS__Promise"
+function __TS__Promise.prototype.____constructor(self, executor)
+    self.state = __TS__PromiseState.Pending
+    self.fulfilledCallbacks = {}
+    self.rejectedCallbacks = {}
+    self.finallyCallbacks = {}
+    do
+        local function ____catch(e)
+            self:reject(e)
+        end
+        local ____try, ____hasReturned = pcall(function()
+            executor(
+                _G,
+                __TS__FunctionBind(self.resolve, self),
+                __TS__FunctionBind(self.reject, self)
+            )
+        end)
+        if not ____try then
+            ____catch(____hasReturned)
+        end
+    end
+end
+function __TS__Promise.resolve(data)
+    local promise = __TS__New(
+        __TS__Promise,
+        function()
+        end
+    )
+    promise.state = __TS__PromiseState.Fulfilled
+    promise.value = data
+    return promise
+end
+function __TS__Promise.reject(reason)
+    local promise = __TS__New(
+        __TS__Promise,
+        function()
+        end
+    )
+    promise.state = __TS__PromiseState.Rejected
+    promise.rejectionReason = reason
+    return promise
+end
+__TS__Promise.prototype["then"] = function(self, onFulfilled, onRejected)
+    local ____TS__PromiseDeferred_result_0 = __TS__PromiseDeferred(_G)
+    local promise = ____TS__PromiseDeferred_result_0.promise
+    local resolve = ____TS__PromiseDeferred_result_0.resolve
+    local reject = ____TS__PromiseDeferred_result_0.reject
+    local isFulfilled = self.state == __TS__PromiseState.Fulfilled
+    local isRejected = self.state == __TS__PromiseState.Rejected
+    if onFulfilled then
+        local internalCallback = self:createPromiseResolvingCallback(onFulfilled, resolve, reject)
+        __TS__ArrayPush(self.fulfilledCallbacks, internalCallback)
+        if isFulfilled then
+            internalCallback(_G, self.value)
+        end
+    else
+        __TS__ArrayPush(
+            self.fulfilledCallbacks,
+            function() return resolve(_G, nil) end
+        )
+    end
+    if onRejected then
+        local internalCallback = self:createPromiseResolvingCallback(onRejected, resolve, reject)
+        __TS__ArrayPush(self.rejectedCallbacks, internalCallback)
+        if isRejected then
+            internalCallback(_G, self.rejectionReason)
+        end
+    end
+    if isFulfilled then
+        resolve(_G, self.value)
+    end
+    if isRejected then
+        reject(_G, self.rejectionReason)
+    end
+    return promise
+end
+function __TS__Promise.prototype.catch(self, onRejected)
+    return self["then"](self, nil, onRejected)
+end
+function __TS__Promise.prototype.finally(self, onFinally)
+    if onFinally then
+        __TS__ArrayPush(self.finallyCallbacks, onFinally)
+        if self.state ~= __TS__PromiseState.Pending then
+            onFinally(_G)
+        end
+    end
+    return self
+end
+function __TS__Promise.prototype.resolve(self, data)
+    if __TS__InstanceOf(data, __TS__Promise) then
+        data["then"](
+            data,
+            function(____, v) return self:resolve(v) end,
+            function(____, err) return self:reject(err) end
+        )
+        return
+    end
+    if self.state == __TS__PromiseState.Pending then
+        self.state = __TS__PromiseState.Fulfilled
+        self.value = data
+        for ____, callback in ipairs(self.fulfilledCallbacks) do
+            callback(_G, data)
+        end
+        for ____, callback in ipairs(self.finallyCallbacks) do
+            callback(_G)
+        end
+    end
+end
+function __TS__Promise.prototype.reject(self, reason)
+    if self.state == __TS__PromiseState.Pending then
+        self.state = __TS__PromiseState.Rejected
+        self.rejectionReason = reason
+        for ____, callback in ipairs(self.rejectedCallbacks) do
+            callback(_G, reason)
+        end
+        for ____, callback in ipairs(self.finallyCallbacks) do
+            callback(_G)
+        end
+    end
+end
+function __TS__Promise.prototype.createPromiseResolvingCallback(self, f, resolve, reject)
+    return function(____, value)
+        do
+            local function ____catch(e)
+                reject(_G, e)
+            end
+            local ____try, ____hasReturned = pcall(function()
+                self:handleCallbackData(
+                    f(_G, value),
+                    resolve,
+                    reject
+                )
+            end)
+            if not ____try then
+                ____catch(____hasReturned)
+            end
+        end
+    end
+end
+function __TS__Promise.prototype.handleCallbackData(self, data, resolve, reject)
+    if __TS__IsPromiseLike(_G, data) then
+        local nextpromise = data
+        if nextpromise.state == __TS__PromiseState.Fulfilled then
+            resolve(_G, nextpromise.value)
+        elseif nextpromise.state == __TS__PromiseState.Rejected then
+            reject(_G, nextpromise.rejectionReason)
+        else
+            data["then"](data, resolve, reject)
+        end
+    else
+        resolve(_G, data)
+    end
+end
+
 function __TS__AsyncAwaiter(generator)
     return __TS__New(
         __TS__Promise,
@@ -529,11 +733,15 @@ function __TS__AsyncAwaiter(generator)
             function rejected(self, handler)
                 if handler then
                     return function(____, value)
-                        local success, valueOrError = pcall(handler, value)
+                        local success, hasReturnedOrError, returnedValue = pcall(handler, value)
                         if success then
-                            step(_G, valueOrError, handler)
+                            if hasReturnedOrError then
+                                resolve(_G, returnedValue)
+                            else
+                                step(_G, hasReturnedOrError, handler)
+                            end
                         else
-                            reject(_G, valueOrError)
+                            reject(_G, hasReturnedOrError)
                         end
                     end
                 else
@@ -568,13 +776,6 @@ function __TS__Await(errorHandler, thing)
     return coroutine.yield(errorHandler, thing)
 end
 
-function __TS__Class(self)
-    local c = {prototype = {}}
-    c.prototype.__index = c.prototype
-    c.prototype.constructor = c
-    return c
-end
-
 function __TS__ClassExtends(target, base)
     target.____super = base
     local staticMetatable = setmetatable({__index = base}, base)
@@ -600,13 +801,13 @@ function __TS__ClassExtends(target, base)
     end
 end
 
-local value
-local writable
-local set
-local get
-local configurable
-local enumerable
 function __TS__CloneDescriptor(____bindingPattern0)
+    local value
+    local writable
+    local set
+    local get
+    local configurable
+    local enumerable
     enumerable = ____bindingPattern0.enumerable
     configurable = ____bindingPattern0.configurable
     get = ____bindingPattern0.get
@@ -919,26 +1120,6 @@ function __TS__DelegatedYield(iterable)
     end
 end
 
-__TS__Unpack = table.unpack or unpack
-
-function __TS__FunctionBind(fn, thisArg, ...)
-    local boundArgs = {...}
-    return function(____, ...)
-        local args = {...}
-        do
-            local i = 0
-            while i < #boundArgs do
-                table.insert(args, i + 1, boundArgs[i + 1])
-                i = i + 1
-            end
-        end
-        return fn(
-            thisArg,
-            __TS__Unpack(args)
-        )
-    end
-end
-
 function __TS__GeneratorIterator(self)
     return self
 end
@@ -1154,6 +1335,15 @@ Map = Map
 
 __TS__MathAtan2 = math.atan2 or math.atan
 
+function __TS__MathSign(val)
+    if val > 0 then
+        return 1
+    elseif val < 0 then
+        return -1
+    end
+    return 0
+end
+
 function __TS__Number(value)
     local valueType = type(value)
     if valueType == "number" then
@@ -1436,175 +1626,6 @@ function __TS__ParseInt(numberString, base)
     end
 end
 
-__TS__PromiseState = __TS__PromiseState or ({})
-__TS__PromiseState.Pending = 0
-__TS__PromiseState[__TS__PromiseState.Pending] = "Pending"
-__TS__PromiseState.Fulfilled = 1
-__TS__PromiseState[__TS__PromiseState.Fulfilled] = "Fulfilled"
-__TS__PromiseState.Rejected = 2
-__TS__PromiseState[__TS__PromiseState.Rejected] = "Rejected"
-function __TS__PromiseDeferred(self)
-    local resolve
-    local reject
-    local promise = __TS__New(
-        __TS__Promise,
-        function(____, res, rej)
-            resolve = res
-            reject = rej
-        end
-    )
-    return {promise = promise, resolve = resolve, reject = reject}
-end
-function __TS__IsPromiseLike(self, thing)
-    return __TS__InstanceOf(thing, __TS__Promise)
-end
-__TS__Promise = __TS__Class()
-__TS__Promise.name = "__TS__Promise"
-function __TS__Promise.prototype.____constructor(self, executor)
-    self.state = __TS__PromiseState.Pending
-    self.fulfilledCallbacks = {}
-    self.rejectedCallbacks = {}
-    self.finallyCallbacks = {}
-    do
-        local function ____catch(e)
-            self:reject(e)
-        end
-        local ____try, ____hasReturned = pcall(function()
-            executor(
-                _G,
-                __TS__FunctionBind(self.resolve, self),
-                __TS__FunctionBind(self.reject, self)
-            )
-        end)
-        if not ____try then
-            ____hasReturned, ____returnValue = ____catch(____hasReturned)
-        end
-    end
-end
-function __TS__Promise.resolve(data)
-    local promise = __TS__New(
-        __TS__Promise,
-        function()
-        end
-    )
-    promise.state = __TS__PromiseState.Fulfilled
-    promise.value = data
-    return promise
-end
-function __TS__Promise.reject(reason)
-    local promise = __TS__New(
-        __TS__Promise,
-        function()
-        end
-    )
-    promise.state = __TS__PromiseState.Rejected
-    promise.rejectionReason = reason
-    return promise
-end
-__TS__Promise.prototype["then"] = function(self, onFulfilled, onRejected)
-    local ____TS__PromiseDeferred_result_0 = __TS__PromiseDeferred(_G)
-    local promise = ____TS__PromiseDeferred_result_0.promise
-    local resolve = ____TS__PromiseDeferred_result_0.resolve
-    local reject = ____TS__PromiseDeferred_result_0.reject
-    local isFulfilled = self.state == __TS__PromiseState.Fulfilled
-    local isRejected = self.state == __TS__PromiseState.Rejected
-    if onFulfilled then
-        local internalCallback = self:createPromiseResolvingCallback(onFulfilled, resolve, reject)
-        __TS__ArrayPush(self.fulfilledCallbacks, internalCallback)
-        if isFulfilled then
-            internalCallback(_G, self.value)
-        end
-    else
-        __TS__ArrayPush(
-            self.fulfilledCallbacks,
-            function() return resolve(_G, nil) end
-        )
-    end
-    if onRejected then
-        local internalCallback = self:createPromiseResolvingCallback(onRejected, resolve, reject)
-        __TS__ArrayPush(self.rejectedCallbacks, internalCallback)
-        if isRejected then
-            internalCallback(_G, self.rejectionReason)
-        end
-    end
-    if isFulfilled then
-        resolve(_G, self.value)
-    end
-    if isRejected then
-        reject(_G, self.rejectionReason)
-    end
-    return promise
-end
-function __TS__Promise.prototype.catch(self, onRejected)
-    return self["then"](self, nil, onRejected)
-end
-function __TS__Promise.prototype.finally(self, onFinally)
-    if onFinally then
-        __TS__ArrayPush(self.finallyCallbacks, onFinally)
-        if self.state ~= __TS__PromiseState.Pending then
-            onFinally(_G)
-        end
-    end
-    return self
-end
-function __TS__Promise.prototype.resolve(self, data)
-    if self.state == __TS__PromiseState.Pending then
-        self.state = __TS__PromiseState.Fulfilled
-        self.value = data
-        for ____, callback in ipairs(self.fulfilledCallbacks) do
-            callback(_G, data)
-        end
-        for ____, callback in ipairs(self.finallyCallbacks) do
-            callback(_G)
-        end
-    end
-end
-function __TS__Promise.prototype.reject(self, reason)
-    if self.state == __TS__PromiseState.Pending then
-        self.state = __TS__PromiseState.Rejected
-        self.rejectionReason = reason
-        for ____, callback in ipairs(self.rejectedCallbacks) do
-            callback(_G, reason)
-        end
-        for ____, callback in ipairs(self.finallyCallbacks) do
-            callback(_G)
-        end
-    end
-end
-function __TS__Promise.prototype.createPromiseResolvingCallback(self, f, resolve, reject)
-    return function(____, value)
-        do
-            local function ____catch(e)
-                reject(_G, e)
-            end
-            local ____try, ____hasReturned = pcall(function()
-                self:handleCallbackData(
-                    f(_G, value),
-                    resolve,
-                    reject
-                )
-            end)
-            if not ____try then
-                ____hasReturned, ____returnValue = ____catch(____hasReturned)
-            end
-        end
-    end
-end
-function __TS__Promise.prototype.handleCallbackData(self, data, resolve, reject)
-    if __TS__IsPromiseLike(_G, data) then
-        local nextpromise = data
-        if nextpromise.state == __TS__PromiseState.Fulfilled then
-            resolve(_G, nextpromise.value)
-        elseif nextpromise.state == __TS__PromiseState.Rejected then
-            reject(_G, nextpromise.rejectionReason)
-        else
-            data["then"](data, resolve, reject)
-        end
-    else
-        resolve(_G, data)
-    end
-end
-
 function __TS__PromiseAll(iterable)
     local results = {}
     local toResolve = {}

package/dist/transformation/builtins/function.js

@@ -24,7 +24,7 @@ function transformFunctionPrototypeCall(context, node) {
             return (0, lualib_1.transformLuaLibFunction)(context, lualib_1.LuaLibFeature.FunctionBind, node, caller, ...params);
         case "call":
             return lua.createCallExpression(caller, params, node);
-        default:
+        case "toString":
             context.diagnostics.push((0, diagnostics_1.unsupportedProperty)(expression.name, "function", expressionName));
     }
 }
@@ -42,7 +42,10 @@ function transformFunctionProperty(context, node) {
             return contextType === function_context_1.ContextType.NonVoid
                 ? lua.createBinaryExpression(nparams, lua.createNumericLiteral(1), lua.SyntaxKind.SubtractionOperator)
                 : nparams;
-        default:
+        case "arguments":
+        case "caller":
+        case "displayName":
+        case "name":
             context.diagnostics.push((0, diagnostics_1.unsupportedProperty)(node.name, "function", node.name.text));
     }
 }