warscript 0.0.1-dev.e72b4b0 → 0.0.1-dev.ea102a7

package/engine/object-field.lua

@@ -58,9 +58,9 @@ end
 function ObjectFieldBase.prototype.supports(self, instance)
     return __TS__InstanceOf(instance, self.instanceClass)
 end
-function ObjectFieldBase.prototype.hasValue(self, instance)
+function ObjectFieldBase.prototype.hasValue(self, objectDataEntryId)
     local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
-    return self.isGlobal or defaultValueByObjectDataEntryId ~= nil and defaultValueByObjectDataEntryId[self:getObjectDataEntryId(instance)] ~= nil or self:hasNativeFieldValue(instance)
+    return self.isGlobal or defaultValueByObjectDataEntryId ~= nil and defaultValueByObjectDataEntryId[objectDataEntryId] ~= nil or self:hasNativeFieldValue(objectDataEntryId)
 end
 function ObjectFieldBase.create(self, id, isGlobal)
     return __TS__New(
@@ -215,8 +215,9 @@ function ObjectField.prototype.getActualValue(self, instance)
 end
 function ObjectField.prototype.setActualValue(self, instance, value)
     local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
+    local objectDataEntryId = self:getObjectDataEntryId(instance)
     if defaultValueByObjectDataEntryId ~= nil or self.isGlobal then
-        local defaultValue = (defaultValueByObjectDataEntryId or emptyLuaMap())[self:getObjectDataEntryId(instance)]
+        local defaultValue = (defaultValueByObjectDataEntryId or emptyLuaMap())[objectDataEntryId]
         if defaultValue ~= nil or self.isGlobal then
             local ____self_valueByInstance_instance_3 = self.valueByInstance[instance]
             if ____self_valueByInstance_instance_3 == nil then
@@ -234,7 +235,7 @@ function ObjectField.prototype.setActualValue(self, instance, value)
             return true
         end
     end
-    if not self:hasNativeFieldValue(instance) then
+    if not self:hasNativeFieldValue(objectDataEntryId) then
         return false
     end
     local previousValue = self:getNativeFieldValue(instance)
@@ -460,8 +461,9 @@ function ObjectLevelField.prototype.setValue(self, entry, levelOrValue, value)
         return true
     end
     local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
+    local objectDataEntryId = self:getObjectDataEntryId(entry)
     if defaultValueByObjectDataEntryId ~= nil or self.isGlobal then
-        local defaultValueByLevel = (defaultValueByObjectDataEntryId or emptyLuaMap())[self:getObjectDataEntryId(entry)]
+        local defaultValueByLevel = (defaultValueByObjectDataEntryId or emptyLuaMap())[objectDataEntryId]
         if defaultValueByLevel ~= nil or self.isGlobal then
             local valueByLevel = self.valueByInstance[entry]
             if valueByLevel == nil then
@@ -490,7 +492,7 @@ function ObjectLevelField.prototype.setValue(self, entry, levelOrValue, value)
             return true
         end
     end
-    if not self:hasNativeFieldValue(entry) then
+    if not self:hasNativeFieldValue(objectDataEntryId) then
         return false
     end
     local previousValue = self:getNativeFieldValue(entry, level)

package/engine/random.d.ts

@@ -1,4 +1,5 @@
 /** @noSelfInFile */
+import { ReadonlyNonEmptyArray } from "../utility/types";
 export declare const randomAngle: () => number;
 export declare const randomInteger: {
     (upperBound?: number): number;
@@ -9,3 +10,11 @@ export declare const randomFloat: {
     (lowerBound: number, upperBound: number): number;
 };
 export declare const randomXY: (centerX: number, centerY: number, range: number) => LuaMultiReturn<[x: number, y: number]>;
+export declare const randomElement: {
+    <T>(array: ReadonlyNonEmptyArray<T>): T;
+    <T>(array: ReadonlyArray<T>): T | undefined;
+};
+export declare const random: {
+    <T>(element: T, ...elements: T[]): T;
+    <T>(...elements: T[]): T | undefined;
+};

package/engine/random.lua

@@ -4,6 +4,7 @@ local MAXIMUM_INTEGER = ____math.MAXIMUM_INTEGER
 local PI = ____math.PI
 local getRandomInt = GetRandomInt
 local getRandomReal = GetRandomReal
+local select = _G.select
 local cos = math.cos
 local sin = math.sin
 local sqrt = math.sqrt
@@ -15,4 +16,16 @@ ____exports.randomXY = function(centerX, centerY, range)
     local t = getRandomReal(0, 1) * 2 * PI
     return centerX + r * cos(t), centerY + r * sin(t)
 end
+____exports.randomElement = function(array)
+    return array[getRandomInt(1, #array)]
+end
+____exports.random = function(...)
+    return (select(
+        getRandomInt(
+            1,
+            select("#", ...)
+        ),
+        ...
+    ))
+end
 return ____exports

package/engine/standard/fields/unit.d.ts

@@ -1,3 +1,4 @@
 /** @noSelfInFile */
-import { UnitPropulsionWindowField } from "../../object-field/unit";
+import { UnitClassificationsField, UnitPropulsionWindowField } from "../../object-field/unit";
 export declare const PROPULSION_WINDOW_UNIT_FLOAT_FIELD: UnitPropulsionWindowField & symbol;
+export declare const UNIT_CLASSIFICATIONS_FIELD: UnitClassificationsField & symbol;

package/engine/standard/fields/unit.lua

@@ -1,5 +1,7 @@
 local ____exports = {}
 local ____unit = require("engine.object-field.unit")
+local UnitClassificationsField = ____unit.UnitClassificationsField
 local UnitPropulsionWindowField = ____unit.UnitPropulsionWindowField
 ____exports.PROPULSION_WINDOW_UNIT_FLOAT_FIELD = UnitPropulsionWindowField:create(fourCC("urpw"))
+____exports.UNIT_CLASSIFICATIONS_FIELD = UnitClassificationsField:create(fourCC("utyp"))
 return ____exports

package/engine/text-tag.d.ts

@@ -23,7 +23,7 @@ declare const enum TextTagPropertyKey {
     Y = 107
 }
 export declare class TextTag extends AbstractDestroyable {
-    private readonly [TextTagPropertyKey.HANDLE];
+    private [TextTagPropertyKey.HANDLE]?;
     private [TextTagPropertyKey.CONFIGURATION]?;
     private [TextTagPropertyKey.TEXT]?;
     private [TextTagPropertyKey.FONT_SIZE]?;

package/engine/text-tag.lua

@@ -11,6 +11,12 @@ 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
@@ -24,6 +30,12 @@ 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
 local function applyConfiguration(textTag, configuration)
     setTextTagFadepoint(textTag, configuration.fadepoint)
@@ -41,6 +53,33 @@ local function applyConfiguration(textTag, configuration)
     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"
@@ -50,7 +89,11 @@ function TextTag.prototype.____constructor(self, handle)
     self[101] = handle
 end
 function TextTag.prototype.onDestroy(self)
-    destroyTextTag(self[101])
+    local handle = self[101]
+    if handle ~= nil then
+        destroyTextTag(handle)
+        self[101] = nil
+    end
     unitTextTags[self] = nil
     return AbstractDestroyable.prototype.onDestroy(self)
 end
@@ -61,14 +104,11 @@ function TextTag.flash(self, configuration, text, x, y, z)
     applyConfiguration(textTag, configuration)
 end
 function TextTag.create(self, configuration, text, unit)
-    local handle = createTextTag()
-    setTextTagText(handle, text, DEFAULT_FONT_SIZE)
-    setTextTagPosUnit(handle, unit.handle, configuration.offsetZ)
-    applyConfiguration(handle, configuration)
-    setTextTagPermanent(handle, true)
-    local textTag = __TS__New(____exports.TextTag, handle)
+    local textTag = __TS__New(____exports.TextTag)
+    textTag[103] = text
     textTag[100] = unit
     textTag[102] = configuration
+    ensureHandle(textTag)
     unitTextTags[textTag] = true
     return textTag
 end
@@ -80,7 +120,11 @@ __TS__SetDescriptor(
             return self[103] or ""
         end,
         set = function(self, text)
-            setTextTagText(self[101], text, self[104] or DEFAULT_FONT_SIZE)
+            setTextTagText(
+                ensureHandle(self),
+                text,
+                self[104] or DEFAULT_FONT_SIZE
+            )
             self[103] = text
         end
     },
@@ -94,7 +138,11 @@ __TS__SetDescriptor(
             return self[104] or DEFAULT_FONT_SIZE
         end,
         set = function(self, fontSize)
-            setTextTagText(self[101], self[103] or "", DEFAULT_FONT_SIZE)
+            setTextTagText(
+                ensureHandle(self),
+                self[103] or "",
+                fontSize
+            )
             self[104] = fontSize
         end
     },
@@ -109,7 +157,7 @@ __TS__SetDescriptor(
         end,
         set = function(self, color)
             setTextTagColor(
-                self[101],
+                ensureHandle(self),
                 color.r,
                 color.g,
                 color.b,
@@ -129,7 +177,11 @@ __TS__SetDescriptor(
         end,
         set = function(self, unit)
             if unit ~= nil then
-                setTextTagPosUnit(self[101], unit.handle, 0)
+                setTextTagPosUnit(
+                    ensureHandle(self),
+                    unit.handle,
+                    0
+                )
                 self[106] = nil
                 self[107] = nil
                 unitTextTags[self] = true
@@ -137,7 +189,12 @@ __TS__SetDescriptor(
                 local unit = self[100]
                 local x = unit.x
                 local y = unit.y
-                setTextTagPos(self[101], x, y, 0)
+                setTextTagPos(
+                    ensureHandle(self),
+                    x,
+                    y,
+                    0
+                )
                 self[106] = x
                 self[107] = y
                 unitTextTags[self] = nil
@@ -160,14 +217,14 @@ __TS__SetDescriptor(
             return ____self__106_2 or 0
         end,
         set = function(self, x)
-            local ____self__101_6 = self[101]
+            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(____self__101_6, ____x_7, ____self__107_5 or 0, 0)
+            setTextTagPos(____ensureHandle_result_6, ____x_7, ____self__107_5 or 0, 0)
             self[106] = x
             self[100] = nil
             unitTextTags[self] = nil
@@ -188,13 +245,13 @@ __TS__SetDescriptor(
             return ____self__107_10 or 0
         end,
         set = function(self, y)
-            local ____self__101_14 = self[101]
+            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(____self__101_14, ____self__106_13 or 0, y, 0)
+            setTextTagPos(____ensureHandle_result_14, ____self__106_13 or 0, y, 0)
             self[107] = y
             self[100] = nil
             unitTextTags[self] = nil
@@ -268,7 +325,24 @@ TextTag.SHADOW_STRIKE = __TS__ObjectAssign(
 )
 Timer.onPeriod[1 / 64]:addListener(function()
     for textTag in pairs(unitTextTags) do
-        setTextTagPosUnit(textTag[101], textTag[100].handle, textTag[102].offsetZ)
+        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/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.e72b4b0",
+    "version": "0.0.1-dev.ea102a7",
     "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.fa5e065"
+        "warpack": "0.0.1-dev.251db08"
     },
     "devDependencies": {
         "@typescript-eslint/eslint-plugin": "^8.13.0",

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;

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

@@ -0,0 +1,13 @@
+/** @noSelfInFile */
+type Callback = {
+    readonly __callback: 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 clearCallbacks(this: void, array: CallbackArray): 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,46 @@
+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
+function ____exports.addCallback(array, callback, ...)
+    local i = array[1] or 2
+    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
+end
+function ____exports.clearCallbacks(array)
+    local length = array[1] or 2
+    tableMove(array, length, length + length - 2, 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

@@ -4,3 +4,10 @@ export declare const apply: {
     <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

@@ -88,4 +88,16 @@ ____exports.apply = function(object, transform, ...)
     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/lua-maps.d.ts

@@ -4,6 +4,15 @@ export declare const emptyLuaMap: <K extends AnyNotNil, V>() => ReadonlyLuaMap<K
 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;

package/utility/lua-maps.lua

@@ -27,10 +27,41 @@ ____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

package/utility/lua-sets.d.ts

@@ -1,4 +1,5 @@
 /** @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>;

package/utility/lua-sets.lua

@@ -1,5 +1,9 @@
 local ____exports = {}
 local select = _G.select
+local EMPTY_LUA_SET = {}
+____exports.emptyLuaSet = function()
+    return EMPTY_LUA_SET
+end
 ____exports.mutableLuaSet = function()
     return {}
 end