typescript-to-lua 1.33.2 → 1.35.0

package/dist/lualib/5.0/lualib_bundle.lua

@@ -657,7 +657,6 @@ do
         self.state = 0
         self.fulfilledCallbacks = {}
         self.rejectedCallbacks = {}
-        self.finallyCallbacks = {}
         local success, ____error = ____pcall(
             executor,
             nil,
@@ -707,14 +706,17 @@ do
         return self["then"](self, nil, onRejected)
     end
     function __TS__Promise.prototype.finally(self, onFinally)
-        if onFinally then
-            local ____self_finallyCallbacks_2 = self.finallyCallbacks
-            ____self_finallyCallbacks_2[table.getn(____self_finallyCallbacks_2) + 1] = onFinally
-            if self.state ~= 0 then
+        return self["then"](
+            self,
+            onFinally and (function(____, value)
                 onFinally(nil)
-            end
-        end
-        return self
+                return value
+            end) or nil,
+            onFinally and (function(____, reason)
+                onFinally(nil)
+                error(reason, 0)
+            end) or nil
+        )
     end
     function __TS__Promise.prototype.resolve(self, value)
         if isPromiseLike(value) then
@@ -738,22 +740,11 @@ do
     end
     function __TS__Promise.prototype.invokeCallbacks(self, callbacks, value)
         local callbacksLength = table.getn(callbacks)
-        local finallyCallbacks = self.finallyCallbacks
-        local finallyCallbacksLength = table.getn(finallyCallbacks)
         if callbacksLength ~= 0 then
             for i = 1, callbacksLength - 1 do
                 callbacks[i](callbacks, value)
             end
-            if finallyCallbacksLength == 0 then
-                return callbacks[callbacksLength](callbacks, value)
-            end
-            callbacks[callbacksLength](callbacks, value)
-        end
-        if finallyCallbacksLength ~= 0 then
-            for i = 1, finallyCallbacksLength - 1 do
-                finallyCallbacks[i](finallyCallbacks)
-            end
-            return finallyCallbacks[finallyCallbacksLength](finallyCallbacks)
+            return callbacks[callbacksLength](callbacks, value)
         end
     end
     function __TS__Promise.prototype.createPromiseResolvingCallback(self, f, resolve, reject)
@@ -908,8 +899,10 @@ local function __TS__ObjectAssign(target, ...)
     local sources = arg
     for i = 1, table.getn(sources) do
         local source = sources[i]
-        for key in pairs(source) do
-            target[key] = source[key]
+        if type(source) == "table" then
+            for key in pairs(source) do
+                target[key] = source[key]
+            end
         end
     end
     return target
@@ -1015,6 +1008,13 @@ do
             metatable = {}
             setmetatable(target, metatable)
         end
+        if not isPrototype and not rawget(metatable, "_isOwnDescriptorMetatable") then
+            local instanceMetatable = {}
+            instanceMetatable._isOwnDescriptorMetatable = true
+            setmetatable(instanceMetatable, metatable)
+            setmetatable(target, instanceMetatable)
+            metatable = instanceMetatable
+        end
         local value = rawget(target, key)
         if value ~= nil then
             rawset(target, key, nil)
@@ -1412,46 +1412,70 @@ do
         return self:entries()
     end
     function Map.prototype.entries(self)
+        local function getFirstKey()
+            return self.firstKey
+        end
         local items = self.items
         local nextKey = self.nextKey
-        local key = self.firstKey
+        local key
+        local started = false
         return {
             [Symbol.iterator] = function(self)
                 return self
             end,
             next = function(self)
-                local result = {done = not key, value = {key, items[key]}}
-                key = nextKey[key]
-                return result
+                if not started then
+                    started = true
+                    key = getFirstKey(nil)
+                else
+                    key = nextKey[key]
+                end
+                return {done = not key, value = {key, items[key]}}
             end
         }
     end
     function Map.prototype.keys(self)
+        local function getFirstKey()
+            return self.firstKey
+        end
         local nextKey = self.nextKey
-        local key = self.firstKey
+        local key
+        local started = false
         return {
             [Symbol.iterator] = function(self)
                 return self
             end,
             next = function(self)
-                local result = {done = not key, value = key}
-                key = nextKey[key]
-                return result
+                if not started then
+                    started = true
+                    key = getFirstKey(nil)
+                else
+                    key = nextKey[key]
+                end
+                return {done = not key, value = key}
             end
         }
     end
     function Map.prototype.values(self)
+        local function getFirstKey()
+            return self.firstKey
+        end
         local items = self.items
         local nextKey = self.nextKey
-        local key = self.firstKey
+        local key
+        local started = false
         return {
             [Symbol.iterator] = function(self)
                 return self
             end,
             next = function(self)
-                local result = {done = not key, value = items[key]}
-                key = nextKey[key]
-                return result
+                if not started then
+                    started = true
+                    key = getFirstKey(nil)
+                else
+                    key = nextKey[key]
+                end
+                return {done = not key, value = items[key]}
             end
         }
     end
@@ -2068,44 +2092,68 @@ do
         return self:values()
     end
     function Set.prototype.entries(self)
+        local function getFirstKey()
+            return self.firstKey
+        end
         local nextKey = self.nextKey
-        local key = self.firstKey
+        local key
+        local started = false
         return {
             [Symbol.iterator] = function(self)
                 return self
             end,
             next = function(self)
-                local result = {done = not key, value = {key, key}}
-                key = nextKey[key]
-                return result
+                if not started then
+                    started = true
+                    key = getFirstKey(nil)
+                else
+                    key = nextKey[key]
+                end
+                return {done = not key, value = {key, key}}
             end
         }
     end
     function Set.prototype.keys(self)
+        local function getFirstKey()
+            return self.firstKey
+        end
         local nextKey = self.nextKey
-        local key = self.firstKey
+        local key
+        local started = false
         return {
             [Symbol.iterator] = function(self)
                 return self
             end,
             next = function(self)
-                local result = {done = not key, value = key}
-                key = nextKey[key]
-                return result
+                if not started then
+                    started = true
+                    key = getFirstKey(nil)
+                else
+                    key = nextKey[key]
+                end
+                return {done = not key, value = key}
             end
         }
     end
     function Set.prototype.values(self)
+        local function getFirstKey()
+            return self.firstKey
+        end
         local nextKey = self.nextKey
-        local key = self.firstKey
+        local key
+        local started = false
         return {
             [Symbol.iterator] = function(self)
                 return self
             end,
             next = function(self)
-                local result = {done = not key, value = key}
-                key = nextKey[key]
-                return result
+                if not started then
+                    started = true
+                    key = getFirstKey(nil)
+                else
+                    key = nextKey[key]
+                end
+                return {done = not key, value = key}
             end
         }
     end
@@ -2309,7 +2357,7 @@ local function __TS__SourceMapTraceBack(fileName, sourceMap)
             end
             local result = string.gsub(
                 trace,
-                "(%S+)%.lua:(%d+)",
+                "([^%s<]+)%.lua:(%d+)",
                 function(file, line) return replacer(nil, file .. ".lua", file .. ".ts", line) end
             )
             local function stringReplacer(____, file, line)

package/dist/lualib/universal/Map.lua

@@ -93,46 +93,70 @@ do
         return self:entries()
     end
     function Map.prototype.entries(self)
+        local function getFirstKey()
+            return self.firstKey
+        end
         local items = self.items
         local nextKey = self.nextKey
-        local key = self.firstKey
+        local key
+        local started = false
         return {
             [Symbol.iterator] = function(self)
                 return self
             end,
             next = function(self)
-                local result = {done = not key, value = {key, items[key]}}
-                key = nextKey[key]
-                return result
+                if not started then
+                    started = true
+                    key = getFirstKey(nil)
+                else
+                    key = nextKey[key]
+                end
+                return {done = not key, value = {key, items[key]}}
             end
         }
     end
     function Map.prototype.keys(self)
+        local function getFirstKey()
+            return self.firstKey
+        end
         local nextKey = self.nextKey
-        local key = self.firstKey
+        local key
+        local started = false
         return {
             [Symbol.iterator] = function(self)
                 return self
             end,
             next = function(self)
-                local result = {done = not key, value = key}
-                key = nextKey[key]
-                return result
+                if not started then
+                    started = true
+                    key = getFirstKey(nil)
+                else
+                    key = nextKey[key]
+                end
+                return {done = not key, value = key}
             end
         }
     end
     function Map.prototype.values(self)
+        local function getFirstKey()
+            return self.firstKey
+        end
         local items = self.items
         local nextKey = self.nextKey
-        local key = self.firstKey
+        local key
+        local started = false
         return {
             [Symbol.iterator] = function(self)
                 return self
             end,
             next = function(self)
-                local result = {done = not key, value = items[key]}
-                key = nextKey[key]
-                return result
+                if not started then
+                    started = true
+                    key = getFirstKey(nil)
+                else
+                    key = nextKey[key]
+                end
+                return {done = not key, value = items[key]}
             end
         }
     end

package/dist/lualib/universal/ObjectAssign.lua

@@ -2,8 +2,10 @@ local function __TS__ObjectAssign(target, ...)
     local sources = {...}
     for i = 1, #sources do
         local source = sources[i]
-        for key in pairs(source) do
-            target[key] = source[key]
+        if type(source) == "table" then
+            for key in pairs(source) do
+                target[key] = source[key]
+            end
         end
     end
     return target

package/dist/lualib/universal/Promise.lua

@@ -25,7 +25,6 @@ do
         self.state = 0
         self.fulfilledCallbacks = {}
         self.rejectedCallbacks = {}
-        self.finallyCallbacks = {}
         local success, ____error = ____pcall(
             executor,
             nil,
@@ -75,14 +74,17 @@ do
         return self["then"](self, nil, onRejected)
     end
     function __TS__Promise.prototype.finally(self, onFinally)
-        if onFinally then
-            local ____self_finallyCallbacks_2 = self.finallyCallbacks
-            ____self_finallyCallbacks_2[#____self_finallyCallbacks_2 + 1] = onFinally
-            if self.state ~= 0 then
+        return self["then"](
+            self,
+            onFinally and (function(____, value)
                 onFinally(nil)
-            end
-        end
-        return self
+                return value
+            end) or nil,
+            onFinally and (function(____, reason)
+                onFinally(nil)
+                error(reason, 0)
+            end) or nil
+        )
     end
     function __TS__Promise.prototype.resolve(self, value)
         if isPromiseLike(value) then
@@ -106,22 +108,11 @@ do
     end
     function __TS__Promise.prototype.invokeCallbacks(self, callbacks, value)
         local callbacksLength = #callbacks
-        local finallyCallbacks = self.finallyCallbacks
-        local finallyCallbacksLength = #finallyCallbacks
         if callbacksLength ~= 0 then
             for i = 1, callbacksLength - 1 do
                 callbacks[i](callbacks, value)
             end
-            if finallyCallbacksLength == 0 then
-                return callbacks[callbacksLength](callbacks, value)
-            end
-            callbacks[callbacksLength](callbacks, value)
-        end
-        if finallyCallbacksLength ~= 0 then
-            for i = 1, finallyCallbacksLength - 1 do
-                finallyCallbacks[i](finallyCallbacks)
-            end
-            return finallyCallbacks[finallyCallbacksLength](finallyCallbacks)
+            return callbacks[callbacksLength](callbacks, value)
         end
     end
     function __TS__Promise.prototype.createPromiseResolvingCallback(self, f, resolve, reject)

package/dist/lualib/universal/Set.lua

@@ -85,44 +85,68 @@ do
         return self:values()
     end
     function Set.prototype.entries(self)
+        local function getFirstKey()
+            return self.firstKey
+        end
         local nextKey = self.nextKey
-        local key = self.firstKey
+        local key
+        local started = false
         return {
             [Symbol.iterator] = function(self)
                 return self
             end,
             next = function(self)
-                local result = {done = not key, value = {key, key}}
-                key = nextKey[key]
-                return result
+                if not started then
+                    started = true
+                    key = getFirstKey(nil)
+                else
+                    key = nextKey[key]
+                end
+                return {done = not key, value = {key, key}}
             end
         }
     end
     function Set.prototype.keys(self)
+        local function getFirstKey()
+            return self.firstKey
+        end
         local nextKey = self.nextKey
-        local key = self.firstKey
+        local key
+        local started = false
         return {
             [Symbol.iterator] = function(self)
                 return self
             end,
             next = function(self)
-                local result = {done = not key, value = key}
-                key = nextKey[key]
-                return result
+                if not started then
+                    started = true
+                    key = getFirstKey(nil)
+                else
+                    key = nextKey[key]
+                end
+                return {done = not key, value = key}
             end
         }
     end
     function Set.prototype.values(self)
+        local function getFirstKey()
+            return self.firstKey
+        end
         local nextKey = self.nextKey
-        local key = self.firstKey
+        local key
+        local started = false
         return {
             [Symbol.iterator] = function(self)
                 return self
             end,
             next = function(self)
-                local result = {done = not key, value = key}
-                key = nextKey[key]
-                return result
+                if not started then
+                    started = true
+                    key = getFirstKey(nil)
+                else
+                    key = nextKey[key]
+                end
+                return {done = not key, value = key}
             end
         }
     end

package/dist/lualib/universal/SetDescriptor.lua

@@ -31,6 +31,13 @@ do
             metatable = {}
             setmetatable(target, metatable)
         end
+        if not isPrototype and not rawget(metatable, "_isOwnDescriptorMetatable") then
+            local instanceMetatable = {}
+            instanceMetatable._isOwnDescriptorMetatable = true
+            setmetatable(instanceMetatable, metatable)
+            setmetatable(target, instanceMetatable)
+            metatable = instanceMetatable
+        end
         local value = rawget(target, key)
         if value ~= nil then
             rawset(target, key, nil)

package/dist/lualib/universal/SourceMapTraceBack.lua

@@ -29,7 +29,7 @@ local function __TS__SourceMapTraceBack(fileName, sourceMap)
             end
             local result = string.gsub(
                 trace,
-                "(%S+)%.lua:(%d+)",
+                "([^%s<]+)%.lua:(%d+)",
                 function(file, line) return replacer(nil, file .. ".lua", file .. ".ts", line) end
             )
             local function stringReplacer(____, file, line)