@markuplint/svelte-parser 3.4.0 → 3.5.0

package/lib/attr.d.ts

@@ -1,10 +1,5 @@
 import type { SvelteDirective } from './svelte-parser';
 import type { MLASTAttr } from '@markuplint/ml-ast';
-export declare function attr(
-	attr: SvelteDirective,
-	rawHTML: string,
-):
-	| MLASTAttr
-	| {
-			__spreadAttr: true;
-	  };
+export declare function attr(attr: SvelteDirective, rawHTML: string): MLASTAttr | {
+    __spreadAttr: true;
+};

package/lib/attr.js

@@ -6,7 +6,9 @@ const html_parser_1 = require("@markuplint/html-parser");
 const parser_utils_1 = require("@markuplint/parser-utils");
 const directive_tokenizer_1 = tslib_1.__importDefault(require("./directive-tokenizer"));
 const specificBindDirective = ['bind:group', 'bind:this'];
-function attr(attr, rawHTML) {
+function attr(
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+attr, rawHTML) {
     const isShorthand = attr.value && Array.isArray(attr.value)
         ? attr.value.some((val) => val.type === 'AttributeShorthand')
         : false;

package/lib/directive-tokenizer.d.ts

@@ -1,8 +1,2 @@
 import type { MLASTHTMLAttr } from '@markuplint/ml-ast';
-export default function directiveTokenizer(
-	raw: string,
-	rawValue: string,
-	line: number,
-	col: number,
-	startOffset: number,
-): MLASTHTMLAttr;
+export default function directiveTokenizer(raw: string, rawValue: string, line: number, col: number, startOffset: number): MLASTHTMLAttr;

package/lib/index.d.ts

@@ -1,2 +1,2 @@
 export { parse } from './parse';
-export declare const endTag = 'xml';
+export declare const endTag = "xml";

package/lib/nodeize.d.ts

@@ -1,9 +1,3 @@
 import type { SvelteNode } from './svelte-parser';
 import type { MLASTNode, MLASTParentNode, ParserOptions } from '@markuplint/ml-ast';
-export declare function nodeize(
-	originNode: SvelteNode,
-	prevNode: MLASTNode | null,
-	parentNode: MLASTParentNode | null,
-	rawHtml: string,
-	options?: ParserOptions,
-): MLASTNode | MLASTNode[] | null;
+export declare function nodeize(originNode: SvelteNode, prevNode: MLASTNode | null, parentNode: MLASTParentNode | null, rawHtml: string, options?: ParserOptions): MLASTNode | MLASTNode[] | null;

package/lib/nodeize.js

@@ -4,8 +4,15 @@ exports.nodeize = void 0;
 const html_parser_1 = require("@markuplint/html-parser");
 const parser_utils_1 = require("@markuplint/parser-utils");
 const attr_1 = require("./attr");
+const parse_ctrl_block_1 = require("./parse-ctrl-block");
 const traverse_1 = require("./traverse");
-function nodeize(originNode, prevNode, parentNode, rawHtml, options) {
+function nodeize(
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+originNode, 
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+prevNode, 
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+parentNode, rawHtml, options) {
     var _a, _b, _c, _d;
     const nextNode = null;
     const { startOffset, endOffset, startLine, endLine, startCol, endCol, raw } = (0, parser_utils_1.sliceFragment)(rawHtml, originNode.start, originNode.end);
@@ -125,10 +132,11 @@ function nodeize(originNode, prevNode, parentNode, rawHtml, options) {
             return startTag;
         }
         case 'IfBlock': {
-            return solveCtrlBlock('if', originNode, raw, rawHtml, startOffset, parentNode, prevNode, nextNode, options);
+            const ifBlocks = (0, parse_ctrl_block_1.parseCtrlBlock)('if', originNode, raw, rawHtml, startOffset, parentNode, prevNode, nextNode, options);
+            return ifBlocks;
         }
         case 'EachBlock': {
-            return solveCtrlBlock('each', originNode, raw, rawHtml, startOffset, parentNode, prevNode, nextNode, options);
+            return (0, parse_ctrl_block_1.parseCtrlBlock)('each', originNode, raw, rawHtml, startOffset, parentNode, prevNode, nextNode, options);
         }
         case 'AwaitBlock': {
             const pendingNode = originNode.pending;
@@ -248,81 +256,3 @@ function nodeize(originNode, prevNode, parentNode, rawHtml, options) {
     }
 }
 exports.nodeize = nodeize;
-function solveCtrlBlock(ctrlName, originNode, raw, rawHtml, startOffset, parentNode, prevNode, nextNode, options) {
-    var _a, _b, _c, _d;
-    const children = originNode.children || [];
-    const reEndTag = new RegExp(`{/${ctrlName}}$`, 'i');
-    const startTagEndOffset = children.length
-        ? (_b = (_a = children[0]) === null || _a === void 0 ? void 0 : _a.start) !== null && _b !== void 0 ? _b : 0
-        : raw.replace(reEndTag, '').length + startOffset;
-    const startTagLocation = (0, parser_utils_1.sliceFragment)(rawHtml, startOffset, startTagEndOffset);
-    let endTag = null;
-    const endTagRawMatched = raw.match(reEndTag);
-    if (endTagRawMatched) {
-        const endTagRaw = endTagRawMatched[0];
-        const endTagStartOffset = originNode.end - endTagRaw.length;
-        const endTagEndOffset = originNode.end;
-        const endTagLocation = (0, parser_utils_1.sliceFragment)(rawHtml, endTagStartOffset, endTagEndOffset);
-        endTag = {
-            uuid: (0, parser_utils_1.uuid)(),
-            raw: endTagRaw,
-            startOffset: endTagStartOffset,
-            endOffset: endTagEndOffset,
-            startLine: endTagLocation.startLine,
-            endLine: endTagLocation.endLine,
-            startCol: endTagLocation.startCol,
-            endCol: endTagLocation.endCol,
-            nodeName: originNode.type,
-            type: 'psblock',
-            parentNode,
-            prevNode,
-            nextNode,
-            isFragment: false,
-            isGhost: false,
-        };
-    }
-    let elseTag = null;
-    if (originNode.else) {
-        const elseNode = originNode.else;
-        const elseTagStartOffset = children.length
-            ? (_d = (_c = children[children.length - 1]) === null || _c === void 0 ? void 0 : _c.end) !== null && _d !== void 0 ? _d : 0
-            : startTagLocation.endOffset;
-        const elseTagLocation = (0, parser_utils_1.sliceFragment)(rawHtml, elseTagStartOffset, elseNode.start);
-        elseTag = {
-            uuid: (0, parser_utils_1.uuid)(),
-            ...elseTagLocation,
-            nodeName: elseNode.type,
-            type: 'psblock',
-            parentNode,
-            prevNode,
-            nextNode,
-            isFragment: false,
-            isGhost: false,
-        };
-        if (elseNode.children) {
-            elseTag.childNodes = (0, traverse_1.traverse)(elseNode.children, elseTag, rawHtml, options);
-        }
-    }
-    const tag = {
-        uuid: (0, parser_utils_1.uuid)(),
-        ...startTagLocation,
-        nodeName: originNode.type,
-        type: 'psblock',
-        parentNode,
-        prevNode,
-        nextNode,
-        isFragment: false,
-        isGhost: false,
-    };
-    if (originNode.children) {
-        tag.childNodes = (0, traverse_1.traverse)(originNode.children, tag, rawHtml, options);
-    }
-    const tags = [tag];
-    if (elseTag) {
-        tags.push(elseTag);
-    }
-    if (endTag) {
-        tags.push(endTag);
-    }
-    return tags;
-}

package/lib/parse-ctrl-block.d.ts

@@ -0,0 +1,3 @@
+import type { SvelteNode } from './svelte-parser';
+import type { MLASTNode, MLASTParentNode, MLASTPreprocessorSpecificBlock, ParserOptions } from '@markuplint/ml-ast';
+export declare function parseCtrlBlock(ctrlName: 'if' | 'each', originNode: SvelteNode, raw: string, rawHtml: string, startOffset: number, parentNode: MLASTParentNode | null, prevNode: MLASTNode | null, nextNode: MLASTNode | null, options?: ParserOptions): MLASTPreprocessorSpecificBlock[];

package/lib/parse-ctrl-block.js

@@ -0,0 +1,181 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseCtrlBlock = void 0;
+const parser_utils_1 = require("@markuplint/parser-utils");
+const traverse_1 = require("./traverse");
+function parseCtrlBlock(ctrlName, 
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+originNode, raw, rawHtml, startOffset, 
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+parentNode, 
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+prevNode, 
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+nextNode, options) {
+    var _a, _b, _c, _d;
+    if (ctrlName === 'if') {
+        return parseIfBlock(originNode, raw, rawHtml, startOffset, originNode.start, parentNode, prevNode, nextNode, options);
+    }
+    const children = originNode.children || [];
+    const reEndTag = new RegExp('{/each}$', 'i');
+    const startTagEndOffset = children.length
+        ? (_b = (_a = children[0]) === null || _a === void 0 ? void 0 : _a.start) !== null && _b !== void 0 ? _b : 0
+        : raw.replace(reEndTag, '').length + startOffset;
+    const startTagLocation = (0, parser_utils_1.sliceFragment)(rawHtml, startOffset, startTagEndOffset);
+    const tag = {
+        uuid: (0, parser_utils_1.uuid)(),
+        ...startTagLocation,
+        nodeName: originNode.type,
+        type: 'psblock',
+        parentNode,
+        prevNode,
+        nextNode,
+        isFragment: false,
+        isGhost: false,
+    };
+    if (originNode.children) {
+        tag.childNodes = (0, traverse_1.traverse)(originNode.children, tag, rawHtml, options);
+    }
+    let elseTag = null;
+    if (originNode.else) {
+        const elseNode = originNode.else;
+        const elseTagStartOffset = children.length
+            ? (_d = (_c = children[children.length - 1]) === null || _c === void 0 ? void 0 : _c.end) !== null && _d !== void 0 ? _d : 0
+            : startTagLocation.endOffset;
+        const elseTagLocation = (0, parser_utils_1.sliceFragment)(rawHtml, elseTagStartOffset, elseNode.start);
+        elseTag = {
+            uuid: (0, parser_utils_1.uuid)(),
+            ...elseTagLocation,
+            nodeName: elseNode.type,
+            type: 'psblock',
+            parentNode,
+            prevNode,
+            nextNode,
+            isFragment: false,
+            isGhost: false,
+        };
+        if (elseNode.children) {
+            elseTag.childNodes = (0, traverse_1.traverse)(elseNode.children, elseTag, rawHtml, options);
+        }
+    }
+    let endTag = null;
+    const endTagRawMatched = raw.match(reEndTag);
+    if (endTagRawMatched) {
+        const endTagRaw = endTagRawMatched[0];
+        const endTagStartOffset = originNode.end - endTagRaw.length;
+        const endTagEndOffset = originNode.end;
+        const endTagLocation = (0, parser_utils_1.sliceFragment)(rawHtml, endTagStartOffset, endTagEndOffset);
+        endTag = {
+            uuid: (0, parser_utils_1.uuid)(),
+            raw: endTagRaw,
+            startOffset: endTagStartOffset,
+            endOffset: endTagEndOffset,
+            startLine: endTagLocation.startLine,
+            endLine: endTagLocation.endLine,
+            startCol: endTagLocation.startCol,
+            endCol: endTagLocation.endCol,
+            nodeName: originNode.type,
+            type: 'psblock',
+            parentNode,
+            prevNode,
+            nextNode,
+            isFragment: false,
+            isGhost: false,
+        };
+    }
+    const tags = [tag];
+    if (elseTag) {
+        tags.push(elseTag);
+    }
+    if (endTag) {
+        tags.push(endTag);
+    }
+    return tags;
+}
+exports.parseCtrlBlock = parseCtrlBlock;
+function parseIfBlock(
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+originNode, raw, rawHtml, statementStartOffset, tokenStartOffset, 
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+parentNode, 
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+prevNode, 
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+nextNode, options) {
+    var _a, _b, _c, _d, _e, _f, _g, _h;
+    const children = originNode.children || [];
+    const startTagEndOffset = (_b = (_a = children[0]) === null || _a === void 0 ? void 0 : _a.start) !== null && _b !== void 0 ? _b : tokenStartOffset;
+    const startTagLocation = (0, parser_utils_1.sliceFragment)(rawHtml, tokenStartOffset, startTagEndOffset);
+    const tag = {
+        uuid: (0, parser_utils_1.uuid)(),
+        ...startTagLocation,
+        nodeName: originNode.elseif ? 'ElseIfBlock' : originNode.type,
+        type: 'psblock',
+        parentNode,
+        prevNode,
+        nextNode,
+        isFragment: false,
+        isGhost: false,
+    };
+    if (originNode.children) {
+        tag.childNodes = (0, traverse_1.traverse)(originNode.children, tag, rawHtml, options);
+    }
+    const elseOrElseIfTags = [];
+    if (originNode.else) {
+        const elseNode = originNode.else;
+        const elseTagStartOffset = children.length
+            ? (_d = (_c = children[children.length - 1]) === null || _c === void 0 ? void 0 : _c.end) !== null && _d !== void 0 ? _d : 0
+            : startTagLocation.endOffset;
+        const elseTagLocation = (0, parser_utils_1.sliceFragment)(rawHtml, elseTagStartOffset, elseNode.start);
+        if (elseNode.children) {
+            if (elseNode.children.length === 1 && ((_e = elseNode.children[0]) === null || _e === void 0 ? void 0 : _e.type) === 'IfBlock') {
+                const elseIfTags = parseIfBlock(elseNode.children[0], elseTagLocation.raw, rawHtml, statementStartOffset, (_h = (_g = (_f = originNode.children) === null || _f === void 0 ? void 0 : _f[0]) === null || _g === void 0 ? void 0 : _g.end) !== null && _h !== void 0 ? _h : startTagLocation.endOffset, parentNode, null, null, options);
+                elseOrElseIfTags.push(...elseIfTags);
+            }
+            else {
+                const elseTag = {
+                    uuid: (0, parser_utils_1.uuid)(),
+                    ...elseTagLocation,
+                    nodeName: elseNode.type,
+                    type: 'psblock',
+                    parentNode,
+                    prevNode,
+                    nextNode,
+                    isFragment: false,
+                    isGhost: false,
+                };
+                elseTag.childNodes = (0, traverse_1.traverse)(elseNode.children, elseTag, rawHtml, options);
+                elseOrElseIfTags.push(elseTag);
+            }
+        }
+    }
+    if (originNode.elseif) {
+        return [tag, ...elseOrElseIfTags];
+    }
+    const endTagRawMatched = raw.match('{/if}');
+    if (!endTagRawMatched) {
+        throw new Error('Missing the end token `{/if}`');
+    }
+    const endTagRaw = endTagRawMatched[0];
+    const endTagStartOffset = originNode.end - endTagRaw.length;
+    const endTagEndOffset = originNode.end;
+    const endTagLocation = (0, parser_utils_1.sliceFragment)(rawHtml, endTagStartOffset, endTagEndOffset);
+    const endTag = {
+        uuid: (0, parser_utils_1.uuid)(),
+        raw: endTagRaw,
+        startOffset: endTagStartOffset,
+        endOffset: endTagEndOffset,
+        startLine: endTagLocation.startLine,
+        endLine: endTagLocation.endLine,
+        startCol: endTagLocation.startCol,
+        endCol: endTagLocation.endCol,
+        nodeName: originNode.type,
+        type: 'psblock',
+        parentNode,
+        prevNode,
+        nextNode,
+        isFragment: false,
+        isGhost: false,
+    };
+    return [tag, ...elseOrElseIfTags, endTag];
+}

package/lib/parse.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parse = void 0;
 const tslib_1 = require("tslib");
-const html_parser_1 = require("@markuplint/html-parser");
 const parser_utils_1 = require("@markuplint/parser-utils");
 const svelte_parser_1 = tslib_1.__importDefault(require("./svelte-parser"));
 const traverse_1 = require("./traverse");
@@ -43,7 +42,8 @@ const parse = (rawCode, options) => {
             parseError: err instanceof Error ? err.message : new Error(`${err}`).message,
         };
     }
-    const nodeList = (0, parser_utils_1.restoreNode)((0, html_parser_1.flattenNodes)((0, traverse_1.traverse)(ast, null, blocks.replaced, options), blocks.replaced), blocks);
+    const nodes = (0, traverse_1.traverse)(ast, null, blocks.replaced, options);
+    const nodeList = (0, parser_utils_1.restoreNode)((0, parser_utils_1.flattenNodes)(nodes, blocks.replaced), blocks);
     return {
         nodeList,
         isFragment: true,

package/lib/traverse.d.ts

@@ -1,8 +1,3 @@
 import type { SvelteNode } from './svelte-parser';
 import type { MLASTNode, MLASTParentNode, ParserOptions } from '@markuplint/ml-ast';
-export declare function traverse(
-	astNodes: SvelteNode[],
-	parentNode: MLASTParentNode | null | undefined,
-	rawHtml: string,
-	options?: ParserOptions,
-): MLASTNode[];
+export declare function traverse(astNodes: readonly SvelteNode[], parentNode: MLASTParentNode | null | undefined, rawHtml: string, options?: ParserOptions): MLASTNode[];

package/lib/traverse.js

@@ -2,7 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.traverse = void 0;
 const nodeize_1 = require("./nodeize");
-function traverse(astNodes, parentNode = null, rawHtml, options) {
+function traverse(
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
+astNodes, parentNode = null, rawHtml, options) {
     const nodeList = [];
     let prevNode = null;
     for (const astNode of astNodes) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/svelte-parser",
-	"version": "3.4.0",
+	"version": "3.5.0",
 	"description": "Svelte parser for markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -16,11 +16,11 @@
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@markuplint/html-parser": "3.4.0",
-		"@markuplint/ml-ast": "3.0.0",
-		"@markuplint/parser-utils": "3.4.0",
-		"svelte": "^3.55.0",
+		"@markuplint/html-parser": "3.5.0",
+		"@markuplint/ml-ast": "3.1.0",
+		"@markuplint/parser-utils": "3.5.0",
+		"svelte": "^3.57.0",
 		"tslib": "^2.4.1"
 	},
-	"gitHead": "a83e0f5f214a9bbcc0286b9e269074ddca6189e7"
+	"gitHead": "0c47b2c2722f6823a17f36edbab98486275f8ab4"
 }