warscript 0.0.1-dev.c37d12c → 0.0.1-dev.c47d565

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.d.ts

@@ -16,9 +16,11 @@ export { OperationContinue };
 export declare abstract class Operation<T> {
     protected constructor();
     private started;
+    private settled;
+    private canceled;
     protected progress: number;
     protected maximum: number;
-    isCanceled: boolean;
+    get isCanceled(): boolean;
     get isStarted(): boolean;
     execute(): OperationMonitor<T>;
     protected abstract estimate(): number | Promise<number>;
@@ -30,6 +32,11 @@ export declare abstract class Operation<T> {
         ...result: [success: true, result: T] | [success: false, reason?: any]
     ]>;
     get onProgress(): Event<[operation: Operation<T>]>;
+    /**
+     * Invoked with `isCanceled` already set. Should unblock any pending `estimate`/`work` promise
+     * (e.g. by rejecting it) and return whether cancellation is possible; on `false` the canceled
+     * state is reverted.
+     */
     protected abstract doCancel(): boolean;
     cancel(): boolean;
 }

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)
@@ -38,9 +35,10 @@ local Operation = ____exports.Operation
 Operation.name = "Operation"
 function Operation.prototype.____constructor(self)
     self.started = false
+    self.settled = false
+    self.canceled = false
     self.progress = 0
     self.maximum = 0
-    self.isCanceled = false
 end
 function Operation.prototype.execute(self)
     if self.started then
@@ -58,6 +56,12 @@ function Operation.prototype.execute(self)
                 local result
                 local progress = self.progress
                 local ____try = __TS__AsyncAwaiter(function()
+                    if self.canceled then
+                        error(
+                            __TS__New(CancellationException),
+                            0
+                        )
+                    end
                     local maximum = __TS__Await(self:estimate())
                     self.maximum = maximum
                     if maximum ~= 0 then
@@ -68,20 +72,19 @@ function Operation.prototype.execute(self)
                     end
                     repeat
                         do
-                            if self.isCanceled then
-                                local reason = __TS__New(CancellationException)
-                                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)
+                            if self.canceled then
+                                error(
+                                    __TS__New(CancellationException),
+                                    0
+                                )
                             end
                             result = __TS__Await(self:work())
+                            if self.canceled then
+                                error(
+                                    __TS__New(CancellationException),
+                                    0
+                                )
+                            end
                             if self.progress ~= progress or self.maximum ~= maximum then
                                 progress = self.progress
                                 maximum = self.maximum
@@ -96,6 +99,7 @@ function Operation.prototype.execute(self)
                 __TS__Await(____try.catch(
                     ____try,
                     function(____, reason)
+                        self.settled = true
                         reject(nil, reason)
                         local onFailure = ____rawget(self, "onFailure")
                         if onFailure ~= nil then
@@ -108,6 +112,7 @@ function Operation.prototype.execute(self)
                         return ____awaiter_resolve(nil)
                     end
                 ))
+                self.settled = true
                 resolve(nil, result)
                 local onSuccess = ____rawget(self, "onSuccess")
                 if onSuccess ~= nil then
@@ -122,12 +127,27 @@ function Operation.prototype.execute(self)
     )
 end
 function Operation.prototype.cancel(self)
+    if self.canceled then
+        return true
+    end
+    if self.settled then
+        return false
+    end
+    self.canceled = true
     if self:doCancel() then
-        self.isCanceled = true
         return true
     end
+    self.canceled = false
     return false
 end
