@angular-eslint/schematics 22.1.1-alpha.13 → 22.1.1-alpha.15

package/dist/angular-version-compat.d.ts

@@ -0,0 +1,27 @@
+/**
+ * Shared helpers for reporting Angular major mismatches without using a
+ * package-manager peer on `@angular/cli`.
+ */
+export declare const ANGULAR_PACKAGES_TO_CHECK: readonly ["@angular/core", "@angular/cli"];
+export interface PackageJsonLike {
+    dependencies?: Record<string, string>;
+    devDependencies?: Record<string, string>;
+    peerDependencies?: Record<string, string>;
+    version?: string;
+}
+export interface AngularVersionMismatch {
+    packageName: string;
+    specifier: string;
+    foundMajor: number;
+}
+/**
+ * Best-effort major from a semver version or range (`^22.1.0`, `~21.2.0`,
+ * `>= 22.0.0 < 23.0.0`, `22.1.0`).
+ */
+export declare function parseMajorVersion(specifier: string | undefined | null): number | null;
+export declare function findDeclaredDependency(pkg: PackageJsonLike, name: string): string | undefined;
+export declare function findAngularVersionMismatches(workspacePackageJson: PackageJsonLike, expectedMajor: number, installedMajors?: Partial<Record<string, number | null>>): AngularVersionMismatch[];
+export declare function hasDetectableAngularVersion(workspacePackageJson: PackageJsonLike, installedMajors?: Partial<Record<string, number | null>>): boolean;
+export declare function formatAngularVersionMismatchMessage(expectedMajor: number, mismatches: AngularVersionMismatch[]): string;
+export declare function formatAngularVersionMatchMessage(expectedMajor: number): string;
+//# sourceMappingURL=angular-version-compat.d.ts.map

package/dist/angular-version-compat.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"angular-version-compat.d.ts","sourceRoot":"","sources":["../src/angular-version-compat.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,eAAO,MAAM,yBAAyB,4CAG5B,CAAC;AAEX,MAAM,WAAW,eAAe;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACzC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1C,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,sBAAsB;IACrC,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GACnC,MAAM,GAAG,IAAI,CAwBf;AAED,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,eAAe,EACpB,IAAI,EAAE,MAAM,GACX,MAAM,GAAG,SAAS,CAMpB;AAED,wBAAgB,4BAA4B,CAC1C,oBAAoB,EAAE,eAAe,EACrC,aAAa,EAAE,MAAM,EACrB,eAAe,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC,GACvD,sBAAsB,EAAE,CAgB1B;AAED,wBAAgB,2BAA2B,CACzC,oBAAoB,EAAE,eAAe,EACrC,eAAe,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC,GACvD,OAAO,CAWT;AAED,wBAAgB,mCAAmC,CACjD,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,sBAAsB,EAAE,GACnC,MAAM,CAcR;AAED,wBAAgB,gCAAgC,CAC9C,aAAa,EAAE,MAAM,GACpB,MAAM,CAER"}

package/dist/angular-version-compat.js

@@ -0,0 +1,91 @@
+"use strict";
+/**
+ * Shared helpers for reporting Angular major mismatches without using a
+ * package-manager peer on `@angular/cli`.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ANGULAR_PACKAGES_TO_CHECK = void 0;
+exports.parseMajorVersion = parseMajorVersion;
+exports.findDeclaredDependency = findDeclaredDependency;
+exports.findAngularVersionMismatches = findAngularVersionMismatches;
+exports.hasDetectableAngularVersion = hasDetectableAngularVersion;
+exports.formatAngularVersionMismatchMessage = formatAngularVersionMismatchMessage;
+exports.formatAngularVersionMatchMessage = formatAngularVersionMatchMessage;
+exports.ANGULAR_PACKAGES_TO_CHECK = [
+    '@angular/core',
+    '@angular/cli',
+];
+/**
+ * Best-effort major from a semver version or range (`^22.1.0`, `~21.2.0`,
+ * `>= 22.0.0 < 23.0.0`, `22.1.0`).
+ */
+function parseMajorVersion(specifier) {
+    if (!specifier) {
+        return null;
+    }
+    const trimmed = specifier.trim();
+    if (!trimmed ||
+        trimmed === '*' ||
+        trimmed === 'latest' ||
+        /^(workspace|catalog|file|link|portal|git|http|https):/i.test(trimmed)) {
+        return null;
+    }
+    const match = trimmed.match(/(\d+)/);
+    if (!match) {
+        return null;
+    }
+    const major = Number(match[1]);
+    // 0.x (including the e2e publish version `0.0.0-e2e`) is not an
+    // Angular-aligned major; treat it as undetectable rather than v0.
+    if (major === 0) {
+        return null;
+    }
+    return major;
+}
+function findDeclaredDependency(pkg, name) {
+    return (pkg.dependencies?.[name] ??
+        pkg.devDependencies?.[name] ??
+        pkg.peerDependencies?.[name]);
+}
+function findAngularVersionMismatches(workspacePackageJson, expectedMajor, installedMajors) {
+    const mismatches = [];
+    for (const name of exports.ANGULAR_PACKAGES_TO_CHECK) {
+        const declared = findDeclaredDependency(workspacePackageJson, name);
+        const installedMajor = installedMajors?.[name];
+        const major = installedMajor ?? parseMajorVersion(declared);
+        if (major == null || major === expectedMajor) {
+            continue;
+        }
+        mismatches.push({
+            packageName: name,
+            specifier: declared ?? `v${major}`,
+            foundMajor: major,
+        });
+    }
+    return mismatches;
+}
+function hasDetectableAngularVersion(workspacePackageJson, installedMajors) {
+    return exports.ANGULAR_PACKAGES_TO_CHECK.some((name) => {
+        const installed = installedMajors?.[name];
+        if (installed != null) {
+            return true;
+        }
+        return (parseMajorVersion(findDeclaredDependency(workspacePackageJson, name)) !==
+            null);
+    });
+}
+function formatAngularVersionMismatchMessage(expectedMajor, mismatches) {
+    const details = mismatches
+        .map((mismatch) => `  - ${mismatch.packageName}@${mismatch.specifier} (v${mismatch.foundMajor})`)
+        .join('\n');
+    return `
+angular-eslint v${expectedMajor} is intended for Angular v${expectedMajor}.
+This workspace is using a different Angular major:
+${details}
+
+See https://github.com/angular-eslint/angular-eslint/blob/main/docs/ANGULAR_VERSION_SUPPORT.md
+`.trim();
+}
+function formatAngularVersionMatchMessage(expectedMajor) {
+    return `angular-eslint v${expectedMajor} matches this workspace's Angular v${expectedMajor}.`;
+}

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

