@o3r/eslint-config 13.0.0-prerelease.3 → 13.0.0-prerelease.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/eslint-config",
-  "version": "13.0.0-prerelease.3",
+  "version": "13.0.0-prerelease.4",
   "publishConfig": {
     "access": "public"
   },
@@ -37,7 +37,7 @@
     "build:builders": "tsc -b tsconfig.builders.json --pretty && yarn generate-cjs-manifest"
   },
   "dependencies": {
-    "@o3r/schematics": "^13.0.0-prerelease.3"
+    "@o3r/schematics": "^13.0.0-prerelease.4"
   },
   "peerDependencies": {
     "@angular-devkit/core": "^20.0.0",
@@ -46,8 +46,8 @@
     "@angular/compiler": "^20.0.0",
     "@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
     "@eslint/js": "^8.57.0 || ^9.22.0",
-    "@o3r/eslint-plugin": "^13.0.0-prerelease.3",
-    "@o3r/schematics": "^13.0.0-prerelease.3",
+    "@o3r/eslint-plugin": "^13.0.0-prerelease.4",
+    "@o3r/schematics": "^13.0.0-prerelease.4",
     "@schematics/angular": "^20.0.0",
     "@stylistic/eslint-plugin": "~5.2.0",
     "@typescript-eslint/parser": "^8.15.0",
@@ -81,9 +81,9 @@
     "@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
     "@eslint/js": "~9.34.0",
     "@nx/eslint-plugin": "~21.3.11",
-    "@o3r/build-helpers": "^13.0.0-prerelease.3",
-    "@o3r/eslint-plugin": "^13.0.0-prerelease.3",
-    "@o3r/test-helpers": "^13.0.0-prerelease.3",
+    "@o3r/build-helpers": "^13.0.0-prerelease.4",
+    "@o3r/eslint-plugin": "^13.0.0-prerelease.4",
+    "@o3r/test-helpers": "^13.0.0-prerelease.4",
     "@schematics/angular": "~20.0.0",
     "@stylistic/eslint-plugin": "~5.2.0",
     "@types/jest": "~29.5.2",

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":"AACA,OAAO,EAGL,KAAK,IAAI,EAIV,MAAM,4BAA4B,CAAC;AAkBpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AA8JlB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,KAAK,IAAI,EAIV,MAAM,4BAA4B,CAAC;AAcpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AA+HlB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}

package/schematics/ng-add/index.js

@@ -67,86 +67,56 @@ const handleOtterEslintErrors = (projectName) => (tree, context) => {
 };
 /**
  * Add a harmonize script in package.json
+ * @param tree
+ * @param context
  */
