Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(store): run plugins in injection context #2256

Merged
merged 1 commit into from
Nov 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ $ npm install @ngxs/store@dev
### To become next patch version

- Refactor: Use field initializers for injectees [#2258](https://github.com/ngxs/store/pull/2258)
- Fix(store): Run plugins in injection context [#2256](https://github.com/ngxs/store/pull/2256)
- Fix(websocket-plugin): Do not dispatch action when root injector is destroyed [#2257](https://github.com/ngxs/store/pull/2257)

### 18.1.5 2024-11-12
Expand Down
36 changes: 33 additions & 3 deletions packages/store/src/internal/dispatcher.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import { inject, Injectable, NgZone } from '@angular/core';
import { inject, Injectable, Injector, NgZone, runInInjectionContext } from '@angular/core';
import { EMPTY, forkJoin, Observable, of, Subject, throwError } from 'rxjs';
import { exhaustMap, filter, map, shareReplay, take } from 'rxjs/operators';

import { getActionTypeFromInstance } from '@ngxs/store/plugins';
import { ɵPlainObject, ɵStateStream } from '@ngxs/store/internals';

import { compose } from '../utils/compose';
import { ActionContext, ActionStatus, InternalActions } from '../actions-stream';
import { PluginManager } from '../plugin-manager';
import { InternalNgxsExecutionStrategy } from '../execution/internal-ngxs-execution-strategy';
Expand All @@ -29,6 +28,7 @@ export class InternalDispatcher {
private _pluginManager = inject(PluginManager);
private _stateStream = inject(ɵStateStream);
private _ngxsExecutionStrategy = inject(InternalNgxsExecutionStrategy);
private _injector = inject(Injector);

/**
* Dispatches event(s).
Expand Down Expand Up @@ -70,7 +70,7 @@ export class InternalDispatcher {
const prevState = this._stateStream.getValue();
const plugins = this._pluginManager.plugins;

return compose([
return compose(this._injector, [
...plugins,
(nextState: any, nextAction: any) => {
if (nextState !== prevState) {
Expand Down Expand Up @@ -115,3 +115,33 @@ export class InternalDispatcher {
.pipe(shareReplay());
}
}

type StateFn = (...args: any[]) => any;

/**
* Composes a array of functions from left to right. Example:
*
* compose([fn, final])(state, action);
*
* then the funcs have a signature like:
*
* function fn (state, action, next) {
* console.log('here', state, action, next);
* return next(state, action);
* }
*
* function final (state, action) {
* console.log('here', state, action);
* return state;
* }
*
* the last function should not call `next`.
*/
const compose =
(injector: Injector, funcs: StateFn[]) =>
(...args: any[]) => {
const curr = funcs.shift()!;
return runInInjectionContext(injector, () =>
curr(...args, (...nextArgs: any[]) => compose(injector, funcs)(...nextArgs))
);
};
29 changes: 0 additions & 29 deletions packages/store/src/utils/compose.ts

This file was deleted.

58 changes: 41 additions & 17 deletions packages/store/tests/plugins.spec.ts
Original file line number Diff line number Diff line change
@@ -1,48 +1,72 @@
import { assertInInjectionContext } from '@angular/core';
import { TestBed } from '@angular/core/testing';
import { NgxsModule, NGXS_PLUGINS, Store } from '@ngxs/store';
import { tap } from 'rxjs/operators';
import { Observable } from 'rxjs';
import { NgxsModule, NGXS_PLUGINS, Store, NgxsNextPluginFn, InitState } from '@ngxs/store';
import { debounceTime, firstValueFrom, tap } from 'rxjs';

describe('Plugins', () => {
it('should run a function plugin', () => {
let pluginInvoked = 0;
it('should run a function plugin (within an injection context too)', async () => {
// Arrange
const recorder: any[] = [];

class Foo {
static readonly type = 'Foo';
}

function logPlugin(
state: any,
action: any,
next: (state: any, action: any) => Observable<any>
) {
if (action.constructor && action.constructor.type === 'Foo') {
pluginInvoked++;
function asyncLogPlugin(state: any, action: any, next: NgxsNextPluginFn) {
assertInInjectionContext(asyncLogPlugin);

if (action.constructor.type === 'Foo') {
recorder.push(['asyncLogPlugin()', action, 'before next()']);
}

return next(state, action).pipe(
debounceTime(0),
tap(() => {
if (action.constructor.type === 'Foo') {
pluginInvoked++;
recorder.push(['asyncLogPlugin()', action, 'after next()']);
}
})
);
}

function otherPlugin(state: any, action: any, next: NgxsNextPluginFn) {
assertInInjectionContext(otherPlugin);
recorder.push(['otherPlugin()', action]);
return next(state, action);
}

TestBed.configureTestingModule({
imports: [NgxsModule.forRoot()],
providers: [
{
provide: NGXS_PLUGINS,
useValue: logPlugin,
useValue: asyncLogPlugin,
multi: true
},
{
provide: NGXS_PLUGINS,
useValue: otherPlugin,
multi: true
}
]
});

const store: Store = TestBed.inject(Store);
store.dispatch(new Foo());
// Act
const store = TestBed.inject(Store);

// Assert
expect(recorder).toEqual([['otherPlugin()', new InitState()]]);

// Act
const action = new Foo();
await firstValueFrom(store.dispatch(action));

expect(pluginInvoked).toEqual(2);
// Assert
expect(recorder).toEqual([
['otherPlugin()', new InitState()],
['asyncLogPlugin()', action, 'before next()'],
['otherPlugin()', action],
['asyncLogPlugin()', action, 'after next()']
]);
});
});
Loading