@markuplint/rules 2.4.2 → 3.0.0-alpha.66

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

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

package/lib/wai-aria/index.js

@@ -2,236 +2,85 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const ml_core_1 = require("@markuplint/ml-core");
 const helpers_1 = require("../helpers");
+const abstract_role_1 = require("./checkings/abstract-role");
+const checking_required_owned_elements_1 = require("./checkings/checking-required-owned-elements");
+const default_value_1 = require("./checkings/default-value");
+const deprecated_props_1 = require("./checkings/deprecated-props");
+const disallowed_prop_1 = require("./checkings/disallowed-prop");
+const implicit_props_1 = require("./checkings/implicit-props");
+const implicit_role_1 = require("./checkings/implicit-role");
+const no_global_prop_1 = require("./checkings/no-global-prop");
+const non_existant_role_1 = require("./checkings/non-existant-role");
+const permitted_roles_1 = require("./checkings/permitted-roles");
+const required_prop_1 = require("./checkings/required-prop");
+const value_1 = require("./checkings/value");
 exports.default = (0, ml_core_1.createRule)({
     defaultOptions: {
         checkingValue: true,
         checkingDeprecatedProps: true,
         permittedAriaRoles: true,
+        checkingRequiredOwnedElements: true,
         disallowSetImplicitRole: true,
         disallowSetImplicitProps: true,
         disallowDefaultValue: false,
+        version: '1.2',
     },
     async verify({ document, report, t }) {
-        await document.walkOn('Element', node => {
-            const attrSpecs = (0, ml_core_1.getAttrSpecs)(node.nameWithNS, document.specs);
-            const html = (0, helpers_1.htmlSpec)(document.specs, node.nodeName);
-            const { roles, ariaAttrs } = (0, helpers_1.ariaSpec)(document.specs);
-            if (!html || !attrSpecs) {
+        await document.walkOn('Element', el => {
+            const roleAttr = el.getAttributeNode('role');
+            const propAttrs = el.attributes.filter(attr => /^aria-/i.test(attr.name));
+            const ariaAttrs = new helpers_1.Collection(roleAttr, ...propAttrs);
+            const elSpec = (0, ml_core_1.getSpec)(el, document.specs);
+            if (!elSpec) {
                 return;
             }
-            const roleAttrTokens = node.getAttributeToken('role');
-            const roleAttr = roleAttrTokens[0];
-            // Roles in the spec
-            if (roleAttr) {
-                const value = roleAttr.getValue().potential.trim().toLowerCase();
-                const existedRole = roles.find(role => role.name === value);
-                if (!existedRole) {
-                    // Not exist
+            if (!elSpec.globalAttrs['#ARIAAttrs']) {
+                for (const ariaAttr of ariaAttrs) {
                     report({
-                        scope: node,
-                        message: t('{0} according to {1}', t('{0} does not exist', t('the "{0*}" {1}', value, 'role')), 'the WAI-ARIA specification') + `This "${value}" role does not exist in WAI-ARIA.`,
-                        line: roleAttr.startLine,
-                        col: roleAttr.startCol,
-                        raw: roleAttr.raw,
+                        scope: ariaAttr,
+                        message: 'ARIA attribute is disallowed',
                     });
                 }
-                else if (existedRole.isAbstract) {
-                    // the abstract role
-                    report({
-                        scope: node,
-                        message: t('{0} is {1}', t('the "{0*}" {1}', value, 'role'), 'the abstract role'),
-                        line: roleAttr.startLine,
-                        col: roleAttr.startCol,
-                        raw: roleAttr.raw,
-                    });
+                return;
+            }
+            const computed = (0, ml_core_1.getComputedRole)(document.specs, el, el.rule.option.version);
+            const { props: propSpecs } = (0, ml_core_1.ariaSpecs)(document.specs, el.rule.option.version);
+            if (roleAttr) {
+                if (report((0, non_existant_role_1.checkingNonExistantRole)({ attr: roleAttr }))) {
+                    return;
                 }
-                // Set the implicit role explicitly
-                if (node.rule.option.disallowSetImplicitRole) {
-                    const implictRole = (0, helpers_1.getImplicitRole)(document.specs, node);
-                    if (implictRole && implictRole === value) {
-                        // the implicit role
-                        report({
-                            scope: node,
-                            message: t('{0} is {1}', t('the "{0*}" {1}', value, 'role'), t('{0} of {1}', 'the implicit role', t('the "{0*}" {1}', node.nodeName, 'element'))),
-                            line: roleAttr.startLine,
-                            col: roleAttr.startCol,
-                            raw: roleAttr.raw,
-                        });
-                    }
+                if (report((0, abstract_role_1.checkingAbstractRole)({ attr: roleAttr }))) {
+                    return;
                 }
-                // Permitted ARIA Roles
-                if (node.rule.option.permittedAriaRoles) {
-                    const permittedRoles = (0, helpers_1.getPermittedRoles)(document.specs, node);
-                    if (permittedRoles === false) {
-                        report({
-                            scope: node,
-                            message: t('{0} according to {1}', t('Cannot overwrite {0}', t('{0} of {1}', t('the {0}', 'role'), t('the "{0*}" {1}', node.nodeName, 'element'))), 'ARIA in HTML specification'),
-                            line: roleAttr.startLine,
-                            col: roleAttr.startCol,
-                            raw: roleAttr.raw,
-                        });
-                    }
-                    else if (Array.isArray(permittedRoles) && !permittedRoles.includes(value)) {
-                        report({
-                            scope: node,
-                            message: t('{0} according to {1}', t('Cannot overwrite {0} to {1}', t('the "{0*}" {1}', value, 'role'), t('the "{0*}" {1}', node.nodeName, 'element')), 'ARIA in HTML specification'),
-                            line: roleAttr.startLine,
-                            col: roleAttr.startCol,
-                            raw: roleAttr.raw,
-                        });
-                    }
+                report((0, required_prop_1.checkingRequiredProp)({ el, role: computed.role, propSpecs }));
+                if (el.rule.option.disallowSetImplicitRole) {
+                    report((0, implicit_role_1.checkingImplicitRole)({ attr: roleAttr }));
                 }
-            }
-            const computedRole = (0, helpers_1.getComputedRole)(document.specs, node);
-            if (computedRole) {
-                const role = (0, helpers_1.getRoleSpec)(document.specs, computedRole.name);
-                if (role) {
-                    // Checking aria-* on the role
-                    for (const attr of node.attributes) {
-                        const attrName = attr.getName().potential.trim().toLowerCase();
-                        if (/^aria-/i.test(attrName)) {
-                            const statesAndProp = role.statesAndProps.find(s => s.name === attrName);
-                            if (statesAndProp) {
-                                if (node.rule.option.checkingDeprecatedProps && statesAndProp.deprecated) {
-                                    report({
-                                        scope: node,
-                                        message: t('{0:c} on {1}', t('{0} is {1:c}', t('the "{0*}" {1}', attrName, 'ARIA state/property'), 'deprecated'), t('the "{0*}" {1}', role.name, 'role')),
-                                        line: attr.startLine,
-                                        col: attr.startCol,
-                                        raw: attr.raw,
-                                    });
-                                }
-                            }
-                            else {
-                                report({
-                                    scope: node,
-                                    message: t('{0:c} on {1}', t('{0} is {1:c}', t('the "{0*}" {1}', attrName, 'ARIA state/property'), 'disallowed'), t('the "{0*}" {1}', role.name, 'role')),
-                                    line: attr.startLine,
-                                    col: attr.startCol,
-                                    raw: attr.raw,
-                                });
-                            }
-                        }
-                    }
-                    // Checing required props
-                    if (!computedRole.isImplicit) {
-                        const requiredProps = role.statesAndProps.filter(s => s.required).map(s => s.name);
-                        for (const requiredProp of requiredProps) {
-                            const has = node.attributes.some(attr => {
-                                const attrName = attr.getName().potential.trim().toLowerCase();
-                                return attrName === requiredProp;
-                            });
-                            if (!has) {
-                                report({
-                                    scope: node,
-                                    message: t('{0:c} on {1}', t('Require {0}', t('the "{0*}" {1}', requiredProp, 'ARIA state/property')), t('the "{0*}" {1}', role.name, 'role')),
-                                });
-                            }
-                        }
-                    }
+                if (el.rule.option.permittedAriaRoles) {
+                    report((0, permitted_roles_1.checkingPermittedRoles)({ attr: roleAttr }));
                 }
             }
-            else {
-                // No role element
-                const { ariaAttrs } = (0, helpers_1.ariaSpec)(document.specs);
-                for (const attr of node.attributes) {
-                    const attrName = attr.getName().potential.trim().toLowerCase();
-                    if (/^aria-/i.test(attrName)) {
-                        const ariaAttr = ariaAttrs.find(attr => attr.name === attrName);
-                        if (ariaAttr && !ariaAttr.isGlobal) {
-                            report({
-                                scope: node,
-                                message: t('{0} is not {1}', t('the "{0*}" {1}', attrName, 'ARIA state/property'), 'global state/property'),
-                                line: attr.startLine,
-                                col: attr.startCol,
-                                raw: attr.raw,
-                            });
-                        }
-                    }
+            for (const attr of propAttrs) {
+                report((0, disallowed_prop_1.checkingDisallowedProp)({ attr, role: computed.role, propSpecs }));
+                if (el.rule.option.checkingDeprecatedProps) {
+                    report((0, deprecated_props_1.checkingDeprecatedProps)({ attr, role: computed.role, propSpecs }));
                 }
-            }
-            for (const attr of node.attributes) {
-                if (attr.attrType === 'html-attr' && attr.isDynamicValue) {
-                    continue;
+                if (el.rule.option.disallowSetImplicitProps) {
+                    const attrSpecs = (0, ml_core_1.getAttrSpecs)(el, document.specs);
+                    report((0, implicit_props_1.checkingImplicitProps)({ attr, propSpecs, attrSpecs }));
+                }
+                if (el.rule.option.checkingValue) {
+                    report((0, value_1.checkingValue)({ attr, role: computed.role, propSpecs }));
                 }
-                const attrName = attr.getName().potential.trim().toLowerCase();
-                if (/^aria-/i.test(attrName)) {
-                    const value = attr.getValue().potential.trim().toLowerCase();
-                    const propSpec = ariaAttrs.find(p => p.name === attrName);
-                    // Checking ARIA Value
-                    if (node.rule.option.checkingValue) {
-                        const result = (0, helpers_1.checkAria)(document.specs, attrName, value, computedRole === null || computedRole === void 0 ? void 0 : computedRole.name);
-                        if (!result.isValid) {
-                            report({
-                                scope: node,
-                                message: t('{0:c} on {1}', t('{0} is {1:c}', t('the "{0}"', value), 'disallowed'), t('the "{0*}" {1}', attrName, 'ARIA state/property')) +
-                                    ('enum' in result && result.enum.length
-                                        ? t('. ') + t('Allowed values are: {0}', t(result.enum))
-                                        : ''),
-                                line: attr.startLine,
-                                col: attr.startCol,
-                                raw: attr.raw,
-                            });
-                        }
-                    }
-                    // Checking implicit props
-                    if (node.rule.option.disallowSetImplicitProps) {
-                        if (propSpec && propSpec.equivalentHtmlAttrs) {
-                            for (const equivalentHtmlAttr of propSpec.equivalentHtmlAttrs) {
-                                const htmlAttrSpec = attrSpecs.find(a => a.name === equivalentHtmlAttr.htmlAttrName);
-                                const isValid = (0, helpers_1.isValidAttr)(t, equivalentHtmlAttr.htmlAttrName, equivalentHtmlAttr.value || '', false, node, attrSpecs);
-                                if (isValid && isValid.invalidType === 'non-existent') {
-                                    continue;
-                                }
-                                if (node.hasAttribute(equivalentHtmlAttr.htmlAttrName)) {
-                                    const targetAttrValue = node.getAttribute(equivalentHtmlAttr.htmlAttrName);
-                                    if ((equivalentHtmlAttr.value == null && targetAttrValue === value) ||
-                                        equivalentHtmlAttr.value === value) {
-                                        report({
-                                            scope: node,
-                                            message: t('{0} has {1}', t('the "{0*}" {1}', attrName, 'ARIA state/property'), t('the same {0} as {1}', 'semantics', t('{0} or {1}', t('the current "{0}" {1}', equivalentHtmlAttr.htmlAttrName, 'attribute'), t('the implicit "{0}" {1}', equivalentHtmlAttr.htmlAttrName, 'attribute')))),
-                                            line: attr.startLine,
-                                            col: attr.startCol,
-                                            raw: attr.raw,
-                                        });
-                                        continue;
-                                    }
-                                    if ((htmlAttrSpec === null || htmlAttrSpec === void 0 ? void 0 : htmlAttrSpec.type) === 'Boolean' && value !== 'false') {
-                                        continue;
-                                    }
-                                    report({
-                                        scope: node,
-                                        message: t('{0} contradicts {1}', t('the "{0*}" {1}', attrName, 'ARIA state/property'), t('the current "{0}" {1}', equivalentHtmlAttr.htmlAttrName, 'attribute')),
-                                        line: attr.startLine,
-                                        col: attr.startCol,
-                                        raw: attr.raw,
-                                    });
-                                }
-                                else if (value === 'true') {
-                                    if (!equivalentHtmlAttr.isNotStrictEquivalent && (htmlAttrSpec === null || htmlAttrSpec === void 0 ? void 0 : htmlAttrSpec.type) === 'Boolean') {
-                                        report({
-                                            scope: node,
-                                            message: t('{0} contradicts {1}', t('the "{0*}" {1}', attrName, 'ARIA state/property'), t('the implicit "{0}" {1}', equivalentHtmlAttr.htmlAttrName, 'attribute')),
-                                            line: attr.startLine,
-                                            col: attr.startCol,
-                                            raw: attr.raw,
-                                        });
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    // Default value
-                    if (node.rule.option.disallowDefaultValue && propSpec && propSpec.defaultValue === value) {
-                        report({
-                            scope: node,
-                            message: t('It is {0}', 'default value'),
-                            line: attr.startLine,
-                            col: attr.startCol,
-                            raw: attr.raw,
-                        });
-                    }
+                if (el.rule.option.disallowDefaultValue) {
+                    report((0, default_value_1.checkingDefaultValue)({ attr, propSpecs }));
                 }
+                if (!computed.role) {
+                    report((0, no_global_prop_1.checkingNoGlobalProp)({ attr, propSpecs }));
+                }
+            }
+            if (el.rule.option.checkingRequiredOwnedElements) {
+                report((0, checking_required_owned_elements_1.checkingRequiredOwnedElements)({ el, role: computed.role }));
             }
         });
     },

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

@@ -0,0 +1,11 @@
+import type { ARIAVersion } from '@markuplint/ml-spec';
+export declare type Options = {
+    checkingValue: boolean;
+    checkingDeprecatedProps: boolean;
+    permittedAriaRoles: boolean;
+    checkingRequiredOwnedElements: boolean;
+    disallowSetImplicitRole: boolean;
+    disallowSetImplicitProps: boolean;
+    disallowDefaultValue: boolean;
+    version: ARIAVersion;
+};

package/lib/wai-aria/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/rules",
-	"version": "2.4.2",
+	"version": "3.0.0-alpha.66+6cde1134",
 	"description": "Rules for markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -17,9 +17,9 @@
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@markuplint/html-spec": "2.7.0",
-		"@markuplint/ml-core": "2.3.2",
-		"@markuplint/ml-spec": "2.1.0",
+		"@markuplint/html-spec": "3.0.0-alpha.66+6cde1134",
+		"@markuplint/ml-core": "3.0.0-alpha.66+6cde1134",
+		"@markuplint/ml-spec": "3.0.0-alpha.82+6cde1134",
 		"@markuplint/types": "2.1.0",
 		"debug": "^4.3.4",
 		"html-entities": "^2.3.3",
@@ -28,5 +28,5 @@
 	"devDependencies": {
 		"@types/debug": "^4.1.7"
 	},
-	"gitHead": "0c774ce046ebc8a9c494e9884a4bfcd72a66250d"
+	"gitHead": "6cde113402758a8fdbd6a0fcf98e78efd2cdb778"
 }

package/schema.json

@@ -9,15 +9,6 @@
 				"attr-duplication": {
 					"$ref": "https://raw.githubusercontent.com/markuplint/markuplint/main/packages/%40markuplint/rules/src/attr-duplication/schema.json"
 				},
-				"attr-equal-space-after": {
-					"$ref": "https://raw.githubusercontent.com/markuplint/markuplint/main/packages/%40markuplint/rules/src/attr-equal-space-after/schema.json"
-				},
-				"attr-equal-space-before": {
-					"$ref": "https://raw.githubusercontent.com/markuplint/markuplint/main/packages/%40markuplint/rules/src/attr-equal-space-before/schema.json"
-				},
-				"attr-spacing": {
-					"$ref": "https://raw.githubusercontent.com/markuplint/markuplint/main/packages/%40markuplint/rules/src/attr-spacing/schema.json"
-				},
 				"attr-value-quotes": {
 					"$ref": "https://raw.githubusercontent.com/markuplint/markuplint/main/packages/%40markuplint/rules/src/attr-value-quotes/schema.json"
 				},
@@ -51,9 +42,6 @@
 				"end-tag": {
 					"$ref": "https://raw.githubusercontent.com/markuplint/markuplint/main/packages/%40markuplint/rules/src/end-tag/schema.json"
 				},
-				"indentation": {
-					"$ref": "https://raw.githubusercontent.com/markuplint/markuplint/main/packages/%40markuplint/rules/src/indentation/schema.json"
-				},
 				"ineffective-attr": {
 					"$ref": "https://raw.githubusercontent.com/markuplint/markuplint/main/packages/%40markuplint/rules/src/ineffective-attr/schema.json"
 				},