isaacscript-common 87.9.6 → 87.9.8

package/dist/functions/logMisc.lua

@@ -92,10 +92,14 @@ function ____exports.logFlags(flags, flagEnum, description)
     for ____, ____value in ipairs(entries) do
         local key = ____value[1]
         local value = ____value[2]
-        if hasFlag(nil, flags, value) then
+        do
+            if not hasFlag(nil, flags, value) then
+                goto __continue14
+            end
             log(((("  Has flag: " .. key) .. " (") .. tostring(value)) .. ")")
             hasNoFlags = false
         end
+        ::__continue14::
     end
     if hasNoFlags then
         log("  n/a (no flags)")
@@ -329,10 +333,14 @@ function ____exports.logSeedEffects()
     for ____, ____value in ipairs(seedEffectEntries) do
         local key = ____value[1]
         local seedEffect = ____value[2]
-        if seeds:HasSeedEffect(seedEffect) then
+        do
+            if not seeds:HasSeedEffect(seedEffect) then
+                goto __continue55
+            end
             log(((("  " .. key) .. " (") .. tostring(seedEffect)) .. ")")
             hasNoSeedEffects = false
         end
+        ::__continue55::
     end
     if hasNoSeedEffects then
         log("  n/a (no seed effects)")
@@ -349,8 +357,8 @@ function ____exports.logSet(set, name)
     end
     local suffix = name == nil and "" or (" \"" .. name) .. "\""
     log(("Logging a TSTL set" .. suffix) .. ":")
-    local setValues = getSortedSetValues(nil, set)
-    for ____, value in ipairs(setValues) do
+    local values = getSortedSetValues(nil, set)
+    for ____, value in ipairs(values) do
         log("  Value: " .. tostring(value))
     end
     log("  The size of the set was: " .. tostring(set.size))
@@ -428,7 +436,7 @@ function ____exports.logTableDifferences(table1, table2)
     local table2Keys = __TS__ObjectKeys(table2)
     local table2KeysSet = __TS__New(ReadonlySet, table2Keys)
     local keysSet = combineSets(nil, table1KeysSet, table2KeysSet)
-    local keys = {__TS__Spread(keysSet:values())}
+    local keys = {__TS__Spread(keysSet)}
     __TS__ArraySort(keys)
     for ____, key in ipairs(keys) do
         local value1 = table1[key]

package/dist/functions/map.d.ts

@@ -1,6 +1,6 @@
 import type { DefaultMap } from "../classes/DefaultMap";
 /** Helper function to copy a map. (You can also use a Map constructor to accomplish this task.) */
-export declare function copyMap<K, V>(oldMap: ReadonlyMap<K, V>): Map<K, V>;
+export declare function copyMap<K, V>(oldMap: ReadonlyMap<K, V>): ReadonlyMap<K, V>;
 /**
  * Helper function to get the value from a `DefaultMap` that corresponds to an entity, assuming that
  * the map uses `PtrHash` as an index.

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

@@ -1 +1 @@
-{"version":3,"file":"map.d.ts","sourceRoot":"","sources":["../../src/functions/map.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAGxD,mGAAmG;AAEnG,wBAAgB,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAOlE;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,CAAC,SAAS,OAAO,EAAE,EACtD,GAAG,EAAE,UAAU,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,EAC9B,MAAM,EAAE,MAAM,EACd,GAAG,SAAS,EAAE,CAAC,GACd,CAAC,CAGH;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,EAEjC,GAAG,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,EACpB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,CAAC,GACP,IAAI,CAEN;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,cAAc,CAAC,CAAC,EAAE,CAAC,EACjC,GAAG,EAAE,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,GACrB,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAQnB;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,CAAC,EAE1B,GAAG,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,EACpB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,CAAC,GACP,IAAI,CAGN;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,WAAW,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC,EAC/D,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GACnB,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAQnB;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,mBAAmB,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC,EACvE,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GACnB,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAEnB;AAED,4DAA4D;AAC5D,wBAAgB,MAAM,CAAC,GAAG,EAAE,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,GAAG,MAAM,CAGhE"}
+{"version":3,"file":"map.d.ts","sourceRoot":"","sources":["../../src/functions/map.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAGxD,mGAAmG;AACnG,wBAAgB,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAE1E;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,CAAC,SAAS,OAAO,EAAE,EACtD,GAAG,EAAE,UAAU,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,EAC9B,MAAM,EAAE,MAAM,EACd,GAAG,SAAS,EAAE,CAAC,GACd,CAAC,CAGH;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,EAEjC,GAAG,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,EACpB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,CAAC,GACP,IAAI,CAEN;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,cAAc,CAAC,CAAC,EAAE,CAAC,EACjC,GAAG,EAAE,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,GACrB,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAQnB;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,CAAC,EAE1B,GAAG,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,EACpB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,CAAC,GACP,IAAI,CAGN;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,WAAW,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC,EAC/D,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GACnB,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAQnB;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,mBAAmB,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC,EACvE,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GACnB,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAEnB;AAED,4DAA4D;AAC5D,wBAAgB,MAAM,CAAC,GAAG,EAAE,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,GAAG,MAAM,CAGhE"}

package/dist/functions/map.js

@@ -1,28 +1,13 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.copyMap = copyMap;
-exports.defaultMapGetHash = defaultMapGetHash;
-exports.defaultMapSetHash = defaultMapSetHash;
-exports.getReversedMap = getReversedMap;
-exports.mapSetHash = mapSetHash;
-exports.objectToMap = objectToMap;
-exports.objectToReadonlyMap = objectToReadonlyMap;
-exports.sumMap = sumMap;
-const array_1 = require("./array");
+import { sumArray } from "./array";
 /** Helper function to copy a map. (You can also use a Map constructor to accomplish this task.) */
