@markuplint/rules 4.10.12 → 4.11.1

package/CHANGELOG.md

@@ -3,6 +3,27 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.11.1](https://github.com/markuplint/markuplint/compare/@markuplint/rules@4.11.0...@markuplint/rules@4.11.1) (2025-08-24)
+
+
+### Bug Fixes
+
+* **rules:** handle rowspan/colspan combinations correctly in table-row-column-alignment ([5579c98](https://github.com/markuplint/markuplint/commit/5579c98995fbad02086e2c9a5470cfcee5ef9ef0))
+
+
+
+
+
+# [4.11.0](https://github.com/markuplint/markuplint/compare/@markuplint/rules@4.10.12...@markuplint/rules@4.11.0) (2025-08-13)
+
+### Bug Fixes
+
+- ensure that each `clean` command correctly removes build files ([110b78e](https://github.com/markuplint/markuplint/commit/110b78e85379d29a84ca68325127344a87a570b6))
+
+### Features
+
+- **rules:** improve error message for multiple required attributes ([4aa4e4f](https://github.com/markuplint/markuplint/commit/4aa4e4fe54efc05edf7e9166a7fd769127b75769))
+
 ## [4.10.12](https://github.com/markuplint/markuplint/compare/@markuplint/rules@4.10.11...@markuplint/rules@4.10.12) (2025-04-13)
 
 **Note:** Version bump only for package @markuplint/rules

package/lib/index.d.ts

@@ -62,7 +62,7 @@ declare const rules: {
     }>>;
     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")[];
+        ignoreRoles: ("form" | ("banner" | "main" | "complementary" | "contentinfo") | "navigation" | "region")[];
         labelEachArea: boolean;
     }>>;
     readonly 'neighbor-popovers': Readonly<import("@markuplint/ml-core").RuleSeed<import("@markuplint/ml-core").RuleConfigValue, undefined>>;

package/lib/require-datetime/utils.js

@@ -92,7 +92,9 @@ function toDatetimeString(date) {
 }
 function parseTryMultipleLangs(content, langs, base) {
     for (const lang of langs) {
-        const results = chrono[lang].casual.parse(content, base);
+        const results = 
+        // eslint-disable-next-line import-x/namespace
+        chrono[lang].casual.parse(content, base);
         // Is not multiple datetime contents
         if (results.length === 0) {
             continue;

package/lib/required-attr/index.js

@@ -45,9 +45,10 @@ export default createRule({
             }
             for (const spec of Object.values(attributeSpecs)) {
                 const didntHave = !el.hasAttribute(spec.name);
+                const candidate = [spec.name];
                 let invalid = false;
                 if (spec.requiredEither) {
-                    const candidate = [...spec.requiredEither, spec.name];
+                    candidate.push(...spec.requiredEither);
                     invalid = !candidate.some(attrName => el.hasAttribute(attrName));
                 }
                 else if (spec.required === true) {
@@ -57,8 +58,15 @@ export default createRule({
                     const selector = typeof spec.required === 'string' ? spec.required : spec.required.join(',');
                     invalid = el.matches(selector) && didntHave;
                 }
+                candidate.sort();
                 if (invalid) {
-                    const message = t('{0} expects {1}', t('the "{0*}" {1}', el.localName, 'element'), t('the "{0*}" {1}', spec.name, 'attribute'));
+                    const expects = candidate.length === 1
+                        ? t('the "{0*}" {1}', spec.name, 'attribute')
+                        : t('{0} {1}', candidate
+                            .map(attrName => t('the "{0*}"', attrName))
+                            // eslint-disable-next-line unicorn/no-array-reduce
+                            .reduce((a, b) => t('{0} or {1}', a, b)), t('attribute'));
+                    const message = t('{0} expects {1}', t('the "{0*}" {1}', el.localName, 'element'), expects);
                     report({
                         scope: el,
                         message,

package/lib/table-row-column-alignment/index.js

@@ -37,6 +37,22 @@ export default createRule({
                 if (!rowEl) {
                     continue;
                 }
+                // Skip validation for rows that have expected column count differences due to rowspan/colspan
+                const cells = findChildren(rowEl, 'th, td');
+                let actualCellCount = 0;
+                for (const cell of cells) {
+                    const colspan = Number.parseInt(cell.getAttribute('colspan') ?? '1');
+                    actualCellCount += colspan;
+                }
+                // Check for rowspan cells occupying spaces in this row
+                const rowspanOccupiedCount = row.filter(cell => cell === '↓').length;
+                const expectedColumnCount = actualCellCount + rowspanOccupiedCount;
+                // Skip validation if the structure is valid accounting for spans
+                if (expectedColumnCount === baseColLength || actualCellCount + rowspanOccupiedCount === baseColLength) {
+                    continue;
+                }
+                // Debug log
+                // console.log(`Row ${rowNum}: baseColLength=${baseColLength}, colLength=${colLength}, actualCellCount=${actualCellCount}, rowspanOccupiedCount=${rowspanOccupiedCount}, expectedColumnCount=${expectedColumnCount}`);
                 const indexes = getIndexes(row);
                 if (colLength > baseColLength) {
                     const index = indexes.slice(baseColLength)[0];
@@ -60,7 +76,7 @@ export default createRule({
                         message: t('{0} extra {1} in {2}', t(`${diff}`), t(diff === 1 ? 'column' : 'columns'), t('a {0}', t('row'))),
                     });
                 }
-                if (colLength < baseColLength) {
+                if (colLength < baseColLength && expectedColumnCount < baseColLength) {
                     const diff = baseColLength - colLength;
                     report({
                         scope: rowEl,

package/package.json

@@ -1,11 +1,10 @@
 {
 	"name": "@markuplint/rules",
-	"version": "4.10.12",
+	"version": "4.11.1",
 	"description": "Built-in rules of markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
 	"license": "MIT",
-	"private": false,
 	"type": "module",
 	"exports": {
 		".": {
@@ -19,24 +18,24 @@
 	"scripts": {
 		"build": "tsc --project tsconfig.build.json",
 		"dev": "tsc --watch --project tsconfig.build.json",
-		"clean": "tsc --build --clean"
+		"clean": "tsc --build --clean tsconfig.build.json"
 	},
 	"browser": {
 		"./lib/permitted-contents/debug.js": "./lib/permitted-contents/debug.browser.js"
 	},
 	"dependencies": {
-		"@markuplint/html-spec": "4.14.2",
-		"@markuplint/ml-core": "4.12.4",
-		"@markuplint/ml-spec": "4.9.6",
-		"@markuplint/selector": "4.7.4",
-		"@markuplint/shared": "4.4.11",
-		"@markuplint/types": "4.7.6",
+		"@markuplint/html-spec": "4.16.0",
+		"@markuplint/ml-core": "4.13.1",
+		"@markuplint/ml-spec": "4.10.0",
+		"@markuplint/selector": "4.7.6",
+		"@markuplint/shared": "4.4.12",
+		"@markuplint/types": "4.8.0",
 		"@types/debug": "4.1.12",
 		"@ungap/structured-clone": "1.3.0",
 		"ansi-colors": "4.1.3",
-		"chrono-node": "2.8.0",
-		"debug": "4.4.0",
-		"type-fest": "4.39.1"
+		"chrono-node": "2.8.4",
+		"debug": "4.4.1",
+		"type-fest": "4.41.0"
 	},
-	"gitHead": "eb36d59f7e13d4e59ff3f3c4eabb5ec06c070eb0"
+	"gitHead": "ae97eb2d31ecedf4f0800fbbf18588aad4ebca04"
 }

package/lib/__foo/index.d.ts

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

package/lib/__foo/index.js

@@ -1,31 +0,0 @@
-import { createRule } from "@markuplint/ml-core";
-import meta from "./meta.js";
-export default createRule({
-    meta: meta,
-    defaultValue: true,
-    defaultOptions: null,
-    async verify({ document, report, t }) {
-        // Element
-        await document.walkOn("Element", (el) => {
-            const raw = el.raw.trim();
-            if (/./.test(raw)) {
-                report({
-                    scope: el,
-                    message: t("It is {0}", "issue"),
-                });
-            }
-        });
-        // Attribute
-        await document.walkOn("Attr", (attr) => {
-            if (/./.test(attr.name)) {
-                report({
-                    scope: attr,
-                    line: attr.nameNode?.startLine,
-                    col: attr.nameNode?.startCol,
-                    raw: attr.nameNode?.raw,
-                    message: t("It is {0}", "issue"),
-                });
-            }
-        });
-    },
-});

package/lib/__foo/meta.d.ts

@@ -1,4 +0,0 @@
-declare const _default: {
-    readonly category: "validation";
-};
-export default _default;

package/lib/__foo/meta.js

@@ -1,3 +0,0 @@
-export default {
-    category: "validation",
-};