@markuplint/rules 3.0.0-rc.2 → 3.0.0-rc.4

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

@@ -1,14 +1,29 @@
 import type { ChildNode, Element, Specs } from './types';
-import type { PermittedContentPattern, PermittedContentChoice, PermittedContentOneOrMore, PermittedContentOptional, PermittedContentRequire, PermittedContentTransparent, PermittedContentZeroOrMore, Model } from '@markuplint/ml-spec';
+import type {
+	PermittedContentPattern,
+	PermittedContentChoice,
+	PermittedContentOneOrMore,
+	PermittedContentOptional,
+	PermittedContentRequire,
+	PermittedContentTransparent,
+	PermittedContentZeroOrMore,
+	Model,
+} from '@markuplint/ml-spec';
 export declare function getChildNodesWithoutWhitespaces(el: Element): ChildNode[];
 export declare function isModel(model: Model | PermittedContentPattern[]): model is Model;
-export declare function matches(selector: string, node: ChildNode, specs: Specs): {
-    matched: boolean;
-    not?: undefined;
-} | {
-    matched: boolean;
-    not: ChildNode | undefined;
-};
+export declare function matches(
+	selector: string,
+	node: ChildNode,
+	specs: Specs,
+):
+	| {
+			matched: boolean;
+			not?: undefined;
+	  }
+	| {
+			matched: boolean;
+			not: ChildNode | undefined;
+	  };
 export declare function isRequire(content: PermittedContentPattern): content is PermittedContentRequire;
 export declare function isOptional(content: PermittedContentPattern): content is PermittedContentOptional;
 export declare function isOneOrMore(content: PermittedContentPattern): content is PermittedContentOneOrMore;
@@ -16,17 +31,16 @@ export declare function isZeroOrMore(content: PermittedContentPattern): content
 export declare function isChoice(content: PermittedContentPattern): content is PermittedContentChoice;
 export declare function isTransparent(content: PermittedContentPattern): content is PermittedContentTransparent;
 export declare class Collection {
-    #private;
-    constructor(origin: readonly ChildNode[]);
-    get matched(): ChildNode[];
-    get matchedCount(): number;
-    get nodes(): ChildNode[];
-    get unmatched(): ChildNode[];
-    addMatched(nodes: ChildNode[]): boolean;
-    back(): void;
-    lock(): void;
-    max(max: number): void;
-    toString(highlightExtraNodes?: boolean): string;
-}
-export declare class UnsupportedError extends Error {
+	#private;
+	constructor(origin: readonly ChildNode[]);
+	get matched(): ChildNode[];
+	get matchedCount(): number;
+	get nodes(): ChildNode[];
+	get unmatched(): ChildNode[];
+	addMatched(nodes: ChildNode[]): boolean;
+	back(): void;
+	lock(): void;
+	max(max: number): void;
+	toString(highlightExtraNodes?: boolean): string;
 }
+export declare class UnsupportedError extends Error {}

package/lib/permitted-contents/utils.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UnsupportedError = exports.Collection = exports.isTransparent = exports.isChoice = exports.isZeroOrMore = exports.isOneOrMore = exports.isOptional = exports.isRequire = exports.matches = exports.isModel = exports.getChildNodesWithoutWhitespaces = void 0;
 const tslib_1 = require("tslib");
 const selector_1 = require("@markuplint/selector");
