@markuplint/svelte-parser 3.7.0 → 3.8.0

package/lib/attr.js

@@ -2,9 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.attr = void 0;
 const tslib_1 = require("tslib");
-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 mustacheTag = {
+    start: '{',
+    end: '}',
+};
 const specificBindDirective = ['bind:group', 'bind:this'];
 function attr(
 // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
@@ -13,29 +16,27 @@ attr, rawHTML) {
         ? attr.value.some((val) => val.type === 'AttributeShorthand')
         : false;
     const { start, end } = attr;
-    // @ts-ignore
     if (attr.type === 'Spread') {
         return {
             __spreadAttr: true,
         };
     }
-    // @ts-ignore TODO solve type
+    let token;
     if (attr.type === 'Attribute' && !isShorthand) {
+        const { raw } = (0, parser_utils_1.sliceFragment)(rawHTML, start, end);
+        token = (0, parser_utils_1.parseAttr)(raw, start, rawHTML, {
+            valueDelimiters: [...parser_utils_1.defaultValueDelimiters, mustacheTag],
+        });
+    }
+    else {
         const { raw, startLine, startCol, startOffset } = (0, parser_utils_1.sliceFragment)(rawHTML, start, end);
-        const token = (0, html_parser_1.attrTokenizer)(raw, startLine, startCol, startOffset);
-        return token;
+        const valueToken = isShorthand
+            ? attr.name
+            : attr.expression && 'start' in attr.expression && 'end' in attr.expression
+                ? (0, parser_utils_1.sliceFragment)(rawHTML, attr.expression.start, attr.expression.end).raw
+                : '';
+        token = (0, directive_tokenizer_1.default)(raw, valueToken, startLine, startCol, startOffset);
     }
-    const { raw, startLine, startCol, startOffset } = (0, parser_utils_1.sliceFragment)(rawHTML, start, end);
-    const valueToken = isShorthand
-        ? attr.name
-        : // @ts-ignore TODO solve type
-            attr.type === 'Spread'
-                ? raw.slice(1).slice(0, -1)
-                : attr.expression && 'start' in attr.expression && 'end' in attr.expression
-                    ? // @ts-ignore
-                        (0, parser_utils_1.sliceFragment)(rawHTML, attr.expression.start, attr.expression.end).raw
-                    : '';
-    const token = (0, directive_tokenizer_1.default)(raw, valueToken, startLine, startCol, startOffset);
     if (!specificBindDirective.includes(token.name.raw) && /^bind:/i.test(token.name.raw)) {
         // Remove "bind:"
         token.potentialName = token.name.raw.slice(5);
@@ -55,6 +56,9 @@ attr, rawHTML) {
             token.isDynamicValue = true;
         }
     }
+    if (token.startQuote.raw === '{' && token.endQuote.raw === '}') {
+        token.isDynamicValue = true;
+    }
     return {
         ...token,
     };

package/lib/nodeize.js

@@ -57,6 +57,7 @@ parentNode, rawHtml, options) {
                 isGhost: false,
             };
         }
+        case 'InlineComponent':
         case 'Element': {
             const children = (_a = originNode.children) !== null && _a !== void 0 ? _a : [];
             const reEndTag = new RegExp(`</${originNode.name}\\s*>$`, 'i');
@@ -233,7 +234,7 @@ parentNode, rawHtml, options) {
             return tags;
         }
         default: {
-            return {
+            const startTag = {
                 uuid: (0, parser_utils_1.uuid)(),
                 raw,
                 startOffset,
@@ -250,6 +251,42 @@ parentNode, rawHtml, options) {
                 isFragment: false,
                 isGhost: false,
             };
+            let endTag = null;
+            if (originNode.children) {
+                startTag.childNodes = (0, traverse_1.traverse)(originNode.children, startTag, rawHtml, options);
+                const firstChild = startTag.childNodes[0];
+                if (firstChild) {
+                    startTag.endOffset = firstChild.startOffset;
+                    startTag.endLine = firstChild.startLine;
+                    startTag.endCol = firstChild.startCol;
+                    startTag.raw = rawHtml.slice(startTag.startOffset, startTag.endOffset);
+                }
+                const lastChild = startTag.childNodes[startTag.childNodes.length - 1];
+                if (lastChild && lastChild.endOffset > startTag.endOffset) {
+                    const startOffset = lastChild.endOffset;
+                    const startLine = lastChild.endLine;
+                    const startCol = lastChild.endCol;
+                    const raw = rawHtml.slice(startOffset, endOffset);
+                    endTag = {
+                        uuid: (0, parser_utils_1.uuid)(),
+                        raw,
+                        startOffset,
+                        endOffset,
+                        startLine,
+                        endLine,
+                        startCol,
+                        endCol,
+                        nodeName: originNode.name || originNode.type,
+                        type: 'psblock',
+                        parentNode,
+                        prevNode,
+                        nextNode,
+                        isFragment: false,
+                        isGhost: false,
+                    };
+                }
+            }
+            return endTag != null ? [startTag, endTag] : startTag;
         }
     }
 }

package/lib/svelte-parser/index.d.ts

@@ -1,4 +1,4 @@
-import type { Directive, TemplateNode } from 'svelte/types/compiler/interfaces';
+import type { Directive, TemplateNode, Attribute, SpreadAttribute } from 'svelte/types/compiler/interfaces';
 export type SvelteNode = TemplateNode;
 export default function svelteParse(template: string): TemplateNode[];
