warscript 0.0.1-dev.ee2345e → 0.0.1-dev.f0a9ffe

package/utility/linked-set.lua

@@ -177,14 +177,17 @@ local EMPTY_LINKED_SET = __TS__New(EmptyLinkedSet)
 ____exports.emptyLinkedSet = function()
     return EMPTY_LINKED_SET
 end
-____exports.linkedSetOf = function(...)
+____exports.mutableLinkedSet = function()
+    return __TS__New(____exports.LinkedSet)
+end
+____exports.mutableLinkedSetOf = function(...)
     local linkedSet = __TS__New(____exports.LinkedSet)
     for i = 1, select("#", ...) do
         linkedSet:add((select(i, ...)))
     end
     return linkedSet
 end
-____exports.linkedSetOfNotNull = function(...)
+____exports.mutableLinkedSetOfNotNull = function(...)
     local linkedSet = __TS__New(____exports.LinkedSet)
     for i = 1, select("#", ...) do
         local element = (select(i, ...))
@@ -194,4 +197,7 @@ ____exports.linkedSetOfNotNull = function(...)
     end
     return linkedSet
 end
+____exports.linkedSetOf = function(...) return ____exports.mutableLinkedSetOf(...) end
+____exports.linkedSetOfNotNull = function(...) return ____exports.mutableLinkedSetOfNotNull(...) end
+____exports.nonEmptyLinkedSetOf = function(...) return ____exports.linkedSetOf(...) end
 return ____exports

package/utility/lua-maps.d.ts

@@ -1,6 +1,9 @@
-/// <reference types="@typescript-to-lua/language-extensions" />
 /** @noSelfInFile */
 import { Flatten, TupleOf } from "./types";
-export declare const luaMapOf: <K extends AnyNotNil, V>(...pairs: Flatten<TupleOf<[K, V], 0 | 2 | 1 | 22 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20 | 21 | 27 | 31 | 40 | 30 | 32 | 23 | 24 | 25 | 26 | 28 | 29 | 33 | 34 | 35 | 36 | 37 | 38 | 39>>) => LuaMap<K, V>;
+export declare const emptyLuaMap: <K extends AnyNotNil, V>() => ReadonlyLuaMap<K, V>;
+export declare const mutableLuaMap: <K extends AnyNotNil, V>() => LuaMap<K, V>;
+export declare const mutableWeakLuaMap: <K extends AnyNotNil, V>() => LuaMap<K, V>;
+export declare const luaMapOf: <K extends AnyNotNil, V>(...pairs: Flatten<TupleOf<[K, V], 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 | 24 | 25 | 26 | 27 | 28 | 29 | 30 | 31 | 32 | 33 | 34 | 35 | 36 | 37 | 38 | 39 | 40>>) => LuaMap<K, V>;
 export declare const luaMapInvert: <K extends AnyNotNil, V extends AnyNotNil>(luaMap: LuaMap<K, V>) => LuaMap<V, K>;
 export declare const mapValues: <K extends AnyNotNil, V1, V2>(luaMap: LuaMap<K, V1>, transform: (value: V1) => V2) => LuaMap<K, V2>;
+export declare const getOrPut: <K extends AnyNotNil, V>(luaMap: LuaMap<K, V>, key: K, defaultValue: () => V) => V;

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
@@ -22,4 +34,12 @@ ____exports.mapValues = function(luaMap, transform)
     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,6 +1,7 @@
-/// <reference types="@typescript-to-lua/language-extensions" />
 /** @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 | null | undefined)[]) => 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>;
 export declare const luaSetContainsAnyOf: <T extends AnyNotNil>(luaSet: ReadonlyLuaSet<T>, ...elements: readonly T[]) => boolean;

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/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

@@ -2,6 +2,7 @@
 export type AnyNonNullable = {};
 export type IsExactlyAny<T> = boolean extends (T extends never ? true : false) ? true : false;
 export type NonEmptyArray<T> = [T, ...T[]];
+export type ReadonlyNonEmptyArray<T> = readonly [T, ...T[]];
 export type InvertRecordType<T extends Record<PropertyKey, PropertyKey | null | undefined>> = {
     [P in keyof T as NonNullable<T[P]>]: P;
 };

package/core/mapbounds.d.ts

@@ -1,8 +0,0 @@
-/** @noSelfInFile */
-import { Rect } from "./types/rect";
-import { Region } from "./types/region";
-export declare const boundRect: Rect;
-export declare const boundRegion: Region;
-export declare const boundMin: Readonly<Vec2>;
-export declare const boundMax: Readonly<Vec2>;
-export declare const boundCenter: Readonly<Vec2>;

package/core/mapbounds.lua

@@ -1,12 +0,0 @@
-local ____exports = {}
-local ____rect = require("core.types.rect")
-local Rect = ____rect.Rect
-local ____region = require("core.types.region")
-local Region = ____region.Region
-____exports.boundRect = Rect:of(GetWorldBounds())
-____exports.boundRegion = Region:create()
-____exports.boundRegion:addRect(____exports.boundRect)
-____exports.boundMin = vec2(____exports.boundRect.minX, ____exports.boundRect.minY)
-____exports.boundMax = vec2(____exports.boundRect.maxX, ____exports.boundRect.maxY)
-____exports.boundCenter = (____exports.boundMin + ____exports.boundMax) * 0.5
-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