isaacscript-common 84.1.2 → 84.2.1

package/dist/functions/table.js

@@ -140,7 +140,7 @@ function iterateTableInOrder(luaMap, func, inOrder = true) {
         }
         return;
     }
-    keys.sort();
+    keys.sort(); // eslint-disable-line @typescript-eslint/require-array-sort-compare
     for (const key of keys) {
         const keyIndex = key;
         const value = luaMap.get(keyIndex);

package/dist/functions/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/functions/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;;;AAEH,OAAO,KAAK,EACV,QAAQ,EACR,eAAe,EACf,UAAU,EACV,QAAQ,EACR,SAAS,EACT,UAAU,EACV,UAAU,EACV,QAAQ,EACR,WAAW,EACZ,MAAM,8BAA8B,CAAC;AAEtC;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,GAAG,GAAG,QAAQ,CAE7C;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,GAAG,GAAG,eAAe,CAE3D;AAED;;;;;GAKG;AACH,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK,CAE1C;AAED;;;;;GAKG;AACH,wBAAgB,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAEtC;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,GAAG,GAAG,UAAU,CAEjD;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,GAAG,GAAG,QAAQ,CAE7C;AAED;;;;;GAKG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE5C;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,GAAG,GAAG,SAAS,CAE/C;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,GAAG,GAAG,UAAU,CAEjD;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,GAAG,GAAG,UAAU,CAEjD;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,GAAG,GAAG,QAAQ,CAE7C;AAED;;;;;GAKG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE5C;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,GAAG,GAAG,WAAW,CAEnD;AAED,wBAAgB,SAAS,CAAC,QAAQ,EAAE,OAAO,GAAG,QAAQ,IAAI,OAAO,CAEhE;AAGD,wBAAgB,UAAU,CAAC,QAAQ,EAAE,OAAO,GAAG,QAAQ,IAAI,QAAQ,CAElE;AAED,wBAAgB,SAAS,CAAC,QAAQ,EAAE,OAAO,GAAG,QAAQ,IAAI,GAAG,CAM5D;AAED,wBAAgB,QAAQ,CAAC,QAAQ,EAAE,OAAO,GAAG,QAAQ,IAAI,MAAM,CAE9D;AAED,+EAA+E;AAC/E,wBAAgB,WAAW,CACzB,QAAQ,EAAE,OAAO,GAChB,QAAQ,IAAI,OAAO,GAAG,MAAM,GAAG,MAAM,CAOvC;AAED,wBAAgB,QAAQ,CAAC,QAAQ,EAAE,OAAO,GAAG,QAAQ,IAAI,MAAM,CAE9D;AAED,wBAAgB,OAAO,CACrB,QAAQ,EAAE,OAAO,GAChB,QAAQ,IAAI,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAExC;AAED,wBAAgB,UAAU,CAAC,QAAQ,EAAE,OAAO,GAAG,QAAQ,IAAI,WAAW,CAErE;AAED;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,GAAG,SAAS,CAe5D"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/functions/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;;;AAEH,OAAO,KAAK,EACV,QAAQ,EACR,eAAe,EACf,UAAU,EACV,QAAQ,EACR,SAAS,EACT,UAAU,EACV,UAAU,EACV,QAAQ,EACR,WAAW,EACZ,MAAM,8BAA8B,CAAC;AAEtC;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,GAAG,GAAG,QAAQ,CAE7C;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,GAAG,GAAG,eAAe,CAE3D;AAED;;;;;GAKG;AACH,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK,CAE1C;AAED;;;;;GAKG;AACH,wBAAgB,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAEtC;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,GAAG,GAAG,UAAU,CAEjD;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,GAAG,GAAG,QAAQ,CAE7C;AAED;;;;;GAKG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE5C;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,GAAG,GAAG,SAAS,CAE/C;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,GAAG,GAAG,UAAU,CAEjD;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,GAAG,GAAG,UAAU,CAEjD;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,GAAG,GAAG,QAAQ,CAE7C;AAED;;;;;GAKG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE5C;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,GAAG,GAAG,WAAW,CAEnD;AAED,wBAAgB,SAAS,CAAC,QAAQ,EAAE,OAAO,GAAG,QAAQ,IAAI,OAAO,CAEhE;AAGD,wBAAgB,UAAU,CAAC,QAAQ,EAAE,OAAO,GAAG,QAAQ,IAAI,QAAQ,CAElE;AAED,wBAAgB,SAAS,CAAC,QAAQ,EAAE,OAAO,GAAG,QAAQ,IAAI,GAAG,CAM5D;AAED,wBAAgB,QAAQ,CAAC,QAAQ,EAAE,OAAO,GAAG,QAAQ,IAAI,MAAM,CAE9D;AAED,+EAA+E;AAC/E,wBAAgB,WAAW,CACzB,QAAQ,EAAE,OAAO,GAChB,QAAQ,IAAI,OAAO,GAAG,MAAM,GAAG,MAAM,CAOvC;AAED,wBAAgB,QAAQ,CAAC,QAAQ,EAAE,OAAO,GAAG,QAAQ,IAAI,MAAM,CAE9D;AAED,wBAAgB,OAAO,CACrB,QAAQ,EAAE,OAAO,GAChB,QAAQ,IAAI,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAGxC;AAED,wBAAgB,UAAU,CAAC,QAAQ,EAAE,OAAO,GAAG,QAAQ,IAAI,WAAW,CAGrE;AAED;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,GAAG,SAAS,CAe5D"}

