@nrwl/angular 14.4.0-beta.5 → 14.4.0-beta.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +1 -1
- package/package.json +9 -9
- package/src/executors/file-server/file-server.impl.js +0 -3
- package/src/executors/file-server/file-server.impl.js.map +1 -1
- package/src/generators/move/lib/update-ng-package.js +1 -1
- package/src/generators/move/lib/update-ng-package.js.map +1 -1
- package/src/generators/ngrx/files/classes-syntax/__directory__/__fileName__.facade.spec.ts__tmpl__ +3 -3
- package/src/generators/ngrx/files/classes-syntax/__directory__/__fileName__.reducer.spec.ts__tmpl__ +4 -4
- package/src/generators/ngrx/files/classes-syntax/__directory__/__fileName__.reducer.ts__tmpl__ +3 -3
- package/src/generators/ngrx/files/creator-syntax/__directory__/__fileName__.actions.ts__tmpl__ +1 -1
- package/src/generators/ngrx/files/creator-syntax/__directory__/__fileName__.effects.spec.ts__tmpl__ +1 -1
- package/src/generators/ngrx/files/creator-syntax/__directory__/__fileName__.effects.ts__tmpl__ +4 -4
- package/src/generators/ngrx/files/creator-syntax/__directory__/__fileName__.facade.spec.ts__tmpl__ +5 -5
- package/src/generators/ngrx/files/creator-syntax/__directory__/__fileName__.facade.ts__tmpl__ +1 -1
- package/src/generators/ngrx/files/creator-syntax/__directory__/__fileName__.reducer.spec.ts__tmpl__ +4 -4
- package/src/generators/ngrx/files/creator-syntax/__directory__/__fileName__.reducer.ts__tmpl__ +8 -8
- package/src/generators/ngrx/files/creator-syntax/__directory__/__fileName__.selectors.spec.ts__tmpl__ +2 -2
- package/src/generators/ngrx/files/creator-syntax/__directory__/__fileName__.selectors.ts__tmpl__ +7 -7
- package/src/generators/ngrx/lib/add-imports-to-module.js +2 -1
- package/src/generators/ngrx/lib/add-imports-to-module.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
-
# [14.4.0-beta.
|
|
6
|
+
# [14.4.0-beta.6](https://github.com/nrwl/nx/compare/14.3.6...14.4.0-beta.6) (2022-06-29)
|
|
7
7
|
|
|
8
8
|
**Note:** Version bump only for package @nrwl/angular
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/angular",
|
|
3
|
-
"version": "14.4.0-beta.
|
|
3
|
+
"version": "14.4.0-beta.6",
|
|
4
4
|
"description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, Cypress, Karma, and Protractor. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Upgrading AngularJS applications \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -65,13 +65,13 @@
|
|
|
65
65
|
},
|
|
66
66
|
"dependencies": {
|
|
67
67
|
"@angular-devkit/schematics": "~14.0.0",
|
|
68
|
-
"@nrwl/cypress": "14.4.0-beta.
|
|
69
|
-
"@nrwl/devkit": "14.4.0-beta.
|
|
70
|
-
"@nrwl/jest": "14.4.0-beta.
|
|
71
|
-
"@nrwl/linter": "14.4.0-beta.
|
|
72
|
-
"@nrwl/storybook": "14.4.0-beta.
|
|
73
|
-
"@nrwl/web": "14.4.0-beta.
|
|
74
|
-
"@nrwl/workspace": "14.4.0-beta.
|
|
68
|
+
"@nrwl/cypress": "14.4.0-beta.6",
|
|
69
|
+
"@nrwl/devkit": "14.4.0-beta.6",
|
|
70
|
+
"@nrwl/jest": "14.4.0-beta.6",
|
|
71
|
+
"@nrwl/linter": "14.4.0-beta.6",
|
|
72
|
+
"@nrwl/storybook": "14.4.0-beta.6",
|
|
73
|
+
"@nrwl/web": "14.4.0-beta.6",
|
|
74
|
+
"@nrwl/workspace": "14.4.0-beta.6",
|
|
75
75
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
76
76
|
"@schematics/angular": "~14.0.0",
|
|
77
77
|
"chalk": "4.1.0",
|
|
@@ -94,5 +94,5 @@
|
|
|
94
94
|
"fesm2015": "fesm2015/nrwl-angular.mjs",
|
|
95
95
|
"typings": "index.d.ts",
|
|
96
96
|
"sideEffects": false,
|
|
97
|
-
"gitHead": "
|
|
97
|
+
"gitHead": "c52a8c2e9b7b1fe9c50ca365c5d77dbfd159c9ef"
|
|
98
98
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/file-server/file-server.impl.ts"],"names":[],"mappings":";;;AAAA,iDAAmD;AACnD,yCAKsB;AACtB,mCAA4B;AAC5B,2BAAkC;AAElC,uCAAiC;AACjC,2BAA8B;AAC9B,+BAA+B;AAC/B,4DAAkE;AAElE,iCAAiC;AACjC,MAAM,KAAK,GAAG,IAAA,aAAQ,GAAE,KAAK,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC;AAEzD,SAAS,iBAAiB,CAAC,OAAe;IACxC,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC;IACtB,IAAI,OAAO,CAAC,IAAI,EAAE;QAChB,IAAI,CAAC,IAAI,CAAC,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;KACjC;IACD,IAAI,OAAO,CAAC,IAAI,EAAE;QAChB,IAAI,CAAC,IAAI,CAAC,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;KACjC;IACD,IAAI,OAAO,CAAC,GAAG,EAAE;QACf,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;KACjB;IACD,IAAI,OAAO,CAAC,OAAO,EAAE;QACnB,IAAI,CAAC,IAAI,CAAC,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;KACpC;IACD,IAAI,OAAO,CAAC,MAAM,EAAE;QAClB,IAAI,CAAC,IAAI,CAAC,MAAM,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;KACnC;IACD,IAAI,OAAO,CAAC,QAAQ,EAAE;QACpB,IAAI,CAAC,IAAI,CAAC,MAAM,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;KACrC;IAED,IAAI,OAAO,CAAC,YAAY,EAAE;QACxB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YAChD,IAAI,CAAC,IAAI,CAAC,mBAAmB,GAAG,4BAA4B,CAAC,CAAC;QAChE,CAAC,CAAC,CAAC;KACJ;IAED,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACpB,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,qBAAqB,CAAC,OAAe;IAC5C,MAAM,GAAG,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IAC/C,IAAI,OAAO,CAAC,QAAQ,EAAE;QACpB,GAAG,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"file-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/file-server/file-server.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@ function updateNgPackage(tree, schema) {
|
|
|
15
15
|
if (!tree.exists(ngPackagePath)) {
|
|
16
16
|
return;
|
|
17
17
|
}
|
|
18
|
-
const rootOffset = (0, path_1.relative)((0, path_1.join)(devkit_1.workspaceRoot, project.root), devkit_1.workspaceRoot);
|
|
18
|
+
const rootOffset = (0, devkit_1.normalizePath)((0, path_1.relative)((0, path_1.join)(devkit_1.workspaceRoot, project.root), devkit_1.workspaceRoot));
|
|
19
19
|
let output = `dist/${project.root}`;
|
|
20
20
|
if (((_c = (_b = (_a = project.targets) === null || _a === void 0 ? void 0 : _a.build) === null || _b === void 0 ? void 0 : _b.outputs) === null || _c === void 0 ? void 0 : _c.length) > 0) {
|
|
21
21
|
output = project.targets.build.outputs[0];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-ng-package.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/move/lib/update-ng-package.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"update-ng-package.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/move/lib/update-ng-package.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AACtB,yEAAkF;AAClF,+BAAsC;AAGtC,SAAgB,eAAe,CAAC,IAAU,EAAE,MAAc;;IACxD,MAAM,cAAc,GAAG,IAAA,yBAAiB,EAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAC7D,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAE/D,IAAI,OAAO,CAAC,WAAW,KAAK,aAAa,EAAE;QACzC,OAAO;KACR;IAED,MAAM,aAAa,GAAG,GAAG,OAAO,CAAC,IAAI,kBAAkB,CAAC;IACxD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE;QAC/B,OAAO;KACR;IAED,MAAM,UAAU,GAAG,IAAA,sBAAa,EAC9B,IAAA,eAAQ,EAAC,IAAA,WAAI,EAAC,sBAAa,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,sBAAa,CAAC,CAC3D,CAAC;IACF,IAAI,MAAM,GAAG,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;IACpC,IAAI,CAAA,MAAA,MAAA,MAAA,OAAO,CAAC,OAAO,0CAAE,KAAK,0CAAE,OAAO,0CAAE,MAAM,IAAG,CAAC,EAAE;QAC/C,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;KAC3C;IAED,IAAA,mBAAU,EAAC,IAAI,EAAE,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE;QACvC,IAAI,CAAC,IAAI,GAAG,GAAG,UAAU,IAAI,MAAM,EAAE,CAAC;QACtC,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAzBD,0CAyBC"}
|
package/src/generators/ngrx/files/classes-syntax/__directory__/__fileName__.facade.spec.ts__tmpl__
CHANGED
|
@@ -11,8 +11,8 @@ import { <%= className %>Facade } from './<%= fileName %>.facade';
|
|
|
11
11
|
import {
|
|
12
12
|
<%= className %>State,
|
|
13
13
|
<%= className %>Entity,
|
|
14
|
-
|
|
15
|
-
|
|
14
|
+
initial<%= className %>State,
|
|
15
|
+
<%= propertyName %>Reducer
|
|
16
16
|
} from './<%= fileName %>.reducer';
|
|
17
17
|
import { <%= propertyName %>Query } from './<%= fileName %>.selectors';
|
|
18
18
|
|
|
@@ -32,7 +32,7 @@ describe('<%= className %>Facade', () => {
|
|
|
32
32
|
beforeEach(() => {
|
|
33
33
|
@NgModule({
|
|
34
34
|
imports: [
|
|
35
|
-
StoreModule.forFeature('<%= propertyName %>',
|
|
35
|
+
StoreModule.forFeature('<%= propertyName %>', <%= propertyName %>Reducer, { initialState: initial<%= className %>State }),
|
|
36
36
|
EffectsModule.forFeature([<%= className %>Effects])
|
|
37
37
|
],
|
|
38
38
|
providers: [<%= className %>Facade]
|
package/src/generators/ngrx/files/classes-syntax/__directory__/__fileName__.reducer.spec.ts__tmpl__
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { <%= className %>Loaded } from './<%= fileName %>.actions';
|
|
2
|
-
import { <%= className %>State, <%= className %>Entity,
|
|
2
|
+
import { <%= className %>State, <%= className %>Entity, initial<%= className %>State, <%= propertyName %>Reducer } from './<%= fileName %>.reducer';
|
|
3
3
|
|
|
4
4
|
describe('<%= className %> Reducer', () => {
|
|
5
5
|
const get<%= className %>Id = (it: <%= className %>Entity) => it.id;
|
|
@@ -12,7 +12,7 @@ describe('<%= className %> Reducer', () => {
|
|
|
12
12
|
it('should return the list of known <%= className %>', () => {
|
|
13
13
|
const <%= propertyName %> = [create<%= className %>('PRODUCT-AAA'), create<%= className %>('PRODUCT-zzz')];
|
|
14
14
|
const action = new <%= className %>Loaded(<%= propertyName %>);
|
|
15
|
-
const result: <%= className %>State =
|
|
15
|
+
const result: <%= className %>State = <%= propertyName %>Reducer(initial<%= className %>State, action);
|
|
16
16
|
const selId: string = get<%= className %>Id(result.list[1]);
|
|
17
17
|
|
|
18
18
|
expect(result.loaded).toBe(true);
|
|
@@ -24,9 +24,9 @@ describe('<%= className %> Reducer', () => {
|
|
|
24
24
|
describe('unknown action', () => {
|
|
25
25
|
it('should return the previous state', () => {
|
|
26
26
|
const action = {} as any;
|
|
27
|
-
const result =
|
|
27
|
+
const result = <%= propertyName %>Reducer(initial<%= className %>State, action);
|
|
28
28
|
|
|
29
|
-
expect(result).toBe(
|
|
29
|
+
expect(result).toBe(initial<%= className %>State);
|
|
30
30
|
});
|
|
31
31
|
});
|
|
32
32
|
});
|
package/src/generators/ngrx/files/classes-syntax/__directory__/__fileName__.reducer.ts__tmpl__
CHANGED
|
@@ -24,13 +24,13 @@ export interface <%= className %>PartialState {
|
|
|
24
24
|
readonly [<%= constantName %>_FEATURE_KEY]: <%= className %>State;
|
|
25
25
|
}
|
|
26
26
|
|
|
27
|
-
export const
|
|
27
|
+
export const initial<%= className %>State: <%= className %>State = {
|
|
28
28
|
list: [],
|
|
29
29
|
loaded: false
|
|
30
30
|
};
|
|
31
31
|
|
|
32
|
-
export function
|
|
33
|
-
state: <%= className %>State =
|
|
32
|
+
export function <%= propertyName %>Reducer(
|
|
33
|
+
state: <%= className %>State = initial<%= className %>State,
|
|
34
34
|
action: <%= className %>Action): <%= className %>State
|
|
35
35
|
{
|
|
36
36
|
switch (action.type) {
|
package/src/generators/ngrx/files/creator-syntax/__directory__/__fileName__.effects.spec.ts__tmpl__
CHANGED
|
@@ -31,7 +31,7 @@ describe('<%= className %>Effects', () => {
|
|
|
31
31
|
|
|
32
32
|
describe('init$', () => {
|
|
33
33
|
it('should work', () => {
|
|
34
|
-
actions = hot('-a-|', { a: <%= className %>Actions.init() });
|
|
34
|
+
actions = hot('-a-|', { a: <%= className %>Actions.init<%= className %>() });
|
|
35
35
|
|
|
36
36
|
const expected = hot('-a-|', { a: <%= className %>Actions.load<%= className %>Success({ <%= propertyName %>: [] }) });
|
|
37
37
|
|
package/src/generators/ngrx/files/creator-syntax/__directory__/__fileName__.effects.ts__tmpl__
CHANGED
|
@@ -7,17 +7,17 @@ import * as <%= className %>Feature from './<%= fileName %>.reducer';
|
|
|
7
7
|
|
|
8
8
|
@Injectable()
|
|
9
9
|
export class <%= className %>Effects {
|
|
10
|
-
<% if (useDataPersistence) { %>init$ = createEffect(() => this.dataPersistence.fetch(<%= className %>Actions
|
|
11
|
-
run: (action: ReturnType<typeof <%= className %>Actions.init
|
|
10
|
+
<% if (useDataPersistence) { %>init$ = createEffect(() => this.dataPersistence.fetch(<%= className %>Actions.<%= className %>init, {
|
|
11
|
+
run: (action: ReturnType<typeof <%= className %>Actions.init<%= className %>>, state: <%= className %>Feature.<%= className %>PartialState) => {
|
|
12
12
|
// Your custom service 'load' logic goes here. For now just return a success action...
|
|
13
13
|
return <%= className %>Actions.load<%= className %>Success({ <%= propertyName %>: [] });
|
|
14
14
|
},
|
|
15
|
-
onError: (action: ReturnType<typeof <%= className %>Actions.init
|
|
15
|
+
onError: (action: ReturnType<typeof <%= className %>Actions.init<%= className %>>, error) => {
|
|
16
16
|
console.error('Error', error);
|
|
17
17
|
return <%= className %>Actions.load<%= className %>Failure({ error });
|
|
18
18
|
}
|
|
19
19
|
}));<% } else { %>init$ = createEffect(() => this.actions$.pipe(
|
|
20
|
-
ofType(<%= className %>Actions.init),
|
|
20
|
+
ofType(<%= className %>Actions.init<%= className %>),
|
|
21
21
|
fetch({
|
|
22
22
|
run: action => {
|
|
23
23
|
// Your custom service 'load' logic goes here. For now just return a success action...
|
package/src/generators/ngrx/files/creator-syntax/__directory__/__fileName__.facade.spec.ts__tmpl__
CHANGED
|
@@ -11,14 +11,14 @@ import { <%= className %>Facade } from './<%= fileName %>.facade';
|
|
|
11
11
|
import { <%= className %>Entity } from './<%= fileName %>.models';
|
|
12
12
|
import {
|
|
13
13
|
<%= constantName %>_FEATURE_KEY,
|
|
14
|
-
State,
|
|
15
|
-
|
|
16
|
-
|
|
14
|
+
<%= className %>State,
|
|
15
|
+
initial<%= className %>State,
|
|
16
|
+
<%= propertyName %>Reducer
|
|
17
17
|
} from './<%= fileName %>.reducer';
|
|
18
18
|
import * as <%= className %>Selectors from './<%= fileName %>.selectors';
|
|
19
19
|
|
|
20
20
|
interface TestSchema {
|
|
21
|
-
<%= propertyName %>: State;
|
|
21
|
+
<%= propertyName %>: <%= className %>State;
|
|
22
22
|
}
|
|
23
23
|
|
|
24
24
|
describe('<%= className %>Facade', () => {
|
|
@@ -33,7 +33,7 @@ describe('<%= className %>Facade', () => {
|
|
|
33
33
|
beforeEach(() => {
|
|
34
34
|
@NgModule({
|
|
35
35
|
imports: [
|
|
36
|
-
StoreModule.forFeature(<%= constantName %>_FEATURE_KEY,
|
|
36
|
+
StoreModule.forFeature(<%= constantName %>_FEATURE_KEY, <%= propertyName %>Reducer),
|
|
37
37
|
EffectsModule.forFeature([<%= className %>Effects])
|
|
38
38
|
],
|
|
39
39
|
providers: [<%= className %>Facade]
|
package/src/generators/ngrx/files/creator-syntax/__directory__/__fileName__.reducer.spec.ts__tmpl__
CHANGED
|
@@ -2,7 +2,7 @@ import { Action } from '@ngrx/store';
|
|
|
2
2
|
|
|
3
3
|
import * as <%= className %>Actions from './<%= fileName %>.actions';
|
|
4
4
|
import { <%= className %>Entity } from './<%= fileName %>.models';
|
|
5
|
-
import { State,
|
|
5
|
+
import { <%= className %>State, initial<%= className %>State, <%= propertyName %>Reducer } from './<%= fileName %>.reducer';
|
|
6
6
|
|
|
7
7
|
describe('<%= className %> Reducer', () => {
|
|
8
8
|
const create<%= className %>Entity = (id: string, name = ''): <%= className %>Entity => ({
|
|
@@ -18,7 +18,7 @@ describe('<%= className %> Reducer', () => {
|
|
|
18
18
|
];
|
|
19
19
|
const action = <%= className %>Actions.load<%= className %>Success({ <%= propertyName %> });
|
|
20
20
|
|
|
21
|
-
const result: State =
|
|
21
|
+
const result: <%= className %>State = <%= propertyName %>Reducer(initial<%= className %>State, action);
|
|
22
22
|
|
|
23
23
|
expect(result.loaded).toBe(true);
|
|
24
24
|
expect(result.ids.length).toBe(2);
|
|
@@ -29,9 +29,9 @@ describe('<%= className %> Reducer', () => {
|
|
|
29
29
|
it('should return the previous state', () => {
|
|
30
30
|
const action = {} as Action;
|
|
31
31
|
|
|
32
|
-
const result =
|
|
32
|
+
const result = <%= propertyName %>Reducer(initial<%= className %>State, action);
|
|
33
33
|
|
|
34
|
-
expect(result).toBe(
|
|
34
|
+
expect(result).toBe(initial<%= className %>State);
|
|
35
35
|
});
|
|
36
36
|
});
|
|
37
37
|
});
|
package/src/generators/ngrx/files/creator-syntax/__directory__/__fileName__.reducer.ts__tmpl__
CHANGED
|
@@ -6,26 +6,26 @@ import { <%= className %>Entity } from './<%= fileName %>.models';
|
|
|
6
6
|
|
|
7
7
|
export const <%= constantName %>_FEATURE_KEY = '<%= propertyName %>';
|
|
8
8
|
|
|
9
|
-
export interface State extends EntityState<<%= className %>Entity> {
|
|
9
|
+
export interface <%= className %>State extends EntityState<<%= className %>Entity> {
|
|
10
10
|
selectedId?: string | number; // which <%= className %> record has been selected
|
|
11
11
|
loaded: boolean; // has the <%= className %> list been loaded
|
|
12
12
|
error?: string | null; // last known error (if any)
|
|
13
13
|
}
|
|
14
14
|
|
|
15
15
|
export interface <%= className %>PartialState {
|
|
16
|
-
readonly [<%= constantName %>_FEATURE_KEY]: State;
|
|
16
|
+
readonly [<%= constantName %>_FEATURE_KEY]: <%= className %>State;
|
|
17
17
|
}
|
|
18
18
|
|
|
19
19
|
export const <%= propertyName %>Adapter: EntityAdapter<<%= className %>Entity> = createEntityAdapter<<%= className %>Entity>();
|
|
20
20
|
|
|
21
|
-
export const
|
|
21
|
+
export const initial<%= className %>State: <%= className %>State = <%= propertyName %>Adapter.getInitialState({
|
|
22
22
|
// set initial required properties
|
|
23
23
|
loaded: false
|
|
24
24
|
});
|
|
25
25
|
|
|
26
|
-
const
|
|
27
|
-
|
|
28
|
-
on(<%= className %>Actions.init
|
|
26
|
+
const reducer = createReducer(
|
|
27
|
+
initial<%= className %>State,
|
|
28
|
+
on(<%= className %>Actions.init<%= className %>,
|
|
29
29
|
state => ({ ...state, loaded: false, error: null })
|
|
30
30
|
),
|
|
31
31
|
on(<%= className %>Actions.load<%= className %>Success,
|
|
@@ -36,6 +36,6 @@ const <%= propertyName %>Reducer = createReducer(
|
|
|
36
36
|
),
|
|
37
37
|
);
|
|
38
38
|
|
|
39
|
-
export function
|
|
40
|
-
return
|
|
39
|
+
export function <%= propertyName %>Reducer(state: <%= className %>State | undefined, action: Action) {
|
|
40
|
+
return reducer(state, action);
|
|
41
41
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { <%= className %>Entity } from './<%= fileName %>.models';
|
|
2
|
-
import { <%= propertyName %>Adapter, <%= className %>PartialState,
|
|
2
|
+
import { <%= propertyName %>Adapter, <%= className %>PartialState, initial<%= className %>State } from './<%= fileName %>.reducer';
|
|
3
3
|
import * as <%= className %>Selectors from './<%= fileName %>.selectors';
|
|
4
4
|
|
|
5
5
|
describe('<%= className %> Selectors', () => {
|
|
@@ -19,7 +19,7 @@ describe('<%= className %> Selectors', () => {
|
|
|
19
19
|
create<%= className %>Entity('PRODUCT-BBB'),
|
|
20
20
|
create<%= className %>Entity('PRODUCT-CCC')
|
|
21
21
|
], {
|
|
22
|
-
...
|
|
22
|
+
...initial<%= className %>State,
|
|
23
23
|
selectedId : 'PRODUCT-BBB',
|
|
24
24
|
error: ERROR_MSG,
|
|
25
25
|
loaded: true
|
package/src/generators/ngrx/files/creator-syntax/__directory__/__fileName__.selectors.ts__tmpl__
CHANGED
|
@@ -1,34 +1,34 @@
|
|
|
1
1
|
import { createFeatureSelector, createSelector } from '@ngrx/store';
|
|
2
|
-
import { <%= constantName %>_FEATURE_KEY, State, <%= propertyName %>Adapter } from './<%= fileName %>.reducer';
|
|
2
|
+
import { <%= constantName %>_FEATURE_KEY, <%= className %>State, <%= propertyName %>Adapter } from './<%= fileName %>.reducer';
|
|
3
3
|
|
|
4
4
|
// Lookup the '<%= className %>' feature state managed by NgRx
|
|
5
|
-
export const get<%= className %>State = createFeatureSelector
|
|
5
|
+
export const get<%= className %>State = createFeatureSelector<<%= className %>State>(<%= constantName %>_FEATURE_KEY);
|
|
6
6
|
|
|
7
7
|
const { selectAll, selectEntities } = <%= propertyName %>Adapter.getSelectors();
|
|
8
8
|
|
|
9
9
|
export const get<%= className %>Loaded = createSelector(
|
|
10
10
|
get<%= className %>State,
|
|
11
|
-
(state: State) => state.loaded
|
|
11
|
+
(state: <%= className %>State) => state.loaded
|
|
12
12
|
);
|
|
13
13
|
|
|
14
14
|
export const get<%= className %>Error = createSelector(
|
|
15
15
|
get<%= className %>State,
|
|
16
|
-
(state: State) => state.error
|
|
16
|
+
(state: <%= className %>State) => state.error
|
|
17
17
|
);
|
|
18
18
|
|
|
19
19
|
export const getAll<%= className %> = createSelector(
|
|
20
20
|
get<%= className %>State,
|
|
21
|
-
(state: State) => selectAll(state)
|
|
21
|
+
(state: <%= className %>State) => selectAll(state)
|
|
22
22
|
);
|
|
23
23
|
|
|
24
24
|
export const get<%= className %>Entities = createSelector(
|
|
25
25
|
get<%= className %>State,
|
|
26
|
-
(state: State) => selectEntities(state)
|
|
26
|
+
(state: <%= className %>State) => selectEntities(state)
|
|
27
27
|
);
|
|
28
28
|
|
|
29
29
|
export const getSelectedId = createSelector(
|
|
30
30
|
get<%= className %>State,
|
|
31
|
-
(state: State) => state.selectedId
|
|
31
|
+
(state: <%= className %>State) => state.selectedId
|
|
32
32
|
);
|
|
33
33
|
|
|
34
34
|
export const getSelected = createSelector(
|
|
@@ -21,6 +21,7 @@ function addImportsToModule(tree, options) {
|
|
|
21
21
|
const effectsName = `${(0, devkit_1.names)(options.name).className}Effects`;
|
|
22
22
|
const facadeName = `${(0, devkit_1.names)(options.name).className}Facade`;
|
|
23
23
|
const className = `${(0, devkit_1.names)(options.name).className}`;
|
|
24
|
+
const propertyName = `${(0, devkit_1.names)(options.name).propertyName}`;
|
|
24
25
|
const reducerImports = `* as from${className}`;
|
|
25
26
|
const storeMetaReducers = `metaReducers: !environment.production ? [] : []`;
|
|
26
27
|
const storeForRoot = `StoreModule.forRoot({}, {
|
|
@@ -33,7 +34,7 @@ function addImportsToModule(tree, options) {
|
|
|
33
34
|
const nxModule = 'NxModule.forRoot()';
|
|
34
35
|
const effectsForRoot = `EffectsModule.forRoot([${effectsName}])`;
|
|
35
36
|
const effectsForEmptyRoot = `EffectsModule.forRoot([])`;
|
|
36
|
-
const storeForFeature = `StoreModule.forFeature(from${className}.${constantName}_FEATURE_KEY, from${className}
|
|
37
|
+
const storeForFeature = `StoreModule.forFeature(from${className}.${constantName}_FEATURE_KEY, from${className}.${propertyName}Reducer)`;
|
|
37
38
|
const effectsForFeature = `EffectsModule.forFeature([${effectsName}])`;
|
|
38
39
|
const devTools = `!environment.production ? StoreDevtoolsModule.instrument() : []`;
|
|
39
40
|
const storeRouterModule = 'StoreRouterConnectingModule.forRoot()';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-imports-to-module.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ngrx/lib/add-imports-to-module.ts"],"names":[],"mappings":";;;AACA,yCAAqC;AACrC,uEAAuE;AAEvE,2CAA4D;AAC5D,kEAG4C;AAG5C,SAAgB,kBAAkB,CAChC,IAAU,EACV,OAA6B;IAE7B,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;IAClC,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAClD,IAAI,UAAU,GAAG,IAAA,6BAAgB,EAC/B,UAAU,EACV,UAAU,EACV,yBAAY,CAAC,MAAM,EACnB,IAAI,CACL,CAAC;IACF,MAAM,SAAS,GAAG,CAChB,MAAkB,EAClB,UAAkB,EAClB,QAAgB,EAChB,SAAS,GAAG,KAAK,EACL,EAAE;QACd,OAAO,IAAA,wBAAY,EACjB,IAAI,EACJ,MAAM,EACN,UAAU,EACV,UAAU,EACV,QAAQ,EACR,SAAS,CACV,CAAC;IACJ,CAAC,CAAC;IAEF,MAAM,GAAG,GAAG,KAAK,IAAA,cAAK,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,CAAC;IACrD,MAAM,UAAU,GAAG,GAAG,GAAG,IAAI,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC5D,MAAM,WAAW,GAAG,GAAG,UAAU,UAAU,CAAC;IAC5C,MAAM,WAAW,GAAG,GAAG,UAAU,UAAU,CAAC;IAC5C,MAAM,UAAU,GAAG,GAAG,UAAU,SAAS,CAAC;IAE1C,MAAM,YAAY,GAAG,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,CAAC;IAC3D,MAAM,WAAW,GAAG,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,SAAS,SAAS,CAAC;IAC9D,MAAM,UAAU,GAAG,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,SAAS,QAAQ,CAAC;IAC5D,MAAM,SAAS,GAAG,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC;IACrD,MAAM,cAAc,GAAG,YAAY,SAAS,EAAE,CAAC;IAE/C,MAAM,iBAAiB,GAAG,iDAAiD,CAAC;IAE5E,MAAM,YAAY,GAAG;QACf,iBAAiB;;;;;OAKlB,CAAC;IACN,MAAM,QAAQ,GAAG,oBAAoB,CAAC;IACtC,MAAM,cAAc,GAAG,0BAA0B,WAAW,IAAI,CAAC;IACjE,MAAM,mBAAmB,GAAG,2BAA2B,CAAC;IACxD,MAAM,eAAe,GAAG,8BAA8B,SAAS,IAAI,YAAY,qBAAqB,SAAS,
|
|
1
|
+
{"version":3,"file":"add-imports-to-module.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ngrx/lib/add-imports-to-module.ts"],"names":[],"mappings":"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"}
|