@markuplint/rules 3.6.1 → 3.8.0

package/lib/attr-check.d.ts

@@ -2,14 +2,14 @@ import type { Translator } from '@markuplint/i18n';
 import type { Attribute as AttrSpec, AttributeType } from '@markuplint/ml-spec';
 import type { ReadonlyDeep } from 'type-fest';
 type Invalid = {
-    invalidType: 'non-existent' | 'invalid-value' | 'disallowed-attr';
-    message: string;
-    loc?: Loc;
+	invalidType: 'non-existent' | 'invalid-value' | 'disallowed-attr';
+	message: string;
+	loc?: Loc;
 };
 type Loc = {
-    raw: string;
-    line: number;
-    col: number;
+	raw: string;
+	line: number;
+	col: number;
 };
 /**
  * Use in rules `invalid-attr` and `wai-aria`
@@ -19,6 +19,17 @@ type Loc = {
  * @param isCustomRule
  * @param spec
  */
-export declare function attrCheck(t: Translator, name: string, value: string, isCustomRule: boolean, spec?: AttrSpec): Invalid | false;
-export declare function valueCheck(t: Translator, name: string, value: string, type: ReadonlyDeep<AttributeType>): [string, Loc] | false;
+export declare function attrCheck(
+	t: Translator,
+	name: string,
+	value: string,
+	isCustomRule: boolean,
+	spec?: AttrSpec,
+): Invalid | false;
+export declare function valueCheck(
+	t: Translator,
+	name: string,
+	value: string,
+	type: ReadonlyDeep<AttributeType>,
+): [string, Loc] | false;
 export {};

package/lib/helpers.d.ts

@@ -3,7 +3,10 @@ import type { Translator } from '@markuplint/i18n';
 import type { PlainData } from '@markuplint/ml-config';
 import type { Element, RuleConfigValue, Document } from '@markuplint/ml-core';
 import type { Attribute } from '@markuplint/ml-spec';
-export declare function attrMatches<T extends RuleConfigValue, O extends PlainData>(node: Element<T, O>, condition: Attribute['condition']): boolean;
+export declare function attrMatches<T extends RuleConfigValue, O extends PlainData>(
+	node: Element<T, O>,
+	condition: Attribute['condition'],
+): boolean;
 export declare function match(needle: string, pattern: string): boolean;
 /**
  * PotentialCustomElementName
@@ -21,27 +24,42 @@ export declare function match(needle: string, pattern: string): boolean;
  * Originally, it is not possible to define a name including ASCII upper alphas in the custom element, but it is not treated as illegal by the HTML parser.
  */
 export declare const rePCENChar: string;
-export declare function isValidAttr(t: Translator, name: string, value: string, isDynamicValue: boolean, node: Element<any, any>, attrSpecs: readonly Attribute[], log?: Log): false | {
-    invalidType: "non-existent" | "invalid-value" | "disallowed-attr";
-    message: string;
-    loc?: {
-        raw: string;
-        line: number;
-        col: number;
-    } | undefined;
-};
+export declare function isValidAttr(
+	t: Translator,
+	name: string,
+	value: string,
+	isDynamicValue: boolean,
+	node: Element<any, any>,
+	attrSpecs: readonly Attribute[],
+	log?: Log,
+):
+	| false
+	| {
+			invalidType: 'non-existent' | 'invalid-value' | 'disallowed-attr';
+			message: string;
+			loc?:
+				| {
+						raw: string;
+						line: number;
+						col: number;
+				  }
+				| undefined;
+	  };
 export declare function toNormalizedValue(value: string, spec: Attribute): string;
 export declare function accnameMayBeMutable(el: Element<any, any>, document: Document<any, any>): boolean;
-export declare function getOwnedLabel<V extends RuleConfigValue, O extends PlainData>(el: Element<V, O>, document: Document<V, O>): Element<V, O> | null;
+export declare function getOwnedLabel<V extends RuleConfigValue, O extends PlainData>(
+	el: Element<V, O>,
+	document: Document<V, O>,
+): Element<V, O> | null;
 export declare class Collection<T> {
-    #private;
-    constructor(...items: readonly (T | null | undefined)[]);
-    [Symbol.iterator](): Iterator<T>;
-    add(...items: readonly (T | null | undefined)[]): void;
-    toArray(): readonly T[];
+	#private;
+	constructor(...items: readonly (T | null | undefined)[]);
+	[Symbol.iterator](): Iterator<T>;
+	add(...items: readonly (T | null | undefined)[]): void;
+	toArray(): readonly T[];
 }
 type Writeable<T> = {
-    -readonly [P in keyof T]: T[P];
+	-readonly [P in keyof T]: T[P];
 };
 export declare function deepCopy<T>(value: T): Writeable<T>;
 export {};

package/lib/index.d.ts