-// eslint-disable-next-line complete/no-mutable-return
-function copyMap(oldMap) {
-    const newMap = new Map();
-    for (const [key, value] of oldMap) {
-        newMap.set(key, value);
-    }
-    return newMap;
+export function copyMap(oldMap) {
+    return new Map(oldMap);
 }
 /**
  * Helper function to get the value from a `DefaultMap` that corresponds to an entity, assuming that
  * the map uses `PtrHash` as an index.
  */
-function defaultMapGetHash(map, entity, ...extraArgs) {
+export function defaultMapGetHash(map, entity, ...extraArgs) {
     const ptrHash = GetPtrHash(entity);
     return map.getAndSetDefault(ptrHash, ...extraArgs);
 }
@@ -33,7 +18,7 @@ function defaultMapGetHash(map, entity, ...extraArgs) {
  * Since `Map` and `DefaultMap` set values in the same way, this function is simply an alias for the
  * `mapSetHash` helper function.
  */
-function defaultMapSetHash(
+export function defaultMapSetHash(
 // eslint-disable-next-line complete/prefer-readonly-parameter-types
 map, entity, value) {
     mapSetHash(map, entity, value);
@@ -59,7 +44,7 @@ map, entity, value) {
  * ]);
  * ```
  */
-function getReversedMap(map) {
+export function getReversedMap(map) {
     const reverseMap = new Map();
     for (const [key, value] of map) {
         reverseMap.set(value, key);
@@ -70,7 +55,7 @@ function getReversedMap(map) {
  * Helper function to set a value for a `DefaultMap` that corresponds to an entity, assuming that
  * the map uses `PtrHash` as an index.
  */
-function mapSetHash(
+export function mapSetHash(
 // eslint-disable-next-line complete/prefer-readonly-parameter-types
 map, entity, value) {
     const hash = GetPtrHash(entity);
@@ -89,7 +74,7 @@ map, entity, value) {
  *
  * Also see the `objectToReadonlyMap` function.
  */
-function objectToMap(object) {
+export function objectToMap(object) {
     const map = new Map();
     for (const [key, value] of Object.entries(object)) {
         map.set(key, value);
@@ -109,11 +94,11 @@ function objectToMap(object) {
  *
  * Also see the `objectToMap` function.
  */
-function objectToReadonlyMap(object) {
+export function objectToReadonlyMap(object) {
     return objectToMap(object);
 }
 /** Helper function to sum every value in a map together. */
-function sumMap(map) {
+export function sumMap(map) {
     const values = [...map.values()];
-    return (0, array_1.sumArray)(values);
+    return sumArray(values);
 }

package/dist/functions/map.lua

@@ -15,13 +15,7 @@ function ____exports.mapSetHash(self, map, entity, value)
 end
 --- Helper function to copy a map. (You can also use a Map constructor to accomplish this task.)
 function ____exports.copyMap(self, oldMap)
-    local newMap = __TS__New(Map)
-    for ____, ____value in __TS__Iterator(oldMap) do
-        local key = ____value[1]
-        local value = ____value[2]
-        newMap:set(key, value)
-    end
-    return newMap
+    return __TS__New(Map, oldMap)
 end
 --- Helper function to get the value from a `DefaultMap` that corresponds to an entity, assuming that
 -- the map uses `PtrHash` as an index.

package/dist/functions/math.d.ts

@@ -38,7 +38,7 @@ export declare function lerpAngleDegrees(aStart: number, aEnd: number, percent:
 /**
  * If rounding fails, this function returns 0.
  *
- * From: http://lua-users.org/wiki/SimpleRound
+ * From: https://lua-users.org/wiki/SimpleRound
  *
  * @param num The number to round.
  * @param numDecimalPlaces Optional. Default is 0.

package/dist/functions/math.js

@@ -1,30 +1,15 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.clamp = clamp;
-exports.getAngleDifference = getAngleDifference;
-exports.getCircleDiscretizedPoints = getCircleDiscretizedPoints;
-exports.inRectangle = inRectangle;
-exports.isCircleIntersectingRectangle = isCircleIntersectingRectangle;
-exports.isEven = isEven;
-exports.isOdd = isOdd;
-exports.lerp = lerp;
-exports.lerpAngleDegrees = lerpAngleDegrees;
-exports.round = round;
-exports.sign = sign;
-exports.splitNumber = splitNumber;
-exports.tanh = tanh;
-const isaac_typescript_definitions_1 = require("isaac-typescript-definitions");
-const direction_1 = require("./direction");
+import { Direction } from "isaac-typescript-definitions";
+import { directionToVector } from "./direction";
 /**
  * Helper function to normalize a number, ensuring that it is within a certain range.
  *
  * - If `num` is less than `min`, then it will be clamped to `min`.
  * - If `num` is greater than `max`, then it will be clamped to `max`.
  */
-function clamp(num, min, max) {
+export function clamp(num, min, max) {
     return Math.max(min, Math.min(num, max));
 }
-function getAngleDifference(angle1, angle2) {
+export function getAngleDifference(angle1, angle2) {
     const subtractedAngle = angle1 - angle2;
     return ((subtractedAngle + 180) % 360) - 180;
 }
@@ -40,8 +25,8 @@ function getAngleDifference(angle1, angle2) {
  * @param initialDirection By default, the first point on the circle will be on the top center, but
  *                         this can be optionally changed by specifying this argument.
  */
-function getCircleDiscretizedPoints(centerPos, radius, numPoints, xMultiplier = 1, yMultiplier = 1, initialDirection = isaac_typescript_definitions_1.Direction.UP) {
-    const vector = (0, direction_1.directionToVector)(initialDirection);
+export function getCircleDiscretizedPoints(centerPos, radius, numPoints, xMultiplier = 1, yMultiplier = 1, initialDirection = Direction.UP) {
+    const vector = directionToVector(initialDirection);
     const initialPosition = vector.mul(radius);
     const positions = [];
     for (let i = 0; i < numPoints; i++) {
@@ -59,7 +44,7 @@ function getCircleDiscretizedPoints(centerPos, radius, numPoints, xMultiplier =
  * This is an inclusive check, meaning that it will return true if the position is on the border of
  * the rectangle.
  */
-function inRectangle(position, topLeft, bottomRight) {
+export function inRectangle(position, topLeft, bottomRight) {
     return (position.X >= topLeft.X
         && position.X <= bottomRight.X
         && position.Y >= topLeft.Y
@@ -68,42 +53,42 @@ function inRectangle(position, topLeft, bottomRight) {
 /**
  * From: https://www.geeksforgeeks.org/check-if-any-point-overlaps-the-given-circle-and-rectangle/
  */
-function isCircleIntersectingRectangle(circleCenter, circleRadius, rectangleTopLeft, rectangleBottomRight) {
+export function isCircleIntersectingRectangle(circleCenter, circleRadius, rectangleTopLeft, rectangleBottomRight) {
     const nearestX = Math.max(rectangleTopLeft.X, Math.min(circleCenter.X, rectangleBottomRight.X));
     const nearestY = Math.max(rectangleTopLeft.Y, Math.min(circleCenter.Y, rectangleBottomRight.Y));
     const nearestPointToCircleOnRectangle = Vector(nearestX, nearestY);
     const distanceToCenterOfCircle = nearestPointToCircleOnRectangle.Distance(circleCenter);
     return distanceToCenterOfCircle <= circleRadius;
 }
-function isEven(num) {
+export function isEven(num) {
     // This is benchmarked to be faster than using the modulus operator by 3%.
     return (num & 1) === 0;
 }
-function isOdd(num) {
+export function isOdd(num) {
     // This is benchmarked to be faster than using the modulus operator by 3%.
     return (num & 1) === 1;
 }
-function lerp(a, b, pos) {
+export function lerp(a, b, pos) {
     return a + (b - a) * pos;
 }
-function lerpAngleDegrees(aStart, aEnd, percent) {
+export function lerpAngleDegrees(aStart, aEnd, percent) {
     return aStart + getAngleDifference(aStart, aEnd) * percent;
 }
 /**
  * If rounding fails, this function returns 0.
  *
- * From: http://lua-users.org/wiki/SimpleRound
+ * From: https://lua-users.org/wiki/SimpleRound
  *
  * @param num The number to round.
  * @param numDecimalPlaces Optional. Default is 0.
  */
-function round(num, numDecimalPlaces = 0) {
+export function round(num, numDecimalPlaces = 0) {
     const roundedString = string.format(`%.${numDecimalPlaces}f`, num);
     const roundedNum = tonumber(roundedString);
     return roundedNum ?? 0;
 }
 /** @returns 1 if n is positive, -1 if n is negative, or 0 if n is 0. */
-function sign(n) {
+export function sign(n) {
     if (n > 0) {
         return 1;
     }
@@ -128,7 +113,7 @@ function sign(n) {
  * @param startAtZero Whether to start at 0. Defaults to false. If true, the chunks will start at 0
  *                    instead of 1.
  */
-function splitNumber(num, size, startAtZero = false) {
+export function splitNumber(num, size, startAtZero = false) {
     if (num <= 0) {
         error(`The number to split needs to be a positive number and is instead: ${num}`);
     }
@@ -144,6 +129,6 @@ function splitNumber(num, size, startAtZero = false) {
     }
     return chunks;
 }
-function tanh(x) {
+export function tanh(x) {
     return (Math.exp(x) - Math.exp(-x)) / (Math.exp(x) + Math.exp(-x));
 }

package/dist/functions/math.lua

@@ -88,7 +88,7 @@ function ____exports.lerpAngleDegrees(self, aStart, aEnd, percent)
 end
 --- If rounding fails, this function returns 0.
 -- 
--- From: http://lua-users.org/wiki/SimpleRound
+-- From: https://lua-users.org/wiki/SimpleRound
 -- 
 -- @param num The number to round.
 -- @param numDecimalPlaces Optional. Default is 0.

package/dist/functions/merge.js

@@ -1,18 +1,15 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.merge = merge;
-const constants_1 = require("../classes/features/other/saveDataManager/constants");
-const SerializationBrand_1 = require("../enums/private/SerializationBrand");
-const SerializationType_1 = require("../enums/SerializationType");
-const serialization_1 = require("../serialization");
-const array_1 = require("./array");
-const deepCopy_1 = require("./deepCopy");
-const log_1 = require("./log");
-const serialization_2 = require("./serialization");
-const table_1 = require("./table");
-const tstlClass_1 = require("./tstlClass");
-const types_1 = require("./types");
-const utils_1 = require("./utils");
+import { SAVE_DATA_MANAGER_DEBUG } from "../classes/features/other/saveDataManager/constants";
+import { SerializationBrand } from "../enums/private/SerializationBrand";
+import { SerializationType } from "../enums/SerializationType";
+import { isSerializationBrand } from "../serialization";
+import { isArray } from "./array";
+import { deepCopy } from "./deepCopy";
+import { log } from "./log";
+import { deserializeIsaacAPIClass, isSerializedIsaacAPIClass, } from "./serialization";
+import { clearTable, iterateTableInOrder } from "./table";
+import { isDefaultMap, isTSTLMap, isTSTLSet } from "./tstlClass";
+import { isTable } from "./types";
+import { getTraversalDescription } from "./utils";
 /**
  * `merge` takes the values from a new table and recursively merges them into an old object (while
  * performing appropriate deserialization).
@@ -49,24 +46,24 @@ const utils_1 = require("./utils");
  *                          object, it will use this map to instantiate a new class. Default is an
  *                          empty Lua table.
  */
-function merge(oldObject, newTable, traversalDescription, classConstructors = new LuaMap()) {
-    if (constants_1.SAVE_DATA_MANAGER_DEBUG) {
-        (0, log_1.log)(`merge is traversing: ${traversalDescription}`);
+export function merge(oldObject, newTable, traversalDescription, classConstructors = new LuaMap()) {
+    if (SAVE_DATA_MANAGER_DEBUG) {
+        log(`merge is traversing: ${traversalDescription}`);
     }
-    if (!(0, types_1.isTable)(oldObject)) {
+    if (!isTable(oldObject)) {
         error("The first argument given to the merge function is not a table.");
     }
-    if (!(0, types_1.isTable)(newTable)) {
+    if (!isTable(newTable)) {
         error("The second argument given to the merge function is not a table.");
     }
     // First, handle the special case of an array with a shallow copy.
-    if ((0, array_1.isArray)(oldObject) && (0, array_1.isArray)(newTable)) {
+    if (isArray(oldObject) && isArray(newTable)) {
         mergeSerializedArray(oldObject, newTable, traversalDescription, classConstructors);
         return;
     }
     // Depending on whether we are working on a Lua table or a TypeScriptToLua object, we need to
     // iterate in a specific way.
-    if ((0, tstlClass_1.isTSTLMap)(oldObject) || (0, tstlClass_1.isTSTLSet)(oldObject) || (0, tstlClass_1.isDefaultMap)(oldObject)) {
+    if (isTSTLMap(oldObject) || isTSTLSet(oldObject) || isDefaultMap(oldObject)) {
         mergeSerializedTSTLObject(oldObject, newTable, traversalDescription, classConstructors);
     }
     else {
@@ -74,85 +71,85 @@ function merge(oldObject, newTable, traversalDescription, classConstructors = ne
     }
 }
 function mergeSerializedArray(oldArray, newArray, traversalDescription, classConstructors) {
-    if (constants_1.SAVE_DATA_MANAGER_DEBUG) {
-        (0, log_1.log)(`merge encountered an array: ${traversalDescription}`);
+    if (SAVE_DATA_MANAGER_DEBUG) {
+        log(`merge encountered an array: ${traversalDescription}`);
     }
     // Assume that we should blow away all array values with whatever is present in the incoming
     // array.
-    (0, table_1.clearTable)(oldArray);
-    (0, table_1.iterateTableInOrder)(newArray, (key, value) => {
-        const deserializedValue = (0, deepCopy_1.deepCopy)(value, SerializationType_1.SerializationType.DESERIALIZE, traversalDescription, classConstructors);
+    clearTable(oldArray);
+    iterateTableInOrder(newArray, (key, value) => {
+        const deserializedValue = deepCopy(value, SerializationType.DESERIALIZE, traversalDescription, classConstructors);
         oldArray.set(key, deserializedValue);
-    }, constants_1.SAVE_DATA_MANAGER_DEBUG);
-}
-function mergeSerializedTSTLObject(
-// eslint-disable-next-line complete/prefer-readonly-parameter-types
-oldObject, newTable, traversalDescription, classConstructors) {
-    if (constants_1.SAVE_DATA_MANAGER_DEBUG) {
-        (0, log_1.log)(`merge encountered a TSTL object: ${traversalDescription}`);
-    }
-    // We blow away the old object and recursively copy over all of the incoming values.
-    oldObject.clear();
-    // During serialization, we brand some Lua tables with a special identifier to signify that it has
-    // keys that should be deserialized to numbers.
-    const convertStringKeysToNumbers = newTable.has(SerializationBrand_1.SerializationBrand.OBJECT_WITH_NUMBER_KEYS);
-    (0, table_1.iterateTableInOrder)(newTable, (key, value) => {
-        if ((0, serialization_1.isSerializationBrand)(key)) {
-            return;
-        }
-        let keyToUse = key;
-        if (convertStringKeysToNumbers) {
-            const numberKey = tonumber(key);
-            if (numberKey === undefined) {
-                return;
-            }
-            keyToUse = numberKey;
-        }
-        if ((0, tstlClass_1.isTSTLMap)(oldObject) || (0, tstlClass_1.isDefaultMap)(oldObject)) {
-            const deserializedValue = (0, deepCopy_1.deepCopy)(value, SerializationType_1.SerializationType.DESERIALIZE, traversalDescription, classConstructors);
-            oldObject.set(keyToUse, deserializedValue);
-        }
-        else if ((0, tstlClass_1.isTSTLSet)(oldObject)) {
-            oldObject.add(keyToUse);
-        }
-    }, constants_1.SAVE_DATA_MANAGER_DEBUG);
+    }, SAVE_DATA_MANAGER_DEBUG);
 }
 function mergeSerializedTable(oldTable, newTable, traversalDescription, classConstructors) {
-    if (constants_1.SAVE_DATA_MANAGER_DEBUG) {
-        (0, log_1.log)(`merge encountered a Lua table: ${traversalDescription}`);
+    if (SAVE_DATA_MANAGER_DEBUG) {
+        log(`merge encountered a Lua table: ${traversalDescription}`);
     }
-    (0, table_1.iterateTableInOrder)(newTable, (key, value) => {
-        if (constants_1.SAVE_DATA_MANAGER_DEBUG) {
-            const valueToPrint = value === "" ? "(empty string)" : `${value}`;
-            (0, log_1.log)(`merge is merging: ${traversalDescription} --> ${valueToPrint}`);
+    iterateTableInOrder(newTable, (key, value) => {
+        if (SAVE_DATA_MANAGER_DEBUG) {
+            const valueToPrint = value === "" ? "(empty string)" : String(value);
+            log(`merge is merging: ${traversalDescription} --> ${valueToPrint}`);
         }
-        if ((0, serialization_1.isSerializationBrand)(key)) {
+        if (isSerializationBrand(key)) {
             return;
         }
         // Handle the special case of serialized Isaac API classes.
-        if ((0, serialization_2.isSerializedIsaacAPIClass)(value)) {
-            if (constants_1.SAVE_DATA_MANAGER_DEBUG) {
-                (0, log_1.log)("merge found a serialized Isaac API class.");
+        if (isSerializedIsaacAPIClass(value)) {
+            if (SAVE_DATA_MANAGER_DEBUG) {
+                log("merge found a serialized Isaac API class.");
             }
-            const deserializedObject = (0, serialization_2.deserializeIsaacAPIClass)(value);
+            const deserializedObject = deserializeIsaacAPIClass(value);
             oldTable.set(key, deserializedObject);
             return;
         }
-        if ((0, types_1.isTable)(value)) {
+        if (isTable(value)) {
             let oldValue = oldTable.get(key);
-            if (!(0, types_1.isTable)(oldValue)) {
+            if (!isTable(oldValue)) {
                 // The child table does not exist on the old table. However, we still need to copy over
                 // the new table, because we need to handle data types like `Foo | null`. Thus, set up a
                 // blank sub-table on the old table, and continue to recursively merge.
                 oldValue = new LuaMap();
                 oldTable.set(key, oldValue);
             }
-            traversalDescription = (0, utils_1.getTraversalDescription)(key, traversalDescription);
+            traversalDescription = getTraversalDescription(key, traversalDescription);
             merge(oldValue, value, traversalDescription, classConstructors);
         }
         else {
             // Base case: copy the value
             oldTable.set(key, value);
         }
-    }, constants_1.SAVE_DATA_MANAGER_DEBUG);
+    }, SAVE_DATA_MANAGER_DEBUG);
+}
+function mergeSerializedTSTLObject(
+// eslint-disable-next-line complete/prefer-readonly-parameter-types
+oldObject, newTable, traversalDescription, classConstructors) {
+    if (SAVE_DATA_MANAGER_DEBUG) {
+        log(`merge encountered a TSTL object: ${traversalDescription}`);
+    }
+    // We blow away the old object and recursively copy over all of the incoming values.
+    oldObject.clear();
+    // During serialization, we brand some Lua tables with a special identifier to signify that it has
+    // keys that should be deserialized to numbers.
+    const convertStringKeysToNumbers = newTable.has(SerializationBrand.OBJECT_WITH_NUMBER_KEYS);
+    iterateTableInOrder(newTable, (key, value) => {
+        if (isSerializationBrand(key)) {
+            return;
+        }
+        let keyToUse = key;
+        if (convertStringKeysToNumbers) {
+            const numberKey = tonumber(key);
+            if (numberKey === undefined) {
+                return;
+            }
+            keyToUse = numberKey;
+        }
+        if (isTSTLMap(oldObject) || isDefaultMap(oldObject)) {
+            const deserializedValue = deepCopy(value, SerializationType.DESERIALIZE, traversalDescription, classConstructors);
+            oldObject.set(keyToUse, deserializedValue);
+        }
+        else if (isTSTLSet(oldObject)) {
+            oldObject.add(keyToUse);
+        }
+    }, SAVE_DATA_MANAGER_DEBUG);
 }

package/dist/functions/merge.lua

@@ -2,7 +2,7 @@ local ____lualib = require("lualib_bundle")
 local Set = ____lualib.Set
 local Map = ____lualib.Map
 local ____exports = {}
-local mergeSerializedArray, mergeSerializedTSTLObject, mergeSerializedTable
+local mergeSerializedArray, mergeSerializedTable, mergeSerializedTSTLObject
 local ____constants = require("classes.features.other.saveDataManager.constants")
 local SAVE_DATA_MANAGER_DEBUG = ____constants.SAVE_DATA_MANAGER_DEBUG
 local ____SerializationBrand = require("enums.private.SerializationBrand")
@@ -127,43 +127,6 @@ function mergeSerializedArray(self, oldArray, newArray, traversalDescription, cl
         SAVE_DATA_MANAGER_DEBUG
     )
 end
-function mergeSerializedTSTLObject(self, oldObject, newTable, traversalDescription, classConstructors)
-    if SAVE_DATA_MANAGER_DEBUG then
-        log("merge encountered a TSTL object: " .. traversalDescription)
-    end
-    oldObject:clear()
-    local convertStringKeysToNumbers = newTable[SerializationBrand.OBJECT_WITH_NUMBER_KEYS] ~= nil
-    iterateTableInOrder(
-        nil,
-        newTable,
-        function(____, key, value)
-            if isSerializationBrand(nil, key) then
-                return
-            end
-            local keyToUse = key
-            if convertStringKeysToNumbers then
-                local numberKey = tonumber(key)
-                if numberKey == nil then
-                    return
-                end
-                keyToUse = numberKey
-            end
-            if isTSTLMap(nil, oldObject) or isDefaultMap(nil, oldObject) then
-                local deserializedValue = deepCopy(
-                    nil,
-                    value,
-                    SerializationType.DESERIALIZE,
-                    traversalDescription,
-                    classConstructors
-                )
-                oldObject:set(keyToUse, deserializedValue)
-            elseif isTSTLSet(nil, oldObject) then
-                oldObject:add(keyToUse)
-            end
-        end,
-        SAVE_DATA_MANAGER_DEBUG
-    )
-end
 function mergeSerializedTable(self, oldTable, newTable, traversalDescription, classConstructors)
     if SAVE_DATA_MANAGER_DEBUG then
         log("merge encountered a Lua table: " .. traversalDescription)
@@ -208,4 +171,41 @@ function mergeSerializedTable(self, oldTable, newTable, traversalDescription, cl
         SAVE_DATA_MANAGER_DEBUG
     )
 end
+function mergeSerializedTSTLObject(self, oldObject, newTable, traversalDescription, classConstructors)
+    if SAVE_DATA_MANAGER_DEBUG then
+        log("merge encountered a TSTL object: " .. traversalDescription)
+    end
+    oldObject:clear()
+    local convertStringKeysToNumbers = newTable[SerializationBrand.OBJECT_WITH_NUMBER_KEYS] ~= nil
+    iterateTableInOrder(
+        nil,
+        newTable,
+        function(____, key, value)
+            if isSerializationBrand(nil, key) then
+                return
+            end
+            local keyToUse = key
+            if convertStringKeysToNumbers then
+                local numberKey = tonumber(key)
+                if numberKey == nil then
+                    return
+                end
+                keyToUse = numberKey
+            end
+            if isTSTLMap(nil, oldObject) or isDefaultMap(nil, oldObject) then
+                local deserializedValue = deepCopy(
+                    nil,
+                    value,
+                    SerializationType.DESERIALIZE,
+                    traversalDescription,
+                    classConstructors
+                )
+                oldObject:set(keyToUse, deserializedValue)
+            elseif isTSTLSet(nil, oldObject) then
+                oldObject:add(keyToUse)
+            end
+        end,
+        SAVE_DATA_MANAGER_DEBUG
+    )
+end
 return ____exports