Merge branch 'filtered-effect'

main
Yanick Champoux 2023-04-21 15:25:10 -04:00
commit a04ebfcdfe
2 changed files with 87 additions and 7 deletions

View File

@ -45,10 +45,10 @@ type ResolveAction<
? ActionArg
: ActionArg extends (...args: any) => any
? ActionCreatorWithPreparedPayload<
Parameters<ActionArg>,
ReturnType<ActionArg>,
ActionType
>
Parameters<ActionArg>,
ReturnType<ActionArg>,
ActionType
>
: ActionCreatorWithoutPayload<ActionType>;
type ResolveActions<
@ -56,10 +56,10 @@ type ResolveActions<
[key: string]: any;
},
> = {
[ActionType in keyof A]: ActionType extends string
[ActionType in keyof A]: ActionType extends string
? ResolveAction<ActionType, A[ActionType]>
: never;
};
};
type Reaction<S = any, M extends MiddlewareAPI = MiddlewareAPI> = (
api: M,
@ -311,8 +311,36 @@ export default class Updux<
this.#defaultMutation = { mutation, terminal };
}
addEffect(effect: EffectMiddleware) {
addEffect(actionCreator:
AggregateActions<ResolveActions<T_LocalActions>, T_Subduxes>,
effect: EffectMiddleware): EffectMiddleware;
addEffect(guardFunc: (action:
AggregateActions<ResolveActions<T_LocalActions>, T_Subduxes>[keyof AggregateActions<ResolveActions<T_LocalActions>, T_Subduxes>]) => boolean,
effect: EffectMiddleware): EffectMiddleware;
addEffect(effect: EffectMiddleware): EffectMiddleware;
addEffect(...args) {
let effect;
if (args.length === 1) {
effect = args[0];
}
else {
const [actionCreator, originalEffect] = args;
const test = actionCreator.hasOwnProperty('match') ?
actionCreator.match : actionCreator;
effect = (api) => next => {
const e = originalEffect(api)(next);
return action => {
const func = test(action) ? e : next;
return func(action);
}
}
}
this.#localEffects.push(effect);
return effect;
}
get effectsMiddleware() {

View File

@ -106,5 +106,57 @@ test('subdux', () => {
expect(seen).toEqual(1);
});
test('addEffect with actionCreator', () => {
const dux = new Updux({
actions: {
foo: null,
bar: null,
},
});
const next = vi.fn();
const spy = vi.fn();
const mw = dux.addEffect(
dux.actions.foo,
(api) => (next) => (action) => next(spy(action)),
);
mw({})(next)(dux.actions.bar());
expect(next).toHaveBeenCalled();
expect(spy).not.toHaveBeenCalled();
next.mockReset();
mw({})(next)(dux.actions.foo());
expect(next).toHaveBeenCalled();
expect(spy).toHaveBeenCalled();
});
test('addEffect with function', () => {
const dux = new Updux({
actions: {
foo: () => {},
bar: () => {},
},
});
const next = vi.fn();
const spy = vi.fn();
const mw = dux.addEffect(
(action) => action.type[0] === 'f',
(api) => (next) => (action) => next(spy(action)),
);
mw({})(next)(dux.actions.bar());
expect(next).toHaveBeenCalled();
expect(spy).not.toHaveBeenCalled();
next.mockReset();
mw({})(next)(dux.actions.foo());
expect(next).toHaveBeenCalled();
expect(spy).toHaveBeenCalled();
});
// TODO subdux effects
// TODO allow to subscribe / unsubscribe effects?