warscript 0.0.1-dev.ee2345e → 0.0.1-dev.fa6dee5

package/engine/standard/entries/unit-type.lua

@@ -8,11 +8,33 @@ ____exports.RIFLEMAN_UNIT_TYPE_ID = fourCC("hrif")
 ____exports.SIEGE_ENGINE_UNIT_TYPE_ID = fourCC("hmtt")
 ____exports.SORCERESS_UNIT_TYPE_ID = fourCC("hsor")
 ____exports.SPELLBREAKER_UNIT_TYPE_ID = fourCC("hspt")
-____exports.PALADIN_HERO_UNIT_TYPE_ID = fourCC("Hpal")
 ____exports.ARCHMAGE_HERO_UNIT_TYPE_ID = fourCC("Hamg")
+____exports.BLOOD_MAGE_HERO_UNIT_TYPE_ID = fourCC("Hblm")
+____exports.MOUNTAIN_KING_HERO_UNIT_TYPE_ID = fourCC("Hmkg")
+____exports.PALADIN_HERO_UNIT_TYPE_ID = fourCC("Hpal")
+____exports.ARCHER_HIGH_ELF_UNIT_TYPE_ID = fourCC("nhea")
 ____exports.CAPTAIN_UNIT_TYPE_ID = fourCC("hcth")
+____exports.SWORDSMAN_UNIT_TYPE_ID = fourCC("hhes")
+____exports.ADMIRAL_PROUDMOORE_HERO_UNIT_TYPE_ID = fourCC("Hapm")
+____exports.ANASTERIAN_SUNSTRIDER_HERO_UNIT_TYPE_ID = fourCC("Hssa")
+____exports.ANTONIDAS_HERO_UNIT_TYPE_ID = fourCC("Hant")
+____exports.ANTONIDAS_GHOST_HERO_UNIT_TYPE_ID = fourCC("Hgam")
 ____exports.ARTHAS_HERO_UNIT_TYPE_ID = fourCC("Hart")
 ____exports.ARTHAS_WITH_FROSTMOURNE_HERO_UNIT_TYPE_ID = fourCC("Harf")
+____exports.DAGREN_THE_ORCSLAYER_HERO_UNIT_TYPE_ID = fourCC("Hdgo")
+____exports.HALAHK_THE_LIFEBRINGER_HERO_UNIT_TYPE_ID = fourCC("Hhkl")
+____exports.JAINA_HERO_UNIT_TYPE_ID = fourCC("Hjai")
+____exports.JENNALLA_DEEMSPRING_HERO_UNIT_TYPE_ID = fourCC("Hjnd")
+____exports.KAEL_HERO_UNIT_TYPE_ID = fourCC("Hkal")
+____exports.KELEN_THE_SEEKER_HERO_UNIT_TYPE_ID = fourCC("Haah")
+____exports.LORD_GARITHOS_HERO_UNIT_TYPE_ID = fourCC("Hlgr")
+____exports.LORD_NICHOLAS_BUZAN_HERO_UNIT_TYPE_ID = fourCC("Hpb1")
+____exports.MAGROTH_THE_DEFENDER_HERO_UNIT_TYPE_ID = fourCC("Hmgd")
+____exports.MURADIN_BRONZEBEARD_HERO_UNIT_TYPE_ID = fourCC("Hmbr")
+____exports.SIR_GREGORY_EDMUNSON_HERO_UNIT_TYPE_ID = fourCC("Hpb2")
+____exports.SYLVANAS_WINDRUNNER_HERO_UNIT_TYPE_ID = fourCC("Hvwd")
+____exports.THALORIEN_DAWNSEEKER_HERO_UNIT_TYPE_ID = fourCC("Hddt")
+____exports.UTHER_HERO_UNIT_TYPE_ID = fourCC("Huth")
 ____exports.BATRIDER_UNIT_TYPE_ID = fourCC("otbr")
 ____exports.DEMOLISHER_UNIT_TYPE_ID = fourCC("ocat")
 ____exports.GRUNT_UNIT_TYPE_ID = fourCC("ogru")
