warscript 0.0.1-dev.702d52d → 0.0.1-dev.70c1215

package/engine/behaviour/ability.d.ts

@@ -36,6 +36,10 @@ export declare abstract class AbilityBehavior<Parameters extends {
     ]): void;
     private static MissileLaunchConfig;
     private get missileLaunchConfig();
+    protected launchMissile(source: Unit, ...args: [
+        ...pointOrWidget: [x: number, y: number] | [widget: Unit /** TODO: support Widget */],
+        ...parameters: NonNullable<Parameters["missileParameters"]>
+    ]): void;
     protected onCreate(): void;
     onValueChange(_value: ReadonlySubscribableAbilityDependentValue<string | number | boolean>): void;
     onMissileArrival(...parameters: NonNullable<Parameters["missileParameters"]>): void;

package/engine/behaviour/ability.lua

@@ -30,7 +30,14 @@ local ____ability = require("engine.object-field.ability")
 local AbilityField = ____ability.AbilityField
 local AbilityLevelField = ____ability.AbilityLevelField
 local resolveCurrentAbilityDependentValue = ____ability.resolveCurrentAbilityDependentValue
+local ____missile = require("core.types.missile")
+local Missile = ____missile.Missile
 local createBehaviorFunctionsByAbilityTypeId = {}
+local function invokeOnMissileArrival(_missile, success, abilityBehavior, ...)
+    if success then
+        abilityBehavior:onMissileArrival(...)
+    end
+end
 local exclusiveOnImpactHandlerAbilityBehaviorByAbility = setmetatable({}, {__mode = "k"})
 local function createUnitEventListener(key)
     return function(unit, ability, ...)
@@ -160,6 +167,28 @@ function AbilityBehavior.prototype.flashSpecialEffect(self, xOrWidget, yOrParame
         )
     end
 end
+function AbilityBehavior.prototype.launchMissile(self, source, xOrWidget, yOrParameter, ...)
+    if type(xOrWidget) ~= "number" then
+        Missile:launch(
+            self.missileLaunchConfig,
+            source,
+            xOrWidget,
+            invokeOnMissileArrival,
+            self,
+            yOrParameter,
+            ...
+        )
+    else
+        Missile:launch(
+            self.missileLaunchConfig,
+            source,
+            vec2(xOrWidget, yOrParameter),
+            invokeOnMissileArrival,
+            self,
+            ...
+        )
+    end
+end
 function AbilityBehavior.prototype.onCreate(self)
 end
 function AbilityBehavior.prototype.onValueChange(self, _value)

package/engine/buff.d.ts

@@ -137,7 +137,7 @@ export declare const enum BuffTypeIdSelectionPolicy {
     LEAST_DURATION = 0
 }
 export type BuffAdditionalParameters = Prohibit<Record<string, any>, keyof BuffParameters>;
-export type BuffConstructorParameters<AdditionalParameters extends BuffAdditionalParameters> = [
+export type BuffConstructorParameters<T extends Buff<BuffAdditionalParameters>> = T extends Buff<infer AdditionalParameters> ? [
     ...typeId: [ApplicableBuffTypeId] | [
         typeIds: ReadonlyNonEmptyArray<ApplicableBuffTypeId>,
         typeIdSelectionPolicy: BuffTypeIdSelectionPolicy
@@ -147,8 +147,10 @@ export type BuffConstructorParameters<AdditionalParameters extends BuffAdditiona
     ...abilityOrParameters: [
         ability?: Ability | AbilityBehavior,
         parameters?: BuffParameters & Omit<AdditionalParameters, keyof BuffParameters>
-    ] | [parameters?: BuffParameters & Omit<AdditionalParameters, keyof BuffParameters>]
-];
+    ] | [
+        parameters?: BuffParameters & Omit<AdditionalParameters, keyof BuffParameters>
+    ]
+] : never;
 export declare class Buff<AdditionalParameters extends Prohibit<Record<string, any>, keyof BuffParameters> = object> extends UnitBehavior {
     private _unit;
     protected readonly __additionalParametersBrand?: AdditionalParameters;
@@ -212,7 +214,7 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
     private readonly [BuffPropertyKey.MISS_PROBABILITY]?;
     private readonly _abilityTypeIds?;
     private _behaviors?;
-    constructor(target: Unit, ...parameters: BuffConstructorParameters<AdditionalParameters>);
+    constructor(target: Unit, ...parameters: BuffConstructorParameters<Buff<AdditionalParameters>>);
     get level(): number;
     get remainingDamageOverDuration(): number;
     set remainingDamageOverDuration(remainingDamageOverDuration: number);
@@ -271,6 +273,7 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
     get manaRegenerationRateIncreaseFactor(): number;
     set manaRegenerationRateIncreaseFactor(manaRegenerationRateIncreaseFactor: number);
     get duration(): number;
+    set duration(duration: number);
     get remainingDuration(): number;
     set remainingDuration(remainingDuration: number);
     get abilityCooldownFactor(): number;
@@ -282,6 +285,7 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
         ...parametersOrDuration: [] | [EffectParameters] | [number]
     ]): void;
     flashSpecialEffect(...parameters: [...widget: [] | [Widget], ...duration: [] | [number]]): void;
