@markuplint/rules 3.5.0 → 3.6.0

package/lib/placeholder-label-option/index.js

@@ -29,6 +29,7 @@ exports.default = (0, ml_core_1.createRule)({
 function needPlaceholderLabelOption(
 // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
 select) {
+    var _a;
     const hasRequired = select.hasAttribute('required');
     if (!hasRequired) {
         return false;
@@ -37,7 +38,7 @@ select) {
     if (hasMultiple) {
         return false;
     }
-    const size = select.getAttribute('size') || '1';
+    const size = (_a = select.getAttribute('size')) !== null && _a !== void 0 ? _a : '1';
     if (size !== '1') {
         return false;
     }
@@ -58,7 +59,7 @@ select) {
 function hasPlaceholderLabelOption(
 // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
 select) {
-    var _a;
+    var _a, _b;
     // > has a required attribute specified
     if (!select.hasAttribute('required')) {
         return false;
@@ -68,7 +69,7 @@ select) {
         return false;
     }
     // > has a display size of 1
-    const size = select.getAttribute('size') || '1';
+    const size = (_a = select.getAttribute('size')) !== null && _a !== void 0 ? _a : '1';
     if (size !== '1') {
         return false;
     }
@@ -79,7 +80,7 @@ select) {
         return true;
     }
     // > that option element's parent node is the select element (and not an optgroup element)
-    if (((_a = firstOption.parentElement) === null || _a === void 0 ? void 0 : _a.localName) === 'optgroup') {
+    if (((_b = firstOption.parentElement) === null || _b === void 0 ? void 0 : _b.localName) === 'optgroup') {
         return false;
     }
     const value = firstOption.getAttribute('value');

package/lib/require-accessible-name/index.d.ts

@@ -1,6 +1,6 @@
 import type { ARIAVersion } from '@markuplint/ml-spec';
 type Option = {
-    ariaVersion: ARIAVersion;
+	ariaVersion: ARIAVersion;
 };
-declare const _default: Readonly<import("@markuplint/ml-core").RuleSeed<boolean, Option>>;
+declare const _default: Readonly<import('@markuplint/ml-core').RuleSeed<boolean, Option>>;
 export default _default;

package/lib/require-datetime/index.d.ts

@@ -1,6 +1,6 @@
 import type { Lang } from './types';
 type Options = {
-    langs?: Lang[];
+	langs?: Lang[];
 };
-declare const _default: Readonly<import("@markuplint/ml-core").RuleSeed<boolean, Options>>;
+declare const _default: Readonly<import('@markuplint/ml-core').RuleSeed<boolean, Options>>;
 export default _default;

package/lib/require-datetime/types.d.ts

@@ -1,8 +1,8 @@
 export type DateTimeKey = 'year' | 'month' | 'day' | 'hour' | 'minute' | 'second' | 'ms';
 export type DateTimeData = Partial<Record<DateTimeKey, number>>;
 export type DateTime = {
-    datetime: DateTimeData;
-    zone?: number;
+	datetime: DateTimeData;
+	zone?: number;
 };
 /**
  * @see https://github.com/wanasit/chrono#locales

package/lib/require-datetime/utils.js

@@ -13,6 +13,7 @@ const defaultLangs = ['en', 'ja', 'fr', 'nl', 'ru', 'de', 'pt', 'zh'];
  * @returns
  */
 function parseADatetime(content, langs, base) {
+    var _a;
     const date = parseTryMultipleLangs(content, langs, base);
     if (!date) {
         return null;
@@ -31,7 +32,7 @@ function parseADatetime(content, langs, base) {
         data.hour = date.get('hour');
     }
     if (date.isCertain('hour')) {
-        data.minute = date.get('minute') || 0;
+        data.minute = (_a = date.get('minute')) !== null && _a !== void 0 ? _a : 0;
     }
     if (date.isCertain('second')) {
         data.second = date.get('second');
@@ -57,7 +58,7 @@ function getCandidateDatetimeString(content, langs = defaultLangs) {
     if (!datetimeStr) {
         return null;
     }
-    if (date.zone) {
+    if (date.zone != null) {
         const plusMinus = date.zone < 0 ? '-' : '+';
         const hour = Math.floor(Math.abs(date.zone) / 60);
         const minute = Math.abs(date.zone) % 60;

package/lib/required-attr/index.d.ts

@@ -1,7 +1,7 @@
 type RequiredAttributes = string | (string | Attr)[];
 type Attr = {
-    name: string;
-    value: string | string[];
+	name: string;
+	value: string | string[];
 };
-declare const _default: Readonly<import("@markuplint/ml-core").RuleSeed<RequiredAttributes, undefined>>;
+declare const _default: Readonly<import('@markuplint/ml-core').RuleSeed<RequiredAttributes, undefined>>;
 export default _default;

package/lib/required-attr/index.js

@@ -15,7 +15,7 @@ exports.default = (0, ml_core_1.createRule)({
             const attributeSpecs = {};
             if (attrSpec && el.elementType === 'html') {
                 for (const spec of attrSpec) {
-                    if (spec.required || spec.requiredEither || spec.condition) {
+                    if (spec.required != null || spec.requiredEither || spec.condition != null) {
                         attributeSpecs[spec.name] = {
                             ...spec,
                             values: [],
@@ -54,7 +54,7 @@ exports.default = (0, ml_core_1.createRule)({
                 else if (spec.required === true) {
                     invalid = (0, helpers_1.attrMatches)(el, spec.condition) && didntHave;
                 }
-                else if (spec.required) {
+                else if (spec.required != null && spec.required !== false) {
                     const selector = typeof spec.required === 'string' ? spec.required : spec.required.join(',');
                     invalid = el.matches(selector) && didntHave;
                 }
@@ -66,14 +66,14 @@ exports.default = (0, ml_core_1.createRule)({
                     });
                 }
                 const value = el.getAttribute(spec.name);
-                if (spec.values.length && value) {
+                if (spec.values.length > 0 && value) {
                     const matched = spec.values.some(pattern => (0, helpers_1.match)(value, pattern));
                     if (!matched) {
                         const expects = spec.values.length === 1 ? t(spec.values) : t('either {0}', t(spec.values));
                         const message = t('{0} expects {1}', t('the "{0*}" {1}', spec.name, 'attribute'), expects);
                         const attrToken = el.getAttributeToken(spec.name);
                         const valueToken = (_a = attrToken[0]) === null || _a === void 0 ? void 0 : _a.valueNode;
-                        const token = valueToken || attrToken[0];
+                        const token = valueToken !== null && valueToken !== void 0 ? valueToken : attrToken[0];
                         if (token) {
                             report({
                                 scope: {

package/lib/required-element/index.d.ts

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

package/lib/required-h1/index.d.ts

@@ -1,6 +1,6 @@
 export interface Options {
-    'expected-once': boolean;
-    'in-document-fragment': boolean;
+	'expected-once': boolean;
+	'in-document-fragment': boolean;
 }
-declare const _default: Readonly<import("@markuplint/ml-core").RuleSeed<boolean, Options>>;
+declare const _default: Readonly<import('@markuplint/ml-core').RuleSeed<boolean, Options>>;
 export default _default;

package/lib/use-list/index.d.ts

@@ -1,6 +1,6 @@
 type Bullets = readonly string[];
 type Options = {
-    spaceNeededBullets?: string[];
+	spaceNeededBullets?: string[];
 };
-declare const _default: Readonly<import("@markuplint/ml-core").RuleSeed<Bullets, Options>>;
+declare const _default: Readonly<import('@markuplint/ml-core').RuleSeed<Bullets, Options>>;
 export default _default;

package/lib/use-list/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const ml_core_1 = require("@markuplint/ml-core");
-const helpers_1 = require("../helpers");
+const shared_1 = require("@markuplint/shared");
 exports.default = (0, ml_core_1.createRule)({
     defaultValue: [
         /**
@@ -57,7 +57,8 @@ exports.default = (0, ml_core_1.createRule)({
     defaultSeverity: 'warning',
     async verify({ document, report, t }) {
         await document.walkOn('Text', textNode => {
-            const text = (0, helpers_1.decodeCharRef)(textNode.raw.trim());
+            var _a;
+            const text = (0, shared_1.decodeEntities)(textNode.raw.trim());
             if (!text) {
                 // empty
                 return;
@@ -67,7 +68,7 @@ exports.default = (0, ml_core_1.createRule)({
                 return;
             }
             const bullets = textNode.rule.value;
-            const spaceNeededBullets = textNode.rule.options.spaceNeededBullets || [];
+            const spaceNeededBullets = (_a = textNode.rule.options.spaceNeededBullets) !== null && _a !== void 0 ? _a : [];
             if (isMayListItem(text, bullets, spaceNeededBullets)) {
                 report({
                     scope: textNode,

package/lib/wai-aria/checkings/default-value.d.ts

@@ -1,6 +1,10 @@
 import type { Options } from '../types';
 import type { AttrChecker } from '@markuplint/ml-core';
 import type { ARIAProperty } from '@markuplint/ml-spec';
-export declare const checkingDefaultValue: AttrChecker<boolean, Options, {
-    propSpecs: readonly ARIAProperty[];
-}>;
+export declare const checkingDefaultValue: AttrChecker<
+	boolean,
+	Options,
+	{
+		propSpecs: readonly ARIAProperty[];
+	}
+>;

package/lib/wai-aria/checkings/deprecated-props.d.ts

@@ -1,7 +1,11 @@
 import type { Options } from '../types';
 import type { AttrChecker } from '@markuplint/ml-core';
 import type { ARIAProperty, ARIARole } from '@markuplint/ml-spec';
-export declare const checkingDeprecatedProps: AttrChecker<boolean, Options, {
-    role: ARIARole | null;
-    propSpecs: readonly ARIAProperty[];
-}>;
+export declare const checkingDeprecatedProps: AttrChecker<
+	boolean,
+	Options,
+	{
+		role: ARIARole | null;
+		propSpecs: readonly ARIAProperty[];
+	}
+>;

package/lib/wai-aria/checkings/disallowed-prop.js

@@ -13,7 +13,7 @@ const checkingDisallowedProp = ({ attr, role, propSpecs }) => t => {
     const statesAndProp = role.ownedProperties.find(p => p.name === attr.name);
     const propSpec = propSpecs.find(p => p.name === attr.name);
     const elAriaSpec = (0, ml_spec_1.getARIA)(attr.ownerMLDocument.specs, attr.ownerElement.localName, attr.ownerElement.namespaceURI, attr.rule.options.version, attr.ownerElement.matches.bind(attr.ownerElement));
-    if ((elAriaSpec === null || elAriaSpec === void 0 ? void 0 : elAriaSpec.properties) && ((_a = elAriaSpec === null || elAriaSpec === void 0 ? void 0 : elAriaSpec.properties) === null || _a === void 0 ? void 0 : _a.without)) {
+    if ((elAriaSpec === null || elAriaSpec === void 0 ? void 0 : elAriaSpec.properties) !== false && ((_a = elAriaSpec === null || elAriaSpec === void 0 ? void 0 : elAriaSpec.properties) === null || _a === void 0 ? void 0 : _a.without)) {
         for (const ignore of elAriaSpec.properties.without) {
             if (ignore.name === attr.name) {
                 return {

package/lib/wai-aria/checkings/implicit-props.d.ts

@@ -1,7 +1,11 @@
 import type { Options } from '../types';
 import type { AttrChecker } from '@markuplint/ml-core';
 import type { ARIAProperty, Attribute } from '@markuplint/ml-spec';
-export declare const checkingImplicitProps: AttrChecker<boolean, Options, {
-    propSpecs: readonly ARIAProperty[];
-    attrSpecs: readonly Attribute[] | null;
-}>;
+export declare const checkingImplicitProps: AttrChecker<
+	boolean,
+	Options,
+	{
+		propSpecs: readonly ARIAProperty[];
+		attrSpecs: readonly Attribute[] | null;
+	}
+>;

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkingImplicitProps = void 0;
 const helpers_1 = require("../../helpers");
 const checkingImplicitProps = ({ attr, propSpecs, attrSpecs }) => t => {
+    var _a;
     if (!attrSpecs) {
         return;
     }
@@ -15,8 +16,8 @@ const checkingImplicitProps = ({ attr, propSpecs, attrSpecs }) => t => {
     }
     for (const equivalentHtmlAttr of propSpec.equivalentHtmlAttrs) {
         const htmlAttrSpec = attrSpecs.find(a => a.name === equivalentHtmlAttr.htmlAttrName);
-        const isValid = (0, helpers_1.isValidAttr)(t, equivalentHtmlAttr.htmlAttrName, equivalentHtmlAttr.value || '', false, attr.ownerElement, attrSpecs);
-        if (isValid && isValid.invalidType === 'non-existent') {
+        const isValid = (0, helpers_1.isValidAttr)(t, equivalentHtmlAttr.htmlAttrName, (_a = equivalentHtmlAttr.value) !== null && _a !== void 0 ? _a : '', false, attr.ownerElement, attrSpecs);
+        if (isValid !== false && isValid.invalidType === 'non-existent') {
             continue;
         }
         const value = attr.value.trim().toLowerCase();

package/lib/wai-aria/checkings/no-global-prop.d.ts

@@ -1,6 +1,10 @@
 import type { Options } from '../types';
 import type { AttrChecker } from '@markuplint/ml-core';
 import type { ARIAProperty } from '@markuplint/ml-spec';
-export declare const checkingNoGlobalProp: AttrChecker<boolean, Options, {
-    propSpecs: readonly ARIAProperty[];
-}>;
+export declare const checkingNoGlobalProp: AttrChecker<
+	boolean,
+	Options,
+	{
+		propSpecs: readonly ARIAProperty[];
+	}
+>;

package/lib/wai-aria/checkings/required-owned-elements.d.ts

@@ -6,6 +6,10 @@ import type { ARIARole } from '@markuplint/ml-spec';
  *
  * @see https://w3c.github.io/aria/#mustContain
  */
-export declare const checkingRequiredOwnedElements: ElementChecker<boolean, Options, {
-    role?: ARIARole | null;
-}>;
+export declare const checkingRequiredOwnedElements: ElementChecker<
+	boolean,
+	Options,
+	{
+		role?: ARIARole | null;
+	}
+>;

package/lib/wai-aria/checkings/required-owned-elements.js

@@ -11,7 +11,7 @@ const checkingRequiredOwnedElements = ({ el, role }) => t => {
     if (!role) {
         return;
     }
-    if (!role.requiredOwnedElements.length) {
+    if (role.requiredOwnedElements.length === 0) {
         return;
     }
     /**

package/lib/wai-aria/checkings/required-prop.d.ts

@@ -1,9 +1,15 @@
 import type { Options } from '../types';
 import type { ElementChecker } from '@markuplint/ml-core';
 import type { ARIAProperty, ARIARole } from '@markuplint/ml-spec';
-export declare const checkingRequiredProp: ElementChecker<boolean, Options, {
-    role?: (ARIARole & {
-        isImplicit?: boolean;
-    }) | null;
-    propSpecs: readonly ARIAProperty[];
-}>;
+export declare const checkingRequiredProp: ElementChecker<
+	boolean,
+	Options,
+	{
+		role?:
+			| (ARIARole & {
+					isImplicit?: boolean;
+			  })
+			| null;
+		propSpecs: readonly ARIAProperty[];
+	}
+>;

package/lib/wai-aria/checkings/value.d.ts

@@ -1,13 +1,22 @@
 import type { Options } from '../types';
 import type { AttrChecker } from '@markuplint/ml-core';
 import type { ARIAProperty, ARIARole } from '@markuplint/ml-spec';
-export declare const checkingValue: AttrChecker<boolean, Options, {
-    role?: ARIARole | null;
-    propSpecs: readonly ARIAProperty[];
-    booleanish?: boolean;
-}>;
+export declare const checkingValue: AttrChecker<
+	boolean,
+	Options,
+	{
+		role?: ARIARole | null;
+		propSpecs: readonly ARIAProperty[];
+		booleanish?: boolean;
+	}
+>;
 /**
  *
  * @see https://www.w3.org/TR/wai-aria-1.2/#propcharacteristic_value
  */
-export declare function checkAriaValue(type: string, value: string, tokenEnum: readonly string[], booleanish?: boolean): boolean;
+export declare function checkAriaValue(
+	type: string,
+	value: string,
+	tokenEnum: readonly string[],
+	booleanish?: boolean,
+): boolean;

package/lib/wai-aria/checkings/value.js

@@ -14,7 +14,9 @@ const checkingValue = ({ attr, role, propSpecs, booleanish }) => t => {
     return {
         scope: attr,
         message: t('{0:c} on {1}', t('{0} is {1:c}', t('the "{0}"', attr.value), 'disallowed'), t('the "{0*}" {1}', attr.name, `ARIA ${(_a = propSpec === null || propSpec === void 0 ? void 0 : propSpec.type) !== null && _a !== void 0 ? _a : 'property'}`)) +
-            ('enum' in result && result.enum.length ? t('. ') + t('Allowed values are: {0}', t(result.enum)) : ''),
+            ('enum' in result && result.enum.length > 0
+                ? t('. ') + t('Allowed values are: {0}', t(result.enum))
+                : ''),
     };
 };
 exports.checkingValue = checkingValue;

package/lib/wai-aria/index.d.ts

@@ -1,3 +1,3 @@
 import type { Options } from './types';
-declare const _default: Readonly<import("@markuplint/ml-core").RuleSeed<boolean, Options>>;
+declare const _default: Readonly<import('@markuplint/ml-core').RuleSeed<boolean, Options>>;
 export default _default;

package/lib/wai-aria/types.d.ts

@@ -1,13 +1,13 @@
 import type { ARIAVersion } from '@markuplint/ml-spec';
 export type Options = {
-    checkingValue: boolean;
-    checkingDeprecatedProps: boolean;
-    permittedAriaRoles: boolean;
-    checkingRequiredOwnedElements: boolean;
-    checkingPresentationalChildren: boolean;
-    checkingInteractionInHidden: boolean;
-    disallowSetImplicitRole: boolean;
-    disallowSetImplicitProps: boolean;
-    disallowDefaultValue: boolean;
-    version: ARIAVersion;
+	checkingValue: boolean;
+	checkingDeprecatedProps: boolean;
+	permittedAriaRoles: boolean;
+	checkingRequiredOwnedElements: boolean;
+	checkingPresentationalChildren: boolean;
+	checkingInteractionInHidden: boolean;
+	disallowSetImplicitRole: boolean;
+	disallowSetImplicitProps: boolean;
+	disallowDefaultValue: boolean;
+	version: ARIAVersion;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/rules",
-	"version": "3.5.0",
+	"version": "3.6.0",
 	"description": "Built-in rules of markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -20,21 +20,21 @@
 		"./lib/permitted-contents/debug.js": "./lib/permitted-contents/debug.browser.js"
 	},
 	"dependencies": {
-		"@markuplint/html-spec": "3.5.0",
-		"@markuplint/ml-core": "3.5.0",
-		"@markuplint/ml-spec": "3.5.0",
-		"@markuplint/selector": "3.5.0",
-		"@markuplint/types": "3.4.0",
+		"@markuplint/html-spec": "3.6.0",
+		"@markuplint/ml-core": "3.6.0",
+		"@markuplint/ml-spec": "3.6.0",
+		"@markuplint/selector": "3.6.0",
+		"@markuplint/shared": "3.5.0",
+		"@markuplint/types": "3.5.0",
 		"@ungap/structured-clone": "^1.0.1",
 		"ansi-colors": "^4.1.3",
 		"chrono-node": "^2.5.0",
 		"debug": "^4.3.4",
-		"html-entities": "^2.3.3",
 		"tslib": "^2.4.1"
 	},
 	"devDependencies": {
 		"@types/debug": "^4.1.7",
 		"type-fest": "^3.6.1"
 	},
-	"gitHead": "0c47b2c2722f6823a17f36edbab98486275f8ab4"
+	"gitHead": "715dd53d3b1064a9bcf616c1533921cad9e3b187"
 }