@@ -24,7 +46,22 @@ ____exports.SPIRIT_WALKER_UNIT_TYPE_ID = fourCC("ospw")
 ____exports.TAUREN_UNIT_TYPE_ID = fourCC("otau")
 ____exports.WIND_RIDER_UNIT_TYPE_ID = fourCC("owyv")
 ____exports.WITCH_DOCTOR_UNIT_TYPE_ID = fourCC("odoc")
+____exports.ARCHER_UNIT_TYPE_ID = fourCC("earc")
+____exports.CHIMAERA_UNIT_TYPE_ID = fourCC("echm")
+____exports.DRUID_OF_THE_CLAW_UNIT_TYPE_ID = fourCC("edoc")
+____exports.DRUID_OF_THE_TALON_UNIT_TYPE_ID = fourCC("edot")
+____exports.DRYAD_UNIT_TYPE_ID = fourCC("edry")
+____exports.FAERIE_DRAGON_UNIT_TYPE_ID = fourCC("efdr")
+____exports.GLAIVE_THROWER_UNIT_TYPE_ID = fourCC("ebal")
+____exports.HIPPOGRYPH_UNIT_TYPE_ID = fourCC("ehip")
+____exports.HIPPOGRYPH_RIDER_UNIT_TYPE_ID = fourCC("ehpr")
+____exports.HUNTRESS_UNIT_TYPE_ID = fourCC("esen")
+____exports.MOUNTAIN_GIANT_THROWER_UNIT_TYPE_ID = fourCC("emtg")
+____exports.WISP_UNIT_TYPE_ID = fourCC("ewsp")
 ____exports.DEMON_HUNTER_HERO_UNIT_TYPE_ID = fourCC("Edem")
+____exports.KEEPER_OF_THE_GROVE_HERO_UNIT_TYPE_ID = fourCC("Ekee")
+____exports.MOON_PRIESTESS_HERO_UNIT_TYPE_ID = fourCC("Emoo")
+____exports.WARDEN_HERO_UNIT_TYPE_ID = fourCC("Ewar")
 ____exports.DEMON_HUNTER_DEMON_FORM_HERO_UNIT_TYPE_ID = fourCC("Edmm")
 ____exports.ABOMINATION_UNIT_TYPE_ID = fourCC("uabo")
 ____exports.GHOUL_UNIT_TYPE_ID = fourCC("ugho")
@@ -60,6 +97,7 @@ ____exports.WENDIGO_UNIT_TYPE_ID = fourCC("nwen")
 ____exports.WENDIGO_SHAMAN_UNIT_TYPE_ID = fourCC("nwns")
 ____exports.WILDKIN_UNIT_TYPE_ID = fourCC("nowb")
 ____exports.WRAITH_UNIT_TYPE_ID = fourCC("ngh2")
+____exports.GOBLIN_LAND_MINE_UNIT_TYPE_ID = fourCC("nglm")
 ____exports.CIRCLE_OF_POWER_UNIT_TYPE_ID = fourCC("ncop")
 ____exports.CIRCLE_OF_POWER_MEDIUM_UNIT_TYPE_ID = fourCC("ncp2")
 ____exports.CIRCLE_OF_POWER_LARGE_UNIT_TYPE_ID = fourCC("ncp3")

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

@@ -16,7 +16,7 @@ export declare const LEVEL_SKIP_REQUIREMENT_ABILITY_INTEGER_FIELD: AbilityIntege
 export declare const HERO_ABILITY_ABILITY_BOOLEAN_FIELD: AbilityBooleanField & symbol;
 export declare const ITEM_ABILITY_ABILITY_BOOLEAN_FIELD: AbilityBooleanField & symbol;
 export declare const CHECK_DEPENDENCIES_ABILITY_BOOLEAN_FIELD: AbilityBooleanField & symbol;
-export declare const ARF_MISSILE_ARC_ABILITY_FLOAT_FIELD: AbilityFloatField & symbol;
+export declare const MISSILE_ARC_ABILITY_FLOAT_FIELD: AbilityFloatField & symbol;
 export declare const NAME_ABILITY_STRING_FIELD: AbilityStringField & symbol;
 export declare const ICON_ACTIVATED_ABILITY_STRING_FIELD: AbilityStringField & symbol;
 export declare const ICON_RESEARCH_ABILITY_STRING_FIELD: AbilityStringField & symbol;

package/engine/standard/fields/ability.lua

