@nrwl/angular 15.9.1 → 16.0.0-beta.0

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

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeOptions = void 0;
+const devkit_1 = require("@nrwl/devkit");
+const path_1 = require("../../utils/path");
+const selector_1 = require("../../utils/selector");
+function normalizeOptions(tree, options) {
+    var _a;
+    const { directory, name, path } = (0, path_1.normalizeNameAndPaths)(tree, Object.assign(Object.assign({}, options), { type: 'directive' }));
+    const { prefix } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    const selector = (_a = options.selector) !== null && _a !== void 0 ? _a : (0, selector_1.buildSelector)(tree, name, options.prefix, prefix, 'propertyName');
+    return Object.assign(Object.assign({}, options), { directory,
+        name,
+        path,
+        selector });
+}
+exports.normalizeOptions = normalizeOptions;
+//# sourceMappingURL=normalize-options.js.map

package/src/generators/directive/lib/normalize-options.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/directive/lib/normalize-options.ts"],"names":[],"mappings":";;;AACA,yCAAwD;AAExD,2CAAyD;AACzD,mDAAqD;AAGrD,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAe;;IAEf,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,IAAA,4BAAqB,EAAC,IAAI,kCACvD,OAAO,KACV,IAAI,EAAE,WAAW,IACjB,CAAC;IAEH,MAAM,EAAE,MAAM,EAAE,GAAG,IAAA,iCAAwB,EACzC,IAAI,EACJ,OAAO,CAAC,OAAO,CACe,CAAC;IAEjC,MAAM,QAAQ,GACZ,MAAA,OAAO,CAAC,QAAQ,mCAChB,IAAA,wBAAa,EAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;IAEpE,uCACK,OAAO,KACV,SAAS;QACT,IAAI;QACJ,IAAI;QACJ,QAAQ,IACR;AACJ,CAAC;AAzBD,4CAyBC"}

package/src/generators/directive/lib/validate-options.d.ts

@@ -0,0 +1,3 @@
+import type { Tree } from '@nrwl/devkit';
+import type { Schema } from '../schema';
+export declare function validateOptions(tree: Tree, options: Schema): void;

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

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateOptions = void 0;
+const path_1 = require("../../utils/path");
+const validations_1 = require("../../utils/validations");
+function validateOptions(tree, options) {
+    (0, validations_1.validateProject)(tree, options.project);
+    (0, path_1.checkPathUnderProjectRoot)(tree, options.project, options.path);
+    (0, validations_1.validateStandaloneOption)(tree, options.standalone);
+}
+exports.validateOptions = validateOptions;
+//# sourceMappingURL=validate-options.js.map

package/src/generators/directive/lib/validate-options.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"validate-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/directive/lib/validate-options.ts"],"names":[],"mappings":";;;AACA,2CAA6D;AAC7D,yDAGiC;AAGjC,SAAgB,eAAe,CAAC,IAAU,EAAE,OAAe;IACzD,IAAA,6BAAe,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IACvC,IAAA,gCAAyB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/D,IAAA,sCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;AACrD,CAAC;AAJD,0CAIC"}

package/src/generators/directive/schema.d.ts

@@ -12,3 +12,8 @@ export interface Schema {
   export?: boolean;
   skipFormat?: boolean;
 }
+
+export interface NormalizedSchema extends Schema {
+  directory: string;
+  path: string;
+}

package/src/generators/directive/schema.json

@@ -63,7 +63,7 @@
       "description": "The HTML selector to use for this directive."
     },
     "standalone": {
-      "description": "Whether the generated directive is standalone.",
+      "description": "Whether the generated directive is standalone. _Note: This is only supported in Angular versions >= 14.1.0_.",
       "type": "boolean",
       "default": false
     },

package/src/generators/host/host.js

@@ -32,7 +32,8 @@ function host(tree, options) {
                 }
             });
         }