package/dist/functions/types.js

@@ -161,12 +161,12 @@ function asTrinketType(num) {
 }
 exports.asTrinketType = asTrinketType;
 function isBoolean(variable) {
-    return type(variable) === "boolean";
+    return typeof variable === "boolean";
 }
 exports.isBoolean = isBoolean;
 // eslint-disable-next-line @typescript-eslint/ban-types
 function isFunction(variable) {
-    return type(variable) === "function";
+    return typeof variable === "function";
 }
 exports.isFunction = isFunction;
 function isInteger(variable) {
@@ -177,26 +177,28 @@ function isInteger(variable) {
 }
 exports.isInteger = isInteger;
 function isNumber(variable) {
-    return type(variable) === "number";
+    return typeof variable === "number";
 }
 exports.isNumber = isNumber;
 /** Helper function to detect if a variable is a boolean, number, or string. */
 function isPrimitive(variable) {
-    const variableType = type(variable);
+    const variableType = typeof variable;
     return (variableType === "boolean" ||
         variableType === "number" ||
         variableType === "string");
 }
 exports.isPrimitive = isPrimitive;
 function isString(variable) {
-    return type(variable) === "string";
+    return typeof variable === "string";
 }
 exports.isString = isString;
 function isTable(variable) {
+    // We cannot use `typeof` here since "table" is not a JavaScript type.
     return type(variable) === "table";
 }
 exports.isTable = isTable;
 function isUserdata(variable) {
+    // We cannot use `typeof` here since "userdata" is not a JavaScript type.
     return type(variable) === "userdata";
 }
 exports.isUserdata = isUserdata;

package/dist/functions/types.lua

@@ -1,3 +1,5 @@
+local ____lualib = require("lualib_bundle")
+local __TS__TypeOf = ____lualib.__TS__TypeOf
 local ____exports = {}
 function ____exports.isNumber(self, variable)
     return type(variable) == "number"
@@ -107,7 +109,7 @@ function ____exports.isInteger(self, variable)
 end
 --- Helper function to detect if a variable is a boolean, number, or string.
 function ____exports.isPrimitive(self, variable)
-    local variableType = type(variable)
+    local variableType = __TS__TypeOf(variable)
     return variableType == "boolean" or variableType == "number" or variableType == "string"
 end
 function ____exports.isString(self, variable)

package/dist/index.rollup.d.ts

@@ -5047,7 +5047,7 @@ export declare function getArrayCombinations<T>(array: readonly T[], includeEmpt
  * Helper function to get the duplicate elements in an array. Only one element for each value will
  * be returned. The elements will be sorted before they are returned.
  */
-export declare function getArrayDuplicateElements<T>(array: readonly T[]): readonly T[];
+export declare function getArrayDuplicateElements<T extends number | string>(array: readonly T[]): readonly T[];
 
 /**
  * Helper function to get an array containing the indexes of an array.
@@ -7261,7 +7261,7 @@ export declare function getRandomSeed(): Seed;
  *                  a random seed.
  * @param exceptions Optional. An array of elements to skip over if selected.
  */
-export declare function getRandomSetElement<T>(set: ReadonlySet<T>, seedOrRNG: Seed | RNG | undefined, exceptions?: readonly T[]): T;
+export declare function getRandomSetElement<T extends number | string>(set: ReadonlySet<T>, seedOrRNG: Seed | RNG | undefined, exceptions?: readonly T[]): T;
 
 /**
  * Helper function to get a random vector between (-1, -1) and (1, 1).
@@ -7876,7 +7876,7 @@ export declare function getSeedEffects(): readonly SeedEffect[];
  * @param set The set to get the combinations of.
  * @param includeEmptyArray Whether to include an empty array in the combinations.
  */
-export declare function getSetCombinations<T>(set: ReadonlySet<T>, includeEmptyArray: boolean): ReadonlyArray<ReadonlySet<T>>;
+export declare function getSetCombinations<T extends number | string>(set: ReadonlySet<T>, includeEmptyArray: boolean): ReadonlyArray<ReadonlySet<T>>;
 
 /**
  * Helper function to get the shooting actions that the specified `ControllerIndex` is currently
@@ -7934,7 +7934,7 @@ export declare function getSlots(slotVariant?: SlotVariant | -1, subType?: numbe
  * Normally, set values are returned in insertion order, so use this function when the ordering of
  * the contents is important.
  */
-export declare function getSortedSetValues<T>(set: ReadonlySet<T>): T[];
+export declare function getSortedSetValues<T extends number | string>(set: ReadonlySet<T>): T[];
 
 /** Helper function to get all of the `GridEntitySpikes` in the room. */
 export declare function getSpikes(variant?: number): readonly GridEntitySpikes[];
@@ -10860,7 +10860,7 @@ export declare function logLevelStateFlags(this: void): void;
  * @param map The TSTL `Map` to log.
  * @param name Optional. The name of the map, which will be logged before the elements.
  */
-export declare function logMap(this: void, map: ReadonlyMap<AnyNotNil, unknown>, name?: string): void;
+export declare function logMap(this: void, map: ReadonlyMap<number | string, unknown>, name?: string): void;
 
 export declare function logMusic(this: void): void;
 
@@ -10901,7 +10901,7 @@ export declare function logSeedEffects(this: void): void;
  * @param set The TSTL `Set` to log.
  * @param name Optional. The name of the set, which will be logged before the elements.
  */
-export declare function logSet(this: void, set: ReadonlySet<AnyNotNil>, name?: string): void;
+export declare function logSet(this: void, set: ReadonlySet<number | string>, name?: string): void;
 
 /** Helper function for logging every sound effect that is currently playing. */
 export declare function logSounds(this: void): void;
@@ -18189,6 +18189,8 @@ export declare function smeltTrinkets(player: EntityPlayer, ...trinketTypes: rea
  */
 export declare function some<T>(array: readonly T[], func: (value: T, index: number, array: readonly T[]) => boolean): boolean;
 
+export declare function sortNormal(a: unknown, b: unknown): -1 | 0 | 1;
+
 /**
  * Helper function to sort an array of objects by one of the object keys.
  *
@@ -18217,7 +18219,7 @@ export declare function sortObjectArrayByKey(key: string): (a: unknown, b: unkno
  *
  * ```ts
  * const myArray = [[1, 2], [2, 3], [3, 4]];
- * myArray.sort(twoDimensionalSort);
+ * myArray.sort(sortTwoDimensionalArray);
  * ```
  *
  * This function also properly handles when the array elements are strings or numbers (instead of

package/dist/isaacscript-common.lua

@@ -1,6 +1,6 @@
 --[[
 
-isaacscript-common 84.1.1
+isaacscript-common 84.2.0
 
 This is the "isaacscript-common" library, which was created with the IsaacScript tool.
 
@@ -17055,6 +17055,8 @@ end
 return ____exports
  end,
 ["functions.types"] = function(...) 
+local ____lualib = require("lualib_bundle")
+local __TS__TypeOf = ____lualib.__TS__TypeOf
 local ____exports = {}
 function ____exports.isNumber(self, variable)
     return type(variable) == "number"
@@ -17164,7 +17166,7 @@ function ____exports.isInteger(self, variable)
 end
 --- Helper function to detect if a variable is a boolean, number, or string.
 function ____exports.isPrimitive(self, variable)
-    local variableType = type(variable)
+    local variableType = __TS__TypeOf(variable)
     return variableType == "boolean" or variableType == "number" or variableType == "string"
 end
 function ____exports.isString(self, variable)
@@ -17203,7 +17205,7 @@ local ____types = require("functions.types")
 local isNumber = ____types.isNumber
 local isString = ____types.isString
 local isTable = ____types.isTable
-local function sortNormal(self, a, b)
+function ____exports.sortNormal(self, a, b)
     if not isNumber(nil, a) and not isString(nil, a) then
         error("Failed to normal sort since the first value was not a number or string and was instead: " .. type(a))
     end
@@ -17245,7 +17247,7 @@ function ____exports.sortObjectArrayByKey(self, key)
         end
         local aValue = a[key]
         local bValue = b[key]
-        return sortNormal(nil, aValue, bValue)
+        return ____exports.sortNormal(nil, aValue, bValue)
     end
 end
 --- Helper function to sort a two-dimensional array by the first element.
@@ -17254,7 +17256,7 @@ end
 -- 
 -- ```ts
 -- const myArray = [[1, 2], [2, 3], [3, 4]];
--- myArray.sort(twoDimensionalSort);
+-- myArray.sort(sortTwoDimensionalArray);
 -- ```
 -- 
 -- This function also properly handles when the array elements are strings or numbers (instead of
@@ -17269,7 +17271,7 @@ function ____exports.sortTwoDimensionalArray(self, a, b)
         error(((((((("Failed to two-dimensional sort since the two elements were disparate types: " .. tostring(a)) .. " & ") .. tostring(b)) .. " (") .. aType) .. " & ") .. bType) .. ")")
     end
     if aType == "string" or aType == "number" then
-        return sortNormal(nil, a, b)
+        return ____exports.sortNormal(nil, a, b)
     end
     if aType ~= "table" then
         error("Failed to two-dimensional sort since the first element was not a string, number, or table.")
@@ -17290,7 +17292,7 @@ function ____exports.sortTwoDimensionalArray(self, a, b)
     if elementType1 ~= elementType2 then
         error(((((((("Failed to two-dimensional sort since the first element of each array were disparate types: " .. tostring(firstElement1)) .. " & ") .. tostring(firstElement2)) .. " (") .. elementType1) .. " & ") .. elementType2) .. ")")
     end
-    return sortNormal(nil, firstElement1, firstElement2)
+    return ____exports.sortNormal(nil, firstElement1, firstElement2)
 end
 --- Helper function to sort an array in a stable way.
 -- 
@@ -17299,7 +17301,7 @@ end
 -- Under the hood, this uses the merge sort algorithm.
 function ____exports.stableSort(self, array, sortFunc)
     if sortFunc == nil then
-        sortFunc = sortNormal
+        sortFunc = ____exports.sortNormal
     end
     if #array <= 1 then
         return array
@@ -18702,6 +18704,8 @@ local getRandomInt = ____random.getRandomInt
 local ____rng = require("functions.rng")
 local isRNG = ____rng.isRNG
 local newRNG = ____rng.newRNG
+local ____sort = require("functions.sort")
+local sortNormal = ____sort.sortNormal
 local ____types = require("functions.types")
 local isNumber = ____types.isNumber
 local isTable = ____types.isTable
@@ -19060,7 +19064,7 @@ function ____exports.getArrayDuplicateElements(self, array)
         set:add(element)
     end
     local values = {__TS__Spread(duplicateElements)}
-    return __TS__ArraySort(values)
+    return __TS__ArraySort(values, sortNormal)
 end
 --- Helper function to get an array containing the indexes of an array.
 -- 
@@ -19272,6 +19276,7 @@ return ____exports
 local ____lualib = require("lualib_bundle")
 local __TS__ArraySort = ____lualib.__TS__ArraySort
 local __TS__ArrayMap = ____lualib.__TS__ArrayMap
+local __TS__ArrayToSorted = ____lualib.__TS__ArrayToSorted
 local __TS__ArrayAt = ____lualib.__TS__ArrayAt
 local __TS__ArrayIncludes = ____lualib.__TS__ArrayIncludes
 local __TS__New = ____lualib.__TS__New
@@ -19280,6 +19285,8 @@ local ____ReadonlySet = require("types.ReadonlySet")
 local ReadonlySet = ____ReadonlySet.ReadonlySet
 local ____array = require("functions.array")
 local getRandomArrayElement = ____array.getRandomArrayElement
+local ____sort = require("functions.sort")
+local sortNormal = ____sort.sortNormal
 local ____types = require("functions.types")
 local isNumber = ____types.isNumber
 local isString = ____types.isString
@@ -19415,8 +19422,9 @@ end
 -- Throws an error if the provided enum is empty.
 function ____exports.getHighestEnumValue(self, transpiledEnum)
     local enumValues = ____exports.getEnumValues(nil, transpiledEnum)
-    local lastElement = __TS__ArrayAt(enumValues, -1)
-    assertDefined(nil, lastElement, "Failed to get the last value from an enum since the enum was empty.")
+    local sortedValues = __TS__ArrayToSorted(enumValues, sortNormal)
+    local lastElement = __TS__ArrayAt(sortedValues, -1)
+    assertDefined(nil, lastElement, "Failed to get the highest value from an enum since the enum was empty.")
     return lastElement
 end
 --- Helper function to get the enum value with the lowest value.
@@ -19427,8 +19435,9 @@ end
 -- Throws an error if the provided enum is empty.
 function ____exports.getLowestEnumValue(self, transpiledEnum)
     local enumValues = ____exports.getEnumValues(nil, transpiledEnum)
-    local firstElement = enumValues[1]
-    assertDefined(nil, firstElement, "Failed to get the first value from an enum since the enum was empty.")
+    local sortedValues = __TS__ArrayToSorted(enumValues, sortNormal)
+    local firstElement = sortedValues[1]
+    assertDefined(nil, firstElement, "Failed to get the lowest value from an enum since the enum was empty.")
     return firstElement
 end
 --- Helper function to get a random value from the provided enum.
@@ -40290,6 +40299,8 @@ return ____exports
  end,
 ["decorators"] = function(...) 
 local ____exports = {}
+local ____tstlClass = require("functions.tstlClass")
+local getTSTLClassName = ____tstlClass.getTSTLClassName
 ____exports.EXPORTED_METHOD_NAMES_KEY = "__exportedMethodNames"
 --- A decorator function that signifies that the decorated class method should be added to the
 -- `ModUpgraded` object.
@@ -40297,10 +40308,15 @@ ____exports.EXPORTED_METHOD_NAMES_KEY = "__exportedMethodNames"
 -- This is only meant to be used internally.
 function ____exports.Exported(self, target, propertyKey)
     local constructor = target.constructor
-    if not (constructor[____exports.EXPORTED_METHOD_NAMES_KEY] ~= nil) then
-        constructor[____exports.EXPORTED_METHOD_NAMES_KEY] = {}
+    if constructor == nil then
+        local tstlClassName = getTSTLClassName(nil, target) or "Unknown"
+        error(("Failed to get the constructor for class \"" .. tstlClassName) .. "\". Did you decorate a static method? You can only decorate non-static class methods.")
     end
     local exportedMethodNames = constructor[____exports.EXPORTED_METHOD_NAMES_KEY]
+    if exportedMethodNames == nil then
+        exportedMethodNames = {}
+        constructor[____exports.EXPORTED_METHOD_NAMES_KEY] = exportedMethodNames
+    end
     exportedMethodNames[#exportedMethodNames + 1] = propertyKey
 end
 return ____exports
@@ -44332,6 +44348,8 @@ local ____array = require("functions.array")
 local getArrayCombinations = ____array.getArrayCombinations
 local getRandomArrayElement = ____array.getRandomArrayElement
 local sumArray = ____array.sumArray
+local ____sort = require("functions.sort")
+local sortNormal = ____sort.sortNormal
 local ____types = require("functions.types")
 local isPrimitive = ____types.isPrimitive
 --- Helper function to get a sorted array based on the contents of a set.
@@ -44347,7 +44365,7 @@ function ____exports.getSortedSetValues(self, set)
             error(("Failed to get the sorted set values because the provided set was of type \"" .. tostring(arrayType)) .. "\". Having sets with non-primitive types doesn't make much sense in general, so you might need to rethink what you are doing.")
         end
     end
-    __TS__ArraySort(values)
+    __TS__ArraySort(values, sortNormal)
     return values
 end
 --- Helper function to convert the keys of an object to a set.
@@ -45388,6 +45406,8 @@ local defaultMapGetPlayer = ____playerDataStructures.defaultMapGetPlayer
 local mapSetPlayer = ____playerDataStructures.mapSetPlayer
 local ____players = require("functions.players")
 local getPlayerFromPtr = ____players.getPlayerFromPtr
+local ____sort = require("functions.sort")
+local sortNormal = ____sort.sortNormal
 local ____utils = require("functions.utils")
 local ____repeat = ____utils["repeat"]
 local ____DefaultMap = require("classes.DefaultMap")
@@ -45511,8 +45531,8 @@ function PlayerCollectibleDetection.prototype.checkActiveItemsChanged(self, play
         oldCollectibleTypes[#oldCollectibleTypes + 1] = oldCollectibleType
         newCollectibleTypes[#newCollectibleTypes + 1] = newCollectibleType
     end
-    __TS__ArraySort(oldCollectibleTypes)
-    __TS__ArraySort(newCollectibleTypes)
+    __TS__ArraySort(oldCollectibleTypes, sortNormal)
+    __TS__ArraySort(newCollectibleTypes, sortNormal)
     if not arrayEquals(nil, oldCollectibleTypes, newCollectibleTypes) then
         self:updateCollectibleMapAndFire(player, nil)
     end
@@ -58456,15 +58476,14 @@ return ____exports
  end,
 ["functions.logMisc"] = function(...) 
 local ____lualib = require("lualib_bundle")
-local Map = ____lualib.Map
 local __TS__Spread = ____lualib.__TS__Spread
 local __TS__ArraySort = ____lualib.__TS__ArraySort
 local __TS__ArrayEntries = ____lualib.__TS__ArrayEntries
 local __TS__Iterator = ____lualib.__TS__Iterator
-local Set = ____lualib.Set
 local __TS__TypeOf = ____lualib.__TS__TypeOf
 local __TS__ObjectKeys = ____lualib.__TS__ObjectKeys
 local __TS__New = ____lualib.__TS__New
+local Set = ____lualib.Set
 local ____exports = {}
 local ____isaac_2Dtypescript_2Ddefinitions = require("lua_modules.isaac-typescript-definitions.dist.index")
 local BossID = ____isaac_2Dtypescript_2Ddefinitions.BossID
@@ -58521,6 +58540,8 @@ local getRoomListIndex = ____roomData.getRoomListIndex
 local ____set = require("functions.set")
 local combineSets = ____set.combineSets
 local getSortedSetValues = ____set.getSortedSetValues
+local ____sort = require("functions.sort")
+local sortNormal = ____sort.sortNormal
 local ____table = require("functions.table")
 local iterateTableInOrder = ____table.iterateTableInOrder
 local ____trinkets = require("functions.trinkets")
@@ -58689,7 +58710,7 @@ function ____exports.logMap(map, name)
     local suffix = name == nil and "" or (" \"" .. name) .. "\""
     log(("Logging a TSTL map" .. suffix) .. ":")
     local mapKeys = {__TS__Spread(map:keys())}
-    __TS__ArraySort(mapKeys)
+    __TS__ArraySort(mapKeys, sortNormal)
     for ____, key in ipairs(mapKeys) do
         local value = map:get(key)
         log((("  " .. tostring(key)) .. " --> ") .. tostring(value))
@@ -64945,10 +64966,12 @@ function ____exports.PriorityCallback(self, modCallback, priority, ...)
             local tstlClassName = getTSTLClassName(nil, target) or "Unknown"
             error(("Failed to get the constructor for class \"" .. tstlClassName) .. "\". Did you decorate a static method? You can only decorate non-static class methods, because the \"Mod\" object is not present before the class is instantiated.")
         end
-        if not (constructor[MOD_FEATURE_CALLBACKS_KEY] ~= nil) then
-            constructor[MOD_FEATURE_CALLBACKS_KEY] = {}
+        local key = MOD_FEATURE_CALLBACKS_KEY
+        local callbackTuples = constructor[key]
+        if callbackTuples == nil then
+            callbackTuples = {}
+            constructor[key] = callbackTuples
         end
-        local callbackTuples = constructor[MOD_FEATURE_CALLBACKS_KEY]
         callbackTuples[#callbackTuples + 1] = callbackTuple
     end
 end
@@ -64968,10 +64991,12 @@ function ____exports.PriorityCallbackCustom(self, modCallbackCustom, priority, .
             local tstlClassName = getTSTLClassName(nil, target) or "Unknown"
             error(("Failed to get the constructor for class \"" .. tstlClassName) .. "\". Did you decorate a static method? You can only decorate non-static class methods, because the \"Mod\" object is not present before the class is instantiated.")
         end
-        if not (constructor[MOD_FEATURE_CUSTOM_CALLBACKS_KEY] ~= nil) then
-            constructor[MOD_FEATURE_CUSTOM_CALLBACKS_KEY] = {}
+        local key = MOD_FEATURE_CUSTOM_CALLBACKS_KEY
+        local callbackTuples = constructor[key]
+        if callbackTuples == nil then
+            callbackTuples = {}
+            constructor[key] = callbackTuples
         end
-        local callbackTuples = constructor[MOD_FEATURE_CUSTOM_CALLBACKS_KEY]
         callbackTuples[#callbackTuples + 1] = callbackTuple
     end
 end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "84.1.2",
+  "version": "84.2.1",
   "description": "Helper functions and features for IsaacScript mods.",
   "keywords": [
     "isaac",

package/src/classes/features/callbackLogic/PlayerCollectibleDetection.ts

@@ -16,6 +16,7 @@ import {
   mapSetPlayer,
 } from "../../../functions/playerDataStructures";
 import { getPlayerFromPtr } from "../../../functions/players";
+import { sortNormal } from "../../../functions/sort";
 import { repeat } from "../../../functions/utils";
 import type { PickingUpItem } from "../../../types/PickingUpItem";
 import type { PlayerIndex } from "../../../types/PlayerIndex";
@@ -262,8 +263,8 @@ export class PlayerCollectibleDetection extends Feature {
     // For example, it is possible for the player to switch Schoolbag items, which will cause the
     // collectibles in the array to be the same, but in a different order. Thus, we sort both arrays
     // before comparing them.
-    oldCollectibleTypes.sort();
-    newCollectibleTypes.sort();
+    oldCollectibleTypes.sort(sortNormal);
+    newCollectibleTypes.sort(sortNormal);
 
     if (!arrayEquals(oldCollectibleTypes, newCollectibleTypes)) {
       // One or more active items have changed (with the player's total collectible count remaining

package/src/decorators.ts

@@ -1,4 +1,5 @@
 import type { Feature } from "./classes/private/Feature";
+import { getTSTLClassName } from "./functions/tstlClass";
 
 export const EXPORTED_METHOD_NAMES_KEY = "__exportedMethodNames";
 
@@ -14,16 +15,24 @@ export function Exported<Class extends Feature>(
 ): void {
   // Since the decorator runs prior to instantiation, we only have access to get and set static
   // properties, which are located on the "constructor" table.
-  const constructor = target.constructor as unknown as LuaMap<
-    AnyNotNil,
-    unknown
-  >;
-  if (!constructor.has(EXPORTED_METHOD_NAMES_KEY)) {
-    constructor.set(EXPORTED_METHOD_NAMES_KEY, []);
+  const constructor = target.constructor as unknown as
+    | Record<string, unknown>
+    | undefined;
+
+  if (constructor === undefined) {
+    const tstlClassName = getTSTLClassName(target) ?? "Unknown";
+    error(
+      `Failed to get the constructor for class "${tstlClassName}". Did you decorate a static method? You can only decorate non-static class methods.`,
+    );
+  }
+
+  let exportedMethodNames = constructor[EXPORTED_METHOD_NAMES_KEY] as
+    | unknown[]
+    | undefined;
+  if (exportedMethodNames === undefined) {
+    exportedMethodNames = [];
+    constructor[EXPORTED_METHOD_NAMES_KEY] = exportedMethodNames;
   }
 
-  const exportedMethodNames = constructor.get(
-    EXPORTED_METHOD_NAMES_KEY,
-  ) as string[];
   exportedMethodNames.push(propertyKey as string);
 }

package/src/functions/array.ts

@@ -2,6 +2,7 @@ import { ReadonlySet } from "../types/ReadonlySet";
 import type { WidenLiteral } from "../types/WidenLiteral";
 import { getRandomInt } from "./random";
 import { isRNG, newRNG } from "./rng";
+import { sortNormal } from "./sort";
 import { isNumber, isTable } from "./types";
 import { assertDefined, eRange } from "./utils";
 
@@ -359,7 +360,7 @@ function addCombinations<T>(
  * Helper function to get the duplicate elements in an array. Only one element for each value will
  * be returned. The elements will be sorted before they are returned.
  */
-export function getArrayDuplicateElements<T>(
+export function getArrayDuplicateElements<T extends number | string>(
   array: readonly T[],
 ): readonly T[] {
   const duplicateElements = new Set<T>();
@@ -373,7 +374,7 @@ export function getArrayDuplicateElements<T>(
   }
 
   const values = [...duplicateElements];
-  return values.sort();
+  return values.sort(sortNormal);
 }
 
 /**

package/src/functions/decorators.ts

@@ -99,7 +99,7 @@ export function PriorityCallback<T extends ModCallback>(
     // properties, which are located on the "constructor" table. Thus, we store the callback
     // arguments for later.
     const constructor = target.constructor as unknown as
-      | LuaMap<AnyNotNil, unknown>
+      | Record<string, unknown>
       | undefined;
 
     if (constructor === undefined) {
@@ -109,13 +109,13 @@ export function PriorityCallback<T extends ModCallback>(
       );
     }
 
-    if (!constructor.has(MOD_FEATURE_CALLBACKS_KEY)) {
-      constructor.set(MOD_FEATURE_CALLBACKS_KEY, []);
+    const key = MOD_FEATURE_CALLBACKS_KEY;
+    let callbackTuples = constructor[key] as unknown[] | undefined;
+    if (callbackTuples === undefined) {
+      callbackTuples = [];
+      constructor[key] = callbackTuples;
     }
 
-    const callbackTuples = constructor.get(
-      MOD_FEATURE_CALLBACKS_KEY,
-    ) as unknown[];
     callbackTuples.push(callbackTuple);
   };
 }
@@ -150,7 +150,7 @@ export function PriorityCallbackCustom<T extends ModCallbackCustom>(
     // properties, which are located on the "constructor" table. Thus, we store the callback
     // arguments for later.
     const constructor = target.constructor as unknown as
-      | LuaMap<AnyNotNil, unknown>
+      | Record<string, unknown>
       | undefined;
 
     if (constructor === undefined) {
@@ -160,13 +160,12 @@ export function PriorityCallbackCustom<T extends ModCallbackCustom>(
       );
     }
 
-    if (!constructor.has(MOD_FEATURE_CUSTOM_CALLBACKS_KEY)) {
-      constructor.set(MOD_FEATURE_CUSTOM_CALLBACKS_KEY, []);
+    const key = MOD_FEATURE_CUSTOM_CALLBACKS_KEY;
+    let callbackTuples = constructor[key] as unknown[] | undefined;
+    if (callbackTuples === undefined) {
+      callbackTuples = [];
+      constructor[key] = callbackTuples;
     }
-
-    const callbackTuples = constructor.get(
-      MOD_FEATURE_CUSTOM_CALLBACKS_KEY,
-    ) as unknown[];
     callbackTuples.push(callbackTuple);
   };
 }

package/src/functions/enums.ts

@@ -1,5 +1,6 @@
 import { ReadonlySet } from "../types/ReadonlySet";
 import { getRandomArrayElement } from "./array";
+import { sortNormal } from "./sort";
 import { isNumber, isString } from "./types";
 import { assertDefined, iRange } from "./utils";
 
@@ -151,11 +152,11 @@ export function getHighestEnumValue<T extends TranspiledEnum>(
   transpiledEnum: T,
 ): T[keyof T] {
   const enumValues = getEnumValues(transpiledEnum);
-
-  const lastElement = enumValues.at(-1);
+  const sortedValues = enumValues.toSorted(sortNormal);
+  const lastElement = sortedValues.at(-1);
   assertDefined(
     lastElement,
-    "Failed to get the last value from an enum since the enum was empty.",
+    "Failed to get the highest value from an enum since the enum was empty.",
   );
 
   return lastElement;
@@ -173,11 +174,11 @@ export function getLowestEnumValue<T extends TranspiledEnum>(
   transpiledEnum: T,
 ): T[keyof T] {
   const enumValues = getEnumValues(transpiledEnum);
-
-  const firstElement = enumValues[0];
+  const sortedValues = enumValues.toSorted(sortNormal);
+  const firstElement = sortedValues[0];
   assertDefined(
     firstElement,
-    "Failed to get the first value from an enum since the enum was empty.",
+    "Failed to get the lowest value from an enum since the enum was empty.",
   );
 
   return firstElement;

package/src/functions/logMisc.ts

@@ -38,6 +38,7 @@ import { getPlayerHealth } from "./playerHealth";
 import { getPlayerName } from "./players";
 import { getRoomData, getRoomGridIndex, getRoomListIndex } from "./roomData";
 import { combineSets, getSortedSetValues } from "./set";
+import { sortNormal } from "./sort";
 import { iterateTableInOrder } from "./table";
 import { getTrinketName } from "./trinkets";
 import { isDefaultMap, isTSTLMap, isTSTLSet } from "./tstlClass";
@@ -257,7 +258,7 @@ export function logLevelStateFlags(this: void): void {
  */
 export function logMap(
   this: void,
-  map: ReadonlyMap<AnyNotNil, unknown>,
+  map: ReadonlyMap<number | string, unknown>,
   name?: string,
 ): void {
   if (!isTSTLMap(map) && !isDefaultMap(map)) {
@@ -269,11 +270,10 @@ export function logMap(
   log(`Logging a TSTL map${suffix}:`);
 
   const mapKeys = [...map.keys()];
-  mapKeys.sort();
+  mapKeys.sort(sortNormal);
 
   for (const key of mapKeys) {
     const value = map.get(key);
-    // eslint-disable-next-line @typescript-eslint/no-base-to-string
     log(`  ${key} --> ${value}`);
   }
 
@@ -405,7 +405,7 @@ export function logSeedEffects(this: void): void {
  */
 export function logSet(
   this: void,
-  set: ReadonlySet<AnyNotNil>,
+  set: ReadonlySet<number | string>,
   name?: string,
 ): void {
   if (!isTSTLSet(set)) {
@@ -418,7 +418,6 @@ export function logSet(
 
   const setValues = getSortedSetValues(set);
   for (const value of setValues) {
-    // eslint-disable-next-line @typescript-eslint/no-base-to-string
     log(`  Value: ${value}`);
   }
 
@@ -510,7 +509,7 @@ export function logTableDifferences<K extends AnyNotNil, V>(
 
   const keysSet = combineSets(table1KeysSet, table2KeysSet);
   const keys = [...keysSet.values()];
-  keys.sort();
+  keys.sort(); // eslint-disable-line @typescript-eslint/require-array-sort-compare
 
   for (const key of keys) {
     const value1 = table1.get(key);