@markuplint/ml-core 4.7.2 → 4.8.0

package/CHANGELOG.md

@@ -3,6 +3,13 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.8.0](https://github.com/markuplint/markuplint/compare/@markuplint/ml-core@4.7.2...@markuplint/ml-core@4.8.0) (2024-05-28)
+
+### Features
+
+- **ml-core:** change `childNodes` to no longer return fragment nodes ([bc41f13](https://github.com/markuplint/markuplint/commit/bc41f13c15ee61616ab9673ed81df52d19786c31))
+- **ml-core:** separate getter `childNodes` and method `getPureChildNodes()` ([a98d22c](https://github.com/markuplint/markuplint/commit/a98d22c5bd291158ceae21c52580136e49bb938b))
+
 ## [4.7.2](https://github.com/markuplint/markuplint/compare/@markuplint/ml-core@4.7.1...@markuplint/ml-core@4.7.2) (2024-05-12)
 
 **Note:** Version bump only for package @markuplint/ml-core

package/lib/ml-dom/helper/create-node.js

@@ -37,6 +37,7 @@ document) {
                         tagOpenChar: '',
                         tagCloseChar: '',
                         isGhost: false,
+                        isFragment: false,
                     }, document);
                 }
                 default: {

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

@@ -4,7 +4,7 @@ export class MLBlock extends MLNode {
     constructor(astNode, 
     // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
     document) {
-        super(astNode, document);
+        super(astNode, document, astNode.isFragment);
         // TODO:
         this.isTransparent = true;
         this.conditionalType = astNode.conditionalType;

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

@@ -28,7 +28,7 @@ export class MLElement extends MLParentNode {
     constructor(astNode, 
     // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
     document) {
-        super(astNode, document);
+        super(astNode, document, astNode.isFragment);
         _MLElement_attributes.set(this, void 0);
         _MLElement_fixedNodeName.set(this, void 0);
         _MLElement_getChildElementsAndTextNodeWithoutWhitespacesCache.set(this, null);
@@ -2339,7 +2339,7 @@ export class MLElement extends MLParentNode {
      * @implements `@markuplint/ml-core` API: `MLElement`
      */
     hasMutableChildren(attr = false) {
-        for (const child of this.childNodes) {
+        for (const child of this.getPureChildNodes()) {
             if (child.is(child.MARKUPLINT_PREPROCESSOR_BLOCK)) {
                 if (child.conditionalType) {
                     continue;

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

@@ -107,12 +107,16 @@ export declare abstract class MLNode<T extends RuleConfigValue, O extends PlainD
      * @see https://dom.spec.whatwg.org/#interface-node
      */
     readonly TEXT_NODE = 3;
+    /**
+     * Returns child nodes when parent node access by `childNodes` property.
+     */
+    readonly isFragment: boolean;
     /**
      *
      */
     readonly rules: Record<string, AnyRule>;
     protected _astToken: A;
-    constructor(astNode: A, document: MLDocument<T, O>);
+    constructor(astNode: A, document: MLDocument<T, O>, isFragment?: boolean);
     /**
      * **IT THROWS AN ERROR WHEN CALLING THIS.**
      *
@@ -390,6 +394,11 @@ export declare abstract class MLNode<T extends RuleConfigValue, O extends PlainD
      * @returns An array of matched child nodes.
      */
     findSubsequentNodes(selector?: string): MLChildNode<T, O>[];
+    /**
+     *
+     * @implements DOM API: `MLNode`
+     */
+    getPureChildNodes(): NodeListOf<MLChildNode<T, O>>;
     /**
      * **IT THROWS AN ERROR WHEN CALLING THIS.**
      *

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

@@ -9,7 +9,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _MLNode_childNodes, _MLNode_ownerDocument, _MLNode_prevToken, _MLNode_conditionalChildNodes;
+var _MLNode_pureChildNodesCache, _MLNode_ownerDocument, _MLNode_prevToken, _MLNode_conditionalChildNodes;
 import { branchesToPatterns } from '@markuplint/shared';
 import { MLToken } from '../token/token.js';
 import { isChildNode } from './child-node.js';
@@ -19,7 +19,7 @@ import { UnexpectedCallError } from './unexpected-call-error.js';
 export class MLNode extends MLToken {
     constructor(astNode, 
     // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
-    document) {
+    document, isFragment) {
         super(astNode);
         /**
          * @implements DOM API: `Node`
@@ -121,7 +121,7 @@ export class MLNode extends MLToken {
         /**
          * Cached `childNodes` property
          */
-        _MLNode_childNodes.set(this, void 0);
+        _MLNode_pureChildNodesCache.set(this, void 0);
         /**
          * Owner `Document`
          *
@@ -143,6 +143,7 @@ export class MLNode extends MLToken {
         this.rules = {};
         this._astToken = astNode;
         __classPrivateFieldSet(this, _MLNode_ownerDocument, document, "f");
+        this.isFragment = !!isFragment;
         nodeStore.setNode(astNode, this);
     }
     /**
@@ -163,41 +164,14 @@ export class MLNode extends MLToken {
      * @see https://dom.spec.whatwg.org/#ref-for-dom-node-childnodes%E2%91%A0
      */
     get childNodes() {
-        if (__classPrivateFieldGet(this, _MLNode_childNodes, "f") != null) {
-            return __classPrivateFieldGet(this, _MLNode_childNodes, "f");
-        }
-        if (this.is(this.DOCUMENT_NODE)) {
-            const childNodes = [];
-            for (const node of this.nodeList) {
-                if (isChildNode(node) && (node.parentNode === this || node.parentNode === null)) {
-                    childNodes.push(node);
-                }
+        const pureChildNodes = [...this.getPureChildNodes()];
+        const childNodes = pureChildNodes.flatMap(node => {
+            if (node.isFragment) {
+                return [...node.childNodes];
             }
-            // Cache
-            __classPrivateFieldSet(this, _MLNode_childNodes, toNodeList(childNodes), "f");
-            return __classPrivateFieldGet(this, _MLNode_childNodes, "f");
-        }
-        if (this.is(this.DOCUMENT_FRAGMENT_NODE) ||
-            this.is(this.ELEMENT_NODE) ||
-            this.is(this.MARKUPLINT_PREPROCESSOR_BLOCK)) {
-            const astChildren = 
-            // @ts-ignore
-            this._astToken?.childNodes?.filter(node => {
-                if (node.type === 'endtag' || node.type === 'invalid') {
-                    return null;
-                }
-                return node;
-            }) ?? [];
-            const childNodes = astChildren
-                .map(node => nodeStore.getNode(node))
-                .filter(node => isChildNode(node));
-            // Cache
-            __classPrivateFieldSet(this, _MLNode_childNodes, toNodeList(childNodes), "f");
-            return __classPrivateFieldGet(this, _MLNode_childNodes, "f");
-        }
-        // Cache
-        __classPrivateFieldSet(this, _MLNode_childNodes, toNodeList([]), "f");
-        return __classPrivateFieldGet(this, _MLNode_childNodes, "f");
+            return [node];
+        });
+        return toNodeList(childNodes);
     }
     /**
      * The first node that may be `Element`, `Text`, and `CommentNode`.
@@ -690,6 +664,47 @@ export class MLNode extends MLToken {
         }
         return matched;
     }
+    /**
+     *
+     * @implements DOM API: `MLNode`
+     */
+    getPureChildNodes() {
+        if (__classPrivateFieldGet(this, _MLNode_pureChildNodesCache, "f") != null) {
+            return __classPrivateFieldGet(this, _MLNode_pureChildNodesCache, "f");
+        }
+        if (this.is(this.DOCUMENT_NODE)) {
+            const childNodes = [];
+            for (const node of this.nodeList) {
+                if (isChildNode(node) && (node.parentNode === this || node.parentNode === null)) {
+                    childNodes.push(node);
+                }
+            }
+            // Cache
+            __classPrivateFieldSet(this, _MLNode_pureChildNodesCache, toNodeList(childNodes), "f");
+            return __classPrivateFieldGet(this, _MLNode_pureChildNodesCache, "f");
+        }
+        if (this.is(this.DOCUMENT_FRAGMENT_NODE) ||
+            this.is(this.ELEMENT_NODE) ||
+            this.is(this.MARKUPLINT_PREPROCESSOR_BLOCK)) {
+            const astChildren = 
+            // @ts-ignore
+            this._astToken?.childNodes?.filter(node => {
+                if (node.type === 'endtag' || node.type === 'invalid') {
+                    return null;
+                }
+                return node;
+            }) ?? [];
+            const childNodes = astChildren
+                .map(node => nodeStore.getNode(node))
+                .filter(node => isChildNode(node));
+            // Cache
+            __classPrivateFieldSet(this, _MLNode_pureChildNodesCache, toNodeList(childNodes), "f");
+            return __classPrivateFieldGet(this, _MLNode_pureChildNodesCache, "f");
+        }
+        // Cache
+        __classPrivateFieldSet(this, _MLNode_pureChildNodesCache, toNodeList([]), "f");
+        return __classPrivateFieldGet(this, _MLNode_pureChildNodesCache, "f");
+    }
     /**
      * **IT THROWS AN ERROR WHEN CALLING THIS.**
      *
@@ -844,7 +859,7 @@ export class MLNode extends MLToken {
     resetChildren(
     // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
     childNodes) {
-        __classPrivateFieldSet(this, _MLNode_childNodes, childNodes ?? __classPrivateFieldGet(this, _MLNode_childNodes, "f"), "f");
+        __classPrivateFieldSet(this, _MLNode_pureChildNodesCache, childNodes ?? __classPrivateFieldGet(this, _MLNode_pureChildNodesCache, "f"), "f");
     }
 }
-_MLNode_childNodes = new WeakMap(), _MLNode_ownerDocument = new WeakMap(), _MLNode_prevToken = new WeakMap(), _MLNode_conditionalChildNodes = new WeakMap();
+_MLNode_pureChildNodesCache = new WeakMap(), _MLNode_ownerDocument = new WeakMap(), _MLNode_prevToken = new WeakMap(), _MLNode_conditionalChildNodes = new WeakMap();

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/ml-core",
-	"version": "4.7.2",
+	"version": "4.8.0",
 	"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.1",
-		"@markuplint/html-parser": "4.6.2",
-		"@markuplint/html-spec": "4.7.2",
+		"@markuplint/config-presets": "4.5.2",
+		"@markuplint/html-parser": "4.6.3",
+		"@markuplint/html-spec": "4.8.0",
 		"@markuplint/i18n": "4.5.0",
-		"@markuplint/ml-ast": "4.3.1",
-		"@markuplint/ml-config": "4.6.2",
-		"@markuplint/ml-spec": "4.6.0",
-		"@markuplint/parser-utils": "4.6.2",
-		"@markuplint/selector": "4.6.2",
-		"@markuplint/shared": "4.4.0",
+		"@markuplint/ml-ast": "4.4.0",
+		"@markuplint/ml-config": "4.7.0",
+		"@markuplint/ml-spec": "4.6.1",
+		"@markuplint/parser-utils": "4.6.3",
+		"@markuplint/selector": "4.6.3",
+		"@markuplint/shared": "4.4.1",
 		"@types/debug": "4.1.12",
 		"debug": "4.3.4",
 		"is-plain-object": "5.0.0",
-		"type-fest": "4.18.2"
+		"type-fest": "4.18.3"
 	},
-	"gitHead": "ca7dc6bf40eac4f2813e492878f889eb77751a70"
+	"gitHead": "bf70c41b1d2497e85b73c9ecd5551eb522e6bdfc"
 }