@@ -27,7 +27,7 @@ ____exports.LEVEL_SKIP_REQUIREMENT_ABILITY_INTEGER_FIELD = AbilityIntegerField:c
 ____exports.HERO_ABILITY_ABILITY_BOOLEAN_FIELD = AbilityBooleanField:create(fourCC("aher"))
 ____exports.ITEM_ABILITY_ABILITY_BOOLEAN_FIELD = AbilityBooleanField:create(fourCC("aite"))
 ____exports.CHECK_DEPENDENCIES_ABILITY_BOOLEAN_FIELD = AbilityBooleanField:create(fourCC("achd"))
-____exports.ARF_MISSILE_ARC_ABILITY_FLOAT_FIELD = AbilityFloatField:create(fourCC("amac"))
+____exports.MISSILE_ARC_ABILITY_FLOAT_FIELD = AbilityFloatField:create(fourCC("amac"))
 ____exports.NAME_ABILITY_STRING_FIELD = AbilityStringField:create(fourCC("anam"))
 ____exports.ICON_ACTIVATED_ABILITY_STRING_FIELD = AbilityStringField:create(fourCC("auar"))
 ____exports.ICON_RESEARCH_ABILITY_STRING_FIELD = AbilityStringField:create(fourCC("arar"))

package/engine/unit.lua

@@ -18,8 +18,7 @@ require("engine.internal.unit.detach-missiles")
 require("engine.internal.unit.band-aids.ancestral-spirit-cannibalize")
 do
     local ____unit = require("engine.internal.unit")
-    local Unit = ____unit.Unit
-    ____exports.Unit = Unit
+    ____exports.Unit = ____unit.Unit
 end
 do
     local ____export = require("engine.internal.unit+damage")
@@ -29,4 +28,12 @@ do
         end
     end
 end
+do
+    local ____export = require("engine.internal.unit+rally")
+    for ____exportKey, ____exportValue in pairs(____export) do
+        if ____exportKey ~= "default" then
+            ____exports[____exportKey] = ____exportValue
+        end
+    end
+end
 return ____exports