@@ -1,175 +1,102 @@
 declare const rules: {
-	readonly 'attr-duplication': Readonly<
-		import('@markuplint/ml-core').RuleSeed<import('@markuplint/ml-core').RuleConfigValue, undefined>
-	>;
-	readonly 'attr-value-quotes': Readonly<
-		import('@markuplint/ml-core').RuleSeed<import('./attr-value-quotes').Type, undefined>
-	>;
-	readonly 'case-sensitive-attr-name': Readonly<
-		import('@markuplint/ml-core').RuleSeed<import('./case-sensitive-attr-name').Value, undefined>
-	>;
-	readonly 'case-sensitive-tag-name': Readonly<
-		import('@markuplint/ml-core').RuleSeed<import('./case-sensitive-tag-name').Value, undefined>
-	>;
-	readonly 'character-reference': Readonly<
-		import('@markuplint/ml-core').RuleSeed<import('@markuplint/ml-core').RuleConfigValue, undefined>
-	>;
-	readonly 'class-naming': Readonly<
-		import('@markuplint/ml-core').RuleSeed<import('./class-naming').Value, undefined>
-	>;
-	readonly 'deprecated-attr': Readonly<
-		import('@markuplint/ml-core').RuleSeed<import('@markuplint/ml-core').RuleConfigValue, undefined>
-	>;
-	readonly 'deprecated-element': Readonly<
-		import('@markuplint/ml-core').RuleSeed<import('@markuplint/ml-core').RuleConfigValue, undefined>
-	>;
-	readonly 'disallowed-element': Readonly<import('@markuplint/ml-core').RuleSeed<string[], undefined>>;
-	readonly doctype: Readonly<
-		import('@markuplint/ml-core').RuleSeed<
-			'always',
-			{
-				denyObsoleteType: boolean;
-			}
-		>
-	>;
-	readonly 'end-tag': Readonly<import('@markuplint/ml-core').RuleSeed<boolean, undefined>>;
-	readonly 'id-duplication': Readonly<
-		import('@markuplint/ml-core').RuleSeed<import('@markuplint/ml-core').RuleConfigValue, undefined>
-	>;
-	readonly 'ineffective-attr': Readonly<
-		import('@markuplint/ml-core').RuleSeed<import('@markuplint/ml-core').RuleConfigValue, undefined>
-	>;
-	readonly 'invalid-attr': Readonly<
-		import('@markuplint/ml-core').RuleSeed<
-			boolean,
-			{
-				attrs?:
-					| Record<
-							string,
-							| {
-									enum: [string, ...string[]];
-							  }
-							| {
-									pattern: string;
-							  }
-							| {
-									type: import('packages/@markuplint/ml-spec/lib').AttributeType;
-							  }
-							| {
-									disallowed: true;
-							  }
-					  >
-					| undefined;
-				ignoreAttrNamePrefix?: string | string[] | undefined;
-				allowToAddPropertiesForPretender?: boolean | undefined;
-			}
-		>
-	>;
-	readonly 'label-has-control': Readonly<
-		import('@markuplint/ml-core').RuleSeed<import('@markuplint/ml-core').RuleConfigValue, undefined>
-	>;
-	readonly 'landmark-roles': Readonly<
-		import('@markuplint/ml-core').RuleSeed<
-			boolean,
-			{
-				ignoreRoles: (
-					| ('banner' | 'main' | 'complementary' | 'contentinfo')
-					| 'form'
-					| 'navigation'
-					| 'region'
-				)[];
-				labelEachArea: boolean;
-			}
-		>
-	>;
-	readonly 'no-boolean-attr-value': Readonly<
-		import('@markuplint/ml-core').RuleSeed<import('@markuplint/ml-core').RuleConfigValue, undefined>
-	>;
-	readonly 'no-default-value': Readonly<
-		import('@markuplint/ml-core').RuleSeed<import('@markuplint/ml-core').RuleConfigValue, undefined>
-	>;
-	readonly 'no-empty-palpable-content': Readonly<
-		import('@markuplint/ml-core').RuleSeed<
-			boolean,
-			{
-				extendsExposableElements?: boolean | undefined;
-				ignoreIfAriaBusy?: boolean | undefined;
-			}
-		>
-	>;
-	readonly 'no-hard-code-id': Readonly<
-		import('@markuplint/ml-core').RuleSeed<import('@markuplint/ml-core').RuleConfigValue, undefined>
-	>;
-	readonly 'no-refer-to-non-existent-id': Readonly<
-		import('@markuplint/ml-core').RuleSeed<
-			import('@markuplint/ml-core').RuleConfigValue,
-			{
-				ariaVersion: import('packages/@markuplint/ml-spec/lib').ARIAVersion;
-				fragmentRefersNameAttr: boolean;
-			}
-		>
-	>;
-	readonly 'no-use-event-handler-attr': Readonly<
-		import('@markuplint/ml-core').RuleSeed<
-			boolean,
-			{
-				ignore?: string | string[] | undefined;
-			}
-		>
-	>;
-	readonly 'permitted-contents': Readonly<
-		import('@markuplint/ml-core').RuleSeed<
-			import('./permitted-contents/types').TagRule[],
-			import('./permitted-contents/types').Options
-		>
-	>;
-	readonly 'placeholder-label-option': Readonly<import('@markuplint/ml-core').RuleSeed<boolean, undefined>>;
-	readonly 'require-accessible-name': Readonly<
-		import('@markuplint/ml-core').RuleSeed<
-			boolean,
-			{
-				ariaVersion: import('packages/@markuplint/ml-spec/lib').ARIAVersion;
-			}
-		>
-	>;
-	readonly 'require-datetime': Readonly<
-		import('@markuplint/ml-core').RuleSeed<
-			boolean,
-			{
-				langs?: import('./require-datetime/types').Lang[] | undefined;
-			}
-		>
-	>;
-	readonly 'required-attr': Readonly<
-		import('@markuplint/ml-core').RuleSeed<
-			| string
-			| (
-					| string
-					| {
-							name: string;
-							value: string | string[];
-					  }
-			  )[],
-			undefined
-		>
-	>;
-	readonly 'required-element': Readonly<
-		import('@markuplint/ml-core').RuleSeed<
-			string[],
-			{
-				ignoreHasMutableContents: boolean;
-			}
-		>
-	>;
-	readonly 'required-h1': Readonly<import('@markuplint/ml-core').RuleSeed<boolean, import('./required-h1').Options>>;
-	readonly 'use-list': Readonly<
-		import('@markuplint/ml-core').RuleSeed<
-			readonly string[],
-			{
-				spaceNeededBullets?: string[] | undefined;
-			}
-		>
-	>;
-	readonly 'wai-aria': Readonly<import('@markuplint/ml-core').RuleSeed<boolean, import('./wai-aria/types').Options>>;
+    readonly 'attr-duplication': Readonly<import("@markuplint/ml-core").RuleSeed<import("@markuplint/ml-core").RuleConfigValue, undefined>>;
+    readonly 'attr-value-quotes': Readonly<import("@markuplint/ml-core").RuleSeed<import("./attr-value-quotes").Type, undefined>>;
+    readonly 'case-sensitive-attr-name': Readonly<import("@markuplint/ml-core").RuleSeed<import("./case-sensitive-attr-name").Value, undefined>>;
+    readonly 'case-sensitive-tag-name': Readonly<import("@markuplint/ml-core").RuleSeed<import("./case-sensitive-tag-name").Value, undefined>>;
+    readonly 'character-reference': Readonly<import("@markuplint/ml-core").RuleSeed<import("@markuplint/ml-core").RuleConfigValue, undefined>>;
+    readonly 'class-naming': Readonly<import("@markuplint/ml-core").RuleSeed<import("./class-naming").Value, undefined>>;
+    readonly 'deprecated-attr': Readonly<import("@markuplint/ml-core").RuleSeed<import("@markuplint/ml-core").RuleConfigValue, undefined>>;
+    readonly 'deprecated-element': Readonly<import("@markuplint/ml-core").RuleSeed<import("@markuplint/ml-core").RuleConfigValue, undefined>>;
+    readonly 'disallowed-element': Readonly<import("@markuplint/ml-core").RuleSeed<string[], undefined>>;
+    readonly doctype: Readonly<import("@markuplint/ml-core").RuleSeed<"always", {
+        denyObsoleteType: boolean;
+    }>>;
+    readonly 'end-tag': Readonly<import("@markuplint/ml-core").RuleSeed<boolean, undefined>>;
+    readonly 'id-duplication': Readonly<import("@markuplint/ml-core").RuleSeed<import("@markuplint/ml-core").RuleConfigValue, undefined>>;
+    readonly 'ineffective-attr': Readonly<import("@markuplint/ml-core").RuleSeed<import("@markuplint/ml-core").RuleConfigValue, undefined>>;
+    readonly 'invalid-attr': Readonly<import("@markuplint/ml-core").RuleSeed<boolean, {
+        allowAttrs?: Record<string, {
+            enum: [string, ...string[]];
+        } | {
+            pattern: string;
+        } | {
+            type: import("packages/@markuplint/ml-spec/src").AttributeType;
+        }> | (string | {
+            name: string;
+            value: import("packages/@markuplint/ml-spec/src").AttributeType | ({
+                enum: [string, ...string[]];
+            } | {
+                pattern: string;
+            } | {
+                type: import("packages/@markuplint/ml-spec/src").AttributeType;
+            });
+        })[] | undefined;
+        disallowAttrs?: Record<string, {
+            enum: [string, ...string[]];
+        } | {
+            pattern: string;
+        } | {
+            type: import("packages/@markuplint/ml-spec/src").AttributeType;
+        }> | (string | {
+            name: string;
+            value: import("packages/@markuplint/ml-spec/src").AttributeType | ({
+                enum: [string, ...string[]];
+            } | {
+                pattern: string;
+            } | {
+                type: import("packages/@markuplint/ml-spec/src").AttributeType;
+            });
+        })[] | undefined;
+        ignoreAttrNamePrefix?: string | string[] | undefined;
+        allowToAddPropertiesForPretender?: boolean | undefined;
+        attrs?: Record<string, ({
+            enum: [string, ...string[]];
+        } | {
+            pattern: string;
+        } | {
+            type: import("packages/@markuplint/ml-spec/src").AttributeType;
+        }) | {
+            disallowed: true;
+        }> | undefined;
+    }>>;
+    readonly 'label-has-control': Readonly<import("@markuplint/ml-core").RuleSeed<import("@markuplint/ml-core").RuleConfigValue, undefined>>;
+    readonly 'landmark-roles': Readonly<import("@markuplint/ml-core").RuleSeed<boolean, {
+        ignoreRoles: (("banner" | "main" | "complementary" | "contentinfo") | "form" | "navigation" | "region")[];
+        labelEachArea: boolean;
+    }>>;
+    readonly 'no-boolean-attr-value': Readonly<import("@markuplint/ml-core").RuleSeed<import("@markuplint/ml-core").RuleConfigValue, undefined>>;
+    readonly 'no-default-value': Readonly<import("@markuplint/ml-core").RuleSeed<import("@markuplint/ml-core").RuleConfigValue, undefined>>;
+    readonly 'no-empty-palpable-content': Readonly<import("@markuplint/ml-core").RuleSeed<boolean, {
+        extendsExposableElements?: boolean | undefined;
+        ignoreIfAriaBusy?: boolean | undefined;
+    }>>;
+    readonly 'no-hard-code-id': Readonly<import("@markuplint/ml-core").RuleSeed<import("@markuplint/ml-core").RuleConfigValue, undefined>>;
+    readonly 'no-refer-to-non-existent-id': Readonly<import("@markuplint/ml-core").RuleSeed<import("@markuplint/ml-core").RuleConfigValue, {
+        ariaVersion: "1.1" | "1.2" | "1.3";
+        fragmentRefersNameAttr: boolean;
+    }>>;
+    readonly 'no-use-event-handler-attr': Readonly<import("@markuplint/ml-core").RuleSeed<boolean, {
+        ignore?: string | string[] | undefined;
+    }>>;
+    readonly 'permitted-contents': Readonly<import("@markuplint/ml-core").RuleSeed<import("./permitted-contents/types").TagRule[], import("./permitted-contents/types").Options>>;
+    readonly 'placeholder-label-option': Readonly<import("@markuplint/ml-core").RuleSeed<boolean, undefined>>;
+    readonly 'require-accessible-name': Readonly<import("@markuplint/ml-core").RuleSeed<boolean, {
+        ariaVersion: "1.1" | "1.2" | "1.3";
+    }>>;
+    readonly 'require-datetime': Readonly<import("@markuplint/ml-core").RuleSeed<boolean, {
+        langs?: import("./require-datetime/types").Lang[] | undefined;
+    }>>;
+    readonly 'required-attr': Readonly<import("@markuplint/ml-core").RuleSeed<string | (string | {
+        name: string;
+        value?: string | string[] | undefined;
+    })[], undefined>>;
+    readonly 'required-element': Readonly<import("@markuplint/ml-core").RuleSeed<string[], {
+        ignoreHasMutableContents: boolean;
+    }>>;
+    readonly 'required-h1': Readonly<import("@markuplint/ml-core").RuleSeed<boolean, import("./required-h1").Options>>;
+    readonly 'use-list': Readonly<import("@markuplint/ml-core").RuleSeed<readonly string[], {
+        spaceNeededBullets?: string[] | undefined;
+    }>>;
+    readonly 'wai-aria': Readonly<import("@markuplint/ml-core").RuleSeed<boolean, import("./wai-aria/types").Options>>;
 };
 export default rules;

