warscript 0.0.1-dev.b9f7033 → 0.0.1-dev.baa67d8

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

@@ -762,7 +762,7 @@ Unit.onDamaging:addListener(function(source, target, event)
     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/package.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://json.schemastore.org/package",
     "name": "warscript",
-    "version": "0.0.1-dev.b9f7033",
+    "version": "0.0.1-dev.baa67d8",
     "description": "A typescript library for Warcraft III using Warpack.",
     "keywords": [
         "warcraft",
@@ -24,7 +24,7 @@
         "@warscript/language-extensions": "^0.0.1",
         "@warscript/tstl-plugin": "^0.0.4",
         "lua-types": "^2.13.1",
-        "warpack": "0.0.1-dev.251db08"
+        "warpack": "0.0.1-dev.efd0770"
     },
     "devDependencies": {
         "@typescript-eslint/eslint-plugin": "^8.13.0",

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;

package/utility/arrays.lua

@@ -49,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

package/utility/callback-array.d.ts

@@ -2,12 +2,16 @@
 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): void;
+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 {};

package/utility/callback-array.lua

@@ -20,8 +20,11 @@ local select = _G.select
 local tableMove = table.move
 tableUnpack = table.unpack
 ____exports.callbackArray = function() return {} end
+local function doNothing()
+end
 function ____exports.addCallback(array, callback, ...)
-    local i = array[1] or 2
+    local id = array[1] or 2
+    local i = id
     array[i] = callback
     local argsCount = select("#", ...)
     i = i + 1
@@ -31,11 +34,23 @@ function ____exports.addCallback(array, callback, ...)
         array[i] = (select(j, ...))
     end
     array[1] = i + 1
+    return id
 end
 function ____exports.clearCallbacks(array)
     local length = array[1] or 2
     tableMove(array, length, length + length - 2, 1)
 end
+function ____exports.consumeCallback(array, id)
+    local callback = array[id]
+    array[id] = doNothing
+    id = id + 1
+    local argsCount = array[id]
+    id = id + 1
+    safeCall(
+        callback,
+        tableUnpack(array, id, id + argsCount - 1)
+    )
+end
 function ____exports.consumeCallbacks(array)
     local length = array[1] or 2
     ____exports.invokeCallbacks(array)

package/utility/linked-set.d.ts

@@ -36,6 +36,7 @@ export declare class LinkedSet<T extends AnyNotNil> implements ReadonlyLinkedSet
     copyOf(): LinkedSet<T>;
     first(): T | undefined;
     last(): T | undefined;
+    pop(): T | undefined;
     next(key: T): T | undefined;
     previous(key: T): T | undefined;
     add(key: T): boolean;

package/utility/linked-set.lua

@@ -42,6 +42,23 @@ end
 function LinkedSet.prototype.last(self)
     return self.l
 end
+function LinkedSet.prototype.pop(self)
+    local f = self.f
+    if f == nil then
+        return nil
+    end
+    local n = self.n
+    local next = n[f]
+    n[f] = nil
+    self.f = next
+    if next ~= nil then
+        self.p[next] = nil
+    else
+        self.l = nil
+    end
+    self.s = self.s - 1
+    return f
+end
 function LinkedSet.prototype.next(self, key)
     return self.n[key]
 end
@@ -107,8 +124,9 @@ function LinkedSet.prototype.forEach(self, action, ...)
     local n = self.n
     local c = self.f
     while c ~= nil do
+        local next = n[c]
         action(c, ...)
-        c = n[c]
+        c = next
     end
 end
 function LinkedSet.prototype.toArray(self)

package/utility/types.d.ts

@@ -37,4 +37,7 @@ export type Flatten<T extends readonly any[], A extends readonly any[] = []> = T
 export type Prohibit<T, K extends keyof any> = T & {
     [P in K]?: never;
 };
+type TupleSplit<T, N extends number, O extends readonly any[] = readonly []> = O["length"] extends N ? [O, T] : T extends readonly [infer F, ...infer R] ? TupleSplit<readonly [...R], N, readonly [...O, F]> : [O, T];
+export type TakeFirst<T extends readonly any[], N extends number> = TupleSplit<T, N>[0];
+export type SkipFirst<T extends readonly any[], N extends number> = TupleSplit<T, N>[1];
 export {};