package/event.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="@typescript-to-lua/language-extensions" />
 /** @noSelfInFile */
 export type EventListener<T extends any[]> = (...args: T) => void;
 export declare const enum EventListenerPriority {

package/lualib_bundle.lua

@@ -193,8 +193,14 @@ do
                 result[#result + 1] = v
             end
         else
-            for i, v in arrayLikeIterator(arrayLike) do
-                result[#result + 1] = mapFn(thisArg, v, i - 1)
+            local i = 0
+            for ____, v in arrayLikeIterator(arrayLike) do
+                local ____mapFn_3 = mapFn
+                local ____thisArg_1 = thisArg
+                local ____v_2 = v
+                local ____i_0 = i
+                i = ____i_0 + 1
+                result[#result + 1] = ____mapFn_3(____thisArg_1, ____v_2, ____i_0)
             end
         end
         return result
@@ -773,10 +779,11 @@ end
 
 local __TS__AsyncAwaiter, __TS__Await
 do
-    local cocreate = coroutine.create
-    local coresume = coroutine.resume
-    local costatus = coroutine.status
-    local coyield = coroutine.yield
+    local ____coroutine = _G.coroutine or ({})
+    local cocreate = ____coroutine.create
+    local coresume = ____coroutine.resume
+    local costatus = ____coroutine.status
+    local coyield = ____coroutine.yield
     function __TS__AsyncAwaiter(generator)
         return __TS__New(
             __TS__Promise,
@@ -1417,19 +1424,51 @@ do
     Map[Symbol.species] = Map
 end
 
+local function __TS__MapGroupBy(items, keySelector)
+    local result = __TS__New(Map)
+    local i = 0
+    for ____, item in __TS__Iterator(items) do
+        local key = keySelector(nil, item, i)
+        if result:has(key) then
+            local ____temp_0 = result:get(key)
+            ____temp_0[#____temp_0 + 1] = item
+        else
+            result:set(key, {item})
+        end
+        i = i + 1
+    end
+    return result
+end
+
 local __TS__Match = string.match
 
 local __TS__MathAtan2 = math.atan2 or math.atan
 
 local __TS__MathModf = math.modf
 
+local function __TS__NumberIsNaN(value)
+    return value ~= value
+end
+
 local function __TS__MathSign(val)
-    if val > 0 then
-        return 1
-    elseif val < 0 then
+    if __TS__NumberIsNaN(val) or val == 0 then
+        return val
+    end
+    if val < 0 then
         return -1
     end
-    return 0
+    return 1
+end
+
+local function __TS__NumberIsFinite(value)
+    return type(value) == "number" and value == value and value ~= math.huge and value ~= -math.huge
+end
+
+local function __TS__MathTrunc(val)
+    if not __TS__NumberIsFinite(val) or val == 0 then
+        return val
+    end
+    return val > 0 and math.floor(val) or math.ceil(val)
 end
 
 local function __TS__Number(value)
@@ -1459,18 +1498,10 @@ local function __TS__Number(value)
     end
 end
 
-local function __TS__NumberIsFinite(value)
-    return type(value) == "number" and value == value and value ~= math.huge and value ~= -math.huge
-end
-
 local function __TS__NumberIsInteger(value)
     return __TS__NumberIsFinite(value) and math.floor(value) == value
 end
 
-local function __TS__NumberIsNaN(value)
-    return value ~= value
-end
-
 local function __TS__StringSubstring(self, start, ____end)
     if ____end ~= ____end then
         ____end = 0
@@ -1603,23 +1634,17 @@ local function __TS__ObjectDefineProperty(target, key, desc)
         local valueExists = value ~= nil
         local ____desc_set_4 = desc.set
         local ____desc_get_5 = desc.get
-        local ____temp_0
-        if desc.configurable ~= nil then
-            ____temp_0 = desc.configurable
-        else
-            ____temp_0 = valueExists
+        local ____desc_configurable_0 = desc.configurable
+        if ____desc_configurable_0 == nil then
+            ____desc_configurable_0 = valueExists
         end
-        local ____temp_1
-        if desc.enumerable ~= nil then
-            ____temp_1 = desc.enumerable
-        else
-            ____temp_1 = valueExists
+        local ____desc_enumerable_1 = desc.enumerable
+        if ____desc_enumerable_1 == nil then
+            ____desc_enumerable_1 = valueExists
         end
-        local ____temp_2
-        if desc.writable ~= nil then
-            ____temp_2 = desc.writable
-        else
-            ____temp_2 = valueExists
+        local ____desc_writable_2 = desc.writable
+        if ____desc_writable_2 == nil then
+            ____desc_writable_2 = valueExists
         end
         local ____temp_3
         if desc.value ~= nil then
@@ -1630,9 +1655,9 @@ local function __TS__ObjectDefineProperty(target, key, desc)
         descriptor = {
             set = ____desc_set_4,
             get = ____desc_get_5,
-            configurable = ____temp_0,
-            enumerable = ____temp_1,
-            writable = ____temp_2,
+            configurable = ____desc_configurable_0,
+            enumerable = ____desc_enumerable_1,
+            writable = ____desc_writable_2,
             value = ____temp_3
         }
     end
@@ -1671,6 +1696,22 @@ local function __TS__ObjectFromEntries(entries)
     return obj
 end
 
+local function __TS__ObjectGroupBy(items, keySelector)
+    local result = {}
+    local i = 0
+    for ____, item in __TS__Iterator(items) do
+        local key = keySelector(nil, item, i)
+        if result[key] ~= nil then
+            local ____result_key_0 = result[key]
+            ____result_key_0[#____result_key_0 + 1] = item
+        else
+            result[key] = {item}
+        end
+        i = i + 1
+    end
+    return result
+end
+
 local function __TS__ObjectKeys(obj)
     local result = {}
     local len = 0
@@ -1994,6 +2035,64 @@ do
             end
         }
     end
+    function Set.prototype.union(self, other)
+        local result = __TS__New(Set, self)
+        for ____, item in __TS__Iterator(other) do
+            result:add(item)
+        end
+        return result
+    end
+    function Set.prototype.intersection(self, other)
+        local result = __TS__New(Set)
+        for ____, item in __TS__Iterator(self) do
+            if other:has(item) then
+                result:add(item)
+            end
+        end
+        return result
+    end
+    function Set.prototype.difference(self, other)
+        local result = __TS__New(Set, self)
+        for ____, item in __TS__Iterator(other) do
+            result:delete(item)
+        end
+        return result
+    end
+    function Set.prototype.symmetricDifference(self, other)
+        local result = __TS__New(Set, self)
+        for ____, item in __TS__Iterator(other) do
+            if self:has(item) then
+                result:delete(item)
+            else
+                result:add(item)
+            end
+        end
+        return result
+    end
+    function Set.prototype.isSubsetOf(self, other)
+        for ____, item in __TS__Iterator(self) do
+            if not other:has(item) then
+                return false
+            end
+        end
+        return true
+    end
+    function Set.prototype.isSupersetOf(self, other)
+        for ____, item in __TS__Iterator(other) do
+            if not self:has(item) then
+                return false
+            end
+        end
+        return true
+    end
+    function Set.prototype.isDisjointFrom(self, other)
+        for ____, item in __TS__Iterator(self) do
+            if other:has(item) then
+                return false
+            end
+        end
+        return true
+    end
     Set[Symbol.species] = Set
 end
 
@@ -2443,10 +2542,7 @@ local function __TS__Using(self, cb, ...)
     local args = {...}
     local thrownError
     local ok, result = xpcall(
-        function() return cb(
-            nil,
-            __TS__Unpack(args)
-        ) end,
+        function() return cb(__TS__Unpack(args)) end,
         function(err)
             thrownError = err
             return thrownError
@@ -2563,10 +2659,12 @@ return {
   __TS__Iterator = __TS__Iterator,
   __TS__LuaIteratorSpread = __TS__LuaIteratorSpread,
   Map = Map,
+  __TS__MapGroupBy = __TS__MapGroupBy,
   __TS__Match = __TS__Match,
   __TS__MathAtan2 = __TS__MathAtan2,
   __TS__MathModf = __TS__MathModf,
   __TS__MathSign = __TS__MathSign,
+  __TS__MathTrunc = __TS__MathTrunc,
   __TS__New = __TS__New,
   __TS__Number = __TS__Number,
   __TS__NumberIsFinite = __TS__NumberIsFinite,
@@ -2582,6 +2680,7 @@ return {
   __TS__ObjectFromEntries = __TS__ObjectFromEntries,
   __TS__ObjectGetOwnPropertyDescriptor = __TS__ObjectGetOwnPropertyDescriptor,
   __TS__ObjectGetOwnPropertyDescriptors = __TS__ObjectGetOwnPropertyDescriptors,
+  __TS__ObjectGroupBy = __TS__ObjectGroupBy,
   __TS__ObjectKeys = __TS__ObjectKeys,
   __TS__ObjectRest = __TS__ObjectRest,
   __TS__ObjectValues = __TS__ObjectValues,

package/math/vec2.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="@typescript-to-lua/language-extensions" />
 /** @noSelfInFile */
 /** Gets the height of the terrain at the position specified by the vector. */
 export declare const getTerrainZ: (x: number, y: number) => number;
@@ -7,12 +6,6 @@ export declare const angleBetweenPoints: (x1: number, y1: number, x2: number, y2
 /** Returns the distance between a and b. */
 export declare const distance: (x1: number, y1: number, x2: number, y2: number) => number;
 /** Moves a point current towards target. */
-export declare const moveTowards: (x1: number, y1: number, x2: number, y2: number, distance: number) => LuaMultiReturn<[
-    number,
-    number
-]>;
+export declare const moveTowards: (x1: number, y1: number, x2: number, y2: number, distance: number) => LuaMultiReturn<[number, number]>;
 /** Gets a polar offset from this vector. Angle should be specified in degrees. */
-export declare const polarOffset: (x: number, y: number, angle: number, distance: number) => LuaMultiReturn<[
-    number,
-    number
-]>;
+export declare const polarOffset: (x: number, y: number, angle: number, distance: number) => LuaMultiReturn<[number, number]>;

package/math.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="lua-types/5.3" />
-/// <reference types="lua-types/5.3" />
 /** @noSelfInFile */
 export declare const MINIMUM_POSITIVE_NORMALIZED_FLOAT: number;
 export declare const MINIMUM_POSITIVE_FLOAT: number;

package/objutil/ability.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
 import { LevelFieldValueProvider, ObjectDefinition } from "./object";
 export declare namespace AbilityDefinition {

package/objutil/buff.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
 import { ObjectDefinition } from "./object";
 import { Unit } from "../core/types/unit";

package/objutil/object.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
 export type LevelFieldValueProvider<T> = T | T[] | ((level: number, value: T) => T);
 export declare namespace ObjectDefinition {

package/objutil/unit.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
 import { ObjectDefinition } from "./object";
 import { AbilityDefinition } from "./ability";

package/package.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://json.schemastore.org/package",
     "name": "warscript",
-    "version": "0.0.1-dev.ee2345e",
+    "version": "0.0.1-dev.fa6dee5",
     "description": "A typescript library for Warcraft III using Warpack.",
     "keywords": [
         "warcraft",
@@ -22,23 +22,22 @@
     },
     "peerDependencies": {
         "@warscript/language-extensions": "^0.0.1",
-        "@warscript/tstl-plugin": "^0.0.2",
-        "typescript-to-lua": "^1.24.1",
+        "@warscript/tstl-plugin": "^0.0.4",
         "lua-types": "^2.13.1",
-        "warpack": "0.0.1-dev.5bdabe5"
+        "warpack": "0.0.1-dev.07dd222"
     },
     "devDependencies": {
-        "@typescript-eslint/eslint-plugin": "^5.59.11",
-        "@typescript-eslint/parser": "^5.59.11",
-        "async": "^3.2.0",
+        "@typescript-eslint/eslint-plugin": "^8.13.0",
+        "@typescript-eslint/parser": "^8.13.0",
+        "async": "^3.2.6",
         "copyfiles": "^2.4.1",
-        "eslint": "^8.42.0",
-        "eslint-config-prettier": "^8.8.0",
-        "eslint-plugin-prettier": "^3.4.0",
-        "prettier": "^2.8.8",
-        "rimraf": "^5.0.5",
-        "ts-node": "^10.9.1",
-        "tsc-watch": "^4.2.9"
+        "eslint": "^9.14.0",
+        "eslint-config-prettier": "^9.1.0",
+        "eslint-plugin-prettier": "^5.2.1",
+        "prettier": "^3.3.3",
+        "rimraf": "^6.0.1",
+        "ts-node": "^10.9.2",
+        "tsc-watch": "^6.2.0"
     },
     "publishConfig": {
         "access": "public",

package/string.d.ts

@@ -59,6 +59,22 @@ declare global {
         function toNumber(string: string): number;
     }
 }
+declare global {
+    namespace string {
+        /**
+         * Returns the index within the string of the first occurrence of the specified substring, starting from the specified `startIndex`,
+         * or -1 if the string does not contain such substring.
+         */
+        function indexOf(string: string, substring: string, startIndex?: number): number;
+    }
+    interface String {
+        /**
+         * Returns the index within this string of the first occurrence of the specified substring, starting from the specified `startIndex`,
+         * or -1 if the string does not contain such substring.
+         */
+        indexOf(substring: string, startIndex?: number): number;
+    }
+}
 declare global {
     interface String {
         /**
@@ -103,4 +119,18 @@ declare global {
         function isNotBlank(string: string): boolean;
     }
 }
+declare global {
+    namespace string {
+        /**
+         * Returns the number of characters matching the given predicate.
+         */
+        function count(string: string, predicate: (char: string) => boolean): number;
+    }
+    interface String {
+        /**
+         * Returns the number of characters matching the given predicate.
+         */
+        count(predicate: (char: string) => boolean): number;
+    }
+}
 export {};

package/string.lua

@@ -2,6 +2,7 @@ local ____exports = {}
 local ____error = _G.error
 local tonumber = _G.tonumber
 local match = string.match
+local find = string.find
 local sub = string.sub
 _G.string.removePrefix = function(____string, prefix)
     local prefixLength = #prefix
@@ -17,6 +18,10 @@ end
 _G.string.toNumber = function(____string)
     return tonumber(____string) or ____error(("'" .. ____string) .. "' is not a valid representation of a number.")
 end
+_G.string.indexOf = function(____string, substring, startIndex)
+    local index = find(____string, substring, (startIndex or 0) + 1, true)
+    return (index or 0) - 1
+end
 _G.string.indexOfLast = function(____string, predicate)
     for i = #____string, 1, -1 do
         if predicate(sub(____string, i, i)) then
@@ -31,4 +36,13 @@ end
 _G.string.isNotBlank = function(____string)
     return (match(____string, "^%s*$")) == nil
 end
+_G.string.count = function(____string, predicate)
+    local result = 0
+    for i = 1, #____string do
+        if predicate(sub(____string, i, i)) then
+            result = result + 1
+        end
+    end
+    return result
+end
 return ____exports

package/util/stream.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="@typescript-to-lua/language-extensions" />
 /** @noSelfInFile */
 export interface Stream<T> {
     toArray(): T[];

package/utility/arrays.d.ts

@@ -1,12 +1,11 @@
-/// <reference types="@typescript-to-lua/language-extensions" />
 /** @noSelfInFile */
 import { TupleOf } from "./types";
 export declare const emptyArray: <T>() => readonly T[];
 export declare const joinToString: <T>(array: readonly T[], separator: string, transform?: (element: T) => string) => string;
-export declare const arrayOfNotNull: <T>(...elements: readonly (T | null | undefined)[]) => 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 forEach: <T, Args extends any[]>(array: readonly T[], consumerOrKey: KeysOfType<T, (this: T, ...args: Args) => void> | ((value: T, ...args: Args) => void), ...args: Args) => void;
+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;
     <T>(array: readonly T[], key: KeysOfType<T, boolean>): boolean;
@@ -45,7 +44,7 @@ export declare const max: (array: readonly number[]) => number;
 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[][];
-export declare const sortBy: <T, R>(array: T[], selector: KeysOfType<T, R> | ((value: T) => R)) => void;
+export declare const sortBy: <T, R>(array: T[], selector: ((value: T) => R) | KeysOfType<T, R>) => void;
 export declare const sortedBy: {
     <T, R>(array: readonly T[], selector: (value: T) => R): T[];
     <T, K extends keyof T>(array: readonly T[], key: K): T[];

package/utility/bit-set.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="@warscript/language-extensions" />
-/// <reference types="@typescript-to-lua/language-extensions" />
 /** @noSelfInFile */
 interface IBitSet<T extends number> {
     readonly has: LuaBitwiseAndEqualsRightMethod<T>;

package/utility/linked-set.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="@typescript-to-lua/language-extensions" />
 /** @noSelfInFile */
 type IteratorState<T extends AnyNotNil> = {
     t: LuaMap<T, T>;
@@ -46,5 +45,5 @@ export declare class LinkedSet<T extends AnyNotNil> implements ReadonlyLinkedSet
 }
 export declare const emptyLinkedSet: <T extends AnyNotNil>() => ReadonlyLinkedSet<T>;
 export declare const linkedSetOf: <T extends AnyNotNil>(...elements: readonly T[]) => LinkedSet<T>;
-export declare const linkedSetOfNotNull: <T extends AnyNotNil>(...elements: readonly (T | null | undefined)[]) => LinkedSet<T>;
+export declare const linkedSetOfNotNull: <T extends AnyNotNil>(...elements: readonly (T | undefined | null)[]) => LinkedSet<T>;
 export {};

package/utility/lua-maps.d.ts

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

package/utility/lua-sets.d.ts

@@ -1,6 +1,5 @@
-/// <reference types="@typescript-to-lua/language-extensions" />
 /** @noSelfInFile */
 export declare const luaSetOf: <T extends AnyNotNil>(...elements: readonly T[]) => LuaSet<T>;
-export declare const luaSetOfNotNull: <T extends AnyNotNil>(...elements: readonly (T | null | undefined)[]) => LuaSet<T>;
+export declare const luaSetOfNotNull: <T extends AnyNotNil>(...elements: readonly (T | undefined | null)[]) => LuaSet<T>;
 export declare const luaSetIntersection: <T extends AnyNotNil>(firstLuaSet: ReadonlyLuaSet<T>, secondLuaSet: ReadonlyLuaSet<T>) => LuaSet<T>;
 export declare const luaSetContainsAnyOf: <T extends AnyNotNil>(luaSet: ReadonlyLuaSet<T>, ...elements: readonly T[]) => boolean;