isaacscript-common 1.2.171 → 1.2.172

package/dist/callbacks/postNewRoomEarly.lua

@@ -36,14 +36,14 @@ function checkRoomChanged(self)
             log("Error: Failed to spawn a new wall (1) for the PostNewRoomEarly callback.")
             return
         end
-        log("Spawned a new wall (2) for the PostNewRoomEarly callback.")
+        log("Spawned a new wall (1) for the PostNewRoomEarly callback.")
     end
     local rightOfTopWallGridIndex = topLeftWallGridIndex + 1
     local topLeftWall2 = room:GetGridEntity(rightOfTopWallGridIndex)
     if topLeftWall2 == nil then
-        topLeftWall2 = spawnGridEntity(nil, GridEntityType.GRID_WALL, topLeftWallGridIndex)
+        topLeftWall2 = spawnGridEntity(nil, GridEntityType.GRID_WALL, rightOfTopWallGridIndex)
         if topLeftWall2 == nil then
-            log("Error: Failed to spawn a new wall (1) for the PostNewRoomEarly callback.")
+            log("Error: Failed to spawn a new wall (2) for the PostNewRoomEarly callback.")
             return
         end
         log("Spawned a new wall (2) for the PostNewRoomEarly callback.")

package/dist/enums/SerializationType.d.ts

@@ -0,0 +1,5 @@
+export declare enum SerializationType {
+    NONE = 0,
+    SERIALIZE = 1,
+    DESERIALIZE = 2
+}

package/dist/enums/SerializationType.lua