-        const appName = (0, project_1.normalizeProjectName)(options.name, options.directory);
+        const { projectDirectory } = (0, devkit_1.extractLayoutDirectory)(options.directory);
+        const appName = (0, project_1.normalizeProjectName)(options.name, projectDirectory);
         const appInstallTask = yield (0, application_1.default)(tree, Object.assign(Object.assign({}, options), { standalone: (_a = options.standalone) !== null && _a !== void 0 ? _a : false, routing: true, port: 4200, skipFormat: true }));
         const skipE2E = !options.e2eTestRunner || options.e2eTestRunner === test_runners_1.E2eTestRunner.None;
         yield (0, setup_mf_1.setupMf)(tree, {

package/src/generators/host/host.js.map

@@ -1 +1 @@
-{"version":3,"file":"host.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/host/host.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"host.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/host/host.ts"],"names":[],"mappings":"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"}

package/src/generators/library/lib/add-project.d.ts

@@ -1,5 +1,4 @@
-import type { ProjectConfiguration, Tree } from '@nrwl/devkit';
-import { NormalizedSchema } from './normalized-schema';
-export declare function addProject(tree: Tree, libraryOptions: NormalizedSchema['libraryOptions']): ProjectConfiguration & {
-    prefix: string;
-};
+import type { Tree } from '@nrwl/devkit';
+import type { AngularProjectConfiguration } from '../../../utils/types';
+import type { NormalizedSchema } from './normalized-schema';
+export declare function addProject(tree: Tree, libraryOptions: NormalizedSchema['libraryOptions']): AngularProjectConfiguration;

package/src/generators/library/lib/add-project.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-project.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-project.ts"],"names":[],"mappings":";;;AACA,yCAA0E;AAG1E,SAAgB,UAAU,CACxB,IAAU,EACV,cAAkD;IAElD,MAAM,OAAO,GAA8C;QACzD,IAAI,EAAE,cAAc,CAAC,IAAI;QACzB,IAAI,EAAE,cAAc,CAAC,WAAW;QAChC,UAAU,EAAE,IAAA,0BAAiB,EAAC,cAAc,CAAC,WAAW,EAAE,KAAK,CAAC;QAChE,MAAM,EAAE,cAAc,CAAC,MAAM;QAC7B,IAAI,EAAE,cAAc,CAAC,UAAU;QAC/B,WAAW,EAAE,SAAS;QACtB,OAAO,EAAE;YACP,KAAK,EACH,cAAc,CAAC,SAAS,IAAI,cAAc,CAAC,WAAW;gBACpD,CAAC,CAAC;oBACE,QAAQ,EAAE,cAAc,CAAC,WAAW;wBAClC,CAAC,CAAC,uBAAuB;wBACzB,CAAC,CAAC,+BAA+B;oBACnC,OAAO,EAAE,CAAC,oCAAoC,CAAC;oBAC/C,OAAO,EAAE;wBACP,OAAO,EAAE,GAAG,cAAc,CAAC,WAAW,kBAAkB;qBACzD;oBACD,cAAc,EAAE;wBACd,UAAU,EAAE;4BACV,QAAQ,EAAE,GAAG,cAAc,CAAC,WAAW,yBAAyB;yBACjE;wBACD,WAAW,EAAE;4BACX,QAAQ,EAAE,GAAG,cAAc,CAAC,WAAW,oBAAoB;yBAC5D;qBACF;oBACD,oBAAoB,EAAE,YAAY;iBACnC;gBACH,CAAC,CAAC,SAAS;SAChB;KACF,CAAC;IAEF,IAAA,gCAAuB,EAAC,IAAI,EAAE,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC5D,OAAO,OAAO,CAAC;AACjB,CAAC;AAtCD,gCAsCC"}
+{"version":3,"file":"add-project.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-project.ts"],"names":[],"mappings":";;;AACA,yCAA0E;AAI1E,SAAgB,UAAU,CACxB,IAAU,EACV,cAAkD;IAElD,MAAM,OAAO,GAAgC;QAC3C,IAAI,EAAE,cAAc,CAAC,IAAI;QACzB,IAAI,EAAE,cAAc,CAAC,WAAW;QAChC,UAAU,EAAE,IAAA,0BAAiB,EAAC,cAAc,CAAC,WAAW,EAAE,KAAK,CAAC;QAChE,MAAM,EAAE,cAAc,CAAC,MAAM;QAC7B,IAAI,EAAE,cAAc,CAAC,UAAU;QAC/B,WAAW,EAAE,SAAS;QACtB,OAAO,EAAE;YACP,KAAK,EACH,cAAc,CAAC,SAAS,IAAI,cAAc,CAAC,WAAW;gBACpD,CAAC,CAAC;oBACE,QAAQ,EAAE,cAAc,CAAC,WAAW;wBAClC,CAAC,CAAC,uBAAuB;wBACzB,CAAC,CAAC,+BAA+B;oBACnC,OAAO,EAAE,CAAC,oCAAoC,CAAC;oBAC/C,OAAO,EAAE;wBACP,OAAO,EAAE,GAAG,cAAc,CAAC,WAAW,kBAAkB;qBACzD;oBACD,cAAc,EAAE;wBACd,UAAU,EAAE;4BACV,QAAQ,EAAE,GAAG,cAAc,CAAC,WAAW,yBAAyB;yBACjE;wBACD,WAAW,EAAE;4BACX,QAAQ,EAAE,GAAG,cAAc,CAAC,WAAW,oBAAoB;yBAC5D;qBACF;oBACD,oBAAoB,EAAE,YAAY;iBACnC;gBACH,CAAC,CAAC,SAAS;SAChB;KACF,CAAC;IAEF,IAAA,gCAAuB,EAAC,IAAI,EAAE,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC5D,OAAO,OAAO,CAAC;AACjB,CAAC;AAtCD,gCAsCC"}

package/src/generators/library/lib/create-files.d.ts

@@ -1,5 +1,4 @@
-import type { ProjectConfiguration, Tree } from '@nrwl/devkit';
-import { NormalizedSchema } from './normalized-schema';
-export declare function createFiles(tree: Tree, options: NormalizedSchema, project: ProjectConfiguration & {
-    prefix: string;
-}): void;
+import type { Tree } from '@nrwl/devkit';
+import type { AngularProjectConfiguration } from '../../../utils/types';
+import type { NormalizedSchema } from './normalized-schema';
+export declare function createFiles(tree: Tree, options: NormalizedSchema, project: AngularProjectConfiguration): void;

package/src/generators/library/lib/create-files.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createFiles = void 0;
 const devkit_1 = require("@nrwl/devkit");
-const test_runners_1 = require("../../../utils/test-runners");
 const js_1 = require("@nrwl/js");
+const test_runners_1 = require("../../../utils/test-runners");
 function createFiles(tree, options, project) {
     const { npmScope } = (0, devkit_1.getWorkspaceLayout)(tree);
     const rootOffset = (0, devkit_1.offsetFromRoot)(options.libraryOptions.projectRoot);

package/src/generators/library/lib/create-files.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/create-files.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"create-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/create-files.ts"],"names":[],"mappings":"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"}

package/src/generators/ngrx/files/{latest → base}/__directory__/__fileName__.effects.ts__tmpl__

@@ -1,11 +1,11 @@
 import { Injectable, inject } from '@angular/core';
-import { createEffect, Actions, ofType } from '@ngrx/effects';
-
+import { createEffect, Actions, ofType } from '@ngrx/effects';<% if (!importFromOperators) { %>
+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 {switchMap, catchError, of} from 'rxjs';
-
 @Injectable()
 export class <%= className %>Effects {
   private actions$ = inject(Actions);

package/src/generators/ngrx/lib/add-ngrx-to-package-json.d.ts

@@ -1,2 +1,3 @@
 import type { GeneratorCallback, Tree } from '@nrwl/devkit';
-export declare function addNgRxToPackageJson(tree: Tree): GeneratorCallback;
+import { NormalizedNgRxGeneratorOptions } from './normalize-options';
+export declare function addNgRxToPackageJson(tree: Tree, options: NormalizedNgRxGeneratorOptions): GeneratorCallback;

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

@@ -2,19 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addNgRxToPackageJson = void 0;
 const devkit_1 = require("@nrwl/devkit");
-const semver_1 = require("@nrwl/devkit/src/utils/semver");
-const semver_2 = require("semver");
-const versions_1 = require("../../../utils/versions");
+const semver_1 = require("semver");
 const version_utils_1 = require("../../utils/version-utils");
-function addNgRxToPackageJson(tree) {
-    let rxjsVersion;
-    try {
-        rxjsVersion = (0, semver_1.checkAndCleanWithSemver)('rxjs', (0, devkit_1.readJson)(tree, 'package.json').dependencies['rxjs']);
-    }
-    catch (_a) {
-        rxjsVersion = (0, semver_1.checkAndCleanWithSemver)('rxjs', versions_1.rxjsVersion);
-    }
-    const jasmineMarblesVersion = (0, semver_2.gte)(rxjsVersion, '7.0.0') ? '~0.9.1' : '~0.8.3';
+function addNgRxToPackageJson(tree, options) {
+    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;
     return (0, devkit_1.addDependenciesToPackageJson)(tree, {
         '@ngrx/store': ngrxVersion,

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

@@ -1 +1 @@
-{"version":3,"file":"add-ngrx-to-package-json.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ngrx/lib/add-ngrx-to-package-json.ts"],"names":[],"mappings":";;;AACA,yCAAsE;AACtE,0DAAwE;AACxE,mCAA6B;AAC7B,sDAA4E;AAC5E,6DAAqD;AAErD,SAAgB,oBAAoB,CAAC,IAAU;IAC7C,IAAI,WAAmB,CAAC;IACxB,IAAI;QACF,WAAW,GAAG,IAAA,gCAAuB,EACnC,MAAM,EACN,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,CACpD,CAAC;KACH;IAAC,WAAM;QACN,WAAW,GAAG,IAAA,gCAAuB,EAAC,MAAM,EAAE,sBAAkB,CAAC,CAAC;KACnE;IAED,MAAM,qBAAqB,GAAG,IAAA,YAAG,EAAC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC;IAC9E,MAAM,WAAW,GAAG,IAAA,wBAAQ,EAAC,IAAI,CAAC,CAAC,WAAW,CAAC;IAE/C,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ;QACE,aAAa,EAAE,WAAW;QAC1B,eAAe,EAAE,WAAW;QAC5B,cAAc,EAAE,WAAW;QAC3B,oBAAoB,EAAE,WAAW;QACjC,uBAAuB,EAAE,WAAW;KACrC,EACD;QACE,kBAAkB,EAAE,WAAW;QAC/B,sBAAsB,EAAE,WAAW;QACnC,iBAAiB,EAAE,qBAAqB;KACzC,CACF,CAAC;AACJ,CAAC;AA7BD,oDA6BC"}
+{"version":3,"file":"add-ngrx-to-package-json.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ngrx/lib/add-ngrx-to-package-json.ts"],"names":[],"mappings":";;;AACA,yCAA4D;AAC5D,mCAA6B;AAC7B,6DAAqD;AAGrD,SAAgB,oBAAoB,CAClC,IAAU,EACV,OAAuC;IAEvC,MAAM,qBAAqB,GAAG,IAAA,YAAG,EAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC;QAC7D,CAAC,CAAC,QAAQ;QACV,CAAC,CAAC,QAAQ,CAAC;IACb,MAAM,WAAW,GAAG,IAAA,wBAAQ,EAAC,IAAI,CAAC,CAAC,WAAW,CAAC;IAE/C,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ;QACE,aAAa,EAAE,WAAW;QAC1B,eAAe,EAAE,WAAW;QAC5B,cAAc,EAAE,WAAW;QAC3B,oBAAoB,EAAE,WAAW;QACjC,uBAAuB,EAAE,WAAW;KACrC,EACD;QACE,kBAAkB,EAAE,WAAW;QAC/B,sBAAsB,EAAE,WAAW;QACnC,iBAAiB,EAAE,qBAAqB;KACzC,CACF,CAAC;AACJ,CAAC;AAxBD,oDAwBC"}

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

@@ -10,7 +10,7 @@ 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', 'latest'), options.parentDirectory, Object.assign(Object.assign(Object.assign({}, options), projectNames), { tmpl: '' }));
+    (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 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: '' }));

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

@@ -1 +1 @@
-{"version":3,"file":"generate-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ngrx/lib/generate-files.ts"],"names":[],"mappings":";;;AACA,yCAAuE;AACvE,mCAA4B;AAC5B,6DAAuE;AAGvE;;GAEG;AACH,SAAgB,8BAA8B,CAC5C,IAAU,EACV,OAAuC;IAEvC,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAC1B,MAAM,YAAY,GAAG,IAAA,cAAK,EAAC,IAAI,CAAC,CAAC;IAEjC,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,EACrD,OAAO,CAAC,eAAe,gDAElB,OAAO,GACP,YAAY,KACf,IAAI,EAAE,EAAE,IAEX,CAAC;IAEF,MAAM,cAAc,GAAG,IAAA,0CAA0B,EAAC,IAAI,CAAC,CAAC;IACxD,IAAI,IAAA,WAAE,EAAC,cAAc,EAAE,QAAQ,CAAC,EAAE;QAChC,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,CAAC,EACxD,OAAO,CAAC,eAAe,gDAElB,OAAO,GACP,YAAY,KACf,IAAI,EAAE,EAAE,IAEX,CAAC;KACH;IAED,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;QACnB,IAAI,CAAC,MAAM,CACT,IAAA,0BAAiB,EACf,OAAO,CAAC,eAAe,EACvB,OAAO,CAAC,SAAS,EACjB,GAAG,YAAY,CAAC,QAAQ,YAAY,CACrC,CACF,CAAC;QACF,IAAI,CAAC,MAAM,CACT,IAAA,0BAAiB,EACf,OAAO,CAAC,eAAe,EACvB,OAAO,CAAC,SAAS,EACjB,GAAG,YAAY,CAAC,QAAQ,iBAAiB,CAC1C,CACF,CAAC;KACH;AACH,CAAC;AAhDD,wEAgDC"}
+{"version":3,"file":"generate-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ngrx/lib/generate-files.ts"],"names":[],"mappings":";;;AACA,yCAAuE;AACvE,mCAA4B;AAC5B,6DAAuE;AAGvE;;GAEG;AACH,SAAgB,8BAA8B,CAC5C,IAAU,EACV,OAAuC;IAEvC,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAC1B,MAAM,YAAY,GAAG,IAAA,cAAK,EAAC,IAAI,CAAC,CAAC;IAEjC,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,EACnD,OAAO,CAAC,eAAe,gDAElB,OAAO,GACP,YAAY,KACf,mBAAmB,EAAE,IAAA,WAAE,EAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,EACrD,IAAI,EAAE,EAAE,IAEX,CAAC;IAEF,MAAM,cAAc,GAAG,IAAA,0CAA0B,EAAC,IAAI,CAAC,CAAC;IACxD,IAAI,IAAA,WAAE,EAAC,cAAc,EAAE,QAAQ,CAAC,EAAE;QAChC,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,CAAC,EACxD,OAAO,CAAC,eAAe,gDAElB,OAAO,GACP,YAAY,KACf,IAAI,EAAE,EAAE,IAEX,CAAC;KACH;IAED,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;QACnB,IAAI,CAAC,MAAM,CACT,IAAA,0BAAiB,EACf,OAAO,CAAC,eAAe,EACvB,OAAO,CAAC,SAAS,EACjB,GAAG,YAAY,CAAC,QAAQ,YAAY,CACrC,CACF,CAAC;QACF,IAAI,CAAC,MAAM,CACT,IAAA,0BAAiB,EACf,OAAO,CAAC,eAAe,EACvB,OAAO,CAAC,SAAS,EACjB,GAAG,YAAY,CAAC,QAAQ,iBAAiB,CAC1C,CACF,CAAC;KACH;AACH,CAAC;AAjDD,wEAiDC"}

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

@@ -1,5 +1,7 @@
+import { Tree } from '@nrwl/devkit';
 import type { NgRxGeneratorOptions } from '../schema';
 export type NormalizedNgRxGeneratorOptions = NgRxGeneratorOptions & {
     parentDirectory: string;
+    rxjsVersion: string;
 };
-export declare function normalizeOptions(options: NgRxGeneratorOptions): NormalizedNgRxGeneratorOptions;
+export declare function normalizeOptions(tree: Tree, options: NgRxGeneratorOptions): NormalizedNgRxGeneratorOptions;

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

@@ -2,14 +2,23 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
 const devkit_1 = require("@nrwl/devkit");
+const semver_1 = require("@nrwl/devkit/src/utils/semver");
 const path_1 = require("path");
-function normalizeOptions(options) {
+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) {
+        rxjsVersion = (0, semver_1.checkAndCleanWithSemver)('rxjs', versions_1.rxjsVersion);
+    }
     return Object.assign(Object.assign({}, 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 });
+                : undefined, route: options.route === '' ? `''` : (_a = options.route) !== null && _a !== void 0 ? _a : `''`, directory: (0, devkit_1.names)(options.directory).fileName, rxjsVersion });
 }
 exports.normalizeOptions = normalizeOptions;
 //# sourceMappingURL=normalize-options.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ngrx/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,yCAAqC;AAErC,+BAA+B;AAM/B,SAAgB,gBAAgB,CAC9B,OAA6B;;IAE7B,uCACK,OAAO,KACV,eAAe,EAAE,OAAO,CAAC,MAAM;YAC7B,CAAC,CAAC,IAAA,cAAO,EAAC,OAAO,CAAC,MAAM,CAAC;YACzB,CAAC,CAAC,OAAO,CAAC,MAAM;gBAChB,CAAC,CAAC,IAAA,cAAO,EAAC,OAAO,CAAC,MAAM,CAAC;gBACzB,CAAC,CAAC,SAAS,EACb,KAAK,EAAE,OAAO,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAA,OAAO,CAAC,KAAK,mCAAI,IAAI,EAC1D,SAAS,EAAE,IAAA,cAAK,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,IAC5C;AACJ,CAAC;AAbD,4CAaC"}
