@nrwl/angular 14.8.7 → 14.9.0-beta.1

package/src/generators/library/lib/add-lazy-loaded-router-configuration.js

@@ -1,17 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addLazyLoadedRouterConfiguration = void 0;
-const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
-const ts = require("typescript");
-const ast_utils_2 = require("../../../utils/nx-devkit/ast-utils");
-function addLazyLoadedRouterConfiguration(host, options) {
-    const moduleSource = host.read(options.modulePath).toString('utf-8');
-    let sourceFile = ts.createSourceFile(options.modulePath, moduleSource, ts.ScriptTarget.Latest, true);
-    sourceFile = (0, ast_utils_2.addImportToModule)(host, sourceFile, options.modulePath, `
-    RouterModule.forChild([
-      /* {path: '', pathMatch: 'full', component: InsertYourComponentHere} */
-    ]) `);
-    sourceFile = (0, ast_utils_1.insertImport)(host, sourceFile, options.modulePath, 'RouterModule', '@angular/router');
+const devkit_1 = require("@nrwl/devkit");
+const js_1 = require("@nrwl/js");
+const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
+const path_1 = require("path");
+const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
+let tsModule;
+function addLazyLoadedRouterConfiguration(tree, options) {
+    if (!tsModule) {
+        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+    }
+    const constName = `${(0, devkit_1.names)(options.fileName).propertyName}Routes`;
+    tree.write((0, devkit_1.joinPathFragments)((0, path_1.dirname)(options.modulePath), 'lib.routes.ts'), `import { Route } from '@angular/router';
+
+export const ${constName}: Route[] = [/* {path: '', pathMatch: 'full', component: InsertYourComponentHere} */];`);
+    const routeFileSource = tree.read(options.modulePath, 'utf-8');
+    let sourceFile = tsModule.createSourceFile(options.modulePath, routeFileSource, tsModule.ScriptTarget.Latest, true);
+    sourceFile = (0, ast_utils_1.addImportToModule)(tree, sourceFile, options.modulePath, `
+    RouterModule.forChild(${constName}) `);
+    sourceFile = (0, js_1.insertImport)(tree, sourceFile, options.modulePath, 'RouterModule', '@angular/router');
+    sourceFile = (0, js_1.insertImport)(tree, sourceFile, options.modulePath, constName, './lib.routes');
+    const pathToIndex = (0, devkit_1.joinPathFragments)(options.projectRoot, 'src/index.ts');
+    const indexFileContents = tree.read(pathToIndex, 'utf-8');
+    tree.write(pathToIndex, `${indexFileContents}
+  export * from './lib/lib.routes';`);
 }
 exports.addLazyLoadedRouterConfiguration = addLazyLoadedRouterConfiguration;
 //# sourceMappingURL=add-lazy-loaded-router-configuration.js.map

package/src/generators/library/lib/add-lazy-loaded-router-configuration.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-lazy-loaded-router-configuration.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-lazy-loaded-router-configuration.ts"],"names":[],"mappings":";;;AACA,uEAAuE;AACvE,iCAAiC;AACjC,kEAAuE;AAGvE,SAAgB,gCAAgC,CAC9C,IAAU,EACV,OAA2C;IAE3C,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACtE,IAAI,UAAU,GAAG,EAAE,CAAC,gBAAgB,CAClC,OAAO,CAAC,UAAU,EAClB,YAAY,EACZ,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;IACF,UAAU,GAAG,IAAA,6BAAiB,EAC5B,IAAI,EACJ,UAAU,EACV,OAAO,CAAC,UAAU,EAClB;;;QAGI,CACL,CAAC;IAEF,UAAU,GAAG,IAAA,wBAAY,EACvB,IAAI,EACJ,UAAU,EACV,OAAO,CAAC,UAAU,EAClB,cAAc,EACd,iBAAiB,CAClB,CAAC;AACJ,CAAC;AA5BD,4EA4BC"}
+{"version":3,"file":"add-lazy-loaded-router-configuration.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-lazy-loaded-router-configuration.ts"],"names":[],"mappings":";;;AAAA,yCAA8D;AAC9D,iCAAwC;AACxC,kEAAuE;AAEvE,+BAA+B;AAC/B,uFAAmF;AAEnF,IAAI,QAAqC,CAAC;AAE1C,SAAgB,gCAAgC,CAC9C,IAAU,EACV,OAA2C;IAE3C,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IACD,MAAM,SAAS,GAAG,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,YAAY,QAAQ,CAAC;IAClE,IAAI,CAAC,KAAK,CACR,IAAA,0BAAiB,EAAC,IAAA,cAAO,EAAC,OAAO,CAAC,UAAU,CAAC,EAAE,eAAe,CAAC,EAC/D;;eAEW,SAAS,wFAAwF,CAC7G,CAAC;IAEF,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAC/D,IAAI,UAAU,GAAG,QAAQ,CAAC,gBAAgB,CACxC,OAAO,CAAC,UAAU,EAClB,eAAe,EACf,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;IACF,UAAU,GAAG,IAAA,6BAAiB,EAC5B,IAAI,EACJ,UAAU,EACV,OAAO,CAAC,UAAU,EAClB;4BACwB,SAAS,IAAI,CACtC,CAAC;IAEF,UAAU,GAAG,IAAA,iBAAY,EACvB,IAAI,EACJ,UAAU,EACV,OAAO,CAAC,UAAU,EAClB,cAAc,EACd,iBAAiB,CAClB,CAAC;IACF,UAAU,GAAG,IAAA,iBAAY,EACvB,IAAI,EACJ,UAAU,EACV,OAAO,CAAC,UAAU,EAClB,SAAS,EACT,cAAc,CACf,CAAC;IAEF,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IAC3E,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAC1D,IAAI,CAAC,KAAK,CACR,WAAW,EACX,GAAG,iBAAiB;oCACY,CACjC,CAAC;AACJ,CAAC;AApDD,4EAoDC"}

package/src/generators/library/lib/add-load-children.js

@@ -2,24 +2,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addLoadChildren = void 0;
 const devkit_1 = require("@nrwl/devkit");
