@markuplint/svelte-parser 3.5.0 → 3.6.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/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,7 +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;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     let spacesBeforeAttrString = '';
     let nameChars = '';
     let spacesBeforeEqualChars = '';
@@ -24,12 +24,12 @@ function directiveTokenizer(raw, rawValue, line, col, startOffset) {
         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 = (_d = beforeMatchedMap[5]) !== null && _d !== void 0 ? _d : '';
-        valueChars = ((_e = beforeMatchedMap[6]) !== null && _e !== void 0 ? _e : '') + rawValue + (afterMatchedMap[1] || '');
+        equalChars = (_d = beforeMatchedMap[4]) !== null && _d !== void 0 ? _d : null;
+        spacesAfterEqualChars = (_e = beforeMatchedMap[5]) !== null && _e !== void 0 ? _e : '';
+        valueChars = ((_f = beforeMatchedMap[6]) !== null && _f !== void 0 ? _f : '') + rawValue + ((_g = afterMatchedMap[1]) !== null && _g !== void 0 ? _g : '');
     }
     else if (beforeWithoutNameMatchedMap && afterMatchedMap) {
-        valueChars = (beforeWithoutNameMatchedMap[1] || '') + rawValue + (afterMatchedMap[1] || '');
+        valueChars = ((_h = beforeWithoutNameMatchedMap[1]) !== null && _h !== void 0 ? _h : '') + rawValue + ((_j = afterMatchedMap[1]) !== null && _j !== void 0 ? _j : '');
     }
     else if (reNameOnly.test(raw)) {
         const token = (0, html_parser_1.attrTokenizer)(raw, line, col, startOffset);

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

@@ -13,7 +13,7 @@ originNode,
 prevNode, 
 // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
 parentNode, rawHtml, options) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f;
     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';