-const addHarmonizeScript = () => {
+const addHarmonizeScript = (tree, context) => {
     const rootPackageJsonPath = '/package.json';
-    return (tree, context) => {
-        if (!tree.exists(rootPackageJsonPath)) {
-            throw new schematics_1.SchematicsException('Root package.json does not exist');
-        }
-        const isYarnPackageManager = (0, schematics_2.getPackageManager)() === 'yarn';
-        const extraPostInstall = isYarnPackageManager ? 'yarn harmonize && yarn install --mode=skip-build' : 'npm run harmonize && npm install --ignore-scripts';
-        const rootPackageJsonObject = tree.readJson(rootPackageJsonPath);
-        rootPackageJsonObject.scripts ||= {};
-        if (rootPackageJsonObject.scripts.harmonize) {
-            context.logger.info('A "harmonize" script already exists in the root "package.json". Version harmonize script will not be added.');
-            return tree;
-        }
-        const postInstall = rootPackageJsonObject.scripts.postinstall;
-        rootPackageJsonObject.scripts.harmonize = `eslint "**/package.json" ${isYarnPackageManager ? '.yarnrc.yml ' : ''}--quiet --fix --no-error-on-unmatched-pattern`;
-        rootPackageJsonObject.scripts.postinstall = `${postInstall ? postInstall + ' && ' : ''}${extraPostInstall}`;
-        tree.overwrite(rootPackageJsonPath, JSON.stringify(rootPackageJsonObject, null, 2));
+    if (!tree.exists(rootPackageJsonPath)) {
+        throw new schematics_1.SchematicsException('Root package.json does not exist');
+    }
+    const isYarnPackageManager = (0, schematics_2.getPackageManager)() === 'yarn';
+    const extraPostInstall = isYarnPackageManager ? 'yarn harmonize && yarn install --mode=skip-build' : 'npm run harmonize && npm install --ignore-scripts';
+    const rootPackageJsonObject = tree.readJson(rootPackageJsonPath);
+    rootPackageJsonObject.scripts ||= {};
+    if (rootPackageJsonObject.scripts.harmonize) {
+        context.logger.info('A "harmonize" script already exists in the root "package.json". Version harmonize script will not be added.');
         return tree;
-    };
+    }
+    const postInstall = rootPackageJsonObject.scripts.postinstall;
+    rootPackageJsonObject.scripts.harmonize = `eslint "**/package.json" ${isYarnPackageManager ? '.yarnrc.yml ' : ''}--quiet --fix --no-error-on-unmatched-pattern`;
+    rootPackageJsonObject.scripts.postinstall = `${postInstall ? postInstall + ' && ' : ''}${extraPostInstall}`;
+    tree.overwrite(rootPackageJsonPath, JSON.stringify(rootPackageJsonObject, null, 2));
+    return tree;
 };
+const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
 function ngAddFn(options) {
-    /* ng add rules */
-    return (tree, context) => {
-        let installJestPlugin = false;
-        try {
-            require.resolve('jest');
-            installJestPlugin = true;
-        }
-        catch { }
-        if (installJestPlugin) {
-            devDependenciesToInstall.push('eslint-plugin-jest');
-        }
-        if (options.projectName) {
-            devDependenciesToInstall.push('@angular-eslint/builder');
-        }
-        const depsInfo = (0, schematics_2.getO3rPeerDeps)(path.resolve(__dirname, '..', '..', 'package.json'), true, /^@(?:o3r|ama-sdk)/);
+    let installJestPlugin = false;
+    try {
+        require.resolve('jest');
+        installJestPlugin = true;
+    }
+    catch { }
+    const setupConfigAndFixKnownErrors = (tree) => {
         const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
-        const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
-        const dependencies = depsInfo.o3rPeerDeps.reduce((acc, dep) => {
-            acc[dep] = {
-                inManifest: [{
-                        range: `${options.exactO3rVersion ? '' : '~'}${depsInfo.packageVersion}`,
-                        types: (0, schematics_2.getProjectNewDependenciesTypes)(workspaceProject)
-                    }],
-                ngAddOptions: { exactO3rVersion: options.exactO3rVersion }
-            };
-            return acc;
-        }, (0, schematics_2.getPackageInstallConfig)(packageJsonPath, tree, options.projectName, true, !!options.exactO3rVersion));
-        const projectDirectory = workspaceProject?.root || '.';
-        const projectPackageJson = tree.readJson(path.posix.join(projectDirectory, 'package.json'));
-        const externalDependenciesInfo = (0, schematics_2.getExternalDependenciesInfo)({
-            devDependenciesToInstall,
-            dependenciesToInstall,
-            projectType: workspaceProject?.projectType,
-            projectPackageJson,
-            o3rPackageJsonPath: packageJsonPath
-        }, context.logger);
-        return () => (0, schematics_1.chain)([
-            (0, schematics_2.setupDependencies)({
-                projectName: options.projectName,
-                dependencies: {
-                    ...dependencies,
-                    ...externalDependenciesInfo
-                },
-                ngAddToRun: depsInfo.o3rPeerDeps
-            }),
-            index_2.updateVscode,
-            (0, index_1.updateEslintConfig)(__dirname),
-            addHarmonizeScript(),
-            options.projectName && workspaceProject?.root
-                ? (0, schematics_1.chain)([
-                    (0, index_1.updateEslintConfig)(__dirname, options.projectName),
-                    options.fix ? handleOtterEslintErrors(options.projectName) : (0, schematics_1.noop)()
-                ])
-                : (0, schematics_1.noop)(),
-            options.skipLinter ? (0, schematics_1.noop)() : (0, schematics_2.applyEditorConfig)()
-        ])(tree, context);
+        return options.projectName && workspaceProject?.root
+            ? (0, schematics_1.chain)([
+                (0, index_1.updateEslintConfig)(__dirname, options.projectName),
+                options.fix ? handleOtterEslintErrors(options.projectName) : (0, schematics_1.noop)()
+            ])
+            : (0, schematics_1.noop)();
     };
+    return (0, schematics_1.chain)([
+        (0, schematics_2.ngAddDependenciesRule)(options, packageJsonPath, {
+            dependenciesToInstall,
+            devDependenciesToInstall: devDependenciesToInstall.concat(installJestPlugin ? ['eslint-plugin-jest'] : [], options.projectName ? ['@angular-eslint/builder'] : [])
+        }),
+        index_2.updateVscode,
+        (0, index_1.updateEslintConfig)(__dirname),
+        addHarmonizeScript,
+        setupConfigAndFixKnownErrors,
+        options.skipLinter ? (0, schematics_1.noop)() : (0, schematics_2.applyEditorConfig)()
+    ]);
 }
 /**
  * Add Otter eslint-config to an Angular Project

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

@@ -1,9 +1,5 @@
-import type { SchematicOptionObject } from '@o3r/schematics';
-export interface NgAddSchematicsSchema extends SchematicOptionObject {
-    /** Project name */
-    projectName?: string | undefined;
-    /** Use a pinned version for otter packages */
-    exactO3rVersion?: boolean;
+import type { NgAddOptions, SchematicOptionObject } from '@o3r/schematics';
+export interface NgAddSchematicsSchema extends NgAddOptions, SchematicOptionObject {
     /** Fix known issues with our ESLint config after Otter application or library generation */
     fix?: boolean;
     /** Skip the linter process which includes EditorConfig rules applying */

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

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,WAAW,qBAAsB,SAAQ,qBAAqB;IAClE,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,8CAA8C;IAC9C,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,4FAA4F;IAC5F,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,yEAAyE;IACzE,UAAU,EAAE,OAAO,CAAC;CACrB"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EACZ,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,WAAW,qBAAsB,SAAQ,YAAY,EAAE,qBAAqB;IAChF,4FAA4F;IAC5F,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,yEAAyE;IACzE,UAAU,EAAE,OAAO,CAAC;CACrB"}