@nx/angular 16.8.0-beta.3 → 16.8.0-beta.5

package/src/generators/ng-add/utilities/workspace.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteGitKeepFilesIfNotNeeded = exports.deleteAngularJson = exports.updateVsCodeRecommendedExtensions = exports.getWorkspaceRootFileTypesInfo = exports.createRootKarmaConfig = exports.createWorkspaceFiles = exports.cleanupEsLintPackages = exports.updateRootEsLintConfig = exports.updatePackageJson = exports.updateRootTsConfig = exports.updateWorkspaceConfigDefaults = exports.createNxJson = exports.validateWorkspace = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const linter_1 = require("@nx/linter");
 const js_1 = require("@nx/js");
@@ -27,11 +26,10 @@ function validateWorkspace(tree) {
 }
 exports.validateWorkspace = validateWorkspace;
 function createNxJson(tree, options, defaultProject) {
-    var _a;
     const targets = getWorkspaceCommonTargets(tree);
     (0, devkit_1.writeJson)(tree, 'nx.json', {
         affected: {
-            defaultBase: (_a = options.defaultBase) !== null && _a !== void 0 ? _a : (0, default_base_1.deduceDefaultBase)(),
+            defaultBase: options.defaultBase ?? (0, default_base_1.deduceDefaultBase)(),
         },
         tasksRunnerOptions: {
             default: {
@@ -93,17 +91,16 @@ function createNxJson(tree, options, defaultProject) {
 }
 exports.createNxJson = createNxJson;
 function getWorkspaceCommonTargets(tree) {
-    var _a, _b, _c;
     const targets = { e2e: false, lint: false, test: false };
     const projects = (0, devkit_1.getProjects)(tree);
     for (const [, project] of projects) {
-        if (!targets.e2e && ((_a = project.targets) === null || _a === void 0 ? void 0 : _a.e2e)) {
+        if (!targets.e2e && project.targets?.e2e) {
             targets.e2e = true;
         }
-        if (!targets.lint && ((_b = project.targets) === null || _b === void 0 ? void 0 : _b.lint)) {
+        if (!targets.lint && project.targets?.lint) {
             targets.lint = true;
         }
-        if (!targets.test && ((_c = project.targets) === null || _c === void 0 ? void 0 : _c.test)) {
+        if (!targets.test && project.targets?.test) {
             targets.test = true;
         }
         if (targets.e2e && targets.lint && targets.test) {
@@ -122,13 +119,11 @@ function updateWorkspaceConfigDefaults(tree) {
 }
 exports.updateWorkspaceConfigDefaults = updateWorkspaceConfigDefaults;
 function updateRootTsConfig(tree) {
-    var _a, _b;
-    var _c;
     const tsconfig = (0, devkit_1.readJson)(tree, (0, js_1.getRootTsConfigPathInTree)(tree));
-    (_a = (_c = tsconfig.compilerOptions).paths) !== null && _a !== void 0 ? _a : (_c.paths = {});
+    tsconfig.compilerOptions.paths ??= {};
     tsconfig.compilerOptions.baseUrl = '.';
     tsconfig.compilerOptions.rootDir = '.';
-    tsconfig.exclude = Array.from(new Set([...((_b = tsconfig.exclude) !== null && _b !== void 0 ? _b : []), 'node_modules', 'tmp']));
+    tsconfig.exclude = Array.from(new Set([...(tsconfig.exclude ?? []), 'node_modules', 'tmp']));
     (0, devkit_1.writeJson)(tree, 'tsconfig.base.json', tsconfig);
     if (tree.exists('tsconfig.json')) {
         tree.delete('tsconfig.json');
@@ -137,15 +132,14 @@ function updateRootTsConfig(tree) {
 exports.updateRootTsConfig = updateRootTsConfig;
 function updatePackageJson(tree) {
     (0, devkit_1.updateJson)(tree, 'package.json', (packageJson) => {
-        var _a, _b, _c;
-        packageJson.scripts = (_a = packageJson.scripts) !== null && _a !== void 0 ? _a : {};
+        packageJson.scripts = packageJson.scripts ?? {};
         Object.keys(packageJson.scripts).forEach((script) => {
             packageJson.scripts[script] = packageJson.scripts[script]
                 .replace(/^ng /, 'nx ')
                 .replace(/ ng /, ' nx ');
         });
-        packageJson.devDependencies = (_b = packageJson.devDependencies) !== null && _b !== void 0 ? _b : {};
-        packageJson.dependencies = (_c = packageJson.dependencies) !== null && _c !== void 0 ? _c : {};
+        packageJson.devDependencies = packageJson.devDependencies ?? {};
+        packageJson.dependencies = packageJson.dependencies ?? {};
         if (!packageJson.devDependencies['@angular/cli']) {
             packageJson.devDependencies['@angular/cli'] = versions_2.angularDevkitVersion;
         }
@@ -164,7 +158,6 @@ function updatePackageJson(tree) {
 }
 exports.updatePackageJson = updatePackageJson;
 function updateRootEsLintConfig(tree, existingEsLintConfig, unitTestRunner) {
-    var _a, _b, _c, _d;
     if (tree.exists('.eslintrc.json')) {
         /**
          * If it still exists it means that there was no project at the root of the
@@ -180,19 +173,18 @@ function updateRootEsLintConfig(tree, existingEsLintConfig, unitTestRunner) {
         return;
     }
     existingEsLintConfig.ignorePatterns = ['**/*'];
-    if (!((_a = existingEsLintConfig.plugins) !== null && _a !== void 0 ? _a : []).includes('@nrwl/nx')) {
-        existingEsLintConfig.plugins = Array.from(new Set([...((_b = existingEsLintConfig.plugins) !== null && _b !== void 0 ? _b : []), '@nx']));
+    if (!(existingEsLintConfig.plugins ?? []).includes('@nrwl/nx')) {
+        existingEsLintConfig.plugins = Array.from(new Set([...(existingEsLintConfig.plugins ?? []), '@nx']));
     }
-    (_c = existingEsLintConfig.overrides) === null || _c === void 0 ? void 0 : _c.forEach((override) => {
-        var _a;
-        if (!((_a = override.parserOptions) === null || _a === void 0 ? void 0 : _a.project)) {
+    existingEsLintConfig.overrides?.forEach((override) => {
+        if (!override.parserOptions?.project) {
             return;
         }
         delete override.parserOptions.project;
     });
     // add the @nx/enforce-module-boundaries rule
     existingEsLintConfig.overrides = [
-        ...((_d = existingEsLintConfig.overrides) !== null && _d !== void 0 ? _d : []),
+        ...(existingEsLintConfig.overrides ?? []),
         {
             files: ['*.ts', '*.tsx', '*.js', '*.jsx'],
             rules: {
@@ -214,32 +206,29 @@ function updateRootEsLintConfig(tree, existingEsLintConfig, unitTestRunner) {
 exports.updateRootEsLintConfig = updateRootEsLintConfig;
 function cleanupEsLintPackages(tree) {
     (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
-        var _a, _b, _c, _d;
-        if ((_a = json.devDependencies) === null || _a === void 0 ? void 0 : _a['@angular-eslint/builder']) {
+        if (json.devDependencies?.['@angular-eslint/builder']) {
             delete json.devDependencies['@angular-eslint/builder'];
         }
-        if ((_b = json.dependencies) === null || _b === void 0 ? void 0 : _b['@angular-eslint/builder']) {
+        if (json.dependencies?.['@angular-eslint/builder']) {
             delete json.dependencies['@angular-eslint/builder'];
         }
-        if ((_c = json.devDependencies) === null || _c === void 0 ? void 0 : _c['@angular-eslint/schematics']) {
+        if (json.devDependencies?.['@angular-eslint/schematics']) {
             delete json.devDependencies['@angular-eslint/schematics'];
         }
-        if ((_d = json.dependencies) === null || _d === void 0 ? void 0 : _d['@angular-eslint/schematics']) {
+        if (json.dependencies?.['@angular-eslint/schematics']) {
             delete json.dependencies['@angular-eslint/schematics'];
         }
         return json;
     });
 }
 exports.cleanupEsLintPackages = cleanupEsLintPackages;
-function createWorkspaceFiles(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        updateVsCodeRecommendedExtensions(tree);
-        yield (0, js_1.initGenerator)(tree, { skipFormat: true });
-        (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, '../files/root'), '.', {
-            tmpl: '',
-            dot: '.',
-            rootTsConfigPath: (0, js_1.getRootTsConfigPathInTree)(tree),
-        });
+async function createWorkspaceFiles(tree) {
+    updateVsCodeRecommendedExtensions(tree);
+    await (0, js_1.initGenerator)(tree, { skipFormat: true });
+    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, '../files/root'), '.', {
+        tmpl: '',
+        dot: '.',
+        rootTsConfigPath: (0, js_1.getRootTsConfigPathInTree)(tree),
     });
 }
 exports.createWorkspaceFiles = createWorkspaceFiles;

package/src/generators/ngrx/lib/add-imports-to-module.js

@@ -84,11 +84,10 @@ function addEffectsForFeatureImport(tree, isParentStandalone, route, sourceFile,
     return sourceFile;
 }
 function addImportsToModule(tree, options) {
-    var _a;
     if (!tsModule) {
         tsModule = (0, ensure_typescript_1.ensureTypescript)();
     }
-    const parentPath = (_a = options.module) !== null && _a !== void 0 ? _a : options.parent;
+    const parentPath = options.module ?? options.parent;
     const sourceText = tree.read(parentPath, 'utf-8');
     let sourceFile = tsModule.createSourceFile(parentPath, sourceText, tsModule.ScriptTarget.Latest, true);
     const isParentStandalone = !sourceText.includes('@NgModule');

package/src/generators/ngrx/lib/add-ngrx-to-package-json.js

@@ -5,13 +5,11 @@ const devkit_1 = require("@nx/devkit");
 const semver_1 = require("semver");
 const version_utils_1 = require("../../utils/version-utils");
 function addNgRxToPackageJson(tree, options) {
-    var _a;
-    var _b;
     const jasmineMarblesVersion = (0, semver_1.gte)(options.rxjsVersion, '7.0.0')
         ? '~0.9.1'
         : '~0.8.3';
     const ngrxVersion = (0, version_utils_1.versions)(tree).ngrxVersion;
-    (_a = (_b = process.env).npm_config_legacy_peer_deps) !== null && _a !== void 0 ? _a : (_b.npm_config_legacy_peer_deps = 'true');
+    process.env.npm_config_legacy_peer_deps ??= 'true';
     return (0, devkit_1.addDependenciesToPackageJson)(tree, {
         '@ngrx/store': ngrxVersion,
         '@ngrx/effects': ngrxVersion,

package/src/generators/ngrx/lib/generate-files.js

@@ -10,10 +10,19 @@ const version_utils_1 = require("../../utils/version-utils");
 function generateNgrxFilesFromTemplates(tree, options) {
     const name = options.name;
     const projectNames = (0, devkit_1.names)(name);
-    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files', 'base'), options.parentDirectory, Object.assign(Object.assign(Object.assign({}, options), projectNames), { importFromOperators: (0, semver_1.lt)(options.rxjsVersion, '7.2.0'), tmpl: '' }));
+    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files', 'base'), options.parentDirectory, {
+        ...options,
+        ...projectNames,
+        importFromOperators: (0, semver_1.lt)(options.rxjsVersion, '7.2.0'),
+        tmpl: '',
+    });
     const angularVersion = (0, version_utils_1.getInstalledAngularVersion)(tree);
     if ((0, semver_1.lt)(angularVersion, '14.1.0')) {
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files', 'no-inject'), options.parentDirectory, Object.assign(Object.assign(Object.assign({}, options), projectNames), { tmpl: '' }));
+        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files', 'no-inject'), options.parentDirectory, {
+            ...options,
+            ...projectNames,
+            tmpl: '',
+        });
     }
     if (!options.facade) {
         tree.delete((0, devkit_1.joinPathFragments)(options.parentDirectory, options.directory, `${projectNames.fileName}.facade.ts`));

package/src/generators/ngrx/lib/normalize-options.js

@@ -6,18 +6,23 @@ const semver_1 = require("@nx/devkit/src/utils/semver");
 const path_1 = require("path");
 const versions_1 = require("../../../utils/versions");
 function normalizeOptions(tree, options) {
-    var _a;
     let rxjsVersion;
     try {
         rxjsVersion = (0, semver_1.checkAndCleanWithSemver)('rxjs', (0, devkit_1.readJson)(tree, 'package.json').dependencies['rxjs']);
     }
-    catch (_b) {
+    catch {
         rxjsVersion = (0, semver_1.checkAndCleanWithSemver)('rxjs', versions_1.rxjsVersion);
     }
-    return Object.assign(Object.assign({}, options), { parentDirectory: options.module
+    return {
+        ...options,
+        parentDirectory: options.module
             ? (0, path_1.dirname)(options.module)
             : options.parent
                 ? (0, path_1.dirname)(options.parent)
-                : undefined, route: options.route === '' ? `''` : (_a = options.route) !== null && _a !== void 0 ? _a : `''`, directory: (0, devkit_1.names)(options.directory).fileName, rxjsVersion });
+                : undefined,
+        route: options.route === '' ? `''` : options.route ?? `''`,
+        directory: (0, devkit_1.names)(options.directory).fileName,
+        rxjsVersion,
+    };
 }
 exports.normalizeOptions = normalizeOptions;

package/src/generators/ngrx/lib/validate-options.js

@@ -5,7 +5,6 @@ const semver_1 = require("semver");
 const version_utils_1 = require("../../utils/version-utils");
 const version_utils_2 = require("../../../utils/version-utils");
 function validateOptions(tree, options) {
-    var _a, _b, _c;
     if (!options.module && !options.parent) {
         throw new Error('Please provide a value for "--parent"!');
     }
@@ -17,9 +16,10 @@ function validateOptions(tree, options) {
     }
     const angularVersionInfo = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     const intendedNgRxVersionForAngularMajor = (0, version_utils_2.getPkgVersionForAngularMajorVersion)('ngrxVersion', angularVersionInfo.major);
-    const ngrxMajorVersion = (_b = (_a = (0, version_utils_1.getInstalledPackageVersionInfo)(tree, '@ngrx/store')) === null || _a === void 0 ? void 0 : _a.major) !== null && _b !== void 0 ? _b : (0, semver_1.major)((0, semver_1.coerce)(intendedNgRxVersionForAngularMajor));
+    const ngrxMajorVersion = (0, version_utils_1.getInstalledPackageVersionInfo)(tree, '@ngrx/store')?.major ??
+        (0, semver_1.major)((0, semver_1.coerce)(intendedNgRxVersionForAngularMajor));
     if ((0, semver_1.lt)(angularVersionInfo.version, '14.1.0') || ngrxMajorVersion < 15) {
-        const parentPath = (_c = options.parent) !== null && _c !== void 0 ? _c : options.module;
+        const parentPath = options.parent ?? options.module;
         const parentContent = tree.read(parentPath, 'utf-8');
         const { tsquery } = require('@phenomnomnominal/tsquery');
         const ast = tsquery.ast(parentContent);

package/src/generators/ngrx/ngrx.js

@@ -1,29 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngrxGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const lib_1 = require("./lib");
-function ngrxGenerator(tree, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        (0, lib_1.validateOptions)(tree, schema);
-        const options = (0, lib_1.normalizeOptions)(tree, schema);
-        if (!options.minimal || !options.root) {
-            (0, lib_1.generateNgrxFilesFromTemplates)(tree, options);
-        }
-        if (!options.skipImport) {
-            (0, lib_1.addImportsToModule)(tree, options);
-            (0, lib_1.addExportsToBarrel)(tree, options);
-        }
-        let packageInstallationTask = () => { };
-        if (!options.skipPackageJson) {
-            packageInstallationTask = (0, lib_1.addNgRxToPackageJson)(tree, options);
-        }
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
-        }
-        return packageInstallationTask;
-    });
+async function ngrxGenerator(tree, schema) {
+    (0, lib_1.validateOptions)(tree, schema);
+    const options = (0, lib_1.normalizeOptions)(tree, schema);
+    if (!options.minimal || !options.root) {
+        (0, lib_1.generateNgrxFilesFromTemplates)(tree, options);
+    }
+    if (!options.skipImport) {
+        (0, lib_1.addImportsToModule)(tree, options);
+        (0, lib_1.addExportsToBarrel)(tree, options);
+    }
+    let packageInstallationTask = () => { };
+    if (!options.skipPackageJson) {
+        packageInstallationTask = (0, lib_1.addNgRxToPackageJson)(tree, options);
+    }
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+    return packageInstallationTask;
 }
 exports.ngrxGenerator = ngrxGenerator;
 exports.default = ngrxGenerator;

package/src/generators/ngrx-feature-store/files/base/__directory__/__fileName__.actions.ts__tmpl__

@@ -1,5 +1,5 @@
 import { createAction, props } from '@ngrx/store';
-import { <%= className %>Entity } from './<%= fileName %>.models';
+import { <%= className %>Entity } from './<%= relativeFileName %>.models';
 
 export const init<%= className %> = createAction(
   '[<%= className %> Page] Init'

package/src/generators/ngrx-feature-store/files/base/__directory__/__fileName__.effects.spec.ts__tmpl__

@@ -5,8 +5,8 @@ import { provideMockStore } from '@ngrx/store/testing';
 import { hot } from 'jasmine-marbles';
 import { Observable } from 'rxjs';
 
-import * as <%= className %>Actions from './<%= fileName %>.actions';
-import { <%= className %>Effects } from './<%= fileName %>.effects';
+import * as <%= className %>Actions from './<%= relativeFileName %>.actions';
+import { <%= className %>Effects } from './<%= relativeFileName %>.effects';
 
 describe('<%= className %>Effects', () => {
   let actions: Observable<Action>;

package/src/generators/ngrx-feature-store/files/base/__directory__/__fileName__.effects.ts__tmpl__

@@ -3,8 +3,8 @@ import { createEffect, Actions, ofType } from '@ngrx/effects';<% if (!importFrom
 import { switchMap, catchError, of } from 'rxjs';<% } else { %>
 import { of } from 'rxjs';
 import { switchMap, catchError } from 'rxjs/operators';<% } %>
-import * as <%= className %>Actions from './<%= fileName %>.actions';
-import * as <%= className %>Feature from './<%= fileName %>.reducer';
+import * as <%= className %>Actions from './<%= relativeFileName %>.actions';
+import * as <%= className %>Feature from './<%= relativeFileName %>.reducer';
 
 @Injectable()
 export class <%= className %>Effects {

package/src/generators/ngrx-feature-store/files/base/__directory__/__fileName__.facade.spec.ts__tmpl__

@@ -4,17 +4,17 @@ import { EffectsModule } from '@ngrx/effects';
 import { StoreModule, Store } from '@ngrx/store';
 import { readFirst } from '@nx/angular/testing';
 
-import * as <%= className %>Actions from './<%= fileName %>.actions';
-import { <%= className %>Effects } from './<%= fileName %>.effects';
-import { <%= className %>Facade } from './<%= fileName %>.facade';
-import { <%= className %>Entity } from './<%= fileName %>.models';
+import * as <%= className %>Actions from './<%= relativeFileName %>.actions';
+import { <%= className %>Effects } from './<%= relativeFileName %>.effects';
+import { <%= className %>Facade } from './<%= relativeFileName %>.facade';
+import { <%= className %>Entity } from './<%= relativeFileName %>.models';
 import {
   <%= constantName %>_FEATURE_KEY,
   <%= className %>State,
   initial<%= className %>State,
   <%= propertyName %>Reducer
-} from './<%= fileName %>.reducer';
-import * as <%= className %>Selectors from './<%= fileName %>.selectors';
+} from './<%= relativeFileName %>.reducer';
+import * as <%= className %>Selectors from './<%= relativeFileName %>.selectors';
 
 interface TestSchema {
   <%= propertyName %>: <%= className %>State;

package/src/generators/ngrx-feature-store/files/base/__directory__/__fileName__.facade.ts__tmpl__

@@ -1,9 +1,9 @@
 import { Injectable, inject } from '@angular/core';
 import { select, Store, Action } from '@ngrx/store';
 
-import * as <%= className %>Actions from './<%= fileName %>.actions';
-import * as <%= className %>Feature from './<%= fileName %>.reducer';
-import * as <%= className %>Selectors from './<%= fileName %>.selectors';
+import * as <%= className %>Actions from './<%= relativeFileName %>.actions';
+import * as <%= className %>Feature from './<%= relativeFileName %>.reducer';
+import * as <%= className %>Selectors from './<%= relativeFileName %>.selectors';
 
 @Injectable()
 export class <%= className %>Facade {

package/src/generators/ngrx-feature-store/files/base/__directory__/__fileName__.reducer.spec.ts__tmpl__

@@ -1,8 +1,8 @@
 import { Action } from '@ngrx/store';
 
-import * as <%= className %>Actions from './<%= fileName %>.actions';
-import { <%= className %>Entity } from './<%= fileName %>.models';
-import { <%= className %>State, initial<%= className %>State, <%= propertyName %>Reducer } from './<%= fileName %>.reducer';
+import * as <%= className %>Actions from './<%= relativeFileName %>.actions';
+import { <%= className %>Entity } from './<%= relativeFileName %>.models';
+import { <%= className %>State, initial<%= className %>State, <%= propertyName %>Reducer } from './<%= relativeFileName %>.reducer';
 
 describe('<%= className %> Reducer', () => {
   const create<%= className %>Entity = (id: string, name = ''): <%= className %>Entity => ({

package/src/generators/ngrx-feature-store/files/base/__directory__/__fileName__.reducer.ts__tmpl__

@@ -1,8 +1,8 @@
 import { EntityState, EntityAdapter, createEntityAdapter } from '@ngrx/entity';
 import { createReducer, on, Action } from '@ngrx/store';
 
-import * as <%= className %>Actions from './<%= fileName %>.actions';
-import { <%= className %>Entity } from './<%= fileName %>.models';
+import * as <%= className %>Actions from './<%= relativeFileName %>.actions';
+import { <%= className %>Entity } from './<%= relativeFileName %>.models';
 
 export const <%= constantName %>_FEATURE_KEY = '<%= propertyName %>';
 

package/src/generators/ngrx-feature-store/files/base/__directory__/__fileName__.selectors.spec.ts__tmpl__

@@ -1,6 +1,6 @@
-import { <%= className %>Entity } from './<%= fileName %>.models';
-import { <%= propertyName %>Adapter, <%= className %>PartialState, initial<%= className %>State } from './<%= fileName %>.reducer';
-import * as <%= className %>Selectors from './<%= fileName %>.selectors';
+import { <%= className %>Entity } from './<%= relativeFileName %>.models';
+import { <%= propertyName %>Adapter, <%= className %>PartialState, initial<%= className %>State } from './<%= relativeFileName %>.reducer';
+import * as <%= className %>Selectors from './<%= relativeFileName %>.selectors';
 
 describe('<%= className %> Selectors', () => {
   const ERROR_MSG = 'No Error Available';

package/src/generators/ngrx-feature-store/files/base/__directory__/__fileName__.selectors.ts__tmpl__

@@ -1,5 +1,5 @@
 import { createFeatureSelector, createSelector } from '@ngrx/store';
-import { <%= constantName %>_FEATURE_KEY, <%= className %>State, <%= propertyName %>Adapter } from './<%= fileName %>.reducer';
+import { <%= constantName %>_FEATURE_KEY, <%= className %>State, <%= propertyName %>Adapter } from './<%= relativeFileName %>.reducer';
 
 // Lookup the '<%= className %>' feature state managed by NgRx
 export const select<%= className %>State = createFeatureSelector<<%= className %>State>(<%= constantName %>_FEATURE_KEY);

package/src/generators/ngrx-feature-store/files/no-inject/__directory__/__fileName__.effects.ts__tmpl__

@@ -1,8 +1,8 @@
 import { Injectable } from '@angular/core';
 import { createEffect, Actions, ofType } from '@ngrx/effects';
 
-import * as <%= className %>Actions from './<%= fileName %>.actions';
-import * as <%= className %>Feature from './<%= fileName %>.reducer';
+import * as <%= className %>Actions from './<%= relativeFileName %>.actions';
+import * as <%= className %>Feature from './<%= relativeFileName %>.reducer';
 
 import {switchMap, catchError, of} from 'rxjs';
 

package/src/generators/ngrx-feature-store/files/no-inject/__directory__/__fileName__.facade.ts__tmpl__

@@ -1,9 +1,9 @@
 import { Injectable } from '@angular/core';
 import { select, Store, Action } from '@ngrx/store';
 
-import * as <%= className %>Actions from './<%= fileName %>.actions';
-import * as <%= className %>Feature from './<%= fileName %>.reducer';
-import * as <%= className %>Selectors from './<%= fileName %>.selectors';
+import * as <%= className %>Actions from './<%= relativeFileName %>.actions';
+import * as <%= className %>Feature from './<%= relativeFileName %>.reducer';
+import * as <%= className %>Selectors from './<%= relativeFileName %>.selectors';
 
 @Injectable()
 export class <%= className %>Facade {

package/src/generators/ngrx-feature-store/lib/add-exports-barrel.js

@@ -17,7 +17,10 @@ function addExportsToBarrel(tree, options) {
     let sourceFile = tsModule.createSourceFile(indexFilePath, indexSourceText, tsModule.ScriptTarget.Latest, true);
     // Public API for the feature interfaces, selectors, and facade
     const { className, fileName } = (0, devkit_1.names)(options.name);
-    const statePath = `./lib/${options.directory}/${fileName}`;
+    const fileNameWithSubdir = options.subdirectory
+        ? (0, devkit_1.joinPathFragments)(options.subdirectory, fileName)
+        : fileName;
+    const statePath = `./lib/${options.directory}/${fileNameWithSubdir}`;
     sourceFile = (0, js_1.addGlobal)(tree, sourceFile, indexFilePath, options.barrels
         ? `import * as ${className}Actions from '${statePath}.actions';`
         : `export * from '${statePath}.actions';`);

package/src/generators/ngrx-feature-store/lib/add-imports.js

@@ -54,7 +54,7 @@ function addImportsToModule(tree, options) {
     const addImport = (source, symbolName, fileName, isDefault = false) => {
         return (0, js_1.insertImport)(tree, source, parentPath, symbolName, fileName, isDefault);
     };
-    const dir = `./${(0, devkit_1.names)(options.directory).fileName}`;
+    const dir = `./${(0, devkit_1.names)(options.directory).fileName}${options.subdirectory ? `/${options.subdirectory}` : ''}`;
     const pathPrefix = `${dir}/${(0, devkit_1.names)(options.name).fileName}`;
     const reducerPath = `${pathPrefix}.reducer`;
     const effectsPath = `${pathPrefix}.effects`;

package/src/generators/ngrx-feature-store/lib/add-ngrx-to-package-json.js

@@ -5,13 +5,11 @@ const devkit_1 = require("@nx/devkit");
 const semver_1 = require("semver");
 const version_utils_1 = require("../../utils/version-utils");
 function addNgRxToPackageJson(tree, options) {
-    var _a;
-    var _b;
     const jasmineMarblesVersion = (0, semver_1.gte)(options.rxjsVersion, '7.0.0')
         ? '~0.9.1'
         : '~0.8.3';
     const ngrxVersion = (0, version_utils_1.versions)(tree).ngrxVersion;
-    (_a = (_b = process.env).npm_config_legacy_peer_deps) !== null && _a !== void 0 ? _a : (_b.npm_config_legacy_peer_deps = 'true');
+    process.env.npm_config_legacy_peer_deps ??= 'true';
     return (0, devkit_1.addDependenciesToPackageJson)(tree, {
         '@ngrx/store': ngrxVersion,
         '@ngrx/effects': ngrxVersion,

package/src/generators/ngrx-feature-store/lib/generate-files.js

@@ -6,14 +6,30 @@ const semver_1 = require("semver");
 const version_utils_1 = require("../../utils/version-utils");
 function generateFilesFromTemplates(tree, options) {
     const projectNames = (0, devkit_1.names)(options.name);
-    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files', 'base'), options.parentDirectory, Object.assign(Object.assign(Object.assign({}, options), projectNames), { importFromOperators: (0, semver_1.lt)(options.rxjsVersion, '7.2.0'), tmpl: '' }));
+    const fileName = options.subdirectory
+        ? (0, devkit_1.joinPathFragments)(options.subdirectory, projectNames.fileName)
+        : projectNames.fileName;
+    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files', 'base'), options.parentDirectory, {
+        ...options,
+        ...projectNames,
+        fileName,
+        relativeFileName: projectNames.fileName,
+        importFromOperators: (0, semver_1.lt)(options.rxjsVersion, '7.2.0'),
+        tmpl: '',
+    });
     const angularVersion = (0, version_utils_1.getInstalledAngularVersion)(tree);
     if ((0, semver_1.lt)(angularVersion, '14.1.0')) {
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files', 'no-inject'), options.parentDirectory, Object.assign(Object.assign(Object.assign({}, options), projectNames), { tmpl: '' }));
+        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files', 'no-inject'), options.parentDirectory, {
+            ...options,
+            ...projectNames,
+            fileName,
+            relativeFileName: projectNames.fileName,
+            tmpl: '',
+        });
     }
     if (!options.facade) {
-        tree.delete((0, devkit_1.joinPathFragments)(options.parentDirectory, options.directory, `${projectNames.fileName}.facade.ts`));
-        tree.delete((0, devkit_1.joinPathFragments)(options.parentDirectory, options.directory, `${projectNames.fileName}.facade.spec.ts`));
+        tree.delete((0, devkit_1.joinPathFragments)(options.parentDirectory, options.directory, `${options.subdirectory ? `${options.subdirectory}/` : ''}${projectNames.fileName}.facade.ts`));
+        tree.delete((0, devkit_1.joinPathFragments)(options.parentDirectory, options.directory, `${options.subdirectory ? `${options.subdirectory}/` : ''}${projectNames.fileName}.facade.spec.ts`));
     }
 }
 exports.generateFilesFromTemplates = generateFilesFromTemplates;

package/src/generators/ngrx-feature-store/lib/normalize-options.d.ts

@@ -2,6 +2,7 @@ import type { Tree } from '@nx/devkit';
 import type { Schema } from '../schema';
 export type NormalizedNgRxFeatureStoreGeneratorOptions = Schema & {
     parentDirectory: string;
+    subdirectory: string;
     rxjsVersion: string;
 };
 export declare function normalizeOptions(tree: Tree, options: Schema): NormalizedNgRxFeatureStoreGeneratorOptions;

package/src/generators/ngrx-feature-store/lib/normalize-options.js

@@ -6,14 +6,33 @@ const semver_1 = require("@nx/devkit/src/utils/semver");
 const path_1 = require("path");
 const versions_1 = require("../../../utils/versions");
 function normalizeOptions(tree, options) {
-    var _a;
     let rxjsVersion;
     try {
         rxjsVersion = (0, semver_1.checkAndCleanWithSemver)('rxjs', (0, devkit_1.readJson)(tree, 'package.json').dependencies['rxjs']);
     }
-    catch (_b) {
+    catch {
         rxjsVersion = (0, semver_1.checkAndCleanWithSemver)('rxjs', versions_1.rxjsVersion);
     }
-    return Object.assign(Object.assign({}, options), { parentDirectory: options.parent ? (0, path_1.dirname)(options.parent) : undefined, route: options.route === '' ? `''` : (_a = options.route) !== null && _a !== void 0 ? _a : `''`, directory: (0, devkit_1.names)(options.directory).fileName, rxjsVersion });
+    const { subdirectory, name } = determineSubdirectoryAndName(options.name);
+    return {
+        ...options,
+        name,
+        subdirectory,
+        parentDirectory: options.parent ? (0, path_1.dirname)(options.parent) : undefined,
+        route: options.route === '' ? `''` : options.route ?? `''`,
+        directory: (0, devkit_1.names)(options.directory).fileName,
+        rxjsVersion,
+    };
 }
 exports.normalizeOptions = normalizeOptions;
+function determineSubdirectoryAndName(name) {
+    if (name.includes('/')) {
+        const parts = name.split('/');
+        const storeName = parts.pop();
+        const subdirectory = (0, devkit_1.joinPathFragments)(...parts);
+        return { subdirectory, name: storeName };
+    }
+    else {
+        return { name };
+    }
+}

package/src/generators/ngrx-feature-store/lib/validate-options.js

@@ -5,7 +5,6 @@ const version_utils_1 = require("../..//utils/version-utils");
 const version_utils_2 = require("../../../utils/version-utils");
 const semver_1 = require("semver");
 function validateOptions(tree, options) {
-    var _a, _b;
     if (!options.parent) {
         throw new Error('Please provide a value for "--parent"!');
     }
@@ -14,7 +13,8 @@ function validateOptions(tree, options) {
     }
     const angularVersionInfo = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     const intendedNgRxVersionForAngularMajor = (0, version_utils_2.getPkgVersionForAngularMajorVersion)('ngrxVersion', angularVersionInfo.major);
-    const ngrxMajorVersion = (_b = (_a = (0, version_utils_1.getInstalledPackageVersionInfo)(tree, '@ngrx/store')) === null || _a === void 0 ? void 0 : _a.major) !== null && _b !== void 0 ? _b : (0, semver_1.major)((0, semver_1.coerce)(intendedNgRxVersionForAngularMajor));
+    const ngrxMajorVersion = (0, version_utils_1.getInstalledPackageVersionInfo)(tree, '@ngrx/store')?.major ??
+        (0, semver_1.major)((0, semver_1.coerce)(intendedNgRxVersionForAngularMajor));
     if ((0, semver_1.lt)(angularVersionInfo.version, '14.1.0') || ngrxMajorVersion < 15) {
         const parentContent = tree.read(options.parent, 'utf-8');
         const { tsquery } = require('@phenomnomnominal/tsquery');