+    expire(): void;
     protected onCreate(): void;
     protected onDestroy(): Destructor;
     static apply<T extends Buff<any>, Args extends any[]>(this: BuffConstructor<T, Args>, ...args: Args): T | undefined;

package/engine/buff.lua

@@ -585,6 +585,9 @@ function Buff.prototype.flashSpecialEffect(self, widgetOrDuration, duration)
         __TS__SparseArraySpread(____array_43)
     )
 end
+function Buff.prototype.expire(self)
+    expireBuff(self)
+end
 function Buff.prototype.onCreate(self)
 end
 function Buff.prototype.onDestroy(self)
@@ -1275,9 +1278,23 @@ __TS__SetDescriptor(
 __TS__SetDescriptor(
     Buff.prototype,
     "duration",
-    {get = function(self)
-        return self[103]
-    end},
+    {
+        get = function(self)
+            return self[103]
+        end,
+        set = function(self, duration)
+            if duration <= 0 then
+                local timer = self._timer
+                if timer ~= nil then
+                    timer:destroy()
+                    self._timer = nil
+                end
+                self[103] = 0
+            else
+                self.remainingDuration = self.remainingDuration + (duration - self[103])
+            end
+        end
+    },
     true
 )
 __TS__SetDescriptor(

package/engine/internal/unit/range-event.d.ts

@@ -0,0 +1,12 @@
+/** @noSelfInFile */
+import { Event } from "../../../event";
+declare module "../unit" {
+    interface Unit {
+        readonly unitInRangeEvent: Record<number, Event<[unit: Unit, range: number, unitInRange: Unit]>>;
+    }
+}
+declare module "../unit" {
+    interface Unit {
+        readonly unitOutOfRangeEvent: Record<number, Event<[unit: Unit, range: number, unitOutOfRange: Unit]>>;
+    }
+}

package/engine/internal/unit/range-event.lua

@@ -0,0 +1,90 @@
+local ____lualib = require("lualib_bundle")
+local __TS__New = ____lualib.__TS__New
+local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
+local ____exports = {}
+local ____event = require("event")
+local Event = ____event.Event
+local InitializingEvent = ____event.InitializingEvent
+local TriggerEvent = ____event.TriggerEvent
+local ____unit = require("engine.internal.unit")
+local Unit = ____unit.Unit
+local ____timer = require("core.types.timer")
+local Timer = ____timer.Timer
+local ____attributes = require("attributes")
+local attribute = ____attributes.attribute
+local ____linked_2Dmap = require("utility.linked-map")
+local mutableLinkedMap = ____linked_2Dmap.mutableLinkedMap
+local ____linked_2Dset = require("utility.linked-set")
+local LinkedSet = ____linked_2Dset.LinkedSet
+local mutableLinkedSet = ____linked_2Dset.mutableLinkedSet
+local getTriggerUnit = GetTriggerUnit
+local triggerRegisterUnitInRange = TriggerRegisterUnitInRange
+local eventInvoke = Event.invoke
+__TS__ObjectDefineProperty(
+    Unit.prototype,
+    "unitInRangeEvent",
+    {get = function(self)
+        local unit = self
+        local handle = self.handle
+        local unitInRangeEvent = setmetatable(
+            {},
+            {__index = function(self, value)
+                local event = __TS__New(
+                    TriggerEvent,
+                    function(trigger)
+                        triggerRegisterUnitInRange(trigger, handle, value, nil)
+                    end,
+                    function() return unit, value, Unit:of(getTriggerUnit()) end
+                )
+                rawset(self, value, event)
+                return event
+            end}
+        )
+        rawset(self, "unitInRangeEvent", unitInRangeEvent)
+        return unitInRangeEvent
+    end}
+)
+local units = __TS__New(LinkedSet)
+local unitsInRangeByRangeAttribute = attribute()
+local function registerUnitOfRangeEvent(unit, range, unitInRange)
+    units:add(unit)
+    unit:getOrPut(unitsInRangeByRangeAttribute, mutableLinkedMap):getOrPut(range, mutableLinkedSet):add(unitInRange)
+end
+__TS__ObjectDefineProperty(
+    Unit.prototype,
+    "unitOutOfRangeEvent",
+    {get = function(self)
+        local unit = self
+        local unitOutOfRangeEvent = setmetatable(
+            {},
+            {__index = function(self, value)
+                local event = __TS__New(
+                    InitializingEvent,
+                    function()
+                        unit.unitInRangeEvent[value]:addListener(999999, registerUnitOfRangeEvent)
+                    end
+                )
+                rawset(self, value, event)
+                return event
+            end}
+        )
+        rawset(self, "unitOutOfRangeEvent", unitOutOfRangeEvent)
+        return unitOutOfRangeEvent
+    end}
+)
+Timer.onPeriod[1]:addListener(function()
+    for unit in pairs(units) do
+        local unitsInRangeByRange = unit[unitsInRangeByRangeAttribute]
+        if unitsInRangeByRange ~= nil then
+            for range, unitsInRange in pairs(unitsInRangeByRange) do
+                for unitInRange in pairs(unitsInRange) do
+                    if unit:getDistanceTo(unitInRange) > range then
+                        unitsInRange:remove(unitInRange)
+                        eventInvoke(unit.unitOutOfRangeEvent[range], unit, range, unitInRange)
+                    end
+                end
+            end
+        end
+    end
+end)
+return ____exports

package/engine/internal/unit.d.ts

@@ -139,6 +139,7 @@ export declare class Unit extends Handle<junit> {
     private _fields?;
     private getEvent;
     constructor(handle: junit);
+    private saveData;
     protected onDestroy(): HandleDestructor;
     addAttackHandler(condition: AttackHandlerCondition, action: AttackHandlerAction): AttackHandler;
     removeAttackHandler(handler: AttackHandler): boolean;
@@ -291,7 +292,6 @@ export declare class Unit extends Handle<junit> {
     set waygateDestination(v: Vec2);
     get waygateDestination(): Vec2;
     get abilities(): ReadonlyArray<UnitAbility>;
-    get onUnitInRange(): Record<number, Event<[Unit]>>;
     get onManaEqual(): Record<number, Event<[Unit, number]>>;
     get manaEvent(): Record<Operator, Record<number, Event<[Unit]>>>;
     get targetAcquiredEvent(): Event;

package/engine/internal/unit.lua

@@ -752,13 +752,15 @@ function Unit.prototype.getEvent(self, jevent, collector)
     end
     return event
 end
+function Unit.prototype.saveData(self)
+    local handle = self.handle
+    self[108] = self[108] or getUnitX(handle)
+    self[109] = self[109] or getUnitY(handle)
+    self._owner = self._owner or Player:of(getOwningPlayer(handle))
+end
 function Unit.prototype.onDestroy(self)
     local handle = self.handle
-    self[108] = getUnitX(handle)
-    self[109] = getUnitY(handle)
-    if not self._owner then
-        self._owner = Player:of(getOwningPlayer(handle))
-    end
+    self:saveData()
     local abilities = self.abilities
     for ____, ability in ipairs(abilities) do
         ability:destroy()
@@ -1987,30 +1989,6 @@ __TS__SetDescriptor(
     end},
     true
 )
-__TS__SetDescriptor(
-    Unit.prototype,
-    "onUnitInRange",
-    {get = function(self)
-        local handle = self.handle
-        local onUnitInRange = setmetatable(
-            {},
-            {__index = function(self, value)
-                local event = __TS__New(
-                    TriggerEvent,
-                    function(trigger)
-                        TriggerRegisterUnitInRangeSimple(trigger, value, handle)
-                    end,
-                    function() return ____exports.Unit:of(handle) end
-                )
-                rawset(self, value, event)
-                return event
-            end}
-        )
-        rawset(self, "onUnitInRange", onUnitInRange)
-        return onUnitInRange
-    end},
-    true
-)
 __TS__SetDescriptor(
     Unit.prototype,
     "onManaEqual",
@@ -2809,7 +2787,8 @@ Unit.synchronize = synchronizer(
                     return
                 end
             end
-            unit:destroy()
+            unit:saveData()
+            Timer:run(unit, "destroy")
         end)
     end
 end)(Unit)

package/engine/object-data/entry/ability-type/reincarnation.d.ts

@@ -0,0 +1,8 @@
+/** @noSelfInFile */
+import { AbilityType, AbilityTypeId } from "../ability-type";
+import { ObjectDataEntryLevelFieldValueSupplier } from "../../entry";
+export declare class ReincarnationAbilityType extends AbilityType {
+    static readonly BASE_ID: AbilityTypeId;
+    get reincarnationDelay(): number[];
+    set reincarnationDelay(reincarnationDelay: ObjectDataEntryLevelFieldValueSupplier<number>);
+}

package/engine/object-data/entry/ability-type/reincarnation.lua

@@ -0,0 +1,26 @@
+local ____lualib = require("lualib_bundle")
+local __TS__Class = ____lualib.__TS__Class
+local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
+local ____exports = {}
+local ____ability_2Dtype = require("engine.object-data.entry.ability-type")
+local AbilityType = ____ability_2Dtype.AbilityType
+____exports.ReincarnationAbilityType = __TS__Class()
+local ReincarnationAbilityType = ____exports.ReincarnationAbilityType
+ReincarnationAbilityType.name = "ReincarnationAbilityType"
+__TS__ClassExtends(ReincarnationAbilityType, AbilityType)
+ReincarnationAbilityType.BASE_ID = fourCC("AOre")
+__TS__SetDescriptor(
+    ReincarnationAbilityType.prototype,
+    "reincarnationDelay",
+    {
+        get = function(self)
+            return self:getNumberLevelField("Ore1")
+        end,
+        set = function(self, reincarnationDelay)
+            self:setNumberLevelField("Ore1", reincarnationDelay)
+        end
+    },
+    true
+)
+return ____exports

package/engine/object-data/entry/ability-type.d.ts

@@ -67,6 +67,8 @@ export declare abstract class AbilityType extends ObjectDataEntry<AbilityTypeId>
     set specialAttachmentPreset(specialAttachmentPreset: AttachmentPresetInput | undefined);
     get targetCastingEffectPresets(): EffectPresetWithParameters[];
     set targetCastingEffectPresets(targetCastingEffectPresets: AttachmentPresetInput[]);
+    get targetChannelingEffectPresets(): EffectPresetWithParameters[];
+    set targetChannelingEffectPresets(targetChannelingEffectPresets: EffectPresetWithParametersInput[]);
     get targetEffectPresets(): TupleOf<EffectPresetWithParameters, 0 | 1 | 2 | 3 | 4 | 5 | 6>;
     set targetEffectPresets(targetEffectPresets: TupleOf<AttachmentPresetInput, 0 | 1 | 2 | 3 | 4 | 5 | 6>);
     get targetEffectPresetsSD(): TupleOf<EffectPresetWithParameters, 0 | 1 | 2 | 3 | 4 | 5 | 6>;

package/engine/object-data/entry/ability-type.lua

@@ -45,6 +45,7 @@ local isButtonVisibleFalseAbilityTypes = {}
 local casterCastingEffectPresetsByAbilityTypeId = {}
 local casterChannelingEffectPresetsByAbilityTypeId = {}
 local targetCastingEffectPresetsByAbilityTypeId = {}
+local targetChannelingEffectPresetsByAbilityTypeId = {}
 local targetEffectSoundPresetByAbilityTypeId = {}
 ____exports.AbilityType = __TS__Class()
 local AbilityType = ____exports.AbilityType
@@ -378,6 +379,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    AbilityType.prototype,
+    "targetChannelingEffectPresets",
+    {
+        get = function(self)
+            return targetChannelingEffectPresetsByAbilityTypeId[self.id] or ({})
+        end,
+        set = function(self, targetChannelingEffectPresets)
+            targetChannelingEffectPresetsByAbilityTypeId[self.id] = map(targetChannelingEffectPresets, toEffectPreset)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     AbilityType.prototype,
     "targetEffectPresets",
@@ -1099,18 +1113,84 @@ local function handleAbilityChannelingStartEvent(caster, ability)
     end
     casterChannelingEffectsByCaster[caster] = effects
 end
+local targetChannelingEffectModelPathsByAbilityTypeId = postcompile(function()
+    return mapValues(
+        targetChannelingEffectPresetsByAbilityTypeId,
+        function(targetChannelingEffectPresets) return map(targetChannelingEffectPresets, extractAttachmentPresetInputModelPath) end
+    )
+end)
+local targetChannelingEffectAttachmentPointsByAbilityTypeId = postcompile(function()
+    return mapValues(
+        targetChannelingEffectPresetsByAbilityTypeId,
+        function(targetChannelingEffectPresets) return map(targetChannelingEffectPresets, extractAttachmentPresetInputNodeFQN) end
+    )
+end)
+local targetChannelingEffectParametersByAbilityTypeId = postcompile(function()
+    return mapValues(
+        targetChannelingEffectPresetsByAbilityTypeId,
+        function(targetChannelingEffectPresets) return map(targetChannelingEffectPresets, "parameters") end
+    )
+end)
+local targetChannelingEffectsByCaster = {}
+local function handleAbilityWidgetTargetChannelingStartEvent(caster, ability, target)
+    local effectModelPaths = targetChannelingEffectModelPathsByAbilityTypeId[ability.typeId]
+    local attachmentPoints = targetChannelingEffectAttachmentPointsByAbilityTypeId[ability.typeId]
+    local parameters = targetChannelingEffectParametersByAbilityTypeId[ability.typeId]
+    local effects = {}
+    if effectModelPaths ~= nil then
+        for i = 1, #effectModelPaths do
+            local effectModelPath = effectModelPaths[i]
+            local attachmentPoint = attachmentPoints and attachmentPoints[i]
+            if attachmentPoint == nil or attachmentPoint == "" then
+                attachmentPoint = "origin"
+            end
+            effects[i] = Effect:create(effectModelPath, target, attachmentPoint, parameters and parameters[i])
+        end
+    end
+    targetChannelingEffectsByCaster[caster] = effects
+end
+local function handleAbilityPointTargetChannelingStartEvent(caster, ability, x, y)
+    local effectModelPaths = targetChannelingEffectModelPathsByAbilityTypeId[ability.typeId]
+    local attachmentPoints = targetChannelingEffectAttachmentPointsByAbilityTypeId[ability.typeId]
+    local parameters = targetChannelingEffectParametersByAbilityTypeId[ability.typeId]
+    local effects = {}
+    if effectModelPaths ~= nil then
+        for i = 1, #effectModelPaths do
+            local effectModelPath = effectModelPaths[i]
+            local attachmentPoint = attachmentPoints and attachmentPoints[i]
+            if attachmentPoint == nil or attachmentPoint == "" then
+                attachmentPoint = "origin"
+            end
+            effects[i] = Effect:create(effectModelPath, x, y, parameters and parameters[i])
+        end
+    end
+    targetChannelingEffectsByCaster[caster] = effects
+end
 local function handleAbilityStopChannelingEvent(caster)
-    local effects = casterChannelingEffectsByCaster[caster]
-    if effects ~= nil then
-        for i = 1, #effects do
-            effects[i]:destroy()
+    local casterEffects = casterChannelingEffectsByCaster[caster]
+    if casterEffects ~= nil then
+        for i = 1, #casterEffects do
+            casterEffects[i]:destroy()
         end
         casterChannelingEffectsByCaster[caster] = nil
     end
+    local targetEffects = targetChannelingEffectsByCaster[caster]
+    if targetEffects ~= nil then
+        for i = 1, #targetEffects do
+            targetEffects[i]:destroy()
+        end
+        targetChannelingEffectsByCaster[caster] = nil
+    end
 end
 for abilityTypeId in pairs(casterChannelingEffectModelPathsByAbilityTypeId) do
     Unit.abilityChannelingStartEvent[abilityTypeId]:addListener(4, handleAbilityChannelingStartEvent)
     Unit.abilityChannelingFinishEvent[abilityTypeId]:addListener(4, handleAbilityStopChannelingEvent)
     Unit.abilityStopEvent[abilityTypeId]:addListener(4, handleAbilityStopChannelingEvent)
 end
+for abilityTypeId in pairs(targetChannelingEffectModelPathsByAbilityTypeId) do
+    Unit.abilityWidgetTargetChannelingStartEvent[abilityTypeId]:addListener(4, handleAbilityWidgetTargetChannelingStartEvent)
+    Unit.abilityPointTargetChannelingStartEvent[abilityTypeId]:addListener(4, handleAbilityPointTargetChannelingStartEvent)
+    Unit.abilityChannelingFinishEvent[abilityTypeId]:addListener(4, handleAbilityStopChannelingEvent)
+    Unit.abilityStopEvent[abilityTypeId]:addListener(4, handleAbilityStopChannelingEvent)
+end
 return ____exports

package/engine/random.d.ts

@@ -18,3 +18,4 @@ export declare const random: {
     <T>(element: T, ...elements: T[]): T;
     <T>(...elements: T[]): T | undefined;
 };
+export declare const shuffle: (array: unknown[]) => void;

package/engine/random.lua

@@ -28,4 +28,12 @@ ____exports.random = function(...)
         ...
     ))
 end
+____exports.shuffle = function(array)
+    for i = #array - 1, 1 do
+        local j = getRandomInt(0, i)
+        local value = array[i + 1]
+        array[i + 1] = array[j + 1]
+        array[j + 1] = value
+    end
+end
 return ____exports

package/engine/unit.d.ts

@@ -23,6 +23,7 @@ import "./internal/unit/attributes";
 import "./internal/unit/fly-height";
 import "./internal/unit/scale";
 import "./internal/unit/interrupts";
+import "./internal/unit/range-event";
 import "./internal/unit/band-aids/ancestral-spirit-cannibalize";
 export { Unit, DamagingEvent, DamageEvent } from "./internal/unit";
 export * from "./internal/unit+damage";

package/engine/unit.lua

@@ -23,6 +23,7 @@ require("engine.internal.unit.attributes")
 require("engine.internal.unit.fly-height")
 require("engine.internal.unit.scale")
 require("engine.internal.unit.interrupts")
+require("engine.internal.unit.range-event")
 require("engine.internal.unit.band-aids.ancestral-spirit-cannibalize")
 do
     local ____unit = require("engine.internal.unit")

package/package.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://json.schemastore.org/package",
     "name": "warscript",
-    "version": "0.0.1-dev.702d52d",
+    "version": "0.0.1-dev.70c1215",
     "description": "A typescript library for Warcraft III using Warpack.",
     "keywords": [
         "warcraft",

package/utility/linked-map.d.ts

@@ -8,10 +8,16 @@ type IteratorState<K extends AnyNotNil, 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> {
+export declare class LinkedMap<K extends AnyNotNil, V> implements ReadonlyLinkedMap<K, V> {
     private k;
     private v;
     get keys(): ReadonlyLinkedSet<K>;
@@ -23,4 +29,6 @@ export declare class LinkedMap<K extends AnyNotNil, V> {
     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

@@ -2,9 +2,12 @@ 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]
@@ -63,4 +66,36 @@ __TS__SetDescriptor(
     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;
@@ -40,6 +40,7 @@ export declare class LinkedSet<T extends AnyNotNil> implements ReadonlyLinkedSet
     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;

package/utility/linked-set.lua

@@ -85,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]