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

package/dist/lint.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lint.impl.d.ts","sourceRoot":"","sources":["../src/lint.impl.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;;AAMvC,wBA0NE"}
+{"version":3,"file":"lint.impl.d.ts","sourceRoot":"","sources":["../src/lint.impl.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;;AAavC,wBAqOE"}

package/dist/lint.impl.js

@@ -2,8 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const architect_1 = require("@angular-devkit/architect");
 const fs_1 = require("fs");
+const node_module_1 = require("node:module");
 const path_1 = require("path");
+const angular_version_compat_1 = require("./utils/angular-version-compat");
 const eslint_utils_1 = require("./utils/eslint-utils");
+const report_angular_version_compat_1 = require("./utils/report-angular-version-compat");
+const requireFromModule = (0, node_module_1.createRequire)(__filename);
+const { version: builderVersion } = requireFromModule('../package.json');
 exports.default = (0, architect_1.createBuilder)(async (options, context) => {
     try {
         const systemRoot = context.workspaceRoot;
@@ -28,6 +33,12 @@ exports.default = (0, architect_1.createBuilder)(async (options, context) => {
         if (printInfo) {
             console.info(`\nLinting ${JSON.stringify(projectName)}...`);
         }
+        const expectedMajor = (0, angular_version_compat_1.parseMajorVersion)(builderVersion);
+        if (expectedMajor !== null) {
+            (0, report_angular_version_compat_1.reportAngularVersionCompatibility)(systemRoot, expectedMajor, (message) => {
+                context.logger.warn(message);
+            });
+        }
         const eslintConfigPath = options.eslintConfig
             ? (0, path_1.resolve)(systemRoot, options.eslintConfig)
             : undefined;

package/dist/utils/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/utils/angular-version-compat.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"angular-version-compat.d.ts","sourceRoot":"","sources":["../../src/utils/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/utils/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/utils/report-angular-version-compat.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Warn when the workspace Angular major does not match this builder's major.
+ * Does not fail the lint; package managers should not be the compatibility UI.
+ */
+export declare function reportAngularVersionCompatibility(workspaceRoot: string, expectedMajor: number, warn: (message: string) => void): void;
+//# sourceMappingURL=report-angular-version-compat.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"report-angular-version-compat.d.ts","sourceRoot":"","sources":["../../src/utils/report-angular-version-compat.ts"],"names":[],"mappings":"AA6CA;;;GAGG;AACH,wBAAgB,iCAAiC,CAC/C,aAAa,EAAE,MAAM,EACrB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GAC9B,IAAI,CAeN"}

package/dist/utils/report-angular-version-compat.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.reportAngularVersionCompatibility = reportAngularVersionCompatibility;
+const node_fs_1 = require("node:fs");
+const node_path_1 = require("node:path");
+const angular_version_compat_1 = require("./angular-version-compat");
+function readWorkspacePackageJson(workspaceRoot) {
+    try {
+        return JSON.parse((0, node_fs_1.readFileSync)((0, node_path_1.join)(workspaceRoot, 'package.json'), 'utf8'));
+    }
+    catch {
+        return {};
+    }
+}
+/**
+ * Read an installed package version from this workspace only (no walk-up
+ * into parent node_modules, which would lie in monorepo tests and nested
+ * workspaces).
+ */
+function readInstalledMajor(workspaceRoot, packageName) {
+    try {
+        const pkgJsonPath = (0, node_path_1.join)(workspaceRoot, 'node_modules', ...packageName.split('/'), 'package.json');
+        const pkg = JSON.parse((0, node_fs_1.readFileSync)(pkgJsonPath, 'utf8'));
+        return (0, angular_version_compat_1.parseMajorVersion)(pkg.version);
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Warn when the workspace Angular major does not match this builder's major.
+ * Does not fail the lint; package managers should not be the compatibility UI.
+ */
+function reportAngularVersionCompatibility(workspaceRoot, expectedMajor, warn) {
+    const workspacePackageJson = readWorkspacePackageJson(workspaceRoot);
+    const installedMajors = {};
+    for (const name of angular_version_compat_1.ANGULAR_PACKAGES_TO_CHECK) {
+        installedMajors[name] = readInstalledMajor(workspaceRoot, name);
+    }
+    const mismatches = (0, angular_version_compat_1.findAngularVersionMismatches)(workspacePackageJson, expectedMajor, installedMajors);
+    if (mismatches.length === 0) {
+        return;
+    }
+    warn((0, angular_version_compat_1.formatAngularVersionMismatchMessage)(expectedMajor, mismatches));
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-eslint/builder",
-  "version": "22.1.1-alpha.13",
+  "version": "22.1.1-alpha.15",
   "description": "Angular CLI builder for ESLint",
   "license": "MIT",
   "main": "dist/index.js",
@@ -24,7 +24,6 @@
     "@angular-devkit/core": ">= 22.0.0 < 23.0.0"
   },
   "peerDependencies": {
-    "@angular/cli": ">= 22.0.0 < 23.0.0",
     "eslint": "^9.0.0 || ^10.0.0",
     "typescript": "*"
   },