+{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ngrx/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,yCAAqD;AACrD,0DAAwE;AACxE,+BAA+B;AAC/B,sDAA4E;AAQ5E,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAA6B;;IAE7B,IAAI,WAAmB,CAAC;IACxB,IAAI;QACF,WAAW,GAAG,IAAA,gCAAuB,EACnC,MAAM,EACN,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,CACpD,CAAC;KACH;IAAC,WAAM;QACN,WAAW,GAAG,IAAA,gCAAuB,EAAC,MAAM,EAAE,sBAAkB,CAAC,CAAC;KACnE;IAED,uCACK,OAAO,KACV,eAAe,EAAE,OAAO,CAAC,MAAM;YAC7B,CAAC,CAAC,IAAA,cAAO,EAAC,OAAO,CAAC,MAAM,CAAC;YACzB,CAAC,CAAC,OAAO,CAAC,MAAM;gBAChB,CAAC,CAAC,IAAA,cAAO,EAAC,OAAO,CAAC,MAAM,CAAC;gBACzB,CAAC,CAAC,SAAS,EACb,KAAK,EAAE,OAAO,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAA,OAAO,CAAC,KAAK,mCAAI,IAAI,EAC1D,SAAS,EAAE,IAAA,cAAK,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,EAC5C,WAAW,IACX;AACJ,CAAC;AAzBD,4CAyBC"}

package/src/generators/ngrx/ngrx.js

@@ -7,7 +7,7 @@ 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)(schema);
+        const options = (0, lib_1.normalizeOptions)(tree, schema);
         if (!options.minimal || !options.root) {
             (0, lib_1.generateNgrxFilesFromTemplates)(tree, options);
         }
