@nrwl/angular 15.9.1 → 16.0.0-beta.0

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

@@ -1 +1 @@
-{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam/lib/normalize-options.ts"],"names":[],"mappings":";;;AACA,yCAA2E;AAG3E,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAe;;IAEf,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,IAAA,iCAAwB,EAChE,IAAI,EACJ,OAAO,CAAC,OAAO,CAChB,CAAC;IACF,MAAM,iBAAiB,GAAG,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,IAAA,0BAAiB,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACvE,MAAM,IAAI,GACR,MAAA,OAAO,CAAC,IAAI,mCACZ,IAAA,0BAAiB,EACf,iBAAiB,EACjB,WAAW,KAAK,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAC9C,CAAC;IAEJ,uCACK,OAAO,KACV,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,IAAI,EAC9B,UAAU,EAAE,MAAA,OAAO,CAAC,UAAU,mCAAI,IAAI,EACtC,IAAI;QACJ,iBAAiB,IACjB;AACJ,CAAC;AAvBD,4CAuBC"}
+{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam/lib/normalize-options.ts"],"names":[],"mappings":";;;AACA,2CAAyD;AAGzD,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAe;;IAEf,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,IAAA,4BAAqB,EAAC,IAAI,kCACrE,OAAO,KACV,IAAI,EAAE,MAAA,OAAO,CAAC,IAAI,mCAAI,WAAW,IACjC,CAAC;IAEH,uCACK,OAAO,KACV,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,IAAI,EAC9B,UAAU,EAAE,MAAA,OAAO,CAAC,UAAU,mCAAI,IAAI,EACtC,SAAS;QACT,QAAQ;QACR,QAAQ;QACR,IAAI,IACJ;AACJ,CAAC;AAlBD,4CAkBC"}

package/src/generators/scam/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/scam/lib/validate-options.js

@@ -0,0 +1,11 @@
+"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);
+}
+exports.validateOptions = validateOptions;
+//# sourceMappingURL=validate-options.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"validate-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam/lib/validate-options.ts"],"names":[],"mappings":";;;AACA,2CAA6D;AAC7D,yDAA0D;AAG1D,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;AACjE,CAAC;AAHD,0CAGC"}

package/src/generators/scam/scam.js

@@ -3,37 +3,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.scamGenerator = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
+const component_1 = require("../component/component");
 const export_scam_1 = require("../utils/export-scam");
-const file_info_1 = require("../utils/file-info");
-const path_1 = require("../utils/path");
 const lib_1 = require("./lib");
 function scamGenerator(tree, rawOptions) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        (0, lib_1.validateOptions)(tree, rawOptions);
+        const { inlineScam } = rawOptions, generatorOptions = tslib_1.__rest(rawOptions, ["inlineScam"]);
+        yield (0, component_1.componentGenerator)(tree, Object.assign(Object.assign({}, generatorOptions), { skipImport: true, export: false, standalone: false, skipFormat: true }));
         const options = (0, lib_1.normalizeOptions)(tree, rawOptions);
-        const { inlineScam, projectSourceRoot } = options, schematicOptions = tslib_1.__rest(options, ["inlineScam", "projectSourceRoot"]);
-        checkPathUnderProjectRoot(tree, options);
-        const { wrapAngularDevkitSchematic } = require('@nrwl/devkit/ngcli-adapter');
-        const angularComponentSchematic = wrapAngularDevkitSchematic('@schematics/angular', 'component');
-        yield angularComponentSchematic(tree, Object.assign(Object.assign({}, schematicOptions), { skipImport: true, export: false, standalone: false }));
-        const componentFileInfo = (0, file_info_1.getComponentFileInfo)(tree, options);
-        (0, lib_1.convertComponentToScam)(tree, componentFileInfo, options);
-        (0, export_scam_1.exportScam)(tree, componentFileInfo, options);
-        yield (0, devkit_1.formatFiles)(tree);
+        (0, lib_1.convertComponentToScam)(tree, options);
+        (0, export_scam_1.exportScam)(tree, options);
+        if (!options.skipFormat) {
+            yield (0, devkit_1.formatFiles)(tree);
+        }
     });
 }
 exports.scamGenerator = scamGenerator;
-function checkPathUnderProjectRoot(tree, options) {
-    if (!options.path) {
-        return;
-    }
-    const { root } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    let pathToComponent = (0, devkit_1.normalizePath)(options.path);
-    pathToComponent = pathToComponent.startsWith('/')
-        ? pathToComponent.slice(1)
-        : pathToComponent;
-    if (!(0, path_1.pathStartsWith)(pathToComponent, root)) {
-        throw new Error(`The path provided for the SCAM (${options.path}) does not exist under the project root (${root}).`);
-    }
-}
 exports.default = scamGenerator;
 //# sourceMappingURL=scam.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"scam.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/scam/scam.ts"],"names":[],"mappings":";;;;AACA,yCAKsB;AACtB,sDAAkD;AAClD,kDAA0D;AAC1D,wCAA+C;AAC/C,+BAAiE;AAGjE,SAAsB,aAAa,CAAC,IAAU,EAAE,UAAkB;;QAChE,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACnD,MAAM,EAAE,UAAU,EAAE,iBAAiB,KAA0B,OAAO,EAA5B,gBAAgB,kBAAK,OAAO,EAAhE,mCAAsD,CAAU,CAAC;QAEvE,yBAAyB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEzC,MAAM,EAAE,0BAA0B,EAAE,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;QAC7E,MAAM,yBAAyB,GAAG,0BAA0B,CAC1D,qBAAqB,EACrB,WAAW,CACZ,CAAC;QACF,MAAM,yBAAyB,CAAC,IAAI,kCAC/B,gBAAgB,KACnB,UAAU,EAAE,IAAI,EAChB,MAAM,EAAE,KAAK,EACb,UAAU,EAAE,KAAK,IACjB,CAAC;QAEH,MAAM,iBAAiB,GAAG,IAAA,gCAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC9D,IAAA,4BAAsB,EAAC,IAAI,EAAE,iBAAiB,EAAE,OAAO,CAAC,CAAC;QACzD,IAAA,wBAAU,EAAC,IAAI,EAAE,iBAAiB,EAAE,OAAO,CAAC,CAAC;QAE7C,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAvBD,sCAuBC;AAED,SAAS,yBAAyB,CAAC,IAAU,EAAE,OAAwB;IACrE,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;QACjB,OAAO;KACR;IAED,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAEjE,IAAI,eAAe,GAAG,IAAA,sBAAa,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAClD,eAAe,GAAG,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC;QAC/C,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;QAC1B,CAAC,CAAC,eAAe,CAAC;IAEpB,IAAI,CAAC,IAAA,qBAAc,EAAC,eAAe,EAAE,IAAI,CAAC,EAAE;QAC1C,MAAM,IAAI,KAAK,CACb,mCAAmC,OAAO,CAAC,IAAI,4CAA4C,IAAI,IAAI,CACpG,CAAC;KACH;AACH,CAAC;AAED,kBAAe,aAAa,CAAC"}
