@markuplint/rules 3.0.0-dev.24 → 3.0.0-dev.290

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

@@ -1,30 +1,50 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const ml_core_1 = require("@markuplint/ml-core");
-exports.default = (0, ml_core_1.createRule)({
+import { createRule, getAttrSpecs, ariaSpecs } from '@markuplint/ml-core';
+import { ARIA_RECOMMENDED_VERSION } from '@markuplint/ml-spec';
+import { decodeEntities, decodeHref } from '@markuplint/shared';
+const HYPERLINK_SELECTOR = 'a[href], area[href]';
+export default createRule({
     defaultOptions: {
-        ariaVersion: '1.2',
+        ariaVersion: ARIA_RECOMMENDED_VERSION,
+        fragmentRefersNameAttr: false,
     },
     async verify({ document, report, t }) {
         const idList = new Set();
+        const nameList = new Set();
         let hasDynamicId = false;
-        await document.walkOn('Attr', attr => {
-            if (attr.name.toLowerCase() !== 'id') {
+        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) {
                 return;
             }
             if (attr.isDynamicValue) {
                 hasDynamicId = true;
             }
             if (attr.valueType !== 'code') {
-                idList.add(attr.value);
+                idList.add(decodeEntities(attr.value));
             }
         });
         if (hasDynamicId) {
             return;
         }
+        document.querySelectorAll('[name]').forEach(el => {
+            const attr = el.getAttributeNode('name');
+            if (!attr) {
+                return;
+            }
+            if (attr.isDynamicValue) {
+                hasDynamicName = true;
+            }
+            if (attr.valueType !== 'code') {
+                nameList.add(decodeEntities(attr.value));
+            }
+        });
         await document.walkOn('Attr', attr => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
-            const attrSpec = (0, ml_core_1.getAttrSpecs)(attr.ownerElement, document.specs);
+            const attrSpec = getAttrSpecs(attr.ownerElement, document.specs);
             if (!attrSpec) {
                 return;
             }
@@ -45,9 +65,9 @@ exports.default = (0, ml_core_1.createRule)({
                 if (spec.type === 'DOMID' && !idList.has(value)) {
                     report({
                         scope: attr,
-                        line: (_a = attr.valueNode) === null || _a === void 0 ? void 0 : _a.startLine,
-                        col: (_b = attr.valueNode) === null || _b === void 0 ? void 0 : _b.startCol,
-                        raw: (_c = attr.valueNode) === null || _c === void 0 ? void 0 : _c.raw,
+                        line: attr.valueNode?.startLine,
+                        col: attr.valueNode?.startCol,
+                        raw: attr.valueNode?.raw,
                         message: t('Missing {0}', t('"{0*}" ID', value)),
                     });
                 }
@@ -60,24 +80,24 @@ exports.default = (0, ml_core_1.createRule)({
                         if (!idList.has(ref)) {
                             report({
                                 scope: attr,
-                                line: (_d = attr.valueNode) === null || _d === void 0 ? void 0 : _d.startLine,
-                                col: (_e = attr.valueNode) === null || _e === void 0 ? void 0 : _e.startCol,
-                                raw: (_f = attr.valueNode) === null || _f === void 0 ? void 0 : _f.raw,
+                                line: attr.valueNode?.startLine,
+                                col: attr.valueNode?.startCol,
+                                raw: attr.valueNode?.raw,
                                 message: t('Missing {0}', t('"{0*}" ID', ref)),
                             });
                         }
                     }
                 }
             }
-            const { props } = (0, ml_core_1.ariaSpecs)(document.specs, attr.rule.options.ariaVersion);
+            const { props } = ariaSpecs(document.specs, attr.rule.options.ariaVersion);
             const aria = props.find(prop => prop.name === name);
             if (aria) {
                 if (aria.value === 'ID reference' && !idList.has(value)) {
                     report({
                         scope: attr,
-                        line: (_g = attr.valueNode) === null || _g === void 0 ? void 0 : _g.startLine,
-                        col: (_h = attr.valueNode) === null || _h === void 0 ? void 0 : _h.startCol,
-                        raw: (_j = attr.valueNode) === null || _j === void 0 ? void 0 : _j.raw,
+                        line: attr.valueNode?.startLine,
+                        col: attr.valueNode?.startCol,
+                        raw: attr.valueNode?.raw,
                         message: t('Missing {0}', t('"{0*}" ID', value)),
                     });
                 }
@@ -90,9 +110,9 @@ exports.default = (0, ml_core_1.createRule)({
                         if (!idList.has(ref)) {
                             report({
                                 scope: attr,
-                                line: (_k = attr.valueNode) === null || _k === void 0 ? void 0 : _k.startLine,
-                                col: (_l = attr.valueNode) === null || _l === void 0 ? void 0 : _l.startCol,
-                                raw: (_m = attr.valueNode) === null || _m === void 0 ? void 0 : _m.raw,
+                                line: attr.valueNode?.startLine,
+                                col: attr.valueNode?.startCol,
+                                raw: attr.valueNode?.raw,
                                 message: t('Missing {0}', t('"{0*}" ID', ref)),
                             });
                         }
@@ -100,5 +120,41 @@ exports.default = (0, ml_core_1.createRule)({
                 }
             }
         });
+        /**
+         * @see https://html.spec.whatwg.org/multipage/browsing-the-web.html#scrolling-to-a-fragment
+         */
+        await document.walkOn('Element', el => {
+            if (el.rule.options.fragmentRefersNameAttr && hasDynamicName) {
+                return;
+            }
+            if (!el.matches(HYPERLINK_SELECTOR)) {
+                return;
+            }
+            const href = el.getAttributeNode('href');
+            if (!href) {
+                return;
+            }
+            const rawFragment = href.value.match(/^#(.+)/)?.[1];
+            if (rawFragment == null) {
+                return;
+            }
+            const decodedFragment = decodeHref(rawFragment);
+            // > 2. If fragment is the empty string, then return the special value top of the document.
+            // >
+            // > 9. If decodedFragment is an ASCII case-insensitive match for the string top, then return the top of the document.
+            if (decodedFragment === '' || /^top$/i.test(decodedFragment)) {
+                return;
+            }
+            if (!idList.has(decodedFragment) &&
+                (el.rule.options.fragmentRefersNameAttr ? !nameList.has(decodedFragment) : true)) {
+                report({
+                    scope: href,
+                    line: href.valueNode?.startLine,
+                    col: href.valueNode?.startCol,
+                    raw: href.valueNode?.raw,
+                    message: t('Missing {0}', t('"{0*}" ID', decodedFragment)),
+                });
+            }
+        });
     },
 });

package/lib/no-use-event-handler-attr/index.d.ts

@@ -1,5 +1,5 @@
 type Options = {
     ignore?: string | string[];
 };
-declare const _default: import("@markuplint/ml-core").RuleSeed<boolean, Options>;
+declare const _default: Readonly<import("@markuplint/ml-core").RuleSeed<boolean, Options>>;
 export default _default;

package/lib/no-use-event-handler-attr/index.js

@@ -1,8 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const ml_core_1 = require("@markuplint/ml-core");
-const helpers_1 = require("../helpers");
-exports.default = (0, ml_core_1.createRule)({
+import { createRule } from '@markuplint/ml-core';
+import { match } from '../helpers.js';
+export default createRule({
     defaultSeverity: 'warning',
     defaultOptions: {},
     async verify({ document, report, t }) {
@@ -17,7 +15,7 @@ exports.default = (0, ml_core_1.createRule)({
                     : [];
             const name = attr.name;
             for (const ignore of ignoreList) {
-                if ((0, helpers_1.match)(name, ignore)) {
+                if (match(name, ignore)) {
                     return;
                 }
             }

package/lib/permitted-contents/choice.d.ts

@@ -1,3 +1,4 @@
-import type { ChildNode, Options, Result, Specs } from './types';
+import type { ChildNode, Options, Result, Specs } from './types.js';
 import type { PermittedContentChoice } from '@markuplint/ml-spec';
-export declare function choice(pattern: PermittedContentChoice, elements: ChildNode[], specs: Specs, options: Options, depth: number): Result;
+import type { ReadonlyDeep } from 'type-fest';
+export declare function choice(pattern: ReadonlyDeep<PermittedContentChoice>, elements: readonly ChildNode[], specs: Specs, options: Options, depth: number): Result;

package/lib/permitted-contents/choice.js

@@ -1,30 +1,60 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.choice = void 0;
-const order_1 = require("./order");
-const utils_1 = require("./utils");
-function choice(pattern, elements, specs, options, depth) {
-    const collection = new utils_1.Collection(elements);
+import { bgBlue, bgGreen, cmLog } from './debug.js';
+import { order } from './order.js';
+import { Collection, modelLog } from './utils.js';
+const indexes = new WeakMap();
+export function choice(pattern, 
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+elements, specs, options, depth) {
+    const choiceLog = cmLog.extend(`choice#${depth}`);
+    const collection = new Collection(elements);
     const unmatchedResults = [];
+    let i = 0;
     for (const some of pattern.choice) {
-        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') {
-            collection.addMatched(result.matched);
+        choiceLog('Patterns[%s]: %s', i, modelLog(some, ''));
+        const result = order(some, collection.unmatched, specs, options, depth + 1);
+        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));
             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) => b.matched.length - a.matched.length)[0];
+    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;
+        }
+        const _a = a.hint.missing?.barelyMatchedElements ?? 0;
+        const _b = b.hint.missing?.barelyMatchedElements ?? 0;
+        const computed2 = _b - _a;
+        return computed2;
+    })[0];
     if (!barelyMatchedResult) {
         throw new Error('Unreachable code');
     }
+    const index = indexes.get(barelyMatchedResult);
+    if (index != null) {
+        choiceLog('Results[%s]: %s', index, choiceLogString(pattern.choice, index, true));
+    }
     return {
         type: barelyMatchedResult.type,
         matched: collection.matched,
@@ -34,4 +64,14 @@ function choice(pattern, elements, specs, options, depth) {
         hint: barelyMatchedResult.hint,
     };
 }
-exports.choice = choice;
+function choiceLogString(choice, index, barely = false) {
+    const colorFn = barely ? bgBlue : bgGreen;
+    return choice
+        .map((pattern, i) => {
+        if (i === index) {
+            return colorFn(modelLog(pattern, ''));
+        }
+        return modelLog(pattern, '');
+    })
+        .join(', ');
+}

package/lib/permitted-contents/complex-branch.d.ts

@@ -1,5 +1,6 @@
-import type { ChildNode, Options, Result, Specs } from './types';
+import type { ChildNode, Options, Result, Specs } from './types.js';
 import type { PermittedContentPattern } from '@markuplint/ml-spec';
+import type { ReadonlyDeep } from 'type-fest';
 /**
  * Check content condition
  *
@@ -10,4 +11,4 @@ import type { PermittedContentPattern } from '@markuplint/ml-spec';
  * @param depth
  * @returns
  */
-export declare function complexBranch(pattern: PermittedContentPattern, elements: ChildNode[], specs: Specs, options: Options, depth: number): Result;
+export declare function complexBranch(pattern: ReadonlyDeep<PermittedContentPattern>, elements: readonly ChildNode[], specs: Specs, options: Options, depth: number): Result;

package/lib/permitted-contents/complex-branch.js

@@ -1,10 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.complexBranch = void 0;
-const choice_1 = require("./choice");
-const count_pattern_1 = require("./count-pattern");
-const transparent_1 = require("./transparent");
-const utils_1 = require("./utils");
+import { choice } from './choice.js';
+import { countPattern } from './count-pattern.js';
+import { transparent } from './transparent.js';
+import { isChoice, isTransparent } from './utils.js';
 /**
  * Check content condition
  *
@@ -15,13 +12,14 @@ const utils_1 = require("./utils");
  * @param depth
  * @returns
  */
-function complexBranch(pattern, elements, specs, options, depth) {
-    if ((0, utils_1.isChoice)(pattern)) {
-        return (0, choice_1.choice)(pattern, elements, specs, options, depth);
+export function complexBranch(pattern, 
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+elements, specs, options, depth) {
+    if (isChoice(pattern)) {
+        return choice(pattern, elements, specs, options, depth);
     }
-    if ((0, utils_1.isTransparent)(pattern)) {
-        return (0, transparent_1.transparent)(elements, specs, options, depth);
+    if (isTransparent(pattern)) {
+        return transparent(elements);
     }
-    return (0, count_pattern_1.countPattern)(pattern, elements, specs, options, depth);
+    return countPattern(pattern, elements, specs, options, depth);
 }
-exports.complexBranch = complexBranch;

package/lib/permitted-contents/content-model.d.ts

@@ -1,2 +1,2 @@
-import type { ContentModelResult, Element, Options, TagRule } from './types';
-export declare function contentModel(el: Element, rules: TagRule[], options: Options): ContentModelResult[];
+import type { ContentModelResult, Element, Options, TagRule } from './types.js';
+export declare function contentModel(el: Element, rules: readonly TagRule[], options: Options): ContentModelResult[];

package/lib/permitted-contents/content-model.js

@@ -1,9 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.contentModel = void 0;
-const ml_spec_1 = require("@markuplint/ml-spec");
-const start_1 = require("./start");
-function contentModel(el, rules, options) {
+import { getContentModel } from '@markuplint/ml-spec';
+import { start } from './start.js';
+export function contentModel(
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+el, rules, options) {
     const model = createModel(el, rules);
     if (model == null) {
         return [
@@ -15,18 +14,19 @@ function contentModel(el, rules, options) {
             },
         ];
     }
-    const result = (0, start_1.start)(model, el, el.ownerMLDocument.specs, options);
+    const result = start(model, el, el.ownerMLDocument.specs, options);
     return result;
 }
-exports.contentModel = contentModel;
-function createModel(el, rules) {
+function createModel(
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+el, rules) {
     const specs = cachedSpecs(el.ownerMLDocument.specs, rules);
-    const model = (0, ml_spec_1.getContentModel)(el, specs.specs);
+    const model = getContentModel(el, specs.specs);
     return model;
 }
 const caches = new Map();
 function cachedSpecs(specs, rules) {
-    if (!rules.length) {
+    if (rules.length === 0) {
         return specs;
     }
     const key = JSON.stringify(rules);

package/lib/permitted-contents/count-pattern.d.ts

@@ -1,5 +1,6 @@
-import type { ChildNode, Options, Result, Specs } from './types';
+import type { ChildNode, Options, Result, Specs } from './types.js';
 import type { PermittedContentOneOrMore, PermittedContentOptional, PermittedContentRequire, PermittedContentZeroOrMore } from '@markuplint/ml-spec';
+import type { ReadonlyDeep } from 'type-fest';
 /**
  * Check count
  *
@@ -10,4 +11,4 @@ import type { PermittedContentOneOrMore, PermittedContentOptional, PermittedCont
  * @param depth
  * @returns
  */
-export declare function countPattern(pattern: PermittedContentOneOrMore | PermittedContentOptional | PermittedContentRequire | PermittedContentZeroOrMore, elements: readonly ChildNode[], specs: Specs, options: Options, depth: number): Result;
+export declare function countPattern(pattern: ReadonlyDeep<PermittedContentOneOrMore> | ReadonlyDeep<PermittedContentOptional> | ReadonlyDeep<PermittedContentRequire> | ReadonlyDeep<PermittedContentZeroOrMore>, elements: readonly ChildNode[], specs: Specs, options: Options, depth: number): Result;

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

@@ -1,9 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.countPattern = void 0;
-const debug_1 = require("./debug");
-const recursive_branch_1 = require("./recursive-branch");
-const utils_1 = require("./utils");
+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
  *
@@ -14,95 +12,75 @@ const utils_1 = require("./utils");
  * @param depth
  * @returns
  */
-function countPattern(pattern, elements, specs, options, depth) {
-    var _a, _b, _c, _d, _e;
-    const ptLog = debug_1.cmLog.extend(`countPattern#${depth}`);
-    const collection = new utils_1.Collection(elements);
-    let min;
-    let max;
-    let model;
-    let type;
-    let _type;
-    if ((0, utils_1.isRequire)(pattern)) {
-        min = (_a = pattern.min) !== null && _a !== void 0 ? _a : 1;
-        max = Math.max((_b = pattern.max) !== null && _b !== void 0 ? _b : 1, min);
-        model = pattern.require;
-        type = 'MISSING_NODE_REQUIRED';
-        _type = 'require';
-    }
-    else if ((0, utils_1.isOptional)(pattern)) {
-        min = 0;
-        max = Math.max((_c = pattern.max) !== null && _c !== void 0 ? _c : 1, 1);
-        model = pattern.optional;
-        _type = 'optional';
-    }
-    else if ((0, utils_1.isOneOrMore)(pattern)) {
-        min = 1;
-        max = Math.max((_d = pattern.max) !== null && _d !== void 0 ? _d : Infinity, 1);
-        model = pattern.oneOrMore;
-        type = 'MISSING_NODE_ONE_OR_MORE';
-        _type = 'one or more';
-    }
-    else if ((0, utils_1.isZeroOrMore)(pattern)) {
-        min = 0;
-        max = Math.max((_e = pattern.max) !== null && _e !== void 0 ? _e : Infinity, 1);
-        model = pattern.zeroOrMore;
-        _type = 'zero or more';
-    }
-    else {
-        throw new Error('Unreachable code');
-    }
-    ptLog('%s: %o', _type, model);
+export function countPattern(pattern, 
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+elements, specs, options, depth) {
+    const ptLog = cmLog.extend(`countPattern#${depth}`);
+    const collection = new Collection(elements);
+    const { model, min, max, repeat, missingType } = normalizeModel(pattern);
+    ptLog('Model:\n  RegEx: %s\n  Schema: %o', modelLog(model, repeat), pattern);
     let prevResult = null;
+    let barelyResult = null;
+    let loopCount = 0;
     // eslint-disable-next-line no-constant-condition
     while (true) {
-        ptLog('%s', collection);
-        const result = (0, recursive_branch_1.recursiveBranch)(model, collection.unmatched, specs, options, depth);
+        loopCount++;
+        ptLog('Check#%s: %s', loopCount, collection);
+        const result = recursiveBranch(model, collection.unmatched, specs, options, depth);
         const added = collection.addMatched(result.matched);
+        const { matchedCount } = collection;
         if (result.type === 'UNMATCHED_SELECTOR_BUT_MAY_EMPTY') {
-            ptLog('MATCHED_ZERO: %s', result.query);
-            return {
+            ptLog('MATCHED_ZERO:\n  model: %s\n  max: %s\n  collection: %s\n  matched element: %s', modelLog(model, repeat), max, collection, matchedCount);
+            return compereResult({
                 type: 'MATCHED_ZERO',
                 matched: collection.matched,
                 unmatched: collection.unmatched,
                 zeroMatch: true,
                 query: result.query,
                 hint: result.hint,
-            };
+            }, barelyResult);
         }
         if (max < collection.matchedCount) {
             collection.max(max);
-            ptLog('UNEXPECTED_EXTRA_NODE (max: %s): %s', max, result.query);
-            return {
+            ptLog('UNEXPECTED_EXTRA_NODE:\n  model: %s\n  max: %s\n  collection: %s\n  matched element: %s', modelLog(model, repeat), max, collection, matchedCount);
+            return compereResult({
                 type: 'UNEXPECTED_EXTRA_NODE',
                 matched: collection.matched,
                 unmatched: collection.unmatched,
                 zeroMatch: result.zeroMatch,
                 query: result.query,
-                hint: {
-                    ...result.hint,
-                    max,
-                },
-            };
+                hint: mergeHints(result.hint, { max }),
+            }, barelyResult);
         }
         if (prevResult) {
             if (result.type === 'MISSING_NODE_ONE_OR_MORE' ||
                 result.type === 'MISSING_NODE_REQUIRED' ||
                 result.type === 'TRANSPARENT_MODEL_DISALLOWS') {
-                ptLog('%s(continued): %s', result.type, collection);
-                return {
+                ptLog('%s(continued): %s; Needs', result.type, collection, result.query);
+                return compereResult({
                     type: result.type,
                     matched: collection.matched,
                     unmatched: collection.unmatched,
                     zeroMatch: result.zeroMatch,
                     query: result.query,
                     hint: result.hint,
-                };
+                }, barelyResult);
             }
             ptLog('%s(continued): %s', prevResult.type, collection);
-            return prevResult;
+            return compereResult(prevResult, barelyResult);
         }
         if (added && collection.unmatched.length > 0) {
+            if (result.type !== 'MISSING_NODE' && result.type !== 'UNMATCHED_SELECTORS') {
+                barelyResult = {
+                    type: result.type,
+                    matched: collection.matched,
+                    unmatched: collection.unmatched,
+                    zeroMatch: result.zeroMatch,
+                    query: result.query,
+                    hint: result.hint,
+                };
+            }
+            ptLog('continue⤴️');
             continue;
         }
         if (collection.matchedCount + (result.zeroMatch ? 1 : 0) < min) {
@@ -110,16 +88,21 @@ function countPattern(pattern, elements, specs, options, depth) {
                 result.type === 'MISSING_NODE_ONE_OR_MORE' ||
                 result.type === 'TRANSPARENT_MODEL_DISALLOWS'
                 ? result.type
-                : type !== null && type !== void 0 ? type : 'MISSING_NODE_REQUIRED';
-            ptLog('%s(in %s): %s', resultType, type, result.query);
-            return {
+                : missingType ?? 'MISSING_NODE_REQUIRED';
+            ptLog('%s(in %s); Needs %s', resultType, missingType, result.query);
+            return compereResult({
                 type: resultType,
                 matched: collection.matched,
                 unmatched: collection.unmatched,
                 zeroMatch: result.zeroMatch,
                 query: result.query,
-                hint: result.hint,
-            };
+                hint: mergeHints(result.hint, {
+                    missing: {
+                        barelyMatchedElements: collection.matched.length,
+                        need: result.query,
+                    },
+                }),
+            }, barelyResult);
         }
         const resultType = collection.matched.length === 0 ? 'MATCHED_ZERO' : 'MATCHED';
         const zeroMatch = result.zeroMatch || min === 0 || resultType === 'MATCHED_ZERO';
@@ -129,27 +112,46 @@ function countPattern(pattern, elements, specs, options, depth) {
             unmatched: collection.unmatched,
             zeroMatch,
             query: result.query,
-            hint: result.hint,
+            hint: mergeHints(result.hint, {
+                missing: {
+                    barelyMatchedElements: collection.matched.length,
+                    need: result.query,
+                },
+            }),
         };
-        if (!prevResult && collection.unmatched.length) {
-            ptLog('continue checking');
+        if (collection.unmatched.length > 0) {
             prevResult = matchedResult;
+            ptLog('continue⤴️ (add prev)');
             continue;
         }
-        ptLog('%s: %s', resultType, collection);
+        ptLog('%s:\n  model: %s\n  max: %s\n  collection: %s\n  matched element: %s', resultType, modelLog(model, repeat), max, collection, matchedCount);
         if (result.type === 'MISSING_NODE_REQUIRED' ||
             result.type === 'MISSING_NODE_ONE_OR_MORE' ||
             result.type === 'TRANSPARENT_MODEL_DISALLOWS') {
-            return {
+            return compereResult({
                 type: result.type,
                 matched: collection.matched,
                 unmatched: collection.unmatched,
                 zeroMatch: result.zeroMatch,
                 query: result.query,
                 hint: result.hint,
-            };
+            }, barelyResult);
         }
-        return matchedResult;
+        return compereResult(matchedResult, barelyResult);
+    }
+}
+function compereResult(
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+a, 
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+b) {
+    cLog('current: %s %O\nbarely: %s %O', a.type, a.hint, b?.type, b?.hint);
+    if (b == null) {
+        return a;
+    }
+    if (a.type === 'MATCHED' || a.type === 'MATCHED_ZERO' || a.type === 'UNEXPECTED_EXTRA_NODE') {
+        return a;
     }
+    const result = [a, b].sort((a, b) => (b.hint.missing?.barelyMatchedElements ?? 0) - (a.hint.missing?.barelyMatchedElements ?? 0))[0] ?? a;
+    return result;
 }
-exports.countPattern = countPattern;

package/lib/permitted-contents/debug.browser.js

@@ -1,14 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.cyan = exports.bgMagenta = exports.blue = exports.bgBlue = exports.bgRed = exports.green = exports.bgGreen = exports.cmLog = void 0;
-const debug_1 = require("../debug");
-exports.cmLog = debug_1.log.extend('content-model');
+import { log } from '../debug.js';
+export const cmLog = log.extend('content-model');
 const fn = () => { };
 fn.bold = () => { };
-exports.bgGreen = fn;
-exports.green = fn;
-exports.bgRed = fn;
-exports.bgBlue = fn;
-exports.blue = fn;
-exports.bgMagenta = fn;
-exports.cyan = fn;
+export const bgGreen = fn;
+export const green = fn;
+export const bgRed = fn;
+export const bgBlue = fn;
+export const blue = fn;
+export const bgMagenta = fn;
+export const cyan = fn;