@markuplint/rules 4.0.0-alpha.1 → 4.0.0-alpha.2

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

@@ -23,6 +23,7 @@ export 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') {
@@ -187,7 +188,10 @@ export 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/permitted-contents/choice.js

@@ -12,23 +12,33 @@ elements, specs, options, depth) {
     for (const some of pattern.choice) {
         choiceLog('Patterns[%s]: %s', i, modelLog(some, ''));
         const result = 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) => {
+        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

@@ -1,6 +1,7 @@
 import { cmLog } from './debug.js';
 import { recursiveBranch } from './recursive-branch.js';
 import { Collection, mergeHints, modelLog, normalizeModel } from './utils.js';
+const cLog = cmLog.extend('countCompereResult');
 /**
  * Check count
  *
@@ -139,7 +140,6 @@ elements, specs, options, depth) {
         return compereResult(matchedResult, barelyResult);
     }
 }
-const cLog = 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": "4.0.0-alpha.1",
+	"version": "4.0.0-alpha.2",
 	"description": "Built-in rules of markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -25,19 +25,19 @@
 		"./lib/permitted-contents/debug.js": "./lib/permitted-contents/debug.browser.js"
 	},
 	"dependencies": {
-		"@markuplint/html-spec": "4.0.0-alpha.1",
-		"@markuplint/ml-core": "4.0.0-alpha.1",
-		"@markuplint/ml-spec": "4.0.0-alpha.1",
-		"@markuplint/selector": "4.0.0-alpha.1",
-		"@markuplint/shared": "4.0.0-alpha.1",
-		"@markuplint/types": "4.0.0-alpha.1",
-		"@types/debug": "^4.1.8",
+		"@markuplint/html-spec": "4.0.0-alpha.2",
+		"@markuplint/ml-core": "4.0.0-alpha.2",
+		"@markuplint/ml-spec": "4.0.0-alpha.2",
+		"@markuplint/selector": "4.0.0-alpha.2",
+		"@markuplint/shared": "4.0.0-alpha.2",
+		"@markuplint/types": "4.0.0-alpha.2",
+		"@types/debug": "^4.1.9",
 		"@ungap/structured-clone": "^1.2.0",
 		"ansi-colors": "^4.1.3",
-		"chrono-node": "^2.6.3",
+		"chrono-node": "^2.7.0",
 		"debug": "^4.3.4",
-		"tslib": "^2.6.1",
-		"type-fest": "^4.1.0"
+		"tslib": "^2.6.2",
+		"type-fest": "^4.3.1"
 	},
-	"gitHead": "22502ee22a378ae766033d687dbc0443e5ed35dc"
+	"gitHead": "51ad52c760435641f9bff8685707d8178b0787eb"
 }