+__TS__SetDescriptor(
+    Operation.prototype,
+    "isCanceled",
+    {get = function(self)
+        return self.canceled
+    end},
+    true
+)
 __TS__SetDescriptor(
     Operation.prototype,
     "isStarted",

package/package.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://json.schemastore.org/package",
     "name": "warscript",
-    "version": "0.0.1-dev.c37d12c",
+    "version": "0.0.1-dev.c47d565",
     "description": "A typescript library for Warcraft III using Warpack.",
     "keywords": [
         "warcraft",
@@ -13,32 +13,11 @@
         "type": "git",
         "url": "git+https://github.com/rhazarian/warscript.git"
     },
-    "scripts": {
-        "clean": "rimraf dist",
-        "prebuild": "npm run clean",
-        "build": "tstl && copyfiles -u 1 \"src/**/*.d.ts\" \"src/**/*.lua\" dist && copyfiles LICENSE package.json dist",
-        "prepublishOnly": "echo You should run 'npm run publish' instead. && exit 1",
-        "publish": "npm run build && npm publish ./dist --ignore-scripts"
-    },
     "peerDependencies": {
         "@warscript/language-extensions": "^0.0.1",
-        "@warscript/tstl-plugin": "^0.0.1",
-        "typescript-to-lua": "^1.24.1",
+        "@warscript/tstl-plugin": "^0.0.6",
         "lua-types": "^2.13.1",
-        "warpack": "0.0.1-dev.5bdabe5"
-    },
-    "devDependencies": {
-        "@typescript-eslint/eslint-plugin": "^5.59.11",
-        "@typescript-eslint/parser": "^5.59.11",
-        "async": "^3.2.0",
-        "copyfiles": "^2.4.1",
-        "eslint": "^8.42.0",
-        "eslint-config-prettier": "^8.8.0",
-        "eslint-plugin-prettier": "^3.4.0",
-        "prettier": "^2.8.8",
-        "rimraf": "^5.0.5",
-        "ts-node": "^10.9.1",
-        "tsc-watch": "^4.2.9"
+        "warpack": "0.0.1-dev.eb3e92a"
     },
     "publishConfig": {
         "access": "public",

package/patch-lua.lua

@@ -0,0 +1,25 @@
+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)
+    if metatable and metatable.__ipairs then
+        return metatable.__ipairs(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/property.d.ts

@@ -0,0 +1,55 @@
+/** @noSelfInFile */
+import { Player } from "./core/types/player";
+import { Event } from "./event";
+export declare class PersistentPropertiesConfig {
+    static defaultFileName: string;
+}
+declare const enum PropertyPropertyKey {
+    DEFAULT_VALUE = 0,
+    VALUE = 1,
+    IS_CHANGED = 2
+}
+export declare class Property<T> {
+    readonly valueChangeEvent: Event<[newValue: T, oldValue: T]>;
+    private [PropertyPropertyKey.DEFAULT_VALUE];
+    private [PropertyPropertyKey.VALUE];
+    private [PropertyPropertyKey.IS_CHANGED]?;
+    constructor(defaultValue: T);
+    get defaultValue(): T;
+    set defaultValue(defaultValue: T);
+    get value(): T;
+    set value(value: T);
+    get isChanged(): boolean;
+    reset(): boolean;
+    set(value: T): boolean;
+    get(): T;
+}
+declare const enum PlayerPropertyPropertyKey {
+    DEFAULT_VALUE = 0,
+    VALUE_BY_PLAYER = 1,
+    IS_CHANGED_BY_PLAYER = 2
+}
+export declare class PlayerProperty<T> {
+    readonly valueChangeEvent: Event<[player: Player, newValue: T, oldValue: T]>;
+    private readonly [PlayerPropertyPropertyKey.DEFAULT_VALUE];
+    private readonly [PlayerPropertyPropertyKey.VALUE_BY_PLAYER];
+    private readonly [PlayerPropertyPropertyKey.IS_CHANGED_BY_PLAYER];
+    constructor(defaultValue: T);
+    isChanged(player: Player): boolean;
+    reset(player: Player): boolean;
+    set(player: Player, value: T): boolean;
+    get(player: Player): T;
+}
+export declare class PersistentProperty<T extends undefined | boolean | number | string> extends Property<T> {
+    readonly id: number;
+    constructor(id: number, defaultValue: T, valueChangeEventListener?: (newValue: T, oldValue: T) => void);
+    reset(): boolean;
+    set(value: T): boolean;
+}
+export declare class PersistentPlayerProperty<T extends string | number | boolean> extends PlayerProperty<T> {
+    readonly id: number;
+    constructor(id: number, initialValue: T, valueChangeEventListener?: (player: Player, newValue: T, oldValue: T) => void);
+    reset(player: Player): boolean;
+    set(player: Player, value: T): boolean;
+}
+export {};

package/property.lua

@@ -0,0 +1,374 @@
+local ____lualib = require("lualib_bundle")
+local __TS__Class = ____lualib.__TS__Class
+local __TS__New = ____lualib.__TS__New
+local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
+local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local ____exports = {}
+local savePropertyValues
+local ____binaryreader = require("binaryreader")
+local BinaryReader = ____binaryreader.BinaryReader
+local ____binarywriter = require("binarywriter")
+local BinaryWriter = ____binarywriter.BinaryWriter
+local ____player = require("core.types.player")
+local Player = ____player.Player
+local ____timer = require("core.types.timer")
+local Timer = ____timer.Timer
+local ____event = require("event")
+local Event = ____event.Event
+local file = require("file")
+local ____network = require("network")
+local synchronize = ____network.synchronize
+local base64 = require("utility.base64")
+local lzw = require("utility.lzw")
+local ____preconditions = require("utility.preconditions")
+local ____require = ____preconditions.require
+local invoke = Event.invoke
+____exports.PersistentPropertiesConfig = __TS__Class()
+local PersistentPropertiesConfig = ____exports.PersistentPropertiesConfig
+PersistentPropertiesConfig.name = "PersistentPropertiesConfig"
+function PersistentPropertiesConfig.prototype.____constructor(self)
+end
+PersistentPropertiesConfig.defaultFileName = ""
+____exports.Property = __TS__Class()
+local Property = ____exports.Property
+Property.name = "Property"
+function Property.prototype.____constructor(self, defaultValue)
+    self.valueChangeEvent = __TS__New(Event)
+    self[0] = defaultValue
+    self[1] = defaultValue
+end
+function Property.prototype.reset(self)
+    if self[2] then
+        self[2] = nil
+        local defaultValue = self[0]
+        local oldValue = self[1]
+        if defaultValue ~= oldValue then
+            self[1] = defaultValue
+            invoke(self.valueChangeEvent, defaultValue, oldValue)
+        end
+        return true
+    end
+    return false
+end
+function Property.prototype.set(self, value)
+    self[2] = true
+    local oldValue = self[1]
+    self[1] = value
+    if value ~= oldValue then
+        invoke(self.valueChangeEvent, value, oldValue)
+        return true
+    end
+    return false
+end
+function Property.prototype.get(self)
+    return self[1]
+end
+__TS__SetDescriptor(
+    Property.prototype,
+    "defaultValue",
+    {
+        get = function(self)
+            return self[0]
+        end,
+        set = function(self, defaultValue)
+            local oldDefaultValue = self[0]
+            if defaultValue ~= oldDefaultValue then
+                self[0] = defaultValue
+                if not self[2] then
+                    self[1] = defaultValue
+                    invoke(self.valueChangeEvent, defaultValue, oldDefaultValue)
+                end
+            end
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    Property.prototype,
+    "value",
+    {
+        get = function(self)
+            return self:get()
+        end,
+        set = function(self, value)
+            self:set(value)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    Property.prototype,
+    "isChanged",
+    {get = function(self)
+        return self[2] == true
+    end},
+    true
+)
+____exports.PlayerProperty = __TS__Class()
+local PlayerProperty = ____exports.PlayerProperty
+PlayerProperty.name = "PlayerProperty"
+function PlayerProperty.prototype.____constructor(self, defaultValue)
+    self.valueChangeEvent = __TS__New(Event)
+    self[0] = defaultValue
+    self[1] = {}
+    self[2] = {}
+end
+function PlayerProperty.prototype.isChanged(self, player)
+    return self[2][player] ~= nil
+end
+function PlayerProperty.prototype.reset(self, player)
+    if self[2][player] ~= nil then
+        self[2][player] = nil
+        local initialValue = self[0]
+        local oldValue = self[1][player]
+        self[1][player] = nil
+        if initialValue ~= oldValue then
+            invoke(self.valueChangeEvent, player, initialValue, oldValue)
+        end
+        return true
+    end
+    return false
+end
+function PlayerProperty.prototype.set(self, player, value)
+    self[2][player] = true
+    local oldValue = self[1][player]
+    self[1][player] = value
+    if value ~= oldValue then
+        invoke(self.valueChangeEvent, player, value, oldValue)
+        return true
+    end
+    return false
+end
+function PlayerProperty.prototype.get(self, player)
+    local ____table_PlayerPropertyPropertyKey_IS_CHANGED_BY_PLAYER_has_result_0
+    if self[2][player] ~= nil then
+        ____table_PlayerPropertyPropertyKey_IS_CHANGED_BY_PLAYER_has_result_0 = self[1][player]
+    else
+        ____table_PlayerPropertyPropertyKey_IS_CHANGED_BY_PLAYER_has_result_0 = self[0]
+    end
+    return ____table_PlayerPropertyPropertyKey_IS_CHANGED_BY_PLAYER_has_result_0
+end
+local NULL_VALUE = {}
+local loadedValueById
+local loadedValueByIdByPlayer = {}
+local localValueById = {}
+local persistentPropertyById = {}
+local persistentPlayerPropertyById = {}
+____exports.PersistentProperty = __TS__Class()
+local PersistentProperty = ____exports.PersistentProperty
+PersistentProperty.name = "PersistentProperty"
+__TS__ClassExtends(PersistentProperty, ____exports.Property)
+function PersistentProperty.prototype.____constructor(self, id, defaultValue, valueChangeEventListener)
+    PersistentProperty.____super.prototype.____constructor(self, defaultValue)
+    self.id = id
+    ____require(not (persistentPropertyById[id] ~= nil) and not (persistentPlayerPropertyById[id] ~= nil))
+    persistentPropertyById[id] = self
+    if valueChangeEventListener ~= nil then
+        self.valueChangeEvent:addListener(valueChangeEventListener)
+    end
+    local value = loadedValueById and loadedValueById[id]
+    if value ~= nil then
+        local ____self_set_4 = self.set
+        local ____temp_3
+        if value == NULL_VALUE then
+            ____temp_3 = nil
+        else
+            ____temp_3 = value
+        end
+        ____self_set_4(self, ____temp_3)
+    end
+end
+function PersistentProperty.prototype.reset(self)
+    if PersistentProperty.____super.prototype.reset(self) then
+        localValueById[self.id] = nil
+        savePropertyValues()
+        return true
+    end
+    return false
+end
+function PersistentProperty.prototype.set(self, value)
+    if PersistentProperty.____super.prototype.set(self, value) then
+        localValueById[self.id] = value == nil and NULL_VALUE or value
+        savePropertyValues()
+        return true
+    end
+    return false
+end
+____exports.PersistentPlayerProperty = __TS__Class()
+local PersistentPlayerProperty = ____exports.PersistentPlayerProperty
+PersistentPlayerProperty.name = "PersistentPlayerProperty"
+__TS__ClassExtends(PersistentPlayerProperty, ____exports.PlayerProperty)
+function PersistentPlayerProperty.prototype.____constructor(self, id, initialValue, valueChangeEventListener)
+    PersistentPlayerProperty.____super.prototype.____constructor(self, initialValue)
+    self.id = id
+    ____require(not (persistentPropertyById[id] ~= nil) and not (persistentPlayerPropertyById[id] ~= nil))
+    persistentPlayerPropertyById[id] = self
+    if valueChangeEventListener ~= nil then
+        self.valueChangeEvent:addListener(valueChangeEventListener)
+    end
+    for ____, player in ipairs(Player.all) do
+        local ____opt_5 = loadedValueByIdByPlayer and loadedValueByIdByPlayer[player]
+        local value = ____opt_5 and ____opt_5[id]
+        if value ~= nil then
+            local ____self_set_10 = self.set
+            local ____temp_9
+            if value == NULL_VALUE then
+                ____temp_9 = nil
+            else
+                ____temp_9 = value
+            end
+            ____self_set_10(self, player, ____temp_9)
+        end
+    end
+end
+function PersistentPlayerProperty.prototype.reset(self, player)
+    if PersistentPlayerProperty.____super.prototype.reset(self, player) then
+        if player.isLocal then
+            localValueById[self.id] = nil
+        end
+        savePropertyValues(player)
+        return true
+    end
+    return false
+end
+function PersistentPlayerProperty.prototype.set(self, player, value)
+    if PersistentPlayerProperty.____super.prototype.set(self, player, value) then
+        if player.isLocal then
+            localValueById[self.id] = value
+        end
+        savePropertyValues(player)
+        return true
+    end
+    return false
+end
+savePropertyValues = function(player)
+    if player ~= nil and not player.isLocal or loadedValueById == nil or loadedValueByIdByPlayer[Player["local"]] == nil then
+        return
+    end
+    local writer = __TS__New(BinaryWriter)
+    writer:writeUInt32(0)
+    local size = 0
+    for ____ in pairs(localValueById) do
+        size = size + 1
+    end
+    writer:writeUInt32(size)
+    for id, value in pairs(localValueById) do
+        writer:writeInt32(id)
+        if value == NULL_VALUE then
+            writer:writeUInt8(0)
+        elseif value == false then
+            writer:writeUInt8(1)
+        elseif value == true then
+            writer:writeUInt8(2)
+        elseif type(value) == "number" then
+            if math.type(value) == "integer" then
+                writer:writeUInt8(3)
+                writer:writeInt32(value)
+            else
+                writer:writeUInt8(4)
+                writer:writeFloat(value)
+            end
+        else
+            writer:writeUInt8(5)
+            writer:writeUInt32(#value)
+            writer:writeBytes(value)
+        end
+    end
+    file.write(
+        ____exports.PersistentPropertiesConfig.defaultFileName,
+        base64.encode(lzw.compress(tostring(writer)))
+    )
+end
+local function loadPropertyValues(fileData, player)
+    do
+        local function ____catch(_)
+            return true, {}
+        end
+        local ____try, ____hasReturned, ____returnValue = pcall(function()
+            local valueById = {}
+            local reader = __TS__New(
+                BinaryReader,
+                lzw.decompress(base64.decode(fileData))
+            )
+            reader:readUInt32()
+            local size = reader:readUInt32()
+            for _ = 1, size do
+                local id = reader:readInt32()
+                local dataType = reader:readUInt8()
+                if dataType == 0 then
+                    valueById[id] = NULL_VALUE
+                elseif dataType == 1 then
+                    valueById[id] = false
+                elseif dataType == 2 then
+                    valueById[id] = true
+                elseif dataType == 3 then
+                    valueById[id] = reader:readInt32()
+                elseif dataType == 4 then
+                    valueById[id] = reader:readFloat()
+                elseif dataType == 5 then
+                    valueById[id] = reader:readBytes(reader:readUInt32())
+                end
+            end
+            for id, value in pairs(valueById) do
+                local persistentProperty = persistentPropertyById[id]
+                if persistentProperty ~= nil then
+                    if not persistentProperty.isChanged then
+                        local ____persistentProperty_set_12 = persistentProperty.set
+                        local ____temp_11
+                        if value == NULL_VALUE then
+                            ____temp_11 = nil
+                        else
+                            ____temp_11 = value
+                        end
+                        ____persistentProperty_set_12(persistentProperty, ____temp_11)
+                    end
+                elseif player ~= nil then
+                    local persistentPlayerProperty = persistentPlayerPropertyById[id]
+                    if persistentPlayerProperty ~= nil then
+                        if not persistentPlayerProperty:isChanged(player) then
+                            local ____persistentPlayerProperty_set_15 = persistentPlayerProperty.set
+                            local ____player_14 = player
+                            local ____temp_13
+                            if value == NULL_VALUE then
+                                ____temp_13 = nil
+                            else
+                                ____temp_13 = value
+                            end
+                            ____persistentPlayerProperty_set_15(persistentPlayerProperty, ____player_14, ____temp_13)
+                        end
+                    elseif player.isLocal then
+                        localValueById[id] = value
+                    end
+                else
+                    localValueById[id] = value
+                end
+            end
+            return true, valueById
+        end)
+        if not ____try then
+            ____hasReturned, ____returnValue = ____catch(____hasReturned)
+        end
+        if ____hasReturned then
+            return ____returnValue
+        end
+    end
+end
+Timer:run(function()
+    local data = file.read(____exports.PersistentPropertiesConfig.defaultFileName) or ""
+    loadedValueById = loadPropertyValues(data)
+    for ____, player in ipairs(Player.all) do
+        local ____self_16 = synchronize(player, data)
+        ____self_16["then"](
+            ____self_16,
+            function(____, synchronizedData)
+                loadedValueByIdByPlayer[player] = loadPropertyValues(synchronizedData, player)
+                savePropertyValues(player)
+            end,
+            function()
+                loadedValueByIdByPlayer[player] = {}
+                savePropertyValues(player)
+            end
+        )
+    end
+end)
+return ____exports