@@ -17,7 +17,7 @@ function ngrxGenerator(tree, schema) {
         }
         let packageInstallationTask = () => { };
         if (!options.skipPackageJson) {
-            packageInstallationTask = (0, lib_1.addNgRxToPackageJson)(tree);
+            packageInstallationTask = (0, lib_1.addNgRxToPackageJson)(tree, options);
         }
         if (!options.skipFormat) {
             yield (0, devkit_1.formatFiles)(tree);

package/src/generators/ngrx/ngrx.js.map

@@ -1 +1 @@
-{"version":3,"file":"ngrx.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/ngrx/ngrx.ts"],"names":[],"mappings":";;;;AACA,yCAA2C;AAC3C,+BAOe;AAGf,SAAsB,aAAa,CACjC,IAAU,EACV,MAA4B;;QAE5B,IAAA,qBAAe,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC9B,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,MAAM,CAAC,CAAC;QAEzC,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;YACrC,IAAA,oCAA8B,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAC/C;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,IAAA,wBAAkB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAClC,IAAA,wBAAkB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACnC;QAED,IAAI,uBAAuB,GAAsB,GAAG,EAAE,GAAE,CAAC,CAAC;QAC1D,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;YAC5B,uBAAuB,GAAG,IAAA,0BAAoB,EAAC,IAAI,CAAC,CAAC;SACtD;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,uBAAuB,CAAC;IACjC,CAAC;CAAA;AA1BD,sCA0BC;AAED,kBAAe,aAAa,CAAC"}
+{"version":3,"file":"ngrx.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/ngrx/ngrx.ts"],"names":[],"mappings":";;;;AACA,yCAA2C;AAC3C,+BAOe;AAGf,SAAsB,aAAa,CACjC,IAAU,EACV,MAA4B;;QAE5B,IAAA,qBAAe,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC9B,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE/C,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;YACrC,IAAA,oCAA8B,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAC/C;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,IAAA,wBAAkB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAClC,IAAA,wBAAkB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACnC;QAED,IAAI,uBAAuB,GAAsB,GAAG,EAAE,GAAE,CAAC,CAAC;QAC1D,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;YAC5B,uBAAuB,GAAG,IAAA,0BAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAC/D;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,uBAAuB,CAAC;IACjC,CAAC;CAAA;AA1BD,sCA0BC;AAED,kBAAe,aAAa,CAAC"}

package/src/generators/pipe/lib/index.d.ts

@@ -0,0 +1,2 @@
+export * from './normalize-options';
+export * from './validate-options';

package/src/generators/pipe/lib/index.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./normalize-options"), exports);
+tslib_1.__exportStar(require("./validate-options"), exports);
+//# sourceMappingURL=index.js.map

package/src/generators/pipe/lib/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/pipe/lib/index.ts"],"names":[],"mappings":";;;AAAA,8DAAoC;AACpC,6DAAmC"}

package/src/generators/pipe/lib/normalize-options.d.ts

@@ -0,0 +1,3 @@
+import type { Tree } from '@nrwl/devkit';
+import type { NormalizedSchema, Schema } from '../schema';
+export declare function normalizeOptions(tree: Tree, options: Schema): NormalizedSchema;

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

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeOptions = void 0;
+const path_1 = require("../../utils/path");
+function normalizeOptions(tree, options) {
+    const { directory, name, path } = (0, path_1.normalizeNameAndPaths)(tree, Object.assign(Object.assign({}, options), { type: 'pipe' }));
+    return Object.assign(Object.assign({}, options), { directory,
+        name,
+        path });
+}
+exports.normalizeOptions = normalizeOptions;
+//# sourceMappingURL=normalize-options.js.map

package/src/generators/pipe/lib/normalize-options.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/pipe/lib/normalize-options.ts"],"names":[],"mappings":";;;AACA,2CAAyD;AAGzD,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAe;IAEf,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,IAAA,4BAAqB,EAAC,IAAI,kCACvD,OAAO,KACV,IAAI,EAAE,MAAM,IACZ,CAAC;IAEH,uCACK,OAAO,KACV,SAAS;QACT,IAAI;QACJ,IAAI,IACJ;AACJ,CAAC;AAfD,4CAeC"}

package/src/generators/pipe/lib/validate-options.d.ts

@@ -0,0 +1,3 @@
+import type { Tree } from '@nrwl/devkit';
+import type { Schema } from '../schema';
+export declare function validateOptions(tree: Tree, options: Schema): void;

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

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateOptions = void 0;
+const path_1 = require("../../utils/path");
+const validations_1 = require("../../utils/validations");
+function validateOptions(tree, options) {
+    (0, validations_1.validateProject)(tree, options.project);
+    (0, path_1.checkPathUnderProjectRoot)(tree, options.project, options.path);
+    (0, validations_1.validateStandaloneOption)(tree, options.standalone);
+}
+exports.validateOptions = validateOptions;
+//# sourceMappingURL=validate-options.js.map

