warscript 0.0.1-dev.ed60fea → 0.0.1-dev.edf7fad

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")
@@ -30,6 +29,8 @@ local ____timer = require("core.types.timer")
 local Timer = ____timer.Timer
 local ____exception = require("exception")
 local IllegalStateException = ____exception.IllegalStateException
+local ____linked_2Dmap = require("utility.linked-map")
+local LinkedMap = ____linked_2Dmap.LinkedMap
 local ____assert = _G.assert
 local ____pairs = _G.pairs
 ____exports.BuffDefinition = __TS__Class()
@@ -462,7 +463,7 @@ local buffs = setmetatable(
     {
         __mode = "k",
         __index = function(self, unit)
-            local ____table = {}
+            local ____table = __TS__New(LinkedMap)
             self[unit] = ____table
             return ____table
         end
@@ -495,7 +496,7 @@ function Buff.prototype.____constructor(self, unit, source, duration, level, pre
     end
     local constructor = self.constructor
     local instances = buffs[unit]
-    local instance = instances[constructor]
+    local instance = instances:get(constructor)
     if instance then
         instance:destroy()
         if not instance.destroyed then
@@ -508,7 +509,7 @@ function Buff.prototype.____constructor(self, unit, source, duration, level, pre
             )
         end
     end
-    instances[constructor] = self
+    instances:put(constructor, self)
     if preset then
         local unitHandle = unit.handle
         local slowPoisonMethod = not preset.positive and not preset.magic
@@ -587,13 +588,13 @@ function Buff.apply(self, ...)
     end
 end
 function Buff.getInstance(self, unit)
-    return buffs[unit][self]
+    return buffs[unit]:get(self)
 end
 function Buff.isApplied(self, unit)
-    return buffs[unit][self] ~= nil
+    return buffs[unit]:get(self) ~= nil
 end
 function Buff.ifApplied(self, unit, action)
-    local instance = buffs[unit][self]
+    local instance = buffs[unit]:get(self)
     if instance then
         ____assert(__TS__InstanceOf(instance, self))
         action(instance)
@@ -616,7 +617,7 @@ function Buff.prototype.destroy(self)
     if self.preset then
         self.unit:removeAbility(self.preset.buffId)
     end
-    buffs[self.unit][self.constructor] = nil
+    buffs[self.unit]:remove(self.constructor)
     self.destroyed = true
 end
 function Buff.prototype.onDispel(self, source)
@@ -756,14 +757,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.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/objutil/object.lua

@@ -153,7 +153,7 @@ end
 function ObjectDefinition.getLevelArrayFieldValue(self, level, value, values)
     return type(values) == "function" and values(level, value) or (__TS__ArrayIsArray(values[1]) and values[1] or values)
 end
-____exports.ObjectType = ObjectType or ({})
+____exports.ObjectType = ____exports.ObjectType or ({})
 ____exports.ObjectType.ABILITY = 0
 ____exports.ObjectType[____exports.ObjectType.ABILITY] = "ABILITY"
 ____exports.ObjectType.ITEM = 1

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

package/package.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://json.schemastore.org/package",
     "name": "warscript",
-    "version": "0.0.1-dev.ed60fea",
+    "version": "0.0.1-dev.edf7fad",
     "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.6",
         "lua-types": "^2.13.1",
-        "warpack": "0.0.1-dev.880fc91"
+        "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/patch-lua.lua

@@ -1,5 +1,9 @@
+local error = _G.error
 local getmetatable = _G.getmetatable
 local ipairs = _G.ipairs
+local select = _G.select
+local tostring = _G.tostring
+local tableconcat = table.concat
 
 _G.ipairs = function(t)
     local metatable = getmetatable(t)
@@ -8,3 +12,14 @@ _G.ipairs = function(t)
     end
     return ipairs(t)
 end
+
+_G.assert = function(v, ...)
+    if not v then
+        local args = {}
+        for i = 1, select("#", ...) do
+            args[i] = tostring(select(i, ...))
+        end
+        error(tableconcat(args, " "))
+    end
+    return v, ...
+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)[];

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

package/utility/callback-array.d.ts

@@ -0,0 +1,17 @@
+/** @noSelfInFile */
+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): 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

@@ -0,0 +1,61 @@
+local ____exports = {}
+local safeCall, tableUnpack
+function ____exports.invokeCallbacks(array)
+    local length = array[1] or 2
+    local i = 2
+    while i ~= length do
+        local callback = array[i]
+        i = i + 1
+        local argsCount = array[i]
+        i = i + 1
+        safeCall(
+            callback,
+            tableUnpack(array, i, i + argsCount - 1)
+        )
+        i = i + argsCount
+    end
+end
+safeCall = warpack.safeCall
+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 id = array[1] or 2
+    local i = id
+    array[i] = callback
+    local argsCount = select("#", ...)
+    i = i + 1
+    array[i] = argsCount
+    for j = 1, argsCount do
+        i = i + 1
+        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)
+    local newLength = array[1] or 2
+    tableMove(array, length, length + newLength - 3, 2)
+    array[1] = newLength - length + 2
+end
+return ____exports

