@nrwl/angular 15.9.0-beta.0 → 15.9.0-beta.2

package/src/generators/directive/schema.json

@@ -0,0 +1,92 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "$id": "GeneratorAngularDirective",
+  "cli": "nx",
+  "title": "Nx Angular Directive Options Schema",
+  "type": "object",
+  "description": "Creates a new, generic directive definition in the given project.",
+  "additionalProperties": false,
+  "properties": {
+    "name": {
+      "type": "string",
+      "description": "The name of the new directive.",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-prompt": "What name would you like to use for the directive?"
+    },
+    "path": {
+      "type": "string",
+      "format": "path",
+      "$default": {
+        "$source": "workingDirectory"
+      },
+      "description": "The path at which to create the interface that defines the directive, relative to the workspace root.",
+      "visible": false
+    },
+    "project": {
+      "type": "string",
+      "description": "The name of the project.",
+      "$default": {
+        "$source": "projectName"
+      },
+      "x-dropdown": "projects"
+    },
+    "prefix": {
+      "type": "string",
+      "description": "A prefix to apply to generated selectors.",
+      "alias": "p",
+      "oneOf": [
+        {
+          "maxLength": 0
+        },
+        {
+          "minLength": 1,
+          "format": "html-selector"
+        }
+      ]
+    },
+    "skipTests": {
+      "type": "boolean",
+      "description": "Do not create \"spec.ts\" test files for the new class.",
+      "default": false
+    },
+    "skipImport": {
+      "type": "boolean",
+      "description": "Do not import this directive into the owning NgModule.",
+      "default": false
+    },
+    "selector": {
+      "type": "string",
+      "format": "html-selector",
+      "description": "The HTML selector to use for this directive."
+    },
+    "standalone": {
+      "description": "Whether the generated directive is standalone.",
+      "type": "boolean",
+      "default": false
+    },
+    "flat": {
+      "type": "boolean",
+      "description": "When true (the default), creates the new files at the top level of the current project.",
+      "default": true
+    },
+    "module": {
+      "type": "string",
+      "description": "The filename of the declaring NgModule.",
+      "alias": "m"
+    },
+    "export": {
+      "type": "boolean",
+      "default": false,
+      "description": "The declaring NgModule exports this directive."
+    },
+    "skipFormat": {
+      "type": "boolean",
+      "default": false,
+      "description": "Skip formatting of files."
+    }
+  },
+  "required": ["name", "project"]
+}

package/src/generators/pipe/files/__pipeFileName__/__pipeFileName__.pipe.spec.ts__tpl__

@@ -0,0 +1,8 @@
+import { <%= pipeClassName %>Pipe } from './<%= pipeFileName %>.pipe';
+
+describe('<%= pipeClassName %>Pipe', () => {
+  it('create an instance', () => {
+    const pipe = new <%= pipeClassName %>Pipe();
+    expect(pipe).toBeTruthy();
+  });
+});

package/src/generators/pipe/files/__pipeFileName__/__pipeFileName__.pipe.ts__tpl__

@@ -0,0 +1,13 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({
+  name: '<%= pipePropertyName %>'<% if(standalone) {%>,
+  standalone: true<%}%>
+})
+export class <%= pipeClassName %>Pipe implements PipeTransform {
+
+  transform(value: unknown, ...args: unknown[]): unknown {
+    return null;
+  }
+
+}

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

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

package/src/generators/pipe/pipe.js

