@o3r/schematics 10.2.0-prerelease.7 → 10.2.0-prerelease.71

package/README.md

@@ -9,6 +9,9 @@ This package is an [Otter Framework Module](https://github.com/AmadeusITGroup/ot
 
 ## Description
 
+[![Stable Version](https://img.shields.io/npm/v/@o3r/schematics?style=for-the-badge)](https://www.npmjs.com/package/@o3r/schematics)
+[![Bundle Size](https://img.shields.io/bundlephobia/min/@o3r/schematics?color=green&style=for-the-badge)](https://www.npmjs.com/package/@o3r/schematics)
+
 This module provides basic utilities and generic rules (install, lint) reused in other package schematics.
 
 ## How to install

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/schematics",
-  "version": "10.2.0-prerelease.7",
+  "version": "10.2.0-prerelease.71",
   "publishConfig": {
     "access": "public"
   },
@@ -26,16 +26,16 @@
     "o3r-environment": "./cli/environment.js"
   },
   "peerDependencies": {
-    "@angular-devkit/architect": "~0.1702.0",
-    "@angular-devkit/core": "~17.2.0",
-    "@angular-devkit/schematics": "~17.2.0",
-    "@angular/cli": "~17.2.0",
-    "@o3r/telemetry": "^10.2.0-prerelease.7",
-    "@schematics/angular": "~17.2.0",
+    "@angular-devkit/architect": "~0.1703.0",
+    "@angular-devkit/core": "~17.3.0",
+    "@angular-devkit/schematics": "~17.3.0",
+    "@angular/cli": "~17.3.0",
+    "@o3r/telemetry": "^10.2.0-prerelease.71",
+    "@schematics/angular": "~17.3.0",
     "eslint": "^8.42.0",
     "rxjs": "^7.8.1",
     "type-fest": "^4.10.2",
-    "typescript": "~5.3.3"
+    "typescript": "~5.4.2"
   },
   "peerDependenciesMeta": {
     "@angular-devkit/architect": {
@@ -49,6 +49,9 @@
     },
     "eslint": {
       "optional": true
+    },
+    "type-fest": {
+      "optional": true
     }
   },
   "dependencies": {
@@ -57,56 +60,56 @@
     "inquirer": "~8.2.6",
     "minimatch": "~9.0.3",
     "semver": "^7.5.2",
-    "tslib": "^2.5.3"
+    "tslib": "^2.6.2"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~17.2.0",
-    "@angular-devkit/core": "~17.2.0",
-    "@angular-devkit/schematics": "~17.2.0",
-    "@angular-eslint/eslint-plugin": "~17.2.0",
-    "@angular/animations": "~17.2.0",
-    "@angular/cli": "~17.2.0",
-    "@angular/common": "~17.2.0",
-    "@angular/compiler": "~17.2.0",
-    "@angular/compiler-cli": "~17.2.0",
-    "@angular/core": "~17.2.0",
-    "@angular/platform-browser": "~17.2.0",
-    "@angular/platform-browser-dynamic": "~17.2.0",
+    "@angular-devkit/build-angular": "~17.3.0",
+    "@angular-devkit/core": "~17.3.0",
+    "@angular-devkit/schematics": "~17.3.0",
+    "@angular-eslint/eslint-plugin": "~17.3.0",
+    "@angular/animations": "~17.3.0",
+    "@angular/cli": "~17.3.0",
+    "@angular/common": "~17.3.0",
+    "@angular/compiler": "~17.3.0",
+    "@angular/compiler-cli": "~17.3.0",
+    "@angular/core": "~17.3.0",
+    "@angular/platform-browser": "~17.3.0",
+    "@angular/platform-browser-dynamic": "~17.3.0",
     "@babel/core": "~7.24.0",
-    "@babel/preset-typescript": "~7.23.0",
+    "@babel/preset-typescript": "~7.24.0",
     "@compodoc/compodoc": "^1.1.19",
-    "@nx/eslint": "~18.0.2",
-    "@nx/eslint-plugin": "~18.0.2",
-    "@nx/jest": "~18.0.2",
-    "@nx/js": "~18.0.2",
-    "@o3r/build-helpers": "^10.2.0-prerelease.7",
-    "@o3r/eslint-plugin": "^10.2.0-prerelease.7",
-    "@o3r/telemetry": "^10.2.0-prerelease.7",
-    "@schematics/angular": "~17.2.0",
+    "@nx/eslint": "~18.2.0",
+    "@nx/eslint-plugin": "~18.2.0",
+    "@nx/jest": "~18.2.0",
+    "@nx/js": "~18.2.0",
+    "@o3r/build-helpers": "^10.2.0-prerelease.71",
+    "@o3r/eslint-plugin": "^10.2.0-prerelease.71",
+    "@o3r/telemetry": "^10.2.0-prerelease.71",
+    "@schematics/angular": "~17.3.0",
     "@stylistic/eslint-plugin-ts": "^1.5.4",
     "@types/inquirer": "~8.2.10",
     "@types/jest": "~29.5.2",
     "@types/node": "^20.0.0",
     "@types/semver": "^7.3.13",
-    "@typescript-eslint/eslint-plugin": "^7.0.1",
-    "@typescript-eslint/parser": "^7.0.1",
+    "@typescript-eslint/eslint-plugin": "^7.2.0",
+    "@typescript-eslint/parser": "^7.2.0",
     "cpy-cli": "^5.0.0",
-    "eslint": "^8.42.0",
-    "eslint-import-resolver-node": "^0.3.4",
+    "eslint": "^8.57.0",
+    "eslint-import-resolver-node": "^0.3.9",
     "eslint-plugin-jest": "~27.9.0",
-    "eslint-plugin-jsdoc": "~48.2.0",
+    "eslint-plugin-jsdoc": "~48.2.1",
     "eslint-plugin-prefer-arrow": "~1.2.3",
-    "eslint-plugin-unicorn": "^51.0.0",
+    "eslint-plugin-unicorn": "^51.0.1",
     "jest": "~29.7.0",
     "jest-junit": "~16.0.0",
     "jsonc-eslint-parser": "~2.4.0",
     "jsonschema": "~1.4.1",
-    "nx": "~18.0.2",
+    "nx": "~18.2.0",
     "rxjs": "^7.8.1",
-    "ts-jest": "~29.1.1",
-    "ts-node": "~10.9.1",
+    "ts-jest": "~29.1.2",
+    "ts-node": "~10.9.2",
     "type-fest": "^4.10.2",
-    "typescript": "~5.3.3",
+    "typescript": "~5.4.2",
     "zone.js": "~0.14.2"
   },
   "engines": {

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

@@ -2,6 +2,7 @@ import type { Rule } from '@angular-devkit/schematics';
 import type { NgAddSchematicsSchema } from './schema';
 /**
  * Add Otter schematics to an Angular Project
+ * @param options
  */
 export declare const ngAdd: (options: NgAddSchematicsSchema) => 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;AAKvD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAqCtD;;GAEG;AACH,eAAO,MAAM,KAAK,0CAAiD,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAIvD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAqCtD;;;GAGG;AACH,eAAO,MAAM,KAAK,YAAa,qBAAqB,KAAG,IAGtD,CAAC"}

package/schematics/ng-add/index.js

@@ -1,19 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngAdd = void 0;
-const schematics_1 = require("@o3r/schematics");
 const dependencies_1 = require("@schematics/angular/utility/dependencies");
 const path = require("node:path");
-const schematics_2 = require("@o3r/schematics");
 /**
  * Add Otter schematics to an Angular Project
  * @param options schematics options
  */
 function ngAddFn(options) {
     const schematicsDependencies = ['@angular-devkit/architect', '@angular-devkit/schematics', '@angular-devkit/core', '@schematics/angular', 'globby'];
-    return () => async () => {
+    return async () => {
         const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
-        const dependencies = Object.entries((0, schematics_1.getExternalDependenciesVersionRange)(schematicsDependencies, packageJsonPath)).reduce((acc, [dep, range]) => {
+        const { getExternalDependenciesVersionRange, setupDependencies } = await Promise.resolve().then(() => require('@o3r/schematics'));
+        const dependencies = Object.entries(getExternalDependenciesVersionRange(schematicsDependencies, packageJsonPath)).reduce((acc, [dep, range]) => {
             acc[dep] = {
                 inManifest: [{
                         range,
@@ -22,7 +21,7 @@ function ngAddFn(options) {
             };
             return acc;
         }, {});
-        Object.entries((0, schematics_1.getExternalDependenciesVersionRange)(schematicsDependencies, packageJsonPath))
+        Object.entries(getExternalDependenciesVersionRange(schematicsDependencies, packageJsonPath))
             .forEach(([dep, range]) => {
             dependencies[dep] = {
                 inManifest: [{
@@ -31,7 +30,7 @@ function ngAddFn(options) {
                     }]
             };
         });
-        return (0, schematics_1.setupDependencies)({
+        return setupDependencies({
             projectName: options.projectName,
             dependencies,
             skipInstall: false
@@ -40,6 +39,11 @@ function ngAddFn(options) {
 }
 /**
  * Add Otter schematics to an Angular Project
+ * @param options
  */
-exports.ngAdd = (0, schematics_2.createSchematicWithMetricsIfInstalled)(ngAddFn);
+const ngAdd = (options) => async () => {
+    const { createSchematicWithMetricsIfInstalled } = await Promise.resolve().then(() => require('@o3r/schematics'));
+    return createSchematicWithMetricsIfInstalled(ngAddFn)(options);
+};
+exports.ngAdd = ngAdd;
 //# sourceMappingURL=index.js.map

package/src/modules/modules.helpers.d.ts

@@ -6,7 +6,7 @@ import { type PackageManagerOptions } from '../utility/index';
  * @param keyword Keyword to identify
  * @param expect tag expected for the Otter keyword
  */
-export declare const isOtterTag: <T extends string | undefined>(keyword: any, expect?: T | undefined) => keyword is `otter-${T extends undefined ? "" : T}`;
+export declare const isOtterTag: <T extends string | undefined>(keyword: any, expect?: T) => keyword is `otter-${T extends undefined ? "" : T}`;
 /** Options for getAvailableModules function */
 export interface AvailableModuleOptions extends PackageManagerOptions {
     /**

package/src/modules/modules.helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"modules.helpers.d.ts","sourceRoot":"","sources":["../../../src/modules/modules.helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAuH,MAAM,qBAAqB,CAAC;AAG9K,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAUpD,OAAO,EAAqB,KAAK,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAkDjF;;;;GAIG;AACH,eAAO,MAAM,UAAU,0CAA2C,GAAG,+EAGpE,CAAC;AAEF,+CAA+C;AAC/C,MAAM,WAAW,sBAAuB,SAAQ,qBAAqB;IACnE;;;OAGG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B;;;OAGG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED;;;;;GAKG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,GAAG,SAAS,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,sBAAsB,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAsBxK;AAED,gEAAgE;AAChE,MAAM,WAAW,uCAAwC,SAAQ,sBAAsB;IACrF;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,MAAM,EAAE,CAAC;CAC/C;AAED;;;;;GAKG;AACH,wBAAsB,oCAAoC,CAAC,OAAO,oBAA+B,EAAE,OAAO,EAAE,uCAAuC,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAoBlL;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACnC,UAAU,EAAE,kBAAkB,EAC9B,MAAM,SAAQ,EACd,WAAW,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,EACxC,MAAM,CAAC,EAAE,OAAO,CAAC,SAAS,UA8B7B"}
+{"version":3,"file":"modules.helpers.d.ts","sourceRoot":"","sources":["../../../src/modules/modules.helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAuH,MAAM,qBAAqB,CAAC;AAG9K,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAUpD,OAAO,EAAqB,KAAK,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAkDjF;;;;GAIG;AACH,eAAO,MAAM,UAAU,0CAA2C,GAAG,WAAW,CAAC,uDAGhF,CAAC;AAEF,+CAA+C;AAC/C,MAAM,WAAW,sBAAuB,SAAQ,qBAAqB;IACnE;;;OAGG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B;;;OAGG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED;;;;;GAKG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,GAAG,SAAS,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,sBAAsB,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAsBxK;AAED,gEAAgE;AAChE,MAAM,WAAW,uCAAwC,SAAQ,sBAAsB;IACrF;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,MAAM,EAAE,CAAC;CAC/C;AAED;;;;;GAKG;AACH,wBAAsB,oCAAoC,CAAC,OAAO,oBAA+B,EAAE,OAAO,EAAE,uCAAuC,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAoBlL;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACnC,UAAU,EAAE,kBAAkB,EAC9B,MAAM,SAAQ,EACd,WAAW,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,EACxC,MAAM,CAAC,EAAE,OAAO,CAAC,SAAS,UA8B7B"}

package/src/utility/wrapper.js

@@ -64,7 +64,7 @@ const createSchematicWithMetricsIfInstalled = (schematicFn) => (opts) => async (
                 message: `
 Would you like to share anonymous data about the usage of Otter builders and schematics with the Otter Team at Amadeus ?
 It will help us to improve our tools.
-For more details and instructions on how to change these settings, see https://github.com/AmadeusITGroup/otter/blob/main/docs/telemetry/README.md.
+For more details and instructions on how to change these settings, see https://github.com/AmadeusITGroup/otter/blob/main/docs/telemetry/PRIVACY_NOTICE.md.
         `,
                 default: false
             };