@markuplint/svelte-parser 4.5.0 → 4.6.0

package/lib/parser.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="svelte" />
 import type { SvelteNode } from './svelte-parser/index.js';
-import type { MLASTParentNode, MLASTPreprocessorSpecificBlock } from '@markuplint/ml-ast';
+import type { MLASTParentNode, MLASTPreprocessorSpecificBlock, MLASTPreprocessorSpecificBlockConditionalType } from '@markuplint/ml-ast';
 import type { ChildToken, ParseOptions, Token } from '@markuplint/parser-utils';
 import { ParserError, Parser } from '@markuplint/parser-utils';
 declare class SvelteParser extends Parser<SvelteNode> {
@@ -16,7 +16,7 @@ declare class SvelteParser extends Parser<SvelteNode> {
     nodeize(originNode: SvelteNode, parentNode: MLASTParentNode | null, depth: number): readonly import("@markuplint/ml-ast").MLASTNodeTreeItem[];
     visitPsBlock(token: ChildToken & {
         readonly nodeName: string;
-    }, childNodes?: readonly SvelteNode[]): readonly [MLASTPreprocessorSpecificBlock];
+    }, childNodes?: readonly SvelteNode[], conditionalType?: MLASTPreprocessorSpecificBlockConditionalType): readonly [MLASTPreprocessorSpecificBlock];
     visitChildren(children: readonly SvelteNode[], parentNode: MLASTParentNode | null): never[];
     visitAttr(token: Token): (import("@markuplint/ml-ast").MLASTSpreadAttr & {
         __rightText?: string | undefined;

package/lib/parser.js

@@ -121,8 +121,8 @@ class SvelteParser extends Parser {
             }
         }
     }
-    visitPsBlock(token, childNodes = []) {
-        const nodes = super.visitPsBlock(token, childNodes);
+    visitPsBlock(token, childNodes = [], conditionalType = null) {
+        const nodes = super.visitPsBlock(token, childNodes, conditionalType);
         const block = nodes.at(0);
         if (!block || block.type !== 'psblock') {
             throw new ParserError('Parse error', token);
@@ -213,7 +213,12 @@ class SvelteParser extends Parser {
                     depth: token.depth,
                     parentNode: token.parentNode,
                     nodeName: ifElseBlock.nodeName,
-                }, ifElseBlock.children)[0];
+                }, ifElseBlock.children, {
+                    if: 'if',
+                    elseif: 'if:elseif',
+                    else: 'if:else',
+                    '/if': 'end',
+                }[ifElseBlock.nodeName])[0];
                 expressions.push(expression);
             }
             return expressions;
@@ -231,16 +236,21 @@ class SvelteParser extends Parser {
                     if (!['IfBlock', 'ElseBlock'].includes(node.type)) {
                         break;
                     }
-                    const type = node.elseif ? 'elseif' : 'else';
+                    const type = node.elseif ? 'if:elseif' : 'if:else';
                     nodeList.set(node, type);
                     node = node.else ?? node.children?.[0] ?? null;
                 }
                 continue;
             }
-            let type = prop || blockType;
-            if (prop === 'pending') {
-                type = 'await';
-            }
+            const typeMap = {
+                if: 'if',
+                else: 'if:else',
+                each: 'each',
+                pending: 'await',
+                then: 'await:then', // eslint-disable-line unicorn/no-thenable
+                catch: 'await:catch',
+            };
+            const type = typeMap[prop || blockType] ?? null;
             nodeList.set(node, type);
         }
         let lastChild = null;
@@ -252,15 +262,17 @@ class SvelteParser extends Parser {
                 start = originBlockNode.start;
             }
             end = node.children?.[0]?.start ?? end;
-            if (type === 'else' && originBlockNode.type === 'EachBlock') {
+            if (type === 'if:else' && originBlockNode.type === 'EachBlock') {
+                type = 'each:empty';
                 start = lastChild?.end ?? start;
             }
-            if (['else', 'elseif'].includes(type) && originBlockNode.type === 'IfBlock') {
+            if (['if:else', 'if:elseif'].includes(type) &&
+                originBlockNode.type === 'IfBlock') {
                 start = lastChild?.end ?? start;
             }
             const tag = this.sliceFragment(start, end);
-            if (type === 'else' && node.type === 'ElseBlock' && node.children?.[0]?.type === 'IfBlock') {
-                type = 'elseif';
+            if (type === 'if:else' && node.type === 'ElseBlock' && node.children?.[0]?.type === 'IfBlock') {
+                type = 'if:elseif';
             }
             if (node.children && Array.isArray(node.children)) {
                 lastChild = node.children.at(-1) ?? null;
@@ -272,8 +284,8 @@ class SvelteParser extends Parser {
                 ...tag,
                 depth: token.depth,
                 parentNode: token.parentNode,
-                nodeName: type,
-            }, node.children)[0];
+                nodeName: type ?? blockType,
+            }, node.children, type)[0];
             expressions.push(expression);
         }
         const lastText = this.sliceFragment(lastChild?.end ?? originBlockNode.end, originBlockNode.end);
@@ -287,7 +299,7 @@ class SvelteParser extends Parser {
                     depth: token.depth,
                     parentNode: token.parentNode,
                     nodeName: '/' + blockType,
-                })[0];
+                }, [], 'end')[0];
                 expressions.push(expression);
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/svelte-parser",
-	"version": "4.5.0",
+	"version": "4.6.0",
 	"description": "Svelte parser for markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -24,10 +24,10 @@
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@markuplint/html-parser": "4.5.0",
-		"@markuplint/ml-ast": "4.2.0",
-		"@markuplint/parser-utils": "4.5.0",
-		"svelte": "4.2.14"
+		"@markuplint/html-parser": "4.6.0",
+		"@markuplint/ml-ast": "4.3.0",
+		"@markuplint/parser-utils": "4.6.0",
+		"svelte": "4.2.15"
 	},
-	"gitHead": "d5c8786b0dbbd82cdd89018dd57941d62bbe8d06"
+	"gitHead": "b8d7bae9bdcdad63ff79abe21b88be12abde3633"
 }