isaacscript-common 80.2.1 → 80.2.3

package/dist/lualib_bundle.lua

@@ -1466,6 +1466,10 @@ local function __TS__NumberIsFinite(value)
     return type(value) == "number" and value == value and value ~= math.huge and value ~= -math.huge
 end
 
+local function __TS__NumberIsInteger(value)
+    return __TS__NumberIsFinite(value) and math.floor(value) == value
+end
+
 local function __TS__NumberIsNaN(value)
     return value ~= value
 end
@@ -2567,6 +2571,7 @@ return {
   __TS__New = __TS__New,
   __TS__Number = __TS__Number,
   __TS__NumberIsFinite = __TS__NumberIsFinite,
+  __TS__NumberIsInteger = __TS__NumberIsInteger,
   __TS__NumberIsNaN = __TS__NumberIsNaN,
   __TS__ParseInt = __TS__ParseInt,
   __TS__ParseFloat = __TS__ParseFloat,

package/dist/objects/itemPoolTypeToCollectibleTypesSet.lua

@@ -9,6 +9,7 @@ local ITEM_POOL_TYPE_VALUES = ____cachedEnumValues.ITEM_POOL_TYPE_VALUES
 local itemPoolsJSON = require("data.itempools")
 local ____types = require("functions.types")
 local asCollectibleType = ____types.asCollectibleType
+local parseIntSafe = ____types.parseIntSafe
 local ____itemPoolTypeToItemPoolName = require("maps.itemPoolTypeToItemPoolName")
 local ITEM_POOL_TYPE_TO_ITEM_POOL_NAME = ____itemPoolTypeToItemPoolName.ITEM_POOL_TYPE_TO_ITEM_POOL_NAME
 function getItemPoolJSON(self, itemPoolType)
@@ -28,11 +29,11 @@ ____exports.ITEM_POOL_TYPE_TO_COLLECTIBLE_TYPES_SET = (function()
         else
             local collectibleTypesSet = __TS__New(Set)
             for ____, itemPoolJSONElement in ipairs(itemPoolJSON.Item) do
-                local collectibleTypeNumber = tonumber(itemPoolJSONElement["$"].Id)
-                if collectibleTypeNumber == nil then
+                local collectibleTypeInt = parseIntSafe(nil, itemPoolJSONElement["$"].Id)
+                if collectibleTypeInt == nil then
                     error("Failed to parse a collectible type in the \"itempools.json\" file: " .. itemPoolJSONElement["$"].Id)
                 end
-                local collectibleType = asCollectibleType(nil, collectibleTypeNumber)
+                local collectibleType = asCollectibleType(nil, collectibleTypeInt)
                 collectibleTypesSet:add(collectibleType)
             end
             itemPoolTypeToCollectibleTypes[itemPoolType] = collectibleTypesSet

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "80.2.1",
+  "version": "80.2.3",
   "description": "Helper functions and features for IsaacScript mods.",
   "keywords": [
     "isaac",
@@ -37,6 +37,6 @@
     "lint": "tsx --tsconfig ./scripts/tsconfig.json ./scripts/lint.mts"
   },
   "dependencies": {
-    "isaac-typescript-definitions": "^39.0.3"
+    "isaac-typescript-definitions": "^39.0.4"
   }
 }

package/src/classes/ModUpgraded.ts

@@ -5,11 +5,13 @@ import { ISCFeature } from "../enums/ISCFeature";
 import { ModCallbackCustom } from "../enums/ModCallbackCustom";
 import { getFeatures } from "../features";
 import { getElapsedTimeSince, getTime } from "../functions/debugFunctions";
+import { isEnumValue } from "../functions/enums";
 import { getParentFunctionDescription, log } from "../functions/log";
 import {
   getTSTLClassConstructor,
   getTSTLClassName,
 } from "../functions/tstlClass";
+import { parseIntSafe } from "../functions/types";
 import { assertDefined } from "../functions/utils";
 import type { AddCallbackParametersCustom } from "../interfaces/private/AddCallbackParametersCustom";
 import type { ModUpgradedInterface } from "../interfaces/private/ModUpgradedInterface";
@@ -233,12 +235,18 @@ export class ModUpgraded implements Mod {
         continue;
       }
 
-      const modCallbackCustom = tonumber(modCallbackCustomString);
+      const modCallbackCustom = parseIntSafe(modCallbackCustomString);
       assertDefined(
         modCallbackCustom,
-        "Failed to convert an index on the callbacks object to a number.",
+        `Failed to convert the string "${modCallbackCustomString}" representing a "ModCallbackCustom" value to a number.`,
       );
 
+      if (!isEnumValue(modCallbackCustom, ModCallbackCustom)) {
+        error(
+          `Failed to convert the number ${modCallbackCustom} to a "ModCallbackCustom" value.`,
+        );
+      }
+
       log(
         `- ModCallbackCustom.${ModCallbackCustom[modCallbackCustom]} (${modCallbackCustom})`,
       );
@@ -252,12 +260,18 @@ export class ModUpgraded implements Mod {
         continue;
       }
 
-      const iscFeature = tonumber(iscFeatureString);
+      const iscFeature = parseIntSafe(iscFeatureString);
       assertDefined(
         iscFeature,
-        "Failed to convert an index on the features object to a number.",
+        `Failed to convert the string "${iscFeatureString}" representing a "ISCFeature" value to a number.`,
       );
 
+      if (!isEnumValue(iscFeature, ISCFeature)) {
+        error(
+          `Failed to convert the number ${iscFeature} to a "ISCFeature" value.`,
+        );
+      }
+
       log(`- ISCFeature.${ISCFeature[iscFeature]} (${iscFeature})`);
     }
   }