-const ts = require("typescript");
-const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
-const standalone_utils_1 = require("../../../utils/nx-devkit/standalone-utils");
+const route_utils_1 = require("../../../utils/nx-devkit/route-utils");
+const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
+let tsModule;
 function addLoadChildren(tree, options) {
-    if (!tree.exists(options.parentModule)) {
-        throw new Error(`Cannot find '${options.parentModule}'`);
+    if (!tree.exists(options.parent)) {
+        throw new Error(`Cannot find '${options.parent}'`);
     }
-    const moduleSource = tree.read(options.parentModule).toString('utf-8');
-    const sourceFile = ts.createSourceFile(options.parentModule, moduleSource, ts.ScriptTarget.Latest, true);
+    if (!tsModule) {
+        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+    }
+    const moduleSource = tree.read(options.parent, 'utf-8');
+    const sourceFile = tsModule.createSourceFile(options.parent, moduleSource, tsModule.ScriptTarget.Latest, true);
     const route = `{path: '${(0, devkit_1.names)(options.fileName).fileName}', loadChildren: () => import('${options.importPath}').then(m => m.${options.standalone
-        ? `${(0, devkit_1.names)(options.name).className.toUpperCase()}_ROUTES`
+        ? `${(0, devkit_1.names)(options.name).propertyName}Routes`
         : options.moduleName})}`;
-    if (moduleSource.includes('@NgModule')) {
-        (0, ast_utils_1.addRoute)(tree, options.parentModule, sourceFile, route);
-    }
-    else {
-        (0, standalone_utils_1.addStandaloneRoute)(tree, options.parentModule, route);
-    }
+    (0, route_utils_1.addRoute)(tree, options.parent, route);
 }
 exports.addLoadChildren = addLoadChildren;
 //# sourceMappingURL=add-load-children.js.map

package/src/generators/library/lib/add-load-children.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-load-children.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-load-children.ts"],"names":[],"mappings":";;;AAAA,yCAA2C;AAC3C,iCAAiC;AACjC,kEAA8D;AAE9D,gFAA+E;AAE/E,SAAgB,eAAe,CAC7B,IAAU,EACV,OAA2C;IAE3C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;QACtC,MAAM,IAAI,KAAK,CAAC,gBAAgB,OAAO,CAAC,YAAY,GAAG,CAAC,CAAC;KAC1D;IAED,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACxE,MAAM,UAAU,GAAG,EAAE,CAAC,gBAAgB,CACpC,OAAO,CAAC,YAAY,EACpB,YAAY,EACZ,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;IAEF,MAAM,KAAK,GAAG,WACZ,IAAA,cAAK,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,QAC1B,kCAAkC,OAAO,CAAC,UAAU,kBAClD,OAAO,CAAC,UAAU;QAChB,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,WAAW,EAAE,SAAS;QACzD,CAAC,CAAC,OAAO,CAAC,UACd,IAAI,CAAC;IAEL,IAAI,YAAY,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;QACtC,IAAA,oBAAQ,EAAC,IAAI,EAAE,OAAO,CAAC,YAAY,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;KACzD;SAAM;QACL,IAAA,qCAAkB,EAAC,IAAI,EAAE,OAAO,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;KACvD;AACH,CAAC;AA7BD,0CA6BC"}
+{"version":3,"file":"add-load-children.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-load-children.ts"],"names":[],"mappings":";;;AAAA,yCAA2C;AAE3C,sEAAgE;AAChE,uFAAmF;AAEnF,IAAI,QAAqC,CAAC;AAE1C,SAAgB,eAAe,CAC7B,IAAU,EACV,OAA2C;IAE3C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QAChC,MAAM,IAAI,KAAK,CAAC,gBAAgB,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;KACpD;IACD,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IAED,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACxD,MAAM,UAAU,GAAG,QAAQ,CAAC,gBAAgB,CAC1C,OAAO,CAAC,MAAM,EACd,YAAY,EACZ,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;IAEF,MAAM,KAAK,GAAG,WACZ,IAAA,cAAK,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,QAC1B,kCAAkC,OAAO,CAAC,UAAU,kBAClD,OAAO,CAAC,UAAU;QAChB,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,YAAY,QAAQ;QAC7C,CAAC,CAAC,OAAO,CAAC,UACd,IAAI,CAAC;IAEL,IAAA,sBAAQ,EAAC,IAAI,EAAE,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AACxC,CAAC;AA5BD,0CA4BC"}

package/src/generators/library/lib/add-module.js

