warscript 0.0.1-dev.c677d41 → 0.0.1-dev.c762beb

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.c677d41",
+    "version": "0.0.1-dev.c762beb",
     "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.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/utility/linked-map.d.ts

@@ -8,10 +8,16 @@ type IteratorState<K extends AnyNotNil, V> = {
 type OneSidedTypeGuard = {
     readonly __oneSidedTypeGuard: unique symbol;
 };
+export interface ReadonlyLinkedMap<K extends AnyNotNil, V> extends LuaPairsIterable<K, V> {
+    readonly keys: ReadonlyLinkedSet<K>;
+    get(key: K): V | undefined;
+    contains(key: AnyNotNil): key is K & OneSidedTypeGuard;
+    readonly size: number;
+}
 export interface LinkedMap<K extends AnyNotNil, V> extends LuaPairsIterable<K, V> {
     readonly __linkedSet: unique symbol;
 }
-export declare class LinkedMap<K extends AnyNotNil, V> {
+export declare class LinkedMap<K extends AnyNotNil, V> implements ReadonlyLinkedMap<K, V> {
     private k;
     private v;
     get keys(): ReadonlyLinkedSet<K>;
@@ -23,4 +29,6 @@ export declare class LinkedMap<K extends AnyNotNil, V> {
     get size(): number;
     protected __pairs(this: LinkedMap<K, V>): LuaIterator<LuaMultiReturn<[K | undefined, V | undefined]>, IteratorState<K, V>>;
 }
+export declare const emptyLinkedMap: <K extends AnyNotNil, V>() => ReadonlyLinkedMap<K, V>;
+export declare const mutableLinkedMap: <K extends AnyNotNil, V>() => LinkedMap<K, V>;
 export {};

package/utility/linked-map.lua

@@ -2,9 +2,12 @@ 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 ____linked_2Dset = require("utility.linked-set")
 local LinkedSet = ____linked_2Dset.LinkedSet
+local ____exception = require("exception")
+local UnsupportedOperationException = ____exception.UnsupportedOperationException
 local function linkedMapNext(state)
     local n = state.n
     state.n = state.t[n]
@@ -63,4 +66,36 @@ __TS__SetDescriptor(
     end},
     true
 )
+local emptyIteratorState = {t = {}, v = {}}
+local EmptyLinkedMap = __TS__Class()
+EmptyLinkedMap.name = "EmptyLinkedMap"
+__TS__ClassExtends(EmptyLinkedMap, ____exports.LinkedMap)
+function EmptyLinkedMap.prototype.getOrPut(self)
+    error(
+        __TS__New(UnsupportedOperationException),
+        0
+    )
+end
+function EmptyLinkedMap.prototype.put(self)
+    error(
+        __TS__New(UnsupportedOperationException),
+        0
+    )
+end
+function EmptyLinkedMap.prototype.remove(self)
+    error(
+        __TS__New(UnsupportedOperationException),
+        0
+    )
+end
+function EmptyLinkedMap.prototype.__pairs(self)
+    return linkedMapNext, emptyIteratorState, nil
+end
+local EMPTY_LINKED_MAP = __TS__New(EmptyLinkedMap)
+____exports.emptyLinkedMap = function()
+    return EMPTY_LINKED_MAP
+end
+____exports.mutableLinkedMap = function()
+    return __TS__New(____exports.LinkedMap)
+end
 return ____exports

package/utility/linked-set.d.ts

@@ -14,7 +14,7 @@ export interface ReadonlyLinkedSet<T extends AnyNotNil> extends LuaPairsKeyItera
     next(key: T): T | undefined;
     previous(key: T): T | undefined;
     contains(key: AnyNotNil): key is T & OneSidedTypeGuard;
-    size: number;
+    readonly size: number;
     forEach<Args extends any[]>(action: (value: T, ...args: Args) => void, ...args: Args): void;
     toArray(): T[];
     sumOf(selector: ((value: T) => number) | KeysOfType<T, number>): number;
@@ -40,6 +40,7 @@ export declare class LinkedSet<T extends AnyNotNil> implements ReadonlyLinkedSet
     next(key: T): T | undefined;
     previous(key: T): T | undefined;
     add(key: T): boolean;
+    protected addBefore(value: T, key: T): boolean;
     remove(key: T): boolean;
     contains(key: AnyNotNil): key is T & OneSidedTypeGuard;
     clear(): void;

package/utility/linked-set.lua

@@ -85,6 +85,23 @@ function LinkedSet.prototype.add(self, key)
     end
     return true
 end
+function LinkedSet.prototype.addBefore(self, value, key)
+    local n = self.n
+    local p = self.p
+    local previous = p[value]
+    if previous ~= nil then
+        n[previous] = key
+        p[key] = previous
+    elseif value == self.f then
+        self.f = key
+    else
+        return false
+    end
+    n[key] = value
+    p[value] = key
+    self.s = self.s + 1
+    return true
+end
 function LinkedSet.prototype.remove(self, key)
     local n = self.n
     local next = n[key]