yanick/updux
1
0
Fork 0
Code Issues 6 Pull Requests Projects Releases 10 Wiki Activity

prettier

Browse Source
This commit is contained in:
Yanick Champoux 2023-05-04 14:41:12 -04:00
parent 2e78e27bf6
commit 342d1b6f3a
3 changed files with 38 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/Updux.ts
View File

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

8
src/effects.test.ts
View File

@ -122,12 +122,12 @@ test('addEffect with actionCreator', () => {
(api) => (next) => (action) => next(spy(action)), (api) => (next) => (action) => next(spy(action)),
); );
mw({})(next)(dux.actions.bar()); mw({} as any)(next)(dux.actions.bar());
expect(next).toHaveBeenCalled(); expect(next).toHaveBeenCalled();
expect(spy).not.toHaveBeenCalled(); expect(spy).not.toHaveBeenCalled();
next.mockReset(); next.mockReset();
mw({})(next)(dux.actions.foo()); mw({} as any)(next)(dux.actions.foo());
expect(next).toHaveBeenCalled(); expect(next).toHaveBeenCalled();
expect(spy).toHaveBeenCalled(); expect(spy).toHaveBeenCalled();
}); });
@ -148,12 +148,12 @@ test('addEffect with function', () => {
(api) => (next) => (action) => next(spy(action)), (api) => (next) => (action) => next(spy(action)),
); );
mw({})(next)(dux.actions.bar()); mw({} as any)(next)(dux.actions.bar());
expect(next).toHaveBeenCalled(); expect(next).toHaveBeenCalled();
expect(spy).not.toHaveBeenCalled(); expect(spy).not.toHaveBeenCalled();
next.mockReset(); next.mockReset();
mw({})(next)(dux.actions.foo()); mw({} as any)(next)(dux.actions.foo());
expect(next).toHaveBeenCalled(); expect(next).toHaveBeenCalled();
expect(spy).toHaveBeenCalled(); expect(spy).toHaveBeenCalled();
}); });

2
src/initial.test.ts
View File

@ -35,7 +35,7 @@ test('initialState to createStore', () => {
}); });
expect( expect(
dux.createStore({ initialState: { a: 3, b: 4 } }).getState(), dux.createStore({ preloadedState: { a: 3, b: 4 } }).getState(),
).toEqual({ ).toEqual({
a: 3, a: 3,
b: 4, b: 4,