@rxap/plugin-angular 16.1.0-dev.10 → 16.1.0-dev.12

package/CHANGELOG.md

@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [16.1.0-dev.12](https://gitlab.com/rxap/packages/compare/@rxap/plugin-angular@16.1.0-dev.11...@rxap/plugin-angular@16.1.0-dev.12) (2023-08-31)
+
+### Bug Fixes
+
+- add project ts-morph ([f17725d](https://gitlab.com/rxap/packages/commit/f17725dccf31d3f5fab9087e103e19ad5df43246))
+- ensure overwrite option is passed to sub schematics ([8472aab](https://gitlab.com/rxap/packages/commit/8472aab8814227c851fab9ae4c1b9ec3019d6f4e))
+- ensure the project name is not included in the project tag list ([b131ac3](https://gitlab.com/rxap/packages/commit/b131ac3bd92b3b8799d62f15bbd30a1997d7c753))
+
+### Features
+
+- coerce default application environments ([6608a7e](https://gitlab.com/rxap/packages/commit/6608a7e8e074ce207a1a405906cc07d0f1e4a8d8))
+
+# [16.1.0-dev.11](https://gitlab.com/rxap/packages/compare/@rxap/plugin-angular@16.1.0-dev.10...@rxap/plugin-angular@16.1.0-dev.11) (2023-08-17)
+
+### Reverts
+
+- change from commonjs to es2022 ([747a381](https://gitlab.com/rxap/packages/commit/747a381a090f0a276cf363da61bb19ed0c9cb5b7))
+
 # [16.1.0-dev.10](https://gitlab.com/rxap/packages/compare/@rxap/plugin-angular@16.1.0-dev.9...@rxap/plugin-angular@16.1.0-dev.10) (2023-08-16)
 
 ### Bug Fixes

package/README.md

@@ -19,7 +19,7 @@ yarn add @rxap/plugin-angular
 ```
 **Install peer dependencies:**
 ```bash
-yarn add @nx/devkit@^16.5.0 @rxap/generator-utilities@^1.1.0-dev.4 @rxap/plugin-localazy@^16.1.0-dev.3 @rxap/plugin-utilities@^16.1.0-dev.6 @rxap/schematics-ts-morph@^16.0.0-dev.10 @rxap/workspace-ts-morph@^0.1.0-dev.0 @rxap/workspace-utilities@^0.1.0-dev.3 nx@^16.5.0 ts-morph@^18.0.0 
+yarn add @nx/devkit@^16.5.0 @rxap/generator-utilities@^1.1.0-dev.7 @rxap/plugin-localazy@^16.1.0-dev.6 @rxap/plugin-utilities@^16.1.0-dev.9 @rxap/ts-morph@^0.1.0-dev.0 @rxap/workspace-ts-morph@^0.1.0-dev.3 @rxap/workspace-utilities@^0.1.0-dev.6 nx@^16.5.0 ts-morph@^18.0.0 
 ```
 **Execute the init generator:**
 ```bash

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rxap/plugin-angular",
-  "version": "16.1.0-dev.10",
-  "type": "module",
+  "version": "16.1.0-dev.12",
+  "type": "commonjs",
   "generators": "./generators.json",
   "publishConfig": {
     "access": "public",
@@ -13,7 +13,8 @@
     "nx",
     "nx-plugin",
     "packages",
-    "angular"
+    "angular",
+    "plugin-angular"
   ],
   "homepage": "https:/gitlab.com/rxap/packages/packages/plugin/angular",
   "bugs": {
@@ -39,49 +40,52 @@
   },
   "peerDependencies": {
     "@nx/devkit": "^16.5.0",
-    "@rxap/generator-utilities": "^1.1.0-dev.4",
-    "@rxap/plugin-localazy": "^16.1.0-dev.3",
-    "@rxap/plugin-utilities": "^16.1.0-dev.6",
-    "@rxap/schematics-ts-morph": "^16.0.0-dev.10",
-    "@rxap/workspace-ts-morph": "^0.1.0-dev.0",
-    "@rxap/workspace-utilities": "^0.1.0-dev.3",
+    "@rxap/generator-utilities": "^1.1.0-dev.7",
+    "@rxap/plugin-localazy": "^16.1.0-dev.6",
+    "@rxap/plugin-utilities": "^16.1.0-dev.9",
+    "@rxap/ts-morph": "^0.1.0-dev.0",
+    "@rxap/workspace-ts-morph": "^0.1.0-dev.3",
+    "@rxap/workspace-utilities": "^0.1.0-dev.6",
     "nx": "^16.5.0",
     "ts-morph": "^18.0.0",
-    "@rxap/node-utilities": "1.1.0-dev.2",
-    "@rxap/schematics-utilities": "16.0.0-dev.8",
-    "@rxap/utilities": "16.0.0-dev.10"
+    "@rxap/node-utilities": "1.1.0-dev.4",
+    "@rxap/utilities": "16.0.0-dev.13"
   },
   "nx-migrations": {
     "packageGroup": [
       {
         "package": "@rxap/generator-utilities",
-        "version": "1.1.0-dev.4"
+        "version": "1.1.0-dev.7"
       },
       {
         "package": "@rxap/plugin-localazy",
-        "version": "16.1.0-dev.3"
+        "version": "16.1.0-dev.6"
       },
       {
         "package": "@rxap/plugin-utilities",
-        "version": "16.1.0-dev.6"
+        "version": "16.1.0-dev.9"
       },
       {
-        "package": "@rxap/schematics-ts-morph",
-        "version": "16.0.0-dev.10"
+        "package": "@rxap/ts-morph",
+        "version": "0.1.0-dev.0"
       },
       {
         "package": "@rxap/workspace-ts-morph",
-        "version": "0.1.0-dev.0"
+        "version": "0.1.0-dev.3"
       },
       {
         "package": "@rxap/workspace-utilities",
-        "version": "0.1.0-dev.3"
+        "version": "0.1.0-dev.6"
+      },
+      {
+        "package": "@rxap/schematics-ts-morph",
+        "version": "16.0.0-dev.12"
       }
     ]
   },
   "executors": "./executors.json",
   "schematics": "./generators.json",
-  "gitHead": "bbab80e59acbe435a02e69c9fec022780cf4640d",
+  "gitHead": "3d49d0a2548a0c403ad55c564108b54ba734a677",
   "main": "./src/index.js",
   "types": "./src/index.d.ts"
 }

package/src/executors/check-ng-package/executor.js

@@ -1,24 +1,30 @@
-import { readFileFromProjectRoot } from '@rxap/plugin-utilities';
-export default async function runExecutor(options, context) {
-    console.log('Executor ran for CheckNgPackage', options);
-    const ngPackage = JSON.parse(readFileFromProjectRoot(context, 'ng-package.json', true));
-    const { dependencies } = JSON.parse(readFileFromProjectRoot(context, 'package.json', true));
-    if (ngPackage.allowedNonPeerDependencies) {
-        const wrongPackages = [];
-        for (const packageName of ngPackage.allowedNonPeerDependencies) {
-            if (!dependencies[packageName]) {
-                wrongPackages.push(packageName);
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const plugin_utilities_1 = require("@rxap/plugin-utilities");
+function runExecutor(options, context) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        console.log('Executor ran for CheckNgPackage', options);
+        const ngPackage = JSON.parse((0, plugin_utilities_1.readFileFromProjectRoot)(context, 'ng-package.json', true));
+        const { dependencies } = JSON.parse((0, plugin_utilities_1.readFileFromProjectRoot)(context, 'package.json', true));
+        if (ngPackage.allowedNonPeerDependencies) {
+            const wrongPackages = [];
+            for (const packageName of ngPackage.allowedNonPeerDependencies) {
+                if (!dependencies[packageName]) {
+                    wrongPackages.push(packageName);
+                }
+            }
+            if (wrongPackages.length) {
+                console.log(`\x1b[31mSome packages in the allowed non peer dependencies list are not in the package.json dependencies list:\x1b[0m\n - ${wrongPackages.join('\n - ')}`);
+                return {
+                    success: false,
+                };
             }
         }
-        if (wrongPackages.length) {
-            console.log(`\x1b[31mSome packages in the allowed non peer dependencies list are not in the package.json dependencies list:\x1b[0m\n - ${wrongPackages.join('\n - ')}`);
-            return {
-                success: false,
-            };
-        }
-    }
-    return {
-        success: true,
-    };
+        return {
+            success: true,
+        };
+    });
 }
+exports.default = runExecutor;
 //# sourceMappingURL=executor.js.map

package/src/executors/check-ng-package/executor.js.map

@@ -1 +1 @@
-{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/angular/src/executors/check-ng-package/executor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AAGjE,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,WAAW,CACvC,OAAqC,EACrC,OAAwB;IAExB,OAAO,CAAC,GAAG,CAAC,iCAAiC,EAAE,OAAO,CAAC,CAAC;IAExD,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,uBAAuB,CAAC,OAAO,EAAE,iBAAiB,EAAE,IAAI,CAAC,CAAC,CAAC;IACxF,MAAM,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,uBAAuB,CAAC,OAAO,EAAE,cAAc,EAAE,IAAI,CAAC,CAAC,CAAC;IAE5F,IAAI,SAAS,CAAC,0BAA0B,EAAE;QACxC,MAAM,aAAa,GAAa,EAAE,CAAC;QACnC,KAAK,MAAM,WAAW,IAAI,SAAS,CAAC,0BAA0B,EAAE;YAC9D,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE;gBAC9B,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;aACjC;SACF;QACD,IAAI,aAAa,CAAC,MAAM,EAAE;YACxB,OAAO,CAAC,GAAG,CAAC,6HAA8H,aAAa,CAAC,IAAI,CAC1J,OAAO,CAAE,EAAE,CAAC,CAAC;YACf,OAAO;gBACL,OAAO,EAAE,KAAK;aACf,CAAC;SACH;KACF;IAED,OAAO;QACL,OAAO,EAAE,IAAI;KACd,CAAC;AACJ,CAAC"}
+{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/angular/src/executors/check-ng-package/executor.ts"],"names":[],"mappings":";;;AACA,6DAAiE;AAGjE,SAA8B,WAAW,CACvC,OAAqC,EACrC,OAAwB;;QAExB,OAAO,CAAC,GAAG,CAAC,iCAAiC,EAAE,OAAO,CAAC,CAAC;QAExD,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,0CAAuB,EAAC,OAAO,EAAE,iBAAiB,EAAE,IAAI,CAAC,CAAC,CAAC;QACxF,MAAM,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,0CAAuB,EAAC,OAAO,EAAE,cAAc,EAAE,IAAI,CAAC,CAAC,CAAC;QAE5F,IAAI,SAAS,CAAC,0BAA0B,EAAE;YACxC,MAAM,aAAa,GAAa,EAAE,CAAC;YACnC,KAAK,MAAM,WAAW,IAAI,SAAS,CAAC,0BAA0B,EAAE;gBAC9D,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE;oBAC9B,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;iBACjC;aACF;YACD,IAAI,aAAa,CAAC,MAAM,EAAE;gBACxB,OAAO,CAAC,GAAG,CAAC,6HAA8H,aAAa,CAAC,IAAI,CAC1J,OAAO,CAAE,EAAE,CAAC,CAAC;gBACf,OAAO;oBACL,OAAO,EAAE,KAAK;iBACf,CAAC;aACH;SACF;QAED,OAAO;YACL,OAAO,EAAE,IAAI;SACd,CAAC;IACJ,CAAC;CAAA;AA5BD,8BA4BC"}

package/src/executors/tailwind/executor.js

@@ -1,23 +1,29 @@
-import { GetProjectRoot } from '@rxap/plugin-utilities';
-import run from 'nx/src/executors/run-commands/run-commands.impl';
-export default async function runExecutor(options, context) {
-    console.log('Executor ran for Tailwind', options);
-    const projectRoot = GetProjectRoot(context);
-    const args = [
-        ['config', options.config],
-        ['input', options.input],
-        ['output', options.output],
-    ];
-    if (options.minify) {
-        args.push(['minify']);
-    }
-    const argsString = args.map(([key, value]) => value ? `--${key} ${value}` : `--${key}`).join(' ');
-    const command = `tailwindcss ${argsString}`;
-    console.log('command: ', command);
-    return run({
-        cwd: projectRoot,
-        command,
-        __unparsed__: [],
-    }, context);
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const plugin_utilities_1 = require("@rxap/plugin-utilities");
+const run_commands_impl_1 = require("nx/src/executors/run-commands/run-commands.impl");
+function runExecutor(options, context) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        console.log('Executor ran for Tailwind', options);
+        const projectRoot = (0, plugin_utilities_1.GetProjectRoot)(context);
+        const args = [
+            ['config', options.config],
+            ['input', options.input],
+            ['output', options.output],
+        ];
+        if (options.minify) {
+            args.push(['minify']);
+        }
+        const argsString = args.map(([key, value]) => value ? `--${key} ${value}` : `--${key}`).join(' ');
+        const command = `tailwindcss ${argsString}`;
+        console.log('command: ', command);
+        return (0, run_commands_impl_1.default)({
+            cwd: projectRoot,
+            command,
+            __unparsed__: [],
+        }, context);
+    });
 }
+exports.default = runExecutor;
 //# sourceMappingURL=executor.js.map

package/src/executors/tailwind/executor.js.map

@@ -1 +1 @@
-{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/angular/src/executors/tailwind/executor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,GAAG,MAAM,iDAAiD,CAAC;AAGlE,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,WAAW,CAAC,OAA+B,EAAE,OAAwB;IACjG,OAAO,CAAC,GAAG,CAAC,2BAA2B,EAAE,OAAO,CAAC,CAAC;IAElD,MAAM,WAAW,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;IAE5C,MAAM,IAAI,GAAG;QACX,CAAE,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAE;QAC5B,CAAE,OAAO,EAAE,OAAO,CAAC,KAAK,CAAE;QAC1B,CAAE,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAE;KAC7B,CAAC;IAEF,IAAI,OAAO,CAAC,MAAM,EAAE;QAClB,IAAI,CAAC,IAAI,CAAC,CAAE,QAAQ,CAAE,CAAC,CAAC;KACzB;IAED,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAE,GAAG,EAAE,KAAK,CAAE,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,KAAM,GAAI,IAAK,KAAM,EAAE,CAAC,CAAC,CAAC,KAAM,GAAI,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAE1G,MAAM,OAAO,GAAG,eAAgB,UAAW,EAAE,CAAC;IAE9C,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAElC,OAAO,GAAG,CAAC;QACT,GAAG,EAAE,WAAW;QAChB,OAAO;QACP,YAAY,EAAE,EAAE;KACjB,EAAE,OAAO,CAAC,CAAC;AACd,CAAC"}
+{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/angular/src/executors/tailwind/executor.ts"],"names":[],"mappings":";;;AACA,6DAAwD;AACxD,uFAAkE;AAGlE,SAA8B,WAAW,CAAC,OAA+B,EAAE,OAAwB;;QACjG,OAAO,CAAC,GAAG,CAAC,2BAA2B,EAAE,OAAO,CAAC,CAAC;QAElD,MAAM,WAAW,GAAG,IAAA,iCAAc,EAAC,OAAO,CAAC,CAAC;QAE5C,MAAM,IAAI,GAAG;YACX,CAAE,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAE;YAC5B,CAAE,OAAO,EAAE,OAAO,CAAC,KAAK,CAAE;YAC1B,CAAE,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAE;SAC7B,CAAC;QAEF,IAAI,OAAO,CAAC,MAAM,EAAE;YAClB,IAAI,CAAC,IAAI,CAAC,CAAE,QAAQ,CAAE,CAAC,CAAC;SACzB;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAE,GAAG,EAAE,KAAK,CAAE,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,KAAM,GAAI,IAAK,KAAM,EAAE,CAAC,CAAC,CAAC,KAAM,GAAI,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAE1G,MAAM,OAAO,GAAG,eAAgB,UAAW,EAAE,CAAC;QAE9C,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAElC,OAAO,IAAA,2BAAG,EAAC;YACT,GAAG,EAAE,WAAW;YAChB,OAAO;YACP,YAAY,EAAE,EAAE;SACjB,EAAE,OAAO,CAAC,CAAC;IACd,CAAC;CAAA;AA1BD,8BA0BC"}

package/src/generators/fix-schematic/generator.js

@@ -1,58 +1,66 @@
-import { GetProjectRoot, GetProjectSourceRoot, VisitTree, } from '@rxap/generator-utilities';
-import { dirname, join, relative, } from 'path';
-export async function fixSchematicGenerator(tree, options) {
-    const projectRoot = GetProjectRoot(tree, options.project);
-    const schematicsSourceRoot = join(GetProjectSourceRoot(tree, options.project), 'schematics');
-    if (!tree.exists(schematicsSourceRoot)) {
-        console.warn(`The schematics source root ${schematicsSourceRoot} does not exists!`);
-        return;
-    }
-    const packageJson = JSON.parse(tree.read(join(projectRoot, 'package.json')).toString('utf-8'));
-    if (!packageJson.schematics) {
-        console.warn(`The package.json file does not contains schematics property!`);
-        return;
-    }
-    const collectionFile = join(projectRoot, packageJson.schematics);
-    if (!tree.exists(collectionFile)) {
-        console.warn(`The collection file ${collectionFile} does not exists!`);
-        return;
-    }
-    const collection = JSON.parse(tree.read(collectionFile).toString('utf-8'));
-    collection.schematics ??= {};
-    const { schematics } = collection;
-    const detectedSchemaJsonFiles = [];
-    for (const { path, isFile } of VisitTree(tree, schematicsSourceRoot)) {
-        if (isFile && path.endsWith('schema.json')) {
-            detectedSchemaJsonFiles.push('./' + relative(projectRoot, path));
-        }
-    }
-    const notDefinedSchematics = detectedSchemaJsonFiles
-        .filter(schemaJsonFile => !Object.values(schematics)
-        .some((schematic) => schematic.schema === schemaJsonFile));
-    console.log(`Not defined schematics: ${notDefinedSchematics.length}`);
-    if (notDefinedSchematics.length) {
-        console.log(` - ${notDefinedSchematics.join('\n - ')}`);
-    }
-    else {
-        console.log('All schematics are defined');
-    }
-    for (const schemaJsonFile of notDefinedSchematics) {
-        const basePath = dirname(schemaJsonFile);
-        const schematicName = basePath.split('/').pop();
-        if (schematics[schematicName]) {
-            console.warn(`The schematic ${schematicName} is already defined!`);
-            continue;
-        }
-        schematics[schematicName] = {
-            schema: schemaJsonFile,
-            factory: `${basePath}/index`,
-        };
-    }
-    for (const [name, schematic] of Object.entries(schematics)) {
-        schematic['description'] ??= `The ${name} schematic`;
-    }
-    console.log('Update collection file');
-    tree.write(collectionFile, JSON.stringify(collection, null, 2));
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fixSchematicGenerator = void 0;
+const tslib_1 = require("tslib");
+const generator_utilities_1 = require("@rxap/generator-utilities");
+const path_1 = require("path");
+function fixSchematicGenerator(tree, options) {
+    var _a, _b;
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const projectRoot = (0, generator_utilities_1.GetProjectRoot)(tree, options.project);
+        const schematicsSourceRoot = (0, path_1.join)((0, generator_utilities_1.GetProjectSourceRoot)(tree, options.project), 'schematics');
+        if (!tree.exists(schematicsSourceRoot)) {
+            console.warn(`The schematics source root ${schematicsSourceRoot} does not exists!`);
+            return;
+        }
+        const packageJson = JSON.parse(tree.read((0, path_1.join)(projectRoot, 'package.json')).toString('utf-8'));
+        if (!packageJson.schematics) {
+            console.warn(`The package.json file does not contains schematics property!`);
+            return;
+        }
+        const collectionFile = (0, path_1.join)(projectRoot, packageJson.schematics);
+        if (!tree.exists(collectionFile)) {
+            console.warn(`The collection file ${collectionFile} does not exists!`);
+            return;
+        }
+        const collection = JSON.parse(tree.read(collectionFile).toString('utf-8'));
+        (_a = collection.schematics) !== null && _a !== void 0 ? _a : (collection.schematics = {});
+        const { schematics } = collection;
+        const detectedSchemaJsonFiles = [];
+        for (const { path, isFile } of (0, generator_utilities_1.VisitTree)(tree, schematicsSourceRoot)) {
+            if (isFile && path.endsWith('schema.json')) {
+                detectedSchemaJsonFiles.push('./' + (0, path_1.relative)(projectRoot, path));
+            }
+        }
+        const notDefinedSchematics = detectedSchemaJsonFiles
+            .filter(schemaJsonFile => !Object.values(schematics)
+            .some((schematic) => schematic.schema === schemaJsonFile));
+        console.log(`Not defined schematics: ${notDefinedSchematics.length}`);
+        if (notDefinedSchematics.length) {
+            console.log(` - ${notDefinedSchematics.join('\n - ')}`);
+        }
+        else {
+            console.log('All schematics are defined');
+        }
+        for (const schemaJsonFile of notDefinedSchematics) {
+            const basePath = (0, path_1.dirname)(schemaJsonFile);
+            const schematicName = basePath.split('/').pop();
+            if (schematics[schematicName]) {
+                console.warn(`The schematic ${schematicName} is already defined!`);
+                continue;
+            }
+            schematics[schematicName] = {
+                schema: schemaJsonFile,
+                factory: `${basePath}/index`,
+            };
+        }
+        for (const [name, schematic] of Object.entries(schematics)) {
+            (_b = schematic['description']) !== null && _b !== void 0 ? _b : (schematic['description'] = `The ${name} schematic`);
+        }
+        console.log('Update collection file');
+        tree.write(collectionFile, JSON.stringify(collection, null, 2));
+    });
 }
-export default fixSchematicGenerator;
+exports.fixSchematicGenerator = fixSchematicGenerator;
+exports.default = fixSchematicGenerator;
 //# sourceMappingURL=generator.js.map

package/src/generators/fix-schematic/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/angular/src/generators/fix-schematic/generator.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EACd,oBAAoB,EACpB,SAAS,GACV,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,OAAO,EACP,IAAI,EACJ,QAAQ,GACT,MAAM,MAAM,CAAC;AAGd,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,IAAU,EACV,OAAoC;IAEpC,MAAM,WAAW,GAAG,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAC1D,MAAM,oBAAoB,GAAG,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,YAAY,CAAC,CAAC;IAE7F,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,EAAE;QACtC,OAAO,CAAC,IAAI,CAAC,8BAA+B,oBAAqB,mBAAmB,CAAC,CAAC;QACtF,OAAO;KACR;IAED,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;IAE/F,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE;QAC3B,OAAO,CAAC,IAAI,CAAC,8DAA8D,CAAC,CAAC;QAC7E,OAAO;KACR;IAED,MAAM,cAAc,GAAG,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;IAEjE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE;QAChC,OAAO,CAAC,IAAI,CAAC,uBAAwB,cAAe,mBAAmB,CAAC,CAAC;QACzE,OAAO;KACR;IAED,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;IAE3E,UAAU,CAAC,UAAU,KAAK,EAAE,CAAC;IAE7B,MAAM,EAAE,UAAU,EAAE,GAAG,UAAU,CAAC;IAElC,MAAM,uBAAuB,GAAa,EAAE,CAAC;IAE7C,KAAK,MAAM,EACT,IAAI,EACJ,MAAM,EACP,IAAI,SAAS,CAAC,IAAI,EAAE,oBAAoB,CAAC,EAAE;QAC1C,IAAI,MAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE;YAC1C,uBAAuB,CAAC,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC;SAClE;KACF;IAED,MAAM,oBAAoB,GAAa,uBAAuB;SAC3D,MAAM,CAAC,cAAc,CAAC,EAAE,CACvB,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC;SAClB,IAAI,CAAC,CAAC,SAAc,EAAE,EAAE,CAAC,SAAS,CAAC,MAAM,KAAK,cAAc,CAAC,CACtE,CAAC;IAEJ,OAAO,CAAC,GAAG,CAAC,2BAA4B,oBAAoB,CAAC,MAAO,EAAE,CAAC,CAAC;IACxE,IAAI,oBAAoB,CAAC,MAAM,EAAE;QAC/B,OAAO,CAAC,GAAG,CAAC,MAAO,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAE,EAAE,CAAC,CAAC;KAC3D;SAAM;QACL,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;KAC3C;IAED,KAAK,MAAM,cAAc,IAAI,oBAAoB,EAAE;QACjD,MAAM,QAAQ,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;QACzC,MAAM,aAAa,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAG,CAAC;QACjD,IAAI,UAAU,CAAC,aAAa,CAAC,EAAE;YAC7B,OAAO,CAAC,IAAI,CAAC,iBAAkB,aAAc,sBAAsB,CAAC,CAAC;YACrE,SAAS;SACV;QACD,UAAU,CAAC,aAAa,CAAC,GAAG;YAC1B,MAAM,EAAE,cAAc;YACtB,OAAO,EAAE,GAAI,QAAS,QAAQ;SAC/B,CAAC;KACH;IAED,KAAK,MAAM,CAAE,IAAI,EAAE,SAAS,CAAE,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;QAC5D,SAAS,CAAC,aAAa,CAAC,KAAK,OAAQ,IAAK,YAAY,CAAC;KACxD;IAED,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;IACtC,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;AAElE,CAAC;AAED,eAAe,qBAAqB,CAAC"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/angular/src/generators/fix-schematic/generator.ts"],"names":[],"mappings":"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"}

package/src/generators/fix-schematic/index.js

@@ -1,5 +1,7 @@
-import { convertNxGenerator } from '@nx/devkit';
-import generator from './generator';
-const schematic = convertNxGenerator(generator);
-export default schematic;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const devkit_1 = require("@nx/devkit");
+const generator_1 = require("./generator");
+const schematic = (0, devkit_1.convertNxGenerator)(generator_1.default);
+exports.default = schematic;
 //# sourceMappingURL=index.js.map

package/src/generators/fix-schematic/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/angular/src/generators/fix-schematic/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,SAAS,MAAM,aAAa,CAAC;AAEpC,MAAM,SAAS,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAC;AAChD,eAAe,SAAS,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/angular/src/generators/fix-schematic/index.ts"],"names":[],"mappings":";;AAAA,uCAAgD;AAChD,2CAAoC;AAEpC,MAAM,SAAS,GAAG,IAAA,2BAAkB,EAAC,mBAAS,CAAC,CAAC;AAChD,kBAAe,SAAS,CAAC"}

package/src/generators/init/generator.js

@@ -1,31 +1,38 @@
-import { getProjects, } from '@nx/devkit';
-import { CoerceCypressComponentTesting, HasComponents, } from '@rxap/generator-utilities';
-import { SkipNonAngularProject } from '../../lib/skip-project';
-import initApplicationGenerator from '../init-application/generator';
-import initLibraryGenerator from '../init-library/generator';
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.initGenerator = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nx/devkit");
+const generator_utilities_1 = require("@rxap/generator-utilities");
+const skip_project_1 = require("../../lib/skip-project");
+const generator_1 = require("../init-application/generator");
+const generator_2 = require("../init-library/generator");
 function skipProject(tree, options, project, projectName) {
-    if (SkipNonAngularProject(tree, options, project, projectName)) {
+    if ((0, skip_project_1.SkipNonAngularProject)(tree, options, project, projectName)) {
         return true;
     }
     return false;
 }
-export async function initGenerator(tree, options) {
-    console.log('angular init generator:', options);
-    for (const [projectName, project] of getProjects(tree).entries()) {
-        if (skipProject(tree, options, project, projectName)) {
-            continue;
+function initGenerator(tree, options) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        console.log('angular init generator:', options);
+        for (const [projectName, project] of (0, devkit_1.getProjects)(tree).entries()) {
+            if (skipProject(tree, options, project, projectName)) {
+                continue;
+            }
+            console.log(`init project: ${projectName}`);
+            if ((0, generator_utilities_1.HasComponents)(tree, project.root)) {
+                yield (0, generator_utilities_1.CoerceCypressComponentTesting)(tree, project, projectName);
+            }
+            if (project.projectType === 'library') {
+                yield (0, generator_2.default)(tree, Object.assign(Object.assign({}, options), { projects: [projectName] }));
+            }
+            if (project.projectType === 'application') {
+                yield (0, generator_1.default)(tree, Object.assign(Object.assign({}, options), { projects: [projectName] }));
+            }
         }
-        console.log(`init project: ${projectName}`);
-        if (HasComponents(tree, project.root)) {
-            await CoerceCypressComponentTesting(tree, project, projectName);
-        }
-        if (project.projectType === 'library') {
-            await initLibraryGenerator(tree, { ...options, projects: [projectName] });
-        }
-        if (project.projectType === 'application') {
-            await initApplicationGenerator(tree, { ...options, projects: [projectName] });
-        }
-    }
+    });
 }
-export default initGenerator;
+exports.initGenerator = initGenerator;
+exports.default = initGenerator;
 //# sourceMappingURL=generator.js.map

package/src/generators/init/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/angular/src/generators/init/generator.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,GAGZ,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,6BAA6B,EAC7B,aAAa,GACd,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,wBAAwB,MAAM,+BAA+B,CAAC;AACrE,OAAO,oBAAoB,MAAM,2BAA2B,CAAC;AAG7D,SAAS,WAAW,CAAC,IAAU,EAAE,OAA4B,EAAE,OAA6B,EAAE,WAAmB;IAE/G,IAAI,qBAAqB,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;QAC9D,OAAO,IAAI,CAAC;KACb;IAED,OAAO,KAAK,CAAC;AAEf,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,IAAU,EAAE,OAA4B;IAC1E,OAAO,CAAC,GAAG,CAAC,yBAAyB,EAAE,OAAO,CAAC,CAAC;IAEhD,KAAK,MAAM,CAAE,WAAW,EAAE,OAAO,CAAE,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;QAElE,IAAI,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;YACpD,SAAS;SACV;QAED,OAAO,CAAC,GAAG,CAAC,iBAAkB,WAAY,EAAE,CAAC,CAAC;QAE9C,IAAI,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE;YACrC,MAAM,6BAA6B,CAAC,IAAI,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;SACjE;QAED,IAAI,OAAO,CAAC,WAAW,KAAK,SAAS,EAAE;YACrC,MAAM,oBAAoB,CAAC,IAAI,EAAE,EAAE,GAAG,OAAO,EAAE,QAAQ,EAAE,CAAE,WAAW,CAAE,EAAE,CAAC,CAAC;SAC7E;QAED,IAAI,OAAO,CAAC,WAAW,KAAK,aAAa,EAAE;YACzC,MAAM,wBAAwB,CAAC,IAAI,EAAE,EAAE,GAAG,OAAO,EAAE,QAAQ,EAAE,CAAE,WAAW,CAAE,EAAE,CAAC,CAAC;SACjF;KAEF;AAEH,CAAC;AAED,eAAe,aAAa,CAAC"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/angular/src/generators/init/generator.ts"],"names":[],"mappings":";;;;AAAA,uCAIoB;AACpB,mEAGmC;AACnC,yDAA+D;AAC/D,6DAAqE;AACrE,yDAA6D;AAG7D,SAAS,WAAW,CAAC,IAAU,EAAE,OAA4B,EAAE,OAA6B,EAAE,WAAmB;IAE/G,IAAI,IAAA,oCAAqB,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;QAC9D,OAAO,IAAI,CAAC;KACb;IAED,OAAO,KAAK,CAAC;AAEf,CAAC;AAED,SAAsB,aAAa,CAAC,IAAU,EAAE,OAA4B;;QAC1E,OAAO,CAAC,GAAG,CAAC,yBAAyB,EAAE,OAAO,CAAC,CAAC;QAEhD,KAAK,MAAM,CAAE,WAAW,EAAE,OAAO,CAAE,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;YAElE,IAAI,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;gBACpD,SAAS;aACV;YAED,OAAO,CAAC,GAAG,CAAC,iBAAkB,WAAY,EAAE,CAAC,CAAC;YAE9C,IAAI,IAAA,mCAAa,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE;gBACrC,MAAM,IAAA,mDAA6B,EAAC,IAAI,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;aACjE;YAED,IAAI,OAAO,CAAC,WAAW,KAAK,SAAS,EAAE;gBACrC,MAAM,IAAA,mBAAoB,EAAC,IAAI,kCAAO,OAAO,KAAE,QAAQ,EAAE,CAAE,WAAW,CAAE,IAAG,CAAC;aAC7E;YAED,IAAI,OAAO,CAAC,WAAW,KAAK,aAAa,EAAE;gBACzC,MAAM,IAAA,mBAAwB,EAAC,IAAI,kCAAO,OAAO,KAAE,QAAQ,EAAE,CAAE,WAAW,CAAE,IAAG,CAAC;aACjF;SAEF;IAEH,CAAC;CAAA;AAzBD,sCAyBC;AAED,kBAAe,aAAa,CAAC"}

package/src/generators/init/index.js

@@ -1,5 +1,7 @@
-import { convertNxGenerator } from '@nx/devkit';
-import generator from './generator';
-const schematic = convertNxGenerator(generator);
-export default schematic;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const devkit_1 = require("@nx/devkit");
+const generator_1 = require("./generator");
+const schematic = (0, devkit_1.convertNxGenerator)(generator_1.default);
+exports.default = schematic;
 //# sourceMappingURL=index.js.map

package/src/generators/init/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/angular/src/generators/init/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,SAAS,MAAM,aAAa,CAAC;AAEpC,MAAM,SAAS,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAC;AAChD,eAAe,SAAS,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/angular/src/generators/init/index.ts"],"names":[],"mappings":";;AAAA,uCAAgD;AAChD,2CAAoC;AAEpC,MAAM,SAAS,GAAG,IAAA,2BAAkB,EAAC,mBAAS,CAAC,CAAC;AAChD,kBAAe,SAAS,CAAC"}

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

@@ -1,3 +1,4 @@
 export interface InitGeneratorSchema {
   projects?: string[];
+  overwrite?: boolean;
 }

package/src/generators/init/schema.json

@@ -10,6 +10,11 @@
       "items": {
         "type": "string"
       }
+    },
+    "overwrite": {
+      "type": "boolean",
+      "default": false,
+      "description": "Whether to overwrite existing files"
     }
   },
   "required": []