warscript 0.0.1-dev.ec4cf89 → 0.0.1-dev.eda504c

package/engine/text-tag.lua

@@ -1,9 +1,22 @@
 local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
+local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local __TS__New = ____lualib.__TS__New
+local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local __TS__ObjectAssign = ____lualib.__TS__ObjectAssign
 local ____exports = {}
 local ____color = require("core.types.color")
 local Color = ____color.Color
+local ____timer = require("core.types.timer")
+local Timer = ____timer.Timer
+local ____destroyable = require("destroyable")
+local AbstractDestroyable = ____destroyable.AbstractDestroyable
+local ____playerCamera = require("core.types.playerCamera")
+local worldCoordinatesToFrame = ____playerCamera.worldCoordinatesToFrame
+local ____get_2Dterrain_2Dz = require("engine.internal.misc.get-terrain-z")
+local getTerrainZ = ____get_2Dterrain_2Dz.getTerrainZ
+local ____player_2Dlocal_2Dhandle = require("engine.internal.misc.player-local-handle")
+local PLAYER_LOCAL_HANDLE = ____player_2Dlocal_2Dhandle.PLAYER_LOCAL_HANDLE
 local createTextTag = CreateTextTag
 local destroyTextTag = DestroyTextTag
 local setTextTagText = SetTextTagText
@@ -17,17 +30,14 @@ local setTextTagPermanent = SetTextTagPermanent
 local setTextTagAge = SetTextTagAge
 local setTextTagLifespan = SetTextTagLifespan
 local setTextTagFadepoint = SetTextTagFadepoint
+local isUnitHidden = IsUnitHidden
+local isUnitLoaded = IsUnitLoaded
+local isUnitVisible = IsUnitVisible
+local getUnitFlyHeight = GetUnitFlyHeight
+local getUnitX = GetUnitX
+local getUnitY = GetUnitY
 local DEFAULT_FONT_SIZE = 0.024
-____exports.TextTag = __TS__Class()
-local TextTag = ____exports.TextTag
-TextTag.name = "TextTag"
-function TextTag.prototype.____constructor(self, handle)
-    self.handle = handle
-end
-function TextTag.flash(self, configuration, text, x, y, z)
-    local textTag = createTextTag()
-    setTextTagText(textTag, text, DEFAULT_FONT_SIZE)
-    setTextTagPos(textTag, x + configuration.offsetX, y + configuration.offsetY, (z or 0) + configuration.offsetZ)
+local function applyConfiguration(textTag, configuration)
     setTextTagFadepoint(textTag, configuration.fadepoint)
     setTextTagLifespan(textTag, configuration.lifespan)
     local color = configuration.color
@@ -42,6 +52,213 @@ function TextTag.flash(self, configuration, text, x, y, z)
     setTextTagPermanent(textTag, false)
     setTextTagVisibility(textTag, true)
 end