+{"version":3,"file":"scam.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/scam/scam.ts"],"names":[],"mappings":";;;;AACA,yCAA2C;AAC3C,sDAA4D;AAC5D,sDAAkD;AAClD,+BAIe;AAGf,SAAsB,aAAa,CAAC,IAAU,EAAE,UAAkB;;QAChE,IAAA,qBAAe,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAElC,MAAM,EAAE,UAAU,KAA0B,UAAU,EAA/B,gBAAgB,kBAAK,UAAU,EAAhD,cAAmC,CAAa,CAAC;QACvD,MAAM,IAAA,8BAAkB,EAAC,IAAI,kCACxB,gBAAgB,KACnB,UAAU,EAAE,IAAI,EAChB,MAAM,EAAE,KAAK,EACb,UAAU,EAAE,KAAK,EACjB,UAAU,EAAE,IAAI,IAChB,CAAC;QAEH,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACnD,IAAA,4BAAsB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACtC,IAAA,wBAAU,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE1B,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;IACH,CAAC;CAAA;AAnBD,sCAmBC;AAED,kBAAe,aAAa,CAAC"}

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

@@ -16,11 +16,13 @@ export interface Schema {
   selector?: string;
   skipSelector?: boolean;
   export?: boolean;
+  skipFormat?: boolean;
 }
 
 export interface NormalizedSchema extends Schema {
+  directory: string;
+  fileName: string;
+  filePath: string;
   export: boolean;
   inlineScam: boolean;
-  path: string;
-  projectSourceRoot: string;
 }

package/src/generators/scam/schema.json

@@ -123,6 +123,12 @@
       "description": "Specifies if the SCAM should be exported from the project's entry point (normally `index.ts`). It only applies to libraries.",
       "default": true,
       "x-priority": "important"
+    },
+    "skipFormat": {
+      "type": "boolean",
+      "description": "Skip formatting files.",
+      "default": false,
+      "x-priority": "internal"
     }
   },
   "required": ["name", "project"]

