@markuplint/svelte-parser 4.6.2 → 4.6.3

package/CHANGELOG.md

@@ -3,6 +3,10 @@
 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/svelte-parser@4.6.2...@markuplint/svelte-parser@4.6.3) (2024-05-28)
+
+**Note:** Version bump only for package @markuplint/svelte-parser
+
 ## [4.6.2](https://github.com/markuplint/markuplint/compare/@markuplint/svelte-parser@4.6.1...@markuplint/svelte-parser@4.6.2) (2024-05-12)
 
 **Note:** Version bump only for package @markuplint/svelte-parser

package/lib/parse-block.d.ts

@@ -0,0 +1,8 @@
+/// <reference types="svelte" />
+import type { SvelteParser } from './parser.js';
+import type { ChildToken, Token } from '@markuplint/parser-utils';
+import type { Block } from 'svelte/compiler';
+export declare function parseBlock(parser: SvelteParser, token: ChildToken, originBlockNode: Block): {
+    openToken: Token;
+    closeToken: Token;
+};

package/lib/parse-block.js

@@ -0,0 +1,47 @@
+export function parseBlock(
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+parser, token, 
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+originBlockNode) {
+    const range = token.raw;
+    /**
+     * `{#xxx}...{:xxx}...{/xxx}`
+     *             find___^
+     */
+    // eslint-disable-next-line regexp/strict
+    const eachCloseStartIndex = range.match(/{\s*\/[a-z]+\s*}$/)?.index;
+    if (eachCloseStartIndex == null) {
+        throw new SyntaxError('Block close tag not found');
+    }
+    /**
+     * `{/xxx}`
+     */
+    const closeToken = parser.sliceFragment(token.startOffset + eachCloseStartIndex, originBlockNode.end);
+    const fragment = originBlockNode.type === 'IfBlock'
+        ? originBlockNode.consequent.nodes
+        : originBlockNode.type === 'AwaitBlock'
+            ? originBlockNode.pending?.nodes
+            : originBlockNode.type === 'KeyBlock'
+                ? originBlockNode.fragment.nodes
+                : originBlockNode.body.nodes;
+    const fragStart = fragment?.at(0)?.start;
+    const fragEnd = fragment?.at(-1)?.end;
+    /**
+     * This token does not guarantee an open tag.
+     * For example, it might include `:then` or `:else`.
+     * Therefore, this variable is not used in
+     * `EachBlock` or `AwaitBlock`.
+     * It is only used in `KeyBlock` and `SnippetBlock`.
+     */
+    let openToken;
+    if (fragStart != null && fragEnd != null) {
+        openToken = parser.sliceFragment(token.startOffset, fragStart);
+    }
+    else {
+        openToken = parser.sliceFragment(token.startOffset, eachCloseStartIndex);
+    }
+    return {
+        openToken,
+        closeToken,
+    };
+}

package/lib/parse-blokc.d.ts

@@ -0,0 +1,8 @@
+/// <reference types="svelte" />
+import type { SvelteParser } from './parser.js';
+import type { ChildToken, Token } from '@markuplint/parser-utils';
+import type { Block } from 'svelte/compiler';
+export declare function parseBlock(parser: SvelteParser, token: ChildToken, originBlockNode: Block): {
+    openToken: Token;
+    closeToken: Token;
+};

package/lib/parse-blokc.js

@@ -0,0 +1,47 @@
+export function parseBlock(
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+parser, token, 
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+originBlockNode) {
+    const range = token.raw;
+    /**
+     * `{#xxx}...{:xxx}...{/xxx}`
+     *             find___^
+     */
+    // eslint-disable-next-line regexp/strict
+    const eachCloseStartIndex = range.match(/{\s*\/[a-z]+\s*}$/)?.index;
+    if (eachCloseStartIndex == null) {
+        throw new SyntaxError('Block close tag not found');
+    }
+    /**
+     * `{/xxx}`
+     */
+    const closeToken = parser.sliceFragment(token.startOffset + eachCloseStartIndex, originBlockNode.end);
+    const fragment = originBlockNode.type === 'IfBlock'
+        ? originBlockNode.consequent.nodes
+        : originBlockNode.type === 'AwaitBlock'
+            ? originBlockNode.pending?.nodes
+            : originBlockNode.type === 'KeyBlock'
+                ? originBlockNode.fragment.nodes
+                : originBlockNode.body.nodes;
+    const fragStart = fragment?.at(0)?.start;
+    const fragEnd = fragment?.at(-1)?.end;
+    /**
+     * This token does not guarantee an open tag.
+     * For example, it might include `:then` or `:else`.
+     * Therefore, this variable is not used in
+     * `EachBlock` or `AwaitBlock`.
+     * It is only used in `KeyBlock` and `SnippetBlock`.
+     */
+    let openToken;
+    if (fragStart != null && fragEnd != null) {
+        openToken = parser.sliceFragment(token.startOffset, fragStart);
+    }
+    else {
+        openToken = parser.sliceFragment(token.startOffset, eachCloseStartIndex);
+    }
+    return {
+        openToken,
+        closeToken,
+    };
+}

package/lib/parser.d.ts

@@ -16,6 +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;
+        readonly isFragment: boolean;
     }, childNodes?: readonly SvelteNode[], conditionalType?: MLASTPreprocessorSpecificBlockConditionalType): readonly [MLASTPreprocessorSpecificBlock];
     visitChildren(children: readonly SvelteNode[], parentNode: MLASTParentNode | null): never[];
     visitAttr(token: Token): (import("@markuplint/ml-ast").MLASTSpreadAttr & {

package/lib/parser.js

@@ -75,6 +75,7 @@ class SvelteParser extends Parser {
                     depth,
                     parentNode,
                     nodeName: 'MustacheTag',
+                    isFragment: false,
                 });
             }
             case 'InlineComponent':
@@ -213,6 +214,7 @@ class SvelteParser extends Parser {
                     depth: token.depth,
                     parentNode: token.parentNode,
                     nodeName: ifElseBlock.nodeName,
+                    isFragment: false,
                 }, ifElseBlock.children, {
                     if: 'if',
                     elseif: 'if:elseif',
@@ -285,6 +287,7 @@ class SvelteParser extends Parser {
                 depth: token.depth,
                 parentNode: token.parentNode,
                 nodeName: type ?? blockType,
+                isFragment: false,
             }, node.children, type)[0];
             expressions.push(expression);
         }
@@ -299,6 +302,7 @@ class SvelteParser extends Parser {
                     depth: token.depth,
                     parentNode: token.parentNode,
                     nodeName: '/' + blockType,
+                    isFragment: false,
                 }, [], 'end')[0];
                 expressions.push(expression);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/svelte-parser",
-	"version": "4.6.2",
+	"version": "4.6.3",
 	"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.6.2",
-		"@markuplint/ml-ast": "4.3.1",
-		"@markuplint/parser-utils": "4.6.2",
-		"svelte": "4.2.16"
+		"@markuplint/html-parser": "4.6.3",
+		"@markuplint/ml-ast": "4.4.0",
+		"@markuplint/parser-utils": "4.6.3",
+		"svelte": "4.2.17"
 	},
-	"gitHead": "ca7dc6bf40eac4f2813e492878f889eb77751a70"
+	"gitHead": "bf70c41b1d2497e85b73c9ecd5551eb522e6bdfc"
 }