@o3r/schematics 8.2.0-alpha.9 → 8.2.0-alpha.90

package/LICENSE

@@ -1,26 +1,26 @@
-Copyright Amadeus SAS
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation and/or
-other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors
-may be used to endorse or promote products derived from this software without
-specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Copyright Amadeus SAS
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors
+may be used to endorse or promote products derived from this software without
+specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

package/README.md

@@ -1,212 +1,24 @@
-<h1 align="center">Otter Framework</h1>
+<h1 align="center">Otter schematics</h1>
 <p align="center">
-  <img src="./.attachments/logo.png" alt="Super cute Otter!"/>
+  <img src="../../../.attachments/otter.png" alt="Super cute Otter!" width="40%"/>
 </p>
 
+This package is an [Otter Framework Module](https://github.com/AmadeusITGroup/otter/tree/main/docs/core/MODULE.md).
 <br />
 <br />
 
 ## Description
-The **Otter** project is a highly modular framework whose goal is to provide a common platform to accelerate and facilitate the development on Angular web applications.
-It is split into several units to cover different aspects of these applications (localization, testing, customization, etc.).
-Also, to customize an application, metadata can be extracted from the application source code and injected into a CMS to manage dynamic configuration.
 
-> **Note**:  The full documentation is available [here](./docs/README.md).
+This module provides basic utilities and generic rules (install, lint) reused in other package schematics.
 
-## Built With
-
-* [Angular](https://angular.io/)
-* [Typescript](https://www.typescriptlang.org/)
-* [RxJs](http://reactivex.io/rxjs/)
-* [Redux](http://redux.js.org/)
-* [Sass](http://sass-lang.com/)
-* [Nx](https://nx.dev/)
-
-## Get Started
-
-A new application can be set up with these simple commands:
-
-```shell
-# Starting a new angular application
-npm install -g @angular/cli
-ng new my-app
-
-# Add Otter framework
-ng add @o3r/core
-```
-
-> **Note**: Please refer to [Otter Get Started](./docs/core/START_NEW_APPLICATION.md) and [Angular Get Started](https://angular.io/guide/setup-local#install-the-angular-cli) for complete documentation.
-
-## Contributing
-
-Please read the [Contributing](./CONTRIBUTING.md) file for details on our code of conduct and the process to submit pull requests.
-
-## Versioning
-
-Please refer to [Security file](./SECURITY.md).
-
-## License
-
-Please refer to the [License file](./LICENSE).
-
-## Acknowledgments
-
-The Otter Team, @AmadeusITGroup/otter_admins, is responsible for the review of the code of this repository.
-Any bug of feature request can be addressed via [issue](https://github.com/AmadeusITGroup/otter/issues/new) report.
-
-## Developer
-
-### Building and Testing library
-
-These documents describe how to set up your development environment to build and test the framework.
-It also explains the basic mechanics of using `git`, `node`, and `npm`.
-
-- [Description](#description)
-- [Built With](#built-with)
-- [Get Started](#get-started)
-- [Contributing](#contributing)
-- [Versioning](#versioning)
-- [License](#license)
-- [Acknowledgments](#acknowledgments)
-- [Developer](#developer)
-  - [Building and Testing library](#building-and-testing-library)
-    - [Prerequisite Software](#prerequisite-software)
-    - [Getting the Sources](#getting-the-sources)
-    - [Installing NPM Modules](#installing-npm-modules)
-    - [Build command](#build-command)
-    - [Running tests locally](#running-tests-locally)
-    - [Manage task cache](#manage-task-cache)
-    - [Debugging with Visual Studio Code](#debugging-with-visual-studio-code)
-    - [Link local packages](#link-local-packages)
-
-Refer to the [contribution guidelines](./CONTRIBUTING.md)
-if you'd like to contribute to the framework.
-
-#### Prerequisite Software
-
-Before you can build and test Otter modules, you must install and configure the
-following products on your development machine:
-
-* [Git](http://git-scm.com) and/or the **GitHub app** (for [Mac](http://mac.github.com) or
-  [Windows](http://windows.github.com))
-  * [GitHub's Guide to Installing
-    Git](https://help.github.com/articles/set-up-git) is a good source of information.
-
-* [Node.js](http://nodejs.org), (version `>=10.0.0`)
-  * This is used to run tests and generate distributable files. We also use Node's Package Manager, `npm`
-    (version `>3.8.x`), which comes with Node. Depending on your system, you can install Node either from
-    source or as a pre-packaged bundle.
-  
-* [Yarn](https://yarnpkg.com/lang/en/docs/install/), a Node's Package Manager
-  * You can install yarn using NPM manager (coming with Node.js).
-    The version of Yarn currently used is embedded in the repository. In case you need to link this library with your project, you can check the section "Link local packages".
-
-* [Chrome](https://www.google.com/chrome/browser/desktop/index.html)
-  * We use Chrome to run our tests.
-
-#### Getting the sources
-
-Clone the Otter repository using the button `Code` or using the following git command:
-
-```shell
-git clone https://github.com/AmadeusITGroup/otter.git
-```
-
-#### Installing NPM modules
-
-Next, install the JavaScript modules needed to build:
-
-```shell
-# Install library project dependencies (package.json)
-yarn install
-```
-
-#### Build command
-
-To build the modules, run:
-
-```shell
-yarn run build
-```
-
-Each module can be built independently thanks to [Nx](https://nx.dev/packages/nx/documents/run) commands:
+## How to install
 
 ```shell
-# ex: Build Core package only
-yarn nx build core
+ng add @o3r/schematics
 ```
 
-> **Note**: Results are put in the `dist` of each module (`packages/@<scope>/<module>/dist`).
-
-#### Running tests locally
-
-Check the formatting:
-
-```shell
-yarn run lint
-```
-
-Check Unit Tests:
-
-```shell
-yarn run test
-```
-
-Each module can be test independently thanks to [Nx](https://nx.dev/packages/nx/documents/run) commands:
-
-```shell
-# ex: Test Core package only
-yarn nx test core
-
-# ex: Lint Core package only
-yarn nx lint core
-```
+> **Warning**: this module requires [@o3r/core](https://www.npmjs.com/package/@o3r/core) to be installed.
 
-#### Manage task cache
-
-When running the Build, Lint, or Test commands, **Nx** can use its [cache mechanism](https://nx.dev/concepts/how-caching-works).
-In some cases, it may be useful to clear the cache to investigate an issue. This can be done with the following command:
-
-```shell
-yarn nx reset
-```
-
-#### Debugging with Visual Studio Code
-
-The repository contains the mandatory configuration and the recommended VSCode plugins to ensure optimal comfort and productivity while developing on the Otter Framework.
-
-The default configuration of the repository provides a way to run Unit Tests one by one and to define, within VSCode, break points using the `vscode-jest-tests` debugger task.
-
-#### Link local packages
-
-For Yarn v1, add the `resolutions` property in the main package.json. It should be filled with the relative path to the `dist` of the local packages you want to link. The protocol `link:` can be used.
-
-NOTE: It will not import the transitive dependencies of the linked packages.
-
-Example:
-
-```json
-{
-  "resolutions": {
-    "@o3r/localization": "./relative/path/to/otter/packages/@o3r/localization/dist",
-    "@o3r/core": "link:./relative/path/to/otter/packages/@o3r/core/dist",
-  }
-}
-```
-
-For Yarn v2+, the protocol `portal:` can also be used.
-
-NOTE: The portal protocol will also import all the transitive dependencies of the linked packages.
-Please keep in mind that mismatched versions of these dependencies may cause some issues.
-
-Example:
+## Description
 
-```json
-{
-  "resolutions": {
-    "@o3r/localization": "./relative/path/to/otter/library/@o3r/localization/dist",
-    "@o3r/core": "link:./relative/path/to/otter/library/@o3r/core/dist",
-    "@o3r/rules-engine": "portal:./relative/path/to/otter/library/@o3r/rules-engine/dist",
-  }
-}
-```
+This is a technical package to be used as dependency by [Otter modules](https://github.com/AmadeusITGroup/otter/tree/main/docs/core/MODULE.md) providing helpers to used in [Schematics](https://angular.io/guide/schematics) development.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/schematics",
-  "version": "8.2.0-alpha.9",
+  "version": "8.2.0-alpha.90",
   "description": "Schematics module of the Otter framework",
   "main": "./src/index.js",
   "keywords": [
@@ -28,7 +28,6 @@
     }
   },
   "dependencies": {
-    "@o3r/dev-tools": "^8.2.0-alpha.9",
     "comment-json": "^4.1.0",
     "globby": "^11.1.0",
     "minimatch": "^6.1.6",
@@ -47,12 +46,16 @@
     "@angular/core": "~15.2.0",
     "@angular/platform-browser": "~15.2.0",
     "@angular/platform-browser-dynamic": "~15.2.0",
+    "@babel/core": "~7.21.0",
+    "@babel/preset-typescript": "~7.21.0",
+    "@compodoc/compodoc": "^1.1.19",
     "@nrwl/cli": "~15.9.0",
     "@nrwl/jest": "~15.9.0",
     "@nrwl/js": "~15.9.0",
     "@nrwl/linter": "~15.9.0",
-    "@o3r/build-helpers": "^8.2.0-alpha.9",
-    "@o3r/eslint-plugin": "^8.2.0-alpha.9",
+    "@o3r/build-helpers": "^8.2.0-alpha.90",
+    "@o3r/dev-tools": "^8.2.0-alpha.90",
+    "@o3r/eslint-plugin": "^8.2.0-alpha.90",
     "@schematics/angular": "~15.2.0",
     "@types/jest": "~28.1.2",
     "@types/node": "^17.0.45",

package/schematics/ng-add/index.d.ts

@@ -1,8 +1,6 @@
 import type { Rule } from '@angular-devkit/schematics';
 /**
  * Add Otter schematics to an Angular Project
- *
- * @param options
  */
 export declare function ngAdd(): Rule;
 //# sourceMappingURL=index.d.ts.map

package/schematics/ng-add/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAEvD;;;;GAIG;AACH,wBAAgB,KAAK,IAAI,IAAI,CAG5B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AA+B/E;;GAEG;AACH,wBAAgB,KAAK,IAAI,IAAI,CAuB5B"}

package/schematics/ng-add/index.js

@@ -1,14 +1,57 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngAdd = void 0;
+const tasks_1 = require("@angular-devkit/schematics/tasks");
+const fs = require("node:fs");
+const path = require("node:path");
+const rxjs_1 = require("rxjs");
+const options_1 = require("@angular-devkit/schematics/tasks/package-manager/options");
 /**
- * Add Otter schematics to an Angular Project
+ * Install dev dependency on your application
  *
- * @param options
+ * Note: it should not be moved to other packages as it should run before the installation
+ * of peer dependencies
+ */
+class DevInstall extends tasks_1.NodePackageInstallTask {
+    /** @inheritDoc */
+    toConfiguration() {
+        const installOptions = process.env && process.env.npm_execpath && process.env.npm_execpath.indexOf('yarn') === -1 ? 'npm' : 'yarn';
+        return {
+            name: options_1.NodePackageName,
+            options: {
+                command: 'install',
+                quiet: this.quiet,
+                workingDirectory: this.workingDirectory,
+                packageName: `${this.packageName} ${installOptions === 'yarn' ? '--prefer-dev' : '-D'}`,
+                packageManager: installOptions
+            }
+        };
+    }
+}
+/**
+ * Add Otter schematics to an Angular Project
  */
 function ngAdd() {
-    /* ng add rules */
-    return () => { };
+    const schematicsDependencies = ['@angular-devkit/architect', '@angular-devkit/schematics', '@angular-devkit/core', '@schematics/angular', 'comment-json', 'eslint', 'globby'];
+    return async (tree, context) => {
+        const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
+        const treePackageJson = tree.readJson('./package.json');
+        const packageJsonContent = JSON.parse(fs.readFileSync(packageJsonPath, { encoding: 'utf-8' }));
+        const getDependencyVersion = (dependency) => packageJsonContent?.dependencies?.[dependency] || packageJsonContent?.peerDependencies?.[dependency];
+        schematicsDependencies.forEach((dependency) => {
+            const version = getDependencyVersion(dependency);
+            context.logger.info(`Installing ${dependency}${version || ''}`);
+            treePackageJson.devDependencies = { ...packageJsonContent.devDependencies, [dependency]: version };
+            context.addTask(new DevInstall({
+                packageName: `${dependency}${version ? '@' + version : ''}`,
+                hideOutput: false,
+                quiet: false
+            }));
+        });
+        tree.overwrite('./package.json', JSON.stringify(treePackageJson));
+        await (0, rxjs_1.lastValueFrom)(context.engine.executePostTasks());
+        return () => tree;
+    };
 }
 exports.ngAdd = ngAdd;
 //# sourceMappingURL=index.js.map

package/src/rule-factories/check-packages-peers/index.d.ts

@@ -4,5 +4,5 @@ import { SchematicContext, Tree } from '@angular-devkit/schematics';
  *
  * @param packageName The package to check peer deps for
  */
-export declare function checkPackagesRule(packageName: string): (tree: Tree, _context: SchematicContext) => import("@angular-devkit/schematics/src/tree/interface").Tree;
+export declare function checkPackagesRule(packageName: string): (tree: Tree, context: SchematicContext) => import("@angular-devkit/schematics/src/tree/interface").Tree;
 //# sourceMappingURL=index.d.ts.map

package/src/rule-factories/check-packages-peers/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/check-packages-peers/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAGpE;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,UACrC,IAAI,8FAKnB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/check-packages-peers/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAgHpE;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,UACrC,IAAI,6FAKnB"}

package/src/rule-factories/check-packages-peers/index.js

@@ -1,16 +1,104 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkPackagesRule = void 0;
-const dev_tools_1 = require("@o3r/dev-tools");
+const path = require("node:path");
+const commentJson = require("comment-json");
+const semver_1 = require("semver");
+/**
+ * Get package manager used in runs
+ * Defaults to the package manager setup in process.env if no package manager set in angular.json
+ *
+ * @param angularJsonString Content of angular.json file
+ */
+function getPackageManager(angularJsonString) {
+    let packageManager = process.env && process.env.npm_execpath && process.env.npm_execpath.indexOf('yarn') === -1 ? 'npm' : 'yarn';
+    if (angularJsonString) {
+        const angularJsonObj = commentJson.parse(angularJsonString);
+        if (angularJsonObj?.cli?.packageManager) {
+            packageManager = angularJsonObj.cli.packageManager;
+        }
+    }
+    return packageManager;
+}
+/**
+ * Check if the first level of peer deps of a given package are installed.
+ * List all not installed packages or packages with version mismatch
+ *
+ * @param packageName
+ */
+function getPackagesToInstallOrUpdate(packageName) {
+    let installedPackage;
+    try {
+        installedPackage = require(`${packageName}${path.posix.sep}package.json`);
+    }
+    catch (err) {
+        throw new Error(`The provided package is not installed: ${packageName}`);
+    }
+    const packagesToInstall = [];
+    const packagesWrongVersion = [];
+    const optionalPackages = Object.entries(installedPackage.peerDependenciesMeta || {})
+        .filter(([, dep]) => dep?.optional)
+        .map(([depName]) => depName);
+    const peerDependenciesMap = Object.entries(installedPackage.peerDependencies || {})
+        .reduce((acc, [name, val]) => {
+        if (!optionalPackages.includes(name)) {
+            acc[name] = val;
+        }
+        return acc;
+    }, {});
+    Object.entries(peerDependenciesMap).forEach(([pName, pVersion]) => {
+        let installedPackageVersion;
+        try {
+            installedPackageVersion = require(`${pName}${path.posix.sep}package.json`).version;
+        }
+        catch (err) {
+            packagesToInstall.push({ packageName: pName, version: pVersion });
+        }
+        if (installedPackageVersion && !(0, semver_1.satisfies)(installedPackageVersion, pVersion)) {
+            packagesWrongVersion.push({ packageName: pName, foundVersion: installedPackageVersion, version: pVersion });
+        }
+    });
+    return { packagesToInstall, packagesWrongVersion };
+}
+/**
+ * Log an instruction with the packages to install or update to match a package peer dependencies
+ *
+ * @param packageName
+ * @param angularJsonString
+ * @param logger
+ */
+function checkPackagesToInstallOrUpdate(packageName, logger, angularJsonString) {
+    const packageManager = getPackageManager(angularJsonString);
+    const { packagesToInstall, packagesWrongVersion } = getPackagesToInstallOrUpdate(packageName);
+    if (packagesWrongVersion.length) {
+        logger.warn('');
+        logger.warn(`The following packages have a mismatch version installed to satisfy "${packageName}" needed versions:`);
+        packagesWrongVersion.forEach(dep => {
+            logger.warn(`${dep.packageName} found version is ${dep.foundVersion}. "${packageName}" needs ${dep.version}`);
+        });
+        logger.warn('');
+        logger.warn('You might consider reinstalling the packages with the good versions:');
+        packagesWrongVersion.forEach((dep) => logger.warn(`${packageManager} run ng update ${dep.packageName}@${dep.version}`));
+    }
+    if (packagesToInstall.length) {
+        logger.error('');
+        logger.error(`The following packages need to be installed to have "${packageName}" working. Run the commands one by one:`);
+        packagesToInstall.forEach((dep) => logger.error(`${packageManager} run ng add ${dep.packageName}@${dep.version}`));
+        throw new Error('Missing peer dependencies');
+    }
+    if (!packagesToInstall.length && !packagesWrongVersion.length) {
+        logger.info(`The package ${packageName} has all peer deps installed.\n`);
+    }
+}
 /**
  * List peer deps packages of the given package, display a warning if version mismatch, error if peer dep is missing
  *
  * @param packageName The package to check peer deps for
  */
 function checkPackagesRule(packageName) {
-    return (tree, _context) => {
+    return (tree, context) => {
         const angularJson = tree.read('/angular.json');
-        (0, dev_tools_1.checkPackagesToInstallOrUpdate)(packageName, angularJson?.toString());
+        checkPackagesToInstallOrUpdate(packageName, context.logger, angularJson?.toString());
         return tree;
     };
 }

package/src/rule-factories/check-packages-peers/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/rule-factories/check-packages-peers/index.ts"],"names":[],"mappings":";;;AACA,8CAAgE;AAEhE;;;;GAIG;AACH,SAAgB,iBAAiB,CAAC,WAAmB;IACnD,OAAO,CAAC,IAAU,EAAE,QAA0B,EAAE,EAAE;QAChD,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAC/C,IAAA,0CAA8B,EAAC,WAAW,EAAE,WAAW,EAAE,QAAQ,EAAE,CAAC,CAAC;QACrE,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC;AAND,8CAMC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/rule-factories/check-packages-peers/index.ts"],"names":[],"mappings":"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"}

package/src/rule-factories/eslint-fix/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/eslint-fix/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,IAAI,EAA+C,MAAM,4BAA4B,CAAC;AAIzG;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B;;;;OAIG;IAEH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;;;OAIG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,UAAU,SAAM,EAAE,SAAS,GAAE,MAAM,EAAW,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,IAAI,CA8D5G"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/eslint-fix/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,IAAI,EAA+C,MAAM,4BAA4B,CAAC;AAKzG;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B;;;;OAIG;IAEH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;;;OAIG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,UAAU,SAAM,EAAE,SAAS,GAAE,MAAM,EAAW,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,IAAI,CAoE5G"}

package/src/rule-factories/eslint-fix/index.js

@@ -4,6 +4,7 @@ exports.applyEsLintFix = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
 const node_child_process_1 = require("node:child_process");
 const node_path_1 = require("node:path");
+const package_manager_runner_1 = require("../../utility/package-manager-runner");
 /**
  * Apply EsLint fix
  *
@@ -48,16 +49,23 @@ function applyEsLintFix(_prootPath = '/', extension = ['ts'], options) {
             }
             return acc;
         }, new Set());
-        (0, node_child_process_1.exec)('yarn eslint ' +
-            Array.from(files).map((file) => `"${file}"`).join(' ') +
-            ' --fix --color' +
-            (linterOptions.hideWarnings ? ' --quiet' : '') +
-            (eslintFile ? ` --config ${eslintFile} --parser-options=tsconfigRootDir:${(0, node_path_1.resolve)(process.cwd(), (0, node_path_1.dirname)(eslintFile))}` : ''), (_error, stdout, stderr) => {
-            context.logger.info(stdout);
-            if (!linterOptions.force) {
-                context.logger.error(stderr);
-            }
-        });
+        try {
+            const packageManager = (0, package_manager_runner_1.getPackageManager)();
+            (0, node_child_process_1.exec)(`${packageManager} ${(0, package_manager_runner_1.getPackageManagerRunner)()} eslint ` +
+                Array.from(files).map((file) => `"${file}"`).join(' ') +
+                ' --fix --color' +
+                (linterOptions.hideWarnings ? ' --quiet' : '') +
+                (eslintFile ? ` --config ${eslintFile} --parser-options=tsconfigRootDir:${(0, node_path_1.resolve)(process.cwd(), (0, node_path_1.dirname)(eslintFile))}` : ''), (_error, stdout, stderr) => {
+                context.logger.info(stdout);
+                if (!linterOptions.force) {
+                    context.logger.error(stderr);
+                }
+            });
+        }
+        catch {
+            context.logger.error('Could not run eslint');
+        }
+        return tree;
     };
 }
 exports.applyEsLintFix = applyEsLintFix;

package/src/rule-factories/eslint-fix/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/rule-factories/eslint-fix/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/rule-factories/eslint-fix/index.ts"],"names":[],"mappings":"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"}

package/src/rule-factories/index.d.ts

@@ -3,4 +3,6 @@ export * from './interfaces';
 export * from './check-packages-peers/index';
 export * from './ng-add/index';
 export * from './remove-packages/index';
+export * from './update-imports/index';
+export * from './vscode-extensions/index';
 //# sourceMappingURL=index.d.ts.map

package/src/rule-factories/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/rule-factories/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,cAAc,CAAC;AAC7B,cAAc,8BAA8B,CAAC;AAC7C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,yBAAyB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/rule-factories/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,cAAc,CAAC;AAC7B,cAAc,8BAA8B,CAAC;AAC7C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,yBAAyB,CAAC;AACxC,cAAc,wBAAwB,CAAC;AACvC,cAAc,2BAA2B,CAAC"}

package/src/rule-factories/index.js

@@ -6,4 +6,6 @@ tslib_1.__exportStar(require("./interfaces"), exports);
 tslib_1.__exportStar(require("./check-packages-peers/index"), exports);
 tslib_1.__exportStar(require("./ng-add/index"), exports);
 tslib_1.__exportStar(require("./remove-packages/index"), exports);
+tslib_1.__exportStar(require("./update-imports/index"), exports);
+tslib_1.__exportStar(require("./vscode-extensions/index"), exports);
 //# sourceMappingURL=index.js.map

package/src/rule-factories/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/rule-factories/index.ts"],"names":[],"mappings":";;;AAAA,6DAAmC;AACnC,uDAA6B;AAC7B,uEAA6C;AAC7C,yDAA+B;AAC/B,kEAAwC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/rule-factories/index.ts"],"names":[],"mappings":";;;AAAA,6DAAmC;AACnC,uDAA6B;AAC7B,uEAA6C;AAC7C,yDAA+B;AAC/B,kEAAwC;AACxC,iEAAuC;AACvC,oEAA0C"}

package/src/rule-factories/ng-add/index.d.ts

@@ -1,10 +1,21 @@
 import { Rule } from '@angular-devkit/schematics';
-import { NgAddPackageOptions } from '../../tasks/index';
+import { NodeDependencyType } from '@schematics/angular/utility/dependencies';
+import type { NgAddPackageOptions } from '../../tasks/index';
 /**
  * Install via `ng add` a list of npm packages.
  *
  * @param packages List of packages to be installed via `ng add`
  * @param options install options
+ * @param packageJsonPath path of the package json of the project where they will be installed
  */
-export declare function ngAddPackages(packages: string[], options?: NgAddPackageOptions): Rule;
+export declare function ngAddPackages(packages: string[], options?: NgAddPackageOptions, packageJsonPath?: string): Rule;
+/**
+ * Look for the peer dependencies and run ng add on the package requested version
+ *
+ * @param packages list of the name of the packages needed
+ * @param packageJsonPath path to package json that needs the peer to be resolved
+ * @param type how to install the dependency (dev, peer for a library or default for an application)
+ * @param parentPackageInfo for logging purposes
+ */
+export declare function ngAddPeerDependencyPackages(packages: string[], packageJsonPath: string, type: NodeDependencyType | undefined, options: NgAddPackageOptions, parentPackageInfo?: string): Rule;
 //# sourceMappingURL=index.d.ts.map

package/src/rule-factories/ng-add/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAwB,MAAM,mBAAmB,CAAC;AAE9E;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,mBAAmB,GAAG,IAAI,CAqBrF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,IAAI,EAAkD,MAAM,4BAA4B,CAAC;AAG5H,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAG9E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAG7D;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,mBAAmB,EAAE,eAAe,SAAkB,GAAG,IAAI,CAsFxH;AAGD;;;;;;;GAOG;AACH,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,eAAe,EAAE,MAAM,EAAE,IAAI,gCAAiD,EAC5I,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,CAAC,EAAE,MAAM,QAezD"}