package/lib/invalid-attr/index.d.ts

@@ -1,10 +1,36 @@
 import type { AttributeType } from '@markuplint/ml-spec';
 type Option = {
-	attrs?: Record<string, Rule>;
+	/**
+	 * @since 3.7.0
+	 */
+	allowAttrs?: (string | Attr)[] | Record<string, ValueRule>;
+	/**
+	 * @since 3.7.0
+	 */
+	disallowAttrs?: (string | Attr)[] | Record<string, ValueRule>;
 	ignoreAttrNamePrefix?: string | string[];
 	allowToAddPropertiesForPretender?: boolean;
+	/**
+	 * @deprecated Since version 3.7.0. Use `allowAttrs` or `disallowAttrs` instead.
+	 * This option (`attr`) is now considered ambiguous and may lead to confusion.
+	 * Please use the more explicit `allowAttrs` or `disallowAttrs` option
+	 * to specify allowed attributes for the `invalid-attr` rule.
+	 * @see {@link Option.allowAttrs}
+	 * @see {@link Option.disallowAttrs}
+	 */
+	attrs?: Record<
+		string,
+		| ValueRule
+		| {
+				disallowed: true;
+		  }
+	>;
 };
-type Rule =
+type Attr = {
+	name: string;
+	value: AttributeType | ValueRule;
+};
+type ValueRule =
 	| {
 			enum: [string, ...string[]];
 	  }
