@markuplint/svelte-parser 4.0.0-alpha.2 → 4.0.0-dev.28

package/lib/attr.js

@@ -4,7 +4,7 @@ const mustacheTag = {
     start: '{',
     end: '}',
 };
-const specificBindDirective = ['bind:group', 'bind:this'];
+const specificBindDirective = new Set(['bind:group', 'bind:this']);
 export function attr(
 // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
 attr, rawHTML) {
@@ -33,7 +33,7 @@ attr, rawHTML) {
                 : '';
         token = directiveTokenizer(raw, valueToken, startLine, startCol, startOffset);
     }
-    if (!specificBindDirective.includes(token.name.raw) && /^bind:/i.test(token.name.raw)) {
+    if (!specificBindDirective.has(token.name.raw) && /^bind:/i.test(token.name.raw)) {
         // Remove "bind:"
         token.potentialName = token.name.raw.slice(5);
         token.isDirective = undefined;

package/lib/directive-tokenizer.js

@@ -1,9 +1,9 @@
 import { attrTokenizer } from '@markuplint/html-parser';
 import { tokenizer, uuid } from '@markuplint/parser-utils';
 // eslint-disable-next-line no-control-regex
-const reNameOnly = /^[^\x00-\x1f\x7f-\x9f {>/=]+/;
+const reNameOnly = /^[^\u0000-\u001F /=>{\u007F-\u009F]+/;
 // eslint-disable-next-line no-control-regex
-const reBeforeStructure = /^(\s*)([^\x00-\x1f\x7f-\x9f {>/=]+)(\s*)(=)(\s*){(\s*)$/;
+const reBeforeStructure = /^(\s*)([^\u0000-\u001F /=>{\u007F-\u009F]+)(\s*)(=)(\s*){(\s*)$/;
 const reBeforeStructureWithoutName = /^{(\s*)$/;
 const reAfterStructure = /(\s*)}/;
 export default function directiveTokenizer(raw, rawValue, line, col, startOffset) {

package/lib/nodeize.js

@@ -258,7 +258,7 @@ parentNode, rawHtml, options) {
                     startTag.endCol = firstChild.startCol;
                     startTag.raw = rawHtml.slice(startTag.startOffset, startTag.endOffset);
                 }
-                const lastChild = startTag.childNodes[startTag.childNodes.length - 1];
+                const lastChild = startTag.childNodes.at(-1);
                 if (lastChild && lastChild.endOffset > startTag.endOffset) {
                     const startOffset = lastChild.endOffset;
                     const startLine = lastChild.endLine;
@@ -283,7 +283,7 @@ parentNode, rawHtml, options) {
                     };
                 }
             }
-            return endTag != null ? [startTag, endTag] : startTag;
+            return endTag == null ? startTag : [startTag, endTag];
         }
     }
 }

package/lib/parse-ctrl-block.js

@@ -33,7 +33,7 @@ nextNode, options) {
     let elseTag = null;
     if (originNode.else) {
         const elseNode = originNode.else;
-        const elseTagStartOffset = children.length > 0 ? children[children.length - 1]?.end ?? 0 : startTagLocation.endOffset;
+        const elseTagStartOffset = children.length > 0 ? children.at(-1)?.end ?? 0 : startTagLocation.endOffset;
         const elseTagLocation = sliceFragment(rawHtml, elseTagStartOffset, elseNode.start);
         elseTag = {
             uuid: uuid(),
@@ -113,7 +113,7 @@ nextNode, options) {
     const elseOrElseIfTags = [];
     if (originNode.else) {
         const elseNode = originNode.else;
-        const elseTagStartOffset = children.length > 0 ? children[children.length - 1]?.end ?? 0 : startTagLocation.endOffset;
+        const elseTagStartOffset = children.length > 0 ? children.at(-1)?.end ?? 0 : startTagLocation.endOffset;
         const elseTagLocation = sliceFragment(rawHtml, elseTagStartOffset, elseNode.start);
         if (elseNode.children) {
             if (elseNode.children.length === 1 && elseNode.children[0]?.type === 'IfBlock') {

package/lib/parse.js

@@ -18,24 +18,24 @@ export const parse = (rawCode, options) => {
     try {
         ast = svelteParse(blocks.replaced);
     }
-    catch (err) {
-        if (err instanceof Error && 'start' in err && 'end' in err && 'frame' in err) {
+    catch (error) {
+        if (error instanceof Error && 'start' in error && 'end' in error && 'frame' in error) {
             // @ts-ignore
-            const raw = rawCode.slice(err.start.character, err.end.character);
+            const raw = rawCode.slice(error.start.character, error.end.character);
             throw new ParserError(
             // @ts-ignore
-            err.message + '\n' + err.frame, {
+            error.message + '\n' + error.frame, {
                 // @ts-ignore
-                line: err.start.line,
+                line: error.start.line,
                 // @ts-ignore
-                col: err.start.column,
+                col: error.start.column,
                 raw,
             });
         }
         return {
             nodeList: [],
             isFragment: true,
-            parseError: err instanceof Error ? err.message : new Error(`${err}`).message,
+            parseError: error instanceof Error ? error.message : new Error(`${error}`).message,
         };
     }
     const nodes = traverse(ast, null, blocks.replaced, options);

package/lib/traverse.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/svelte-parser",
-	"version": "4.0.0-alpha.2",
+	"version": "4.0.0-dev.28+0131de5e",
 	"description": "Svelte parser for markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -21,11 +21,10 @@
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@markuplint/html-parser": "4.0.0-alpha.2",
-		"@markuplint/ml-ast": "4.0.0-alpha.2",
-		"@markuplint/parser-utils": "4.0.0-alpha.2",
-		"svelte": "^4.2.1",
-		"tslib": "^2.6.2"
+		"@markuplint/html-parser": "4.0.0-dev.28+0131de5e",
+		"@markuplint/ml-ast": "4.0.0-dev.28+0131de5e",
+		"@markuplint/parser-utils": "4.0.0-dev.28+0131de5e",
+		"svelte": "^4.2.2"
 	},
-	"gitHead": "51ad52c760435641f9bff8685707d8178b0787eb"
+	"gitHead": "0131de5ea9dd6d3fd5472d7b414b66644c758881"
 }