package/src/generators/pipe/lib/validate-options.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"validate-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/pipe/lib/validate-options.ts"],"names":[],"mappings":";;;AACA,2CAA6D;AAC7D,yDAGiC;AAGjC,SAAgB,eAAe,CAAC,IAAU,EAAE,OAAe;IACzD,IAAA,6BAAe,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IACvC,IAAA,gCAAyB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/D,IAAA,sCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;AACrD,CAAC;AAJD,0CAIC"}

package/src/generators/pipe/pipe.d.ts

@@ -1,4 +1,4 @@
 import type { Tree } from '@nrwl/devkit';
 import type { Schema } from './schema';
-export declare function pipeGenerator(tree: Tree, schema: Schema): Promise<void>;
+export declare function pipeGenerator(tree: Tree, rawOptions: Schema): Promise<void>;
 export default pipeGenerator;

package/src/generators/pipe/pipe.js

@@ -3,39 +3,29 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.pipeGenerator = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
-const path_1 = require("../utils/path");
 const utils_1 = require("../utils");
-let tsModule;
-function pipeGenerator(tree, schema) {
-    var _a;
+const lib_1 = require("./lib");
+function pipeGenerator(tree, rawOptions) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projects = (0, devkit_1.getProjects)(tree);
-        if (!projects.has(schema.project)) {
-            throw new Error(`Project "${schema.project}" does not exist!`);
-        }
-        (0, path_1.checkPathUnderProjectRoot)(tree, schema.project, schema.path);
-        const project = (0, devkit_1.readProjectConfiguration)(tree, schema.project);
-        const path = (_a = schema.path) !== null && _a !== void 0 ? _a : `${project.sourceRoot}`;
-        const pipeNames = (0, devkit_1.names)(schema.name);
-        const pathToGenerateFiles = schema.flat
-            ? './files/__pipeFileName__'
-            : './files';
-        yield (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, pathToGenerateFiles), path, {
+        (0, lib_1.validateOptions)(tree, rawOptions);
+        const options = (0, lib_1.normalizeOptions)(tree, rawOptions);
+        const pipeNames = (0, devkit_1.names)(options.name);
+        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), options.directory, {
             pipeClassName: pipeNames.className,
             pipeFileName: pipeNames.fileName,
             pipePropertyName: pipeNames.propertyName,
-            standalone: schema.standalone,
+            standalone: options.standalone,
             tpl: '',
         });
-        if (schema.skipTests) {
-            const pathToSpecFile = (0, devkit_1.joinPathFragments)(path, `${!schema.flat ? `${pipeNames.fileName}/` : ``}${pipeNames.fileName}.pipe.spec.ts`);
+        if (options.skipTests) {
+            const pathToSpecFile = (0, devkit_1.joinPathFragments)(options.directory, `${pipeNames.fileName}.pipe.spec.ts`);
             tree.delete(pathToSpecFile);
         }
-        if (!schema.skipImport && !schema.standalone) {
-            const modulePath = (0, utils_1.findModule)(tree, path, schema.module);
-            (0, utils_1.addToNgModule)(tree, path, modulePath, pipeNames.fileName, `${pipeNames.className}Pipe`, `${pipeNames.fileName}.pipe`, 'declarations', schema.flat, schema.export);
+        if (!options.skipImport && !options.standalone) {
+            const modulePath = (0, utils_1.findModule)(tree, options.path, options.module);
+            (0, utils_1.addToNgModule)(tree, options.path, modulePath, pipeNames.fileName, `${pipeNames.className}Pipe`, `${pipeNames.fileName}.pipe`, 'declarations', options.flat, options.export);
         }
-        if (!schema.skipFormat) {
+        if (!options.skipFormat) {
             yield (0, devkit_1.formatFiles)(tree);
         }
     });

package/src/generators/pipe/pipe.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipe.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/pipe/pipe.ts"],"names":[],"mappings":";;;;AACA,yCAOsB;AAEtB,wCAA0D;AAC1D,oCAAqD;AAErD,IAAI,QAAqC,CAAC;AAE1C,SAAsB,aAAa,CAAC,IAAU,EAAE,MAAc;;;QAC5D,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACnC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE;YACjC,MAAM,IAAI,KAAK,CAAC,YAAY,MAAM,CAAC,OAAO,mBAAmB,CAAC,CAAC;SAChE;QAED,IAAA,gCAAyB,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QAE7D,MAAM,OAAO,GAAG,IAAA,iCAAwB,EACtC,IAAI,EACJ,MAAM,CAAC,OAAO,CAC+B,CAAC;QAEhD,MAAM,IAAI,GAAG,MAAA,MAAM,CAAC,IAAI,mCAAI,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;QACpD,MAAM,SAAS,GAAG,IAAA,cAAK,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAErC,MAAM,mBAAmB,GAAG,MAAM,CAAC,IAAI;YACrC,CAAC,CAAC,0BAA0B;YAC5B,CAAC,CAAC,SAAS,CAAC;QACd,MAAM,IAAA,sBAAa,EACjB,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,mBAAmB,CAAC,EACjD,IAAI,EACJ;YACE,aAAa,EAAE,SAAS,CAAC,SAAS;YAClC,YAAY,EAAE,SAAS,CAAC,QAAQ;YAChC,gBAAgB,EAAE,SAAS,CAAC,YAAY;YACxC,UAAU,EAAE,MAAM,CAAC,UAAU;YAC7B,GAAG,EAAE,EAAE;SACR,CACF,CAAC;QAEF,IAAI,MAAM,CAAC,SAAS,EAAE;YACpB,MAAM,cAAc,GAAG,IAAA,0BAAiB,EACtC,IAAI,EACJ,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,EAAE,GAC7C,SAAS,CAAC,QACZ,eAAe,CAChB,CAAC;YAEF,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;SAC7B;QAED,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YAC5C,MAAM,UAAU,GAAG,IAAA,kBAAU,EAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;YACzD,IAAA,qBAAa,EACX,IAAI,EACJ,IAAI,EACJ,UAAU,EACV,SAAS,CAAC,QAAQ,EAClB,GAAG,SAAS,CAAC,SAAS,MAAM,EAC5B,GAAG,SAAS,CAAC,QAAQ,OAAO,EAC5B,cAAc,EACd,MAAM,CAAC,IAAI,EACX,MAAM,CAAC,MAAM,CACd,CAAC;SACH;QAED,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YACtB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;;CACF;AA7DD,sCA6DC;AAED,kBAAe,aAAa,CAAC"}
+{"version":3,"file":"pipe.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/pipe/pipe.ts"],"names":[],"mappings":";;;;AACA,yCAKsB;AACtB,oCAAqD;AACrD,+BAA0D;AAG1D,SAAsB,aAAa,CAAC,IAAU,EAAE,UAAkB;;QAChE,IAAA,qBAAe,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAClC,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAEnD,MAAM,SAAS,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAEtC,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,EACrC,OAAO,CAAC,SAAS,EACjB;YACE,aAAa,EAAE,SAAS,CAAC,SAAS;YAClC,YAAY,EAAE,SAAS,CAAC,QAAQ;YAChC,gBAAgB,EAAE,SAAS,CAAC,YAAY;YACxC,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,GAAG,EAAE,EAAE;SACR,CACF,CAAC;QAEF,IAAI,OAAO,CAAC,SAAS,EAAE;YACrB,MAAM,cAAc,GAAG,IAAA,0BAAiB,EACtC,OAAO,CAAC,SAAS,EACjB,GAAG,SAAS,CAAC,QAAQ,eAAe,CACrC,CAAC;YAEF,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;SAC7B;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YAC9C,MAAM,UAAU,GAAG,IAAA,kBAAU,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;YAClE,IAAA,qBAAa,EACX,IAAI,EACJ,OAAO,CAAC,IAAI,EACZ,UAAU,EACV,SAAS,CAAC,QAAQ,EAClB,GAAG,SAAS,CAAC,SAAS,MAAM,EAC5B,GAAG,SAAS,CAAC,QAAQ,OAAO,EAC5B,cAAc,EACd,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,MAAM,CACf,CAAC;SACH;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;IACH,CAAC;CAAA;AA9CD,sCA8CC;AAED,kBAAe,aAAa,CAAC"}