package/src/generators/scam-directive/lib/convert-directive-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 convertDirectiveToScam(tree: Tree, directiveFileInfo: FileInfo, options: NormalizedSchema): void;
+export declare function convertDirectiveToScam(tree: Tree, options: NormalizedSchema): void;

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

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertDirectiveToScam = 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 convertDirectiveToScam(tree, directiveFileInfo, options) {
-    if (!tree.exists(directiveFileInfo.filePath)) {
-        throw new Error(`Couldn't find directive at path ${directiveFileInfo.filePath} to add SCAM setup.`);
+function convertDirectiveToScam(tree, options) {
+    if (!tree.exists(options.filePath)) {
+        throw new Error(`Couldn't find directive at path ${options.filePath} to add SCAM setup.`);
     }
     if (!tsModule) {
         tsModule = (0, ensure_typescript_1.ensureTypescript)();
@@ -16,17 +16,17 @@ function convertDirectiveToScam(tree, directiveFileInfo, options) {
     const typeNames = (0, devkit_1.names)('directive');
     const directiveClassName = `${directiveNames.className}${typeNames.className}`;
     if (options.inlineScam) {
-        const currentDirectiveContents = tree.read(directiveFileInfo.filePath, 'utf-8');
-        let source = tsModule.createSourceFile(directiveFileInfo.filePath, currentDirectiveContents, tsModule.ScriptTarget.Latest, true);
-        source = (0, js_1.insertImport)(tree, source, directiveFileInfo.filePath, 'NgModule', '@angular/core');
-        source = (0, js_1.insertImport)(tree, source, directiveFileInfo.filePath, 'CommonModule', '@angular/common');
+        const currentDirectiveContents = tree.read(options.filePath, 'utf-8');
+        let source = tsModule.createSourceFile(options.filePath, currentDirectiveContents, 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 updatedDirectiveSource = source.getText();
         updatedDirectiveSource = `${updatedDirectiveSource}${getNgModuleDeclaration(directiveClassName)}`;
-        tree.write(directiveFileInfo.filePath, updatedDirectiveSource);
+        tree.write(options.filePath, updatedDirectiveSource);
         return;
     }
-    const scamFilePath = (0, devkit_1.joinPathFragments)(directiveFileInfo.directory, `${directiveNames.fileName}.module.ts`);
-    tree.write(scamFilePath, getModuleFileContent(directiveClassName, directiveFileInfo.fileName));
+    const scamFilePath = (0, devkit_1.joinPathFragments)(options.directory, `${directiveNames.fileName}.module.ts`);
+    tree.write(scamFilePath, getModuleFileContent(directiveClassName, options.fileName));
 }
 exports.convertDirectiveToScam = convertDirectiveToScam;
 function getModuleFileContent(directiveClassName, directiveFileName) {

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

@@ -1 +1 @@
-{"version":3,"file":"convert-directive-to-scam.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam-directive/lib/convert-directive-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;IACD,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IAED,MAAM,cAAc,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3C,MAAM,SAAS,GAAG,IAAA,cAAK,EAAC,WAAW,CAAC,CAAC;IACrC,MAAM,kBAAkB,GAAG,GAAG,cAAc,CAAC,SAAS,GAAG,SAAS,CAAC,SAAS,EAAE,CAAC;IAE/E,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,YAAY,GAAG,IAAA,0BAAiB,EACpC,iBAAiB,CAAC,SAAS,EAC3B,GAAG,cAAc,CAAC,QAAQ,YAAY,CACvC,CAAC;IAEF,IAAI,CAAC,KAAK,CACR,YAAY,EACZ,oBAAoB,CAAC,kBAAkB,EAAE,iBAAiB,CAAC,QAAQ,CAAC,CACrE,CAAC;AACJ,CAAC;AA/DD,wDA+DC;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-directive-to-scam.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam-directive/lib/convert-directive-to-scam.ts"],"names":[],"mappings":";;;AACA,yCAAwD;AACxD,iCAAwC;AACxC,uFAAmF;AAGnF,IAAI,QAAqC,CAAC;AAE1C,SAAgB,sBAAsB,CACpC,IAAU,EACV,OAAyB;IAEzB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;QAClC,MAAM,IAAI,KAAK,CACb,mCAAmC,OAAO,CAAC,QAAQ,qBAAqB,CACzE,CAAC;KACH;IACD,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IAED,MAAM,cAAc,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3C,MAAM,SAAS,GAAG,IAAA,cAAK,EAAC,WAAW,CAAC,CAAC;IACrC,MAAM,kBAAkB,GAAG,GAAG,cAAc,CAAC,SAAS,GAAG,SAAS,CAAC,SAAS,EAAE,CAAC;IAE/E,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,YAAY,GAAG,IAAA,0BAAiB,EACpC,OAAO,CAAC,SAAS,EACjB,GAAG,cAAc,CAAC,QAAQ,YAAY,CACvC,CAAC;IAEF,IAAI,CAAC,KAAK,CACR,YAAY,EACZ,oBAAoB,CAAC,kBAAkB,EAAE,OAAO,CAAC,QAAQ,CAAC,CAC3D,CAAC;AACJ,CAAC;AA3DD,wDA2DC;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-directive/lib/index.d.ts

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

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

@@ -3,4 +3,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./convert-directive-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-directive/lib/index.js.map

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

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

@@ -1,14 +1,15 @@
 "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, _d;
-    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, flat: (_c = options.flat) !== null && _c !== void 0 ? _c : true, inlineScam: (_d = options.inlineScam) !== null && _d !== void 0 ? _d : true, path,
-        projectSourceRoot });
+    var _a, _b, _c;
+    const { directory, fileName, filePath, name, path } = (0, path_1.normalizeNameAndPaths)(tree, Object.assign(Object.assign({}, options), { type: 'directive' }));
+    return Object.assign(Object.assign({}, options), { export: (_a = options.export) !== null && _a !== void 0 ? _a : true, flat: (_b = options.flat) !== null && _b !== void 0 ? _b : true, inlineScam: (_c = options.inlineScam) !== null && _c !== void 0 ? _c : true, directory,
+        fileName,
+        filePath,
+        path,
+        name });
 }
 exports.normalizeOptions = normalizeOptions;
 //# sourceMappingURL=normalize-options.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam-directive/lib/normalize-options.ts"],"names":[],"mappings":";;;AACA,yCAA2E;AAG3E,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAe;;IAEf,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,IAAA,iCAAwB,EAChE,IAAI,EACJ,OAAO,CAAC,OAAO,CAChB,CAAC;IACF,MAAM,iBAAiB,GAAG,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,IAAA,0BAAiB,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACvE,MAAM,IAAI,GACR,MAAA,OAAO,CAAC,IAAI,mCACZ,IAAA,0BAAiB,EACf,iBAAiB,EACjB,WAAW,KAAK,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAC9C,CAAC;IAEJ,uCACK,OAAO,KACV,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,IAAI,EAC9B,IAAI,EAAE,MAAA,OAAO,CAAC,IAAI,mCAAI,IAAI,EAC1B,UAAU,EAAE,MAAA,OAAO,CAAC,UAAU,mCAAI,IAAI,EACtC,IAAI;QACJ,iBAAiB,IACjB;AACJ,CAAC;AAxBD,4CAwBC"}
+{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam-directive/lib/normalize-options.ts"],"names":[],"mappings":";;;AACA,2CAAyD;AAGzD,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAe;;IAEf,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,IAAA,4BAAqB,EACzE,IAAI,kCAEC,OAAO,KACV,IAAI,EAAE,WAAW,IAEpB,CAAC;IAEF,uCACK,OAAO,KACV,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,IAAI,EAC9B,IAAI,EAAE,MAAA,OAAO,CAAC,IAAI,mCAAI,IAAI,EAC1B,UAAU,EAAE,MAAA,OAAO,CAAC,UAAU,mCAAI,IAAI,EACtC,SAAS;QACT,QAAQ;QACR,QAAQ;QACR,IAAI;QACJ,IAAI,IACJ;AACJ,CAAC;AAvBD,4CAuBC"}

package/src/generators/scam-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/scam-directive/lib/validate-options.js

@@ -0,0 +1,11 @@
+"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);
+}
+exports.validateOptions = validateOptions;
+//# sourceMappingURL=validate-options.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"validate-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam-directive/lib/validate-options.ts"],"names":[],"mappings":";;;AACA,2CAA6D;AAC7D,yDAA0D;AAG1D,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;AACjE,CAAC;AAHD,0CAGC"}

package/src/generators/scam-directive/scam-directive.js

@@ -3,36 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.scamDirectiveGenerator = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
+const directive_1 = require("../directive/directive");
 const export_scam_1 = require("../utils/export-scam");
-const file_info_1 = require("../utils/file-info");
-const path_1 = require("../utils/path");
 const lib_1 = require("./lib");
-const directive_1 = require("../directive/directive");
 function scamDirectiveGenerator(tree, rawOptions) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        (0, lib_1.validateOptions)(tree, rawOptions);
+        const { inlineScam } = rawOptions, directiveOptions = tslib_1.__rest(rawOptions, ["inlineScam"]);
+        yield (0, directive_1.directiveGenerator)(tree, Object.assign(Object.assign({}, directiveOptions), { skipImport: true, export: false, standalone: false, skipFormat: true }));
         const options = (0, lib_1.normalizeOptions)(tree, rawOptions);
-        const { inlineScam, projectSourceRoot } = options, directiveOptions = tslib_1.__rest(options, ["inlineScam", "projectSourceRoot"]);
-        checkPathUnderProjectRoot(tree, options);
-        yield (0, directive_1.default)(tree, Object.assign(Object.assign({}, directiveOptions), { skipImport: true, export: false, standalone: false, skipFormat: true }));
-        const pipeFileInfo = (0, file_info_1.getDirectiveFileInfo)(tree, options);
-        (0, lib_1.convertDirectiveToScam)(tree, pipeFileInfo, options);
-        (0, export_scam_1.exportScam)(tree, pipeFileInfo, options);
+        (0, lib_1.convertDirectiveToScam)(tree, options);
+        (0, export_scam_1.exportScam)(tree, options);
         yield (0, devkit_1.formatFiles)(tree);
     });
 }
 exports.scamDirectiveGenerator = scamDirectiveGenerator;