package/utility/functions.d.ts

@@ -3,3 +3,11 @@ export declare const apply: {
     <T, ConsumerParameters extends any[]>(object: T, consumer: (value: T, ...parameters: ConsumerParameters) => void, ...parameters: ConsumerParameters): T;
     <T, ConsumerParameters extends any[], K extends KeysOfType<T, (...parameters: ConsumerParameters) => void>>(object: T, key: K, ...parameters: ConsumerParameters): T;
 };
+export declare const identity: <T>(value: T) => T;
+export declare const firstArgument: <T>(value: T) => T;
+export declare const secondArgument: <T>(_: unknown, value: T) => T;
+export declare const thirdArgument: <T>(_first: unknown, _second: unknown, value: T) => T;
+export declare const increment: (value: number) => number;
+export declare const or: (lhs: boolean, rhs: boolean) => boolean;
+export type Transform<T, R> = (<T, R>(value: T) => R) | KeysOfType<T, R>;
+export declare const transform: <T, R>(object: T, transform: Transform<T, R>) => R;

package/utility/functions.lua

@@ -87,4 +87,17 @@ ____exports.apply = function(object, transform, ...)
     end
     return object
 end
+____exports.identity = function(value) return value end
+____exports.firstArgument = ____exports.identity
+____exports.secondArgument = function(_, value) return value end
+____exports.thirdArgument = function(_first, _second, value) return value end
+____exports.increment = function(value) return value + 1 end
+____exports["or"] = function(lhs, rhs) return lhs or rhs end
+____exports.transform = function(object, transform)
+    if type(transform) == "function" then
+        return transform(object)
+    else
+        return object[transform]
+    end
+end
 return ____exports

package/utility/linked-map.d.ts

@@ -0,0 +1,34 @@
+/** @noSelfInFile */
+import { ReadonlyLinkedSet } from "./linked-set";
+type IteratorState<K extends AnyNotNil, V> = {
+    n?: K;
+    t: LuaMap<K, K>;
+    v: LuaMap<K, 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> implements ReadonlyLinkedMap<K, V> {
+    private k;
+    private v;
+    get keys(): ReadonlyLinkedSet<K>;
+    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 __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

@@ -0,0 +1,101 @@
+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]
+    return n, state.v[n]
+end
+____exports.LinkedMap = __TS__Class()
+local LinkedMap = ____exports.LinkedMap
+LinkedMap.name = "LinkedMap"
+function LinkedMap.prototype.____constructor(self)
+    self.k = __TS__New(LinkedSet)
+    self.v = {}
+end
+function LinkedMap.prototype.get(self, key)
+    return self.v[key]
+end
+function LinkedMap.prototype.getOrPut(self, key, defaultValue)
+    local value = self.v[key]
+    if value ~= nil then
+        return value
+    end
+    value = defaultValue()
+    self.k:add(key)
+    self.v[key] = value
+    return value
+end
+function LinkedMap.prototype.put(self, key, value)
+    self.k:add(key)
+    self.v[key] = value
+end
+function LinkedMap.prototype.remove(self, key)
+    if self.k:remove(key) then
+        self.v[key] = nil
+        return true
+    end
+    return false
+end
+function LinkedMap.prototype.contains(self, key)
+    return self.keys:contains(key)
+end
+function LinkedMap.prototype.__pairs(self)
+    return linkedMapNext, {n = self.k.f, t = self.k.n, v = self.v}, nil
+end
+__TS__SetDescriptor(
+    LinkedMap.prototype,
+    "keys",
+    {get = function(self)
+        return self.k
+    end},
+    true
+)
+__TS__SetDescriptor(
+    LinkedMap.prototype,
+    "size",
+    {get = function(self)
+        return self.keys.size
+    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;
@@ -36,9 +36,11 @@ 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;
+    protected addBefore(value: T, key: T): boolean;
     remove(key: T): boolean;
     contains(key: AnyNotNil): key is T & OneSidedTypeGuard;
     clear(): void;
@@ -50,6 +52,7 @@ export declare class LinkedSet<T extends AnyNotNil> implements ReadonlyLinkedSet
     protected __pairs(this: LinkedSet<T>): LuaIterator<T | undefined, IteratorState<T>>;
 }
 export declare const emptyLinkedSet: <T extends AnyNotNil>() => ReadonlyLinkedSet<T>;
+export declare const mutableLinkedSet: <T extends AnyNotNil>() => LinkedSet<T>;
 export declare const mutableLinkedSetOf: <T extends AnyNotNil>(...elements: ReadonlyArray<T>) => LinkedSet<T>;
 export declare const mutableLinkedSetOfNotNull: <T extends AnyNotNil>(...elements: readonly (T | undefined | null)[]) => LinkedSet<T>;
 export declare const linkedSetOf: <T extends AnyNotNil>(...elements: ReadonlyArray<T>) => ReadonlyLinkedSet<T>;

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
@@ -68,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]
@@ -107,8 +141,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)
@@ -164,6 +199,7 @@ __TS__SetDescriptor(
     end},
     true
 )