package/src/generators/pipe/schema.d.ts

@@ -10,3 +10,8 @@ export interface Schema {
   export?: boolean;
   skipFormat?: boolean;
 }
+
+export interface NormalizedSchema extends Schema {
+  directory: string;
+  path: string;
+}

package/src/generators/pipe/schema.json

@@ -49,7 +49,7 @@
       "description": "Do not import this pipe into the owning NgModule."
     },
     "standalone": {
-      "description": "Whether the generated pipe is standalone.",
+      "description": "Whether the generated pipe is standalone. _Note: This is only supported in Angular versions >= 14.1.0_.",
       "type": "boolean",
       "default": false
     },

package/src/generators/remote/remote.js

@@ -22,7 +22,8 @@ function remote(tree, options) {
         if (options.host && !projects.has(options.host)) {
             throw new Error(`The name of the application to be used as the host app does not exist. (${options.host})`);
         }
-        const appName = (0, project_1.normalizeProjectName)(options.name, options.directory);
+        const { projectDirectory } = (0, devkit_1.extractLayoutDirectory)(options.directory);
+        const appName = (0, project_1.normalizeProjectName)(options.name, projectDirectory);
         const port = (_a = options.port) !== null && _a !== void 0 ? _a : (0, lib_1.findNextAvailablePort)(tree);
         const appInstallTask = yield (0, application_1.default)(tree, Object.assign(Object.assign({}, options), { standalone: (_b = options.standalone) !== null && _b !== void 0 ? _b : false, routing: true, port, skipFormat: true }));
         const skipE2E = !options.e2eTestRunner || options.e2eTestRunner === test_runners_1.E2eTestRunner.None;

package/src/generators/remote/remote.js.map

@@ -1 +1 @@
-{"version":3,"file":"remote.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/remote/remote.ts"],"names":[],"mappings":";;;;AAAA,yCAMsB;AAEtB,4DAA8D;AAC9D,8CAAwD;AACxD,mDAA+C;AAC/C,2DAAyD;AACzD,+BAAsD;AAEtD,0DAAwE;AACxE,mCAA4B;AAE5B,SAAsB,MAAM,CAAC,IAAU,EAAE,OAAe;;;QACtD,MAAM,2BAA2B,GAAG,IAAA,8CAA8B,EAAC,IAAI,CAAC,CAAC;QAEzE,IAAI,IAAA,WAAE,EAAC,2BAA2B,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,OAAO,CAAC,UAAU,EAAE;YAC3E,MAAM,IAAI,KAAK,CAAC,IAAA,qBAAY,EAAA,2FAA2F,2BAA2B,CAAC,OAAO;sGACxD,CAAC,CAAC;SACrG;QAED,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACnC,IAAI,OAAO,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAC/C,MAAM,IAAI,KAAK,CACb,2EAA2E,OAAO,CAAC,IAAI,GAAG,CAC3F,CAAC;SACH;QAED,MAAM,OAAO,GAAG,IAAA,8BAAoB,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;QACtE,MAAM,IAAI,GAAG,MAAA,OAAO,CAAC,IAAI,mCAAI,IAAA,2BAAqB,EAAC,IAAI,CAAC,CAAC;QAEzD,MAAM,cAAc,GAAG,MAAM,IAAA,qBAAoB,EAAC,IAAI,kCACjD,OAAO,KACV,UAAU,EAAE,MAAA,OAAO,CAAC,UAAU,mCAAI,KAAK,EACvC,OAAO,EAAE,IAAI,EACb,IAAI,EACJ,UAAU,EAAE,IAAI,IAChB,CAAC;QAEH,MAAM,OAAO,GACX,CAAC,OAAO,CAAC,aAAa,IAAI,OAAO,CAAC,aAAa,KAAK,4BAAa,CAAC,IAAI,CAAC;QAEzE,MAAM,IAAA,kBAAO,EAAC,IAAI,EAAE;YAClB,OAAO;YACP,MAAM,EAAE,QAAQ;YAChB,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,IAAI;YACJ,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,UAAU,EAAE,IAAI;YAChB,OAAO;YACP,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,OAAO,MAAM;YACtD,UAAU,EAAE,OAAO,CAAC,UAAU;SAC/B,CAAC,CAAC;QAEH,IAAI,YAAY,GAAG,CAAC,cAAc,CAAC,CAAC;QACpC,IAAI,OAAO,CAAC,GAAG,EAAE;YACf,IAAI,cAAc,GAAG,MAAM,IAAA,YAAM,EAAC,IAAI,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;YAC3D,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;SACnC;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,yBAAgB,EAAC,GAAG,YAAY,CAAC,CAAC;;CAC1C;AArDD,wBAqDC;AAED,kBAAe,MAAM,CAAC"}
+{"version":3,"file":"remote.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/remote/remote.ts"],"names":[],"mappings":";;;;AAAA,yCAOsB;AAEtB,4DAA8D;AAC9D,8CAAwD;AACxD,mDAA+C;AAC/C,2DAAyD;AACzD,+BAAsD;AAEtD,0DAAwE;AACxE,mCAA4B;AAE5B,SAAsB,MAAM,CAAC,IAAU,EAAE,OAAe;;;QACtD,MAAM,2BAA2B,GAAG,IAAA,8CAA8B,EAAC,IAAI,CAAC,CAAC;QAEzE,IAAI,IAAA,WAAE,EAAC,2BAA2B,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,OAAO,CAAC,UAAU,EAAE;YAC3E,MAAM,IAAI,KAAK,CAAC,IAAA,qBAAY,EAAA,2FAA2F,2BAA2B,CAAC,OAAO;sGACxD,CAAC,CAAC;SACrG;QAED,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACnC,IAAI,OAAO,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAC/C,MAAM,IAAI,KAAK,CACb,2EAA2E,OAAO,CAAC,IAAI,GAAG,CAC3F,CAAC;SACH;QAED,MAAM,EAAE,gBAAgB,EAAE,GAAG,IAAA,+BAAsB,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACvE,MAAM,OAAO,GAAG,IAAA,8BAAoB,EAAC,OAAO,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QACrE,MAAM,IAAI,GAAG,MAAA,OAAO,CAAC,IAAI,mCAAI,IAAA,2BAAqB,EAAC,IAAI,CAAC,CAAC;QAEzD,MAAM,cAAc,GAAG,MAAM,IAAA,qBAAoB,EAAC,IAAI,kCACjD,OAAO,KACV,UAAU,EAAE,MAAA,OAAO,CAAC,UAAU,mCAAI,KAAK,EACvC,OAAO,EAAE,IAAI,EACb,IAAI,EACJ,UAAU,EAAE,IAAI,IAChB,CAAC;QAEH,MAAM,OAAO,GACX,CAAC,OAAO,CAAC,aAAa,IAAI,OAAO,CAAC,aAAa,KAAK,4BAAa,CAAC,IAAI,CAAC;QAEzE,MAAM,IAAA,kBAAO,EAAC,IAAI,EAAE;YAClB,OAAO;YACP,MAAM,EAAE,QAAQ;YAChB,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,IAAI;YACJ,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,UAAU,EAAE,IAAI;YAChB,OAAO;YACP,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,OAAO,MAAM;YACtD,UAAU,EAAE,OAAO,CAAC,UAAU;SAC/B,CAAC,CAAC;QAEH,IAAI,YAAY,GAAG,CAAC,cAAc,CAAC,CAAC;QACpC,IAAI,OAAO,CAAC,GAAG,EAAE;YACf,IAAI,cAAc,GAAG,MAAM,IAAA,YAAM,EAAC,IAAI,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;YAC3D,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;SACnC;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,yBAAgB,EAAC,GAAG,YAAY,CAAC,CAAC;;CAC1C;AAtDD,wBAsDC;AAED,kBAAe,MAAM,CAAC"}