-function checkPathUnderProjectRoot(tree, options) {
-    if (!options.path) {
-        return;
-    }
-    const { root } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    let pathToDirective = (0, devkit_1.normalizePath)(options.path);
-    pathToDirective = pathToDirective.startsWith('/')
-        ? pathToDirective.slice(1)
-        : pathToDirective;
-    if (!(0, path_1.pathStartsWith)(pathToDirective, root)) {
-        throw new Error(`The path provided for the SCAM (${options.path}) does not exist under the project root (${root}).`);
-    }
-}
 exports.default = scamDirectiveGenerator;
 //# sourceMappingURL=scam-directive.js.map

package/src/generators/scam-directive/scam-directive.js.map

@@ -1 +1 @@
-{"version":3,"file":"scam-directive.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/scam-directive/scam-directive.ts"],"names":[],"mappings":";;;;AACA,yCAIsB;AACtB,sDAAkD;AAClD,kDAA0D;AAC1D,wCAA+C;AAC/C,+BAAiE;AAEjE,sDAAwD;AAExD,SAAsB,sBAAsB,CAAC,IAAU,EAAE,UAAkB;;QACzE,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACnD,MAAM,EAAE,UAAU,EAAE,iBAAiB,KAA0B,OAAO,EAA5B,gBAAgB,kBAAK,OAAO,EAAhE,mCAAsD,CAAU,CAAC;QAEvE,yBAAyB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEzC,MAAM,IAAA,mBAAkB,EAAC,IAAI,kCACxB,gBAAgB,KACnB,UAAU,EAAE,IAAI,EAChB,MAAM,EAAE,KAAK,EACb,UAAU,EAAE,KAAK,EACjB,UAAU,EAAE,IAAI,IAChB,CAAC;QAEH,MAAM,YAAY,GAAG,IAAA,gCAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACzD,IAAA,4BAAsB,EAAC,IAAI,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;QACpD,IAAA,wBAAU,EAAC,IAAI,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;QAExC,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAnBD,wDAmBC;AAED,SAAS,yBAAyB,CAAC,IAAU,EAAE,OAAwB;IACrE,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;QACjB,OAAO;KACR;IAED,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAEjE,IAAI,eAAe,GAAG,IAAA,sBAAa,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAClD,eAAe,GAAG,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC;QAC/C,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;QAC1B,CAAC,CAAC,eAAe,CAAC;IAEpB,IAAI,CAAC,IAAA,qBAAc,EAAC,eAAe,EAAE,IAAI,CAAC,EAAE;QAC1C,MAAM,IAAI,KAAK,CACb,mCAAmC,OAAO,CAAC,IAAI,4CAA4C,IAAI,IAAI,CACpG,CAAC;KACH;AACH,CAAC;AAED,kBAAe,sBAAsB,CAAC"}
+{"version":3,"file":"scam-directive.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/scam-directive/scam-directive.ts"],"names":[],"mappings":";;;;AACA,yCAA2C;AAC3C,sDAA4D;AAC5D,sDAAkD;AAClD,+BAIe;AAGf,SAAsB,sBAAsB,CAAC,IAAU,EAAE,UAAkB;;QACzE,IAAA,qBAAe,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAElC,MAAM,EAAE,UAAU,KAA0B,UAAU,EAA/B,gBAAgB,kBAAK,UAAU,EAAhD,cAAmC,CAAa,CAAC;QACvD,MAAM,IAAA,8BAAkB,EAAC,IAAI,kCACxB,gBAAgB,KACnB,UAAU,EAAE,IAAI,EAChB,MAAM,EAAE,KAAK,EACb,UAAU,EAAE,KAAK,EACjB,UAAU,EAAE,IAAI,IAChB,CAAC;QAEH,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACnD,IAAA,4BAAsB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACtC,IAAA,wBAAU,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE1B,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAjBD,wDAiBC;AAED,kBAAe,sBAAsB,CAAC"}

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