package/src/classes/features/other/DeployJSONRoom.ts

@@ -28,7 +28,7 @@ import { isRNG, newRNG } from "../../../functions/rng";
 import { gridCoordinatesToWorldPosition } from "../../../functions/roomGrid";
 import { setRoomCleared, setRoomUncleared } from "../../../functions/rooms";
 import { spawnCollectible } from "../../../functions/spawnCollectible";
-import { asCollectibleType } from "../../../functions/types";
+import { asCollectibleType, parseIntSafe } from "../../../functions/types";
 import { assertDefined } from "../../../functions/utils";
 import type { JSONRoom } from "../../../interfaces/JSONRoomsFile";
 import { ReadonlySet } from "../../../types/ReadonlySet";
@@ -60,40 +60,40 @@ export class DeployJSONRoom extends Feature {
 
     for (const jsonSpawn of jsonRoom.spawn) {
       const xString = jsonSpawn.$.x;
-      const x = tonumber(xString);
+      const x = parseIntSafe(xString);
       assertDefined(
         x,
-        `Failed to convert the following x coordinate to a number (for a spawn): ${xString}`,
+        `Failed to convert the following x coordinate to an integer (for a spawn): ${xString}`,
       );
 
       const yString = jsonSpawn.$.y;
-      const y = tonumber(yString);
+      const y = parseIntSafe(yString);
       assertDefined(
         y,
-        `Failed to convert the following y coordinate to a number (for a spawn): ${yString}`,
+        `Failed to convert the following y coordinate to an integer (for a spawn): ${yString}`,
       );
 
       const jsonEntity = getRandomJSONEntity(jsonSpawn.entity, rng);
 
       const entityTypeString = jsonEntity.$.type;
-      const entityTypeNumber = tonumber(entityTypeString);
+      const entityTypeNumber = parseIntSafe(entityTypeString);
       assertDefined(
         entityTypeNumber,
-        `Failed to convert the entity type to a number: ${entityTypeString}`,
+        `Failed to convert the entity type to an integer: ${entityTypeString}`,
       );
 
       const variantString = jsonEntity.$.variant;
-      const variant = tonumber(variantString);
+      const variant = parseIntSafe(variantString);
       assertDefined(
         variant,
-        `Failed to convert the entity variant to a number: ${variant}`,
+        `Failed to convert the entity variant to an integer: ${variant}`,
       );
 
       const subTypeString = jsonEntity.$.subtype;
-      const subType = tonumber(subTypeString);
+      const subType = parseIntSafe(subTypeString);
       assertDefined(
         subType,
-        `Failed to convert the entity sub-type to a number: ${subType}`,
+        `Failed to convert the entity sub-type to an integer: ${subType}`,
       );
 
       const isGridEntity = GRID_ENTITY_XML_TYPE_SET.has(