@@ -58,11 +58,9 @@ parentNode, rawHtml, options) {
             };
         }
         case 'Element': {
-            const children = originNode.children || [];
+            const children = (_a = originNode.children) !== null && _a !== void 0 ? _a : [];
             const reEndTag = new RegExp(`</${originNode.name}\\s*>$`, '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 startTagEndOffset = children.length > 0 ? (_c = (_b = children[0]) === null || _b === void 0 ? void 0 : _b.start) !== null && _c !== void 0 ? _c : 0 : raw.replace(reEndTag, '').length + startOffset;
             const startTagLocation = (0, parser_utils_1.sliceFragment)(rawHtml, startOffset, startTagEndOffset);
             let endTag = null;
             if (reEndTag.test(raw)) {
@@ -98,7 +96,7 @@ parentNode, rawHtml, options) {
                     tagCloseChar: '>',
                 };
             }
-            const directives = originNode.attributes.map(a => (0, attr_1.attr)(a, rawHtml)) || [];
+            const directives = (_d = originNode.attributes.map(a => (0, attr_1.attr)(a, rawHtml))) !== null && _d !== void 0 ? _d : [];
             const attributes = directives.filter((d) => !('__spreadAttr' in d));
             const hasSpreadAttr = directives.some(d => '__spreadAttr' in d);
             const tagTokens = (0, html_parser_1.parseRawTag)(startTagLocation.raw, startTagLocation.startLine, startTagLocation.startCol, startTagLocation.startOffset);
@@ -158,7 +156,7 @@ parentNode, rawHtml, options) {
             let then = null;
             if (originNode.then) {
                 const thenNode = originNode.then;
-                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);
+                const thenTag = (0, parser_utils_1.sliceFragment)(rawHtml, thenNode.start, (_e = (thenNode.children && thenNode.children[0] && thenNode.children[0].start)) !== null && _e !== void 0 ? _e : thenNode.end);
                 then = {
                     uuid: (0, parser_utils_1.uuid)(),
                     ...thenTag,
@@ -177,7 +175,7 @@ parentNode, rawHtml, options) {
             let awaitCatch = null;
             if (originNode.catch) {
                 const awaitCatchNode = originNode.catch;
-                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);
+                const awaitCatchTag = (0, parser_utils_1.sliceFragment)(rawHtml, awaitCatchNode.start, (_f = (awaitCatchNode.children && awaitCatchNode.children[0] && awaitCatchNode.children[0].start)) !== null && _f !== void 0 ? _f : awaitCatchNode.end);
                 awaitCatch = {
                     uuid: (0, parser_utils_1.uuid)(),
                     ...awaitCatchTag,

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

@@ -1,3 +1,13 @@
 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[];
+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

@@ -12,15 +12,13 @@ parentNode,
 prevNode, 
 // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
 nextNode, options) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     if (ctrlName === 'if') {
         return parseIfBlock(originNode, raw, rawHtml, startOffset, originNode.start, parentNode, prevNode, nextNode, options);
     }
-    const children = originNode.children || [];
+    const children = (_a = originNode.children) !== null && _a !== void 0 ? _a : [];
     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 startTagEndOffset = children.length > 0 ? (_c = (_b = children[0]) === null || _b === void 0 ? void 0 : _b.start) !== null && _c !== void 0 ? _c : 0 : raw.replace(reEndTag, '').length + startOffset;
     const startTagLocation = (0, parser_utils_1.sliceFragment)(rawHtml, startOffset, startTagEndOffset);
     const tag = {
         uuid: (0, parser_utils_1.uuid)(),
@@ -39,9 +37,7 @@ nextNode, 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 elseTagStartOffset = children.length > 0 ? (_e = (_d = children[children.length - 1]) === null || _d === void 0 ? void 0 : _d.end) !== null && _e !== void 0 ? _e : 0 : startTagLocation.endOffset;
         const elseTagLocation = (0, parser_utils_1.sliceFragment)(rawHtml, elseTagStartOffset, elseNode.start);
         elseTag = {
             uuid: (0, parser_utils_1.uuid)(),
@@ -102,9 +98,9 @@ parentNode,
 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;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+    const children = (_a = originNode.children) !== null && _a !== void 0 ? _a : [];
+    const startTagEndOffset = (_c = (_b = children[0]) === null || _b === void 0 ? void 0 : _b.start) !== null && _c !== void 0 ? _c : tokenStartOffset;
     const startTagLocation = (0, parser_utils_1.sliceFragment)(rawHtml, tokenStartOffset, startTagEndOffset);
     const tag = {
         uuid: (0, parser_utils_1.uuid)(),
@@ -123,13 +119,11 @@ nextNode, 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 elseTagStartOffset = children.length > 0 ? (_e = (_d = children[children.length - 1]) === null || _d === void 0 ? void 0 : _d.end) !== null && _e !== void 0 ? _e : 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);
+            if (elseNode.children.length === 1 && ((_f = elseNode.children[0]) === null || _f === void 0 ? void 0 : _f.type) === 'IfBlock') {
+                const elseIfTags = parseIfBlock(elseNode.children[0], elseTagLocation.raw, rawHtml, statementStartOffset, (_j = (_h = (_g = originNode.children) === null || _g === void 0 ? void 0 : _g[0]) === null || _h === void 0 ? void 0 : _h.end) !== null && _j !== void 0 ? _j : startTagLocation.endOffset, parentNode, null, null, options);
                 elseOrElseIfTags.push(...elseIfTags);
             }
             else {

package/lib/svelte-parser/index.js

@@ -2,9 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const compiler_1 = require("svelte/compiler");
 function svelteParse(template) {
+    var _a;
     const ast = (0, compiler_1.parse)(template, { customElement: true });
     const start = ast.html.start;
-    const children = ast.html.children || [];
+    const children = (_a = ast.html.children) !== null && _a !== void 0 ? _a : [];
     if (children[0] && children[0].end === start) {
         children.shift();
     }

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: readonly 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/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/svelte-parser",
-	"version": "3.5.0",
+	"version": "3.6.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.5.0",
+		"@markuplint/html-parser": "3.6.0",
 		"@markuplint/ml-ast": "3.1.0",
-		"@markuplint/parser-utils": "3.5.0",
+		"@markuplint/parser-utils": "3.6.0",
 		"svelte": "^3.57.0",
 		"tslib": "^2.4.1"
 	},
-	"gitHead": "0c47b2c2722f6823a17f36edbab98486275f8ab4"
+	"gitHead": "715dd53d3b1064a9bcf616c1533921cad9e3b187"
 }