@@ -11,9 +11,11 @@ export interface Schema {
 }
 
 export interface NormalizedSchema extends Schema {
+  directory: string;
   export: boolean;
+  fileName: string;
+  filePath: string;
   flat: boolean;
   inlineScam: boolean;
   path: string;
-  projectSourceRoot: string;
 }

package/src/generators/scam-pipe/lib/convert-pipe-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 convertPipeToScam(tree: Tree, pipeFileInfo: FileInfo, options: NormalizedSchema): void;
+export declare function convertPipeToScam(tree: Tree, options: NormalizedSchema): void;

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

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertPipeToScam = 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 convertPipeToScam(tree, pipeFileInfo, options) {
-    if (!tree.exists(pipeFileInfo.filePath)) {
-        throw new Error(`Couldn't find pipe at path ${pipeFileInfo.filePath} to add SCAM setup.`);
+function convertPipeToScam(tree, options) {
+    if (!tree.exists(options.filePath)) {
+        throw new Error(`Couldn't find pipe at path ${options.filePath} to add SCAM setup.`);
     }
     if (!tsModule) {
         tsModule = (0, ensure_typescript_1.ensureTypescript)();
@@ -16,17 +16,17 @@ function convertPipeToScam(tree, pipeFileInfo, options) {
     const typeNames = (0, devkit_1.names)('pipe');
     const pipeClassName = `${pipeNames.className}${typeNames.className}`;
     if (options.inlineScam) {
-        const currentPipeContents = tree.read(pipeFileInfo.filePath, 'utf-8');
-        let source = tsModule.createSourceFile(pipeFileInfo.filePath, currentPipeContents, tsModule.ScriptTarget.Latest, true);
-        source = (0, js_1.insertImport)(tree, source, pipeFileInfo.filePath, 'NgModule', '@angular/core');
-        source = (0, js_1.insertImport)(tree, source, pipeFileInfo.filePath, 'CommonModule', '@angular/common');
+        const currentPipeContents = tree.read(options.filePath, 'utf-8');
+        let source = tsModule.createSourceFile(options.filePath, currentPipeContents, 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 updatedPipeSource = source.getText();
         updatedPipeSource = `${updatedPipeSource}${getNgModuleDeclaration(pipeClassName)}`;
-        tree.write(pipeFileInfo.filePath, updatedPipeSource);
+        tree.write(options.filePath, updatedPipeSource);
         return;
     }
-    const scamFilePath = (0, devkit_1.joinPathFragments)(pipeFileInfo.directory, `${pipeNames.fileName}.module.ts`);
-    tree.write(scamFilePath, getModuleFileContent(pipeClassName, pipeFileInfo.fileName));
+    const scamFilePath = (0, devkit_1.joinPathFragments)(options.directory, `${pipeNames.fileName}.module.ts`);
+    tree.write(scamFilePath, getModuleFileContent(pipeClassName, options.fileName));
 }
 exports.convertPipeToScam = convertPipeToScam;
 function getModuleFileContent(pipeClassName, pipeFileName) {

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

@@ -1 +1 @@
-{"version":3,"file":"convert-pipe-to-scam.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam-pipe/lib/convert-pipe-to-scam.ts"],"names":[],"mappings":";;;AACA,yCAAwD;AACxD,uFAAmF;AACnF,iCAAwC;AAIxC,IAAI,QAAqC,CAAC;AAE1C,SAAgB,iBAAiB,CAC/B,IAAU,EACV,YAAsB,EACtB,OAAyB;IAEzB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE;QACvC,MAAM,IAAI,KAAK,CACb,8BAA8B,YAAY,CAAC,QAAQ,qBAAqB,CACzE,CAAC;KACH;IACD,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IAED,MAAM,SAAS,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,MAAM,SAAS,GAAG,IAAA,cAAK,EAAC,MAAM,CAAC,CAAC;IAChC,MAAM,aAAa,GAAG,GAAG,SAAS,CAAC,SAAS,GAAG,SAAS,CAAC,SAAS,EAAE,CAAC;IAErE,IAAI,OAAO,CAAC,UAAU,EAAE;QACtB,MAAM,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACtE,IAAI,MAAM,GAAG,QAAQ,CAAC,gBAAgB,CACpC,YAAY,CAAC,QAAQ,EACrB,mBAAmB,EACnB,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;QAEF,MAAM,GAAG,IAAA,iBAAY,EACnB,IAAI,EACJ,MAAM,EACN,YAAY,CAAC,QAAQ,EACrB,UAAU,EACV,eAAe,CAChB,CAAC;QACF,MAAM,GAAG,IAAA,iBAAY,EACnB,IAAI,EACJ,MAAM,EACN,YAAY,CAAC,QAAQ,EACrB,cAAc,EACd,iBAAiB,CAClB,CAAC;QAEF,IAAI,iBAAiB,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;QACzC,iBAAiB,GAAG,GAAG,iBAAiB,GAAG,sBAAsB,CAC/D,aAAa,CACd,EAAE,CAAC;QAEJ,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;QACrD,OAAO;KACR;IAED,MAAM,YAAY,GAAG,IAAA,0BAAiB,EACpC,YAAY,CAAC,SAAS,EACtB,GAAG,SAAS,CAAC,QAAQ,YAAY,CAClC,CAAC;IAEF,IAAI,CAAC,KAAK,CACR,YAAY,EACZ,oBAAoB,CAAC,aAAa,EAAE,YAAY,CAAC,QAAQ,CAAC,CAC3D,CAAC;AACJ,CAAC;AA5DD,8CA4DC;AAED,SAAS,oBAAoB,CAC3B,aAAqB,EACrB,YAAoB;IAEpB,OAAO;;WAEE,aAAa,cAAc,YAAY;EAChD,sBAAsB,CAAC,aAAa,CAAC,EAAE,CAAC;AAC1C,CAAC;AAED,SAAS,sBAAsB,CAAC,aAAqB;IACnD,OAAO;;;mBAGU,aAAa;cAClB,aAAa;;eAEZ,aAAa,WAAW,CAAC;AACxC,CAAC"}
+{"version":3,"file":"convert-pipe-to-scam.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam-pipe/lib/convert-pipe-to-scam.ts"],"names":[],"mappings":";;;AACA,yCAAwD;AACxD,iCAAwC;AACxC,uFAAmF;AAGnF,IAAI,QAAqC,CAAC;AAE1C,SAAgB,iBAAiB,CAAC,IAAU,EAAE,OAAyB;IACrE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;QAClC,MAAM,IAAI,KAAK,CACb,8BAA8B,OAAO,CAAC,QAAQ,qBAAqB,CACpE,CAAC;KACH;IACD,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IAED,MAAM,SAAS,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,MAAM,SAAS,GAAG,IAAA,cAAK,EAAC,MAAM,CAAC,CAAC;IAChC,MAAM,aAAa,GAAG,GAAG,SAAS,CAAC,SAAS,GAAG,SAAS,CAAC,SAAS,EAAE,CAAC;IAErE,IAAI,OAAO,CAAC,UAAU,EAAE;QACtB,MAAM,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACjE,IAAI,MAAM,GAAG,QAAQ,CAAC,gBAAgB,CACpC,OAAO,CAAC,QAAQ,EAChB,mBAAmB,EACnB,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,iBAAiB,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;QACzC,iBAAiB,GAAG,GAAG,iBAAiB,GAAG,sBAAsB,CAC/D,aAAa,CACd,EAAE,CAAC;QAEJ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;QAChD,OAAO;KACR;IAED,MAAM,YAAY,GAAG,IAAA,0BAAiB,EACpC,OAAO,CAAC,SAAS,EACjB,GAAG,SAAS,CAAC,QAAQ,YAAY,CAClC,CAAC;IAEF,IAAI,CAAC,KAAK,CACR,YAAY,EACZ,oBAAoB,CAAC,aAAa,EAAE,OAAO,CAAC,QAAQ,CAAC,CACtD,CAAC;AACJ,CAAC;AAxDD,8CAwDC;AAED,SAAS,oBAAoB,CAC3B,aAAqB,EACrB,YAAoB;IAEpB,OAAO;;WAEE,aAAa,cAAc,YAAY;EAChD,sBAAsB,CAAC,aAAa,CAAC,EAAE,CAAC;AAC1C,CAAC;AAED,SAAS,sBAAsB,CAAC,aAAqB;IACnD,OAAO;;;mBAGU,aAAa;cAClB,aAAa;;eAEZ,aAAa,WAAW,CAAC;AACxC,CAAC"}

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

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

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

@@ -3,4 +3,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./convert-pipe-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-pipe/lib/index.js.map

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

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

@@ -1,14 +1,15 @@
 "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, _d;
-    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, flat: (_c = options.flat) !== null && _c !== void 0 ? _c : true, inlineScam: (_d = options.inlineScam) !== null && _d !== void 0 ? _d : true, path,
-        projectSourceRoot });
+    var _a, _b, _c;
+    const { directory, fileName, filePath, name, path } = (0, path_1.normalizeNameAndPaths)(tree, Object.assign(Object.assign({}, options), { type: 'pipe' }));
+    return Object.assign(Object.assign({}, options), { export: (_a = options.export) !== null && _a !== void 0 ? _a : true, flat: (_b = options.flat) !== null && _b !== void 0 ? _b : true, inlineScam: (_c = options.inlineScam) !== null && _c !== void 0 ? _c : true, directory,
+        fileName,
+        filePath,
+        name,
+        path });
 }
 exports.normalizeOptions = normalizeOptions;
 //# sourceMappingURL=normalize-options.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam-pipe/lib/normalize-options.ts"],"names":[],"mappings":";;;AACA,yCAA2E;AAG3E,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAe;;IAEf,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,IAAA,iCAAwB,EAChE,IAAI,EACJ,OAAO,CAAC,OAAO,CAChB,CAAC;IACF,MAAM,iBAAiB,GAAG,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,IAAA,0BAAiB,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACvE,MAAM,IAAI,GACR,MAAA,OAAO,CAAC,IAAI,mCACZ,IAAA,0BAAiB,EACf,iBAAiB,EACjB,WAAW,KAAK,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAC9C,CAAC;IAEJ,uCACK,OAAO,KACV,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,IAAI,EAC9B,IAAI,EAAE,MAAA,OAAO,CAAC,IAAI,mCAAI,IAAI,EAC1B,UAAU,EAAE,MAAA,OAAO,CAAC,UAAU,mCAAI,IAAI,EACtC,IAAI;QACJ,iBAAiB,IACjB;AACJ,CAAC;AAxBD,4CAwBC"}
+{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam-pipe/lib/normalize-options.ts"],"names":[],"mappings":";;;AACA,2CAAyD;AAGzD,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAe;;IAEf,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,IAAA,4BAAqB,EACzE,IAAI,kCAEC,OAAO,KACV,IAAI,EAAE,MAAM,IAEf,CAAC;IAEF,uCACK,OAAO,KACV,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,IAAI,EAC9B,IAAI,EAAE,MAAA,OAAO,CAAC,IAAI,mCAAI,IAAI,EAC1B,UAAU,EAAE,MAAA,OAAO,CAAC,UAAU,mCAAI,IAAI,EACtC,SAAS;QACT,QAAQ;QACR,QAAQ;QACR,IAAI;QACJ,IAAI,IACJ;AACJ,CAAC;AAvBD,4CAuBC"}

package/src/generators/scam-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/scam-pipe/lib/validate-options.js

@@ -0,0 +1,11 @@
+"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);
+}
+exports.validateOptions = validateOptions;
+//# sourceMappingURL=validate-options.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"validate-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam-pipe/lib/validate-options.ts"],"names":[],"mappings":";;;AACA,2CAA6D;AAC7D,yDAA0D;AAG1D,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;AACjE,CAAC;AAHD,0CAGC"}

package/src/generators/scam-pipe/scam-pipe.js

@@ -3,34 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.scamPipeGenerator = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
+const pipe_1 = require("../pipe/pipe");
 const export_scam_1 = require("../utils/export-scam");
-const file_info_1 = require("../utils/file-info");
-const path_1 = require("../utils/path");
 const lib_1 = require("./lib");
-const pipe_1 = require("../pipe/pipe");
 function scamPipeGenerator(tree, rawOptions) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const options = (0, lib_1.normalizeOptions)(tree, rawOptions);
-        const { inlineScam, projectSourceRoot } = options, pipeOptions = tslib_1.__rest(options, ["inlineScam", "projectSourceRoot"]);
-        checkPathUnderProjectRoot(tree, options);
+        (0, lib_1.validateOptions)(tree, rawOptions);
+        const { inlineScam } = rawOptions, pipeOptions = tslib_1.__rest(rawOptions, ["inlineScam"]);
         yield (0, pipe_1.pipeGenerator)(tree, Object.assign(Object.assign({}, pipeOptions), { skipImport: true, export: false, standalone: false, skipFormat: true }));
-        const pipeFileInfo = (0, file_info_1.getPipeFileInfo)(tree, options);
-        (0, lib_1.convertPipeToScam)(tree, pipeFileInfo, options);
-        (0, export_scam_1.exportScam)(tree, pipeFileInfo, options);
+        const options = (0, lib_1.normalizeOptions)(tree, rawOptions);
+        (0, lib_1.convertPipeToScam)(tree, options);
+        (0, export_scam_1.exportScam)(tree, options);
         yield (0, devkit_1.formatFiles)(tree);
     });
 }
 exports.scamPipeGenerator = scamPipeGenerator;
