warscript 0.0.1-dev.dbb3984 → 0.0.1-dev.dc37dce

package/lualib_bundle.lua

@@ -653,7 +653,6 @@ do
         self.state = 0
         self.fulfilledCallbacks = {}
         self.rejectedCallbacks = {}
-        self.finallyCallbacks = {}
         local success, ____error = ____pcall(
             executor,
             nil,
@@ -703,14 +702,40 @@ 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
-                onFinally(nil)
-            end
+        if type(onFinally) ~= "function" then
+            return self["then"](self, onFinally, onFinally)
         end
-        return self
+        return self["then"](
+            self,
+            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)
         if isPromiseLike(value) then
@@ -734,22 +759,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)
@@ -904,8 +918,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
@@ -1011,6 +1027,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)
@@ -1383,46 +1406,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
@@ -1999,44 +2046,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
@@ -2241,7 +2312,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/net/socket.lua

@@ -28,13 +28,13 @@ function Socket.prototype.____constructor(self)
     onReceive[self[0]]:addListener(function(sender, data)
         local chunks = chunksByPlayer[sender]
         if chunks ~= nil then
+            chunksByPlayer[sender] = nil
             chunks[#chunks + 1] = data
             Event.invoke(
                 self.onMessage,
                 sender,
                 tableConcat(chunks)
             )
-            chunksByPlayer[sender] = nil
         else
             Event.invoke(self.onMessage, sender, data)
         end

package/objutil/buff.lua

@@ -20,7 +20,6 @@ local AbilityDefinitionInnerFire = ____ability.AbilityDefinitionInnerFire
 local AbilityDefinitionSearingArrows = ____ability.AbilityDefinitionSearingArrows
 local AbilityDefinitionSlowPoison = ____ability.AbilityDefinitionSlowPoison
 local ____unit = require("core.types.unit")
-local AttackType = ____unit.AttackType
 local DamageType = ____unit.DamageType
 local Unit = ____unit.Unit
 local ____dummy = require("core.dummy")
@@ -30,6 +29,8 @@ local ____timer = require("core.types.timer")
 local Timer = ____timer.Timer
 local ____exception = require("exception")
 local IllegalStateException = ____exception.IllegalStateException
+local ____linked_2Dmap = require("utility.linked-map")
+local LinkedMap = ____linked_2Dmap.LinkedMap
 local ____assert = _G.assert
 local ____pairs = _G.pairs
 ____exports.BuffDefinition = __TS__Class()
@@ -462,7 +463,7 @@ local buffs = setmetatable(
     {
         __mode = "k",
         __index = function(self, unit)
-            local ____table = {}
+            local ____table = __TS__New(LinkedMap)
             self[unit] = ____table
             return ____table
         end
@@ -495,7 +496,7 @@ function Buff.prototype.____constructor(self, unit, source, duration, level, pre
     end
     local constructor = self.constructor
     local instances = buffs[unit]
-    local instance = instances[constructor]
+    local instance = instances:get(constructor)
     if instance then
         instance:destroy()
         if not instance.destroyed then
@@ -508,7 +509,7 @@ function Buff.prototype.____constructor(self, unit, source, duration, level, pre
             )
         end
     end
-    instances[constructor] = self
+    instances:put(constructor, self)
     if preset then
         local unitHandle = unit.handle
         local slowPoisonMethod = not preset.positive and not preset.magic
@@ -587,13 +588,13 @@ function Buff.apply(self, ...)
     end
 end
 function Buff.getInstance(self, unit)
-    return buffs[unit][self]
+    return buffs[unit]:get(self)
 end
 function Buff.isApplied(self, unit)
-    return buffs[unit][self] ~= nil
+    return buffs[unit]:get(self) ~= nil
 end
 function Buff.ifApplied(self, unit, action)
-    local instance = buffs[unit][self]
+    local instance = buffs[unit]:get(self)
     if instance then
         ____assert(__TS__InstanceOf(instance, self))
         action(instance)
@@ -616,7 +617,7 @@ function Buff.prototype.destroy(self)
     if self.preset then
         self.unit:removeAbility(self.preset.buffId)
     end
-    buffs[self.unit][self.constructor] = nil
+    buffs[self.unit]:remove(self.constructor)
     self.destroyed = true
 end
 function Buff.prototype.onDispel(self, source)
@@ -756,14 +757,14 @@ for ____, pointDispelAbilityId in ipairs(pointDispelAbilityIds) do
     end)
 end
 Unit.onDamaging:addListener(function(source, target, event)
-    if event.amount == 0 and event.attackType == AttackType.SPELL and event.damageType == DamageType.NORMAL and not event.isAttack then
+    if event.amount == 0 and event.attackType == 0 and event.damageType == DamageType.NORMAL and not event.isAttack then
         Timer:run(function()
             checkBuffs(target, true, source)
         end)
     end
 end)
 Unit.itemPickedUpEvent:addListener(function(unit, item)
-    if item.powerup and item:hasAbility(fourCC("APdi")) then
+    if item.isPowerUp and item:hasAbility(fourCC("APdi")) then
     end
 end)
 return ____exports

package/objutil/object.lua

@@ -153,7 +153,7 @@ end
 function ObjectDefinition.getLevelArrayFieldValue(self, level, value, values)
     return type(values) == "function" and values(level, value) or (__TS__ArrayIsArray(values[1]) and values[1] or values)
 end
-____exports.ObjectType = ObjectType or ({})
+____exports.ObjectType = ____exports.ObjectType or ({})
 ____exports.ObjectType.ABILITY = 0
 ____exports.ObjectType[____exports.ObjectType.ABILITY] = "ABILITY"
 ____exports.ObjectType.ITEM = 1

package/objutil/unit.lua

@@ -11,6 +11,8 @@ local ____exports = {}
 local ____object = require("objutil.object")
 local ObjectDefinition = ____object.ObjectDefinition
 local idgen = require("objutil.idgen")
+local ____config = require("config")
+local WarscriptConfig = ____config.WarscriptConfig
 local attackTypes = setmetatable(
     {
         normal = "normal",
@@ -593,6 +595,9 @@ __TS__SetDescriptor(
         end,
         set = function(self, v)
             self:setStringField("umdl", v)
+            if WarscriptConfig.AUTOMATICALLY_SET_UNIT_TYPE_PORTRAIT_MODEL_PATH then
+                self:setStringField("upor", "")
+            end
         end
     },
     true
@@ -606,6 +611,9 @@ __TS__SetDescriptor(
         end,
         set = function(self, v)
             self.object:setField("umdl:hd", v)
+            if WarscriptConfig.AUTOMATICALLY_SET_UNIT_TYPE_PORTRAIT_MODEL_PATH then
+                self.object:setField("upor:hd", "")
+            end
         end
     },
     true

package/operation.lua

@@ -22,10 +22,7 @@ OperationMonitor.name = "OperationMonitor"
 __TS__ClassExtends(OperationMonitor, __TS__Promise)
 function OperationMonitor.prototype.____constructor(self, operation, ...)
     local args = {...}
-    __TS__Promise.prototype.____constructor(
-        self,
-        table.unpack(args)
-    )
+    __TS__Promise.prototype.____constructor(self, ...)
     self.o = operation
 end
 function OperationMonitor.prototype.cancel(self)
@@ -57,6 +54,7 @@ function Operation.prototype.execute(self)
             return __TS__AsyncAwaiter(function(____awaiter_resolve)
                 local result
                 local progress = self.progress
+                local ____hasReturned, ____returnValue
                 local ____try = __TS__AsyncAwaiter(function()
                     local maximum = __TS__Await(self:estimate())
                     self.maximum = maximum
@@ -79,7 +77,8 @@ function Operation.prototype.execute(self)
                                 if onComplete ~= nil then
                                     Event.invoke(onComplete, self, false, reason)
                                 end
-                                return ____awaiter_resolve(nil)
+                                ____hasReturned = true
+                                return
                             end
                             result = __TS__Await(self:work())
                             if self.progress ~= progress or self.maximum ~= maximum then
@@ -93,21 +92,28 @@ function Operation.prototype.execute(self)
                         end
                     until not (result == OperationContinue)
                 end)
-                __TS__Await(____try.catch(
+                ____try = ____try.catch(
                     ____try,
                     function(____, reason)
-                        reject(nil, reason)
-                        local onFailure = ____rawget(self, "onFailure")
-                        if onFailure ~= nil then
-                            Event.invoke(onFailure, self, reason)
-                        end
-                        local onComplete = ____rawget(self, "onComplete")
-                        if onComplete ~= nil then
-                            Event.invoke(onComplete, self, false, reason)
-                        end
-                        return ____awaiter_resolve(nil)
+                        return __TS__AsyncAwaiter(function()
+                            reject(nil, reason)
+                            local onFailure = ____rawget(self, "onFailure")
+                            if onFailure ~= nil then
+                                Event.invoke(onFailure, self, reason)
+                            end
+                            local onComplete = ____rawget(self, "onComplete")
+                            if onComplete ~= nil then
+                                Event.invoke(onComplete, self, false, reason)
+                            end
+                            ____hasReturned = true
+                            return
+                        end)
                     end
-                ))
+                )
+                __TS__Await(____try)
+                if ____hasReturned then
+                    return ____awaiter_resolve(nil, ____returnValue)
+                end
                 resolve(nil, result)
                 local onSuccess = ____rawget(self, "onSuccess")
                 if onSuccess ~= nil then

package/package.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://json.schemastore.org/package",
     "name": "warscript",
-    "version": "0.0.1-dev.dbb3984",
+    "version": "0.0.1-dev.dc37dce",
     "description": "A typescript library for Warcraft III using Warpack.",
     "keywords": [
         "warcraft",
@@ -22,13 +22,13 @@
     },
     "peerDependencies": {
         "@warscript/language-extensions": "^0.0.1",
-        "@warscript/tstl-plugin": "^0.0.4",
+        "@warscript/tstl-plugin": "^0.0.5",
         "lua-types": "^2.13.1",
-        "warpack": "0.0.1-dev.880fc91"
+        "warpack": "0.0.1-dev.e490aaf"
     },
     "devDependencies": {
-        "@typescript-eslint/eslint-plugin": "^8.13.0",
-        "@typescript-eslint/parser": "^8.13.0",
+        "@typescript-eslint/eslint-plugin": "^8.61.1",
+        "@typescript-eslint/parser": "^8.61.1",
         "async": "^3.2.6",
         "copyfiles": "^2.4.1",
         "eslint": "^9.14.0",

package/patch-lua.lua

@@ -1,5 +1,9 @@
+local error = _G.error
 local getmetatable = _G.getmetatable
 local ipairs = _G.ipairs
+local select = _G.select
+local tostring = _G.tostring
+local tableconcat = table.concat
 
 _G.ipairs = function(t)
     local metatable = getmetatable(t)
@@ -8,3 +12,14 @@ _G.ipairs = function(t)
     end
     return ipairs(t)
 end
+
+_G.assert = function(v, ...)
+    if not v then
+        local args = {}
+        for i = 1, select("#", ...) do
+            args[i] = tostring(select(i, ...))
+        end
+        error(tableconcat(args, " "))
+    end
+    return v, ...
+end

package/patch-lualib.lua

@@ -3,7 +3,7 @@ local lualib = _G.require("lualib_bundle")
 local next = _G.next
 local ____type = _G.type
 lualib.__TS__ArrayIsArray = function(value)
-    return ____type(value) == "table" and (value[1] ~= nil or ({next(value)}) == nil) and value.constructor == nil
+    return ____type(value) == "table" and (value[1] ~= nil or (next(value)) == nil) and value.constructor == nil
 end
 local __TS__SetDescriptor = lualib.__TS__SetDescriptor
 lualib.__TS__ObjectDefineProperty = function(target, key, desc)

package/utility/arrays.d.ts

@@ -5,6 +5,7 @@ export declare const joinToString: <T>(array: readonly T[], separator: string, t
 export declare const arrayOfNotNull: <T>(...elements: readonly (T | undefined | null)[]) => T[];
 export declare const array: <T, N extends number>(length: N, initialize: (index: number) => T) => TupleOf<T, N>;
 export declare const toLuaSet: <T extends AnyNotNil>(array: readonly T[]) => LuaSet<T>;
+export declare const contains: <T>(array: readonly T[], element: T) => boolean;
 export declare const forEach: <T, Args extends any[]>(array: readonly T[], consumerOrKey: ((value: T, ...args: Args) => void) | KeysOfType<T, (this: T, ...args: Args) => void>, ...args: Args) => void;
 export declare const all: {
     <T>(array: readonly T[], transform: (value: T) => boolean): boolean;
@@ -22,6 +23,7 @@ export declare const mapToLuaSet: {
     <T, R extends AnyNotNil>(array: readonly T[], transform: (value: T) => R): LuaSet<R>;
     <T, K extends KeysOfType<T, AnyNotNil>>(array: readonly T[], key: K): LuaSet<T[K] extends AnyNotNil ? T[K] : never>;
 };
+export declare const flatten: <T>(array: readonly (readonly T[])[]) => T[];
 export declare const flatMap: {
     <T, R>(array: readonly T[], transform: (value: T) => readonly R[]): R[];
     <T, K extends KeysOfType<T, readonly any[]>>(array: readonly T[], key: K): (T[K] extends readonly (infer R)[] ? R : never)[];

package/utility/arrays.lua

@@ -3,6 +3,8 @@ local __TS__New = ____lualib.__TS__New
 local ____exports = {}
 local ____exception = require("exception")
 local IllegalArgumentException = ____exception.IllegalArgumentException
+local ____functions = require("utility.functions")
+local identity = ____functions.identity
 local mathMax = math.max
 local mathMin = math.min
 local select = _G.select
@@ -47,6 +49,14 @@ ____exports.toLuaSet = function(array)
     end
     return result
 end
+____exports.contains = function(array, element)
+    for i = 1, #array do
+        if array[i] == element then
+            return true
+        end
+    end
+    return false
+end
 ____exports.forEach = function(array, consumerOrKey, ...)
     if type(consumerOrKey) == "function" then
         for i = 1, #array do
@@ -120,6 +130,7 @@ ____exports.mapToLuaSet = function(array, transform)
     end
     return result
 end
+____exports.flatten = function(array) return ____exports.flatMap(array, identity) end
 ____exports.flatMap = function(array, transform)
     local result = {}
     local k = 1

package/utility/callback-array.d.ts

@@ -0,0 +1,17 @@
+/** @noSelfInFile */
+type Callback = {
+    readonly __callback: unique symbol;
+};
+export type CallbackId = number & {
+    readonly __callbackId: unique symbol;
+};
+export type CallbackArray = {
+    readonly __callbackArray: unique symbol;
+} & Callback[];
+export declare const callbackArray: () => CallbackArray;
+export declare function addCallback<Args extends any[]>(this: void, array: CallbackArray, callback: (...args: Args) => unknown, ...args: Args): CallbackId;
+export declare function clearCallbacks(this: void, array: CallbackArray): void;
+export declare function consumeCallback(this: void, array: CallbackArray, id: CallbackId): void;
+export declare function consumeCallbacks(this: void, array: CallbackArray): void;
+export declare function invokeCallbacks(this: void, array: CallbackArray): void;
+export {};