isaacscript-common 6.10.1 → 6.10.2

package/dist/functions/deepCopy.lua

@@ -452,6 +452,14 @@ function getCopiedEntries(self, object, serializationType, traversalDescription,
     if SAVE_DATA_MANAGER_DEBUG then
         __TS__ArraySort(entries, twoDimensionalSort)
     end
+    local convertStringKeysToNumbers = serializationType == SerializationType.DESERIALIZE and __TS__ArraySome(
+        entries,
+        function(____, ____bindingPattern0)
+            local key
+            key = ____bindingPattern0[1]
+            return key == SerializationBrand.OBJECT_WITH_NUMBER_KEYS
+        end
+    )
     local hasNumberKeys = __TS__ArraySome(
         entries,
         function(____, ____bindingPattern0)
@@ -467,7 +475,7 @@ function getCopiedEntries(self, object, serializationType, traversalDescription,
         local value = ____value[2]
         do
             if isSerializationBrand(nil, key) then
-                goto __continue86
+                goto __continue87
             end
             traversalDescription = getTraversalDescription(nil, key, traversalDescription)
             local newValue = ____exports.deepCopy(
@@ -477,10 +485,19 @@ function getCopiedEntries(self, object, serializationType, traversalDescription,
                 traversalDescription,
                 insideMap
             )
-            local keyToUse = convertNumberKeysToStrings and tostring(key) or key
+            local keyToUse = key
+            if convertStringKeysToNumbers then
+                local numberKey = tonumber(key)
+                if numberKey ~= nil then
+                    keyToUse = numberKey
+                end
+            end
+            if convertNumberKeysToStrings then
+                keyToUse = tostring(key)
+            end
             copiedEntries[#copiedEntries + 1] = {keyToUse, newValue}
         end
-        ::__continue86::
+        ::__continue87::
     end
     return {entries = copiedEntries, convertedNumberKeysToStrings = convertNumberKeysToStrings}
 end

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

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

package/dist/functions/deepCopyTests.lua

@@ -3,8 +3,10 @@ local __TS__TypeOf = ____lualib.__TS__TypeOf
 local Map = ____lualib.Map
 local __TS__New = ____lualib.__TS__New
 local Set = ____lualib.Set
+local __TS__Spread = ____lualib.__TS__Spread
+local __TS__ArrayIncludes = ____lualib.__TS__ArrayIncludes
 local ____exports = {}
-local copiedObjectIsTable, copiedObjectHasKeyAndValueString, copiedTableHasKeyAndValueNumber, copiedTableDoesNotCoerceTypes, copiedObjectHasNoReferencesForPrimitivesForward, copiedObjectHasNoReferencesForPrimitivesBackward, copiedObjectHasNoReferencesForArray, copiedObjectHasChildObject, copiedMapIsMap, copiedMapHasValue, copiedSetIsSet, copiedSetHasValue, copiedMapHasChildMap, copiedDefaultMapHasChildDefaultMap, copiedDefaultMapHasBrand
+local copiedObjectIsTable, copiedObjectHasKeyAndValueString, copiedTableHasKeyAndValueNumber, copiedTableDoesNotCoerceTypes, copiedObjectHasNoReferencesForPrimitivesForward, copiedObjectHasNoReferencesForPrimitivesBackward, copiedObjectHasNoReferencesForArray, copiedObjectHasChildObject, copiedMapIsMap, copiedMapHasValue, copiedSetIsSet, copiedSetHasValue, copiedMapHasChildMap, copiedDefaultMapHasChildDefaultMap, copiedDefaultMapHasBrand, copiedSerializedMapHasStringKeyType, copiedSerializedMapHasNumberKeyType, copiedSerializedDefaultMapHasStringKeyType, copiedSerializedDefaultMapHasNumberKeyType
 local ____DefaultMap = require("classes.DefaultMap")
 local DefaultMap = ____DefaultMap.DefaultMap
 local ____SerializationBrand = require("enums.private.SerializationBrand")
@@ -297,6 +299,64 @@ function copiedDefaultMapHasBrand(self)
         error("The copied DefaultMap does not have the brand: " .. SerializationBrand.DEFAULT_MAP)
     end
 end
+function copiedSerializedMapHasStringKeyType(self)
+    local mapKey = "123"
+    local mapValue = 456
+    local oldMap = __TS__New(Map)
+    oldMap:set(mapKey, mapValue)
+    local tempTable = deepCopy(nil, oldMap, SerializationType.SERIALIZE, "copiedSerializedMapHasStringKeyTypeSerialize")
+    local newTable = deepCopy(nil, tempTable, SerializationType.DESERIALIZE, "copiedSerializedMapHasStringKeyTypeDeserialize")
+    local newMap = newTable
+    if not __TS__ArrayIncludes(
+        {__TS__Spread(newMap:keys())},
+        mapKey
+    ) then
+        error((("The copied Map did not have a key of: " .. mapKey) .. " with type ") .. type(mapKey))
+    end
+end
+function copiedSerializedMapHasNumberKeyType(self)
+    local mapKey = 123
+    local mapValue = 456
+    local oldMap = __TS__New(Map)
+    oldMap:set(mapKey, mapValue)
+    local tempTable = deepCopy(nil, oldMap, SerializationType.SERIALIZE, "copiedSerializedMapHasNumberKeyTypeSerialize")
+    local newTable = deepCopy(nil, tempTable, SerializationType.DESERIALIZE, "copiedSerializedMapHasNumberKeyTypeDeserialize")
+    local newMap = newTable
+    if not __TS__ArrayIncludes(
+        {__TS__Spread(newMap:keys())},
+        mapKey
+    ) then
+        error((("The copied Map did not have a key of: " .. tostring(mapKey)) .. " with type ") .. type(mapKey))
+    end
+end
+function copiedSerializedDefaultMapHasStringKeyType(self)
+    local mapKey = "123"
+    local oldMap = __TS__New(DefaultMap, 456)
+    oldMap:getAndSetDefault(mapKey)
+    local tempTable = deepCopy(nil, oldMap, SerializationType.SERIALIZE, "copiedSerializedDefaultMapHasStringKeyTypeSerialize")
+    local newTable = deepCopy(nil, tempTable, SerializationType.DESERIALIZE, "copiedSerializedDefaultMapHasStringKeyTypeDeserialize")
+    local newMap = newTable
+    if not __TS__ArrayIncludes(
+        {__TS__Spread(newMap:keys())},
+        mapKey
+    ) then
+        error((("The copied DefaultMap did not have a key of: " .. mapKey) .. " with type ") .. type(mapKey))
+    end
+end
+function copiedSerializedDefaultMapHasNumberKeyType(self)
+    local mapKey = 123
+    local oldMap = __TS__New(DefaultMap, 456)
+    oldMap:getAndSetDefault(mapKey)
+    local tempTable = deepCopy(nil, oldMap, SerializationType.SERIALIZE, "copiedSerializedDefaultMapHasNumberKeyTypeSerialize")
+    local newTable = deepCopy(nil, tempTable, SerializationType.DESERIALIZE, "copiedSerializedDefaultMapHasNumberKeyTypeDeserialize")
+    local newMap = newTable
+    if not __TS__ArrayIncludes(
+        {__TS__Spread(newMap:keys())},
+        mapKey
+    ) then
+        error((("The copied DefaultMap did not have a key of: " .. tostring(mapKey)) .. " with type ") .. type(mapKey))
+    end
+end
 --- Run the suite of tests that prove that the "deepCopy" helper function works properly.
 -- 
 -- This function is only useful if you are troubleshooting the "deepCopy" function.
@@ -316,6 +376,10 @@ function ____exports.runDeepCopyTests(self)
     copiedMapHasChildMap(nil)
     copiedDefaultMapHasChildDefaultMap(nil)
     copiedDefaultMapHasBrand(nil)
+    copiedSerializedMapHasStringKeyType(nil)
+    copiedSerializedMapHasNumberKeyType(nil)
+    copiedSerializedDefaultMapHasStringKeyType(nil)
+    copiedSerializedDefaultMapHasNumberKeyType(nil)
     log("All deep copy tests passed!")
 end
 return ____exports

package/dist/functions/mergeTests.lua

@@ -149,7 +149,6 @@ function oldTableHasFilledDefaultMap(self)
     end
 end
 function oldTableHasVector(self)
-    log("Starting test: oldTableHasVector")
     local key = "foo"
     local x = 50
     local y = 60
@@ -173,7 +172,6 @@ function oldTableHasVector(self)
     end
 end
 function oldTableHasVectorSerialized(self)
-    log("Starting test: oldTableHasVectorSerialized")
     local key = "foo"
     local x = 50
     local y = 60
@@ -198,7 +196,6 @@ function oldTableHasVectorSerialized(self)
     end
 end
 function oldTableHasRNG(self)
-    log("Starting test: oldTableHasRNG")
     local key = "foo"
     local seed = 50
     local newValue = newRNG(nil, seed)
@@ -219,7 +216,6 @@ function oldTableHasRNG(self)
     end
 end
 function oldTableHasRNGSerialized(self)
-    log("Starting test: oldTableHasRNGSerialized")
     local key = "foo"
     local seed = 50
     local newValue = newRNG(nil, seed)

package/package.json

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

package/src/functions/deepCopy.ts

@@ -568,6 +568,14 @@ function getCopiedEntries(
     entries.sort(twoDimensionalSort);
   }
 
+  // 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 =
+    serializationType === SerializationType.DESERIALIZE &&
+    entries.some(
+      ([key]) => key === (SerializationBrand.OBJECT_WITH_NUMBER_KEYS as string),
+    );
+
   const hasNumberKeys = entries.some(([key]) => isNumber(key));
   const convertNumberKeysToStrings =
     serializationType === SerializationType.SERIALIZE && hasNumberKeys;
@@ -589,7 +597,16 @@ function getCopiedEntries(
       insideMap,
     );
 
-    const keyToUse = convertNumberKeysToStrings ? tostring(key) : key;
+    let keyToUse = key;
+    if (convertStringKeysToNumbers) {
+      const numberKey = tonumber(key);
+      if (numberKey !== undefined) {
+        keyToUse = numberKey;
+      }
+    }
+    if (convertNumberKeysToStrings) {
+      keyToUse = tostring(key);
+    }
     copiedEntries.push([keyToUse, newValue]);
   }
 

package/src/functions/deepCopyTests.ts

@@ -32,6 +32,12 @@ export function runDeepCopyTests(): void {
   copiedDefaultMapHasChildDefaultMap();
   copiedDefaultMapHasBrand();
 
+  copiedSerializedMapHasStringKeyType();
+  copiedSerializedMapHasNumberKeyType();
+
+  copiedSerializedDefaultMapHasStringKeyType();
+  copiedSerializedDefaultMapHasNumberKeyType();
+
   log("All deep copy tests passed!");
 }
 
@@ -457,3 +463,113 @@ function copiedDefaultMapHasBrand() {
     );
   }
 }
+
+function copiedSerializedMapHasStringKeyType() {
+  const mapKey = "123";
+  const mapValue = 456;
+  const oldMap = new Map<string, number>();
+  oldMap.set(mapKey, mapValue);
+
+  const tempTable = deepCopy(
+    oldMap,
+    SerializationType.SERIALIZE,
+    "copiedSerializedMapHasStringKeyTypeSerialize",
+  );
+
+  const newTable = deepCopy(
+    tempTable,
+    SerializationType.DESERIALIZE,
+    "copiedSerializedMapHasStringKeyTypeDeserialize",
+  );
+
+  const newMap = newTable as Map<string, number>;
+  if (![...newMap.keys()].includes(mapKey)) {
+    error(
+      `The copied Map did not have a key of: ${mapKey} with type ${type(
+        mapKey,
+      )}`,
+    );
+  }
+}
+
+function copiedSerializedMapHasNumberKeyType() {
+  const mapKey = 123;
+  const mapValue = 456;
+  const oldMap = new Map<number, number>();
+  oldMap.set(mapKey, mapValue);
+
+  const tempTable = deepCopy(
+    oldMap,
+    SerializationType.SERIALIZE,
+    "copiedSerializedMapHasNumberKeyTypeSerialize",
+  );
+
+  const newTable = deepCopy(
+    tempTable,
+    SerializationType.DESERIALIZE,
+    "copiedSerializedMapHasNumberKeyTypeDeserialize",
+  );
+
+  const newMap = newTable as Map<number, number>;
+  if (![...newMap.keys()].includes(mapKey)) {
+    error(
+      `The copied Map did not have a key of: ${mapKey} with type ${type(
+        mapKey,
+      )}`,
+    );
+  }
+}
+
+function copiedSerializedDefaultMapHasStringKeyType() {
+  const mapKey = "123";
+  const oldMap = new DefaultMap<string, number>(456);
+  oldMap.getAndSetDefault(mapKey);
+
+  const tempTable = deepCopy(
+    oldMap,
+    SerializationType.SERIALIZE,
+    "copiedSerializedDefaultMapHasStringKeyTypeSerialize",
+  );
+
+  const newTable = deepCopy(
+    tempTable,
+    SerializationType.DESERIALIZE,
+    "copiedSerializedDefaultMapHasStringKeyTypeDeserialize",
+  );
+
+  const newMap = newTable as DefaultMap<string, number>;
+  if (![...newMap.keys()].includes(mapKey)) {
+    error(
+      `The copied DefaultMap did not have a key of: ${mapKey} with type ${type(
+        mapKey,
+      )}`,
+    );
+  }
+}
+
+function copiedSerializedDefaultMapHasNumberKeyType() {
+  const mapKey = 123;
+  const oldMap = new DefaultMap<number, number>(456);
+  oldMap.getAndSetDefault(mapKey);
+
+  const tempTable = deepCopy(
+    oldMap,
+    SerializationType.SERIALIZE,
+    "copiedSerializedDefaultMapHasNumberKeyTypeSerialize",
+  );
+
+  const newTable = deepCopy(
+    tempTable,
+    SerializationType.DESERIALIZE,
+    "copiedSerializedDefaultMapHasNumberKeyTypeDeserialize",
+  );
+
+  const newMap = newTable as DefaultMap<number, number>;
+  if (![...newMap.keys()].includes(mapKey)) {
+    error(
+      `The copied DefaultMap did not have a key of: ${mapKey} with type ${type(
+        mapKey,
+      )}`,
+    );
+  }
+}

package/src/functions/mergeTests.ts

@@ -266,8 +266,6 @@ function oldTableHasFilledDefaultMap() {
 }
 
 function oldTableHasVector() {
-  log("Starting test: oldTableHasVector");
-
   interface Foo {
     bar: Vector;
   }
@@ -307,8 +305,6 @@ function oldTableHasVector() {
 }
 
 function oldTableHasVectorSerialized() {
-  log("Starting test: oldTableHasVectorSerialized");
-
   interface Foo {
     bar: Vector;
   }
@@ -355,8 +351,6 @@ function oldTableHasVectorSerialized() {
 }
 
 function oldTableHasRNG() {
-  log("Starting test: oldTableHasRNG");
-
   interface Foo {
     bar: RNG;
   }
@@ -392,8 +386,6 @@ function oldTableHasRNG() {
 }
 
 function oldTableHasRNGSerialized() {
-  log("Starting test: oldTableHasRNGSerialized");
-
   interface Foo {
     bar: RNG;
   }