fix(iff): execute iff.else() correctly

feathersjs-ecosystem · May 31, 2022 · 0147f67 · 0147f67
1 parent 97c0fbe
commit 0147f67
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/hooks/iff-else.ts b/src/hooks/iff-else.ts
@@ -10,7 +10,7 @@ import type { PredicateFn } from '../types';
 export function iffElse (
   predicate: boolean | PredicateFn,
   trueHooks: Hook | Hook[] | undefined,
-  falseHooks: Hook | Hook[] | undefined
+  falseHooks?: Hook | Hook[] | undefined
 ): Hook {
   // fnArgs is [context] for service & permission hooks, [data, connection, context] for event filters
   return function (this: any, ctx: HookContext) {

diff --git a/src/hooks/iff.ts b/src/hooks/iff.ts
@@ -11,9 +11,10 @@ export function iff (
   ...hooks: Hook[]
 ): IffHook {
   const iffWithoutElse = function (context: HookContext) {
-    return iffElse(predicate, hooks.slice(), undefined)(context);
+    return iffElse(predicate, hooks.slice())(context);
   }
-  iffWithoutElse.else = (...falseHooks: any[]) => iffElse(true, falseHooks.slice(), []);
+
+  iffWithoutElse.else = (...falseHooks: any[]) => (context: HookContext) => iffElse(predicate, hooks.slice(), falseHooks.slice())(context);
 
   return iffWithoutElse;
 }