-function checkPathUnderProjectRoot(tree, options) {
-    if (!options.path) {
-        return;
-    }
-    const { root } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    let pathToPipe = (0, devkit_1.normalizePath)(options.path);
-    pathToPipe = pathToPipe.startsWith('/') ? pathToPipe.slice(1) : pathToPipe;
-    if (!(0, path_1.pathStartsWith)(pathToPipe, root)) {
-        throw new Error(`The path provided for the SCAM (${options.path}) does not exist under the project root (${root}).`);
-    }
-}
 exports.default = scamPipeGenerator;
 //# sourceMappingURL=scam-pipe.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"scam-pipe.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/scam-pipe/scam-pipe.ts"],"names":[],"mappings":";;;;AACA,yCAIsB;AACtB,sDAAkD;AAClD,kDAAqD;AACrD,wCAA+C;AAC/C,+BAA4D;AAE5D,uCAA6C;AAE7C,SAAsB,iBAAiB,CAAC,IAAU,EAAE,UAAkB;;QACpE,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACnD,MAAM,EAAE,UAAU,EAAE,iBAAiB,KAAqB,OAAO,EAAvB,WAAW,kBAAK,OAAO,EAA3D,mCAAiD,CAAU,CAAC;QAElE,yBAAyB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEzC,MAAM,IAAA,oBAAa,EAAC,IAAI,kCACnB,WAAW,KACd,UAAU,EAAE,IAAI,EAChB,MAAM,EAAE,KAAK,EACb,UAAU,EAAE,KAAK,EACjB,UAAU,EAAE,IAAI,IAChB,CAAC;QAEH,MAAM,YAAY,GAAG,IAAA,2BAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACpD,IAAA,uBAAiB,EAAC,IAAI,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;QAC/C,IAAA,wBAAU,EAAC,IAAI,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;QAExC,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAnBD,8CAmBC;AAED,SAAS,yBAAyB,CAAC,IAAU,EAAE,OAAwB;IACrE,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;QACjB,OAAO;KACR;IAED,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAEjE,IAAI,UAAU,GAAG,IAAA,sBAAa,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7C,UAAU,GAAG,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;IAE3E,IAAI,CAAC,IAAA,qBAAc,EAAC,UAAU,EAAE,IAAI,CAAC,EAAE;QACrC,MAAM,IAAI,KAAK,CACb,mCAAmC,OAAO,CAAC,IAAI,4CAA4C,IAAI,IAAI,CACpG,CAAC;KACH;AACH,CAAC;AAED,kBAAe,iBAAiB,CAAC"}
