warscript 0.0.1-dev.a5f2d10 → 0.0.1-dev.a856ae3

package/utility/lua-maps.lua

@@ -1,5 +1,17 @@
 local ____exports = {}
 local select = _G.select
+local setmetatable = _G.setmetatable
+local weakKeysMetatable = {__mode = "k"}
+local EMPTY_LUA_MAP = {}
+____exports.emptyLuaMap = function()
+    return EMPTY_LUA_MAP
+end
+____exports.mutableLuaMap = function()
+    return {}
+end
+____exports.mutableWeakLuaMap = function()
+    return setmetatable({}, weakKeysMetatable)
+end
 ____exports.luaMapOf = function(...)
     local luaMap = {}
     for i = 1, select("#", ...), 2 do
@@ -15,11 +27,50 @@ ____exports.luaMapInvert = function(luaMap)
     end
     return invertLuaMap
 end
+____exports.toLuaMap = function(record)
+    return record
+end
+____exports.flattenKeys = function(luaMap)
+    local result = {}
+    for keys, value in pairs(luaMap) do
+        for ____, key in ipairs(keys) do
+            result[key] = value
+        end
+    end
+    return result
+end
+____exports.mapKeys = function(luaMap, transform)
+    local result = {}
+    if type(transform) == "function" then
+        for key, value in pairs(luaMap) do
+            result[transform(key)] = value
+        end
+    else
+        for key, value in pairs(luaMap) do
+            result[key[transform]] = value
+        end
+    end
+    return result
+end
 ____exports.mapValues = function(luaMap, transform)
     local result = {}
-    for key, value in pairs(luaMap) do
-        result[key] = transform(value)
+    if type(transform) == "function" then
+        for key, value in pairs(luaMap) do
+            result[key] = transform(value)
+        end
+    else
+        for key, value in pairs(luaMap) do
+            result[key] = value[transform]
+        end
     end
     return result
 end
+____exports.getOrPut = function(luaMap, key, defaultValue)
+    local value = luaMap[key]
+    if value == nil then
+        value = defaultValue()
+        luaMap[key] = value
+    end
+    return value
+end
 return ____exports

package/utility/lua-sets.d.ts

@@ -1,4 +1,6 @@
 /** @noSelfInFile */
+export declare const emptyLuaSet: <T extends AnyNotNil>() => ReadonlyLuaSet<T>;
+export declare const mutableLuaSet: <T extends AnyNotNil>() => LuaSet<T>;
 export declare const luaSetOf: <T extends AnyNotNil>(...elements: readonly T[]) => LuaSet<T>;
 export declare const luaSetOfNotNull: <T extends AnyNotNil>(...elements: readonly (T | undefined | null)[]) => LuaSet<T>;
 export declare const luaSetIntersection: <T extends AnyNotNil>(firstLuaSet: ReadonlyLuaSet<T>, secondLuaSet: ReadonlyLuaSet<T>) => LuaSet<T>;

package/utility/lua-sets.lua

@@ -1,5 +1,12 @@
 local ____exports = {}
 local select = _G.select
+local EMPTY_LUA_SET = {}
+____exports.emptyLuaSet = function()
+    return EMPTY_LUA_SET
+end
+____exports.mutableLuaSet = function()
+    return {}
+end
 ____exports.luaSetOf = function(...)
     local luaSet = {}
     for i = 1, select("#", ...) do

package/utility/records.lua

@@ -1,9 +1,28 @@
 local ____exports = {}
+local ____pairs = _G.pairs
+local tableSort = table.sort
 ____exports.invertRecord = function(record)
     local invertRecord = {}
-    for key, value in pairs(record) do
+    for key, value in ____pairs(record) do
         invertRecord[value] = key
     end
     return invertRecord
 end
+local sortedKeysInternal = {}
+local lastSortedKeysLength = 0
+---
+-- @internal For use by internal systems only.
+____exports.sortedKeysUnnested = function(record)
+    local length = 0
+    for key in ____pairs(record) do
+        length = length + 1
+        sortedKeysInternal[length] = key
+    end
+    for i = length + 1, lastSortedKeysLength do
+        sortedKeysInternal[i] = nil
+    end
+    lastSortedKeysLength = length
+    tableSort(sortedKeysInternal)
+    return sortedKeysInternal
+end
 return ____exports

