@o3r/eslint-config 12.3.0-prerelease.53 → 12.3.0-prerelease.55

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/eslint-config",
-  "version": "12.3.0-prerelease.53",
+  "version": "12.3.0-prerelease.55",
   "publishConfig": {
     "access": "public"
   },
@@ -37,7 +37,7 @@
     "build:builders": "tsc -b tsconfig.builders.json --pretty && yarn generate-cjs-manifest"
   },
   "dependencies": {
-    "@o3r/schematics": "^12.3.0-prerelease.53"
+    "@o3r/schematics": "^12.3.0-prerelease.55"
   },
   "peerDependencies": {
     "@angular-devkit/core": "^19.0.0",
@@ -46,8 +46,8 @@
     "@angular/compiler": "^19.0.0",
     "@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
     "@eslint/js": "^8.57.0 || ^9.22.0",
-    "@o3r/eslint-plugin": "^12.3.0-prerelease.53",
-    "@o3r/schematics": "^12.3.0-prerelease.53",
+    "@o3r/eslint-plugin": "^12.3.0-prerelease.55",
+    "@o3r/schematics": "^12.3.0-prerelease.55",
     "@schematics/angular": "^19.0.0",
     "@stylistic/eslint-plugin": "~3.1.0",
     "@typescript-eslint/parser": "^8.15.0",
@@ -79,9 +79,9 @@
     "@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
     "@eslint/js": "~9.25.0",
     "@nx/eslint-plugin": "~20.8.0",
-    "@o3r/build-helpers": "^12.3.0-prerelease.53",
-    "@o3r/eslint-plugin": "^12.3.0-prerelease.53",
-    "@o3r/test-helpers": "^12.3.0-prerelease.53",
+    "@o3r/build-helpers": "^12.3.0-prerelease.55",
+    "@o3r/eslint-plugin": "^12.3.0-prerelease.55",
+    "@o3r/test-helpers": "^12.3.0-prerelease.55",
     "@schematics/angular": "~19.2.0",
     "@stylistic/eslint-plugin": "~3.1.0",
     "@types/eslint__js": "^8.42.3",

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/eslint/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAQL,KAAK,IAAI,EAGV,MAAM,4BAA4B,CAAC;AAyCpC;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,GAAI,UAAU,MAAM,EAAE,cAAc,MAAM,KAAG,IA2D3E,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/eslint/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAQL,KAAK,IAAI,EAGV,MAAM,4BAA4B,CAAC;AAqCpC;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,GAAI,UAAU,MAAM,EAAE,cAAc,MAAM,KAAG,IA4D3E,CAAC"}

package/schematics/ng-add/eslint/index.js

@@ -4,12 +4,12 @@ exports.updateEslintConfig = void 0;
 const path = require("node:path");
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
-const schematics_2 = require("@o3r/schematics");
 const index_1 = require("../tsconfig/index");
-const editAngularJson = (projectName, extension) => (tree, context) => {
+const editAngularJson = (projectName, extension) => async (tree, context) => {
     let workspace = null;
     try {
-        workspace = (0, schematics_2.getWorkspaceConfig)(tree);
+        const { getWorkspaceConfig } = await Promise.resolve().then(() => require('@o3r/schematics'));
+        workspace = getWorkspaceConfig(tree);
     }
     catch {
         context.logger.warn(`No @o3r/schematics installed, we could not detect the workspace. The linter task for ${projectName} can not be added.`);
@@ -37,12 +37,13 @@ const editAngularJson = (projectName, extension) => (tree, context) => {
  * @param rootPath
  * @param projectName
  */
-const updateEslintConfig = (rootPath, projectName) => (tree, context) => {
-    const workspace = (0, schematics_2.getWorkspaceConfig)(tree);
+const updateEslintConfig = (rootPath, projectName) => async (tree, context) => {
+    const { findFilesInTree, getTemplateFolder, getWorkspaceConfig } = await Promise.resolve().then(() => require('@o3r/schematics'));
+    const workspace = getWorkspaceConfig(tree);
     const workspaceProject = workspace?.projects[projectName || ''];
     const projectRootPath = workspaceProject?.root || '.';
     const workingDir = tree.getDir(projectRootPath);
-    const eslintConfigFiles = (0, schematics_2.findFilesInTree)(workingDir, (file) => /eslint.config.[cm]?js/.test(file));
+    const eslintConfigFiles = findFilesInTree(workingDir, (file) => /eslint.config.[cm]?js/.test(file));
     if (eslintConfigFiles.length > 1) {
         context.logger.warn('Unable to add the "@o3r/eslint-config" recommendation because several ESLint config file detected.\n'
             + eslintConfigFiles.map((file) => `\t- ${file.path.toString()}`).join('\n'));
@@ -55,7 +56,7 @@ const updateEslintConfig = (rootPath, projectName) => (tree, context) => {
         oldConfig: '',
         relativePathToRoot: path.posix.relative(projectRootPath, '.'),
         packageName: tree.readJson(workingDir.file((0, core_1.fragment)('package.json'))?.path || 'package.json').name,
-        detectedTsConfigs: (0, schematics_2.findFilesInTree)(workingDir, (f) => /tsconfig\..*\.json/.test(f)).map((entry) => path.basename(entry.path)).concat('tsconfig.eslint.json'),
+        detectedTsConfigs: findFilesInTree(workingDir, (f) => /tsconfig\..*\.json/.test(f)).map((entry) => path.basename(entry.path)).concat('tsconfig.eslint.json'),
         isApp: workspaceProject?.projectType === 'application'
     };
     if (eslintConfigFiles.length === 1) {
@@ -80,7 +81,7 @@ const updateEslintConfig = (rootPath, projectName) => (tree, context) => {
         projectName ? editAngularJson(projectName, templateOptions.extension) : (0, schematics_1.noop)(),
         (0, schematics_1.applyToSubtree)(projectRootPath, [
             (0, index_1.updateOrAddTsconfigEslint)(rootPath),
-            (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)((0, schematics_2.getTemplateFolder)(rootPath, __dirname, `./templates/${projectRootPath === '.' ? 'workspace' : 'project'}`)), [
+            (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)(getTemplateFolder(rootPath, __dirname, `./templates/${projectRootPath === '.' ? 'workspace' : 'project'}`)), [
                 (0, schematics_1.template)(templateOptions),
                 (0, schematics_1.renameTemplateFiles)()
             ]), schematics_1.MergeStrategy.Overwrite)

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,EAGV,MAAM,4BAA4B,CAAC;AAcpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAkHlB;;;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,EAGV,MAAM,4BAA4B,CAAC;AAOpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAiIlB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,KAAG,IAKtD,CAAC"}

package/schematics/ng-add/index.js

@@ -6,11 +6,17 @@ const schematics_1 = require("@angular-devkit/schematics");
 const schematics_2 = require("@o3r/schematics");
 const index_1 = require("./eslint/index");
 const index_2 = require("./vscode/index");
-const handleOtterEslintErrors = (projectName) => (tree, context) => {
+const reportMissingSchematicsDep = (logger) => (reason) => {
+    logger.error(`[ERROR]: Adding @o3r/eslint-config has failed.
+You need to install '@o3r/schematics' package to be able to use the eslint-config package. Please run 'ng add @o3r/schematics' .`);
+    throw reason;
+};
+const handleOtterEslintErrors = (projectName) => async (tree, context) => {
     if (!projectName) {
         return;
     }
-    const workspace = (0, schematics_2.getWorkspaceConfig)(tree);
+    const { getWorkspaceConfig } = await Promise.resolve().then(() => require('@o3r/schematics'));
+    const workspace = getWorkspaceConfig(tree);
     if (!workspace) {
         return;
     }
@@ -69,21 +75,22 @@ function ngAddFn(options) {
             'yaml-eslint-parser',
             ...(options.projectName ? ['@angular-eslint/builder'] : [])
         ];
-        const depsInfo = (0, schematics_2.getO3rPeerDeps)(path.resolve(__dirname, '..', '..', 'package.json'), true, /^@(?:o3r|ama-sdk)/);
-        const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
+        const { getExternalDependenciesVersionRange, setupDependencies, getWorkspaceConfig, getO3rPeerDeps, getProjectNewDependenciesTypes, getPackageInstallConfig } = await Promise.resolve().then(() => require('@o3r/schematics'));
+        const depsInfo = getO3rPeerDeps(path.resolve(__dirname, '..', '..', 'package.json'), true, /^@(?:o3r|ama-sdk)/);
+        const workspaceProject = options.projectName ? getWorkspaceConfig(tree)?.projects[options.projectName] : undefined;
         const { NodeDependencyType } = await Promise.resolve().then(() => require('@schematics/angular/utility/dependencies'));
         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)
+                        types: getProjectNewDependenciesTypes(workspaceProject)
                     }],
                 ngAddOptions: { exactO3rVersion: options.exactO3rVersion }
             };
             return acc;
-        }, (0, schematics_2.getPackageInstallConfig)(packageJsonPath, tree, options.projectName, true, !!options.exactO3rVersion));
-        Object.entries((0, schematics_2.getExternalDependenciesVersionRange)(devDependenciesToInstall, packageJsonPath, context.logger))
+        }, getPackageInstallConfig(packageJsonPath, tree, options.projectName, true, !!options.exactO3rVersion));
+        Object.entries(getExternalDependenciesVersionRange(devDependenciesToInstall, packageJsonPath, context.logger))
             .forEach(([dep, range]) => {
             dependencies[dep] = {
                 inManifest: [{
@@ -93,7 +100,7 @@ function ngAddFn(options) {
             };
         });
         return () => (0, schematics_1.chain)([
-            (0, schematics_2.setupDependencies)({
+            setupDependencies({
                 projectName: options.projectName,
                 dependencies,
                 ngAddToRun: depsInfo.o3rPeerDeps
@@ -114,6 +121,9 @@ function ngAddFn(options) {
  * Add Otter eslint-config to an Angular Project
  * @param options Options for the schematic
  */
-const ngAdd = (options) => (0, schematics_2.createOtterSchematic)(ngAddFn)(options);
+const ngAdd = (options) => async (_, { logger }) => {
+    const { createOtterSchematic } = await Promise.resolve().then(() => require('@o3r/schematics')).catch(reportMissingSchematicsDep(logger));
+    return createOtterSchematic(ngAddFn)(options);
+};
 exports.ngAdd = ngAdd;
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/tsconfig/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAKL,KAAK,IAAI,EAGV,MAAM,4BAA4B,CAAC;AAIpC;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,GAAI,UAAU,MAAM,EAAE,wBAA4B,KAAG,IAa1F,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/tsconfig/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAKL,KAAK,IAAI,EAGV,MAAM,4BAA4B,CAAC;AAEpC;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,GAAI,UAAU,MAAM,EAAE,wBAA4B,KAAG,IAa1F,CAAC"}

package/schematics/ng-add/tsconfig/index.js

@@ -2,13 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateOrAddTsconfigEslint = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
-const schematics_2 = require("@o3r/schematics");
 /**
  * Update or add tsconfig.eslint.json file
  * @param rootPath
  * @param projectTsConfig
  */
-const updateOrAddTsconfigEslint = (rootPath, projectTsConfig = 'tsconfig') => (tree) => {
+const updateOrAddTsconfigEslint = (rootPath, projectTsConfig = 'tsconfig') => async (tree) => {
     const tsconfigPath = 'tsconfig.eslint.json';
     if (tree.exists(tsconfigPath)) {
         const tsconfig = tree.readJson(tsconfigPath);
@@ -16,7 +15,8 @@ const updateOrAddTsconfigEslint = (rootPath, projectTsConfig = 'tsconfig') => (t
         tree.overwrite(tsconfigPath, JSON.stringify(tsconfig, null, 2));
         return () => tree;
     }
-    return () => (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)((0, schematics_2.getTemplateFolder)(rootPath, __dirname)), [
+    const { getTemplateFolder } = await Promise.resolve().then(() => require('@o3r/schematics'));
+    return () => (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)(getTemplateFolder(rootPath, __dirname)), [
         (0, schematics_1.template)({ projectTsConfig }),
         (0, schematics_1.renameTemplateFiles)()
     ]), schematics_1.MergeStrategy.Overwrite);

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/vscode/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,KAAK,IAAI,EACV,MAAM,4BAA4B,CAAC;AAuCpC;;GAEG;AACH,eAAO,MAAM,YAAY,EAAE,IAuB1B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/vscode/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,KAAK,IAAI,EACV,MAAM,4BAA4B,CAAC;AAoCpC;;GAEG;AACH,eAAO,MAAM,YAAY,EAAE,IAwB1B,CAAC"}

package/schematics/ng-add/vscode/index.js

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateVscode = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
-const schematics_2 = require("@o3r/schematics");
 /**
  * Update VSCode recommendations and settings
  */
-const updateVscode = () => {
+const updateVscode = async () => {
+    const { addVsCodeRecommendations } = await Promise.resolve().then(() => require('@o3r/schematics'));
     return (0, schematics_1.chain)([
-        (0, schematics_2.addVsCodeRecommendations)(['dbaeumer.vscode-eslint']),
+        addVsCodeRecommendations(['dbaeumer.vscode-eslint']),
         (tree) => {
             const vscodeSettingsPath = '.vscode/settings.json';
             const settings = (tree.exists(vscodeSettingsPath) ? (tree.readJson(vscodeSettingsPath) || {}) : {});