@markuplint/rules 3.12.1 → 3.13.0

package/lib/create-message.d.ts

@@ -3,4 +3,4 @@ import type { AttributeType } from '@markuplint/ml-spec';
 import type { UnmatchedResult } from '@markuplint/types';
 import type { ReadonlyDeep } from 'type-fest';
 export declare function createMessageValueExpected(t: Translator, baseTarget: string, type: ReadonlyDeep<AttributeType>, matches: UnmatchedResult): string;
-export declare function __createMessageValueExpected(t: Translator, baseTarget: string, expected: string | null, matches: Pick<UnmatchedResult, 'partName' | 'reason' | 'raw' | 'candidate' | 'ref' | 'extra'>): string;
+export declare function __createMessageValueExpected(t: Translator, baseTarget: string, expected: string | null, matches: Pick<UnmatchedResult, 'partName' | 'reason' | 'raw' | 'candidate' | 'ref' | 'extra' | 'fallbackTo'>): string;

package/lib/create-message.js

@@ -28,6 +28,7 @@ function __createMessageValueExpected(t, baseTarget, expected, matches) {
     let expectPart;
     let unnecessaryPart;
     let candidatePart;
+    let fallbackToPart;
     let expectOrNeed = 'expects';
     if (matches.partName) {
         if (matches.partName === 'the content of the list') {
@@ -192,7 +193,10 @@ function __createMessageValueExpected(t, baseTarget, expected, matches) {
     if (matches.candidate) {
         candidatePart = t('Did you mean "{0*}"?', matches.candidate);
     }
-    let message = [reasonPart, unnecessaryPart, expectPart, candidatePart].filter(s => s).join(t('. '));
+    if (matches.fallbackTo) {
+        fallbackToPart = t('The user agent will automatically use "{0*}" instead', matches.fallbackTo);
+    }
+    let message = [reasonPart, unnecessaryPart, expectPart, candidatePart, fallbackToPart].filter(s => s).join(t('. '));
     if (matches.ref) {
         message += ` (${matches.ref})`;
     }

package/lib/index.d.ts

@@ -15,38 +15,38 @@ declare const rules: {
     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?: (string | {
+        allowAttrs?: Record<string, {
+            enum: [string, ...string[]];
+        } | {
+            pattern: string;
+        } | {
+            type: import("packages/@markuplint/ml-spec/lib").AttributeType;
+        }> | (string | {
             name: string;
-            value: ({
+            value: import("packages/@markuplint/ml-spec/lib").AttributeType | ({
                 enum: [string, ...string[]];
             } | {
                 pattern: string;
             } | {
                 type: import("packages/@markuplint/ml-spec/lib").AttributeType;
-            }) | import("packages/@markuplint/ml-spec/lib").AttributeType;
-        })[] | Record<string, {
+            });
+        })[] | undefined;
+        disallowAttrs?: Record<string, {
             enum: [string, ...string[]];
         } | {
             pattern: string;
         } | {
             type: import("packages/@markuplint/ml-spec/lib").AttributeType;
-        }> | undefined;
-        disallowAttrs?: (string | {
+        }> | (string | {
             name: string;
-            value: ({
+            value: import("packages/@markuplint/ml-spec/lib").AttributeType | ({
                 enum: [string, ...string[]];
             } | {
                 pattern: string;
             } | {
                 type: import("packages/@markuplint/ml-spec/lib").AttributeType;
-            }) | import("packages/@markuplint/ml-spec/lib").AttributeType;
-        })[] | Record<string, {
-            enum: [string, ...string[]];
-        } | {
-            pattern: string;
-        } | {
-            type: import("packages/@markuplint/ml-spec/lib").AttributeType;
-        }> | undefined;
+            });
+        })[] | undefined;
         ignoreAttrNamePrefix?: string | string[] | undefined;
         allowToAddPropertiesForPretender?: boolean | undefined;
         attrs?: Record<string, ({

package/lib/permitted-contents/choice.js

@@ -15,24 +15,34 @@ elements, specs, options, depth) {
     for (const some of pattern.choice) {
         choiceLog('Patterns[%s]: %s', i, (0, utils_1.modelLog)(some, ''));
         const result = (0, order_1.order)(some, collection.unmatched, specs, options, depth + 1);
-        if (result.type === 'UNEXPECTED_EXTRA_NODE' || result.type === 'MATCHED' || result.type === 'MATCHED_ZERO') {
+        if (result.type === 'MATCHED' ||
+            result.type === 'MATCHED_ZERO' ||
+            (result.type === 'UNEXPECTED_EXTRA_NODE' && result.matched.length >= 1)) {
             choiceLog('Results[%s]: %s', i, choiceLogString(pattern.choice, i));
-            collection.addMatched(result.matched);
             return {
                 type: result.type,
-                matched: collection.matched,
-                unmatched: collection.unmatched,
+                matched: result.matched,
+                unmatched: result.unmatched,
                 zeroMatch: result.zeroMatch,
                 query: result.query,
                 hint: result.hint,
             };
         }
         unmatchedResults.push(result);
+        collection.addMatched(result.matched);
         indexes.set(result, i);
         i++;
     }
     const barelyMatchedResult = unmatchedResults.sort((a, b) => {
         var _c, _d, _e, _f;
+        if (a.type !== b.type) {
+            if (a.type === 'UNEXPECTED_EXTRA_NODE') {
+                return -1;
+            }
+            if (b.type === 'UNEXPECTED_EXTRA_NODE') {
+                return 1;
+            }
+        }
         const computed1 = b.matched.length - a.matched.length;
         if (computed1 !== 0) {
             return computed1;

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

@@ -4,6 +4,7 @@ exports.countPattern = void 0;
 const debug_1 = require("./debug");
 const recursive_branch_1 = require("./recursive-branch");
 const utils_1 = require("./utils");
+const cLog = debug_1.cmLog.extend('countCompereResult');
 /**
  * Check count
  *
@@ -143,7 +144,6 @@ elements, specs, options, depth) {
     }
 }
 exports.countPattern = countPattern;
-const cLog = debug_1.cmLog.extend('countCompereResult');
 function compereResult(
 // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
 a, 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/rules",
-	"version": "3.12.1",
+	"version": "3.13.0",
 	"description": "Built-in rules of markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -20,12 +20,12 @@
 		"./lib/permitted-contents/debug.js": "./lib/permitted-contents/debug.browser.js"
 	},
 	"dependencies": {
-		"@markuplint/html-spec": "3.11.1",
-		"@markuplint/ml-core": "3.12.1",
-		"@markuplint/ml-spec": "3.11.1",
-		"@markuplint/selector": "3.11.1",
+		"@markuplint/html-spec": "3.12.0",
+		"@markuplint/ml-core": "3.13.0",
+		"@markuplint/ml-spec": "3.12.0",
+		"@markuplint/selector": "3.12.0",
 		"@markuplint/shared": "3.8.0",
-		"@markuplint/types": "3.9.1",
+		"@markuplint/types": "3.10.0",
 		"@types/debug": "^4.1.8",
 		"@ungap/structured-clone": "^1.2.0",
 		"ansi-colors": "^4.1.3",
@@ -34,5 +34,5 @@
 		"tslib": "^2.6.2",
 		"type-fest": "^4.3.1"
 	},
-	"gitHead": "09100b8baa14dd930602daa458197322197c79c2"
+	"gitHead": "ef31aef8f2fff319d0f692feead332ec5fc5c7cf"
 }

package/test/invalid-attr/index.spec.js

@@ -93,18 +93,8 @@ test('the input element type case-insensitive', async () => {
 	expect(violations2.length).toBe(0);
 });
 
-test('ancestor condition', async () => {
-	expect((await mlRuleTest(rule, '<picture><source media="print"></picture>')).violations).toStrictEqual([]);
-
-	expect((await mlRuleTest(rule, '<audio><source media="print"></audio>')).violations).toStrictEqual([
-		{
-			severity: 'error',
-			line: 1,
-			col: 16,
-			message: 'The "media" attribute is disallowed',
-			raw: 'media',
-		},
-	]);
+test.skip('ancestor condition', async () => {
+	// TODO: Find instead of test
 });
 
 test('Add allow attr', async () => {

package/test/permitted-contents/index.spec.js

@@ -169,10 +169,10 @@ describe('verify', () => {
 		expect(violations2).toStrictEqual([
 			{
 				severity: 'error',
-				col: 1,
-				line: 1,
-				message: 'Require one or more elements. (Need "dt")',
-				raw: '<dl>',
+				col: 5,
+				line: 2,
+				message: 'The "dt" element is not allowed in the "dl" element in this context',
+				raw: '<dt>',
 			},
 			{
 				severity: 'error',