-const ansi_colors_1 = require("ansi-colors");
+const debug_1 = require("./debug");
 const represent_transparent_nodes_1 = require("./represent-transparent-nodes");
 const getChildNodesWithoutWhitespacesCaches = new Map();
 function getChildNodesWithoutWhitespaces(el) {
@@ -142,33 +142,33 @@ class Collection {
             const raw = n.is(n.TEXT_NODE) ? `:text(${n.raw.replace(/\n/g, '\\n')})` : n.raw;
             if (tslib_1.__classPrivateFieldGet(this, _Collection_locked, "f").has(n)) {
                 if (represent_transparent_nodes_1.transparentMode.has(n)) {
-                    out.push(ansi_colors_1.bgBlue.bold(raw));
+                    out.push(debug_1.bgBlue.bold(raw));
                 }
                 else {
-                    out.push(ansi_colors_1.bgGreen.bold(raw));
+                    out.push(debug_1.bgGreen.bold(raw));
                 }
                 continue;
             }
             if (tslib_1.__classPrivateFieldGet(this, _Collection_matched, "f").has(n)) {
                 if (represent_transparent_nodes_1.transparentMode.has(n)) {
-                    out.push(ansi_colors_1.blue.bold(raw));
+                    out.push(debug_1.blue.bold(raw));
                 }
                 else {
-                    out.push(ansi_colors_1.green.bold(raw));
+                    out.push(debug_1.green.bold(raw));
                 }
                 continue;
             }
             if (highlightExtraNodes) {
                 if (represent_transparent_nodes_1.transparentMode.has(n)) {
-                    out.push(ansi_colors_1.bgMagenta.bold(raw));
+                    out.push(debug_1.bgMagenta.bold(raw));
                 }
                 else {
-                    out.push(ansi_colors_1.bgRed.bold(raw));
+                    out.push(debug_1.bgRed.bold(raw));
                 }
                 continue;
             }
             if (represent_transparent_nodes_1.transparentMode.has(n)) {
-                out.push((0, ansi_colors_1.cyan)(raw));
+                out.push((0, debug_1.cyan)(raw));
             }
             else {
                 out.push(raw);

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: import("@markuplint/ml-core").RuleSeed<boolean, Option>;
+declare const _default: import('@markuplint/ml-core').RuleSeed<boolean, Option>;
 export default _default;

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: import("@markuplint/ml-core").RuleSeed<RequiredAttributes, null>;
+declare const _default: import('@markuplint/ml-core').RuleSeed<RequiredAttributes, null>;
 export default _default;

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

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

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

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

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: ARIAProperty[];
-}>;
+export declare const checkingDefaultValue: AttrChecker<
+	boolean,
+	Options,
+	{
+		propSpecs: 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: ARIAProperty[];
-}>;
+export declare const checkingDeprecatedProps: AttrChecker<
+	boolean,
+	Options,
+	{
+		role: ARIARole | null;
+		propSpecs: ARIAProperty[];
+	}
+>;

package/lib/wai-aria/checkings/disallowed-prop.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 checkingDisallowedProp: AttrChecker<boolean, Options, {
-    role: ARIARole | null;
-    propSpecs: ARIAProperty[];
-}>;
+export declare const checkingDisallowedProp: AttrChecker<
+	boolean,
+	Options,
+	{
+		role: ARIARole | null;
+		propSpecs: ARIAProperty[];
+	}
+>;

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: ARIAProperty[];
-    attrSpecs: Attribute[] | null;
-}>;
+export declare const checkingImplicitProps: AttrChecker<
+	boolean,
+	Options,
+	{
+		propSpecs: ARIAProperty[];
+		attrSpecs: Attribute[] | null;
+	}
+>;

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: ARIAProperty[];
-}>;
+export declare const checkingNoGlobalProp: AttrChecker<
+	boolean,
+	Options,
+	{
+		propSpecs: 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

@@ -28,16 +28,11 @@ const checkingRequiredOwnedElements = ({ el, role }) => t => {
         return;
     }
     // TODO: Needs to resolve `aria-own`
-    if (el.isEmpty()) {
-        return {
-            scope: el,
-            message: t('{0}. Or, {1}', t('require {0}', role.requiredOwnedElements.length === 1
-                ? t('the "{0*}" {1}', role.requiredOwnedElements[0], 'role')
-                : t('the {0}', 'roles') + `: ${t(role.requiredOwnedElements)}`), t('require {0}', 'aria-busy="true"')),
-        };
-    }
     const children = Array.from(el.childNodes).map(child => {
         if (child.is(child.ELEMENT_NODE)) {
+            if (child.matches('[aria-busy="true" i]')) {
+                return [child, 'BUSY'];
+            }
             const computedChild = (0, ml_spec_1.getComputedRole)(child.ownerMLDocument.specs, child, child.rule.options.version);
             if (role.requiredOwnedElements.some(ownedRole => (0, ml_spec_1.isRequiredOwnedElement)(computedChild, ownedRole, child.ownerMLDocument.specs, child.rule.options.version))) {
                 return [child, 'REQUIRED'];
@@ -49,6 +44,9 @@ const checkingRequiredOwnedElements = ({ el, role }) => t => {
         }
         return [null, 'NO_ELEMENT'];
     });
+    if (children.some(([, type]) => type === 'BUSY')) {
+        return;
+    }
     /**
      * > Any element that will be owned by the element with this role.
      * > For example, an element with the role list
@@ -77,6 +75,14 @@ const checkingRequiredOwnedElements = ({ el, role }) => t => {
     if (el.hasMutableChildren(true)) {
         return;
     }
+    if (mayBeBeforeCreated(el)) {
+        return {
+            scope: el,
+            message: t('{0}. Or, {1}', t('require {0}', role.requiredOwnedElements.length === 1
+                ? t('the "{0*}" {1}', role.requiredOwnedElements[0], 'role')
+                : t('the {0}', 'roles') + `: ${t(role.requiredOwnedElements)}`), t('require {0}', 'aria-busy="true"')),
+        };
+    }
     return {
         scope: el,
         message: t('{0} expects {1}', t('the "{0*}" {1}', role.name, 'role'), role.requiredOwnedElements.length === 1
@@ -85,3 +91,11 @@ const checkingRequiredOwnedElements = ({ el, role }) => t => {
     };
 };
 exports.checkingRequiredOwnedElements = checkingRequiredOwnedElements;
+function mayBeBeforeCreated(el) {
+    if (el.isEmpty()) {
+        return true;
+    }
+    return Array.from(el.children).every(child => {
+        return ['script', 'template'].includes(child.localName);
+    });
+}

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: ARIAProperty[];
-}>;
+export declare const checkingRequiredProp: ElementChecker<
+	boolean,
+	Options,
+	{
+		role?:
+			| (ARIARole & {
+					isImplicit?: boolean;
+			  })
+			| null;
+		propSpecs: ARIAProperty[];
+	}
+>;

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

@@ -1,11 +1,15 @@
 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: ARIAProperty[];
-    booleanish?: boolean;
-}>;
+export declare const checkingValue: AttrChecker<
+	boolean,
+	Options,
+	{
+		role?: ARIARole | null;
+		propSpecs: ARIAProperty[];
+		booleanish?: boolean;
+	}
+>;
 /**
  *
  * @see https://www.w3.org/TR/wai-aria-1.2/#propcharacteristic_value

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

@@ -1,3 +1,3 @@
 import type { Options } from './types';
-declare const _default: import("@markuplint/ml-core").RuleSeed<boolean, Options>;
+declare const _default: 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.0.0-rc.2",
+	"version": "3.0.0-rc.4",
 	"description": "Built-in rules of markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -16,11 +16,14 @@
 		"dev": "tsc --build --watch",
 		"clean": "tsc --build --clean"
 	},
+	"browser": {
+		"./lib/permitted-contents/debug.js": "./lib/permitted-contents/debug.browser.js"
+	},
 	"dependencies": {
-		"@markuplint/html-spec": "3.0.0-rc.2",
-		"@markuplint/ml-core": "3.0.0-rc.2",
-		"@markuplint/ml-spec": "3.0.0-rc.2",
-		"@markuplint/types": "3.0.0-rc.2",
+		"@markuplint/html-spec": "3.0.0-rc.4",
+		"@markuplint/ml-core": "3.0.0-rc.4",
+		"@markuplint/ml-spec": "3.0.0-rc.4",
+		"@markuplint/types": "3.0.0-rc.4",
 		"@ungap/structured-clone": "^1.0.1",
 		"debug": "^4.3.4",
 		"html-entities": "^2.3.3",
@@ -29,5 +32,5 @@
 	"devDependencies": {
 		"@types/debug": "^4.1.7"
 	},
-	"gitHead": "27a5c8d136f4b0cf8452552cff529dd0a4db6bba"
+	"gitHead": "6187135f1c3522eee13cc1e7e1e8501b0fbfa876"
 }