isaacscript-common 39.4.2 → 39.4.4

package/dist/isaacscript-common.lua

@@ -1,6 +1,6 @@
 --[[
 
-isaacscript-common 39.4.2
+isaacscript-common 39.4.4
 
 This is the "isaacscript-common" library, which was created with the IsaacScript tool.
 
@@ -18335,7 +18335,6 @@ return ____exports
 local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
-local __TS__Spread = ____lualib.__TS__Spread
 local __TS__ArrayFindIndex = ____lualib.__TS__ArrayFindIndex
 local __TS__ArraySplice = ____lualib.__TS__ArraySplice
 local __TS__ArrayEntries = ____lualib.__TS__ArrayEntries
@@ -18365,7 +18364,13 @@ function CustomCallback.prototype.____constructor(self, ...)
             if self:shouldFire(fireArgs, optionalArgs) then
                 local value = callbackFunc(
                     nil,
-                    __TS__Spread(fireArgs)
+                    fireArgs[1],
+                    fireArgs[2],
+                    fireArgs[3],
+                    fireArgs[4],
+                    fireArgs[5],
+                    fireArgs[6],
+                    fireArgs[7]
                 )
                 if value ~= nil then
                     return value
@@ -18495,7 +18500,7 @@ __TS__ClassExtends(InputActionFilter, CustomCallback)
 function InputActionFilter.prototype.____constructor(self)
     CustomCallback.prototype.____constructor(self)
     self.shouldFire = function(____, fireArgs, optionalArgs)
-        local _, inputHook, buttonAction = table.unpack(fireArgs)
+        local _entity, inputHook, buttonAction = table.unpack(fireArgs)
         local callbackInputHook, callbackButtonAction = table.unpack(optionalArgs)
         return (callbackInputHook == nil or callbackInputHook == inputHook) and (callbackButtonAction == nil or callbackButtonAction == buttonAction)
     end

package/dist/src/classes/callbacks/InputActionFilter.lua

@@ -13,7 +13,7 @@ __TS__ClassExtends(InputActionFilter, CustomCallback)
 function InputActionFilter.prototype.____constructor(self)
     CustomCallback.prototype.____constructor(self)
     self.shouldFire = function(____, fireArgs, optionalArgs)
-        local _, inputHook, buttonAction = table.unpack(fireArgs)
+        local _entity, inputHook, buttonAction = table.unpack(fireArgs)
         local callbackInputHook, callbackButtonAction = table.unpack(optionalArgs)
         return (callbackInputHook == nil or callbackInputHook == inputHook) and (callbackButtonAction == nil or callbackButtonAction == buttonAction)
     end

package/dist/src/classes/private/CustomCallback.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CustomCallback.d.ts","sourceRoot":"","sources":["../../../../src/classes/private/CustomCallback.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8DAA8D,CAAC;AACrG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAIvE,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,sDAAsD,CAAC;AACxG,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,MAAM,MAAM,QAAQ,CAAC,CAAC,SAAS,iBAAiB,IAAI,UAAU,CAC5D,2BAA2B,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAClC,CAAC;AAEF,MAAM,MAAM,YAAY,CAAC,CAAC,SAAS,iBAAiB,IAAI,WAAW,CACjE,2BAA2B,CAAC,CAAC,CAAC,CAC/B,CAAC;AAQF;;;GAGG;AACH,8BAAsB,cAAc,CAClC,CAAC,SAAS,iBAAiB,CAC3B,SAAQ,OAAO;IACf,OAAO,CAAC,aAAa,CAA8B;IAE5C,aAAa,CAClB,QAAQ,EAAE,gBAAgB,GAAG,GAAG,EAChC,YAAY,EAAE,2BAA2B,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAC/C,GAAG,YAAY,EAAE,WAAW,CAAC,2BAA2B,CAAC,CAAC,CAAC,CAAC,GAC3D,IAAI;IAiBP;;;OAGG;IACI,gBAAgB,CAAC,QAAQ,EAAE,2BAA2B,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI;IAYnE,IAAI,gBACI,SAAS,CAAC,CAAC,KACvB,WAAW,2BAA2B,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAc9C;IAEF;;;OAGG;IACH,SAAS,CAAC,UAAU,EAAE,CACpB,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,EACrB,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC,KAC1B,OAAO,CAAc;IAEnB,gBAAgB,IAAI,IAAI;CAYhC"}
+{"version":3,"file":"CustomCallback.d.ts","sourceRoot":"","sources":["../../../../src/classes/private/CustomCallback.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8DAA8D,CAAC;AACrG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAIvE,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,sDAAsD,CAAC;AACxG,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,MAAM,MAAM,QAAQ,CAAC,CAAC,SAAS,iBAAiB,IAAI,UAAU,CAC5D,2BAA2B,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAClC,CAAC;AAEF,MAAM,MAAM,YAAY,CAAC,CAAC,SAAS,iBAAiB,IAAI,WAAW,CACjE,2BAA2B,CAAC,CAAC,CAAC,CAC/B,CAAC;AAQF;;;GAGG;AACH,8BAAsB,cAAc,CAClC,CAAC,SAAS,iBAAiB,CAC3B,SAAQ,OAAO;IACf,OAAO,CAAC,aAAa,CAA8B;IAE5C,aAAa,CAClB,QAAQ,EAAE,gBAAgB,GAAG,GAAG,EAChC,YAAY,EAAE,2BAA2B,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAC/C,GAAG,YAAY,EAAE,WAAW,CAAC,2BAA2B,CAAC,CAAC,CAAC,CAAC,GAC3D,IAAI;IAiBP;;;OAGG;IACI,gBAAgB,CAAC,QAAQ,EAAE,2BAA2B,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI;IAYnE,IAAI,gBACI,SAAS,CAAC,CAAC,KACvB,WAAW,2BAA2B,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAyB9C;IAEF;;;OAGG;IACH,SAAS,CAAC,UAAU,EAAE,CACpB,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,EACrB,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC,KAC1B,OAAO,CAAc;IAEnB,gBAAgB,IAAI,IAAI;CAYhC"}

package/dist/src/classes/private/CustomCallback.lua

@@ -1,7 +1,6 @@
 local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
-local __TS__Spread = ____lualib.__TS__Spread
 local __TS__ArrayFindIndex = ____lualib.__TS__ArrayFindIndex
 local __TS__ArraySplice = ____lualib.__TS__ArraySplice
 local __TS__ArrayEntries = ____lualib.__TS__ArrayEntries
@@ -33,7 +32,13 @@ function CustomCallback.prototype.____constructor(self, ...)
             if self:shouldFire(fireArgs, optionalArgs) then
                 local value = callbackFunc(
                     nil,
-                    __TS__Spread(fireArgs)
+                    fireArgs[1],
+                    fireArgs[2],
+                    fireArgs[3],
+                    fireArgs[4],
+                    fireArgs[5],
+                    fireArgs[6],
+                    fireArgs[7]
                 )
                 if value ~= nil then
                     return value

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isaacscript-common",
-  "version": "39.4.2",
+  "version": "39.4.4",
   "description": "Helper functions and features for IsaacScript mods.",
   "keywords": [
     "isaac",
@@ -25,6 +25,6 @@
   "main": "dist/src/index",
   "types": "dist/index.rollup.d.ts",
   "dependencies": {
-    "isaac-typescript-definitions": "^17.0.3"
+    "isaac-typescript-definitions": "^17.0.4"
   }
 }

package/src/classes/callbacks/InputActionFilter.ts

@@ -20,7 +20,7 @@ export class InputActionFilter extends CustomCallback<T> {
     fireArgs: FireArgs<T>,
     optionalArgs: OptionalArgs<T>,
   ): boolean => {
-    const [_, inputHook, buttonAction] = fireArgs;
+    const [_entity, inputHook, buttonAction] = fireArgs;
     const [callbackInputHook, callbackButtonAction] = optionalArgs;
 
     return (

package/src/classes/private/CustomCallback.ts

@@ -75,8 +75,19 @@ export abstract class CustomCallback<
       const { callbackFunc, optionalArgs } = subscription;
 
       if (this.shouldFire(fireArgs, optionalArgs)) {
-        // TypeScript is not smart enough to know that the arguments match the function.
-        const value = (callbackFunc as AnyFunction)(...fireArgs);
+        // - TypeScript is not smart enough to know that the arguments match the function, so we
+        //   must cast it to `AnyFunction`.
+        // - We cannot use `...fireArgs` here because it would fail to pass any arguments that exist
+        //   beyond `nil` elements.
+        const value = (callbackFunc as AnyFunction)(
+          fireArgs[0],
+          fireArgs[1],
+          fireArgs[2],
+          fireArgs[3],
+          fireArgs[4],
+          fireArgs[5],
+          fireArgs[6],
+        );
         if (value !== undefined) {
           return value as ReturnType<AddCallbackParametersCustom[T][0]>;
         }