@nx/angular 16.1.3 → 16.2.0-beta.0
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/generators.d.ts +2 -0
- package/generators.js +2 -0
- package/generators.js.map +1 -1
- package/generators.json +14 -2
- package/migrations.json +21 -0
- package/package.json +10 -11
- package/src/builders/webpack-dev-server/schema.json +1 -1
- package/src/builders/webpack-server/schema.json +1 -1
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-package.transform.js +3 -4
- package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-package.transform.js.map +1 -1
- package/src/generators/add-linting/schema.json +1 -1
- package/src/generators/application/lib/add-unit-test-runner.d.ts +1 -1
- package/src/generators/application/lib/add-unit-test-runner.js +13 -0
- package/src/generators/application/lib/add-unit-test-runner.js.map +1 -1
- package/src/generators/application/lib/normalize-options.js +3 -2
- package/src/generators/application/lib/normalize-options.js.map +1 -1
- package/src/generators/component/lib/validate-options.js +1 -2
- package/src/generators/component/lib/validate-options.js.map +1 -1
- package/src/generators/convert-to-with-mf/schema.json +1 -1
- package/src/generators/cypress-component-configuration/cypress-component-configuration.js +30 -28
- package/src/generators/cypress-component-configuration/cypress-component-configuration.js.map +1 -1
- package/src/generators/directive/lib/validate-options.js +1 -2
- package/src/generators/directive/lib/validate-options.js.map +1 -1
- package/src/generators/host/host.js +1 -0
- package/src/generators/host/host.js.map +1 -1
- package/src/generators/host/schema.json +1 -1
- package/src/generators/init/schema.json +4 -4
- package/src/generators/library/files/base/package.json__tpl__ +1 -1
- package/src/generators/library/lib/create-files.js +1 -2
- package/src/generators/library/lib/create-files.js.map +1 -1
- package/src/generators/library/lib/normalize-options.js +6 -4
- package/src/generators/library/lib/normalize-options.js.map +1 -1
- package/src/generators/library/library.js +12 -0
- package/src/generators/library/library.js.map +1 -1
- package/src/generators/move/schema.json +1 -1
- package/src/generators/ng-add/migrate-from-angular-cli.d.ts +1 -1
- package/src/generators/ng-add/migrate-from-angular-cli.js +1 -2
- package/src/generators/ng-add/migrate-from-angular-cli.js.map +1 -1
- package/src/generators/ng-add/schema.d.ts +3 -1
- package/src/generators/ng-add/schema.json +1 -1
- package/src/generators/ng-add/utilities/index.d.ts +0 -1
- package/src/generators/ng-add/utilities/index.js +0 -1
- package/src/generators/ng-add/utilities/index.js.map +1 -1
- package/src/generators/ng-add/utilities/workspace.js +11 -6
- package/src/generators/ng-add/utilities/workspace.js.map +1 -1
- package/src/generators/ngrx/lib/add-imports-to-module.js +20 -4
- package/src/generators/ngrx/lib/add-imports-to-module.js.map +1 -1
- package/src/generators/ngrx/schema.json +5 -4
- package/src/generators/ngrx-feature-store/files/base/__directory__/__fileName__.actions.ts__tmpl__ +16 -0
- package/src/generators/ngrx-feature-store/files/base/__directory__/__fileName__.effects.spec.ts__tmpl__ +37 -0
- package/src/generators/ngrx-feature-store/files/base/__directory__/__fileName__.effects.ts__tmpl__ +22 -0
- package/src/generators/ngrx-feature-store/files/base/__directory__/__fileName__.facade.spec.ts__tmpl__ +99 -0
- package/src/generators/ngrx-feature-store/files/base/__directory__/__fileName__.facade.ts__tmpl__ +27 -0
- package/src/generators/ngrx-feature-store/files/base/__directory__/__fileName__.models.ts__tmpl__ +7 -0
- package/src/generators/ngrx-feature-store/files/base/__directory__/__fileName__.reducer.spec.ts__tmpl__ +37 -0
- package/src/generators/ngrx-feature-store/files/base/__directory__/__fileName__.reducer.ts__tmpl__ +41 -0
- package/src/generators/ngrx-feature-store/files/base/__directory__/__fileName__.selectors.spec.ts__tmpl__ +58 -0
- package/src/generators/ngrx-feature-store/files/base/__directory__/__fileName__.selectors.ts__tmpl__ +38 -0
- package/src/generators/ngrx-feature-store/files/no-inject/__directory__/__fileName__.effects.ts__tmpl__ +22 -0
- package/src/generators/ngrx-feature-store/files/no-inject/__directory__/__fileName__.facade.ts__tmpl__ +27 -0
- package/src/generators/ngrx-feature-store/lib/add-exports-barrel.d.ts +3 -0
- package/src/generators/ngrx-feature-store/lib/add-exports-barrel.js +39 -0
- package/src/generators/ngrx-feature-store/lib/add-exports-barrel.js.map +1 -0
- package/src/generators/ngrx-feature-store/lib/add-imports.d.ts +3 -0
- package/src/generators/ngrx-feature-store/lib/add-imports.js +103 -0
- package/src/generators/ngrx-feature-store/lib/add-imports.js.map +1 -0
- package/src/generators/ngrx-feature-store/lib/add-ngrx-to-package-json.d.ts +3 -0
- package/src/generators/ngrx-feature-store/lib/add-ngrx-to-package-json.js +28 -0
- package/src/generators/ngrx-feature-store/lib/add-ngrx-to-package-json.js.map +1 -0
- package/src/generators/ngrx-feature-store/lib/generate-files.d.ts +3 -0
- package/src/generators/ngrx-feature-store/lib/generate-files.js +20 -0
- package/src/generators/ngrx-feature-store/lib/generate-files.js.map +1 -0
- package/src/generators/ngrx-feature-store/lib/index.d.ts +6 -0
- package/src/generators/ngrx-feature-store/lib/index.js +10 -0
- package/src/generators/ngrx-feature-store/lib/index.js.map +1 -0
- package/src/generators/ngrx-feature-store/lib/normalize-options.d.ts +7 -0
- package/src/generators/ngrx-feature-store/lib/normalize-options.js +20 -0
- package/src/generators/ngrx-feature-store/lib/normalize-options.js.map +1 -0
- package/src/generators/ngrx-feature-store/lib/validate-options.d.ts +3 -0
- package/src/generators/ngrx-feature-store/lib/validate-options.js +35 -0
- package/src/generators/ngrx-feature-store/lib/validate-options.js.map +1 -0
- package/src/generators/ngrx-feature-store/ngrx-feature-store.d.ts +5 -0
- package/src/generators/ngrx-feature-store/ngrx-feature-store.js +30 -0
- package/src/generators/ngrx-feature-store/ngrx-feature-store.js.map +1 -0
- package/src/generators/ngrx-feature-store/schema.d.ts +12 -0
- package/src/generators/ngrx-feature-store/schema.json +72 -0
- package/src/generators/ngrx-root-store/lib/add-imports.d.ts +3 -0
- package/src/generators/ngrx-root-store/lib/add-imports.js +80 -0
- package/src/generators/ngrx-root-store/lib/add-imports.js.map +1 -0
- package/src/generators/ngrx-root-store/lib/add-ngrx-to-package-json.d.ts +3 -0
- package/src/generators/ngrx-root-store/lib/add-ngrx-to-package-json.js +28 -0
- package/src/generators/ngrx-root-store/lib/add-ngrx-to-package-json.js.map +1 -0
- package/src/generators/ngrx-root-store/lib/index.d.ts +4 -0
- package/src/generators/ngrx-root-store/lib/index.js +8 -0
- package/src/generators/ngrx-root-store/lib/index.js.map +1 -0
- package/src/generators/ngrx-root-store/lib/normalize-options.d.ts +7 -0
- package/src/generators/ngrx-root-store/lib/normalize-options.js +37 -0
- package/src/generators/ngrx-root-store/lib/normalize-options.js.map +1 -0
- package/src/generators/ngrx-root-store/lib/validate-options.d.ts +3 -0
- package/src/generators/ngrx-root-store/lib/validate-options.js +33 -0
- package/src/generators/ngrx-root-store/lib/validate-options.js.map +1 -0
- package/src/generators/ngrx-root-store/ngrx-root-store.d.ts +5 -0
- package/src/generators/ngrx-root-store/ngrx-root-store.js +40 -0
- package/src/generators/ngrx-root-store/ngrx-root-store.js.map +1 -0
- package/src/generators/ngrx-root-store/schema.d.ts +10 -0
- package/src/generators/ngrx-root-store/schema.json +66 -0
- package/src/generators/pipe/lib/validate-options.js +1 -2
- package/src/generators/pipe/lib/validate-options.js.map +1 -1
- package/src/generators/remote/remote.js +1 -0
- package/src/generators/remote/remote.js.map +1 -1
- package/src/generators/remote/schema.json +1 -1
- package/src/generators/scam/lib/validate-options.js +1 -2
- package/src/generators/scam/lib/validate-options.js.map +1 -1
- package/src/generators/scam/schema.json +1 -1
- package/src/generators/scam-directive/lib/validate-options.js +1 -2
- package/src/generators/scam-directive/lib/validate-options.js.map +1 -1
- package/src/generators/scam-directive/schema.json +1 -1
- package/src/generators/scam-pipe/lib/validate-options.js +1 -2
- package/src/generators/scam-pipe/lib/validate-options.js.map +1 -1
- package/src/generators/scam-pipe/schema.json +1 -1
- package/src/generators/setup-mf/lib/add-remote-entry.js +0 -3
- package/src/generators/setup-mf/lib/add-remote-entry.js.map +1 -1
- package/src/generators/setup-mf/lib/index.d.ts +1 -0
- package/src/generators/setup-mf/lib/index.js +1 -0
- package/src/generators/setup-mf/lib/index.js.map +1 -1
- package/src/generators/setup-mf/lib/normalize-options.d.ts +3 -0
- package/src/generators/setup-mf/lib/normalize-options.js +10 -0
- package/src/generators/setup-mf/lib/normalize-options.js.map +1 -0
- package/src/generators/setup-mf/lib/remove-dead-code-from-remote.d.ts +1 -1
- package/src/generators/setup-mf/lib/remove-dead-code-from-remote.js +9 -13
- package/src/generators/setup-mf/lib/remove-dead-code-from-remote.js.map +1 -1
- package/src/generators/setup-mf/schema.d.ts +8 -1
- package/src/generators/setup-mf/setup-mf.d.ts +1 -1
- package/src/generators/setup-mf/setup-mf.js +3 -4
- package/src/generators/setup-mf/setup-mf.js.map +1 -1
- package/src/generators/utils/path.d.ts +0 -1
- package/src/generators/utils/path.js +1 -16
- package/src/generators/utils/path.js.map +1 -1
- package/src/generators/utils/project.d.ts +3 -1
- package/src/generators/utils/project.js +17 -7
- package/src/generators/utils/project.js.map +1 -1
- package/src/generators/utils/selector.js +2 -2
- package/src/generators/utils/selector.js.map +1 -1
- package/src/generators/utils/testing.js +24 -7
- package/src/generators/utils/testing.js.map +1 -1
- package/src/generators/utils/validations.d.ts +1 -0
- package/src/generators/utils/validations.js +17 -1
- package/src/generators/utils/validations.js.map +1 -1
- package/src/migrations/update-16-1-0/extract-standalone-config-from-bootstrap.js +45 -25
- package/src/migrations/update-16-1-0/extract-standalone-config-from-bootstrap.js.map +1 -1
- package/src/migrations/update-16-2-0/switch-data-persistence-operators-imports-to-ngrx-router-store.d.ts +2 -0
- package/src/migrations/update-16-2-0/switch-data-persistence-operators-imports-to-ngrx-router-store.js +124 -0
- package/src/migrations/update-16-2-0/switch-data-persistence-operators-imports-to-ngrx-router-store.js.map +1 -0
- package/src/utils/versions.d.ts +1 -1
- package/src/utils/versions.js +1 -1
- package/src/generators/cypress-component-configuration/files/cypress/support/commands.ts__tpl__ +0 -42
- package/src/generators/cypress-component-configuration/files/cypress.config.ts__tpl__ +0 -6
- package/src/generators/ng-add/utilities/normalize-options.d.ts +0 -4
- package/src/generators/ng-add/utilities/normalize-options.js +0 -30
- package/src/generators/ng-add/utilities/normalize-options.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/normalize-options.ts"],"names":[],"mappings":";;;;AAAA,uCAMoB;
|
|
1
|
+
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/normalize-options.ts"],"names":[],"mappings":"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"}
|
|
@@ -90,6 +90,18 @@ function addUnitTestRunner(host, options) {
|
|
|
90
90
|
skipFormat: true,
|
|
91
91
|
skipPackageJson: options.skipPackageJson,
|
|
92
92
|
});
|
|
93
|
+
const setupFile = (0, devkit_1.joinPathFragments)(options.projectRoot, 'src', 'test-setup.ts');
|
|
94
|
+
if (options.strict && host.exists(setupFile)) {
|
|
95
|
+
const contents = host.read(setupFile, 'utf-8');
|
|
96
|
+
host.write(setupFile, `// @ts-expect-error https://thymikee.github.io/jest-preset-angular/docs/getting-started/test-environment
|
|
97
|
+
globalThis.ngJest = {
|
|
98
|
+
testEnvironmentOptions: {
|
|
99
|
+
errorOnUnknownElements: true,
|
|
100
|
+
errorOnUnknownProperties: true,
|
|
101
|
+
},
|
|
102
|
+
};
|
|
103
|
+
${contents}`);
|
|
104
|
+
}
|
|
93
105
|
}
|
|
94
106
|
});
|
|
95
107
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/library/library.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/library/library.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
"type": "object",
|
|
8
8
|
"examples": [
|
|
9
9
|
{
|
|
10
|
-
"command": "nx g @
|
|
10
|
+
"command": "nx g @nx/angular:move --project my-feature-lib --destination shared/my-feature-lib",
|
|
11
11
|
"description": "Move libs/my-feature-lib to libs/shared/my-feature-lib."
|
|
12
12
|
}
|
|
13
13
|
],
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import type { GeneratorCallback, Tree } from '@nx/devkit';
|
|
2
2
|
import type { GeneratorOptions } from './schema';
|
|
3
|
-
export declare function migrateFromAngularCli(tree: Tree,
|
|
3
|
+
export declare function migrateFromAngularCli(tree: Tree, options: GeneratorOptions): Promise<GeneratorCallback>;
|
|
@@ -5,11 +5,10 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const devkit_1 = require("@nx/devkit");
|
|
6
6
|
const migrators_1 = require("./migrators");
|
|
7
7
|
const utilities_1 = require("./utilities");
|
|
8
|
-
function migrateFromAngularCli(tree,
|
|
8
|
+
function migrateFromAngularCli(tree, options) {
|
|
9
9
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
10
10
|
(0, utilities_1.validateWorkspace)(tree);
|
|
11
11
|
const projects = (0, utilities_1.getAllProjects)(tree);
|
|
12
|
-
const options = (0, utilities_1.normalizeOptions)(tree, rawOptions, projects);
|
|
13
12
|
const angularJson = (0, devkit_1.readJson)(tree, 'angular.json');
|
|
14
13
|
(0, utilities_1.ensureAngularDevKitPeerDependenciesAreInstalled)(tree);
|
|
15
14
|
const migrators = [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrate-from-angular-cli.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/ng-add/migrate-from-angular-cli.ts"],"names":[],"mappings":";;;;AACA,uCAAuE;AAEvE,2CAAuD;AAEvD,
|
|
1
|
+
{"version":3,"file":"migrate-from-angular-cli.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/ng-add/migrate-from-angular-cli.ts"],"names":[],"mappings":";;;;AACA,uCAAuE;AAEvE,2CAAuD;AAEvD,2CAgBqB;AAErB,SAAsB,qBAAqB,CACzC,IAAU,EACV,OAAyB;;QAEzB,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC;QACxB,MAAM,QAAQ,GAAG,IAAA,0BAAc,EAAC,IAAI,CAAC,CAAC;QAEtC,MAAM,WAAW,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAQ,CAAC;QAC1D,IAAA,2DAA+C,EAAC,IAAI,CAAC,CAAC;QAEtD,MAAM,SAAS,GAAsB;YACnC,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,uBAAW,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;YAClE,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,uBAAW,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;SACnE,CAAC;QAEF,MAAM,0BAA0B,GAAG,IAAA,yCAA6B,EAC9D,IAAI,EACJ,SAAS,CACV,CAAC;QAEF;;;;;WAKG;QACH,IAAI,YAAY,GACd,0BAA0B,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC;YAChE,CAAC,CAAC,IAAA,iBAAQ,EAAC,IAAI,EAAE,gBAAgB,CAAC;YAClC,CAAC,CAAC,SAAS,CAAC;QAEhB,kDAAkD;QAClD,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,iCACtC,IAAI,KACP,OAAO,EAAE,CAAC,EACV,OAAO,EAAE,SAAS,IAClB,CAAC,CAAC;QACJ,IAAA,wBAAY,EAAC,IAAI,EAAE,OAAO,EAAE,WAAW,CAAC,cAAc,CAAC,CAAC;QACxD,IAAA,yCAA6B,EAAC,IAAI,CAAC,CAAC;QACpC,IAAA,8BAAkB,EAAC,IAAI,CAAC,CAAC;QACzB,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC;QACxB,MAAM,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC;QAEjC,uBAAuB;QACvB,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;YAChC,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;SAC1B;QAED;;;;WAIG;QACH,IAAI,0BAA0B,CAAC,KAAK,EAAE;YACpC,IAAA,iCAAqB,EAAC,IAAI,CAAC,CAAC;SAC7B;QACD,IAAI,0BAA0B,CAAC,MAAM,EAAE;YACrC,IAAA,kCAAsB,EAAC,IAAI,EAAE,YAAY,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;YACnE,IAAA,iCAAqB,EAAC,IAAI,CAAC,CAAC;SAC7B;QAED,IAAA,yCAA6B,EAAC,IAAI,CAAC,CAAC;QACpC,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC;QAExB,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;YACxB,OAAO,GAAG,EAAE;gBACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;gBAC1B,IAAA,2BAAe,EAAC,IAAI,CAAC,CAAC;YACxB,CAAC,CAAC;SACH;IACH,CAAC;CAAA;AAtED,sDAsEC"}
|
|
@@ -3,7 +3,9 @@ import { E2eTestRunner, UnitTestRunner } from '../../utils/test-runners';
|
|
|
3
3
|
import type { Styles } from '../utils/types';
|
|
4
4
|
|
|
5
5
|
export interface GeneratorOptions {
|
|
6
|
-
|
|
6
|
+
/**
|
|
7
|
+
* @deprecated This should be inferred with {@link getNpmScope}
|
|
8
|
+
*/
|
|
7
9
|
npmScope?: string;
|
|
8
10
|
defaultBase?: string;
|
|
9
11
|
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
"npmScope": {
|
|
10
10
|
"type": "string",
|
|
11
11
|
"description": "Npm scope for importing libs. NOTE: only used if running the generator in an Angular CLI workspace.",
|
|
12
|
-
"x-
|
|
12
|
+
"x-deprecated": "This will be inferred from your root package.json"
|
|
13
13
|
},
|
|
14
14
|
"defaultBase": {
|
|
15
15
|
"type": "string",
|
|
@@ -4,7 +4,6 @@ const tslib_1 = require("tslib");
|
|
|
4
4
|
tslib_1.__exportStar(require("./dependencies"), exports);
|
|
5
5
|
tslib_1.__exportStar(require("./format-files-task"), exports);
|
|
6
6
|
tslib_1.__exportStar(require("./logger"), exports);
|
|
7
|
-
tslib_1.__exportStar(require("./normalize-options"), exports);
|
|
8
7
|
tslib_1.__exportStar(require("./projects"), exports);
|
|
9
8
|
tslib_1.__exportStar(require("./types"), exports);
|
|
10
9
|
tslib_1.__exportStar(require("./validation-logging"), exports);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/index.ts"],"names":[],"mappings":";;;AAAA,yDAA+B;AAC/B,8DAAoC;AACpC,mDAAyB;AACzB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/index.ts"],"names":[],"mappings":";;;AAAA,yDAA+B;AAC/B,8DAAoC;AACpC,mDAAyB;AACzB,qDAA2B;AAC3B,kDAAwB;AACxB,+DAAqC;AACrC,sDAA4B"}
|
|
@@ -27,11 +27,12 @@ function validateWorkspace(tree) {
|
|
|
27
27
|
exports.validateWorkspace = validateWorkspace;
|
|
28
28
|
function createNxJson(tree, options, defaultProject) {
|
|
29
29
|
var _a;
|
|
30
|
-
const { npmScope } = options;
|
|
31
30
|
const targets = getWorkspaceCommonTargets(tree);
|
|
32
|
-
(0, devkit_1.writeJson)(tree, 'nx.json',
|
|
31
|
+
(0, devkit_1.writeJson)(tree, 'nx.json', {
|
|
32
|
+
affected: {
|
|
33
33
|
defaultBase: (_a = options.defaultBase) !== null && _a !== void 0 ? _a : (0, default_base_1.deduceDefaultBase)(),
|
|
34
|
-
},
|
|
34
|
+
},
|
|
35
|
+
tasksRunnerOptions: {
|
|
35
36
|
default: {
|
|
36
37
|
runner: 'nx/tasks-runners/default',
|
|
37
38
|
options: {
|
|
@@ -43,7 +44,8 @@ function createNxJson(tree, options, defaultProject) {
|
|
|
43
44
|
].filter(Boolean),
|
|
44
45
|
},
|
|
45
46
|
},
|
|
46
|
-
},
|
|
47
|
+
},
|
|
48
|
+
namedInputs: {
|
|
47
49
|
sharedGlobals: [],
|
|
48
50
|
default: ['{projectRoot}/**/*', 'sharedGlobals'],
|
|
49
51
|
production: [
|
|
@@ -57,7 +59,8 @@ function createNxJson(tree, options, defaultProject) {
|
|
|
57
59
|
: []),
|
|
58
60
|
targets.lint ? '!{projectRoot}/.eslintrc.json' : undefined,
|
|
59
61
|
].filter(Boolean),
|
|
60
|
-
},
|
|
62
|
+
},
|
|
63
|
+
targetDefaults: {
|
|
61
64
|
build: {
|
|
62
65
|
dependsOn: ['^build'],
|
|
63
66
|
inputs: ['production', '^production'],
|
|
@@ -77,7 +80,9 @@ function createNxJson(tree, options, defaultProject) {
|
|
|
77
80
|
inputs: ['default', '^production'],
|
|
78
81
|
}
|
|
79
82
|
: undefined,
|
|
80
|
-
},
|
|
83
|
+
},
|
|
84
|
+
defaultProject,
|
|
85
|
+
});
|
|
81
86
|
}
|
|
82
87
|
exports.createNxJson = createNxJson;
|
|
83
88
|
function getWorkspaceCommonTargets(tree) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/workspace.ts"],"names":[],"mappings":";;;;AACA,uCASoB;AACpB,uCAAuD;AACvD,+BAGgB;AAChB,4DAA8D;AAC9D,wDAA4D;AAC5D,8DAA0D;AAC1D,sDAA0E;AAK1E,SAAgB,iBAAiB,CAAC,IAAU;IAC1C,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE;QAChC,MAAM,CAAC,IAAI,CAAC,6CAA6C,CAAC,CAAC;KAC5D;IACD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE;QAChC,MAAM,CAAC,IAAI,CAAC,6CAA6C,CAAC,CAAC;KAC5D;IAED,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;QAClB,OAAO;KACR;IAED,MAAM,IAAI,KAAK,CAAC;;MAEZ,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AAC7B,CAAC;AAhBD,8CAgBC;AAED,SAAgB,YAAY,CAC1B,IAAU,EACV,OAAyB,EACzB,cAAkC;;IAElC,MAAM,
|
|
1
|
+
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/workspace.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,9 +9,13 @@ const route_utils_1 = require("../../../utils/nx-devkit/route-utils");
|
|
|
9
9
|
let tsModule;
|
|
10
10
|
function addRootStoreImport(tree, isParentStandalone, route, sourceFile, parentPath, provideRootStore, storeForRoot) {
|
|
11
11
|
if (isParentStandalone) {
|
|
12
|
-
|
|
12
|
+
const parentContents = tree.read(parentPath, 'utf-8');
|
|
13
|
+
if (parentContents.includes('ApplicationConfig')) {
|
|
13
14
|
(0, ast_utils_1.addProviderToAppConfig)(tree, parentPath, provideRootStore);
|
|
14
15
|
}
|
|
16
|
+
else if (parentContents.includes('bootstrapApplication')) {
|
|
17
|
+
(0, ast_utils_1.addProviderToBootstrapApplication)(tree, parentPath, provideRootStore);
|
|
18
|
+
}
|
|
15
19
|
else {
|
|
16
20
|
(0, route_utils_1.addProviderToRoute)(tree, parentPath, route, provideRootStore);
|
|
17
21
|
}
|
|
@@ -23,9 +27,13 @@ function addRootStoreImport(tree, isParentStandalone, route, sourceFile, parentP
|
|
|
23
27
|
}
|
|
24
28
|
function addRootEffectsImport(tree, isParentStandalone, route, sourceFile, parentPath, provideRootEffects, effectsForEmptyRoot) {
|
|
25
29
|
if (isParentStandalone) {
|
|
26
|
-
|
|
30
|
+
const parentContents = tree.read(parentPath, 'utf-8');
|
|
31
|
+
if (parentContents.includes('ApplicationConfig')) {
|
|
27
32
|
(0, ast_utils_1.addProviderToAppConfig)(tree, parentPath, provideRootEffects);
|
|
28
33
|
}
|
|
34
|
+
else if (parentContents.includes('bootstrapApplication')) {
|
|
35
|
+
(0, ast_utils_1.addProviderToBootstrapApplication)(tree, parentPath, provideRootEffects);
|
|
36
|
+
}
|
|
29
37
|
else {
|
|
30
38
|
(0, route_utils_1.addProviderToRoute)(tree, parentPath, route, provideRootEffects);
|
|
31
39
|
}
|
|
@@ -41,9 +49,13 @@ function addRouterStoreImport(tree, sourceFile, addImport, parentPath, storeRout
|
|
|
41
49
|
}
|
|
42
50
|
function addStoreForFeatureImport(tree, isParentStandalone, route, sourceFile, parentPath, provideStoreForFeature, storeForFeature) {
|
|
43
51
|
if (isParentStandalone) {
|
|
44
|
-
|
|
52
|
+
const parentContents = tree.read(parentPath, 'utf-8');
|
|
53
|
+
if (parentContents.includes('ApplicationConfig')) {
|
|
45
54
|
(0, ast_utils_1.addProviderToAppConfig)(tree, parentPath, provideStoreForFeature);
|
|
46
55
|
}
|
|
56
|
+
else if (parentContents.includes('bootstrapApplication')) {
|
|
57
|
+
(0, ast_utils_1.addProviderToBootstrapApplication)(tree, parentPath, provideStoreForFeature);
|
|
58
|
+
}
|
|
47
59
|
else {
|
|
48
60
|
(0, route_utils_1.addProviderToRoute)(tree, parentPath, route, provideStoreForFeature);
|
|
49
61
|
}
|
|
@@ -55,9 +67,13 @@ function addStoreForFeatureImport(tree, isParentStandalone, route, sourceFile, p
|
|
|
55
67
|
}
|
|
56
68
|
function addEffectsForFeatureImport(tree, isParentStandalone, route, sourceFile, parentPath, provideEffectsForFeature, effectsForFeature) {
|
|
57
69
|
if (isParentStandalone) {
|
|
58
|
-
|
|
70
|
+
const parentContents = tree.read(parentPath, 'utf-8');
|
|
71
|
+
if (parentContents.includes('ApplicationConfig')) {
|
|
59
72
|
(0, ast_utils_1.addProviderToAppConfig)(tree, parentPath, provideEffectsForFeature);
|
|
60
73
|
}
|
|
74
|
+
else if (parentContents.includes('bootstrapApplication')) {
|
|
75
|
+
(0, ast_utils_1.addProviderToBootstrapApplication)(tree, parentPath, provideEffectsForFeature);
|
|
76
|
+
}
|
|
61
77
|
else {
|
|
62
78
|
(0, route_utils_1.addProviderToRoute)(tree, parentPath, route, provideEffectsForFeature);
|
|
63
79
|
}
|
|
@@ -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,uCAAmC;AACnC,+BAAsC;AACtC,qFAAiF;AAEjF,
|
|
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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"}
|
|
@@ -3,23 +3,24 @@
|
|
|
3
3
|
"$id": "NxNgrxGenerator",
|
|
4
4
|
"title": "Add NgRx support to an application or library.",
|
|
5
5
|
"description": "Adds NgRx support to an application or library.",
|
|
6
|
+
"x-deprecated": "This generator is deprecated and will be removed in a future version of Nx. Use the 'ngrx-root-store' and 'ngrx-feature-store' generators instead.",
|
|
6
7
|
"cli": "nx",
|
|
7
8
|
"type": "object",
|
|
8
9
|
"examples": [
|
|
9
10
|
{
|
|
10
|
-
"command": "nx g @
|
|
11
|
+
"command": "nx g @nx/angular:ngrx --root --parent=apps/my-app/src/app/app.module.ts --facade=false placeholder",
|
|
11
12
|
"description": "Add root ngrx configration to the `my-app` application"
|
|
12
13
|
},
|
|
13
14
|
{
|
|
14
|
-
"command": "nx g @
|
|
15
|
+
"command": "nx g @nx/angular:ngrx --parent=libs/my-lib/src/lib/my-lib.module.ts --facade=true --root=false users",
|
|
15
16
|
"description": "Add a `users` state with a facade to the `my-lib` library. It will be tracked under the default `+state` folder in the lib"
|
|
16
17
|
},
|
|
17
18
|
{
|
|
18
|
-
"command": "nx g @
|
|
19
|
+
"command": "nx g @nx/angular:ngrx --parent=apps/my-app/src/app/app.config.ts --root",
|
|
19
20
|
"description": "Add a root state configuration to `my-app` when `my-app` uses Standalone APIs"
|
|
20
21
|
},
|
|
21
22
|
{
|
|
22
|
-
"command": "nx g @
|
|
23
|
+
"command": "nx g @nx/angular:ngrx --parent=libs/my-lib/src/lib.routes.ts users",
|
|
23
24
|
"description": "Add a `users` feature state to the Route definition of a library using Standalone APIs"
|
|
24
25
|
}
|
|
25
26
|
],
|
package/src/generators/ngrx-feature-store/files/base/__directory__/__fileName__.actions.ts__tmpl__
ADDED
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { createAction, props } from '@ngrx/store';
|
|
2
|
+
import { <%= className %>Entity } from './<%= fileName %>.models';
|
|
3
|
+
|
|
4
|
+
export const init<%= className %> = createAction(
|
|
5
|
+
'[<%= className %> Page] Init'
|
|
6
|
+
);
|
|
7
|
+
|
|
8
|
+
export const load<%= className %>Success = createAction(
|
|
9
|
+
'[<%= className %>/API] Load <%= className %> Success',
|
|
10
|
+
props<{ <%= propertyName %>: <%= className %>Entity[] }>()
|
|
11
|
+
);
|
|
12
|
+
|
|
13
|
+
export const load<%= className %>Failure = createAction(
|
|
14
|
+
'[<%= className %>/API] Load <%= className %> Failure',
|
|
15
|
+
props<{ error: any }>()
|
|
16
|
+
);
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import { TestBed } from '@angular/core/testing';
|
|
2
|
+
import { provideMockActions } from '@ngrx/effects/testing';
|
|
3
|
+
import { Action } from '@ngrx/store';
|
|
4
|
+
import { provideMockStore } from '@ngrx/store/testing';
|
|
5
|
+
import { hot } from 'jasmine-marbles';
|
|
6
|
+
import { Observable } from 'rxjs';
|
|
7
|
+
|
|
8
|
+
import * as <%= className %>Actions from './<%= fileName %>.actions';
|
|
9
|
+
import { <%= className %>Effects } from './<%= fileName %>.effects';
|
|
10
|
+
|
|
11
|
+
describe('<%= className %>Effects', () => {
|
|
12
|
+
let actions: Observable<Action>;
|
|
13
|
+
let effects: <%= className %>Effects;
|
|
14
|
+
|
|
15
|
+
beforeEach(() => {
|
|
16
|
+
TestBed.configureTestingModule({
|
|
17
|
+
imports: [],
|
|
18
|
+
providers: [
|
|
19
|
+
<%= className %>Effects,
|
|
20
|
+
provideMockActions(() => actions),
|
|
21
|
+
provideMockStore()
|
|
22
|
+
],
|
|
23
|
+
});
|
|
24
|
+
|
|
25
|
+
effects = TestBed.inject(<%= className %>Effects);
|
|
26
|
+
});
|
|
27
|
+
|
|
28
|
+
describe('init$', () => {
|
|
29
|
+
it('should work', () => {
|
|
30
|
+
actions = hot('-a-|', { a: <%= className %>Actions.init<%= className %>() });
|
|
31
|
+
|
|
32
|
+
const expected = hot('-a-|', { a: <%= className %>Actions.load<%= className %>Success({ <%= propertyName %>: [] }) });
|
|
33
|
+
|
|
34
|
+
expect(effects.init$).toBeObservable(expected);
|
|
35
|
+
});
|
|
36
|
+
});
|
|
37
|
+
});
|
package/src/generators/ngrx-feature-store/files/base/__directory__/__fileName__.effects.ts__tmpl__
ADDED
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { Injectable, inject } from '@angular/core';
|
|
2
|
+
import { createEffect, Actions, ofType } from '@ngrx/effects';<% if (!importFromOperators) { %>
|
|
3
|
+
import { switchMap, catchError, of } from 'rxjs';<% } else { %>
|
|
4
|
+
import { of } from 'rxjs';
|
|
5
|
+
import { switchMap, catchError } from 'rxjs/operators';<% } %>
|
|
6
|
+
import * as <%= className %>Actions from './<%= fileName %>.actions';
|
|
7
|
+
import * as <%= className %>Feature from './<%= fileName %>.reducer';
|
|
8
|
+
|
|
9
|
+
@Injectable()
|
|
10
|
+
export class <%= className %>Effects {
|
|
11
|
+
private actions$ = inject(Actions);
|
|
12
|
+
|
|
13
|
+
init$ = createEffect(() => this.actions$.pipe(
|
|
14
|
+
ofType(<%= className %>Actions.init<%= className %>),
|
|
15
|
+
switchMap(() => of(<%= className %>Actions.load<%= className %>Success({ <%= propertyName %>: [] }))),
|
|
16
|
+
catchError((error) => {
|
|
17
|
+
console.error('Error', error);
|
|
18
|
+
return of(<%= className %>Actions.load<%= className %>Failure({ error }));
|
|
19
|
+
}
|
|
20
|
+
)
|
|
21
|
+
));
|
|
22
|
+
}
|
|
@@ -0,0 +1,99 @@
|
|
|
1
|
+
import { NgModule } from '@angular/core';
|
|
2
|
+
import { TestBed } from '@angular/core/testing';
|
|
3
|
+
import { EffectsModule } from '@ngrx/effects';
|
|
4
|
+
import { StoreModule, Store } from '@ngrx/store';
|
|
5
|
+
import { readFirst } from '@nx/angular/testing';
|
|
6
|
+
|
|
7
|
+
import * as <%= className %>Actions from './<%= fileName %>.actions';
|
|
8
|
+
import { <%= className %>Effects } from './<%= fileName %>.effects';
|
|
9
|
+
import { <%= className %>Facade } from './<%= fileName %>.facade';
|
|
10
|
+
import { <%= className %>Entity } from './<%= fileName %>.models';
|
|
11
|
+
import {
|
|
12
|
+
<%= constantName %>_FEATURE_KEY,
|
|
13
|
+
<%= className %>State,
|
|
14
|
+
initial<%= className %>State,
|
|
15
|
+
<%= propertyName %>Reducer
|
|
16
|
+
} from './<%= fileName %>.reducer';
|
|
17
|
+
import * as <%= className %>Selectors from './<%= fileName %>.selectors';
|
|
18
|
+
|
|
19
|
+
interface TestSchema {
|
|
20
|
+
<%= propertyName %>: <%= className %>State;
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
describe('<%= className %>Facade', () => {
|
|
24
|
+
let facade: <%= className %>Facade;
|
|
25
|
+
let store: Store<TestSchema>;
|
|
26
|
+
const create<%= className %>Entity = (id: string, name = ''): <%= className %>Entity => ({
|
|
27
|
+
id,
|
|
28
|
+
name: name || `name-${id}`
|
|
29
|
+
});
|
|
30
|
+
|
|
31
|
+
describe('used in NgModule', () => {
|
|
32
|
+
beforeEach(() => {
|
|
33
|
+
@NgModule({
|
|
34
|
+
imports: [
|
|
35
|
+
StoreModule.forFeature(<%= constantName %>_FEATURE_KEY, <%= propertyName %>Reducer),
|
|
36
|
+
EffectsModule.forFeature([<%= className %>Effects])
|
|
37
|
+
],
|
|
38
|
+
providers: [<%= className %>Facade]
|
|
39
|
+
})
|
|
40
|
+
class CustomFeatureModule {}
|
|
41
|
+
|
|
42
|
+
@NgModule({
|
|
43
|
+
imports: [
|
|
44
|
+
StoreModule.forRoot({}),
|
|
45
|
+
EffectsModule.forRoot([]),
|
|
46
|
+
CustomFeatureModule,
|
|
47
|
+
]
|
|
48
|
+
})
|
|
49
|
+
class RootModule {}
|
|
50
|
+
TestBed.configureTestingModule({ imports: [RootModule] });
|
|
51
|
+
|
|
52
|
+
store = TestBed.inject(Store);
|
|
53
|
+
facade = TestBed.inject(<%= className %>Facade);
|
|
54
|
+
});
|
|
55
|
+
|
|
56
|
+
/**
|
|
57
|
+
* The initially generated facade::loadAll() returns empty array
|
|
58
|
+
*/
|
|
59
|
+
it('loadAll() should return empty list with loaded == true', async () => {
|
|
60
|
+
let list = await readFirst(facade.all<%= className %>$);
|
|
61
|
+
let isLoaded = await readFirst(facade.loaded$);
|
|
62
|
+
|
|
63
|
+
expect(list.length).toBe(0);
|
|
64
|
+
expect(isLoaded).toBe(false);
|
|
65
|
+
|
|
66
|
+
facade.init();
|
|
67
|
+
|
|
68
|
+
list = await readFirst(facade.all<%= className %>$);
|
|
69
|
+
isLoaded = await readFirst(facade.loaded$);
|
|
70
|
+
|
|
71
|
+
expect(list.length).toBe(0);
|
|
72
|
+
expect(isLoaded).toBe(true);
|
|
73
|
+
});
|
|
74
|
+
|
|
75
|
+
/**
|
|
76
|
+
* Use `load<%= className %>Success` to manually update list
|
|
77
|
+
*/
|
|
78
|
+
it('all<%= className %>$ should return the loaded list; and loaded flag == true', async () => {
|
|
79
|
+
let list = await readFirst(facade.all<%= className %>$);
|
|
80
|
+
let isLoaded = await readFirst(facade.loaded$);
|
|
81
|
+
|
|
82
|
+
expect(list.length).toBe(0);
|
|
83
|
+
expect(isLoaded).toBe(false);
|
|
84
|
+
|
|
85
|
+
store.dispatch(<%= className %>Actions.load<%= className %>Success({
|
|
86
|
+
<%= propertyName %>: [
|
|
87
|
+
create<%= className %>Entity('AAA'),
|
|
88
|
+
create<%= className %>Entity('BBB')
|
|
89
|
+
]})
|
|
90
|
+
);
|
|
91
|
+
|
|
92
|
+
list = await readFirst(facade.all<%= className %>$);
|
|
93
|
+
isLoaded = await readFirst(facade.loaded$);
|
|
94
|
+
|
|
95
|
+
expect(list.length).toBe(2);
|
|
96
|
+
expect(isLoaded).toBe(true);
|
|
97
|
+
});
|
|
98
|
+
});
|
|
99
|
+
});
|
package/src/generators/ngrx-feature-store/files/base/__directory__/__fileName__.facade.ts__tmpl__
ADDED
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import { Injectable, inject } from '@angular/core';
|
|
2
|
+
import { select, Store, Action } from '@ngrx/store';
|
|
3
|
+
|
|
4
|
+
import * as <%= className %>Actions from './<%= fileName %>.actions';
|
|
5
|
+
import * as <%= className %>Feature from './<%= fileName %>.reducer';
|
|
6
|
+
import * as <%= className %>Selectors from './<%= fileName %>.selectors';
|
|
7
|
+
|
|
8
|
+
@Injectable()
|
|
9
|
+
export class <%= className %>Facade {
|
|
10
|
+
private readonly store = inject(Store);
|
|
11
|
+
|
|
12
|
+
/**
|
|
13
|
+
* Combine pieces of state using createSelector,
|
|
14
|
+
* and expose them as observables through the facade.
|
|
15
|
+
*/
|
|
16
|
+
loaded$ = this.store.pipe(select(<%= className %>Selectors.select<%= className %>Loaded));
|
|
17
|
+
all<%= className %>$ = this.store.pipe(select(<%= className %>Selectors.selectAll<%= className %>));
|
|
18
|
+
selected<%= className %>$ = this.store.pipe(select(<%= className %>Selectors.selectEntity));
|
|
19
|
+
|
|
20
|
+
/**
|
|
21
|
+
* Use the initialization action to perform one
|
|
22
|
+
* or more tasks in your Effects.
|
|
23
|
+
*/
|
|
24
|
+
init() {
|
|
25
|
+
this.store.dispatch(<%= className %>Actions.init<%= className %>());
|
|
26
|
+
}
|
|
27
|
+
}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import { Action } from '@ngrx/store';
|
|
2
|
+
|
|
3
|
+
import * as <%= className %>Actions from './<%= fileName %>.actions';
|
|
4
|
+
import { <%= className %>Entity } from './<%= fileName %>.models';
|
|
5
|
+
import { <%= className %>State, initial<%= className %>State, <%= propertyName %>Reducer } from './<%= fileName %>.reducer';
|
|
6
|
+
|
|
7
|
+
describe('<%= className %> Reducer', () => {
|
|
8
|
+
const create<%= className %>Entity = (id: string, name = ''): <%= className %>Entity => ({
|
|
9
|
+
id,
|
|
10
|
+
name: name || `name-${id}`
|
|
11
|
+
});
|
|
12
|
+
|
|
13
|
+
describe('valid <%= className %> actions', () => {
|
|
14
|
+
it('load<%= className %>Success should return the list of known <%= className %>', () => {
|
|
15
|
+
const <%= propertyName %> = [
|
|
16
|
+
create<%= className %>Entity('PRODUCT-AAA'),
|
|
17
|
+
create<%= className %>Entity('PRODUCT-zzz')
|
|
18
|
+
];
|
|
19
|
+
const action = <%= className %>Actions.load<%= className %>Success({ <%= propertyName %> });
|
|
20
|
+
|
|
21
|
+
const result: <%= className %>State = <%= propertyName %>Reducer(initial<%= className %>State, action);
|
|
22
|
+
|
|
23
|
+
expect(result.loaded).toBe(true);
|
|
24
|
+
expect(result.ids.length).toBe(2);
|
|
25
|
+
});
|
|
26
|
+
});
|
|
27
|
+
|
|
28
|
+
describe('unknown action', () => {
|
|
29
|
+
it('should return the previous state', () => {
|
|
30
|
+
const action = {} as Action;
|
|
31
|
+
|
|
32
|
+
const result = <%= propertyName %>Reducer(initial<%= className %>State, action);
|
|
33
|
+
|
|
34
|
+
expect(result).toBe(initial<%= className %>State);
|
|
35
|
+
});
|
|
36
|
+
});
|
|
37
|
+
});
|