@markuplint/rules 3.3.1 → 3.4.0

package/lib/create-message.js

@@ -199,7 +199,7 @@ function __createMessageValueExpected(t, baseTarget, expected, matches) {
 }
 exports.__createMessageValueExpected = __createMessageValueExpected;
 function createExpectedObject(type, matches, t) {
-    var _a;
+    var _a, _b;
     const expectedObject = [];
     if ((_a = matches.expects) === null || _a === void 0 ? void 0 : _a.length) {
         expectedObject.push(...matches.expects.map(expect => {
@@ -221,7 +221,7 @@ function createExpectedObject(type, matches, t) {
         ? null
         : 1 < expectedObject.length
             ? t('either {0}', t(expectedObject))
-            : expectedObject[0];
+            : (_b = expectedObject[0]) !== null && _b !== void 0 ? _b : null;
     return expects;
 }
 function expectValueToWord(t, expect, type) {

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

@@ -12,6 +12,10 @@ exports.default = (0, ml_core_1.createRule)({
         const nameList = new Set();
         let hasDynamicId = false;
         let hasDynamicName = false;
+        const isMutable = document.nodeList.some(node => node.is(node.MARKUPLINT_PREPROCESSOR_BLOCK));
+        if (isMutable) {
+            return;
+        }
         document.querySelectorAll('[id]').forEach(el => {
             const attr = el.getAttributeNode('id');
             if (!attr) {

package/lib/permitted-contents/count-pattern.js

@@ -143,6 +143,7 @@ function countPattern(pattern, elements, specs, options, depth) {
 exports.countPattern = countPattern;
 const cLog = debug_1.cmLog.extend('countCompereResult');
 function compereResult(a, b) {
+    var _a;
     cLog('current: %s %O\nbarely: %s %O', a.type, a.hint, b === null || b === void 0 ? void 0 : b.type, b === null || b === void 0 ? void 0 : b.hint);
     if (b == null) {
         return a;
@@ -150,6 +151,6 @@ function compereResult(a, b) {
     if (a.type === 'MATCHED' || a.type === 'MATCHED_ZERO' || a.type === 'UNEXPECTED_EXTRA_NODE') {
         return a;
     }
-    const result = [a, b].sort((a, b) => { var _a, _b, _c, _d; return ((_b = (_a = b.hint.missing) === null || _a === void 0 ? void 0 : _a.barelyMatchedElements) !== null && _b !== void 0 ? _b : 0) - ((_d = (_c = a.hint.missing) === null || _c === void 0 ? void 0 : _c.barelyMatchedElements) !== null && _d !== void 0 ? _d : 0); })[0];
+    const result = (_a = [a, b].sort((a, b) => { var _a, _b, _c, _d; return ((_b = (_a = b.hint.missing) === null || _a === void 0 ? void 0 : _a.barelyMatchedElements) !== null && _b !== void 0 ? _b : 0) - ((_d = (_c = a.hint.missing) === null || _c === void 0 ? void 0 : _c.barelyMatchedElements) !== null && _d !== void 0 ? _d : 0); })[0]) !== null && _a !== void 0 ? _a : a;
     return result;
 }

package/lib/permitted-contents/order.js

@@ -27,7 +27,7 @@ function order(contents, nodes, specs, options, depth) {
     let backtrackMode = false;
     let afterBacktrack = false;
     const unmatchedResults = [];
-    while (patterns.length) {
+    while (patterns.length && patterns[0]) {
         result = (0, complex_branch_1.complexBranch)(patterns[0], collection.unmatched, specs, options, depth);
         collection.addMatched(result.matched);
         if (result.type !== 'UNEXPECTED_EXTRA_NODE' && result.type !== 'MATCHED' && result.type !== 'MATCHED_ZERO') {

package/lib/permitted-contents/transparent.js

@@ -4,8 +4,8 @@ exports.transparent = void 0;
 const debug_1 = require("./debug");
 const transparentLog = debug_1.cmLog.extend('transparent');
 function transparent(nodes, specs, options, depth) {
-    var _a;
-    if (nodes.length === 0 || ((_a = nodes[0].parentElement) === null || _a === void 0 ? void 0 : _a.parentElement)) {
+    var _a, _b;
+    if (nodes.length === 0 || ((_b = (_a = nodes[0]) === null || _a === void 0 ? void 0 : _a.parentElement) === null || _b === void 0 ? void 0 : _b.parentElement)) {
         transparentLog('Skipped');
         return {
             type: nodes.length === 0 ? 'MATCHED_ZERO' : 'MATCHED',

package/lib/permitted-contents/utils.js

@@ -268,7 +268,7 @@ function modelLog(model, repeat) {
 }
 exports.modelLog = modelLog;
 function orderLog(order, repeat) {
-    return order.length === 1
+    return order.length === 1 && order[0]
         ? markRepeat(patternLog(order[0]), repeat)
         : markRepeat(order.map(pattern => patternLog(pattern)).join(''), repeat);
 }

package/lib/require-datetime/utils.js

@@ -98,13 +98,15 @@ function toDatetimeString(date) {
 }
 function parseTryMultipleLangs(content, langs, base) {
     for (const lang of langs) {
-        // eslint-disable-next-line import/namespace
         const results = chrono[lang].casual.parse(content, base);
         // Is not multiple datetime contents
         if (results.length < 1) {
             continue;
         }
         const result = results[0];
+        if (!result) {
+            continue;
+        }
         // Is not a range or period
         if (result.end) {
             continue;

package/lib/required-attr/index.js

@@ -6,6 +6,7 @@ exports.default = (0, ml_core_1.createRule)({
     defaultValue: [],
     async verify({ document, report, t }) {
         await document.walkOn('Element', el => {
+            var _a;
             if (el.hasSpreadAttr) {
                 return;
             }
@@ -71,17 +72,19 @@ 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 = el.getAttributeToken(spec.name);
-                        const valueToken = attrToken[0].valueNode;
+                        const valueToken = (_a = attrToken[0]) === null || _a === void 0 ? void 0 : _a.valueNode;
                         const token = valueToken || attrToken[0];
-                        report({
-                            scope: {
-                                rule: el.rule,
-                                raw: token.raw,
-                                startCol: token.startCol,
-                                startLine: token.startLine,
-                            },
-                            message,
-                        });
+                        if (token) {
+                            report({
+                                scope: {
+                                    rule: el.rule,
+                                    raw: token.raw,
+                                    startCol: token.startCol,
+                                    startLine: token.startLine,
+                                },
+                                message,
+                            });
+                        }
                     }
                 }
             }

package/lib/required-element/index.js

@@ -7,6 +7,7 @@ exports.default = (0, ml_core_1.createRule)({
         ignoreHasMutableContents: true,
     },
     async verify({ document, report, t }) {
+        var _a, _b;
         const hasMutableContent = document.nodeList.some(n => n.is(n.ELEMENT_NODE) && n.hasMutableChildren());
         if (!hasMutableContent) {
             for (const query of document.rule.value) {
@@ -17,7 +18,7 @@ exports.default = (0, ml_core_1.createRule)({
                         message,
                         line: 1,
                         col: 1,
-                        raw: document.nodeList[0].raw.slice(0, 1),
+                        raw: (_b = (_a = document.nodeList[0]) === null || _a === void 0 ? void 0 : _a.raw.slice(0, 1)) !== null && _b !== void 0 ? _b : '',
                     });
                 }
             }

package/lib/required-h1/index.js

@@ -7,6 +7,7 @@ exports.default = (0, ml_core_1.createRule)({
         'in-document-fragment': false,
     },
     async verify({ document, report, t }) {
+        var _a, _b;
         const h1Stack = [];
         if (document.nodeList.length === 0) {
             return;
@@ -25,10 +26,10 @@ exports.default = (0, ml_core_1.createRule)({
                 message,
                 line: 1,
                 col: 1,
-                raw: document.nodeList[0].raw.slice(0, 1),
+                raw: (_b = (_a = document.nodeList[0]) === null || _a === void 0 ? void 0 : _a.raw.slice(0, 1)) !== null && _b !== void 0 ? _b : '',
             });
         }
-        else if (document.rule.options['expected-once'] && h1Stack.length > 1) {
+        else if (document.rule.options['expected-once'] && h1Stack.length > 1 && h1Stack[1]) {
             const message = t('{0} is {1:c}', t('the "{0*}" {1}', 'h1', 'element'), 'duplicated');
             report({
                 message,

package/lib/use-list/index.js

@@ -78,15 +78,16 @@ exports.default = (0, ml_core_1.createRule)({
     },
 });
 function isMayListItem(text, bullets, spaceNeededBullets) {
+    var _a;
     const textArray = Array.from(text);
-    const firstLetter = textArray[0];
+    const firstLetter = (_a = textArray[0]) !== null && _a !== void 0 ? _a : '';
     const isBullet = bullets.includes(firstLetter);
     const needSpace = spaceNeededBullets.includes(firstLetter);
     const continuous = firstLetter === textArray[1];
     if (continuous) {
         return false;
     }
-    if (isBullet && needSpace) {
+    if (isBullet && needSpace && text[1]) {
         const secondLetter = text[1];
         const isSpace = /^\s$/.test(secondLetter);
         return isSpace;

package/lib/wai-aria/checkings/disallowed-prop.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkingDisallowedProp = void 0;
+const ml_spec_1 = require("@markuplint/ml-spec");
 const checkingDisallowedProp = ({ attr, role, propSpecs }) => t => {
-    var _a;
+    var _a, _b, _c, _d;
     if (!role) {
         return;
     }
@@ -10,13 +11,36 @@ const checkingDisallowedProp = ({ attr, role, propSpecs }) => t => {
         return;
     }
     const statesAndProp = role.ownedProperties.find(p => p.name === attr.name);
+    const propSpec = propSpecs.find(p => p.name === attr.name);
+    const elAriaSpec = (0, ml_spec_1.getARIA)(attr.ownerMLDocument.specs, attr.ownerElement.localName, attr.ownerElement.namespaceURI, attr.rule.options.version, attr.ownerElement.matches.bind(attr.ownerElement));
+    if ((elAriaSpec === null || elAriaSpec === void 0 ? void 0 : elAriaSpec.properties) && ((_a = elAriaSpec === null || elAriaSpec === void 0 ? void 0 : elAriaSpec.properties) === null || _a === void 0 ? void 0 : _a.without)) {
+        for (const ignore of elAriaSpec.properties.without) {
+            if (ignore.name === attr.name) {
+                return {
+                    scope: attr,
+                    message: t('{0:c} on {1}', t(ignore.type === 'must-not'
+                        ? '{0} must not {1}'
+                        : ignore.type === 'should-not'
+                            ? '{0} should not {1}'
+                            : '{0} is not recommended to {1}', 
+                    // {0}
+                    t('the "{0*}" {1}', attr.name, `ARIA ${(_b = propSpec === null || propSpec === void 0 ? void 0 : propSpec.type) !== null && _b !== void 0 ? _b : 'property'}`), 
+                    // {1}
+                    'use'), t('the "{0*}" {1}', attr.ownerElement.localName, 'element')) +
+                        (ignore.alt
+                            ? t('. ') +
+                                t('{0} if you {1} {2}', t(ignore.alt.method === 'remove-attr' ? 'Remove {0}' : 'Add {0}', t('the "{0*}" {1}', ignore.alt.target, 'attribute')), 'use', t('the {0}', `ARIA ${(_c = propSpec === null || propSpec === void 0 ? void 0 : propSpec.type) !== null && _c !== void 0 ? _c : 'property'}`))
+                            : ''),
+                };
+            }
+        }
+    }
     if (statesAndProp) {
         return;
     }
-    const propSpec = propSpecs.find(p => p.name === attr.name);
     return {
         scope: attr,
-        message: t('{0:c} on {1}', t('{0} is {1:c}', t('the "{0*}" {1}', attr.name, `ARIA ${(_a = propSpec === null || propSpec === void 0 ? void 0 : propSpec.type) !== null && _a !== void 0 ? _a : 'property'}`), 'disallowed'), t('the "{0*}" {1}', role.name, 'role')),
+        message: t('{0:c} on {1}', t('{0} is {1:c}', t('the "{0*}" {1}', attr.name, `ARIA ${(_d = propSpec === null || propSpec === void 0 ? void 0 : propSpec.type) !== null && _d !== void 0 ? _d : 'property'}`), 'disallowed'), t('the "{0*}" {1}', role.name, 'role')),
     };
 };
 exports.checkingDisallowedProp = checkingDisallowedProp;

package/lib/wai-aria/checkings/required-owned-elements.js

@@ -78,14 +78,14 @@ const checkingRequiredOwnedElements = ({ el, role }) => t => {
     if (mayBeBeforeCreated(el)) {
         return {
             scope: el,
-            message: t('{0}. Or, {1}', t('require {0}', role.requiredOwnedElements.length === 1
+            message: t('{0}. Or, {1}', t('require {0}', role.requiredOwnedElements.length === 1 && role.requiredOwnedElements[0]
                 ? t('the "{0*}" {1}', role.requiredOwnedElements[0], 'role')
                 : t('the {0}', 'roles') + `: ${t(role.requiredOwnedElements)}`), t('require {0}', 'aria-busy="true"')),
         };
     }
     return {
         scope: el,
-        message: t('{0} expects {1}', t('the "{0*}" {1}', role.name, 'role'), role.requiredOwnedElements.length === 1
+        message: t('{0} expects {1}', t('the "{0*}" {1}', role.name, 'role'), role.requiredOwnedElements.length === 1 && role.requiredOwnedElements[0]
             ? t('the "{0*}" {1}', role.requiredOwnedElements[0], 'role')
             : t('the {0}', 'roles') + `: ${t(role.requiredOwnedElements)}`),
     };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/rules",
-	"version": "3.3.1",
+	"version": "3.4.0",
 	"description": "Built-in rules of markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -20,11 +20,11 @@
 		"./lib/permitted-contents/debug.js": "./lib/permitted-contents/debug.browser.js"
 	},
 	"dependencies": {
-		"@markuplint/html-spec": "3.3.1",
-		"@markuplint/ml-core": "3.3.1",
-		"@markuplint/ml-spec": "3.3.0",
-		"@markuplint/selector": "3.3.0",
-		"@markuplint/types": "3.2.0",
+		"@markuplint/html-spec": "3.4.0",
+		"@markuplint/ml-core": "3.4.0",
+		"@markuplint/ml-spec": "3.4.0",
+		"@markuplint/selector": "3.4.0",
+		"@markuplint/types": "3.3.0",
 		"@ungap/structured-clone": "^1.0.1",
 		"ansi-colors": "^4.1.3",
 		"chrono-node": "^2.5.0",
@@ -35,5 +35,5 @@
 	"devDependencies": {
 		"@types/debug": "^4.1.7"
 	},
-	"gitHead": "f19e7de726cf01d53342bc5513c30da75d28da63"
+	"gitHead": "a83e0f5f214a9bbcc0286b9e269074ddca6189e7"
 }