+{"version":3,"file":"scam-pipe.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/scam-pipe/scam-pipe.ts"],"names":[],"mappings":";;;;AACA,yCAA2C;AAC3C,uCAA6C;AAC7C,sDAAkD;AAClD,+BAA6E;AAG7E,SAAsB,iBAAiB,CAAC,IAAU,EAAE,UAAkB;;QACpE,IAAA,qBAAe,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAElC,MAAM,EAAE,UAAU,KAAqB,UAAU,EAA1B,WAAW,kBAAK,UAAU,EAA3C,cAA8B,CAAa,CAAC;QAClD,MAAM,IAAA,oBAAa,EAAC,IAAI,kCACnB,WAAW,KACd,UAAU,EAAE,IAAI,EAChB,MAAM,EAAE,KAAK,EACb,UAAU,EAAE,KAAK,EACjB,UAAU,EAAE,IAAI,IAChB,CAAC;QAEH,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACnD,IAAA,uBAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACjC,IAAA,wBAAU,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE1B,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAjBD,8CAiBC;AAED,kBAAe,iBAAiB,CAAC"}

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

@@ -9,9 +9,11 @@ export interface Schema {
 }
 
 export interface NormalizedSchema extends Schema {
+  directory: string;
   export: boolean;
+  fileName: string;
+  filePath: string;
   flat: boolean;
   inlineScam: boolean;
   path: string;
-  projectSourceRoot: string;
 }

package/src/generators/setup-mf/lib/add-remote-entry.d.ts