package/src/generators/scam/lib/convert-component-to-scam.d.ts

@@ -1,4 +1,3 @@
 import type { Tree } from '@nrwl/devkit';
-import type { FileInfo } from '../../utils/file-info';
 import type { NormalizedSchema } from '../schema';
-export declare function convertComponentToScam(tree: Tree, componentFileInfo: FileInfo, options: NormalizedSchema): void;
+export declare function convertComponentToScam(tree: Tree, options: NormalizedSchema): void;

package/src/generators/scam/lib/convert-component-to-scam.js

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertComponentToScam = void 0;
 const devkit_1 = require("@nrwl/devkit");
-const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
 const js_1 = require("@nrwl/js");
+const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
 let tsModule;
-function convertComponentToScam(tree, componentFileInfo, options) {
+function convertComponentToScam(tree, options) {
     var _a;
-    if (!tree.exists(componentFileInfo.filePath)) {
-        throw new Error(`Couldn't find component at path ${componentFileInfo.filePath} to add SCAM setup.`);
+    if (!tree.exists(options.filePath)) {
+        throw new Error(`Couldn't find component at path ${options.filePath} to add SCAM setup.`);
     }
     const componentNames = (0, devkit_1.names)(options.name);
     const typeNames = (0, devkit_1.names)((_a = options.type) !== null && _a !== void 0 ? _a : 'component');
@@ -17,17 +17,17 @@ function convertComponentToScam(tree, componentFileInfo, options) {
         tsModule = (0, ensure_typescript_1.ensureTypescript)();
     }
     if (options.inlineScam) {
-        const currentComponentContents = tree.read(componentFileInfo.filePath, 'utf-8');
-        let source = tsModule.createSourceFile(componentFileInfo.filePath, currentComponentContents, tsModule.ScriptTarget.Latest, true);
-        source = (0, js_1.insertImport)(tree, source, componentFileInfo.filePath, 'NgModule', '@angular/core');
-        source = (0, js_1.insertImport)(tree, source, componentFileInfo.filePath, 'CommonModule', '@angular/common');
+        const currentComponentContents = tree.read(options.filePath, 'utf-8');
+        let source = tsModule.createSourceFile(options.filePath, currentComponentContents, tsModule.ScriptTarget.Latest, true);
+        source = (0, js_1.insertImport)(tree, source, options.filePath, 'NgModule', '@angular/core');
+        source = (0, js_1.insertImport)(tree, source, options.filePath, 'CommonModule', '@angular/common');
         let updatedComponentSource = source.getText();
         updatedComponentSource = `${updatedComponentSource}${getNgModuleDeclaration(componentClassName)}`;
-        tree.write(componentFileInfo.filePath, updatedComponentSource);
+        tree.write(options.filePath, updatedComponentSource);
         return;
     }
-    const moduleFilePath = (0, devkit_1.joinPathFragments)(componentFileInfo.directory, `${componentNames.fileName}.module.ts`);
-    tree.write(moduleFilePath, getModuleFileContent(componentClassName, componentFileInfo.fileName));
+    const moduleFilePath = (0, devkit_1.joinPathFragments)(options.directory, `${componentNames.fileName}.module.ts`);
+    tree.write(moduleFilePath, getModuleFileContent(componentClassName, options.fileName));
 }
 exports.convertComponentToScam = convertComponentToScam;
 function getModuleFileContent(componentClassName, componentFileName) {

package/src/generators/scam/lib/convert-component-to-scam.js.map

@@ -1 +1 @@
-{"version":3,"file":"convert-component-to-scam.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam/lib/convert-component-to-scam.ts"],"names":[],"mappings":";;;AACA,yCAAwD;AACxD,uFAAmF;AACnF,iCAAwC;AAIxC,IAAI,QAAqC,CAAC;AAE1C,SAAgB,sBAAsB,CACpC,IAAU,EACV,iBAA2B,EAC3B,OAAyB;;IAEzB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE;QAC5C,MAAM,IAAI,KAAK,CACb,mCAAmC,iBAAiB,CAAC,QAAQ,qBAAqB,CACnF,CAAC;KACH;IAED,MAAM,cAAc,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3C,MAAM,SAAS,GAAG,IAAA,cAAK,EAAC,MAAA,OAAO,CAAC,IAAI,mCAAI,WAAW,CAAC,CAAC;IACrD,MAAM,kBAAkB,GAAG,GAAG,cAAc,CAAC,SAAS,GAAG,SAAS,CAAC,SAAS,EAAE,CAAC;IAE/E,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IAED,IAAI,OAAO,CAAC,UAAU,EAAE;QACtB,MAAM,wBAAwB,GAAG,IAAI,CAAC,IAAI,CACxC,iBAAiB,CAAC,QAAQ,EAC1B,OAAO,CACR,CAAC;QACF,IAAI,MAAM,GAAG,QAAQ,CAAC,gBAAgB,CACpC,iBAAiB,CAAC,QAAQ,EAC1B,wBAAwB,EACxB,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;QAEF,MAAM,GAAG,IAAA,iBAAY,EACnB,IAAI,EACJ,MAAM,EACN,iBAAiB,CAAC,QAAQ,EAC1B,UAAU,EACV,eAAe,CAChB,CAAC;QACF,MAAM,GAAG,IAAA,iBAAY,EACnB,IAAI,EACJ,MAAM,EACN,iBAAiB,CAAC,QAAQ,EAC1B,cAAc,EACd,iBAAiB,CAClB,CAAC;QAEF,IAAI,sBAAsB,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;QAC9C,sBAAsB,GAAG,GAAG,sBAAsB,GAAG,sBAAsB,CACzE,kBAAkB,CACnB,EAAE,CAAC;QAEJ,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,QAAQ,EAAE,sBAAsB,CAAC,CAAC;QAC/D,OAAO;KACR;IAED,MAAM,cAAc,GAAG,IAAA,0BAAiB,EACtC,iBAAiB,CAAC,SAAS,EAC3B,GAAG,cAAc,CAAC,QAAQ,YAAY,CACvC,CAAC;IAEF,IAAI,CAAC,KAAK,CACR,cAAc,EACd,oBAAoB,CAAC,kBAAkB,EAAE,iBAAiB,CAAC,QAAQ,CAAC,CACrE,CAAC;AACJ,CAAC;AAhED,wDAgEC;AAED,SAAS,oBAAoB,CAC3B,kBAA0B,EAC1B,iBAAyB;IAEzB,OAAO;;WAEE,kBAAkB,cAAc,iBAAiB;EAC1D,sBAAsB,CAAC,kBAAkB,CAAC,EAAE,CAAC;AAC/C,CAAC;AAED,SAAS,sBAAsB,CAAC,kBAA0B;IACxD,OAAO;;;mBAGU,kBAAkB;cACvB,kBAAkB;;eAEjB,kBAAkB,WAAW,CAAC;AAC7C,CAAC"}
+{"version":3,"file":"convert-component-to-scam.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam/lib/convert-component-to-scam.ts"],"names":[],"mappings":";;;AACA,yCAAwD;AACxD,iCAAwC;AACxC,uFAAmF;AAGnF,IAAI,QAAqC,CAAC;AAE1C,SAAgB,sBAAsB,CAAC,IAAU,EAAE,OAAyB;;IAC1E,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;QAClC,MAAM,IAAI,KAAK,CACb,mCAAmC,OAAO,CAAC,QAAQ,qBAAqB,CACzE,CAAC;KACH;IAED,MAAM,cAAc,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3C,MAAM,SAAS,GAAG,IAAA,cAAK,EAAC,MAAA,OAAO,CAAC,IAAI,mCAAI,WAAW,CAAC,CAAC;IACrD,MAAM,kBAAkB,GAAG,GAAG,cAAc,CAAC,SAAS,GAAG,SAAS,CAAC,SAAS,EAAE,CAAC;IAE/E,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IAED,IAAI,OAAO,CAAC,UAAU,EAAE;QACtB,MAAM,wBAAwB,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACtE,IAAI,MAAM,GAAG,QAAQ,CAAC,gBAAgB,CACpC,OAAO,CAAC,QAAQ,EAChB,wBAAwB,EACxB,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;QAEF,MAAM,GAAG,IAAA,iBAAY,EACnB,IAAI,EACJ,MAAM,EACN,OAAO,CAAC,QAAQ,EAChB,UAAU,EACV,eAAe,CAChB,CAAC;QACF,MAAM,GAAG,IAAA,iBAAY,EACnB,IAAI,EACJ,MAAM,EACN,OAAO,CAAC,QAAQ,EAChB,cAAc,EACd,iBAAiB,CAClB,CAAC;QAEF,IAAI,sBAAsB,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;QAC9C,sBAAsB,GAAG,GAAG,sBAAsB,GAAG,sBAAsB,CACzE,kBAAkB,CACnB,EAAE,CAAC;QAEJ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,sBAAsB,CAAC,CAAC;QACrD,OAAO;KACR;IAED,MAAM,cAAc,GAAG,IAAA,0BAAiB,EACtC,OAAO,CAAC,SAAS,EACjB,GAAG,cAAc,CAAC,QAAQ,YAAY,CACvC,CAAC;IAEF,IAAI,CAAC,KAAK,CACR,cAAc,EACd,oBAAoB,CAAC,kBAAkB,EAAE,OAAO,CAAC,QAAQ,CAAC,CAC3D,CAAC;AACJ,CAAC;AAzDD,wDAyDC;AAED,SAAS,oBAAoB,CAC3B,kBAA0B,EAC1B,iBAAyB;IAEzB,OAAO;;WAEE,kBAAkB,cAAc,iBAAiB;EAC1D,sBAAsB,CAAC,kBAAkB,CAAC,EAAE,CAAC;AAC/C,CAAC;AAED,SAAS,sBAAsB,CAAC,kBAA0B;IACxD,OAAO;;;mBAGU,kBAAkB;cACvB,kBAAkB;;eAEjB,kBAAkB,WAAW,CAAC;AAC7C,CAAC"}

package/src/generators/scam/lib/index.d.ts

@@ -1,2 +1,3 @@
 export * from './convert-component-to-scam';
 export * from './normalize-options';
+export * from './validate-options';

package/src/generators/scam/lib/index.js

@@ -3,4 +3,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./convert-component-to-scam"), exports);
 tslib_1.__exportStar(require("./normalize-options"), exports);
+tslib_1.__exportStar(require("./validate-options"), exports);
 //# sourceMappingURL=index.js.map

package/src/generators/scam/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam/lib/index.ts"],"names":[],"mappings":";;;AAAA,sEAA4C;AAC5C,8DAAoC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam/lib/index.ts"],"names":[],"mappings":";;;AAAA,sEAA4C;AAC5C,8DAAoC;AACpC,6DAAmC"}

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

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
-const devkit_1 = require("@nrwl/devkit");
+const path_1 = require("../../utils/path");
 function normalizeOptions(tree, options) {
     var _a, _b, _c;
-    const { projectType, root, sourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    const projectSourceRoot = sourceRoot !== null && sourceRoot !== void 0 ? sourceRoot : (0, devkit_1.joinPathFragments)(root, 'src');
-    const path = (_a = options.path) !== null && _a !== void 0 ? _a : (0, devkit_1.joinPathFragments)(projectSourceRoot, projectType === 'application' ? 'app' : 'lib');
-    return Object.assign(Object.assign({}, options), { export: (_b = options.export) !== null && _b !== void 0 ? _b : true, inlineScam: (_c = options.inlineScam) !== null && _c !== void 0 ? _c : true, path,
-        projectSourceRoot });
+    const { directory, fileName, filePath, name } = (0, path_1.normalizeNameAndPaths)(tree, Object.assign(Object.assign({}, options), { type: (_a = options.type) !== null && _a !== void 0 ? _a : 'component' }));
+    return Object.assign(Object.assign({}, options), { export: (_b = options.export) !== null && _b !== void 0 ? _b : true, inlineScam: (_c = options.inlineScam) !== null && _c !== void 0 ? _c : true, directory,
+        fileName,
+        filePath,
+        name });
 }
 exports.normalizeOptions = normalizeOptions;
 //# sourceMappingURL=normalize-options.js.map