-export type SvelteDirective = Directive;
+export type SvelteDirective = Directive | Attribute | SpreadAttribute;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/svelte-parser",
-	"version": "3.7.0",
+	"version": "3.8.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.8.0",
-		"@markuplint/ml-ast": "3.1.0",
-		"@markuplint/parser-utils": "3.8.0",
+		"@markuplint/html-parser": "3.9.0",
+		"@markuplint/ml-ast": "3.2.0",
+		"@markuplint/parser-utils": "3.9.0",
 		"svelte": "^3.58.0",
-		"tslib": "^2.5.0"
+		"tslib": "^2.5.3"
 	},
-	"gitHead": "af370797bfc887e5a5a2ff57fbaa8392ac98ead2"
+	"gitHead": "9547b8dca20736a93e4d01af2d61bee314ba5718"
 }

package/test/index.spec.js

@@ -211,7 +211,7 @@ describe('parser', () => {
 				'  [1:19]>[1:35](18,34)value: ␣`abc${def}ghi`␣',
 				'  [1:35]>[1:36](34,35)eQ: }',
 				'  isDirective: true',
-				'  isDynamicValue: false',
+				'  isDynamicValue: true',
 			],
 		]);
 	});
@@ -231,7 +231,7 @@ describe('parser', () => {
 				'  [1:31]>[1:38](30,37)value: handler',
 				'  [1:38]>[1:39](37,38)eQ: }',
 				'  isDirective: true',
-				'  isDynamicValue: false',
+				'  isDynamicValue: true',
 			],
 		]);
 	});
@@ -505,4 +505,52 @@ describe('Issues', () => {
 		expect(r.nodeList[0].childNodes[4].raw).toBe(r.nodeList[11].raw);
 		expect(r.nodeList[0].childNodes[4].uuid).toBe(r.nodeList[11].uuid);
 	});
+
+	test('#991', () => {
+		const r = parse(`<CustomElement>
+	<div>Evaluation doesn't work</div>
+</CustomElement>`);
+		const map = nodeListToDebugMaps(r.nodeList);
+		expect(map).toStrictEqual([
+			'[1:1]>[1:16](0,15)CustomElement: <CustomElement>',
+			'[1:16]>[2:2](15,17)#text: ⏎→',
+			'[2:2]>[2:7](17,22)div: <div>',
+			"[2:7]>[2:30](22,45)#text: Evaluation␣doesn't␣work",
+			'[2:30]>[2:36](45,51)div: </div>',
+			'[2:36]>[3:1](51,52)#text: ⏎',
+			'[3:1]>[3:17](52,68)CustomElement: </CustomElement>',
+		]);
+	});
+
+	test('#991-2', () => {
+		const r = parse('<div id={uid()}></div>');
+		const map = nodeListToDebugMaps(r.nodeList, true);
+		expect(map).toStrictEqual([
+			'[1:1]>[1:17](0,16)div: <div␣id={uid()}>',
+			'[1:6]>[1:16](5,15)id: id={uid()}',
+			'  [1:6]>[1:6](5,5)bN: ',
+			'  [1:6]>[1:8](5,7)name: id',
+			'  [1:8]>[1:8](7,7)bE: ',
+			'  [1:8]>[1:9](7,8)equal: =',
+			'  [1:9]>[1:9](8,8)aE: ',
+			'  [1:9]>[1:10](8,9)sQ: {',
+			'  [1:10]>[1:15](9,14)value: uid()',
+			'  [1:15]>[1:16](14,15)eQ: }',
+			'  isDirective: false',
+			'  isDynamicValue: true',
+			'[1:17]>[1:23](16,22)div: </div>',
+		]);
+	});
+
+	test('#991-3', () => {
+		const r = parse('<div>\n<!-- It is a comment node -->\n</div>');
+		const map = nodeListToDebugMaps(r.nodeList, true);
+		expect(map).toStrictEqual([
+			'[1:1]>[1:6](0,5)div: <div>',
+			'[1:6]>[2:1](5,6)#text: ⏎',
+			'[2:1]>[2:30](6,35)Comment: <!--␣It␣is␣a␣comment␣node␣-->',
+			'[2:30]>[3:1](35,36)#text: ⏎',
+			'[3:1]>[3:7](36,42)div: </div>',
+		]);
+	});
 });

package/test/svelte-parser/index.spec.js

@@ -107,3 +107,35 @@ describe('parser', () => {
 		]);
 	});
 });
+
+describe('Issues', () => {
+	test('#991', () => {
+		expect(svelteParse("<CustomElement><div>Evaluation doesn't work</div></CustomElement>")).toEqual([
+			{
+				type: 'InlineComponent',
+				name: 'CustomElement',
+				start: 0,
+				end: 65,
+				attributes: [],
+				children: [
+					{
+						type: 'Element',
+						name: 'div',
+						start: 15,
+						end: 49,
+						attributes: [],
+						children: [
+							{
+								type: 'Text',
+								start: 20,
+								end: 43,
+								data: "Evaluation doesn't work",
+								raw: "Evaluation doesn't work",
+							},
+						],
+					},
+				],
+			},
+		]);
+	});
+});