@markuplint/parser-utils 4.6.2 → 4.6.3

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.6.3](https://github.com/markuplint/markuplint/compare/@markuplint/parser-utils@4.6.2...@markuplint/parser-utils@4.6.3) (2024-05-28)
+
+### Bug Fixes
+
+- **parser-utils:** correct length calculation for surrogate pairs in validScript ([37a712c](https://github.com/markuplint/markuplint/commit/37a712c2836bd701c680c1263669e105c0a8dea5))
+
 ## [4.6.2](https://github.com/markuplint/markuplint/compare/@markuplint/parser-utils@4.6.1...@markuplint/parser-utils@4.6.2) (2024-05-12)
 
 **Note:** Version bump only for package @markuplint/parser-utils

package/lib/attr-tokenizer.js

@@ -129,7 +129,8 @@ export function attrTokenizer(raw, quoteSet = defaultQuoteSet, startState = Attr
                     const raw = char + chars.join('');
                     const { validScript } = safeScriptParser(raw, parser);
                     attrValue += validScript;
-                    chars.splice(0, validScript.length - 1);
+                    const length = [...validScript].length;
+                    chars.splice(0, length - 1);
                     break;
                 }
                 attrValue += char;

package/lib/ignore-block.js

@@ -79,6 +79,7 @@ ignoreBlock, throwErrorWhenTagHasUnresolved = true) {
                 parentNode: node.parentNode,
                 childNodes: [],
                 isBogus: false,
+                isFragment: false, // TODO: Case by case
             };
             replacementChildNodes.push(psNode);
         }
@@ -109,6 +110,7 @@ ignoreBlock, throwErrorWhenTagHasUnresolved = true) {
                 parentNode: node.parentNode,
                 childNodes: [],
                 isBogus: false,
+                isFragment: false, // TODO: Case by case
             };
             replacementChildNodes.push(psNode);
             if (below) {

package/lib/parser.d.ts

@@ -71,6 +71,7 @@ export declare abstract class Parser<Node extends {} = {}, State extends unknown
     }): readonly MLASTNodeTreeItem[];
     visitPsBlock(token: ChildToken & {
         readonly nodeName: string;
+        readonly isFragment: boolean;
     }, childNodes?: readonly Node[], conditionalType?: MLASTPreprocessorSpecificBlockConditionalType, originBlockNode?: Node): readonly MLASTNodeTreeItem[];
     visitChildren(children: readonly Node[], parentNode: MLASTParentNode | null): readonly MLASTNodeTreeItem[];
     visitSpreadAttr(token: Token): MLASTSpreadAttr | null;

package/lib/parser.js

@@ -135,6 +135,7 @@ export class Parser {
                     parentNode: null,
                     raw,
                     nodeName: 'front-matter',
+                    isFragment: false,
                 })[0];
                 if (!fmNode) {
                     throw new ParserError('Unexpected front matter', firstTextNode ?? token);
@@ -286,6 +287,7 @@ export class Parser {
                 tagCloseChar: '',
                 tagOpenChar: '',
                 isGhost: true,
+                isFragment: false,
                 ...overwriteProps,
             };
             const siblings = this.visitChildren(childNodes, startTag);
@@ -975,9 +977,10 @@ _Parser_booleanish = new WeakMap(), _Parser_defaultState = new WeakMap(), _Parse
         };
     }
     const tagToken = this.createToken(rawCodeFragment, tagStartOffset, tagStartLine, tagStartCol);
+    const isFragment = tagName === '';
     const commons = {
         depth,
-        nodeName: tagName || '#jsx-fragment',
+        nodeName: isFragment ? '#jsx-fragment' : tagName,
         parentNode: null,
     };
     const tag = isOpenTag
@@ -994,6 +997,7 @@ _Parser_booleanish = new WeakMap(), _Parser_defaultState = new WeakMap(), _Parse
             tagCloseChar: selfClosingSolidusChar + '>',
             selfClosingSolidus,
             isGhost: false,
+            isFragment,
         }
         : {
             ...tagToken,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/parser-utils",
-	"version": "4.6.2",
+	"version": "4.6.3",
 	"description": "Utility module for markuplint parser plugin",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -27,17 +27,17 @@
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@markuplint/ml-ast": "4.3.1",
-		"@markuplint/ml-spec": "4.6.0",
-		"@markuplint/types": "4.5.0",
+		"@markuplint/ml-ast": "4.4.0",
+		"@markuplint/ml-spec": "4.6.1",
+		"@markuplint/types": "4.5.1",
 		"@types/uuid": "9.0.8",
 		"debug": "4.3.4",
 		"espree": "10.0.1",
-		"type-fest": "4.18.2",
+		"type-fest": "4.18.3",
 		"uuid": "9.0.1"
 	},
 	"devDependencies": {
-		"@typescript-eslint/typescript-estree": "7.8.0"
+		"@typescript-eslint/typescript-estree": "7.11.0"
 	},
-	"gitHead": "ca7dc6bf40eac4f2813e492878f889eb77751a70"
+	"gitHead": "bf70c41b1d2497e85b73c9ecd5551eb522e6bdfc"
 }