@@ -9,13 +9,13 @@ function addModule(host, options) {
     if (options.routing && options.lazy) {
         (0, add_lazy_loaded_router_configuration_1.addLazyLoadedRouterConfiguration)(host, options);
     }
-    if (options.routing && options.lazy && options.parentModule) {
+    if (options.routing && options.lazy && options.parent) {
         (0, add_load_children_1.addLoadChildren)(host, options);
     }
     if (options.routing && !options.lazy) {
         (0, add_router_configuration_1.addRouterConfiguration)(host, options);
     }
-    if (options.routing && !options.lazy && options.parentModule) {
+    if (options.routing && !options.lazy && options.parent) {
         (0, add_children_1.addChildren)(host, options);
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"add-module.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-module.ts"],"names":[],"mappings":";;;AACA,iDAA6C;AAC7C,iGAA0F;AAC1F,2DAAsD;AACtD,yEAAoE;AAGpE,SAAgB,SAAS,CACvB,IAAU,EACV,OAA2C;IAE3C,IAAI,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,EAAE;QACnC,IAAA,uEAAgC,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KACjD;IACD,IAAI,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,YAAY,EAAE;QAC3D,IAAA,mCAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KAChC;IACD,IAAI,OAAO,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;QACpC,IAAA,iDAAsB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KACvC;IACD,IAAI,OAAO,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,YAAY,EAAE;QAC5D,IAAA,0BAAW,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KAC5B;AACH,CAAC;AAhBD,8BAgBC"}
+{"version":3,"file":"add-module.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-module.ts"],"names":[],"mappings":";;;AACA,iDAA6C;AAC7C,iGAA0F;AAC1F,2DAAsD;AACtD,yEAAoE;AAGpE,SAAgB,SAAS,CACvB,IAAU,EACV,OAA2C;IAE3C,IAAI,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,EAAE;QACnC,IAAA,uEAAgC,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KACjD;IACD,IAAI,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE;QACrD,IAAA,mCAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KAChC;IACD,IAAI,OAAO,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;QACpC,IAAA,iDAAsB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KACvC;IACD,IAAI,OAAO,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE;QACtD,IAAA,0BAAW,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KAC5B;AACH,CAAC;AAhBD,8BAgBC"}

package/src/generators/library/lib/add-router-configuration.d.ts

@@ -1,3 +1,3 @@
 import type { Tree } from '@nrwl/devkit';
 import { NormalizedSchema } from './normalized-schema';
-export declare function addRouterConfiguration(host: Tree, options: NormalizedSchema['libraryOptions']): void;
+export declare function addRouterConfiguration(tree: Tree, options: NormalizedSchema['libraryOptions']): void;

package/src/generators/library/lib/add-router-configuration.js

@@ -2,16 +2,28 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addRouterConfiguration = void 0;
 const devkit_1 = require("@nrwl/devkit");
-const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
-const ts = require("typescript");
-const ast_utils_2 = require("../../../utils/nx-devkit/ast-utils");
-function addRouterConfiguration(host, options) {
+const js_1 = require("@nrwl/js");
+const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
+const path_1 = require("path");
+const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
+let tsModule;
+function addRouterConfiguration(tree, options) {
+    if (!tsModule) {
+        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+    }
     const constName = `${(0, devkit_1.names)(options.fileName).propertyName}Routes`;
-    const moduleSource = host.read(options.modulePath).toString('utf-8');
-    let moduleSourceFile = ts.createSourceFile(options.modulePath, moduleSource, ts.ScriptTarget.Latest, true);
-    moduleSourceFile = (0, ast_utils_2.addImportToModule)(host, moduleSourceFile, options.modulePath, `RouterModule`);
-    moduleSourceFile = (0, ast_utils_1.insertImport)(host, moduleSourceFile, options.modulePath, 'RouterModule, Route', '@angular/router');
-    moduleSourceFile = (0, ast_utils_1.addGlobal)(host, moduleSourceFile, options.modulePath, `export const ${constName}: Route[] = [];`);
+    const moduleSource = tree.read(options.modulePath, 'utf-8');
+    let moduleSourceFile = tsModule.createSourceFile(options.modulePath, moduleSource, tsModule.ScriptTarget.Latest, true);
+    moduleSourceFile = (0, ast_utils_1.addImportToModule)(tree, moduleSourceFile, options.modulePath, `RouterModule`);
+    moduleSourceFile = (0, js_1.insertImport)(tree, moduleSourceFile, options.modulePath, 'RouterModule, Route', '@angular/router');
+    moduleSourceFile = (0, js_1.insertImport)(tree, moduleSourceFile, options.modulePath, constName, './lib.routes');
+    tree.write((0, devkit_1.joinPathFragments)((0, path_1.dirname)(options.modulePath), 'lib.routes.ts'), `import { Route } from '@angular/router';
+
+export const ${constName}: Route[] = [];`);
+    const pathToIndex = (0, devkit_1.joinPathFragments)(options.projectRoot, 'src/index.ts');
+    const indexFileContents = tree.read(pathToIndex, 'utf-8');
+    tree.write(pathToIndex, `${indexFileContents}
+  export * from './lib/lib.routes';`);
 }
 exports.addRouterConfiguration = addRouterConfiguration;
 //# sourceMappingURL=add-router-configuration.js.map

package/src/generators/library/lib/add-router-configuration.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-router-configuration.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-router-configuration.ts"],"names":[],"mappings":";;;AACA,yCAAqC;AACrC,uEAGiD;AACjD,iCAAiC;AACjC,kEAAuE;AAGvE,SAAgB,sBAAsB,CACpC,IAAU,EACV,OAA2C;IAE3C,MAAM,SAAS,GAAG,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,YAAY,QAAQ,CAAC;IAClE,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACtE,IAAI,gBAAgB,GAAG,EAAE,CAAC,gBAAgB,CACxC,OAAO,CAAC,UAAU,EAClB,YAAY,EACZ,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;IAEF,gBAAgB,GAAG,IAAA,6BAAiB,EAClC,IAAI,EACJ,gBAAgB,EAChB,OAAO,CAAC,UAAU,EAClB,cAAc,CACf,CAAC;IACF,gBAAgB,GAAG,IAAA,wBAAY,EAC7B,IAAI,EACJ,gBAAgB,EAChB,OAAO,CAAC,UAAU,EAClB,qBAAqB,EACrB,iBAAiB,CAClB,CAAC;IACF,gBAAgB,GAAG,IAAA,qBAAS,EAC1B,IAAI,EACJ,gBAAgB,EAChB,OAAO,CAAC,UAAU,EAClB,gBAAgB,SAAS,iBAAiB,CAC3C,CAAC;AACJ,CAAC;AAhCD,wDAgCC"}
+{"version":3,"file":"add-router-configuration.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-router-configuration.ts"],"names":[],"mappings":";;;AACA,yCAAwD;AACxD,iCAAwC;AACxC,kEAAuE;AAEvE,+BAA+B;AAC/B,uFAAmF;AAEnF,IAAI,QAAqC,CAAC;AAE1C,SAAgB,sBAAsB,CACpC,IAAU,EACV,OAA2C;IAE3C,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IACD,MAAM,SAAS,GAAG,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,YAAY,QAAQ,CAAC;IAClE,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAC5D,IAAI,gBAAgB,GAAG,QAAQ,CAAC,gBAAgB,CAC9C,OAAO,CAAC,UAAU,EAClB,YAAY,EACZ,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;IAEF,gBAAgB,GAAG,IAAA,6BAAiB,EAClC,IAAI,EACJ,gBAAgB,EAChB,OAAO,CAAC,UAAU,EAClB,cAAc,CACf,CAAC;IACF,gBAAgB,GAAG,IAAA,iBAAY,EAC7B,IAAI,EACJ,gBAAgB,EAChB,OAAO,CAAC,UAAU,EAClB,qBAAqB,EACrB,iBAAiB,CAClB,CAAC;IACF,gBAAgB,GAAG,IAAA,iBAAY,EAC7B,IAAI,EACJ,gBAAgB,EAChB,OAAO,CAAC,UAAU,EAClB,SAAS,EACT,cAAc,CACf,CAAC;IAEF,IAAI,CAAC,KAAK,CACR,IAAA,0BAAiB,EAAC,IAAA,cAAO,EAAC,OAAO,CAAC,UAAU,CAAC,EAAE,eAAe,CAAC,EAC/D;;eAEW,SAAS,iBAAiB,CACtC,CAAC;IAEF,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IAC3E,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAC1D,IAAI,CAAC,KAAK,CACR,WAAW,EACX,GAAG,iBAAiB;oCACY,CACjC,CAAC;AACJ,CAAC;AAnDD,wDAmDC"}

package/src/generators/library/lib/add-standalone-component.js

@@ -9,21 +9,21 @@ const add_load_children_1 = require("./add-load-children");
 const add_children_1 = require("./add-children");
 function addStandaloneComponent(tree, { libraryOptions, componentOptions }) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        yield (0, component_1.default)(tree, Object.assign(Object.assign({}, componentOptions), { name: componentOptions.name, standalone: true, export: true, project: libraryOptions.name }));
+        yield (0, component_1.default)(tree, Object.assign(Object.assign({}, componentOptions), { name: componentOptions.name, standalone: true, export: true, project: libraryOptions.name, flat: componentOptions.flat }));
         if (libraryOptions.routing) {
-            const pathToRoutes = (0, path_1.joinPathFragments)(libraryOptions.projectRoot, 'src/lib/routes.ts');
+            const pathToRoutes = (0, path_1.joinPathFragments)(libraryOptions.projectRoot, 'src/lib/lib.routes.ts');
             const routesContents = `import { Route } from '@angular/router';
-    import { ${libraryOptions.standaloneComponentName} } from './${(0, path_1.joinPathFragments)(libraryOptions.fileName, `${libraryOptions.fileName}.component`)}';
+    import { ${libraryOptions.standaloneComponentName} } from './${(0, path_1.joinPathFragments)(componentOptions.flat ? '' : libraryOptions.fileName, `${libraryOptions.fileName}.component`)}';
     
-        export const ${(0, devkit_1.names)(libraryOptions.name).className.toUpperCase()}_ROUTES: Route[] = [
+        export const ${(0, devkit_1.names)(libraryOptions.name).propertyName}Routes: Route[] = [
           {path: '', component: ${libraryOptions.standaloneComponentName}}
         ];`;
             tree.write(pathToRoutes, routesContents);
             const pathToEntryFile = (0, path_1.joinPathFragments)(libraryOptions.projectRoot, 'src', `${libraryOptions.entryFile}.ts`);
             const entryFileContents = tree.read(pathToEntryFile, 'utf-8');
             tree.write(pathToEntryFile, `${entryFileContents}
-        export * from './lib/routes'`);
-            if (libraryOptions.parentModule) {
+        export * from './lib/lib.routes'`);
+            if (libraryOptions.parent) {
                 if (libraryOptions.lazy) {
                     (0, add_load_children_1.addLoadChildren)(tree, libraryOptions);
                 }

package/src/generators/library/lib/add-standalone-component.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-standalone-component.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-standalone-component.ts"],"names":[],"mappings":";;;;AAEA,yDAA2D;AAC3D,4CAAsD;AACtD,yCAAqC;AACrC,2DAAsD;AACtD,iDAA6C;AAE7C,SAAsB,sBAAsB,CAC1C,IAAU,EACV,EAAE,cAAc,EAAE,gBAAgB,EAAoB;;QAEtD,MAAM,IAAA,mBAAkB,EAAC,IAAI,kCACxB,gBAAgB,KACnB,IAAI,EAAE,gBAAgB,CAAC,IAAI,EAC3B,UAAU,EAAE,IAAI,EAChB,MAAM,EAAE,IAAI,EACZ,OAAO,EAAE,cAAc,CAAC,IAAI,IAC5B,CAAC;QAEH,IAAI,cAAc,CAAC,OAAO,EAAE;YAC1B,MAAM,YAAY,GAAG,IAAA,wBAAiB,EACpC,cAAc,CAAC,WAAW,EAC1B,mBAAmB,CACpB,CAAC;YAEF,MAAM,cAAc,GAAG;eAErB,cAAc,CAAC,uBACjB,cAAc,IAAA,wBAAiB,EAC7B,cAAc,CAAC,QAAQ,EACvB,GAAG,cAAc,CAAC,QAAQ,YAAY,CACvC;;uBAEkB,IAAA,cAAK,EAClB,cAAc,CAAC,IAAI,CACpB,CAAC,SAAS,CAAC,WAAW,EAAE;kCACC,cAAc,CAAC,uBAAuB;WAC7D,CAAC;YACR,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;YAEzC,MAAM,eAAe,GAAG,IAAA,wBAAiB,EACvC,cAAc,CAAC,WAAW,EAC1B,KAAK,EACL,GAAG,cAAc,CAAC,SAAS,KAAK,CACjC,CAAC;YACF,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;YAC9D,IAAI,CAAC,KAAK,CACR,eAAe,EACf,GAAG,iBAAiB;qCACW,CAChC,CAAC;YAEF,IAAI,cAAc,CAAC,YAAY,EAAE;gBAC/B,IAAI,cAAc,CAAC,IAAI,EAAE;oBACvB,IAAA,mCAAe,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;iBACvC;qBAAM;oBACL,IAAA,0BAAW,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;iBACnC;aACF;SACF;IACH,CAAC;CAAA;AArDD,wDAqDC"}
+{"version":3,"file":"add-standalone-component.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-standalone-component.ts"],"names":[],"mappings":";;;;AAEA,yDAA2D;AAC3D,4CAAsD;AACtD,yCAAqC;AACrC,2DAAsD;AACtD,iDAA6C;AAE7C,SAAsB,sBAAsB,CAC1C,IAAU,EACV,EAAE,cAAc,EAAE,gBAAgB,EAAoB;;QAEtD,MAAM,IAAA,mBAAkB,EAAC,IAAI,kCACxB,gBAAgB,KACnB,IAAI,EAAE,gBAAgB,CAAC,IAAI,EAC3B,UAAU,EAAE,IAAI,EAChB,MAAM,EAAE,IAAI,EACZ,OAAO,EAAE,cAAc,CAAC,IAAI,EAC5B,IAAI,EAAE,gBAAgB,CAAC,IAAI,IAC3B,CAAC;QAEH,IAAI,cAAc,CAAC,OAAO,EAAE;YAC1B,MAAM,YAAY,GAAG,IAAA,wBAAiB,EACpC,cAAc,CAAC,WAAW,EAC1B,uBAAuB,CACxB,CAAC;YAEF,MAAM,cAAc,GAAG;eAErB,cAAc,CAAC,uBACjB,cAAc,IAAA,wBAAiB,EAC7B,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,QAAQ,EACpD,GAAG,cAAc,CAAC,QAAQ,YAAY,CACvC;;uBAGK,IAAA,cAAK,EAAC,cAAc,CAAC,IAAI,CAAC,CAAC,YAC7B;kCAC0B,cAAc,CAAC,uBAAuB;WAC7D,CAAC;YACR,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;YAEzC,MAAM,eAAe,GAAG,IAAA,wBAAiB,EACvC,cAAc,CAAC,WAAW,EAC1B,KAAK,EACL,GAAG,cAAc,CAAC,SAAS,KAAK,CACjC,CAAC;YACF,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;YAC9D,IAAI,CAAC,KAAK,CACR,eAAe,EACf,GAAG,iBAAiB;yCACe,CACpC,CAAC;YAEF,IAAI,cAAc,CAAC,MAAM,EAAE;gBACzB,IAAI,cAAc,CAAC,IAAI,EAAE;oBACvB,IAAA,mCAAe,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;iBACvC;qBAAM;oBACL,IAAA,0BAAW,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;iBACnC;aACF;SACF;IACH,CAAC;CAAA;AAtDD,wDAsDC"}

package/src/generators/library/lib/enable-strict-type-checking.js

@@ -13,18 +13,18 @@ function setLibraryStrictDefault(host, isStrict) {
     var _a;
     // set the default so future libraries use it
     // unless the user has previously set this value
-    const workspace = (0, devkit_1.readWorkspaceConfiguration)(host);
-    workspace.generators = workspace.generators || {};
-    workspace.generators['@nrwl/angular:library'] =
-        workspace.generators['@nrwl/angular:library'] || {};
-    workspace.generators['@nrwl/angular:library'].strict =
-        (_a = workspace.generators['@nrwl/angular:library'].strict) !== null && _a !== void 0 ? _a : isStrict;
-    (0, devkit_1.updateWorkspaceConfiguration)(host, workspace);
+    const nxJson = (0, devkit_1.readNxJson)(host);
+    nxJson.generators = nxJson.generators || {};
+    nxJson.generators['@nrwl/angular:library'] =
+        nxJson.generators['@nrwl/angular:library'] || {};
+    nxJson.generators['@nrwl/angular:library'].strict =
+        (_a = nxJson.generators['@nrwl/angular:library'].strict) !== null && _a !== void 0 ? _a : isStrict;
+    (0, devkit_1.updateNxJson)(host, nxJson);
 }
 exports.setLibraryStrictDefault = setLibraryStrictDefault;
 function updateTsConfig(host, options) {
     // Update the settings in the tsconfig.app.json to enable strict type checking.
-    // This matches the settings defined by the Angular CLI https://angular.io/guide/strict-mode
+    // This matches the settings defined by the Angular CL https://angular.io/guide/strict-mode
     (0, devkit_1.updateJson)(host, `${options.projectRoot}/tsconfig.json`, (json) => {
         var _a, _b;
         // update the TypeScript settings

package/src/generators/library/lib/enable-strict-type-checking.js.map

@@ -1 +1 @@
-{"version":3,"file":"enable-strict-type-checking.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/enable-strict-type-checking.ts"],"names":[],"mappings":";;;AACA,yCAIsB;AAGtB;;KAEK;AACL,SAAgB,wBAAwB,CACtC,IAAU,EACV,OAA2C;IAE3C,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AAChC,CAAC;AALD,4DAKC;AAED,SAAgB,uBAAuB,CAAC,IAAU,EAAE,QAAiB;;IACnE,6CAA6C;IAC7C,gDAAgD;IAChD,MAAM,SAAS,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;IAEnD,SAAS,CAAC,UAAU,GAAG,SAAS,CAAC,UAAU,IAAI,EAAE,CAAC;IAElD,SAAS,CAAC,UAAU,CAAC,uBAAuB,CAAC;QAC3C,SAAS,CAAC,UAAU,CAAC,uBAAuB,CAAC,IAAI,EAAE,CAAC;IAEtD,SAAS,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAC,MAAM;QAClD,MAAA,SAAS,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAC,MAAM,mCAAI,QAAQ,CAAC;IACnE,IAAA,qCAA4B,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;AAChD,CAAC;AAbD,0DAaC;AAED,SAAS,cAAc,CACrB,IAAU,EACV,OAA2C;IAE3C,+EAA+E;IAC/E,4FAA4F;IAC5F,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,gBAAgB,EAAE,CAAC,IAAI,EAAE,EAAE;;QAChE,iCAAiC;QACjC,IAAI,CAAC,eAAe,mCACf,CAAC,MAAA,IAAI,CAAC,eAAe,mCAAI,EAAE,CAAC,KAC/B,gCAAgC,EAAE,IAAI,EACtC,MAAM,EAAE,IAAI,EACZ,kBAAkB,EAAE,IAAI,EACxB,kCAAkC,EAAE,IAAI,EACxC,iBAAiB,EAAE,IAAI,EACvB,0BAA0B,EAAE,IAAI,GACjC,CAAC;QAEF,mCAAmC;QACnC,IAAI,CAAC,sBAAsB,mCACtB,CAAC,MAAA,IAAI,CAAC,sBAAsB,mCAAI,EAAE,CAAC,KACtC,+BAA+B,EAAE,KAAK,EACtC,yBAAyB,EAAE,IAAI,EAC/B,0BAA0B,EAAE,IAAI,EAChC,eAAe,EAAE,IAAI,GACtB,CAAC;QAEF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"enable-strict-type-checking.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/enable-strict-type-checking.ts"],"names":[],"mappings":";;;AACA,yCAAoE;AAGpE;;KAEK;AACL,SAAgB,wBAAwB,CACtC,IAAU,EACV,OAA2C;IAE3C,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AAChC,CAAC;AALD,4DAKC;AAED,SAAgB,uBAAuB,CAAC,IAAU,EAAE,QAAiB;;IACnE,6CAA6C;IAC7C,gDAAgD;IAChD,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAEhC,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC;IAE5C,MAAM,CAAC,UAAU,CAAC,uBAAuB,CAAC;QACxC,MAAM,CAAC,UAAU,CAAC,uBAAuB,CAAC,IAAI,EAAE,CAAC;IAEnD,MAAM,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAC,MAAM;QAC/C,MAAA,MAAM,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAC,MAAM,mCAAI,QAAQ,CAAC;IAChE,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAC7B,CAAC;AAbD,0DAaC;AAED,SAAS,cAAc,CACrB,IAAU,EACV,OAA2C;IAE3C,+EAA+E;IAC/E,2FAA2F;IAC3F,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,gBAAgB,EAAE,CAAC,IAAI,EAAE,EAAE;;QAChE,iCAAiC;QACjC,IAAI,CAAC,eAAe,mCACf,CAAC,MAAA,IAAI,CAAC,eAAe,mCAAI,EAAE,CAAC,KAC/B,gCAAgC,EAAE,IAAI,EACtC,MAAM,EAAE,IAAI,EACZ,kBAAkB,EAAE,IAAI,EACxB,kCAAkC,EAAE,IAAI,EACxC,iBAAiB,EAAE,IAAI,EACvB,0BAA0B,EAAE,IAAI,GACjC,CAAC;QAEF,mCAAmC;QACnC,IAAI,CAAC,sBAAsB,mCACtB,CAAC,MAAA,IAAI,CAAC,sBAAsB,mCAAI,EAAE,CAAC,KACtC,+BAA+B,EAAE,KAAK,EACtC,yBAAyB,EAAE,IAAI,EAC/B,0BAA0B,EAAE,IAAI,EAChC,eAAe,EAAE,IAAI,GACtB,CAAC;QAEF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC"}

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

@@ -1,4 +1,4 @@
 import { Tree } from '@nrwl/devkit';
 import { Schema } from '../schema';
 import { NormalizedSchema } from './normalized-schema';
-export declare function normalizeOptions(host: Tree, schema: Partial<Schema>): NormalizedSchema;
+export declare function normalizeOptions(host: Tree, schema: Schema): NormalizedSchema;

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

@@ -10,21 +10,23 @@ const project_1 = require("../../utils/project");
 function normalizeOptions(host, schema) {
     var _a, _b, _c, _d;
     // Create a schema with populated default values
-    const options = Object.assign({ buildable: false, linter: linter_1.Linter.EsLint, name: '', publishable: false, simpleModuleName: false, skipFormat: false, unitTestRunner: test_runners_1.UnitTestRunner.Jest, 
+    const options = Object.assign({ buildable: false, linter: linter_1.Linter.EsLint, publishable: false, simpleName: false, skipFormat: false, unitTestRunner: test_runners_1.UnitTestRunner.Jest, 
         // Publishable libs cannot use `full` yet, so if its false then use the passed value or default to `full`
         compilationMode: schema.publishable
             ? 'partial'
             : (_a = schema.compilationMode) !== null && _a !== void 0 ? _a : 'full', skipModule: schema.skipModule || schema.standalone }, schema);
     const name = (0, devkit_1.names)(options.name).fileName;
-    const projectDirectory = options.directory
-        ? `${(0, devkit_1.names)(options.directory).fileName}/${name}`.replace(/\/+/g, '/')
+    const { layoutDirectory, projectDirectory } = (0, devkit_1.extractLayoutDirectory)(options.directory);
+    const fullProjectDirectory = projectDirectory
+        ? `${(0, devkit_1.names)(projectDirectory).fileName}/${name}`.replace(/\/+/g, '/')
         : name;
-    const { libsDir, npmScope, standaloneAsDefault } = (0, devkit_1.getWorkspaceLayout)(host);
-    const projectName = projectDirectory
+    const { libsDir: defaultLibsDirectory, npmScope, standaloneAsDefault, } = (0, devkit_1.getWorkspaceLayout)(host);
+    const libsDir = layoutDirectory !== null && layoutDirectory !== void 0 ? layoutDirectory : defaultLibsDirectory;
+    const projectName = fullProjectDirectory
         .replace(new RegExp('/', 'g'), '-')
         .replace(/-\d+/g, '');
-    const fileName = options.simpleModuleName ? name : projectName;
-    const projectRoot = (0, devkit_1.joinPathFragments)(libsDir, projectDirectory);
+    const fileName = options.simpleName || options.simpleModuleName ? name : projectName;
+    const projectRoot = (0, devkit_1.joinPathFragments)(libsDir, fullProjectDirectory);
     const moduleName = `${(0, devkit_1.names)(fileName).className}Module`;
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())
@@ -32,29 +34,18 @@ function normalizeOptions(host, schema) {
     const modulePath = `${projectRoot}/src/lib/${fileName}.module.ts`;
     const prefix = (0, project_1.normalizePrefix)(options.prefix, npmScope);
     options.standaloneConfig = (_b = options.standaloneConfig) !== null && _b !== void 0 ? _b : standaloneAsDefault;
-    const importPath = options.importPath || (0, path_1.getImportPath)(npmScope, projectDirectory);
-    // Determine the roots where @schematics/angular will place the projects
-    // This might not be where the projects actually end up
-    const workspaceJsonPath = (0, devkit_1.getWorkspacePath)(host);
-    let newProjectRoot = null;
-    if (workspaceJsonPath) {
-        ({ newProjectRoot } = (0, devkit_1.readJson)(host, workspaceJsonPath));
-    }
-    const ngCliSchematicLibRoot = newProjectRoot
-        ? `${newProjectRoot}/${projectName}`
-        : projectName;
-    const allNormalizedOptions = Object.assign(Object.assign({}, options), { linter: (_c = options.linter) !== null && _c !== void 0 ? _c : linter_1.Linter.EsLint, unitTestRunner: (_d = options.unitTestRunner) !== null && _d !== void 0 ? _d : test_runners_1.UnitTestRunner.Jest, prefix, name: projectName, projectRoot, entryFile: 'index', moduleName,
-        projectDirectory,
-        modulePath,
+    const importPath = options.importPath || (0, path_1.getImportPath)(npmScope, fullProjectDirectory);
+    const ngCliSchematicLibRoot = projectName;
+    const allNormalizedOptions = Object.assign(Object.assign({}, options), { linter: (_c = options.linter) !== null && _c !== void 0 ? _c : linter_1.Linter.EsLint, unitTestRunner: (_d = options.unitTestRunner) !== null && _d !== void 0 ? _d : test_runners_1.UnitTestRunner.Jest, prefix, name: projectName, projectRoot, entryFile: 'index', moduleName, projectDirectory: fullProjectDirectory, modulePath,
         parsedTags,
         fileName,
         importPath,
         ngCliSchematicLibRoot, standaloneComponentName: `${(0, devkit_1.names)(name).className}Component` });
-    const { displayBlock, inlineStyle, inlineTemplate, viewEncapsulation, changeDetection, style, skipTests, selector, skipSelector } = allNormalizedOptions, libraryOptions = tslib_1.__rest(allNormalizedOptions, ["displayBlock", "inlineStyle", "inlineTemplate", "viewEncapsulation", "changeDetection", "style", "skipTests", "selector", "skipSelector"]);
+    const { displayBlock, inlineStyle, inlineTemplate, viewEncapsulation, changeDetection, style, skipTests, selector, skipSelector, flat } = allNormalizedOptions, libraryOptions = tslib_1.__rest(allNormalizedOptions, ["displayBlock", "inlineStyle", "inlineTemplate", "viewEncapsulation", "changeDetection", "style", "skipTests", "selector", "skipSelector", "flat"]);
     return {
         libraryOptions,
         componentOptions: {
-            name: libraryOptions.name,
+            name: fileName,
             standalone: libraryOptions.standalone,
             displayBlock,
             inlineStyle,
@@ -65,6 +56,7 @@ function normalizeOptions(host, schema) {
             skipTests,
             selector,
             skipSelector,
+            flat,
         },
     };
 }

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

@@ -1 +1 @@
-{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/normalize-options.ts"],"names":[],"mappings":";;;;AAAA,yCAOsB;AACtB,4CAAkD;AAGlD,yCAAsC;AACtC,8DAA6D;AAC7D,iDAAsD;AAEtD,SAAgB,gBAAgB,CAC9B,IAAU,EACV,MAAuB;;IAEvB,gDAAgD;IAChD,MAAM,OAAO,mBACX,SAAS,EAAE,KAAK,EAChB,MAAM,EAAE,eAAM,CAAC,MAAM,EACrB,IAAI,EAAE,EAAE,EACR,WAAW,EAAE,KAAK,EAClB,gBAAgB,EAAE,KAAK,EACvB,UAAU,EAAE,KAAK,EACjB,cAAc,EAAE,6BAAc,CAAC,IAAI;QACnC,yGAAyG;QACzG,eAAe,EAAE,MAAM,CAAC,WAAW;YACjC,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,MAAA,MAAM,CAAC,eAAe,mCAAI,MAAM,EACpC,UAAU,EAAE,MAAM,CAAC,UAAU,IAAI,MAAM,CAAC,UAAU,IAC/C,MAAM,CACV,CAAC;IAEF,MAAM,IAAI,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC1C,MAAM,gBAAgB,GAAG,OAAO,CAAC,SAAS;QACxC,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,IAAI,IAAI,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;QACrE,CAAC,CAAC,IAAI,CAAC;IAET,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IAE5E,MAAM,WAAW,GAAG,gBAAgB;SACjC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC;SAClC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IACxB,MAAM,QAAQ,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC;IAC/D,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;IAEjE,MAAM,UAAU,GAAG,GAAG,IAAA,cAAK,EAAC,QAAQ,CAAC,CAAC,SAAS,QAAQ,CAAC;IACxD,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI;QAC7B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9C,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,UAAU,GAAG,GAAG,WAAW,YAAY,QAAQ,YAAY,CAAC;IAClE,MAAM,MAAM,GAAG,IAAA,yBAAe,EAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAEzD,OAAO,CAAC,gBAAgB,GAAG,MAAA,OAAO,CAAC,gBAAgB,mCAAI,mBAAmB,CAAC;IAE3E,MAAM,UAAU,GACd,OAAO,CAAC,UAAU,IAAI,IAAA,oBAAa,EAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;IAElE,wEAAwE;IACxE,uDAAuD;IACvD,MAAM,iBAAiB,GAAG,IAAA,yBAAgB,EAAC,IAAI,CAAC,CAAC;IACjD,IAAI,cAAc,GAAG,IAAI,CAAC;IAC1B,IAAI,iBAAiB,EAAE;QACrB,CAAC,EAAE,cAAc,EAAE,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC;KAC1D;IACD,MAAM,qBAAqB,GAAG,cAAc;QAC1C,CAAC,CAAC,GAAG,cAAc,IAAI,WAAW,EAAE;QACpC,CAAC,CAAC,WAAW,CAAC;IAEhB,MAAM,oBAAoB,mCACrB,OAAO,KACV,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,eAAM,CAAC,MAAM,EACvC,cAAc,EAAE,MAAA,OAAO,CAAC,cAAc,mCAAI,6BAAc,CAAC,IAAI,EAC7D,MAAM,EACN,IAAI,EAAE,WAAW,EACjB,WAAW,EACX,SAAS,EAAE,OAAO,EAClB,UAAU;QACV,gBAAgB;QAChB,UAAU;QACV,UAAU;QACV,QAAQ;QACR,UAAU;QACV,qBAAqB,EACrB,uBAAuB,EAAE,GAAG,IAAA,cAAK,EAAC,IAAI,CAAC,CAAC,SAAS,WAAW,GAC7D,CAAC;IAEF,MAAM,EACJ,YAAY,EACZ,WAAW,EACX,cAAc,EACd,iBAAiB,EACjB,eAAe,EACf,KAAK,EACL,SAAS,EACT,QAAQ,EACR,YAAY,KAEV,oBAAoB,EADnB,cAAc,kBACf,oBAAoB,EAXlB,2IAWL,CAAuB,CAAC;IAEzB,OAAO;QACL,cAAc;QACd,gBAAgB,EAAE;YAChB,IAAI,EAAE,cAAc,CAAC,IAAI;YACzB,UAAU,EAAE,cAAc,CAAC,UAAU;YACrC,YAAY;YACZ,WAAW;YACX,cAAc;YACd,iBAAiB;YACjB,eAAe;YACf,KAAK;YACL,SAAS;YACT,QAAQ;YACR,YAAY;SACb;KACF,CAAC;AACJ,CAAC;AAxGD,4CAwGC"}
+{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/normalize-options.ts"],"names":[],"mappings":"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"}

package/src/generators/library/lib/normalized-schema.d.ts

@@ -1,11 +1,11 @@
 import { UnitTestRunner } from '../../../utils/test-runners';
-import type { AngularLinter } from '../schema';
+import type { Linter } from '@nrwl/linter';
 export interface NormalizedSchema {
     libraryOptions: {
         name: string;
         addTailwind?: boolean;
         skipFormat?: boolean;
-        simpleModuleName?: boolean;
+        simpleName?: boolean;
         addModuleSpec?: boolean;
         directory?: string;
         sourceDir?: string;
@@ -14,11 +14,10 @@ export interface NormalizedSchema {
         importPath?: string;
         standaloneConfig?: boolean;
         spec?: boolean;
-        flat?: boolean;
         commonModule?: boolean;
         routing?: boolean;
         lazy?: boolean;
-        parentModule?: string;
+        parent?: string;
         tags?: string;
         strict?: boolean;
         compilationMode?: 'full' | 'partial';
@@ -27,7 +26,7 @@ export interface NormalizedSchema {
         skipPackageJson?: boolean;
         skipPostInstall?: boolean;
         standalone?: boolean;
-        linter: AngularLinter;
+        linter: Linter;
         unitTestRunner: UnitTestRunner;
         prefix: string;
         fileName: string;
@@ -52,5 +51,6 @@ export interface NormalizedSchema {
         skipTests?: boolean;
         selector?: string;
         skipSelector?: boolean;
+        flat?: boolean;
     };
 }

package/src/generators/library/lib/update-ng-package.js

@@ -6,7 +6,7 @@ function updateNgPackage(host, options) {
     if (!(options.publishable || options.buildable)) {
         return;
     }
-    const dest = (0, devkit_1.joinPathFragments)((0, devkit_1.offsetFromRoot)(options.projectRoot), 'dist', (0, devkit_1.getWorkspaceLayout)(host).libsDir, options.projectDirectory);
+    const dest = (0, devkit_1.joinPathFragments)((0, devkit_1.offsetFromRoot)(options.projectRoot), 'dist', options.projectRoot);
     (0, devkit_1.updateJson)(host, `${options.projectRoot}/ng-package.json`, (json) => {
         let $schema = json.$schema;
         if (json.$schema && json.$schema.indexOf('node_modules') >= 0) {

package/src/generators/library/lib/update-ng-package.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-ng-package.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-ng-package.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AAGtB,SAAgB,eAAe,CAC7B,IAAU,EACV,OAA2C;IAE3C,IAAI,CAAC,CAAC,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,SAAS,CAAC,EAAE;QAC/C,OAAO;KACR;IAED,MAAM,IAAI,GAAG,IAAA,0BAAiB,EAC5B,IAAA,uBAAc,EAAC,OAAO,CAAC,WAAW,CAAC,EACnC,MAAM,EACN,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,OAAO,EAChC,OAAO,CAAC,gBAAgB,CACzB,CAAC;IAEF,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,kBAAkB,EAAE,CAAC,IAAI,EAAE,EAAE;QAClE,IAAI,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC3B,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE;YAC7D,OAAO,GAAG,GAAG,IAAA,uBAAc,EAAC,OAAO,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CACvE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,EACpC,IAAI,CAAC,OAAO,CAAC,MAAM,CACpB,EAAE,CAAC;SACL;QACD,uCACK,IAAI,KACP,IAAI;YACJ,OAAO,IACP;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AA7BD,0CA6BC"}
+{"version":3,"file":"update-ng-package.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-ng-package.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AAGtB,SAAgB,eAAe,CAC7B,IAAU,EACV,OAA2C;IAE3C,IAAI,CAAC,CAAC,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,SAAS,CAAC,EAAE;QAC/C,OAAO;KACR;IAED,MAAM,IAAI,GAAG,IAAA,0BAAiB,EAC5B,IAAA,uBAAc,EAAC,OAAO,CAAC,WAAW,CAAC,EACnC,MAAM,EACN,OAAO,CAAC,WAAW,CACpB,CAAC;IAEF,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,kBAAkB,EAAE,CAAC,IAAI,EAAE,EAAE;QAClE,IAAI,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC3B,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE;YAC7D,OAAO,GAAG,GAAG,IAAA,uBAAc,EAAC,OAAO,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CACvE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,EACpC,IAAI,CAAC,OAAO,CAAC,MAAM,CACpB,EAAE,CAAC;SACL;QACD,uCACK,IAAI,KACP,IAAI;YACJ,OAAO,IACP;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AA5BD,0CA4BC"}

package/src/generators/library/lib/update-project.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateProject = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
-const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
-const cli_config_utils_1 = require("@nrwl/workspace/src/utils/cli-config-utils");
-const path = require("path");
+const js_1 = require("@nrwl/js");
+const cli_config_utils_1 = require("../../../utils/cli-config-utils");
 const update_ng_package_1 = require("./update-ng-package");
+const path_1 = require("path");
 function updateProject(host, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         createFiles(host, options);
@@ -19,30 +19,30 @@ function updateProject(host, options) {
 exports.updateProject = updateProject;
 function updateFiles(host, options) {
     const libRoot = `${options.projectRoot}/src/lib/`;
-    const serviceSpecPath = path.join(libRoot, `${options.name}.service.spec.ts`);
-    const componentSpecPath = path.join(libRoot, `${options.name}.component.spec.ts`);
-    host.delete(path.join(libRoot, `${options.name}.service.ts`));
+    const serviceSpecPath = (0, devkit_1.joinPathFragments)(libRoot, `${options.name}.service.spec.ts`);
+    const componentSpecPath = (0, devkit_1.joinPathFragments)(libRoot, `${options.name}.component.spec.ts`);
+    host.delete((0, devkit_1.joinPathFragments)(libRoot, `${options.name}.service.ts`));
     if (host.exists(serviceSpecPath)) {
         host.delete(serviceSpecPath);
     }
-    host.delete(path.join(libRoot, `${options.name}.component.ts`));
+    host.delete((0, devkit_1.joinPathFragments)(libRoot, `${options.name}.component.ts`));
     if (host.exists(componentSpecPath)) {
-        host.delete(path.join(libRoot, `${options.name}.component.spec.ts`));
+        host.delete((0, devkit_1.joinPathFragments)(libRoot, `${options.name}.component.spec.ts`));
     }
     if (!options.publishable && !options.buildable) {
-        host.delete(path.join(options.projectRoot, 'ng-package.json'));
-        host.delete(path.join(options.projectRoot, 'package.json'));
-        host.delete(path.join(options.projectRoot, 'tsconfig.lib.prod.json'));
-        host.delete(path.join(options.projectRoot, '.browserslistrc'));
+        host.delete((0, devkit_1.joinPathFragments)(options.projectRoot, 'ng-package.json'));
+        host.delete((0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'));
+        host.delete((0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.lib.prod.json'));
+        host.delete((0, devkit_1.joinPathFragments)(options.projectRoot, '.browserslistrc'));
     }
-    host.delete(path.join(options.projectRoot, 'karma.conf.js'));
-    host.delete(path.join(options.projectRoot, 'src/test.ts'));
-    host.delete(path.join(options.projectRoot, 'tsconfig.spec.json'));
+    host.delete((0, devkit_1.joinPathFragments)(options.projectRoot, 'karma.conf.js'));
+    host.delete((0, devkit_1.joinPathFragments)(options.projectRoot, 'src/test.ts'));
+    host.delete((0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.spec.json'));
     if (options.name !== options.fileName) {
-        host.delete(path.join(libRoot, `${options.name}.module.ts`));
+        host.delete((0, devkit_1.joinPathFragments)(libRoot, `${options.name}.module.ts`));
     }
     if (!options.skipModule && !options.standalone) {
-        host.write(path.join(libRoot, `${options.fileName}.module.ts`), `
+        host.write((0, devkit_1.joinPathFragments)(libRoot, `${options.fileName}.module.ts`), `
         import { NgModule } from '@angular/core';
         import { CommonModule } from '@angular/common';
         
@@ -54,7 +54,7 @@ function updateFiles(host, options) {
         export class ${options.moduleName} { }
         `);
         if (options.unitTestRunner !== 'none' && options.addModuleSpec) {
-            host.write(path.join(libRoot, `${options.fileName}.module.spec.ts`), `
+            host.write((0, devkit_1.joinPathFragments)(libRoot, `${options.fileName}.module.spec.ts`), `
     import { async, TestBed } from '@angular/core/testing';
     import { ${options.moduleName} } from './${options.fileName}.module';
     
@@ -87,7 +87,7 @@ function updateFiles(host, options) {
         `);
 }
 function createFiles(host, options) {
-    (0, devkit_1.generateFiles)(host, path.join(__dirname, '../files/lib'), options.projectRoot, Object.assign(Object.assign({}, options), { rootTsConfigPath: (0, typescript_1.getRelativePathToRootTsConfig)(host, options.projectRoot), tpl: '' }));
+    (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/lib'), options.projectRoot, Object.assign(Object.assign({}, options), { rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(host, options.projectRoot), tpl: '' }));
 }
 function fixProjectWorkspaceConfig(host, options) {
     let project = (0, devkit_1.readProjectConfiguration)(host, options.name);
@@ -108,9 +108,7 @@ function fixProjectWorkspaceConfig(host, options) {
         const _a = project.targets.build, { executor } = _a, rest = tslib_1.__rest(_a, ["executor"]);
         project.targets.build = Object.assign({ executor: options.publishable
                 ? '@nrwl/angular:package'
-                : '@nrwl/angular:ng-packagr-lite', outputs: [
-                (0, devkit_1.joinPathFragments)('dist', (0, devkit_1.getWorkspaceLayout)(host).libsDir, options.projectDirectory),
-            ] }, rest);
+                : '@nrwl/angular:ng-packagr-lite', outputs: ['{workspaceRoot}/dist/{projectRoot}'] }, rest);
     }
     delete project.targets.test;
     /**
@@ -132,13 +130,19 @@ function updateProjectTsConfig(host, options) {
     }
     (0, devkit_1.updateJson)(host, `${options.projectRoot}/tsconfig.lib.json`, (json) => {
         if (options.unitTestRunner === 'jest') {
-            json.exclude = ['src/test-setup.ts', '**/*.spec.ts'];
+            json.exclude = ['src/test-setup.ts', 'src/**/*.spec.ts'];
         }
         else if (options.unitTestRunner === 'none') {
             json.exclude = [];
         }
         else {
             json.exclude = json.exclude || [];
+            json.exclude = json.exclude.map((v) => {
+                if (v.startsWith('**/*')) {
+                    return v.replace('**/*', 'src/**/*');
+                }
+                return v;
+            });
         }
         return Object.assign(Object.assign({}, json), { extends: `./tsconfig.json`, compilerOptions: Object.assign(Object.assign({}, json.compilerOptions), { outDir: `${(0, devkit_1.offsetFromRoot)(options.projectRoot)}dist/out-tsc` }) });
     });

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

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

package/src/generators/library/lib/update-tsconfig.d.ts

@@ -1,3 +1,3 @@
-import { Tree } from '@nrwl/devkit';
+import type { Tree } from '@nrwl/devkit';
 import { NormalizedSchema } from './normalized-schema';
 export declare function updateTsConfig(host: Tree, options: NormalizedSchema['libraryOptions']): void;