@markuplint/svelte-parser 3.3.0 → 3.4.0

package/lib/attr.d.ts

@@ -1,5 +1,10 @@
 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

@@ -46,7 +46,7 @@ function attr(attr, rawHTML) {
         token.isDynamicValue = true;
     }
     const [baseName, subName] = token.name.raw.split(':');
-    if (baseName.toLowerCase() === 'class') {
+    if ((baseName === null || baseName === void 0 ? void 0 : baseName.toLowerCase()) === 'class') {
         token.isDuplicatable = true;
         if (subName) {
             token.potentialName = 'class';

package/lib/directive-tokenizer.d.ts

@@ -1,2 +1,8 @@
 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/directive-tokenizer.js

@@ -9,6 +9,7 @@ const reBeforeStructure = /^(\s*)([^\x00-\x1f\x7f-\x9f {>/=]+)(\s*)(=)(\s*){(\s*
 const reBeforeStructureWithoutName = /^{(\s*)$/;
 const reAfterStructure = /(\s*)}/;
 function directiveTokenizer(raw, rawValue, line, col, startOffset) {
+    var _a, _b, _c, _d, _e;
     let spacesBeforeAttrString = '';
     let nameChars = '';
     let spacesBeforeEqualChars = '';
@@ -16,16 +17,16 @@ function directiveTokenizer(raw, rawValue, line, col, startOffset) {
     let spacesAfterEqualChars = '';
     let valueChars = '';
     const [before, after] = raw.split(rawValue);
-    const beforeMatchedMap = before.match(reBeforeStructure);
-    const beforeWithoutNameMatchedMap = before.match(reBeforeStructureWithoutName);
-    const afterMatchedMap = after.match(reAfterStructure);
+    const beforeMatchedMap = before === null || before === void 0 ? void 0 : before.match(reBeforeStructure);
+    const beforeWithoutNameMatchedMap = before === null || before === void 0 ? void 0 : before.match(reBeforeStructureWithoutName);
+    const afterMatchedMap = after === null || after === void 0 ? void 0 : after.match(reAfterStructure);
     if (beforeMatchedMap && afterMatchedMap) {
-        spacesBeforeAttrString = beforeMatchedMap[1];
-        nameChars = beforeMatchedMap[2];
-        spacesBeforeEqualChars = beforeMatchedMap[3] || '';
+        spacesBeforeAttrString = (_a = beforeMatchedMap[1]) !== null && _a !== void 0 ? _a : '';
+        nameChars = (_b = beforeMatchedMap[2]) !== null && _b !== void 0 ? _b : '';
+        spacesBeforeEqualChars = (_c = beforeMatchedMap[3]) !== null && _c !== void 0 ? _c : '';
         equalChars = beforeMatchedMap[4] || null;
-        spacesAfterEqualChars = beforeMatchedMap[5] || '';
-        valueChars = (beforeMatchedMap[6] || '') + rawValue + (afterMatchedMap[1] || '');
+        spacesAfterEqualChars = (_d = beforeMatchedMap[5]) !== null && _d !== void 0 ? _d : '';
+        valueChars = ((_e = beforeMatchedMap[6]) !== null && _e !== void 0 ? _e : '') + rawValue + (afterMatchedMap[1] || '');
     }
     else if (beforeWithoutNameMatchedMap && afterMatchedMap) {
         valueChars = (beforeWithoutNameMatchedMap[1] || '') + rawValue + (afterMatchedMap[1] || '');

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,3 +1,9 @@
 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

@@ -6,7 +6,7 @@ const parser_utils_1 = require("@markuplint/parser-utils");
 const attr_1 = require("./attr");
 const traverse_1 = require("./traverse");
 function nodeize(originNode, prevNode, parentNode, rawHtml, options) {
-    var _a, _b;
+    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);
     const parentNamespace = parentNode && 'namespace' in parentNode ? parentNode.namespace : 'http://www.w3.org/1999/xhtml';
@@ -54,7 +54,7 @@ function nodeize(originNode, prevNode, parentNode, rawHtml, options) {
             const children = originNode.children || [];
             const reEndTag = new RegExp(`</${originNode.name}\\s*>$`, 'i');
             const startTagEndOffset = children.length
-                ? children[0].start
+                ? (_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;
@@ -150,7 +150,7 @@ function nodeize(originNode, prevNode, parentNode, rawHtml, options) {
             let then = null;
             if (originNode.then) {
                 const thenNode = originNode.then;
-                const thenTag = (0, parser_utils_1.sliceFragment)(rawHtml, thenNode.start, (_a = (thenNode.children && thenNode.children[0] && thenNode.children[0].start)) !== null && _a !== void 0 ? _a : thenNode.end);
+                const thenTag = (0, parser_utils_1.sliceFragment)(rawHtml, thenNode.start, (_c = (thenNode.children && thenNode.children[0] && thenNode.children[0].start)) !== null && _c !== void 0 ? _c : thenNode.end);
                 then = {
                     uuid: (0, parser_utils_1.uuid)(),
                     ...thenTag,
@@ -169,7 +169,7 @@ function nodeize(originNode, prevNode, parentNode, rawHtml, options) {
             let awaitCatch = null;
             if (originNode.catch) {
                 const awaitCatchNode = originNode.catch;
-                const awaitCatchTag = (0, parser_utils_1.sliceFragment)(rawHtml, awaitCatchNode.start, (_b = (awaitCatchNode.children && awaitCatchNode.children[0] && awaitCatchNode.children[0].start)) !== null && _b !== void 0 ? _b : awaitCatchNode.end);
+                const awaitCatchTag = (0, parser_utils_1.sliceFragment)(rawHtml, awaitCatchNode.start, (_d = (awaitCatchNode.children && awaitCatchNode.children[0] && awaitCatchNode.children[0].start)) !== null && _d !== void 0 ? _d : awaitCatchNode.end);
                 awaitCatch = {
                     uuid: (0, parser_utils_1.uuid)(),
                     ...awaitCatchTag,
@@ -249,9 +249,12 @@ 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 ? children[0].start : raw.replace(reEndTag, '').length + startOffset;
+    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);
@@ -281,7 +284,9 @@ function solveCtrlBlock(ctrlName, originNode, raw, rawHtml, startOffset, parentN
     let elseTag = null;
     if (originNode.else) {
         const elseNode = originNode.else;
-        const elseTagStartOffset = children.length ? children[children.length - 1].end : startTagLocation.endOffset;
+        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)(),

package/lib/traverse.d.ts

@@ -1,3 +1,8 @@
 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: SvelteNode[],
+	parentNode: MLASTParentNode | null | undefined,
+	rawHtml: string,
+	options?: ParserOptions,
+): MLASTNode[];

package/lib/traverse.js

@@ -12,7 +12,11 @@ function traverse(astNodes, parentNode = null, rawHtml, options) {
         }
         let node;
         if (Array.isArray(nodes)) {
-            node = nodes[nodes.length - 1];
+            const lastNode = nodes[nodes.length - 1];
+            if (!lastNode) {
+                continue;
+            }
+            node = lastNode;
         }
         else {
             node = nodes;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/svelte-parser",
-	"version": "3.3.0",
+	"version": "3.4.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.3.0",
+		"@markuplint/html-parser": "3.4.0",
 		"@markuplint/ml-ast": "3.0.0",
-		"@markuplint/parser-utils": "3.3.0",
+		"@markuplint/parser-utils": "3.4.0",
 		"svelte": "^3.55.0",
 		"tslib": "^2.4.1"
 	},
-	"gitHead": "791fb22a4df7acb985ced3808923fba0cd95c28a"
+	"gitHead": "a83e0f5f214a9bbcc0286b9e269074ddca6189e7"
 }