@@ -0,0 +1,45 @@
+"use strict";
+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;
+    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, {
+            pipeClassName: pipeNames.className,
+            pipeFileName: pipeNames.fileName,
+            pipePropertyName: pipeNames.propertyName,
+            standalone: schema.standalone,
+            tpl: '',
+        });
+        if (schema.skipTests) {
+            const pathToSpecFile = (0, devkit_1.joinPathFragments)(path, `${!schema.flat ? `${pipeNames.fileName}/` : ``}${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 (!schema.skipFormat) {
+            yield (0, devkit_1.formatFiles)(tree);
+        }
+    });
+}
+exports.pipeGenerator = pipeGenerator;
+exports.default = pipeGenerator;
+//# sourceMappingURL=pipe.js.map

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

@@ -0,0 +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"}

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

@@ -0,0 +1,12 @@
+export interface Schema {
+  name: string;
+  project: string;
+  path?: string;
+  flat?: boolean;
+  skipTests?: boolean;
+  skipImport?: boolean;
+  standalone?: boolean;
+  module?: string;
+  export?: boolean;
+  skipFormat?: boolean;
+}

package/src/generators/pipe/schema.json

@@ -0,0 +1,73 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "$id": "SchematicsAngularPipe",
+  "title": "Angular Pipe Options Schema",
+  "type": "object",
+  "cli": "nx",
+  "additionalProperties": false,
+  "description": "Creates a new, generic pipe definition in the given project.",
+  "properties": {
+    "name": {
+      "type": "string",
+      "description": "The name of the pipe.",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-prompt": "What name would you like to use for the pipe?"
+    },
+    "path": {
+      "type": "string",
+      "format": "path",
+      "$default": {
+        "$source": "workingDirectory"
+      },
+      "description": "The path at which to create the pipe, relative to the workspace root.",
+      "visible": false
+    },
+    "project": {
+      "type": "string",
+      "description": "The name of the project.",
+      "$default": {
+        "$source": "projectName"
+      },
+      "x-dropdown": "projects"
+    },
+    "flat": {
+      "type": "boolean",
+      "default": true,
+      "description": "When true (the default) creates files at the top level of the project."
+    },
+    "skipTests": {
+      "type": "boolean",
+      "description": "Do not create \"spec.ts\" test files for the new pipe.",
+      "default": false
+    },
+    "skipImport": {
+      "type": "boolean",
+      "default": false,
+      "description": "Do not import this pipe into the owning NgModule."
+    },
+    "standalone": {
+      "description": "Whether the generated pipe is standalone.",
+      "type": "boolean",
+      "default": false
+    },
+    "module": {
+      "type": "string",
+      "description": "The filename of the declaring NgModule.",
+      "alias": "m"
+    },
+    "export": {
+      "type": "boolean",
+      "default": false,
+      "description": "The declaring NgModule exports this pipe."
+    },
+    "skipFormat": {
+      "type": "boolean",
+      "default": false,
+      "description": "Skip formatting of files."
+    }
+  },
+  "required": ["name", "project"]
+}

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

@@ -3,13 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
 const devkit_1 = require("@nrwl/devkit");
 function normalizeOptions(tree, options) {
-    var _a, _b, _c, _d;
-    const project = (_a = options.project) !== null && _a !== void 0 ? _a : (0, devkit_1.readNxJson)(tree).defaultProject;
-    const { projectType, root, sourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, project);
+    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 = (_b = options.path) !== null && _b !== void 0 ? _b : (0, devkit_1.joinPathFragments)(projectSourceRoot, projectType === 'application' ? 'app' : 'lib');
-    return Object.assign(Object.assign({}, options), { export: (_c = options.export) !== null && _c !== void 0 ? _c : true, inlineScam: (_d = options.inlineScam) !== null && _d !== void 0 ? _d : true, path,
-        project,
+    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 });
 }
 exports.normalizeOptions = normalizeOptions;

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,yCAIsB;AAGtB,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAe;;IAEf,MAAM,OAAO,GAAG,MAAA,OAAO,CAAC,OAAO,mCAAI,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC,cAAc,CAAC;IACnE,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,IAAA,iCAAwB,EAChE,IAAI,EACJ,OAAO,CACR,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,OAAO;QACP,iBAAiB,IACjB;AACJ,CAAC;AAzBD,4CAyBC"}
+{"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"}

package/src/generators/scam/scam.js

@@ -23,12 +23,10 @@ function scamGenerator(tree, rawOptions) {
 }
 exports.scamGenerator = scamGenerator;
 function checkPathUnderProjectRoot(tree, options) {
-    var _a;
     if (!options.path) {
         return;
     }
-    const project = (_a = options.project) !== null && _a !== void 0 ? _a : (0, devkit_1.readNxJson)(tree).defaultProject;
-    const { root } = (0, devkit_1.readProjectConfiguration)(tree, project);
+    const { root } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     let pathToComponent = (0, devkit_1.normalizePath)(options.path);
     pathToComponent = pathToComponent.startsWith('/')
         ? pathToComponent.slice(1)

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,OAAO,GAAG,MAAA,OAAO,CAAC,OAAO,mCAAI,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC,cAAc,CAAC;IACnE,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEzD,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,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"}

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

@@ -1,7 +1,7 @@
 export interface Schema {
   name: string;
+  project: string;
   path?: string;
-  project?: string;
   displayBlock?: boolean;
   inlineStyle?: boolean;
   inlineTemplate?: boolean;
@@ -22,6 +22,5 @@ export interface NormalizedSchema extends Schema {
   export: boolean;
   inlineScam: boolean;
   path: string;
-  project: string;
   projectSourceRoot: string;
 }

package/src/generators/scam/schema.json

@@ -22,6 +22,9 @@
     "project": {
       "type": "string",
       "description": "The name of the project.",
+      "$default": {
+        "$source": "projectName"
+      },
       "x-dropdown": "projects"
     },
     "name": {

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

@@ -3,13 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
 const devkit_1 = require("@nrwl/devkit");
 function normalizeOptions(tree, options) {
-    var _a, _b, _c, _d, _e;
-    const project = (_a = options.project) !== null && _a !== void 0 ? _a : (0, devkit_1.readNxJson)(tree).defaultProject;
-    const { projectType, root, sourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, project);
+    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 = (_b = options.path) !== null && _b !== void 0 ? _b : (0, devkit_1.joinPathFragments)(projectSourceRoot, projectType === 'application' ? 'app' : 'lib');
-    return Object.assign(Object.assign({}, options), { export: (_c = options.export) !== null && _c !== void 0 ? _c : true, flat: (_d = options.flat) !== null && _d !== void 0 ? _d : true, inlineScam: (_e = options.inlineScam) !== null && _e !== void 0 ? _e : true, path,
-        project,
+    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 });
 }
 exports.normalizeOptions = normalizeOptions;

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,yCAIsB;AAGtB,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAe;;IAEf,MAAM,OAAO,GAAG,MAAA,OAAO,CAAC,OAAO,mCAAI,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC,cAAc,CAAC;IACnE,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,IAAA,iCAAwB,EAChE,IAAI,EACJ,OAAO,CACR,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,OAAO;QACP,iBAAiB,IACjB;AACJ,CAAC;AA1BD,4CA0BC"}
+{"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"}

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

@@ -23,12 +23,10 @@ function scamDirectiveGenerator(tree, rawOptions) {
 }
 exports.scamDirectiveGenerator = scamDirectiveGenerator;
 function checkPathUnderProjectRoot(tree, options) {
-    var _a;
     if (!options.path) {
         return;
     }
-    const project = (_a = options.project) !== null && _a !== void 0 ? _a : (0, devkit_1.readNxJson)(tree).defaultProject;
-    const { root } = (0, devkit_1.readProjectConfiguration)(tree, project);
+    const { root } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     let pathToDirective = (0, devkit_1.normalizePath)(options.path);
     pathToDirective = pathToDirective.startsWith('/')
         ? pathToDirective.slice(1)

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,yCAKsB;AACtB,sDAAkD;AAClD,kDAA0D;AAC1D,wCAA+C;AAC/C,+BAAiE;AAGjE,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,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,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;AAvBD,wDAuBC;AAED,SAAS,yBAAyB,CAAC,IAAU,EAAE,OAAwB;;IACrE,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;QACjB,OAAO;KACR;IAED,MAAM,OAAO,GAAG,MAAA,OAAO,CAAC,OAAO,mCAAI,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC,cAAc,CAAC;IACnE,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEzD,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,yCAIsB;AACtB,sDAAkD;AAClD,kDAA0D;AAC1D,wCAA+C;AAC/C,+BAAiE;AAGjE,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,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,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;AAvBD,wDAuBC;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"}

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

@@ -1,7 +1,7 @@
 export interface Schema {
   name: string;
+  project: string;
   path?: string;
-  project?: string;
   skipTests?: boolean;
   inlineScam?: boolean;
   flat?: boolean;
@@ -15,6 +15,5 @@ export interface NormalizedSchema extends Schema {
   flat: boolean;
   inlineScam: boolean;
   path: string;
-  project: string;
   projectSourceRoot: string;
 }

package/src/generators/scam-directive/schema.json

@@ -22,6 +22,9 @@
     "project": {
       "type": "string",
       "description": "The name of the project.",
+      "$default": {
+        "$source": "projectName"
+      },
       "x-dropdown": "projects"
     },
     "name": {

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

@@ -3,13 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
 const devkit_1 = require("@nrwl/devkit");
 function normalizeOptions(tree, options) {
-    var _a, _b, _c, _d, _e;
-    const project = (_a = options.project) !== null && _a !== void 0 ? _a : (0, devkit_1.readNxJson)(tree).defaultProject;
-    const { projectType, root, sourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, project);
+    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 = (_b = options.path) !== null && _b !== void 0 ? _b : (0, devkit_1.joinPathFragments)(projectSourceRoot, projectType === 'application' ? 'app' : 'lib');
-    return Object.assign(Object.assign({}, options), { export: (_c = options.export) !== null && _c !== void 0 ? _c : true, flat: (_d = options.flat) !== null && _d !== void 0 ? _d : true, inlineScam: (_e = options.inlineScam) !== null && _e !== void 0 ? _e : true, path,
-        project,
+    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 });
 }
 exports.normalizeOptions = normalizeOptions;

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,yCAIsB;AAGtB,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAe;;IAEf,MAAM,OAAO,GAAG,MAAA,OAAO,CAAC,OAAO,mCAAI,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC,cAAc,CAAC;IACnE,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,IAAA,iCAAwB,EAChE,IAAI,EACJ,OAAO,CACR,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,OAAO;QACP,iBAAiB,IACjB;AACJ,CAAC;AA1BD,4CA0BC"}
+{"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"}

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

@@ -23,12 +23,10 @@ function scamPipeGenerator(tree, rawOptions) {
 }
 exports.scamPipeGenerator = scamPipeGenerator;
 function checkPathUnderProjectRoot(tree, options) {
-    var _a;
     if (!options.path) {
         return;
     }
-    const project = (_a = options.project) !== null && _a !== void 0 ? _a : (0, devkit_1.readNxJson)(tree).defaultProject;
-    const { root } = (0, devkit_1.readProjectConfiguration)(tree, project);
+    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)) {

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,yCAKsB;AACtB,sDAAkD;AAClD,kDAAqD;AACrD,wCAA+C;AAC/C,+BAA4D;AAG5D,SAAsB,iBAAiB,CAAC,IAAU,EAAE,UAAkB;;QACpE,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,oBAAoB,GAAG,0BAA0B,CACrD,qBAAqB,EACrB,MAAM,CACP,CAAC;QACF,MAAM,oBAAoB,CAAC,IAAI,kCAC1B,gBAAgB,KACnB,UAAU,EAAE,IAAI,EAChB,MAAM,EAAE,KAAK,EACb,UAAU,EAAE,KAAK,IACjB,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;AAvBD,8CAuBC;AAED,SAAS,yBAAyB,CAAC,IAAU,EAAE,OAAwB;;IACrE,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;QACjB,OAAO;KACR;IAED,MAAM,OAAO,GAAG,MAAA,OAAO,CAAC,OAAO,mCAAI,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC,cAAc,CAAC;IACnE,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEzD,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,yCAIsB;AACtB,sDAAkD;AAClD,kDAAqD;AACrD,wCAA+C;AAC/C,+BAA4D;AAG5D,SAAsB,iBAAiB,CAAC,IAAU,EAAE,UAAkB;;QACpE,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,oBAAoB,GAAG,0BAA0B,CACrD,qBAAqB,EACrB,MAAM,CACP,CAAC;QACF,MAAM,oBAAoB,CAAC,IAAI,kCAC1B,gBAAgB,KACnB,UAAU,EAAE,IAAI,EAChB,MAAM,EAAE,KAAK,EACb,UAAU,EAAE,KAAK,IACjB,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;AAvBD,8CAuBC;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"}

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

@@ -1,7 +1,7 @@
 export interface Schema {
   name: string;
+  project: string;
   path?: string;
-  project?: string;
   skipTests?: boolean;
   inlineScam?: boolean;
   flat?: boolean;
@@ -13,6 +13,5 @@ export interface NormalizedSchema extends Schema {
   flat: boolean;
   inlineScam: boolean;
   path: string;
-  project: string;
   projectSourceRoot: string;
 }

package/src/generators/scam-pipe/schema.json

@@ -22,6 +22,9 @@
     "project": {
       "type": "string",
       "description": "The name of the project.",
+      "$default": {
+        "$source": "projectName"
+      },
       "x-dropdown": "projects"
     },
     "name": {

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

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

package/src/generators/utils/file-info.d.ts

@@ -1,9 +1,9 @@
 import { Tree } from '@nrwl/devkit';
 export type GenerationOptions = {
     name: string;
+    project: string;
     flat?: boolean;
     path?: string;
-    project?: string;
     type?: string;
 };
 export type FileInfo = {

package/src/generators/utils/file-info.js

@@ -15,13 +15,12 @@ function getPipeFileInfo(tree, options) {
 }
 exports.getPipeFileInfo = getPipeFileInfo;
 function getFileInfo(tree, options, defaultType) {
-    var _a, _b;
-    const project = (_a = options.project) !== null && _a !== void 0 ? _a : (0, devkit_1.readNxJson)(tree).defaultProject;
-    const { root, sourceRoot, projectType } = (0, devkit_1.readProjectConfiguration)(tree, project);
+    var _a;
+    const { root, sourceRoot, projectType } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const { fileName: normalizedName } = (0, devkit_1.names)(options.name);
     const fileName = `${normalizedName}.${options.type ? (0, devkit_1.names)(options.type).fileName : defaultType}`;
     const projectSourceRoot = sourceRoot !== null && sourceRoot !== void 0 ? sourceRoot : (0, devkit_1.joinPathFragments)(root, 'src');
-    const path = (_b = options.path) !== null && _b !== void 0 ? _b : (0, devkit_1.joinPathFragments)(projectSourceRoot, projectType === 'application' ? 'app' : 'lib');
+    const path = (_a = options.path) !== null && _a !== void 0 ? _a : (0, devkit_1.joinPathFragments)(projectSourceRoot, projectType === 'application' ? 'app' : 'lib');
     const directory = options.flat
         ? (0, devkit_1.normalizePath)(path)
         : (0, devkit_1.joinPathFragments)(path, normalizedName);

package/src/generators/utils/file-info.js.map

@@ -1 +1 @@
-{"version":3,"file":"file-info.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/file-info.ts"],"names":[],"mappings":";;;AAAA,yCAOsB;AAetB,SAAgB,oBAAoB,CAClC,IAAU,EACV,OAA0B;IAE1B,OAAO,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;AACjD,CAAC;AALD,oDAKC;AAED,SAAgB,oBAAoB,CAClC,IAAU,EACV,OAA0B;IAE1B,OAAO,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;AACjD,CAAC;AALD,oDAKC;AAED,SAAgB,eAAe,CAC7B,IAAU,EACV,OAA0B;IAE1B,OAAO,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;AAC5C,CAAC;AALD,0CAKC;AAED,SAAS,WAAW,CAClB,IAAU,EACV,OAA0B,EAC1B,WAAmB;;IAEnB,MAAM,OAAO,GAAG,MAAA,OAAO,CAAC,OAAO,mCAAI,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC,cAAc,CAAC;IACnE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,IAAA,iCAAwB,EAChE,IAAI,EACJ,OAAO,CACR,CAAC;IACF,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzD,MAAM,QAAQ,GAAG,GAAG,cAAc,IAChC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,WAChD,EAAE,CAAC;IAEH,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;IACJ,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI;QAC5B,CAAC,CAAC,IAAA,sBAAa,EAAC,IAAI,CAAC;QACrB,CAAC,CAAC,IAAA,0BAAiB,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAE5C,MAAM,QAAQ,GAAG,IAAA,0BAAiB,EAAC,SAAS,EAAE,GAAG,QAAQ,KAAK,CAAC,CAAC;IAEhE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;AAC3C,CAAC"}
+{"version":3,"file":"file-info.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/file-info.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AAetB,SAAgB,oBAAoB,CAClC,IAAU,EACV,OAA0B;IAE1B,OAAO,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;AACjD,CAAC;AALD,oDAKC;AAED,SAAgB,oBAAoB,CAClC,IAAU,EACV,OAA0B;IAE1B,OAAO,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;AACjD,CAAC;AALD,oDAKC;AAED,SAAgB,eAAe,CAC7B,IAAU,EACV,OAA0B;IAE1B,OAAO,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;AAC5C,CAAC;AALD,0CAKC;AAED,SAAS,WAAW,CAClB,IAAU,EACV,OAA0B,EAC1B,WAAmB;;IAEnB,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,IAAA,iCAAwB,EAChE,IAAI,EACJ,OAAO,CAAC,OAAO,CAChB,CAAC;IACF,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzD,MAAM,QAAQ,GAAG,GAAG,cAAc,IAChC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,WAChD,EAAE,CAAC;IAEH,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;IACJ,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI;QAC5B,CAAC,CAAC,IAAA,sBAAa,EAAC,IAAI,CAAC;QACrB,CAAC,CAAC,IAAA,0BAAiB,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAE5C,MAAM,QAAQ,GAAG,IAAA,0BAAiB,EAAC,SAAS,EAAE,GAAG,QAAQ,KAAK,CAAC,CAAC;IAEhE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;AAC3C,CAAC"}

package/src/generators/utils/find-module.d.ts

@@ -0,0 +1,4 @@
+import type { Tree } from '@nrwl/devkit';
+import { ngModuleDecoratorProperty } from './insert-ngmodule-import';
+export declare function findModule(tree: Tree, path: string, module?: string): string;
+export declare function addToNgModule(tree: Tree, path: string, modulePath: string, name: string, className: string, fileName: string, ngModuleProperty: ngModuleDecoratorProperty, isFlat?: boolean, isExported?: boolean): void;

package/src/generators/utils/find-module.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addToNgModule = exports.findModule = void 0;
+const devkit_1 = require("@nrwl/devkit");
+const path_1 = require("path");
+const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
+const js_1 = require("@nrwl/js");
+const insert_ngmodule_import_1 = require("./insert-ngmodule-import");
+let tsModule;
+function findModule(tree, path, module) {
+    let modulePath = '';
+    let pathToSearch = path;
+    while (pathToSearch !== '/') {
+        if (module) {
+            const pathToModule = (0, devkit_1.joinPathFragments)(pathToSearch, module);
+            if (tree.exists(pathToModule)) {
+                modulePath = pathToModule;
+                break;
+            }
+        }
+        else {
+            const potentialOptions = tree
+                .children(pathToSearch)
+                .filter((f) => f.endsWith('.module.ts'));
+            if (potentialOptions.length > 1) {
+                throw new Error(`More than one NgModule was found. Please provide the NgModule you wish to use.`);
+            }
+            else if (potentialOptions.length === 1) {
+                modulePath = (0, devkit_1.joinPathFragments)(pathToSearch, potentialOptions[0]);
+                break;
+            }
+        }
+        pathToSearch = (0, path_1.dirname)(pathToSearch);
+    }
+    const moduleContents = tree.read(modulePath, 'utf-8');
+    if (!moduleContents.includes('@NgModule')) {
+        throw new Error(`Declaring module file (${modulePath}) does not contain an @NgModule Declaration.`);
+    }
+    return modulePath;
+}
+exports.findModule = findModule;
+function addToNgModule(tree, path, modulePath, name, className, fileName, ngModuleProperty, isFlat = true, isExported = false) {
+    if (!tsModule) {
+        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+    }
+    let relativePath = `${(0, devkit_1.joinPathFragments)(path.replace((0, path_1.dirname)(modulePath), ''), !isFlat ? name : '', `${fileName}`)}`;
+    relativePath = relativePath.startsWith('/')
+        ? `.${relativePath}`
+        : `./${relativePath}`;
+    const moduleContents = tree.read(modulePath, 'utf-8');
+    const source = tsModule.createSourceFile(modulePath, moduleContents, tsModule.ScriptTarget.Latest, true);
+    (0, js_1.insertImport)(tree, source, modulePath, className, relativePath);
+    (0, insert_ngmodule_import_1.insertNgModuleProperty)(tree, modulePath, className, ngModuleProperty);
+    if (isExported) {
+        (0, insert_ngmodule_import_1.insertNgModuleProperty)(tree, modulePath, className, 'exports');
+    }
+}
+exports.addToNgModule = addToNgModule;
+//# sourceMappingURL=find-module.js.map

package/src/generators/utils/find-module.js.map

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