+local emptyIteratorState = {t = {}}
 local EmptyLinkedSet = __TS__Class()
 EmptyLinkedSet.name = "EmptyLinkedSet"
 __TS__ClassExtends(EmptyLinkedSet, ____exports.LinkedSet)
@@ -173,10 +209,16 @@ function EmptyLinkedSet.prototype.add(self)
         0
     )
 end
+function EmptyLinkedSet.prototype.__pairs(self)
+    return linkedSetNext, emptyIteratorState, nil
+end
 local EMPTY_LINKED_SET = __TS__New(EmptyLinkedSet)
 ____exports.emptyLinkedSet = function()
     return EMPTY_LINKED_SET
 end
+____exports.mutableLinkedSet = function()
+    return __TS__New(____exports.LinkedSet)
+end
 ____exports.mutableLinkedSetOf = function(...)
     local linkedSet = __TS__New(____exports.LinkedSet)
     for i = 1, select("#", ...) do

package/utility/lua-maps.d.ts

@@ -1,5 +1,18 @@
 /** @noSelfInFile */
 import { Flatten, TupleOf } from "./types";
+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 luaMapInvert: <K extends AnyNotNil, V extends AnyNotNil>(luaMap: ReadonlyLuaMap<K, V | undefined | null>) => LuaMap<V, K>;
+export declare const toLuaMap: <K extends PropertyKey, V>(record: Record<K, V>) => LuaMap<K, V>;
+export declare const flattenKeys: <K extends AnyNotNil, V>(luaMap: ReadonlyLuaMap<readonly K[], V> | ReadonlyLuaMap<K[], V>) => LuaMap<K, V>;
+export declare const mapKeys: {
+    <K1 extends AnyNotNil, K2 extends AnyNotNil, V>(luaMap: ReadonlyLuaMap<K1, V>, transform: (value: K1) => K2): LuaMap<K2, V>;
+    <K1 extends AnyNotNil, K2 extends keyof K1, V>(luaMap: ReadonlyLuaMap<K1, V>, key: K2): K1[K2] extends AnyNotNil ? LuaMap<K1[K2], V> : never;
+};
+export declare const mapValues: {
+    <K extends AnyNotNil, V1, V2>(luaMap: ReadonlyLuaMap<K, V1>, transform: (value: V1) => V2): LuaMap<K, V2>;
+    <K extends AnyNotNil, V1, V2 extends keyof V1>(luaMap: ReadonlyLuaMap<K, V1>, key: V2): LuaMap<K, V1[V2]>;
+};
+export declare const getOrPut: <K extends AnyNotNil, V>(luaMap: LuaMap<K, V>, key: K, defaultValue: () => V) => V;