@@ -1,9 +1,4 @@
 import type { Rule } from '@angular-devkit/schematics';
 import type { Schema } from './schema';
-/**
- * Entry point for the ng-add schematic.
- *
- * @param options Configuration options passed to the schematic.
- */
 export default function (options: Schema): Rule;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAG/E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAkLvC;;;;GAIG;AACH,MAAM,CAAC,OAAO,WAAW,OAAO,EAAE,MAAM,GAAG,IAAI,CAY9C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAG/E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAsNvC,MAAM,CAAC,OAAO,WAAW,OAAO,EAAE,MAAM,GAAG,IAAI,CAc9C"}

package/dist/ng-add/index.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const schematics_1 = require("@angular-devkit/schematics");
 const tasks_1 = require("@angular-devkit/schematics/tasks");
+const angular_version_compat_1 = require("../angular-version-compat");
 const utils_1 = require("../utils");
 const packageJSON = require('../../package.json');
 function addAngularESLintPackages(json, options) {
@@ -140,10 +141,25 @@ Please see https://github.com/angular-eslint/angular-eslint for more information
  *
  * @param options Configuration options passed to the schematic.
  */
+function reportAngularVersionCompatibility(workspacePackageJson, context) {
+    const expectedMajor = (0, angular_version_compat_1.parseMajorVersion)(packageJSON.version);
+    if (expectedMajor == null) {
+        return;
+    }
+    const mismatches = (0, angular_version_compat_1.findAngularVersionMismatches)(workspacePackageJson, expectedMajor);
+    if (mismatches.length > 0) {
+        context.logger.warn((0, angular_version_compat_1.formatAngularVersionMismatchMessage)(expectedMajor, mismatches));
+        return;
+    }
+    if ((0, angular_version_compat_1.hasDetectableAngularVersion)(workspacePackageJson)) {
+        context.logger.info((0, angular_version_compat_1.formatAngularVersionMatchMessage)(expectedMajor));
+    }
+}
 function default_1(options) {
     return (host, context) => {
         const workspacePackageJSON = host.read('package.json').toString('utf-8');
         const json = JSON.parse(workspacePackageJSON);
+        reportAngularVersionCompatibility(json, context);
         return (0, schematics_1.chain)([
             addAngularESLintPackages(json, options),
             applyESLintConfigIfSingleProjectWithNoExistingTSLint(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-eslint/schematics",
-  "version": "22.1.1-alpha.13",
+  "version": "22.1.1-alpha.15",
   "description": "Angular Schematics for angular-eslint",
   "license": "MIT",
   "main": "dist/index.js",
@@ -36,17 +36,14 @@
   "ng-add": {
     "save": "devDependencies"
   },
-  "peerDependencies": {
-    "@angular/cli": ">= 22.0.0 < 23.0.0"
-  },
   "dependencies": {
     "@angular-devkit/core": ">= 22.0.0 < 23.0.0",
     "@angular-devkit/schematics": ">= 22.0.0 < 23.0.0",
     "ignore": "7.0.6",
     "semver": "7.8.5",
     "strip-json-comments": "3.1.1",
-    "@angular-eslint/eslint-plugin": "22.1.1-alpha.13",
-    "@angular-eslint/eslint-plugin-template": "22.1.1-alpha.13"
+    "@angular-eslint/eslint-plugin": "22.1.1-alpha.15",
+    "@angular-eslint/eslint-plugin-template": "22.1.1-alpha.15"
   },
   "devDependencies": {
     "@eslint/js": "10.0.1",