package/utility/reflection.lua

@@ -5,21 +5,25 @@ local checkNotNull = ____preconditions.checkNotNull
 -- @internal For use by internal systems only.
 ____exports.implementReadonlyNumberIndexSupplier = function(clazz, supplier)
     local metatable = checkNotNull(getmetatable(clazz))
-    local originalIndex = checkNotNull(metatable.__index)
+    local originalIndex = checkNotNull(rawget(metatable, "__index"))
     local memoizedValueByKey = {}
-    metatable.__index = setmetatable(
-        memoizedValueByKey,
-        {__index = function(self, key)
+    rawset(
+        metatable,
+        "__index",
+        function(self, key)
             if type(key) == "number" then
-                local value = supplier(key)
-                memoizedValueByKey[key] = value
+                local value = memoizedValueByKey[key]
+                if value == nil then
+                    value = supplier(key)
+                    memoizedValueByKey[key] = value
+                end
                 return value
             end
             if type(originalIndex) == "function" then
                 return originalIndex(self, key)
             end
             return originalIndex[key]
-        end}
+        end
     )
 end
 ____exports.getClass = function(object)

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 {};

package/utility/unordered-map.d.ts

@@ -0,0 +1,27 @@
+/** @noSelfInFile */
+type OneSidedTypeGuard = {
+    readonly __oneSidedTypeGuard: unique symbol;
+};
+export interface ReadonlyUnorderedMap<K extends AnyNotNil, V> extends LuaPairsIterable<K, V> {
+    get(key: K): V | undefined;
+    contains(key: AnyNotNil): key is K & OneSidedTypeGuard;
+    readonly size: number;
+}
+export interface UnorderedMap<K extends AnyNotNil, V> extends LuaPairsIterable<K, V> {
+    readonly __unorderedMap: unique symbol;
+}
+export declare class UnorderedMap<K extends AnyNotNil, V> implements ReadonlyUnorderedMap<K, V> {
+    private readonly v;
+    private s;
+    get(key: K): V | undefined;
+    getOrPut(key: K, defaultValue: (this: void) => V): V;
+    put(key: K, value: V): void;
+    remove(key: K): boolean;
+    contains(key: AnyNotNil): key is K & OneSidedTypeGuard;
+    get size(): number;
+    protected __len(): number;
+    protected __pairs(this: UnorderedMap<K, V>): ReturnType<typeof pairs>;
+}
+export declare const emptyUnorderedMap: <K extends AnyNotNil, V>() => ReadonlyUnorderedMap<K, V>;
+export declare const mutableUnorderedMap: <K extends AnyNotNil, V>() => UnorderedMap<K, V>;
+export {};

package/utility/unordered-map.lua

@@ -0,0 +1,99 @@
+local ____lualib = require("lualib_bundle")
+local __TS__Class = ____lualib.__TS__Class
+local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
+local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local __TS__New = ____lualib.__TS__New
+local ____exports = {}
+local ____exception = require("exception")
+local UnsupportedOperationException = ____exception.UnsupportedOperationException
+____exports.UnorderedMap = __TS__Class()
+local UnorderedMap = ____exports.UnorderedMap
+UnorderedMap.name = "UnorderedMap"
+function UnorderedMap.prototype.____constructor(self)
+    self.v = {}
+    self.s = 0
+end
+function UnorderedMap.prototype.get(self, key)
+    return self.v[key]
+end
+function UnorderedMap.prototype.getOrPut(self, key, defaultValue)
+    local value = self.v[key]
+    if value ~= nil then
+        return value
+    end
+    value = defaultValue()
+    if value ~= nil then
+        self.v[key] = value
+        self.s = self.s + 1
+    end
+    return value
+end
+function UnorderedMap.prototype.put(self, key, value)
+    local has = self.v[key] ~= nil
+    self.v[key] = value
+    if value ~= nil and not has then
+        self.s = self.s + 1
+    elseif value == nil and has then
+        self.s = self.s - 1
+    end
+end
+function UnorderedMap.prototype.remove(self, key)
+    if self.v[key] ~= nil then
+        self.v[key] = nil
+        self.s = self.s - 1
+        return true
+    end
+    return false
+end
+function UnorderedMap.prototype.contains(self, key)
+    return self.v[key] ~= nil
+end
+function UnorderedMap.prototype.__len(self)
+    return self.s
+end
+function UnorderedMap.prototype.__pairs(self)
+    return pairs(self.v)
+end
+__TS__SetDescriptor(
+    UnorderedMap.prototype,
+    "size",
+    {get = function(self)
+        return self.s
+    end},
+    true
+)
+local EmptyUnorderedMap = __TS__Class()
+EmptyUnorderedMap.name = "EmptyUnorderedMap"
+__TS__ClassExtends(EmptyUnorderedMap, ____exports.UnorderedMap)
+function EmptyUnorderedMap.prototype.getOrPut(self)
+    error(
+        __TS__New(UnsupportedOperationException),
+        0
+    )
+end
+function EmptyUnorderedMap.prototype.put(self)
+    error(
+        __TS__New(UnsupportedOperationException),
+        0
+    )
+end
+function EmptyUnorderedMap.prototype.remove(self)
+    error(
+        __TS__New(UnsupportedOperationException),
+        0
+    )
+end
+function EmptyUnorderedMap.prototype.__len(self)
+    return 0
+end
+function EmptyUnorderedMap.prototype.__pairs(self)
+    return pairs(self.v)
+end
+local EMPTY_UNORDERED_MAP = __TS__New(EmptyUnorderedMap)
+____exports.emptyUnorderedMap = function()
+    return EMPTY_UNORDERED_MAP
+end
+____exports.mutableUnorderedMap = function()
+    return __TS__New(____exports.UnorderedMap)
+end
+return ____exports

package/core/types/order.d.ts

@@ -1,25 +0,0 @@
-/** @noSelfInFile */
-import { Unit } from "./unit";
-import { Item } from "./item";
-import { Destructable } from "./destructable";
-export type Order = {
-    id: number;
-    startX: number;
-    startY: number;
-} & ({
-    type: "immediate";
-} | {
-    type: "point";
-    targetX: number;
-    targetY: number;
-} | {
-    type: "target";
-    target: Unit | Item | Destructable;
-});
-declare module "../../engine/internal/unit" {
-    interface Unit {
-        readonly currentOrder: Order;
-        readonly lastOrder: Order;
-        issueOrder(order: Order): void;
-    }
-}

package/core/types/order.lua

@@ -1,55 +0,0 @@
-local ____lualib = require("lualib_bundle")
-local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
-local ____exports = {}
-local ____unit = require("core.types.unit")
-local Unit = ____unit.Unit
-local getUnitCurrentOrder = GetUnitCurrentOrder
-local orders = setmetatable({}, {__mode = "k"})
-Unit.onImmediateOrder:addListener(function(unit, orderId)
-    orders[unit] = {id = orderId, startX = unit.x, startY = unit.y, type = "immediate"}
-end)
-Unit.onPointOrder:addListener(function(unit, orderId, x, y)
-    orders[unit] = {
-        id = orderId,
-        startX = unit.x,
-        startY = unit.y,
-        type = "point",
-        targetX = x,
-        targetY = y
-    }
-end)
-Unit.onTargetOrder:addListener(function(unit, orderId, target)
-    orders[unit] = {
-        id = orderId,
-        startX = unit.x,
-        startY = unit.y,
-        type = "target",
-        target = target
-    }
-end)
-__TS__ObjectDefineProperty(
-    Unit.prototype,
-    "currentOrder",
-    {get = function(self)
-        local currentOrderId = getUnitCurrentOrder(self.handle)
-        local lastOrder = orders[self]
-        return lastOrder and (lastOrder.id == currentOrderId or currentOrderId == orderId("patrolAI") and lastOrder.id == orderId("patrol")) and lastOrder or ({id = 0, type = "immediate"})
-    end}
-)
-__TS__ObjectDefineProperty(
-    Unit.prototype,
-    "lastOrder",
-    {get = function(self)
-        return orders[self] or ({id = 0, type = "immediate"})
-    end}
-)
-Unit.prototype.issueOrder = function(self, order)
-    if order.type == "immediate" then
-        IssueImmediateOrderById(self.handle, order.id)
-    elseif order.type == "point" then
-        IssuePointOrderById(self.handle, order.id, order.targetX, order.targetY)
-    else
-        IssueTargetOrderById(self.handle, order.id, order.target.handle)
-    end
-end
-return ____exports