@angular-eslint/utils 20.5.3-alpha.4 → 20.6.0

package/dist/eslint-plugin/selector-utils.d.ts

@@ -1,3 +1,4 @@
+import { CssSelector } from '@angular-eslint/bundled-angular-compiler';
 import type { TSESLint, TSESTree } from '@typescript-eslint/utils';
 import type { SelectorStyle } from './ast-utils';
 export declare const OPTION_TYPE_ATTRIBUTE = "attribute";
@@ -6,6 +7,14 @@ export declare const OPTION_TYPE_ELEMENT = "element";
 export type SelectorStyleOption = SelectorStyle | string;
 export type SelectorTypeOption = typeof OPTION_TYPE_ATTRIBUTE | typeof OPTION_TYPE_ELEMENT | string;
 export type SelectorTypeInternal = typeof OPTION_TYPE_ATTRS | typeof OPTION_TYPE_ELEMENT;
+export type SelectorConfig = {
+    readonly type: SelectorTypeOption;
+    readonly prefix: string | readonly string[];
+    readonly style: SelectorStyleOption;
+};
+export type SingleConfigOption = Options[number];
+export type MultipleConfigOption = readonly SelectorConfig[];
+export type RuleOptions = readonly [SingleConfigOption | MultipleConfigOption];
 export type Options = [
     {
         readonly type: SelectorTypeOption | readonly SelectorTypeOption[];
@@ -24,10 +33,14 @@ export declare const reportPrefixError: (node: TSESTree.Node, prefix: string | r
 export declare const reportStyleError: (node: TSESTree.Node, style: SelectorStyleOption, context: Readonly<TSESLint.RuleContext<string, readonly unknown[]>>) => void;
 export declare const reportStyleAndPrefixError: (node: TSESTree.Node, style: SelectorStyleOption, prefix: string | readonly string[], context: Readonly<TSESLint.RuleContext<string, readonly unknown[]>>) => void;
 export declare const reportTypeError: (node: TSESTree.Node, type: SelectorTypeOption | readonly SelectorTypeOption[], context: Readonly<TSESLint.RuleContext<string, readonly unknown[]>>) => void;
+export declare const parseSelectorNode: (node: TSESTree.Node) => readonly CssSelector[] | null;
+export declare const getActualSelectorType: (node: TSESTree.Node) => SelectorTypeOption | null;
 export declare const checkValidOptions: (type: SelectorTypeOption | readonly SelectorTypeOption[], prefix: string | readonly string[], style: SelectorStyleOption) => boolean;
-export declare const checkSelector: (node: TSESTree.Node, typeOption: SelectorTypeOption | readonly SelectorTypeOption[], prefixOption: readonly string[], styleOption: SelectorStyle) => {
+export declare const checkSelector: (node: TSESTree.Node, typeOption: SelectorTypeOption | readonly SelectorTypeOption[], prefixOption: readonly string[], styleOption: SelectorStyle, parsedSelectors?: readonly CssSelector[] | null) => {
     readonly hasExpectedPrefix: boolean;
     readonly hasExpectedType: boolean;
     readonly hasExpectedStyle: boolean;
 } | null;
+export declare const isMultipleConfigOption: (option: SingleConfigOption | MultipleConfigOption) => option is MultipleConfigOption;
+export declare const normalizeOptionsToConfigs: (option: SingleConfigOption | MultipleConfigOption) => Map<string, SelectorConfig>;
 //# sourceMappingURL=selector-utils.d.ts.map

package/dist/eslint-plugin/selector-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"selector-utils.d.ts","sourceRoot":"","sources":["../../src/eslint-plugin/selector-utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AASjD,eAAO,MAAM,qBAAqB,cAAc,CAAC;AACjD,eAAO,MAAM,iBAAiB,UAAU,CAAC;AACzC,eAAO,MAAM,mBAAmB,YAAY,CAAC;AAE7C,MAAM,MAAM,mBAAmB,GAAG,aAAa,GAAG,MAAM,CAAC;AACzD,MAAM,MAAM,kBAAkB,GAC1B,OAAO,qBAAqB,GAC5B,OAAO,mBAAmB,GAC1B,MAAM,CAAC;AACX,MAAM,MAAM,oBAAoB,GAC5B,OAAO,iBAAiB,GACxB,OAAO,mBAAmB,CAAC;AAO/B,MAAM,MAAM,OAAO,GAAG;IACpB;QACE,QAAQ,CAAC,IAAI,EAAE,kBAAkB,GAAG,SAAS,kBAAkB,EAAE,CAAC;QAClE,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,CAAC;QAC5C,QAAQ,CAAC,KAAK,EAAE,kBAAkB,CAAC;KACpC;CACF,CAAC;AAEF,eAAO,MAAM,iBAAiB;wBACR,MAAM,GAAG,OAAO;wBAIhB,MAAM,GAAG,OAAO;sBAIlB,MAAM,GAAG,OAAO;wBAId,MAAM,GAAG,OAAO;mBAIrB,MAAM,iBAAiB,MAAM,GAAG,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO;CAmB7E,CAAC;AAmBF,eAAO,MAAM,iBAAiB,GAC5B,MAAM,QAAQ,CAAC,IAAI,EACnB,QAAQ,MAAM,GAAG,SAAS,MAAM,EAAE,EAClC,SAAS,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,MAAM,EAAE,SAAS,OAAO,EAAE,CAAC,CAAC,KAClE,IAQF,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAC3B,MAAM,QAAQ,CAAC,IAAI,EACnB,OAAO,mBAAmB,EAC1B,SAAS,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,MAAM,EAAE,SAAS,OAAO,EAAE,CAAC,CAAC,KAClE,IAQF,CAAC;AAEF,eAAO,MAAM,yBAAyB,GACpC,MAAM,QAAQ,CAAC,IAAI,EACnB,OAAO,mBAAmB,EAC1B,QAAQ,MAAM,GAAG,SAAS,MAAM,EAAE,EAClC,SAAS,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,MAAM,EAAE,SAAS,OAAO,EAAE,CAAC,CAAC,KAClE,IASF,CAAC;AAEF,eAAO,MAAM,eAAe,GAC1B,MAAM,QAAQ,CAAC,IAAI,EACnB,MAAM,kBAAkB,GAAG,SAAS,kBAAkB,EAAE,EACxD,SAAS,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,MAAM,EAAE,SAAS,OAAO,EAAE,CAAC,CAAC,KAClE,IAQF,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAC5B,MAAM,kBAAkB,GAAG,SAAS,kBAAkB,EAAE,EACxD,QAAQ,MAAM,GAAG,SAAS,MAAM,EAAE,EAClC,OAAO,mBAAmB,KACzB,OAqBF,CAAC;AAEF,eAAO,MAAM,aAAa,GACxB,MAAM,QAAQ,CAAC,IAAI,EACnB,YAAY,kBAAkB,GAAG,SAAS,kBAAkB,EAAE,EAC9D,cAAc,SAAS,MAAM,EAAE,EAC/B,aAAa,aAAa,KACzB;IACD,QAAQ,CAAC,iBAAiB,EAAE,OAAO,CAAC;IACpC,QAAQ,CAAC,eAAe,EAAE,OAAO,CAAC;IAClC,QAAQ,CAAC,gBAAgB,EAAE,OAAO,CAAC;CACpC,GAAG,IA8CH,CAAC"}
+{"version":3,"file":"selector-utils.d.ts","sourceRoot":"","sources":["../../src/eslint-plugin/selector-utils.ts"],"names":[],"mappings":"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"}

package/dist/eslint-plugin/selector-utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkSelector = exports.checkValidOptions = exports.reportTypeError = exports.reportStyleAndPrefixError = exports.reportStyleError = exports.reportPrefixError = exports.SelectorValidator = exports.OPTION_TYPE_ELEMENT = exports.OPTION_TYPE_ATTRS = exports.OPTION_TYPE_ATTRIBUTE = void 0;
+exports.normalizeOptionsToConfigs = exports.isMultipleConfigOption = exports.checkSelector = exports.checkValidOptions = exports.getActualSelectorType = exports.parseSelectorNode = exports.reportTypeError = exports.reportStyleAndPrefixError = exports.reportStyleError = exports.reportPrefixError = exports.SelectorValidator = exports.OPTION_TYPE_ELEMENT = exports.OPTION_TYPE_ATTRS = exports.OPTION_TYPE_ATTRIBUTE = void 0;
 const bundled_angular_compiler_1 = require("@angular-eslint/bundled-angular-compiler");
 const ast_utils_1 = require("./ast-utils");
 const utils_1 = require("../utils");
@@ -92,6 +92,37 @@ const reportTypeError = (node, type, context) => {
     });
 };
 exports.reportTypeError = reportTypeError;
+const parseSelectorNode = (node) => {
+    if ((0, ast_utils_1.isLiteral)(node)) {
+        return bundled_angular_compiler_1.CssSelector.parse(node.raw);
+    }
+    else if ((0, ast_utils_1.isTemplateLiteral)(node) && node.quasis[0]) {
+        return bundled_angular_compiler_1.CssSelector.parse(node.quasis[0].value.raw);
+    }
+    return null;
+};
+exports.parseSelectorNode = parseSelectorNode;
+const getActualSelectorType = (node) => {
+    const listSelectors = (0, exports.parseSelectorNode)(node);
+    if (!listSelectors || listSelectors.length === 0) {
+        return null;
+    }
+    // Check the first selector to determine type
+    const firstSelector = listSelectors[0];
+    // Attribute selectors have attrs populated (e.g., [appFoo])
+    // CssSelector.attrs is an array where each attribute is stored as [name, value]
+    if (Array.isArray(firstSelector.attrs) && firstSelector.attrs.length > 0) {
+        return exports.OPTION_TYPE_ATTRIBUTE;
+    }
+    // Element selectors have a non-null, non-empty element (e.g., app-foo)
+    if (firstSelector.element != null &&
+        firstSelector.element !== '' &&
+        firstSelector.element !== '*') {
+        return exports.OPTION_TYPE_ELEMENT;
+    }
+    return null;
+};
+exports.getActualSelectorType = getActualSelectorType;
 const checkValidOptions = (type, prefix, style) => {
     // Get options
     const typeOption = (0, utils_1.arrayify)(type);
@@ -105,19 +136,14 @@ const checkValidOptions = (type, prefix, style) => {
     return isTypeOptionValid && isPrefixOptionValid && isStyleOptionValid;
 };
 exports.checkValidOptions = checkValidOptions;
-const checkSelector = (node, typeOption, prefixOption, styleOption) => {
+const checkSelector = (node, typeOption, prefixOption, styleOption, parsedSelectors) => {
     // Get valid list of selectors
     const types = (0, utils_1.arrayify)(typeOption || [exports.OPTION_TYPE_ATTRS, exports.OPTION_TYPE_ELEMENT]).reduce((previousValue, currentValue) => previousValue.concat(SELECTOR_TYPE_MAPPER[currentValue]), []);
     const styleValidator = styleOption === ast_utils_1.OPTION_STYLE_KEBAB_CASE
         ? exports.SelectorValidator.kebabCase
         : exports.SelectorValidator.camelCase;
-    let listSelectors = null;
-    if (node && (0, ast_utils_1.isLiteral)(node)) {
-        listSelectors = bundled_angular_compiler_1.CssSelector.parse(node.raw);
-    }
-    else if (node && (0, ast_utils_1.isTemplateLiteral)(node) && node.quasis[0]) {
-        listSelectors = bundled_angular_compiler_1.CssSelector.parse(node.quasis[0].value.raw);
-    }
+    // Use provided parsed selectors or parse them
+    const listSelectors = parsedSelectors ?? (0, exports.parseSelectorNode)(node);
     if (!listSelectors) {
         return null;
     }
@@ -132,3 +158,40 @@ const checkSelector = (node, typeOption, prefixOption, styleOption) => {
     };
 };
 exports.checkSelector = checkSelector;
+// Type guard for multiple configs
+const isMultipleConfigOption = (option) => {
+    return (Array.isArray(option) &&
+        option.length >= 1 &&
+        option.length <= 2 &&
+        option.every((config) => typeof config.type === 'string'));
+};
+exports.isMultipleConfigOption = isMultipleConfigOption;
+// Normalize options to a consistent format
+const normalizeOptionsToConfigs = (option) => {
+    const configByType = new Map();
+    if ((0, exports.isMultipleConfigOption)(option)) {
+        // Validate no duplicate types
+        const types = option.map((config) => config.type);
+        if (new Set(types).size !== types.length) {
+            throw new Error('Invalid rule config: Each config object in the options array must have a unique "type" property (either "element" or "attribute")');
+        }
+        // Build lookup map by type
+        for (const config of option) {
+            configByType.set(config.type, config);
+        }
+    }
+    else {
+        // Single config - normalize to map format
+        // Handle both single type and array of types
+        const types = (0, utils_1.arrayify)(option.type);
+        for (const type of types) {
+            configByType.set(type, {
+                type,
+                prefix: option.prefix,
+                style: option.style,
+            });
+        }
+    }
+    return configByType;
+};
+exports.normalizeOptionsToConfigs = normalizeOptionsToConfigs;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-eslint/utils",
-  "version": "20.5.3-alpha.4",
+  "version": "20.6.0",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -22,7 +22,7 @@
     "typescript": "*"
   },
   "dependencies": {
-    "@angular-eslint/bundled-angular-compiler": "20.5.3-alpha.4"
+    "@angular-eslint/bundled-angular-compiler": "20.6.0"
   },
   "nx": {
     "namedInputs": {