+local unitTextTags = setmetatable({}, {__mode = "k"})
+local function ensureHandle(textTag)
+    local handle = textTag[101]
+    if handle == nil then
+        handle = createTextTag()
+        applyConfiguration(handle, textTag[102])
+        setTextTagPermanent(handle, true)
+        setTextTagText(handle, textTag[103] or "", textTag[104] or DEFAULT_FONT_SIZE)
+        local color = textTag[105]
+        if color ~= nil then
+            setTextTagColor(
+                handle,
+                color.r,
+                color.g,
+                color.b,
+                color.a
+            )
+        end
+        local unit = textTag[100]
+        if unit ~= nil then
+            setTextTagPosUnit(handle, unit.handle, textTag[102].offsetZ)
+        else
+            setTextTagPos(handle, textTag[106] or 0, textTag[107] or 0, 0)
+        end
+        textTag[101] = handle
+    end
+    return handle
+end
+____exports.TextTag = __TS__Class()
+local TextTag = ____exports.TextTag
+TextTag.name = "TextTag"
+__TS__ClassExtends(TextTag, AbstractDestroyable)
+function TextTag.prototype.____constructor(self, handle)
+    AbstractDestroyable.prototype.____constructor(self)
+    self[101] = handle
+end
+function TextTag.prototype.onDestroy(self)
+    local handle = self[101]
+    if handle ~= nil then
+        destroyTextTag(handle)
+        self[101] = nil
+    end
+    unitTextTags[self] = nil
+    return AbstractDestroyable.prototype.onDestroy(self)
+end
+function TextTag.flash(self, configuration, text, x, y, z)
+    local textTag = createTextTag()
+    setTextTagText(textTag, text, DEFAULT_FONT_SIZE)
+    setTextTagPos(textTag, x + configuration.offsetX, y + configuration.offsetY, (z or 0) + configuration.offsetZ)
+    applyConfiguration(textTag, configuration)
+end
+function TextTag.create(self, configuration, text, unit)
+    local textTag = __TS__New(____exports.TextTag)
+    textTag[103] = text
+    textTag[100] = unit
+    textTag[102] = configuration
+    ensureHandle(textTag)
+    unitTextTags[textTag] = true
+    return textTag
+end
+__TS__SetDescriptor(
+    TextTag.prototype,
+    "text",
+    {
+        get = function(self)
+            return self[103] or ""
+        end,
+        set = function(self, text)
+            setTextTagText(
+                ensureHandle(self),
+                text,
+                self[104] or DEFAULT_FONT_SIZE
+            )
+            self[103] = text
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    TextTag.prototype,
+    "fontSize",
+    {
+        get = function(self)
+            return self[104] or DEFAULT_FONT_SIZE
+        end,
+        set = function(self, fontSize)
+            setTextTagText(
+                ensureHandle(self),
+                self[103] or "",
+                fontSize
+            )
+            self[104] = fontSize
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    TextTag.prototype,
+    "color",
+    {
+        get = function(self)
+            return self[105] or Color.white
+        end,
+        set = function(self, color)
+            setTextTagColor(
+                ensureHandle(self),
+                color.r,
+                color.g,
+                color.b,
+                color.a
+            )
+            self[105] = color
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    TextTag.prototype,
+    "unit",
+    {
+        get = function(self)
+            return self[100]
+        end,
+        set = function(self, unit)
+            if unit ~= nil then
+                setTextTagPosUnit(
+                    ensureHandle(self),
+                    unit.handle,
+                    0
+                )
+                self[106] = nil
+                self[107] = nil
+                unitTextTags[self] = true
+            elseif self[100] ~= nil then
+                local unit = self[100]
+                local x = unit.x
+                local y = unit.y
+                setTextTagPos(
+                    ensureHandle(self),
+                    x,
+                    y,
+                    0
+                )
+                self[106] = x
+                self[107] = y
+                unitTextTags[self] = nil
+            end
+            self[100] = unit
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    TextTag.prototype,
+    "x",
+    {
+        get = function(self)
+            local ____self__106_2 = self[106]
+            if ____self__106_2 == nil then
+                local ____opt_0 = self[100]
+                ____self__106_2 = ____opt_0 and ____opt_0.x
+            end
+            return ____self__106_2 or 0
+        end,
+        set = function(self, x)
+            local ____ensureHandle_result_6 = ensureHandle(self)
+            local ____x_7 = x
+            local ____self__107_5 = self[107]
+            if ____self__107_5 == nil then
+                local ____opt_3 = self[100]
+                ____self__107_5 = ____opt_3 and ____opt_3.y
+            end
+            setTextTagPos(____ensureHandle_result_6, ____x_7, ____self__107_5 or 0, 0)
+            self[106] = x
+            self[100] = nil
+            unitTextTags[self] = nil
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    TextTag.prototype,
+    "y",
+    {
+        get = function(self)
+            local ____self__107_10 = self[107]
+            if ____self__107_10 == nil then
+                local ____opt_8 = self[100]
+                ____self__107_10 = ____opt_8 and ____opt_8.y
+            end
+            return ____self__107_10 or 0
+        end,
+        set = function(self, y)
+            local ____ensureHandle_result_14 = ensureHandle(self)
+            local ____self__106_13 = self[106]
+            if ____self__106_13 == nil then
+                local ____opt_11 = self[100]
+                ____self__106_13 = ____opt_11 and ____opt_11.x
+            end
+            setTextTagPos(____ensureHandle_result_14, ____self__106_13 or 0, y, 0)
+            self[107] = y
+            self[100] = nil
+            unitTextTags[self] = nil
+        end
+    },
+    true
+)
 TextTag.BASE = {
     fadepoint = 2,
     lifespan = 3,
@@ -106,4 +323,26 @@ TextTag.SHADOW_STRIKE = __TS__ObjectAssign(
         lifespan = 5
     }
 )
+Timer.onPeriod[1 / 64]:addListener(function()
+    for textTag in pairs(unitTextTags) do
+        local unit = textTag[100].handle
+        local x = getUnitX(unit)
+        local y = getUnitY(unit)
+        local ____, ____, isInView = worldCoordinatesToFrame(
+            x,
+            y,
+            getUnitFlyHeight(unit) + getTerrainZ(x, y)
+        )
+        if isInView and not isUnitHidden(unit) and not isUnitLoaded(unit) and isUnitVisible(unit, PLAYER_LOCAL_HANDLE) then
+            setTextTagPosUnit(
+                ensureHandle(textTag),
+                unit,
+                textTag[102].offsetZ
+            )
+        elseif textTag[101] ~= nil then
+            destroyTextTag(textTag[101])
+            textTag[101] = nil
+        end
+    end
+end)
 return ____exports

package/engine/unit.d.ts

@@ -1,9 +1,11 @@
 /** @noSelfInFile */
 import "./internal/unit";
+import "./internal/unit/order";
 import "./internal/unit/ability";
 import "./internal/unit/allowed-targets";
 import "./internal/unit/buff";
 import "./internal/unit/expiration-timer";
+import "./internal/unit/item";
 import "./internal/unit+ability";
 import "./internal/unit+damage";
 import "./internal/unit+rally";
@@ -15,6 +17,8 @@ import "./internal/unit-missile-launch";
 import "./internal/unit/ghost-counter";
 import "./internal/unit/invulnerability-counter";
 import "./internal/unit/detach-missiles";
+import "./internal/unit/main-selected";
+import "./internal/unit/add-item-to-slot-init";
 import "./internal/unit/band-aids/ancestral-spirit-cannibalize";
 export { Unit, DamagingEvent, DamageEvent } from "./internal/unit";
 export * from "./internal/unit+damage";

package/engine/unit.lua

@@ -1,9 +1,11 @@
 local ____exports = {}
 require("engine.internal.unit")
+require("engine.internal.unit.order")
 require("engine.internal.unit.ability")
 require("engine.internal.unit.allowed-targets")
 require("engine.internal.unit.buff")
 require("engine.internal.unit.expiration-timer")
+require("engine.internal.unit.item")
 require("engine.internal.unit+ability")
 require("engine.internal.unit+damage")
 require("engine.internal.unit+rally")
@@ -15,6 +17,8 @@ require("engine.internal.unit-missile-launch")
 require("engine.internal.unit.ghost-counter")
 require("engine.internal.unit.invulnerability-counter")
 require("engine.internal.unit.detach-missiles")
+require("engine.internal.unit.main-selected")
+require("engine.internal.unit.add-item-to-slot-init")
 require("engine.internal.unit.band-aids.ancestral-spirit-cannibalize")
 do
     local ____unit = require("engine.internal.unit")

package/index.d.ts

@@ -1,5 +1,6 @@
 /** @noSelfInFile */
 import "./types";
+import "./patch-lua";
 import "./patch-lualib";
 import "./patch-natives";
 import "./global/math";

package/index.lua

@@ -1,5 +1,6 @@
 local ____exports = {}
 require("types")
+require("patch-lua")
 require("patch-lualib")
 require("patch-natives")
 require("global.math")

package/net/socket.d.ts

@@ -1,9 +1,15 @@
 /** @noSelfInFile */
 import { Event } from "../event";
 import { Player } from "../core/types/player";
+declare const enum SocketPropertyKey {
+    ID = 0,
+    CHUNK_ID = 1
+}
 export declare class Socket {
-    private readonly id;
+    private readonly [SocketPropertyKey.ID];
+    private readonly [SocketPropertyKey.CHUNK_ID];
     readonly onMessage: Event<[Player, string]>;
     constructor();
     send(data: string): void;
 }
+export {};

package/net/socket.lua

@@ -7,6 +7,11 @@ local Event = ____event.Event
 local ____network = require("network")
 local send = ____network.send
 local onReceive = ____network.onReceive
+local MAX_PAYLOAD_LENGTH = ____network.MAX_PAYLOAD_LENGTH
+local ____math = require("math")
+local ceil = ____math.ceil
+local stringSub = string.sub
+local tableConcat = table.concat
 local nextId = 0
 ____exports.Socket = __TS__Class()
 local Socket = ____exports.Socket
@@ -14,13 +19,49 @@ Socket.name = "Socket"
 function Socket.prototype.____constructor(self)
     local ____tostring_0 = tostring
     nextId = nextId + 1
-    self.id = ____tostring_0(nextId)
+    self[0] = ____tostring_0(nextId)
+    local ____tostring_1 = tostring
+    nextId = nextId + 1
+    self[1] = ____tostring_1(nextId)
     self.onMessage = __TS__New(Event)
-    onReceive[self.id]:addListener(function(sender, data)
-        Event.invoke(self.onMessage, sender, data)
+    local chunksByPlayer = {}
+    onReceive[self[0]]:addListener(function(sender, data)
+        local chunks = chunksByPlayer[sender]
+        if chunks ~= nil then
+            chunks[#chunks + 1] = data
+            Event.invoke(
+                self.onMessage,
+                sender,
+                tableConcat(chunks)
+            )
+            chunksByPlayer[sender] = nil
+        else
+            Event.invoke(self.onMessage, sender, data)
+        end
+    end)
+    onReceive[self[1]]:addListener(function(sender, data)
+        local chunks = chunksByPlayer[sender]
+        if chunks == nil then
+            chunks = {}
+            chunksByPlayer[sender] = chunks
+        end
+        chunks[#chunks + 1] = data
     end)
 end
 function Socket.prototype.send(self, data)
-    send(self.id, data)
+    local chunks = ceil(#data / MAX_PAYLOAD_LENGTH) - 1
+    local offset = 1
+    for _ = 0, chunks - 1 do
+        local nextOffset = offset + MAX_PAYLOAD_LENGTH
+        send(
+            self[1],
+            stringSub(data, offset, nextOffset - 1)
+        )
+        offset = nextOffset
+    end
+    send(
+        self[0],
+        stringSub(data, offset)
+    )
 end
 return ____exports

package/network.d.ts

@@ -2,6 +2,7 @@
 import { Event } from "./event";
 import { Player } from "./core/types/player";
 import { Operation, OperationContinue, OperationMonitor } from "./operation";
+export declare const MAX_PAYLOAD_LENGTH = 255;
 export declare const onReceive: {
     [prefix: string]: Event<[Player, string]>;
 } & {

package/network.lua

@@ -25,6 +25,7 @@ local concat = table.concat
 local pack = string.pack
 local sub = string.sub
 local ____unpack = string.unpack
+____exports.MAX_PAYLOAD_LENGTH = 255
 ____exports.onReceive = setmetatable(
     {},
     {__index = function(self, prefix)
@@ -42,11 +43,11 @@ ____exports.onReceive = setmetatable(
     end}
 )
 function ____exports.send(id, payload)
-    if #payload > 255 then
+    if #payload > ____exports.MAX_PAYLOAD_LENGTH then
         error(
             __TS__New(
                 IllegalArgumentException,
-                "payload length must be <= 256, but was " .. tostring(#payload)
+                (("payload length must be <= " .. tostring(____exports.MAX_PAYLOAD_LENGTH)) .. ", but was ") .. tostring(#payload)
             ),
             0
         )

package/objutil/buff.lua

@@ -20,7 +20,6 @@ local AbilityDefinitionInnerFire = ____ability.AbilityDefinitionInnerFire
 local AbilityDefinitionSearingArrows = ____ability.AbilityDefinitionSearingArrows
 local AbilityDefinitionSlowPoison = ____ability.AbilityDefinitionSlowPoison
 local ____unit = require("core.types.unit")
-local AttackType = ____unit.AttackType
 local DamageType = ____unit.DamageType
 local Unit = ____unit.Unit
 local ____dummy = require("core.dummy")
@@ -756,14 +755,14 @@ for ____, pointDispelAbilityId in ipairs(pointDispelAbilityIds) do
     end)
 end
 Unit.onDamaging:addListener(function(source, target, event)
-    if event.amount == 0 and event.attackType == AttackType.SPELL and event.damageType == DamageType.NORMAL and not event.isAttack then
+    if event.amount == 0 and event.attackType == 0 and event.damageType == DamageType.NORMAL and not event.isAttack then
         Timer:run(function()
             checkBuffs(target, true, source)
         end)
     end
 end)
-Unit.onItemPickup:addListener(function(unit, item)
-    if item.powerup and item:hasAbility(fourCC("APdi")) then
+Unit.itemPickedUpEvent:addListener(function(unit, item)
+    if item.isPowerUp and item:hasAbility(fourCC("APdi")) then
     end
 end)
 return ____exports

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/package.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://json.schemastore.org/package",
     "name": "warscript",
-    "version": "0.0.1-dev.ec4cf89",
+    "version": "0.0.1-dev.eda504c",
     "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.b573f4b"
+        "warpack": "0.0.1-dev.251db08"
     },
     "devDependencies": {
         "@typescript-eslint/eslint-plugin": "^8.13.0",

package/patch-lua.lua

@@ -0,0 +1,10 @@
+local getmetatable = _G.getmetatable
+local ipairs = _G.ipairs
+
+_G.ipairs = function(t)
+    local metatable = getmetatable(t)
+    if metatable and metatable.__ipairs then
+        return metatable.__ipairs(t)
+    end
+    return ipairs(t)
+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/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;
@@ -22,6 +23,7 @@ export declare const mapToLuaSet: {
     <T, R extends AnyNotNil>(array: readonly T[], transform: (value: T) => R): LuaSet<R>;
     <T, K extends KeysOfType<T, AnyNotNil>>(array: readonly T[], key: K): LuaSet<T[K] extends AnyNotNil ? T[K] : never>;
 };
+export declare const flatten: <T>(array: readonly (readonly T[])[]) => T[];
 export declare const flatMap: {
     <T, R>(array: readonly T[], transform: (value: T) => readonly R[]): R[];
     <T, K extends KeysOfType<T, readonly any[]>>(array: readonly T[], key: K): (T[K] extends readonly (infer R)[] ? R : never)[];
@@ -32,7 +34,10 @@ export declare const flatMapToLuaSet: {
 };
 export declare const mapIndexed: <T, R>(array: readonly T[], transform: (index: number, value: T) => R) => R[];
 export declare const associate: <T, K extends AnyNotNil, V>(array: readonly T[], keySelector: (value: T) => K, valueSelector: (value: T) => V) => LuaMap<K, V>;
-export declare const associateBy: <K extends AnyNotNil, V>(array: readonly V[], keySelector: (value: V) => K) => LuaMap<K, V>;
+export declare const associateBy: {
+    <K extends AnyNotNil, V>(array: readonly V[], keySelector: (value: V) => K): LuaMap<K, V>;
+    <K extends KeysOfType<V, AnyNotNil>, V>(array: readonly V[], keySelector: K): LuaMap<V[K] extends AnyNotNil ? V[K] : never, V>;
+};
 export declare const associateByIndexed: <K extends AnyNotNil, V>(array: readonly V[], keySelector: (index: number, value: V) => K) => LuaMap<K, V>;
 export declare const associateWith: <K extends AnyNotNil, V>(array: readonly K[], valueSelector: (value: K) => V) => LuaMap<K, V>;
 export declare const associateWithIndexed: <K extends AnyNotNil, V>(array: readonly K[], valueSelector: (index: number, value: K) => V) => LuaMap<K, V>;
@@ -41,6 +46,10 @@ export declare const average: (array: readonly number[]) => number;
 export declare const sum: (array: readonly number[]) => number;
 export declare const product: (array: readonly number[]) => number;
 export declare const max: (array: readonly number[]) => number;
+export declare const maxBy: {
+    <T, Args extends any[]>(array: readonly T[], selector: (value: T, ...args: Args) => number, ...args: Args): T | undefined;
+    <T, K extends KeysOfType<T, number>>(array: readonly T[], key: K): T | undefined;
+};
 export declare const intersperse: <T>(array: readonly T[], delimiter: T) => T[];
 export declare const zip: <T, R, V>(array: readonly T[], otherArray: readonly R[], transform: (value: T, otherValue: R) => V) => V[];
 export declare const chunked: <T>(array: readonly T[], size: number) => T[][];

package/utility/arrays.lua

@@ -3,6 +3,8 @@ local __TS__New = ____lualib.__TS__New
 local ____exports = {}
 local ____exception = require("exception")
 local IllegalArgumentException = ____exception.IllegalArgumentException
+local ____functions = require("utility.functions")
+local identity = ____functions.identity
 local mathMax = math.max
 local mathMin = math.min
 local select = _G.select
@@ -47,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
@@ -120,6 +130,7 @@ ____exports.mapToLuaSet = function(array, transform)
     end
     return result
 end
+____exports.flatten = function(array) return ____exports.flatMap(array, identity) end
 ____exports.flatMap = function(array, transform)
     local result = {}
     local k = 1
@@ -178,9 +189,16 @@ ____exports.associate = function(array, keySelector, valueSelector)
 end
 ____exports.associateBy = function(array, keySelector)
     local result = {}
-    for i = 1, #array do
-        local value = array[i]
-        result[keySelector(value)] = value
+    if type(keySelector) == "function" then
+        for i = 1, #array do
+            local value = array[i]
+            result[keySelector(value)] = value
+        end
+    else
+        for i = 1, #array do
+            local value = array[i]
+            result[value[keySelector]] = value
+        end
     end
     return result
 end
@@ -251,6 +269,30 @@ ____exports.max = function(array)
     end
     return mathMax(table.unpack(array))
 end
+____exports.maxBy = function(array, selector, ...)
+    local result = nil
+    local maxValue = -math.huge
+    if type(selector) == "function" then
+        for i = 1, #array do
+            local element = array[i]
+            local value = selector(element, ...)
+            if value > maxValue then
+                result = element
+                maxValue = value
+            end
+        end
+    else
+        for i = 1, #array do
+            local element = array[i]
+            local value = element[selector]
+            if value > maxValue then
+                result = element
+                maxValue = value
+            end
+        end
+    end
+    return result
+end
 ____exports.intersperse = function(array, delimiter)
     local result = {}
     local length = #array