@markuplint/rules 4.10.5 → 4.10.6

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.10.6](https://github.com/markuplint/markuplint/compare/@markuplint/rules@4.10.5...@markuplint/rules@4.10.6) (2024-11-17)
+
+### Bug Fixes
+
+- **rules:** change to spread syntax ([6f2688b](https://github.com/markuplint/markuplint/commit/6f2688bfd4a7f10d63f653d90bbb19463c1066fb))
+
 ## [4.10.5](https://github.com/markuplint/markuplint/compare/@markuplint/rules@4.10.4...@markuplint/rules@4.10.5) (2024-10-31)
 
 **Note:** Version bump only for package @markuplint/rules

package/lib/attr-check.d.ts

@@ -1,8 +1,9 @@
 import type { Translator } from '@markuplint/i18n';
 import type { Attribute as AttrSpec, AttributeType } from '@markuplint/ml-spec';
 import type { ReadonlyDeep } from 'type-fest';
-type Invalid = {
-    invalidType: 'non-existent' | 'invalid-value' | 'disallowed-attr';
+type InvalidTYpe = 'non-existent' | 'invalid-value' | 'disallowed-attr';
+type Invalid<T extends InvalidTYpe = InvalidTYpe> = {
+    invalidType: T;
     message: string;
     loc?: Loc;
 };
@@ -19,6 +20,6 @@ type Loc = {
  * @param isCustomRule
  * @param spec
  */
-export declare function attrCheck(t: Translator, name: string, value: string, isCustomRule: boolean, spec?: AttrSpec): Invalid | false;
+export declare function attrCheck(t: Translator, name: string, value: string, isCustomRule: boolean, spec?: AttrSpec): Invalid | Invalid<'invalid-value'>[] | false;
 export declare function valueCheck(t: Translator, name: string, value: string, type: ReadonlyDeep<AttributeType>): [string, Loc] | false;
 export {};

package/lib/attr-check.js

@@ -52,30 +52,21 @@ export function attrCheck(t, name, value, isCustomRule, spec) {
         };
     }
     const types = toNonNullableArrayFromItemOrArray(spec.type);
-    const invalidList = types.map(type => {
+    const invalidMap = new Map();
+    for (const type of types) {
         const invalid = valueCheck(t, name, value, type);
         if (invalid === false) {
             return false;
         }
-        if (typeof invalid === 'string') {
-            return {
-                invalidType: 'invalid-value',
-                message: invalid,
-            };
-        }
-        else {
-            return {
-                invalidType: 'invalid-value',
-                message: invalid[0],
-                loc: invalid[1],
-            };
-        }
-    });
-    if (invalidList.includes(false)) {
-        return false;
+        const key = `${invalid[1].line}:${invalid[1].col}`;
+        const current = invalidMap.get(key);
+        invalidMap.set(key, {
+            invalidType: 'invalid-value',
+            message: current?.message ? [current.message, invalid[0]].join(t('. ') + t('Or, ')) : invalid[0],
+            loc: invalid[1],
+        });
     }
-    const invalid = invalidList.find(Boolean);
-    return invalid ?? false;
+    return [...invalidMap.values()];
 }
 export function valueCheck(t, name, value, type) {
     if (type === 'Boolean') {

package/lib/helpers.d.ts

@@ -30,7 +30,15 @@ export declare function isValidAttr(t: Translator, name: string, value: string,
         line: number;
         col: number;
     };
-};
+} | {
+    invalidType: "invalid-value";
+    message: string;
+    loc?: {
+        raw: string;
+        line: number;
+        col: number;
+    };
+}[];
 export declare function toNormalizedValue(value: string, spec: Attribute): string;
 export declare function accnameMayBeMutable(el: Element<any, any>, document: Document<any, any>): boolean;
 export declare function getOwnedLabel<V extends RuleConfigValue, O extends PlainData>(el: Element<V, O>, document: Document<V, O>): Element<V, O> | null;

package/lib/helpers.js

@@ -79,7 +79,7 @@ log) {
             message: t('{0} is {1}', t('the "{0*}" {1}', name, 'attribute'), 'disallowed'),
         };
     }
-    if (invalid !== false && invalid.invalidType === 'invalid-value' && isDynamicValue) {
+    if (invalid !== false && (Array.isArray(invalid) || invalid.invalidType === 'invalid-value') && isDynamicValue) {
         invalid = false;
     }
     return invalid;

package/lib/invalid-attr/index.js

@@ -167,45 +167,49 @@ export default createRule({
                 log('Checking %s[%s="%s"]', attr.nodeName, name, value);
                 invalid = isValidAttr(t, name, value, attr.isDynamicValue || false, attr.ownerElement, attrSpecs, log);
             }
-            if (invalid !== false) {
-                switch (invalid.invalidType) {
-                    case 'disallowed-attr': {
-                        report({
-                            scope: attr,
-                            message: invalid.message,
-                        });
-                        break;
-                    }
-                    case 'invalid-value': {
-                        if (attr.isDynamicValue) {
+            const invalidList = Array.isArray(invalid) ? invalid : [invalid];
+            for (const invalid of invalidList) {
+                if (invalid !== false) {
+                    switch (invalid.invalidType) {
+                        case 'disallowed-attr': {
+                            report({
+                                scope: attr,
+                                message: invalid.message,
+                            });
                             break;
                         }
-                        report({
-                            scope: attr,
-                            message: invalid.message,
-                            line: (valueNode?.startLine ?? 0) + (invalid.loc?.line ?? 0),
-                            col: invalid.loc && invalid.loc.line > 0
-                                ? invalid.loc?.col + 1
-                                : (valueNode?.startCol ?? 0) + (invalid.loc?.col ?? 0),
-                            raw: invalid.loc?.raw ?? value,
-                        });
-                        break;
-                    }
-                    case 'non-existent': {
-                        if (allowToAddPropertiesForPretender && attr.ownerElement.pretenderContext?.type === 'origin') {
-                            return;
+                        case 'invalid-value': {
+                            if (attr.isDynamicValue) {
+                                break;
+                            }
+                            report({
+                                scope: attr,
+                                message: invalid.message,
+                                line: (valueNode?.startLine ?? 0) + (invalid.loc?.line ?? 0),
+                                col: invalid.loc && invalid.loc.line > 0
+                                    ? invalid.loc?.col + 1
+                                    : (valueNode?.startCol ?? 0) + (invalid.loc?.col ?? 0),
+                                raw: invalid.loc?.raw ?? value,
+                            });
+                            break;
                         }
-                        const spec = getSpec(attr.ownerElement, document.specs.specs);
-                        if (spec?.possibleToAddProperties) {
-                            return;
+                        case 'non-existent': {
+                            if (allowToAddPropertiesForPretender &&
+                                attr.ownerElement.pretenderContext?.type === 'origin') {
+                                return;
+                            }
+                            const spec = getSpec(attr.ownerElement, document.specs.specs);
+                            if (spec?.possibleToAddProperties) {
+                                return;
+                            }
+                            report({
+                                scope: attr,
+                                message: invalid.message,
+                                line: attrName?.startLine,
+                                col: attrName?.startCol,
+                                raw: attrName?.raw,
+                            });
                         }
-                        report({
-                            scope: attr,
-                            message: invalid.message,
-                            line: attrName?.startLine,
-                            col: attrName?.startCol,
-                            raw: attrName?.raw,
-                        });
                     }
                 }
             }

package/lib/wai-aria/checkings/implicit-props.js

@@ -13,7 +13,7 @@ export const checkingImplicitProps = ({ attr, propSpecs, attrSpecs }) => t => {
     for (const equivalentHtmlAttr of propSpec.equivalentHtmlAttrs) {
         const htmlAttrSpec = attrSpecs.find(a => a.name === equivalentHtmlAttr.htmlAttrName);
         const isValid = isValidAttr(t, equivalentHtmlAttr.htmlAttrName, equivalentHtmlAttr.value ?? '', false, attr.ownerElement, attrSpecs);
-        if (isValid !== false && isValid.invalidType === 'non-existent') {
+        if (isValid !== false && !Array.isArray(isValid) && isValid.invalidType === 'non-existent') {
             continue;
         }
         const value = attr.value.trim().toLowerCase();

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/rules",
-	"version": "4.10.5",
+	"version": "4.10.6",
 	"description": "Built-in rules of markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -17,26 +17,26 @@
 		"access": "public"
 	},
 	"scripts": {
-		"build": "tsc",
-		"dev": "tsc --build --watch",
+		"build": "tsc --project tsconfig.build.json",
+		"dev": "tsc --watch --project tsconfig.build.json",
 		"clean": "tsc --build --clean"
 	},
 	"browser": {
 		"./lib/permitted-contents/debug.js": "./lib/permitted-contents/debug.browser.js"
 	},
 	"dependencies": {
-		"@markuplint/html-spec": "4.10.2",
-		"@markuplint/ml-core": "4.10.4",
-		"@markuplint/ml-spec": "4.8.2",
-		"@markuplint/selector": "4.6.12",
-		"@markuplint/shared": "4.4.9",
-		"@markuplint/types": "4.6.4",
+		"@markuplint/html-spec": "4.11.0",
+		"@markuplint/ml-core": "4.10.5",
+		"@markuplint/ml-spec": "4.9.0",
+		"@markuplint/selector": "4.6.13",
+		"@markuplint/shared": "4.4.10",
+		"@markuplint/types": "4.7.0",
 		"@types/debug": "4.1.12",
 		"@ungap/structured-clone": "1.2.0",
 		"ansi-colors": "4.1.3",
 		"chrono-node": "2.7.7",
 		"debug": "4.3.7",
-		"type-fest": "4.26.1"
+		"type-fest": "4.27.0"
 	},
-	"gitHead": "c35e0beb5e14093a41cee7634221dbe7f7d577f9"
+	"gitHead": "b2154ecf1e67559a3791991752f45c9c0283801a"
 }

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",
-};

package/lib/permitted-contents/opt-condition.d.ts

@@ -1,8 +0,0 @@
-import type { Specs } from './types.js';
-type Condition = {
-    selector: string;
-    hasCustom: boolean;
-    hasText: boolean;
-};
-export declare function optCondition(query: string, specs: Specs): Readonly<Condition>;
-export {};

package/lib/permitted-contents/opt-condition.js

@@ -1,54 +0,0 @@
-import { contentModelCategoryToTagNames } from '@markuplint/ml-spec';
-const conditionWithoutSpecs = {
-    '#custom': {
-        selector: '#custom',
-        hasCustom: true,
-        hasText: false,
-    },
-    '#text': {
-        selector: '#text',
-        hasCustom: false,
-        hasText: true,
-    },
-};
-const optConditionSpecsBaseCaches = new Map();
-export function optCondition(query, specs) {
-    const condWithoutSpecs = conditionWithoutSpecs[query];
-    if (condWithoutSpecs) {
-        return condWithoutSpecs;
-    }
-    const queryCaches = optConditionSpecsBaseCaches.get(specs) ?? new Map();
-    const cached = queryCaches.get(query);
-    if (cached) {
-        return cached;
-    }
-    let hasCustom = false;
-    let hasText = false;
-    const selector = query.replace(/^:model\(([^)]+)\)|^#([a-z-]+)/, (_, $model, _model) => {
-        const _selectors = contentModelCategoryToTagNames(`#${$model ?? _model}`, specs.def);
-        if (_selectors.length === 0) {
-            throw new Error(`${$model ?? _model} is empty`);
-        }
-        const selectors = [];
-        for (const selector of _selectors) {
-            if (selector === '#custom') {
-                hasCustom = true;
-                continue;
-            }
-            if (selector === '#text') {
-                hasText = true;
-                continue;
-            }
-            selectors.push(selector);
-        }
-        return `:is(${selectors.join(',')})`;
-    });
-    const result = {
-        selector,
-        hasCustom,
-        hasText,
-    };
-    queryCaches.set(query, result);
-    optConditionSpecsBaseCaches.set(specs, queryCaches);
-    return result;
-}