@markuplint/rules 2.0.0 → 2.2.0

package/lib/no-default-value/index.d.ts

@@ -1,2 +1,2 @@
-declare const _default: import('@markuplint/ml-core').RuleSeed<import('@markuplint/ml-core').RuleConfigValue, null>;
+declare const _default: import("@markuplint/ml-core").RuleSeed<import("@markuplint/ml-core").RuleConfigValue, null>;
 export default _default;

package/lib/no-default-value/index.js

@@ -26,9 +26,9 @@ exports.default = (0, ml_core_1.createRule)({
                 if (defaultValue === normalizedValue) {
                     report({
                         scope: el,
-                        line: attr.value.startLine,
-                        col: attr.value.startCol,
-                        raw: attr.value.raw,
+                        line: attr.valueNode.startLine,
+                        col: attr.valueNode.startCol,
+                        raw: attr.valueNode.raw,
                         message: t('It is {0}', t('the {0}', 'default value')),
                     });
                 }

package/lib/no-hard-code-id/index.d.ts

@@ -1,2 +1,2 @@
-declare const _default: import('@markuplint/ml-core').RuleSeed<import('@markuplint/ml-core').RuleConfigValue, null>;
+declare const _default: import("@markuplint/ml-core").RuleSeed<import("@markuplint/ml-core").RuleConfigValue, null>;
 export default _default;

package/lib/no-hard-code-id/index.js

@@ -9,10 +9,9 @@ exports.default = (0, ml_core_1.createRule)({
         }
         await document.walkOn('Element', el => {
             for (const attr of el.attributes) {
-                if ((attr.attrType === 'html-attr' && !attr.isDynamicValue) ||
-                    (attr.attrType === 'ps-attr' &&
-                        attr.potentialName.toLowerCase() === 'id' &&
-                        attr.valueType !== 'code')) {
+                if (attr.potentialName.toLowerCase() === 'id' &&
+                    ((attr.attrType === 'html-attr' && !attr.isDynamicValue) ||
+                        (attr.attrType === 'ps-attr' && attr.valueType !== 'code'))) {
                     report({
                         scope: el,
                         line: attr.startLine,

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

@@ -1,2 +1,2 @@
-declare const _default: import('@markuplint/ml-core').RuleSeed<import('@markuplint/ml-core').RuleConfigValue, null>;
+declare const _default: import("@markuplint/ml-core").RuleSeed<import("@markuplint/ml-core").RuleConfigValue, null>;
 export default _default;

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

@@ -51,9 +51,9 @@ exports.default = (0, ml_core_1.createRule)({
                     if (spec.type === 'DOMID' && !idList.has(value)) {
                         report({
                             scope: el,
-                            line: attr.value.startLine,
-                            col: attr.value.startCol,
-                            raw: attr.value.raw,
+                            line: attr.valueNode.startLine,
+                            col: attr.valueNode.startCol,
+                            raw: attr.valueNode.raw,
                             message: t('Missing {0}', t('"{0*}" ID', value)),
                         });
                     }
@@ -66,9 +66,9 @@ exports.default = (0, ml_core_1.createRule)({
                             if (!idList.has(ref)) {
                                 report({
                                     scope: el,
-                                    line: attr.value.startLine,
-                                    col: attr.value.startCol,
-                                    raw: attr.value.raw,
+                                    line: attr.valueNode.startLine,
+                                    col: attr.valueNode.startCol,
+                                    raw: attr.valueNode.raw,
                                     message: t('Missing {0}', t('"{0*}" ID', ref)),
                                 });
                             }
@@ -80,9 +80,9 @@ exports.default = (0, ml_core_1.createRule)({
                     if (aria.value === 'ID reference' && !idList.has(value)) {
                         report({
                             scope: el,
-                            line: attr.value.startLine,
-                            col: attr.value.startCol,
-                            raw: attr.value.raw,
+                            line: attr.valueNode.startLine,
+                            col: attr.valueNode.startCol,
+                            raw: attr.valueNode.raw,
                             message: t('Missing {0}', t('"{0*}" ID', value)),
                         });
                     }
@@ -95,9 +95,9 @@ exports.default = (0, ml_core_1.createRule)({
                             if (!idList.has(ref)) {
                                 report({
                                     scope: el,
-                                    line: attr.value.startLine,
-                                    col: attr.value.startCol,
-                                    raw: attr.value.raw,
+                                    line: attr.valueNode.startLine,
+                                    col: attr.valueNode.startCol,
+                                    raw: attr.valueNode.raw,
                                     message: t('Missing {0}', t('"{0*}" ID', ref)),
                                 });
                             }

package/lib/no-use-event-handler-attr/index.d.ts

@@ -1,5 +1,5 @@
 declare type Options = {
-	ignore?: string | string[];
+    ignore?: string | string[];
 };
-declare const _default: import('@markuplint/ml-core').RuleSeed<boolean, Options>;
+declare const _default: import("@markuplint/ml-core").RuleSeed<boolean, Options>;
 export default _default;

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

@@ -1,6 +1,6 @@
 import type { PermittedStructuresSchema } from '@markuplint/ml-spec';
 declare type Options = {
-	ignoreHasMutableChildren: boolean;
+    ignoreHasMutableChildren: boolean;
 };
-declare const _default: import('@markuplint/ml-core').RuleSeed<PermittedStructuresSchema[], Options>;
+declare const _default: import("@markuplint/ml-core").RuleSeed<PermittedStructuresSchema[], Options>;
 export default _default;

package/lib/permitted-contents/index.js

@@ -136,6 +136,7 @@ exports.default = (0, ml_core_1.createRule)({
 function normalization(nodes, ownNS, evalCustomElement) {
     return nodes
         .map(node => {
+        // FIXME: https://github.com/markuplint/markuplint/issues/388
         if (!evalCustomElement && node.type === 'Element' && node.isCustomElement) {
             return '';
         }

package/lib/permitted-contents/permitted-content.spec-to-regexp.d.ts

@@ -1,11 +1,11 @@
 import type { PermittedContent } from '@markuplint/ml-spec';
 export default class ExpGenerator {
-	private _id;
-	private _idCounter;
-	constructor(_id: number);
-	specToRegExp(contentRule: PermittedContent[] | boolean, parentExp?: RegExp | null, ownNS?: string | null): RegExp;
-	private _toPattern;
-	private _interleavePattern;
-	private _targetTags;
-	private _resolveTags;
+    private _id;
+    private _idCounter;
+    constructor(_id: number);
+    specToRegExp(contentRule: PermittedContent[] | boolean, parentExp?: RegExp | null, ownNS?: string | null): RegExp;
+    private _toPattern;
+    private _interleavePattern;
+    private _targetTags;
+    private _resolveTags;
 }

package/lib/require-accessible-name/index.d.ts

@@ -0,0 +1,2 @@
+declare const _default: import("@markuplint/ml-core").RuleSeed<boolean, null>;
+export default _default;

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

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const ml_core_1 = require("@markuplint/ml-core");
+const helpers_1 = require("../helpers");
+exports.default = (0, ml_core_1.createRule)({
+    async verify({ document, report, t }) {
+        await document.walkOn('Element', el => {
+            const role = (0, helpers_1.getComputedRole)(document.specs, el);
+            if (!role) {
+                return;
+            }
+            const roleSpec = (0, helpers_1.getRoleSpec)(document.specs, role.name);
+            if (!roleSpec || !roleSpec.accessibleNameRequired) {
+                return;
+            }
+            const hasAccessibleName = !!el.getAccessibleName().trim();
+            if (!hasAccessibleName) {
+                report({ scope: el, message: t('Require {0}', 'accessible name') });
+            }
+        });
+    },
+});

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

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

package/lib/required-attr/index.js

@@ -80,7 +80,7 @@ exports.default = (0, ml_core_1.createRule)({
                         const expects = spec.values.length === 1 ? t(spec.values) : t('either {0}', t(spec.values));
                         const message = t('{0} expects {1}', t('the "{0*}" {1}', spec.name, 'attribute'), expects);
                         const attrToken = node.getAttributeToken(spec.name);
-                        const valueToken = ((_a = attrToken[0]) === null || _a === void 0 ? void 0 : _a.attrType) === 'html-attr' ? attrToken[0].value : null;
+                        const valueToken = ((_a = attrToken[0]) === null || _a === void 0 ? void 0 : _a.attrType) === 'html-attr' ? attrToken[0].valueNode : null;
                         const token = valueToken || attrToken[0];
                         report({
                             scope: {

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

@@ -1,5 +1,5 @@
 declare type Options = {
-	ignoreHasMutableContents?: boolean;
+    ignoreHasMutableContents?: boolean;
 };
-declare const _default: import('@markuplint/ml-core').RuleSeed<string[], Options>;
+declare const _default: import("@markuplint/ml-core").RuleSeed<string[], Options>;
 export default _default;

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

@@ -1,6 +1,6 @@
 export interface Options {
-	'expected-once'?: boolean;
-	'in-document-fragment'?: boolean;
+    'expected-once'?: boolean;
+    'in-document-fragment'?: boolean;
 }
-declare const _default: import('@markuplint/ml-core').RuleSeed<boolean, Options>;
+declare const _default: import("@markuplint/ml-core").RuleSeed<boolean, Options>;
 export default _default;

package/lib/wai-aria/index.d.ts

@@ -1,10 +1,10 @@
 declare type Options = {
-	checkingValue?: boolean;
-	checkingDeprecatedProps?: boolean;
-	permittedAriaRoles?: boolean;
-	disallowSetImplicitRole?: boolean;
-	disallowSetImplicitProps?: boolean;
-	disallowDefaultValue?: boolean;
+    checkingValue?: boolean;
+    checkingDeprecatedProps?: boolean;
+    permittedAriaRoles?: boolean;
+    disallowSetImplicitRole?: boolean;
+    disallowSetImplicitProps?: boolean;
+    disallowDefaultValue?: boolean;
 };
-declare const _default: import('@markuplint/ml-core').RuleSeed<boolean, Options>;
+declare const _default: import("@markuplint/ml-core").RuleSeed<boolean, Options>;
 export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/rules",
-	"version": "2.0.0",
+	"version": "2.2.0",
 	"description": "Rules for markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -17,8 +17,8 @@
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@markuplint/html-spec": "2.0.0",
-		"@markuplint/ml-core": "2.0.0",
+		"@markuplint/html-spec": "^2.2.0",
+		"@markuplint/ml-core": "^2.1.0",
 		"@markuplint/ml-spec": "2.0.0",
 		"@markuplint/types": "2.0.0",
 		"debug": "^4.3.3",
@@ -27,5 +27,5 @@
 	"devDependencies": {
 		"@types/debug": "^4.1.7"
 	},
-	"gitHead": "de81fc514acdf472f87184e3499e9364258f9b66"
+	"gitHead": "b76084dbdb538119a29fd07b19110ef7d3a44670"
 }

package/schema.json

@@ -81,6 +81,9 @@
 				"permitted-contents": {
 					"$ref": "https://raw.githubusercontent.com/markuplint/markuplint/main/packages/%40markuplint/rules/src/permitted-contents/schema.json"
 				},
+				"require-accessible-name": {
+					"$ref": "https://raw.githubusercontent.com/markuplint/markuplint/main/packages/%40markuplint/rules/src/require-accessible-name/schema.json"
+				},
 				"required-attr": {
 					"$ref": "https://raw.githubusercontent.com/markuplint/markuplint/main/packages/%40markuplint/rules/src/required-attr/schema.json"
 				},