@@ -0,0 +1,10 @@
+--[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
+local ____exports = {}
+____exports.SerializationType = SerializationType or ({})
+____exports.SerializationType.NONE = 0
+____exports.SerializationType[____exports.SerializationType.NONE] = "NONE"
+____exports.SerializationType.SERIALIZE = 1
+____exports.SerializationType[____exports.SerializationType.SERIALIZE] = "SERIALIZE"
+____exports.SerializationType.DESERIALIZE = 2
+____exports.SerializationType[____exports.SerializationType.DESERIALIZE] = "DESERIALIZE"
+return ____exports

package/dist/features/saveDataManager/exports.lua

@@ -3,11 +3,12 @@ local ____lualib = require("lualib_bundle")
 local Map = ____lualib.Map
 local __TS__ObjectKeys = ____lualib.__TS__ObjectKeys
 local ____exports = {}
+local ____SerializationType = require("enums.SerializationType")
+local SerializationType = ____SerializationType.SerializationType
 local ____featuresInitialized = require("featuresInitialized")
 local errorIfFeaturesNotInitialized = ____featuresInitialized.errorIfFeaturesNotInitialized
 local ____deepCopy = require("functions.deepCopy")
 local deepCopy = ____deepCopy.deepCopy
-local SerializationType = ____deepCopy.SerializationType
 local ____constants = require("features.saveDataManager.constants")
 local SAVE_DATA_MANAGER_FEATURE_NAME = ____constants.SAVE_DATA_MANAGER_FEATURE_NAME
 local ____main = require("features.saveDataManager.main")

package/dist/features/saveDataManager/main.lua

@@ -9,9 +9,10 @@ local ____ModCallbacksCustom = require("enums.ModCallbacksCustom")
 local ModCallbacksCustom = ____ModCallbacksCustom.ModCallbacksCustom
 local ____SaveDataKeys = require("enums.private.SaveDataKeys")
 local SaveDataKeys = ____SaveDataKeys.SaveDataKeys
+local ____SerializationType = require("enums.SerializationType")
+local SerializationType = ____SerializationType.SerializationType
 local ____deepCopy = require("functions.deepCopy")
 local deepCopy = ____deepCopy.deepCopy
-local SerializationType = ____deepCopy.SerializationType
 local ____log = require("functions.log")
 local log = ____log.log
 local ____table = require("functions.table")

package/dist/features/saveDataManager/merge.lua

@@ -8,6 +8,8 @@ local mergeArray, mergeTSTLObject, mergeTable, mergeVector
 local ____SerializationBrand = require("enums.private.SerializationBrand")
 local isSerializationBrand = ____SerializationBrand.isSerializationBrand
 local SerializationBrand = ____SerializationBrand.SerializationBrand
+local ____SerializationType = require("enums.SerializationType")
+local SerializationType = ____SerializationType.SerializationType
 local ____array = require("functions.array")
 local isArray = ____array.isArray
 local ____deepCopy = require("functions.deepCopy")
@@ -15,7 +17,6 @@ local addTraversalDescription = ____deepCopy.addTraversalDescription
 local deepCopy = ____deepCopy.deepCopy
 local deserializeVector = ____deepCopy.deserializeVector
 local isSerializedVector = ____deepCopy.isSerializedVector
-local SerializationType = ____deepCopy.SerializationType
 local ____log = require("functions.log")
 local log = ____log.log
 local ____table = require("functions.table")
@@ -23,6 +24,9 @@ local clearTable = ____table.clearTable
 local ____constants = require("features.saveDataManager.constants")
 local SAVE_DATA_MANAGER_DEBUG = ____constants.SAVE_DATA_MANAGER_DEBUG
 function ____exports.merge(self, oldObject, newTable, traversalDescription)
+    if SAVE_DATA_MANAGER_DEBUG then
+        log("merge is operating on: " .. traversalDescription)
+    end
     local oldObjectType = type(oldObject)
     if oldObjectType ~= "table" then
         error("The first argument given to the merge function is not a table.")
@@ -31,9 +35,6 @@ function ____exports.merge(self, oldObject, newTable, traversalDescription)
     if newTableType ~= "table" then
         error("The second argument given to the merge function is not a table.")
     end
-    if SAVE_DATA_MANAGER_DEBUG then
-        log("merge is operating on: " .. traversalDescription)
-    end
     if mergeArray(nil, oldObject, newTable) then
         return
     end
@@ -87,19 +88,28 @@ function mergeTSTLObject(self, oldObject, newTable, traversalDescription)
     end
 end
 function mergeTable(self, oldTable, newTable, traversalDescription)
+    if SAVE_DATA_MANAGER_DEBUG then
+        log("merge is operating on a table. Iterating through the keys...")
+    end
     for key, value in pairs(newTable) do
         do
+            if SAVE_DATA_MANAGER_DEBUG then
+                log((("merge is operating on: " .. tostring(key)) .. " --> ") .. tostring(value))
+            end
             if isSerializationBrand(nil, key) then
-                goto __continue22
+                goto __continue23
             end
             if mergeVector(nil, oldTable, key, value) then
-                goto __continue22
+                goto __continue23
             end
             local valueType = type(value)
             if valueType == "table" then
                 local oldValue = oldTable[key]
                 local oldValueType = type(oldValue)
-                if oldValueType == "table" then
+                if oldValueType == "nil" then
+                    local valueDeepCopy = deepCopy(nil, value)
+                    oldTable[key] = valueDeepCopy
+                elseif oldValueType == "table" then
                     traversalDescription = addTraversalDescription(nil, key, traversalDescription)
                     ____exports.merge(nil, oldValue, value, traversalDescription)
                 end
@@ -110,7 +120,7 @@ function mergeTable(self, oldTable, newTable, traversalDescription)
                 oldTable[key] = value
             end
         end
-        ::__continue22::
+        ::__continue23::
     end
 end
 function mergeVector(self, oldTable, key, value)

package/dist/features/saveDataManager/save.lua

@@ -4,9 +4,10 @@ local Map = ____lualib.Map
 local __TS__ObjectKeys = ____lualib.__TS__ObjectKeys
 local ____exports = {}
 local getAllSaveDataToWriteToDisk
+local ____SerializationType = require("enums.SerializationType")
+local SerializationType = ____SerializationType.SerializationType
 local ____deepCopy = require("functions.deepCopy")
 local deepCopy = ____deepCopy.deepCopy
-local SerializationType = ____deepCopy.SerializationType
 local ____jsonHelpers = require("functions.jsonHelpers")
 local jsonEncode = ____jsonHelpers.jsonEncode
 local ____log = require("functions.log")

package/dist/functions/deepCopy.d.ts

@@ -1,10 +1,6 @@
 /// <reference types="typescript-to-lua/language-extensions" />
 /// <reference types="isaac-typescript-definitions" />
-export declare enum SerializationType {
-    NONE = 0,
-    SERIALIZE = 1,
-    DESERIALIZE = 2
-}
+import { SerializationType } from "../enums/SerializationType";
 /**
  * deepCopy is a semi-generic deep cloner. It will recursively copy all of the values so that none
  * of the nested references remain.

package/dist/functions/deepCopy.lua

@@ -12,6 +12,8 @@ local DefaultMap = ____DefaultMap.DefaultMap
 local ____SerializationBrand = require("enums.private.SerializationBrand")
 local isSerializationBrand = ____SerializationBrand.isSerializationBrand
 local SerializationBrand = ____SerializationBrand.SerializationBrand
+local ____SerializationType = require("enums.SerializationType")
+local SerializationType = ____SerializationType.SerializationType
 local ____constants = require("features.saveDataManager.constants")
 local SAVE_DATA_MANAGER_DEBUG = ____constants.SAVE_DATA_MANAGER_DEBUG
 local ____log = require("functions.log")
@@ -20,24 +22,24 @@ local ____vector = require("functions.vector")
 local isVector = ____vector.isVector
 function ____exports.deepCopy(self, oldObject, serializationType, traversalDescription)
     if serializationType == nil then
-        serializationType = ____exports.SerializationType.NONE
+        serializationType = SerializationType.NONE
     end
     if traversalDescription == nil then
         traversalDescription = ""
     end
-    local oldObjectType = type(oldObject)
-    if oldObjectType ~= "table" then
-        error(("The deepCopy function was given a " .. oldObjectType) .. " instead of a table.")
-    end
     if SAVE_DATA_MANAGER_DEBUG then
         local logString = "deepCopy is operating on: " .. traversalDescription
-        if serializationType == ____exports.SerializationType.SERIALIZE then
+        if serializationType == SerializationType.SERIALIZE then
             logString = logString .. " (serializing)"
-        elseif serializationType == ____exports.SerializationType.DESERIALIZE then
+        elseif serializationType == SerializationType.DESERIALIZE then
             logString = logString .. " (deserializing)"
         end
         log(logString)
     end
+    local oldObjectType = type(oldObject)
+    if oldObjectType ~= "table" then
+        error(("The deepCopy function was given a " .. oldObjectType) .. " instead of a table.")
+    end
     local oldTable = oldObject
     local isClass = isTSTLClass(nil, oldTable)
     local hasTSTLDefaultMapBrand = false
@@ -52,27 +54,27 @@ function ____exports.deepCopy(self, oldObject, serializationType, traversalDescr
         hasTSTLClassBrand = oldTable[SerializationBrand.CLASS] ~= nil
     end
     local newObject
-    if serializationType == ____exports.SerializationType.NONE and __TS__InstanceOf(oldObject, DefaultMap) then
+    if serializationType == SerializationType.NONE and __TS__InstanceOf(oldObject, DefaultMap) then
         local oldDefaultMap = oldObject
         local constructorArg = oldDefaultMap:getConstructorArg()
         newObject = __TS__New(DefaultMap, constructorArg)
-    elseif serializationType == ____exports.SerializationType.DESERIALIZE and hasTSTLDefaultMapBrand then
+    elseif serializationType == SerializationType.DESERIALIZE and hasTSTLDefaultMapBrand then
         local defaultValue = oldTable[SerializationBrand.DEFAULT_MAP_VALUE]
         if type(defaultValue) ~= "boolean" and type(defaultValue) ~= "number" and type(defaultValue) ~= "string" then
             error("The deepCopy function failed to get a valid default value for a DefaultMap object when deserializing.")
         else
             newObject = __TS__New(DefaultMap, defaultValue)
         end
-    elseif serializationType == ____exports.SerializationType.NONE and __TS__InstanceOf(oldObject, Map) or serializationType == ____exports.SerializationType.DESERIALIZE and hasTSTLMapBrand then
+    elseif serializationType == SerializationType.NONE and __TS__InstanceOf(oldObject, Map) or serializationType == SerializationType.DESERIALIZE and hasTSTLMapBrand then
         newObject = __TS__New(Map)
-    elseif serializationType == ____exports.SerializationType.NONE and __TS__InstanceOf(oldObject, Set) or serializationType == ____exports.SerializationType.DESERIALIZE and hasTSTLSetBrand then
+    elseif serializationType == SerializationType.NONE and __TS__InstanceOf(oldObject, Set) or serializationType == SerializationType.DESERIALIZE and hasTSTLSetBrand then
         newObject = __TS__New(Set)
-    elseif serializationType == ____exports.SerializationType.NONE and isClass or serializationType == ____exports.SerializationType.DESERIALIZE and hasTSTLClassBrand then
+    elseif serializationType == SerializationType.NONE and isClass or serializationType == SerializationType.DESERIALIZE and hasTSTLClassBrand then
         newObject = copyClass(nil, oldObject)
     else
         newObject = {}
     end
-    if serializationType == ____exports.SerializationType.SERIALIZE then
+    if serializationType == SerializationType.SERIALIZE then
         local newTable = newObject
         if __TS__InstanceOf(oldObject, DefaultMap) then
             newTable[SerializationBrand.DEFAULT_MAP] = ""
@@ -189,7 +191,7 @@ function deepCopyValue(self, oldObject, newObject, key, value, traversalDescript
     local convertNumberKeysToString = false
     local isTSTLObject = __TS__InstanceOf(oldObject, Map) or __TS__InstanceOf(oldObject, Set)
     local keyType = type(key)
-    if serializationType == ____exports.SerializationType.SERIALIZE and isTSTLObject and keyType == "number" then
+    if serializationType == SerializationType.SERIALIZE and isTSTLObject and keyType == "number" then
         convertNumberKeysToString = true
         local newTable = newObject
         newTable[SerializationBrand.OBJECT_WITH_NUMBER_KEYS] = ""
@@ -201,7 +203,7 @@ function deepCopyValue(self, oldObject, newObject, key, value, traversalDescript
     if isVector(nil, value) then
         local vector = value
         newValue = copyVector(nil, vector, serializationType)
-    elseif ____exports.isSerializedVector(nil, value) and serializationType == ____exports.SerializationType.DESERIALIZE then
+    elseif ____exports.isSerializedVector(nil, value) and serializationType == SerializationType.DESERIALIZE then
         local serializedVector = value
         newValue = ____exports.deserializeVector(nil, serializedVector)
     elseif valueType == "table" then
@@ -221,7 +223,7 @@ function deepCopyValue(self, oldObject, newObject, key, value, traversalDescript
     end
 end
 function copyVector(self, vector, serializationType)
-    if serializationType == ____exports.SerializationType.SERIALIZE then
+    if serializationType == SerializationType.SERIALIZE then
         local vectorTable = {}
         vectorTable.X = vector.X
         vectorTable.Y = vector.Y
@@ -275,12 +277,5 @@ function ____exports.isSerializedVector(self, object)
     local ____table = object
     return ____table[SerializationBrand.VECTOR] ~= nil and ____table.X ~= nil and ____table.Y ~= nil
 end
-____exports.SerializationType = SerializationType or ({})
-____exports.SerializationType.NONE = 0
-____exports.SerializationType[____exports.SerializationType.NONE] = "NONE"
-____exports.SerializationType.SERIALIZE = 1
-____exports.SerializationType[____exports.SerializationType.SERIALIZE] = "SERIALIZE"
-____exports.SerializationType.DESERIALIZE = 2
-____exports.SerializationType[____exports.SerializationType.DESERIALIZE] = "DESERIALIZE"
 TSTL_CLASS_KEYS = __TS__New(Set, {"____constructor", "__index", "constructor"})
 return ____exports

package/dist/functions/deepCopyTests.lua

@@ -10,11 +10,12 @@ local ____DefaultMap = require("classes.DefaultMap")
 local DefaultMap = ____DefaultMap.DefaultMap
 local ____SerializationBrand = require("enums.private.SerializationBrand")
 local SerializationBrand = ____SerializationBrand.SerializationBrand
+local ____SerializationType = require("enums.SerializationType")
+local SerializationType = ____SerializationType.SerializationType
 local ____array = require("functions.array")
 local arrayEquals = ____array.arrayEquals
 local ____deepCopy = require("functions.deepCopy")
 local deepCopy = ____deepCopy.deepCopy
-local SerializationType = ____deepCopy.SerializationType
 local ____log = require("functions.log")
 local log = ____log.log
 function copiedObjectIsTable(self)
@@ -294,10 +295,6 @@ function copiedDefaultMapHasBrand(self)
     if not (newTable[SerializationBrand.DEFAULT_MAP] ~= nil) then
         error("The copied DefaultMap does not have the brand: " .. SerializationBrand.DEFAULT_MAP)
     end
-    local serializedDefaultValue = newTable[SerializationBrand.DEFAULT_MAP]
-    if serializedDefaultValue ~= oldDefaultValue then
-        error("The copied DefaultMap does not have a serialized default value of: " .. oldDefaultValue)
-    end
 end
 function ____exports.deepCopyTests(self)
     copiedObjectIsTable(nil)
@@ -315,6 +312,6 @@ function ____exports.deepCopyTests(self)
     copiedMapHasChildMap(nil)
     copiedDefaultMapHasChildDefaultMap(nil)
     copiedDefaultMapHasBrand(nil)
-    log("All tests passed!")
+    log("All deep copy tests passed!")
 end
 return ____exports

package/dist/functions/mergeTests.d.ts

@@ -0,0 +1 @@
+export declare function mergeTests(): void;

package/dist/functions/mergeTests.lua

@@ -0,0 +1,65 @@
+--[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
+local ____exports = {}
+local oldTableHasUpdatedValue, newTableHasSameValue, oldTableHasUpdatedValueFromNull, oldTableHasFilledInterface
+local ____merge = require("features.saveDataManager.merge")
+local merge = ____merge.merge
+local ____log = require("functions.log")
+local log = ____log.log
+function oldTableHasUpdatedValue(self)
+    local key = "foo"
+    local oldValue = "bar"
+    local newValue = "baz"
+    local oldTable = {foo = oldValue}
+    local newTable = {foo = newValue}
+    merge(nil, oldTable, newTable, "oldTableHasUpdatedValue")
+    local oldTableValue = oldTable[key]
+    if oldTableValue ~= newValue then
+        error("The old table does not have a value of: " .. newValue)
+    end
+end
+function newTableHasSameValue(self)
+    local key = "foo"
+    local oldValue = "bar"
+    local newValue = "baz"
+    local oldTable = {foo = oldValue}
+    local newTable = {foo = newValue}
+    merge(nil, oldTable, newTable, "newTableHasSameValue")
+    local newTableValue = newTable[key]
+    if newTableValue ~= newValue then
+        error("The new table does not have a value of: " .. newValue)
+    end
+end
+function oldTableHasUpdatedValueFromNull(self)
+    local key = "foo"
+    local newValue = "baz"
+    local oldTable = {foo = nil}
+    local newTable = {foo = newValue}
+    merge(nil, oldTable, newTable, "oldTableHasUpdatedValueFromNull")
+    local oldTableValue = oldTable[key]
+    if oldTableValue ~= newValue then
+        error("The old table does not have a value of: " .. newValue)
+    end
+end
+function oldTableHasFilledInterface(self)
+    local key = "foo"
+    local newValue = "baz"
+    local oldTable = {foo = nil}
+    local foo = {bar = newValue}
+    local newTable = {foo = foo}
+    merge(nil, oldTable, newTable, "oldTableHasFilledInterface")
+    local oldTableValue = oldTable[key]
+    if oldTableValue == nil then
+        error(("The old table's key of \"" .. key) .. "\" was not filled.")
+    end
+    if oldTableValue.bar ~= newValue then
+        error("The old table's key of \"bar\" was not filled.")
+    end
+end
+function ____exports.mergeTests(self)
+    oldTableHasUpdatedValue(nil)
+    newTableHasSameValue(nil)
+    oldTableHasUpdatedValueFromNull(nil)
+    oldTableHasFilledInterface(nil)
+    log("All merge tests passed!")
+end
+return ____exports

package/dist/index.d.ts

@@ -12,6 +12,7 @@ export * from "./enums/ModCallbacksCustom";
 export * from "./enums/PillEffectClass";
 export * from "./enums/PillEffectType";
 export * from "./enums/PocketItemType";
+export * from "./enums/SerializationType";
 export { deployJSONRoom, deployRandomJSONRoom, emptyRoom, } from "./features/deployJSONRoom";
 export { disableAllInputs, disableAllInputsExceptFor, disableMovementInputs, disableShootingInputs, enableAllInputs, enableAllInputsExceptFor, } from "./features/disableInputs";
 export { disableAllSound, enableAllSound } from "./features/disableSound";
@@ -52,6 +53,7 @@ export * from "./functions/language";
 export * from "./functions/log";
 export * from "./functions/map";
 export * from "./functions/math";
+export { mergeTests } from "./functions/mergeTests";
 export * from "./functions/npc";
 export * from "./functions/pickups";
 export * from "./functions/pills";

package/dist/index.lua

@@ -110,6 +110,14 @@ do
         end
     end
 end
+do
+    local ____export = require("enums.SerializationType")
+    for ____exportKey, ____exportValue in pairs(____export) do
+        if ____exportKey ~= "default" then
+            ____exports[____exportKey] = ____exportValue
+        end
+    end
+end
 do
     local ____deployJSONRoom = require("features.deployJSONRoom")
     local deployJSONRoom = ____deployJSONRoom.deployJSONRoom
@@ -421,6 +429,11 @@ do
         end
     end
 end
+do
+    local ____mergeTests = require("functions.mergeTests")
+    local mergeTests = ____mergeTests.mergeTests
+    ____exports.mergeTests = mergeTests
+end
 do
     local ____export = require("functions.npc")
     for ____exportKey, ____exportValue in pairs(____export) do

package/dist/types/private/TSTLClassMetatable.d.ts

@@ -0,0 +1,8 @@
+export interface TSTLClassMetatable {
+    ____constructor: () => void;
+    __index: unknown;
+    constructor: {
+        prototype: unknown;
+        name: string;
+    };
+}

package/dist/types/private/TSTLClassMetatable.lua

@@ -0,0 +1,3 @@
+--[[ Generated with https://github.com/TypeScriptToLua/TypeScriptToLua ]]
+local ____exports = {}
+return ____exports

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "1.2.171",
+  "version": "1.2.172",
   "description": "Helper functions for IsaacScript mods",
   "keywords": [
     "isaac",