isaacscript-common 9.13.4 → 9.13.5-dev.2

package/dist/functions/deepCopy.lua

@@ -78,7 +78,7 @@ local twoDimensionalSort = ____utils.twoDimensionalSort
 -- Default is an empty string.
 -- @param insideMap Optional. Tracks whether or not the deep copy function is in the process of
 -- recursively copying a TSTL Map. Default is false.
-function ____exports.deepCopy(self, value, serializationType, traversalDescription, insideMap)
+function ____exports.deepCopy(value, serializationType, traversalDescription, insideMap)
     if serializationType == nil then
         serializationType = SerializationType.NONE
     end
@@ -96,7 +96,7 @@ function ____exports.deepCopy(self, value, serializationType, traversalDescripti
             logString = logString .. " (deserializing)"
         end
         logString = logString .. ": " .. tostring(value)
-        log(nil, logString)
+        log(logString)
     end
     local valueType = type(value)
     repeat
@@ -120,131 +120,71 @@ function ____exports.deepCopy(self, value, serializationType, traversalDescripti
         if ____cond6 then
             do
                 local luaMap = value
-                return deepCopyTable(
-                    nil,
-                    luaMap,
-                    serializationType,
-                    traversalDescription,
-                    insideMap
-                )
+                return deepCopyTable(luaMap, serializationType, traversalDescription, insideMap)
             end
         end
         ____cond6 = ____cond6 or ____switch6 == "userdata"
         if ____cond6 then
             do
-                return deepCopyUserdata(nil, value, serializationType, traversalDescription)
+                return deepCopyUserdata(value, serializationType, traversalDescription)
             end
         end
     until true
 end
-function deepCopyTable(self, luaMap, serializationType, traversalDescription, insideMap)
-    if isDefaultMap(nil, luaMap) or luaMap[SerializationBrand.DEFAULT_MAP] ~= nil then
-        return deepCopyDefaultMap(
-            nil,
-            luaMap,
-            serializationType,
-            traversalDescription,
-            insideMap
-        )
-    end
-    if isTSTLMap(nil, luaMap) or luaMap[SerializationBrand.MAP] ~= nil then
-        return deepCopyMap(
-            nil,
-            luaMap,
-            serializationType,
-            traversalDescription,
-            insideMap
-        )
-    end
-    if isTSTLSet(nil, luaMap) or luaMap[SerializationBrand.SET] ~= nil then
-        return deepCopySet(
-            nil,
-            luaMap,
-            serializationType,
-            traversalDescription,
-            insideMap
-        )
-    end
-    local className = getTSTLClassName(nil, luaMap)
+function deepCopyTable(luaMap, serializationType, traversalDescription, insideMap)
+    if isDefaultMap(luaMap) or luaMap[SerializationBrand.DEFAULT_MAP] ~= nil then
+        return deepCopyDefaultMap(luaMap, serializationType, traversalDescription, insideMap)
+    end
+    if isTSTLMap(luaMap) or luaMap[SerializationBrand.MAP] ~= nil then
+        return deepCopyMap(luaMap, serializationType, traversalDescription, insideMap)
+    end
+    if isTSTLSet(luaMap) or luaMap[SerializationBrand.SET] ~= nil then
+        return deepCopySet(luaMap, serializationType, traversalDescription, insideMap)
+    end
+    local className = getTSTLClassName(luaMap)
     if className == "WeakMap" then
         error("The deep copy function does not support copying the \"WeakMap\" class for: " .. traversalDescription)
     end
     if className == "WeakSet" then
         error("The deep copy function does not support copying the \"WeakSet\" class for: " .. traversalDescription)
     end
-    if isUserDefinedTSTLClass(nil, luaMap) then
-        return deepCopyTSTLClass(
-            nil,
-            luaMap,
-            serializationType,
-            traversalDescription,
-            insideMap
-        )
-    end
-    checkMetatable(nil, luaMap, traversalDescription)
-    if isSerializedIsaacAPIClass(nil, luaMap) and serializationType == SerializationType.DESERIALIZE then
-        return deserializeIsaacAPIClass(nil, luaMap)
-    end
-    if isArray(nil, luaMap) then
-        return deepCopyArray(
-            nil,
-            luaMap,
-            serializationType,
-            traversalDescription,
-            insideMap
-        )
-    end
-    return deepCopyNormalLuaTable(
-        nil,
-        luaMap,
-        serializationType,
-        traversalDescription,
-        insideMap
-    )
+    if isUserDefinedTSTLClass(luaMap) then
+        return deepCopyTSTLClass(luaMap, serializationType, traversalDescription, insideMap)
+    end
+    checkMetatable(luaMap, traversalDescription)
+    if isSerializedIsaacAPIClass(luaMap) and serializationType == SerializationType.DESERIALIZE then
+        return deserializeIsaacAPIClass(luaMap)
+    end
+    if isArray(luaMap) then
+        return deepCopyArray(luaMap, serializationType, traversalDescription, insideMap)
+    end
+    return deepCopyNormalLuaTable(luaMap, serializationType, traversalDescription, insideMap)
 end
-function deepCopyDefaultMap(self, defaultMap, serializationType, traversalDescription, insideMap)
+function deepCopyDefaultMap(defaultMap, serializationType, traversalDescription, insideMap)
     if SAVE_DATA_MANAGER_DEBUG then
-        log(nil, "deepCopy is copying a DefaultMap.")
+        log("deepCopy is copying a DefaultMap.")
     end
     local ____isDefaultMap_result_0
-    if isDefaultMap(nil, defaultMap) then
+    if isDefaultMap(defaultMap) then
         ____isDefaultMap_result_0 = defaultMap:getConstructorArg()
     else
         ____isDefaultMap_result_0 = nil
     end
     local constructorArg = ____isDefaultMap_result_0
-    if serializationType == SerializationType.SERIALIZE and not isPrimitive(nil, constructorArg) then
+    if serializationType == SerializationType.SERIALIZE and not isPrimitive(constructorArg) then
         if insideMap then
             error("Failed to deep copy a DefaultMap because it was instantiated with a factory function and was also inside of an array, map, or set. For more information, see: https://isaacscript.github.io/main/gotchas#failed-to-deep-copy-a-defaultmap")
         else
-            return deepCopyMap(
-                nil,
-                defaultMap,
-                serializationType,
-                traversalDescription,
-                insideMap
-            )
+            return deepCopyMap(defaultMap, serializationType, traversalDescription, insideMap)
         end
     end
-    local newDefaultMap = getNewDefaultMap(
-        nil,
-        defaultMap,
-        serializationType,
-        traversalDescription,
-        constructorArg
-    )
+    local newDefaultMap = getNewDefaultMap(defaultMap, serializationType, traversalDescription, constructorArg)
     insideMap = true
-    local ____getCopiedEntries_result_1 = getCopiedEntries(
-        nil,
-        defaultMap,
-        serializationType,
-        traversalDescription,
-        insideMap
-    )
+    local ____getCopiedEntries_result_1 = getCopiedEntries(defaultMap, serializationType, traversalDescription, insideMap)
     local entries = ____getCopiedEntries_result_1.entries
     local convertedNumberKeysToStrings = ____getCopiedEntries_result_1.convertedNumberKeysToStrings
     if convertedNumberKeysToStrings then
-        if isDefaultMap(nil, newDefaultMap) then
+        if isDefaultMap(newDefaultMap) then
             newDefaultMap:set(SerializationBrand.OBJECT_WITH_NUMBER_KEYS, "")
         else
             newDefaultMap[SerializationBrand.OBJECT_WITH_NUMBER_KEYS] = ""
@@ -253,7 +193,7 @@ function deepCopyDefaultMap(self, defaultMap, serializationType, traversalDescri
     for ____, ____value in ipairs(entries) do
         local key = ____value[1]
         local value = ____value[2]
-        if isDefaultMap(nil, newDefaultMap) then
+        if isDefaultMap(newDefaultMap) then
             newDefaultMap:set(key, value)
         else
             newDefaultMap[key] = value
@@ -262,7 +202,7 @@ function deepCopyDefaultMap(self, defaultMap, serializationType, traversalDescri
     insideMap = false
     return newDefaultMap
 end
-function getNewDefaultMap(self, defaultMap, serializationType, traversalDescription, constructorArg)
+function getNewDefaultMap(defaultMap, serializationType, traversalDescription, constructorArg)
     repeat
         local ____switch34 = serializationType
         local ____cond34 = ____switch34 == SerializationType.NONE
@@ -283,7 +223,7 @@ function getNewDefaultMap(self, defaultMap, serializationType, traversalDescript
         ____cond34 = ____cond34 or ____switch34 == SerializationType.DESERIALIZE
         if ____cond34 then
             do
-                if isDefaultMap(nil, defaultMap) then
+                if isDefaultMap(defaultMap) then
                     error(("The deep copy function failed to deserialize a default map of \"" .. traversalDescription) .. "\", since it was not a Lua table.")
                 end
                 local defaultMapValue = defaultMap[SerializationBrand.DEFAULT_MAP_VALUE]
@@ -295,9 +235,9 @@ function getNewDefaultMap(self, defaultMap, serializationType, traversalDescript
         end
     until true
 end
-function deepCopyMap(self, map, serializationType, traversalDescription, insideMap)
+function deepCopyMap(map, serializationType, traversalDescription, insideMap)
     if SAVE_DATA_MANAGER_DEBUG then
-        log(nil, "deepCopy is copying a Map.")
+        log("deepCopy is copying a Map.")
     end
     local newMap
     if serializationType == SerializationType.SERIALIZE then
@@ -307,17 +247,11 @@ function deepCopyMap(self, map, serializationType, traversalDescription, insideM
         newMap = __TS__New(Map)
     end
     insideMap = true
-    local ____getCopiedEntries_result_2 = getCopiedEntries(
-        nil,
-        map,
-        serializationType,
-        traversalDescription,
-        insideMap
-    )
+    local ____getCopiedEntries_result_2 = getCopiedEntries(map, serializationType, traversalDescription, insideMap)
     local entries = ____getCopiedEntries_result_2.entries
     local convertedNumberKeysToStrings = ____getCopiedEntries_result_2.convertedNumberKeysToStrings
     if convertedNumberKeysToStrings then
-        if isTSTLMap(nil, newMap) then
+        if isTSTLMap(newMap) then
             newMap:set(SerializationBrand.OBJECT_WITH_NUMBER_KEYS, "")
         else
             newMap[SerializationBrand.OBJECT_WITH_NUMBER_KEYS] = ""
@@ -326,7 +260,7 @@ function deepCopyMap(self, map, serializationType, traversalDescription, insideM
     for ____, ____value in ipairs(entries) do
         local key = ____value[1]
         local value = ____value[2]
-        if isTSTLMap(nil, newMap) then
+        if isTSTLMap(newMap) then
             newMap:set(key, value)
         else
             newMap[key] = value
@@ -335,9 +269,9 @@ function deepCopyMap(self, map, serializationType, traversalDescription, insideM
     insideMap = false
     return newMap
 end
-function deepCopySet(self, set, serializationType, traversalDescription, insideMap)
+function deepCopySet(set, serializationType, traversalDescription, insideMap)
     if SAVE_DATA_MANAGER_DEBUG then
-        log(nil, "deepCopy is copying a Set.")
+        log("deepCopy is copying a Set.")
     end
     local newSet
     if serializationType == SerializationType.SERIALIZE then
@@ -346,17 +280,11 @@ function deepCopySet(self, set, serializationType, traversalDescription, insideM
     else
         newSet = __TS__New(Set)
     end
-    local ____getCopiedEntries_result_3 = getCopiedEntries(
-        nil,
-        set,
-        serializationType,
-        traversalDescription,
-        insideMap
-    )
+    local ____getCopiedEntries_result_3 = getCopiedEntries(set, serializationType, traversalDescription, insideMap)
     local entries = ____getCopiedEntries_result_3.entries
     local convertedNumberKeysToStrings = ____getCopiedEntries_result_3.convertedNumberKeysToStrings
     if convertedNumberKeysToStrings then
-        if isTSTLSet(nil, newSet) then
+        if isTSTLSet(newSet) then
             error("The deep copy function cannot convert number keys to strings for a Set.")
         else
             newSet[SerializationBrand.OBJECT_WITH_NUMBER_KEYS] = ""
@@ -364,7 +292,7 @@ function deepCopySet(self, set, serializationType, traversalDescription, insideM
     end
     for ____, ____value in ipairs(entries) do
         local key = ____value[1]
-        if isTSTLSet(nil, newSet) then
+        if isTSTLSet(newSet) then
             newSet:add(key)
         else
             newSet[key] = ""
@@ -372,23 +300,17 @@ function deepCopySet(self, set, serializationType, traversalDescription, insideM
     end
     return newSet
 end
-function deepCopyTSTLClass(self, tstlClass, serializationType, traversalDescription, insideMap)
+function deepCopyTSTLClass(tstlClass, serializationType, traversalDescription, insideMap)
     if SAVE_DATA_MANAGER_DEBUG then
-        log(nil, "deepCopy is copying a TSTL class.")
+        log("deepCopy is copying a TSTL class.")
     end
     local newClass
     if serializationType == SerializationType.SERIALIZE then
         newClass = {}
     else
-        newClass = newTSTLClass(nil, tstlClass)
-    end
-    local ____getCopiedEntries_result_4 = getCopiedEntries(
-        nil,
-        tstlClass,
-        serializationType,
-        traversalDescription,
-        insideMap
-    )
+        newClass = newTSTLClass(tstlClass)
+    end
+    local ____getCopiedEntries_result_4 = getCopiedEntries(tstlClass, serializationType, traversalDescription, insideMap)
     local entries = ____getCopiedEntries_result_4.entries
     local convertedNumberKeysToStrings = ____getCopiedEntries_result_4.convertedNumberKeysToStrings
     if convertedNumberKeysToStrings then
@@ -401,35 +323,23 @@ function deepCopyTSTLClass(self, tstlClass, serializationType, traversalDescript
     end
     return newClass
 end
-function deepCopyArray(self, array, serializationType, traversalDescription, insideMap)
+function deepCopyArray(array, serializationType, traversalDescription, insideMap)
     if SAVE_DATA_MANAGER_DEBUG then
-        log(nil, "deepCopy is copying an array.")
+        log("deepCopy is copying an array.")
     end
     local newArray = {}
     for ____, value in ipairs(array) do
-        local newValue = ____exports.deepCopy(
-            nil,
-            value,
-            serializationType,
-            traversalDescription,
-            insideMap
-        )
+        local newValue = ____exports.deepCopy(value, serializationType, traversalDescription, insideMap)
         newArray[#newArray + 1] = newValue
     end
     return newArray
 end
-function deepCopyNormalLuaTable(self, luaMap, serializationType, traversalDescription, insideMap)
+function deepCopyNormalLuaTable(luaMap, serializationType, traversalDescription, insideMap)
     if SAVE_DATA_MANAGER_DEBUG then
-        log(nil, "deepCopy is copying a normal Lua table.")
+        log("deepCopy is copying a normal Lua table.")
     end
     local newTable = {}
-    local ____getCopiedEntries_result_5 = getCopiedEntries(
-        nil,
-        luaMap,
-        serializationType,
-        traversalDescription,
-        insideMap
-    )
+    local ____getCopiedEntries_result_5 = getCopiedEntries(luaMap, serializationType, traversalDescription, insideMap)
     local entries = ____getCopiedEntries_result_5.entries
     local convertedNumberKeysToStrings = ____getCopiedEntries_result_5.convertedNumberKeysToStrings
     if convertedNumberKeysToStrings then
@@ -442,9 +352,9 @@ function deepCopyNormalLuaTable(self, luaMap, serializationType, traversalDescri
     end
     return newTable
 end
-function getCopiedEntries(self, object, serializationType, traversalDescription, insideMap)
+function getCopiedEntries(object, serializationType, traversalDescription, insideMap)
     local entries = {}
-    if isTSTLMap(nil, object) or isTSTLSet(nil, object) or isDefaultMap(nil, object) then
+    if isTSTLMap(object) or isTSTLSet(object) or isDefaultMap(object) then
         for ____, ____value in __TS__Iterator(object:entries()) do
             local key = ____value[1]
             local value = ____value[2]
@@ -463,7 +373,7 @@ function getCopiedEntries(self, object, serializationType, traversalDescription,
         function(____, ____bindingPattern0)
             local key
             key = ____bindingPattern0[1]
-            return key == asString(nil, SerializationBrand.OBJECT_WITH_NUMBER_KEYS)
+            return key == asString(SerializationBrand.OBJECT_WITH_NUMBER_KEYS)
         end
     )
     local hasNumberKeys = __TS__ArraySome(
@@ -471,7 +381,7 @@ function getCopiedEntries(self, object, serializationType, traversalDescription,
         function(____, ____bindingPattern0)
             local key
             key = ____bindingPattern0[1]
-            return isNumber(nil, key)
+            return isNumber(key)
         end
     )
     local convertNumberKeysToStrings = serializationType == SerializationType.SERIALIZE and hasNumberKeys
@@ -480,17 +390,11 @@ function getCopiedEntries(self, object, serializationType, traversalDescription,
         local key = ____value[1]
         local value = ____value[2]
         do
-            if isSerializationBrand(nil, key) then
+            if isSerializationBrand(key) then
                 goto __continue87
             end
-            traversalDescription = getTraversalDescription(nil, key, traversalDescription)
-            local newValue = ____exports.deepCopy(
-                nil,
-                value,
-                serializationType,
-                traversalDescription,
-                insideMap
-            )
+            traversalDescription = getTraversalDescription(key, traversalDescription)
+            local newValue = ____exports.deepCopy(value, serializationType, traversalDescription, insideMap)
             local keyToUse = key
             if convertStringKeysToNumbers then
                 local numberKey = tonumber(key)
@@ -507,7 +411,7 @@ function getCopiedEntries(self, object, serializationType, traversalDescription,
     end
     return {entries = copiedEntries, convertedNumberKeysToStrings = convertNumberKeysToStrings}
 end
-function checkMetatable(self, luaMap, traversalDescription)
+function checkMetatable(luaMap, traversalDescription)
     local metatable = getmetatable(luaMap)
     if metatable == nil then
         return
@@ -515,11 +419,11 @@ function checkMetatable(self, luaMap, traversalDescription)
     local tableDescription = traversalDescription == "" and "the table to copy" or ("\"" .. traversalDescription) .. "\""
     error(("The deepCopy function detected that " .. tableDescription) .. " has a metatable. Copying tables with metatables is not supported, unless they are explicitly handled by the save data manager. (e.g. TypeScriptToLua Maps, TypeScriptToLua Sets, etc.)")
 end
-function deepCopyUserdata(self, value, serializationType, traversalDescription)
+function deepCopyUserdata(value, serializationType, traversalDescription)
     if SAVE_DATA_MANAGER_DEBUG then
-        log(nil, "deepCopy is copying userdata.")
+        log("deepCopy is copying userdata.")
     end
-    local classType = getIsaacAPIClassName(nil, value)
+    local classType = getIsaacAPIClassName(value)
     if classType == nil then
         error("The deep copy function was not able to derive the Isaac API class type for: " .. traversalDescription)
     end
@@ -531,25 +435,25 @@ function deepCopyUserdata(self, value, serializationType, traversalDescription)
         local ____cond99 = ____switch99 == SerializationType.NONE
         if ____cond99 then
             do
-                return copyIsaacAPIClass(nil, value)
+                return copyIsaacAPIClass(value)
             end
         end
         ____cond99 = ____cond99 or ____switch99 == SerializationType.SERIALIZE
         if ____cond99 then
             do
-                return serializeIsaacAPIClass(nil, value)
+                return serializeIsaacAPIClass(value)
             end
         end
         ____cond99 = ____cond99 or ____switch99 == SerializationType.DESERIALIZE
         if ____cond99 then
             do
-                return deserializeIsaacAPIClass(nil, value)
+                return deserializeIsaacAPIClass(value)
             end
         end
     until true
 end
 COPYABLE_ISAAC_API_CLASS_TYPES_SET = __TS__New(
     Set,
-    getEnumValues(nil, CopyableIsaacAPIClassType)
+    getEnumValues(CopyableIsaacAPIClassType)
 )
 return ____exports

package/dist/functions/deepCopyTests.d.ts

@@ -1,3 +1,4 @@
+/** @noSelfInFile */
 /**
  * Run the suite of tests that prove that the "deepCopy" helper function works properly.
  *

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

@@ -1 +1 @@
-{"version":3,"file":"deepCopyTests.d.ts","sourceRoot":"","sources":["../../src/functions/deepCopyTests.ts"],"names":[],"mappings":"AAUA;;;;GAIG;AACH,wBAAgB,gBAAgB,IAAI,IAAI,CA6BvC"}
+{"version":3,"file":"deepCopyTests.d.ts","sourceRoot":"","sources":["../../src/functions/deepCopyTests.ts"],"names":[],"mappings":";AAUA;;;;GAIG;AACH,wBAAgB,gBAAgB,IAAI,IAAI,CA6BvC"}