@markuplint/ml-core 4.11.0 → 4.12.1

package/CHANGELOG.md

@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.12.1](https://github.com/markuplint/markuplint/compare/@markuplint/ml-core@4.12.0...@markuplint/ml-core@4.12.1) (2025-02-11)
+
+**Note:** Version bump only for package @markuplint/ml-core
+
+# [4.12.0](https://github.com/markuplint/markuplint/compare/@markuplint/ml-core@4.11.0...@markuplint/ml-core@4.12.0) (2025-02-04)
+
+### Bug Fixes
+
+- **ml-core:** fix to match pretended element type selectors ([3f6d139](https://github.com/markuplint/markuplint/commit/3f6d1395ca6aab3698bfde771e8ba7086acb83c7))
+
+### Features
+
+- **ml-core:** add `matchMLSelector` method to Element ([cd822d6](https://github.com/markuplint/markuplint/commit/cd822d6f3f7b899ffbc03646337cb018d72ce5e7))
+
 # [4.11.0](https://github.com/markuplint/markuplint/compare/@markuplint/ml-core@4.10.5...@markuplint/ml-core@4.11.0) (2024-12-04)
 
 ### Features

package/lib/ml-core.d.ts

@@ -10,7 +10,7 @@ export type MLCoreParams = {
 export declare class MLCore {
     #private;
     constructor({ parser, sourceCode, ruleset, rules, locale, schemas, parserOptions, severity, pretenders, filename, debug, configErrors, }: MLCoreParams);
-    get document(): Document<RuleConfigValue, PlainData> | ParserError;
+    get document(): ParserError | Document<RuleConfigValue, PlainData>;
     setCode(sourceCode: string): void;
     update({ parser, ruleset, rules, locale, schemas, parserOptions, configErrors }: Partial<MLFabric>): void;
     verify(fix?: boolean): Promise<Violation[]>;

package/lib/ml-dom/node/document.js

@@ -13,7 +13,7 @@ var _MLDocument_filename, _MLDocument_tokenList;
 import { exchangeValueOnRule, mergeRule } from '@markuplint/ml-config';
 import { schemaToSpec, getAccname, getComputedRole, mayBeFocusable, getComputedAriaProps, isExposed, ARIA_RECOMMENDED_VERSION, } from '@markuplint/ml-spec';
 import { ConfigParserError } from '@markuplint/parser-utils';
-import { InvalidSelectorError, matchSelector } from '@markuplint/selector';
+import { InvalidSelectorError } from '@markuplint/selector';
 import { log as coreLog } from '../../debug.js';
 import { createNode } from '../helper/create-node.js';
 import { nodeListToDebugMaps } from '../helper/debug.js';
@@ -2259,7 +2259,7 @@ export class MLDocument extends MLParentNode {
                     continue;
                 }
                 const selector = nodeRule.selector ?? nodeRule.regexSelector;
-                const matches = matchSelector(selectorTarget, selector);
+                const matches = selectorTarget.matchMLSelector(selector);
                 if (!matches.matched) {
                     continue;
                 }
@@ -2302,7 +2302,7 @@ export class MLDocument extends MLParentNode {
                     if (selector == null) {
                         continue;
                     }
-                    const matches = matchSelector(selectorTarget, selector);
+                    const matches = selectorTarget.matchMLSelector(selector);
                     if (!matches.matched) {
                         continue;
                     }

package/lib/ml-dom/node/element.d.ts

@@ -4,8 +4,9 @@ import type { MLNode } from './node.js';
 import type { MLText } from './text.js';
 import type { ElementNodeType, PretenderContext } from './types.js';
 import type { ElementType, MLASTElement, NamespaceURI } from '@markuplint/ml-ast';
-import type { PlainData, Pretender, RuleConfigValue, RuleInfo } from '@markuplint/ml-config';
+import type { PlainData, Pretender, RegexSelector, RuleConfigValue, RuleInfo } from '@markuplint/ml-config';
 import type { ARIAVersion } from '@markuplint/ml-spec';
+import type { SelectorMatches } from '@markuplint/selector';
 import { MLToken } from '../token/token.js';
 import { MLAttr } from './attr.js';
 import { MLDomTokenList } from './dom-token-list.js';
@@ -1857,6 +1858,7 @@ export declare class MLElement<T extends RuleConfigValue, O extends PlainData =
      * @see https://dom.spec.whatwg.org/#ref-for-dom-element-matches%E2%91%A0
      */
     matches(selector: string, scope?: MLParentNode<T, O>): boolean;
+    matchMLSelector(selector: string | RegexSelector | undefined, scope?: MLParentNode<T, O>): SelectorMatches;
     /**
      * Pretenders Initialization
      */

package/lib/ml-dom/node/element.js

@@ -12,7 +12,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _MLElement_attributes, _MLElement_fixedNodeName, _MLElement_getChildElementsAndTextNodeWithoutWhitespacesCache, _MLElement_localName, _MLElement_normalizedAttrs, _MLElement_normalizedString;
 import { resolveNamespace } from '@markuplint/ml-spec';
-import { createSelector } from '@markuplint/selector';
+import { matchSelector } from '@markuplint/selector';
 import { getAccname } from '../helper/accname.js';
 import { after, before, nextElementSibling, previousElementSibling, remove, replaceWith, } from '../manipulations/child-node-methods.js';
 import { MLToken } from '../token/token.js';
@@ -2520,13 +2520,17 @@ export class MLElement extends MLParentNode {
     matches(selector, 
     // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
     scope) {
-        let matched = false;
-        const selectorMatcher = createSelector(selector, this.ownerMLDocument.specs);
+        return this.matchMLSelector(selector, scope).matched;
+    }
+    matchMLSelector(selector, 
+    // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+    scope) {
         if (this.pretenderContext?.type === 'pretender') {
-            matched = selectorMatcher.match(this, scope) !== false;
-        }
-        if (matched) {
-            return true;
+            // matched = selectorMatcher.match(this, scope) !== false;
+            const matched = matchSelector(this, selector, scope, this.ownerMLDocument.specs);
+            if (matched.matched) {
+                return matched;
+            }
         }
         let _pretender = null;
         // don't expose pretenders temporarily
@@ -2534,7 +2538,7 @@ export class MLElement extends MLParentNode {
             _pretender = this.pretenderContext;
             this.pretenderContext = null;
         }
-        matched = selectorMatcher.match(this, scope) !== false;
+        const matched = matchSelector(this, selector, scope, this.ownerMLDocument.specs);
         if (_pretender) {
             this.pretenderContext = _pretender;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/ml-core",
-	"version": "4.11.0",
+	"version": "4.12.1",
 	"description": "The core module of markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -28,20 +28,20 @@
 		"./lib/configs.js": "./lib/configs.browser.js"
 	},
 	"dependencies": {
-		"@markuplint/config-presets": "4.5.10",
-		"@markuplint/html-parser": "4.6.14",
-		"@markuplint/html-spec": "4.11.1",
+		"@markuplint/config-presets": "4.5.12",
+		"@markuplint/html-parser": "4.6.16",
+		"@markuplint/html-spec": "4.13.0",
 		"@markuplint/i18n": "4.6.0",
 		"@markuplint/ml-ast": "4.4.9",
-		"@markuplint/ml-config": "4.8.6",
-		"@markuplint/ml-spec": "4.9.1",
-		"@markuplint/parser-utils": "4.8.2",
-		"@markuplint/selector": "4.6.14",
+		"@markuplint/ml-config": "4.8.8",
+		"@markuplint/ml-spec": "4.9.3",
+		"@markuplint/parser-utils": "4.8.4",
+		"@markuplint/selector": "4.7.1",
 		"@markuplint/shared": "4.4.10",
 		"@types/debug": "4.1.12",
-		"debug": "4.3.7",
+		"debug": "4.4.0",
 		"is-plain-object": "5.0.0",
-		"type-fest": "4.30.0"
+		"type-fest": "4.34.1"
 	},
-	"gitHead": "2a067903214e5633bd9b77690613837ead9683c3"
+	"gitHead": "f9f6c415b8a3a231aac56181892bb393aeb8ae1a"
 }