@@ -13,9 +39,6 @@ type Rule =
 	  }
 	| {
 			type: AttributeType;
-	  }
-	| {
-			disallowed: true;
 	  };
 declare const _default: Readonly<import('@markuplint/ml-core').RuleSeed<boolean, Option>>;
 export default _default;

package/lib/invalid-attr/index.js

@@ -9,7 +9,7 @@ exports.default = (0, ml_core_1.createRule)({
     defaultOptions: {},
     async verify({ document, report, t }) {
         await document.walkOn('Attr', attr => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
             // Default
             const allowToAddPropertiesForPretender = (_a = attr.rule.options.allowToAddPropertiesForPretender) !== null && _a !== void 0 ? _a : true;
             if (attr.isDirective) {
@@ -42,33 +42,126 @@ exports.default = (0, ml_core_1.createRule)({
                 }
             }
             let invalid = false;
-            const customRule = attr.rule.options.attrs ? attr.rule.options.attrs[name] : null;
-            if (customRule) {
-                if ('enum' in customRule) {
+            const allowAttrs = {};
+            const disallowAttrs = {};
+            if (attr.rule.options.allowAttrs) {
+                if (Array.isArray(attr.rule.options.allowAttrs)) {
+                    for (const allowAttr of attr.rule.options.allowAttrs) {
+                        if (typeof allowAttr === 'string') {
+                            allowAttrs[allowAttr] = { type: 'Any' };
+                            continue;
+                        }
+                        if (isValueRule(allowAttr.value)) {
+                            allowAttrs[allowAttr.name] = allowAttr.value;
+                            continue;
+                        }
+                        allowAttrs[allowAttr.name] = { type: allowAttr.value };
+                    }
+                }
+                else {
+                    for (const [attrName, valueRule] of Object.entries(attr.rule.options.allowAttrs)) {
+                        allowAttrs[attrName] = valueRule;
+                    }
+                }
+            }
+            if (attr.rule.options.disallowAttrs) {
+                if (Array.isArray(attr.rule.options.disallowAttrs)) {
+                    for (const disallowAttr of attr.rule.options.disallowAttrs) {
+                        if (typeof disallowAttr === 'string') {
+                            disallowAttrs[disallowAttr] = { type: 'Any' };
+                            continue;
+                        }
+                        if (isValueRule(disallowAttr.value)) {
+                            disallowAttrs[disallowAttr.name] = disallowAttr.value;
+                            continue;
+                        }
+                        disallowAttrs[disallowAttr.name] = { type: disallowAttr.value };
+                    }
+                }
+                else {
+                    for (const [attrName, valueRule] of Object.entries(attr.rule.options.disallowAttrs)) {
+                        disallowAttrs[attrName] = valueRule;
+                    }
+                }
+            }
+            if (attr.rule.options.attrs) {
+                for (const [attrName, valueRule] of Object.entries(attr.rule.options.attrs)) {
+                    if ('disallowed' in valueRule) {
+                        disallowAttrs[attrName] = { type: 'Any' };
+                    }
+                    else {
+                        allowAttrs[attrName] = valueRule;
+                    }
+                }
+            }
+            const allowValue = (_b = allowAttrs[name]) !== null && _b !== void 0 ? _b : null;
+            const disallowValue = (_c = disallowAttrs[name]) !== null && _c !== void 0 ? _c : null;
+            if (allowValue) {
+                if ('enum' in allowValue) {
                     invalid = (0, attr_check_1.attrCheck)(t, name.toLowerCase(), value, true, {
                         name,
                         type: {
-                            enum: customRule.enum,
+                            enum: allowValue.enum,
                         },
                         description: '',
                     });
                 }
-                else if ('pattern' in customRule) {
-                    if (!(0, helpers_1.match)(value, customRule.pattern)) {
+                else if ('pattern' in allowValue) {
+                    if (!(0, helpers_1.match)(value, allowValue.pattern)) {
+                        invalid = {
+                            invalidType: 'invalid-value',
+                            message: t('{0} is unmatched with the below patterns: {1}', t('the "{0*}" {1}', name, 'attribute'), allowValue.pattern),
+                        };
+                    }
+                }
+                else if ('type' in allowValue) {
+                    invalid = (0, attr_check_1.attrCheck)(t, name, value, true, { name, type: allowValue.type, description: '' });
+                }
+            }
+            else if (disallowValue) {
+                if ('enum' in disallowValue) {
+                    const checkResult = (0, attr_check_1.attrCheck)(t, name.toLowerCase(), value, true, {
+                        name,
+                        type: {
+                            enum: disallowValue.enum,
+                        },
+                        description: '',
+                    });
+                    if (checkResult === false) {
                         invalid = {
                             invalidType: 'invalid-value',
-                            message: t('{0} is unmatched with the below patterns: {1}', t('the "{0*}" {1}', name, 'attribute'), customRule.pattern),
+                            message: t('{0} is disallowed to accept the following values: {1}', t('the "{0*}" {1}', name, 'attribute'), t(disallowValue.enum)),
                         };
                     }
                 }
-                else if ('type' in customRule) {
-                    invalid = (0, attr_check_1.attrCheck)(t, name, value, true, { name, type: customRule.type, description: '' });
+                else if ('pattern' in disallowValue) {
+                    if ((0, helpers_1.match)(value, disallowValue.pattern)) {
+                        invalid = {
+                            invalidType: 'invalid-value',
+                            message: t('{0} is matched with the below disallowed patterns: {1}', t('the "{0*}" {1}', name, 'attribute'), disallowValue.pattern),
+                        };
+                    }
                 }
-                else if ('disallowed' in customRule && customRule.disallowed) {
-                    invalid = {
-                        invalidType: 'non-existent',
-                        message: t('{0} is disallowed', t('the "{0*}" {1}', name, 'attribute')),
-                    };
+                else if ('type' in disallowValue) {
+                    if (disallowValue.type === 'Any') {
+                        invalid = {
+                            invalidType: 'non-existent',
+                            message: t('{0} is disallowed', t('the "{0*}" {1}', name, 'attribute')),
+                        };
+                    }
+                    else {
+                        const checkResult = (0, attr_check_1.attrCheck)(t, name, value, true, {
+                            name,
+                            type: disallowValue.type,
+                            description: '',
+                        });
+                        if (checkResult === false) {
+                            invalid = {
+                                invalidType: 'invalid-value',
+                                message: t('{0} is disallowed', t('{0} of {1}', t('the {0}', 'type'), t('the "{0*}" {1}', name, 'attribute'))),
+                            };
+                        }
+                    }
                 }
             }
             else if (attr.ownerElement.elementType === 'html' && attrSpecs) {
@@ -91,16 +184,16 @@ exports.default = (0, ml_core_1.createRule)({
                         report({
                             scope: attr,
                             message: invalid.message,
-                            line: ((_b = valueNode === null || valueNode === void 0 ? void 0 : valueNode.startLine) !== null && _b !== void 0 ? _b : 0) + ((_d = (_c = invalid.loc) === null || _c === void 0 ? void 0 : _c.line) !== null && _d !== void 0 ? _d : 0),
+                            line: ((_d = valueNode === null || valueNode === void 0 ? void 0 : valueNode.startLine) !== null && _d !== void 0 ? _d : 0) + ((_f = (_e = invalid.loc) === null || _e === void 0 ? void 0 : _e.line) !== null && _f !== void 0 ? _f : 0),
                             col: invalid.loc && invalid.loc.line > 0
-                                ? ((_e = invalid.loc) === null || _e === void 0 ? void 0 : _e.col) + 1
-                                : ((_f = valueNode === null || valueNode === void 0 ? void 0 : valueNode.startCol) !== null && _f !== void 0 ? _f : 0) + ((_h = (_g = invalid.loc) === null || _g === void 0 ? void 0 : _g.col) !== null && _h !== void 0 ? _h : 0),
-                            raw: (_k = (_j = invalid.loc) === null || _j === void 0 ? void 0 : _j.raw) !== null && _k !== void 0 ? _k : value,
+                                ? ((_g = invalid.loc) === null || _g === void 0 ? void 0 : _g.col) + 1
+                                : ((_h = valueNode === null || valueNode === void 0 ? void 0 : valueNode.startCol) !== null && _h !== void 0 ? _h : 0) + ((_k = (_j = invalid.loc) === null || _j === void 0 ? void 0 : _j.col) !== null && _k !== void 0 ? _k : 0),
+                            raw: (_m = (_l = invalid.loc) === null || _l === void 0 ? void 0 : _l.raw) !== null && _m !== void 0 ? _m : value,
                         });
                         break;
                     }
                     case 'non-existent': {
-                        if (allowToAddPropertiesForPretender && ((_l = attr.ownerElement.pretenderContext) === null || _l === void 0 ? void 0 : _l.type) === 'origin') {
+                        if (allowToAddPropertiesForPretender && ((_o = attr.ownerElement.pretenderContext) === null || _o === void 0 ? void 0 : _o.type) === 'origin') {
                             return;
                         }
                         const spec = (0, ml_core_1.getSpec)(attr.ownerElement, document.specs.specs);
@@ -120,3 +213,29 @@ exports.default = (0, ml_core_1.createRule)({
         });
     },
 });
+function isValueRule(
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+value) {
+    if (typeof value === 'string') {
+        return false;
+    }
+    if ('enum' in value) {
+        if (Object.keys(value).length > 1) {
+            return false;
+        }
+        return true;
+    }
+    if ('token' in value) {
+        return false;
+    }
+    if ('pattern' in value) {
+        return true;
+    }
+    if (value.type === 'integer' || value.type === 'float') {
+        return false;
+    }
+    if (Object.keys(value).length > 1) {
+        return false;
+    }
+    return true;
+}

package/lib/no-refer-to-non-existent-id/index.d.ts

@@ -1,9 +1,8 @@
-import type { ARIAVersion } from '@markuplint/ml-spec';
 declare const _default: Readonly<
 	import('@markuplint/ml-core').RuleSeed<
 		import('@markuplint/ml-core').RuleConfigValue,
 		{
-			ariaVersion: ARIAVersion;
+			ariaVersion: '1.1' | '1.2' | '1.3';
 			fragmentRefersNameAttr: boolean;
 		}
 	>

package/lib/no-refer-to-non-existent-id/index.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const ml_core_1 = require("@markuplint/ml-core");
+const ml_spec_1 = require("@markuplint/ml-spec");
 const shared_1 = require("@markuplint/shared");
 const HYPERLINK_SELECTOR = 'a[href], area[href]';
 exports.default = (0, ml_core_1.createRule)({
     defaultOptions: {
-        ariaVersion: '1.2',
+        ariaVersion: ml_spec_1.ARIA_RECOMMENDED_VERSION,
         fragmentRefersNameAttr: false,
     },
     async verify({ document, report, t }) {

package/lib/permitted-contents/utils.d.ts

@@ -1,100 +1,51 @@
 import type { ChildNode, Element, Hints, MissingNodeReason, RepeatSign, Specs } from './types';
-import type {
-	PermittedContentPattern,
-	PermittedContentChoice,
-	PermittedContentOneOrMore,
-	PermittedContentOptional,
-	PermittedContentRequire,
-	PermittedContentTransparent,
-	PermittedContentZeroOrMore,
-	Model,
-} from '@markuplint/ml-spec';
+import type { PermittedContentPattern, PermittedContentChoice, PermittedContentOneOrMore, PermittedContentOptional, PermittedContentRequire, PermittedContentTransparent, PermittedContentZeroOrMore, Model } from '@markuplint/ml-spec';
 import type { ReadonlyDeep } from 'type-fest';
 export declare function getChildNodesWithoutWhitespaces(el: Element): ChildNode[];
 export declare function isModel(model: ReadonlyDeep<Model | PermittedContentPattern[]>): model is ReadonlyDeep<Model>;
-export declare function matches(
-	selector: string,
-	node: ChildNode,
-	specs: Specs,
-):
-	| {
-			matched: boolean;
-			not?: undefined;
-	  }
-	| {
-			matched: boolean;
-			not: ChildNode | undefined;
-	  };
-export declare function isRequire(
-	content: ReadonlyDeep<PermittedContentPattern>,
-): content is ReadonlyDeep<PermittedContentRequire>;
-export declare function isOptional(
-	content: ReadonlyDeep<PermittedContentPattern>,
-): content is ReadonlyDeep<PermittedContentOptional>;
-export declare function isOneOrMore(
-	content: ReadonlyDeep<PermittedContentPattern>,
-): content is ReadonlyDeep<PermittedContentOneOrMore>;
-export declare function isZeroOrMore(
-	content: ReadonlyDeep<PermittedContentPattern>,
-): content is ReadonlyDeep<PermittedContentZeroOrMore>;
-export declare function isChoice(
-	content: ReadonlyDeep<PermittedContentPattern>,
-): content is ReadonlyDeep<PermittedContentChoice>;
-export declare function isTransparent(
-	content: ReadonlyDeep<PermittedContentPattern>,
-): content is ReadonlyDeep<PermittedContentTransparent>;
-export declare function normalizeModel(
-	pattern:
-		| ReadonlyDeep<PermittedContentRequire>
-		| ReadonlyDeep<PermittedContentOptional>
-		| ReadonlyDeep<PermittedContentOneOrMore>
-		| ReadonlyDeep<PermittedContentZeroOrMore>,
-): {
-	model: ReadonlyDeep<PermittedContentPattern[] | Model>;
-	min: number;
-	max: number;
-	repeat: RepeatSign;
-	missingType: MissingNodeReason | undefined;
+export declare function matches(selector: string, node: ChildNode, specs: Specs): {
+    matched: boolean;
+    not?: undefined;
+} | {
+    matched: boolean;
+    not: ChildNode | undefined;
 };
-export declare function mergeHints(
-	a: Readonly<Hints>,
-	b: Readonly<Hints>,
-): Partial<{
-	missing:
-		| Partial<{
-				barelyMatchedElements?: number | undefined;
-				need?: string | undefined;
-		  }>
-		| undefined;
-	max?: number | undefined;
-	not?:
-		| import('packages/@markuplint/ml-core/lib').DocumentType<
-				import('./types').TagRule[],
-				import('./types').Options
-		  >
-		| import('packages/@markuplint/ml-core/lib/ml-dom/node/character-data').MLCharacterData<
-				import('./types').TagRule[],
-				import('./types').Options,
-				import('packages/@markuplint/ml-ast/lib').MLASTAbstractNode
-		  >
-		| import('packages/@markuplint/ml-core/lib').Element<import('./types').TagRule[], import('./types').Options>
-		| import('packages/@markuplint/ml-core/lib').Block<import('./types').TagRule[], import('./types').Options>
-		| undefined;
-	transparent?: Element | undefined;
+export declare function isRequire(content: ReadonlyDeep<PermittedContentPattern>): content is ReadonlyDeep<PermittedContentRequire>;
+export declare function isOptional(content: ReadonlyDeep<PermittedContentPattern>): content is ReadonlyDeep<PermittedContentOptional>;
+export declare function isOneOrMore(content: ReadonlyDeep<PermittedContentPattern>): content is ReadonlyDeep<PermittedContentOneOrMore>;
+export declare function isZeroOrMore(content: ReadonlyDeep<PermittedContentPattern>): content is ReadonlyDeep<PermittedContentZeroOrMore>;
+export declare function isChoice(content: ReadonlyDeep<PermittedContentPattern>): content is ReadonlyDeep<PermittedContentChoice>;
+export declare function isTransparent(content: ReadonlyDeep<PermittedContentPattern>): content is ReadonlyDeep<PermittedContentTransparent>;
+export declare function normalizeModel(pattern: ReadonlyDeep<PermittedContentRequire> | ReadonlyDeep<PermittedContentOptional> | ReadonlyDeep<PermittedContentOneOrMore> | ReadonlyDeep<PermittedContentZeroOrMore>): {
+    model: ReadonlyDeep<PermittedContentPattern[] | Model>;
+    min: number;
+    max: number;
+    repeat: RepeatSign;
+    missingType: MissingNodeReason | undefined;
+};
+export declare function mergeHints(a: Readonly<Hints>, b: Readonly<Hints>): Partial<{
+    missing: Partial<{
+        barelyMatchedElements?: number | undefined;
+        need?: string | undefined;
+    }> | undefined;
+    max?: number | undefined;
+    not?: import("packages/@markuplint/ml-core/lib").DocumentType<import("./types").TagRule[], import("./types").Options> | import("packages/@markuplint/ml-core/lib/ml-dom/node/character-data").MLCharacterData<import("./types").TagRule[], import("./types").Options, import("packages/@markuplint/ml-ast/src").MLASTAbstractNode> | import("packages/@markuplint/ml-core/lib").Element<import("./types").TagRule[], import("./types").Options> | import("packages/@markuplint/ml-core/lib").Block<import("./types").TagRule[], import("./types").Options> | undefined;
+    transparent?: Element | undefined;
 }>;
 export declare function cleanObject<T extends Object>(object: T): Partial<T>;
 export declare class Collection {
-	#private;
-	constructor(origin: readonly ChildNode[]);
-	get matched(): ChildNode[];
-	get matchedCount(): number;
-	get nodes(): ChildNode[];
-	get unmatched(): ChildNode[];
-	addMatched(nodes: ChildNode[]): boolean;
-	back(): void;
-	lock(): void;
-	max(max: number): void;
-	toString(highlightExtraNodes?: boolean): string;
+    #private;
+    constructor(origin: readonly ChildNode[]);
+    get matched(): ChildNode[];
+    get matchedCount(): number;
+    get nodes(): ChildNode[];
+    get unmatched(): ChildNode[];
+    addMatched(nodes: ChildNode[]): boolean;
+    back(): void;
+    lock(): void;
+    max(max: number): void;
+    toString(highlightExtraNodes?: boolean): string;
+}
+export declare class UnsupportedError extends Error {
 }
-export declare class UnsupportedError extends Error {}
 export declare function modelLog(model: ReadonlyDeep<Model | PermittedContentPattern[]>, repeat: RepeatSign): string;

package/lib/require-accessible-name/index.js

@@ -5,7 +5,7 @@ const ml_spec_1 = require("@markuplint/ml-spec");
 const helpers_1 = require("../helpers");
 exports.default = (0, ml_core_1.createRule)({
     defaultOptions: {
-        ariaVersion: '1.2',
+        ariaVersion: ml_spec_1.ARIA_RECOMMENDED_VERSION,
     },
     async verify({ document, report, t }) {
         await document.walkOn('Element', el => {

package/lib/required-attr/index.d.ts

@@ -1,7 +1,7 @@
 type RequiredAttributes = string | (string | Attr)[];
 type Attr = {
 	name: string;
-	value: string | string[];
+	value?: string | string[];
 };
 declare const _default: Readonly<import('@markuplint/ml-core').RuleSeed<RequiredAttributes, undefined>>;
 export default _default;

package/lib/required-attr/index.js

@@ -34,7 +34,7 @@ exports.default = (0, ml_core_1.createRule)({
                     if (Array.isArray(req.value)) {
                         values.push(...req.value);
                     }
-                    else {
+                    else if (req.value) {
                         values.push(req.value);
                     }
                 }

package/lib/wai-aria/checkings/_.d.ts

@@ -0,0 +1,9 @@
+import type { Options } from '../types';
+import type { ElementChecker } from '@markuplint/ml-core';
+import type { ARIAProperty, ARIARole } from '@markuplint/ml-spec';
+export declare const checkingRequiredProp: ElementChecker<boolean, Options, {
+    role?: (ARIARole & {
+        isImplicit?: boolean;
+    }) | null;
+    propSpecs: readonly ARIAProperty[];
+}>;

package/lib/wai-aria/checkings/_.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkingRequiredProp = void 0;
+const checkingRequiredProp = ({ el, role, propSpecs }) => t => {
+    var _a;
+    if (!role) {
+        return;
+    }
+    if (role.isImplicit) {
+        return;
+    }
+    const requiredProps = role.ownedProperties.filter(s => s.required).map(s => s.name);
+    for (const requiredProp of requiredProps) {
+        const has = el.attributes.some(attr => {
+            const attrName = attr.name.toLowerCase();
+            return attrName === requiredProp;
+        });
+        if (!has) {
+            const propSpec = propSpecs.find(p => p.name === requiredProp);
+            return {
+                scope: el,
+                message: t('{0:c} on {1}', t('Require {0}', t('the "{0*}" {1}', requiredProp, `ARIA ${(_a = propSpec === null || propSpec === void 0 ? void 0 : propSpec.type) !== null && _a !== void 0 ? _a : 'property'}`)), t('the "{0*}" {1}', role.name, 'role')),
+            };
+        }
+    }
+};
+exports.checkingRequiredProp = checkingRequiredProp;

package/lib/wai-aria/checkings/disallowed-prop.d.ts

@@ -1,11 +1,7 @@
 import type { Options } from '../types';
 import type { AttrChecker } from '@markuplint/ml-core';
 import type { ARIAProperty, ARIARole } from '@markuplint/ml-spec';
-export declare const checkingDisallowedProp: AttrChecker<
-	boolean,
-	Options,
-	{
-		role: ARIARole | null;
-		propSpecs: readonly ARIAProperty[];
-	}
->;
+export declare const checkingDisallowedProp: AttrChecker<boolean, Options, {
+    role: ARIARole | null;
+    propSpecs: readonly ARIAProperty[];
+}>;

package/lib/wai-aria/checkings/required-prop copy.d.ts

@@ -0,0 +1,9 @@
+import type { Options } from '../types';
+import type { ElementChecker } from '@markuplint/ml-core';
+import type { ARIAProperty, ARIARole } from '@markuplint/ml-spec';
+export declare const checkingRequiredProp: ElementChecker<boolean, Options, {
+    role?: (ARIARole & {
+        isImplicit?: boolean;
+    }) | null;
+    propSpecs: readonly ARIAProperty[];
+}>;

package/lib/wai-aria/checkings/required-prop copy.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkingRequiredProp = void 0;
+const checkingRequiredProp = ({ el, role, propSpecs }) => t => {
+    var _a;
+    if (!role) {
+        return;
+    }
+    if (role.isImplicit) {
+        return;
+    }
+    const requiredProps = role.ownedProperties.filter(s => s.required).map(s => s.name);
+    for (const requiredProp of requiredProps) {
+        const has = el.attributes.some(attr => {
+            const attrName = attr.name.toLowerCase();
+            return attrName === requiredProp;
+        });
+        if (!has) {
+            const propSpec = propSpecs.find(p => p.name === requiredProp);
+            return {
+                scope: el,
+                message: t('{0:c} on {1}', t('Require {0}', t('the "{0*}" {1}', requiredProp, `ARIA ${(_a = propSpec === null || propSpec === void 0 ? void 0 : propSpec.type) !== null && _a !== void 0 ? _a : 'property'}`)), t('the "{0*}" {1}', role.name, 'role')),
+            };
+        }
+    }
+};
+exports.checkingRequiredProp = checkingRequiredProp;

package/lib/wai-aria/checkings/unadopted-explicit-roles.d.ts

@@ -0,0 +1,9 @@
+import type { Options } from '../types';
+import type { ElementChecker } from '@markuplint/ml-core';
+import type { ARIAProperty, ARIARole } from '@markuplint/ml-spec';
+export declare const checkingUnadoptedExplicitRoles: ElementChecker<boolean, Options, {
+    role?: (ARIARole & {
+        isImplicit?: boolean;
+    }) | null;
+    propSpecs: readonly ARIAProperty[];
+}>;

package/lib/wai-aria/checkings/unadopted-explicit-roles.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkingUnadoptedExplicitRoles = void 0;
+const checkingUnadoptedExplicitRoles = ({ el, role, propSpecs }) => t => {
+    if (!role) {
+        return;
+    }
+    if (role.name) {
+        console.log(el.localName, role.name);
+        return {
+            scope: el,
+            message: '',
+        };
+    }
+    return;
+};
+exports.checkingUnadoptedExplicitRoles = checkingUnadoptedExplicitRoles;

package/lib/wai-aria/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const ml_core_1 = require("@markuplint/ml-core");
+const ml_spec_1 = require("@markuplint/ml-spec");
 const helpers_1 = require("../helpers");
 const abstract_role_1 = require("./checkings/abstract-role");
 const default_value_1 = require("./checkings/default-value");
@@ -27,7 +28,7 @@ exports.default = (0, ml_core_1.createRule)({
         disallowSetImplicitRole: true,
         disallowSetImplicitProps: true,
         disallowDefaultValue: false,
-        version: '1.2',
+        version: ml_spec_1.ARIA_RECOMMENDED_VERSION,
     },
     async verify({ document, report, t }) {
         await document.walkOn('Element', el => {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/rules",
-	"version": "3.6.1",
+	"version": "3.8.0",
 	"description": "Built-in rules of markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -20,10 +20,10 @@
 		"./lib/permitted-contents/debug.js": "./lib/permitted-contents/debug.browser.js"
 	},
 	"dependencies": {
-		"@markuplint/html-spec": "3.6.1",
-		"@markuplint/ml-core": "3.6.1",
-		"@markuplint/ml-spec": "3.6.1",
-		"@markuplint/selector": "3.6.1",
+		"@markuplint/html-spec": "3.7.0",
+		"@markuplint/ml-core": "3.8.0",
+		"@markuplint/ml-spec": "3.7.0",
+		"@markuplint/selector": "3.7.0",
 		"@markuplint/shared": "3.5.0",
 		"@markuplint/types": "3.5.1",
 		"@ungap/structured-clone": "^1.0.1",
@@ -36,5 +36,5 @@
 		"@types/debug": "^4.1.7",
 		"type-fest": "^3.6.1"
 	},
-	"gitHead": "3cdf5a088b2da03773d5d4461d0e65ec32290a00"
+	"gitHead": "42b97b47d22b37437024e693a72a458e2963e261"
 }