@@ -1,3 +1,3 @@
 import type { Tree } from '@nrwl/devkit';
 import type { Schema } from '../schema';
-export declare function addRemoteEntry(tree: Tree, { appName, routing, mfType, prefix, standalone }: Schema, appRoot: string): void;
+export declare function addRemoteEntry(tree: Tree, { appName, routing, prefix, standalone }: Schema, appRoot: string): void;

package/src/generators/setup-mf/lib/add-remote-entry.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addRemoteEntry = void 0;
 const devkit_1 = require("@nrwl/devkit");
 const route_utils_1 = require("../../../utils/nx-devkit/route-utils");
-function addRemoteEntry(tree, { appName, routing, mfType, prefix, standalone }, appRoot) {
+function addRemoteEntry(tree, { appName, routing, prefix, standalone }, appRoot) {
     var _a, _b;
     prefix =
         (_b = prefix !== null && prefix !== void 0 ? prefix : (_a = (0, devkit_1.readProjectConfiguration)(tree, appName)) === null || _a === void 0 ? void 0 : _a.prefix) !== null && _b !== void 0 ? _b : (0, devkit_1.readNxJson)(tree).npmScope;

package/src/generators/setup-mf/lib/add-remote-entry.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-remote-entry.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/add-remote-entry.ts"],"names":[],"mappings":";;;AACA,yCAKsB;AAEtB,sEAAgE;AAEhE,SAAgB,cAAc,CAC5B,IAAU,EACV,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAU,EACxD,OAAe;;IAEf,MAAM;QACJ,MAAA,MAAM,aAAN,MAAM,cAAN,MAAM,GACN,MACE,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAGvC,0CAAE,MAAM,mCACT,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC5B,IAAA,sBAAa,EACX,IAAI,EACJ,UAAU;QACR,CAAC,CAAC,IAAA,0BAAiB,EACf,SAAS,EACT,2CAA2C,CAC5C;QACH,CAAC,CAAC,IAAA,0BAAiB,EAAC,SAAS,EAAE,6BAA6B,CAAC,EAC/D,GAAG,OAAO,uBAAuB,EACjC;QACE,IAAI,EAAE,EAAE;QACR,OAAO;QACP,OAAO;QACP,MAAM;KACP,CACF,CAAC;IAEF,IAAI,UAAU,IAAI,OAAO,EAAE;QACzB,IAAA,sBAAQ,EACN,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,EAAE,uBAAuB,CAAC,EACnD,iGAAiG,CAClG,CAAC;KACH;SAAM;QACL,IAAI,OAAO,EAAE;YACX,IAAA,sBAAQ,EACN,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,EAAE,uBAAuB,CAAC,EACnD,sGAAsG,CACvG,CAAC;SACH;QAED,IAAI,CAAC,KAAK,CACR,GAAG,OAAO,wBAAwB,EAClC;;;;;;EAMJ,IAAI,CAAC,IAAI,CAAC,GAAG,OAAO,wBAAwB,EAAE,OAAO,CAAC,EAAE,CACrD,CAAC;KACH;AACH,CAAC;AAxDD,wCAwDC"}
+{"version":3,"file":"add-remote-entry.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/add-remote-entry.ts"],"names":[],"mappings":";;;AACA,yCAKsB;AACtB,sEAAgE;AAIhE,SAAgB,cAAc,CAC5B,IAAU,EACV,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAU,EAChD,OAAe;;IAEf,MAAM;QACJ,MAAA,MAAM,aAAN,MAAM,cAAN,MAAM,GACN,MAAC,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAiC,0CACpE,MAAM,mCACV,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC5B,IAAA,sBAAa,EACX,IAAI,EACJ,UAAU;QACR,CAAC,CAAC,IAAA,0BAAiB,EACf,SAAS,EACT,2CAA2C,CAC5C;QACH,CAAC,CAAC,IAAA,0BAAiB,EAAC,SAAS,EAAE,6BAA6B,CAAC,EAC/D,GAAG,OAAO,uBAAuB,EACjC;QACE,IAAI,EAAE,EAAE;QACR,OAAO;QACP,OAAO;QACP,MAAM;KACP,CACF,CAAC;IAEF,IAAI,UAAU,IAAI,OAAO,EAAE;QACzB,IAAA,sBAAQ,EACN,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,EAAE,uBAAuB,CAAC,EACnD,iGAAiG,CAClG,CAAC;KACH;SAAM;QACL,IAAI,OAAO,EAAE;YACX,IAAA,sBAAQ,EACN,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,EAAE,uBAAuB,CAAC,EACnD,sGAAsG,CACvG,CAAC;SACH;QAED,IAAI,CAAC,KAAK,CACR,GAAG,OAAO,wBAAwB,EAClC;;;;;;EAMJ,IAAI,CAAC,IAAI,CAAC,GAAG,OAAO,wBAAwB,EAAE,OAAO,CAAC,EAAE,CACrD,CAAC;KACH;AACH,CAAC;AArDD,wCAqDC"}

package/src/generators/storybook-configuration/schema.json

@@ -90,7 +90,7 @@
     "storybook7Configuration": {
       "description": "Configure your workspace using Storybook version 7.",
       "type": "boolean",
-      "default": false,
+      "default": true,
       "hidden": true,
       "aliases": ["storybook7betaConfiguration"]
     }

package/src/generators/utils/export-scam.d.ts

@@ -1,9 +1,10 @@
 import type { Tree } from '@nrwl/devkit';
-import type { FileInfo } from './file-info';
 export type GenerationOptions = {
+    directory: string;
+    filePath: string;
     name: string;
     project: string;
     export?: boolean;
     inlineScam?: boolean;
 };
-export declare function exportScam(tree: Tree, fileInfo: FileInfo, options: GenerationOptions): void;
+export declare function exportScam(tree: Tree, options: GenerationOptions): void;