@markuplint/svelte-parser 4.0.0-alpha.3 → 4.0.0-alpha.5

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017-2019 Yusuke Hirao
+Copyright (c) 2017-2023 Yusuke Hirao
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/lib/attr.js

@@ -1,10 +1,10 @@
 import { defaultValueDelimiters, parseAttr, sliceFragment } from '@markuplint/parser-utils';
-import directiveTokenizer from './directive-tokenizer.js';
+import { directiveTokenizer } from './directive-tokenizer.js';
 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.d.ts

@@ -1,2 +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 declare function directiveTokenizer(raw: string, rawValue: string, line: number, col: number, startOffset: number): MLASTHTMLAttr;

package/lib/directive-tokenizer.js

@@ -1,101 +1,16 @@
-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 {>/=]+/;
-// eslint-disable-next-line no-control-regex
-const reBeforeStructure = /^(\s*)([^\x00-\x1f\x7f-\x9f {>/=]+)(\s*)(=)(\s*){(\s*)$/;
-const reBeforeStructureWithoutName = /^{(\s*)$/;
-const reAfterStructure = /(\s*)}/;
-export default function directiveTokenizer(raw, rawValue, line, col, startOffset) {
-    let spacesBeforeAttrString = '';
-    let nameChars = '';
-    let spacesBeforeEqualChars = '';
-    let equalChars = null;
-    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);
-    if (beforeMatchedMap && afterMatchedMap) {
-        spacesBeforeAttrString = beforeMatchedMap[1] ?? '';
-        nameChars = beforeMatchedMap[2] ?? '';
-        spacesBeforeEqualChars = beforeMatchedMap[3] ?? '';
-        equalChars = beforeMatchedMap[4] ?? null;
-        spacesAfterEqualChars = beforeMatchedMap[5] ?? '';
-        valueChars = (beforeMatchedMap[6] ?? '') + rawValue + (afterMatchedMap[1] ?? '');
-    }
-    else if (beforeWithoutNameMatchedMap && afterMatchedMap) {
-        valueChars = (beforeWithoutNameMatchedMap[1] ?? '') + rawValue + (afterMatchedMap[1] ?? '');
-    }
-    else if (reNameOnly.test(raw)) {
-        const token = attrTokenizer(raw, line, col, startOffset);
-        token.isDirective = true;
-        return token;
-    }
-    else {
-        throw new SyntaxError('Illegal attribute token');
-    }
-    let offset = startOffset;
-    const attrToken = tokenizer(raw, line, col, offset);
-    const spacesBeforeName = tokenizer(spacesBeforeAttrString, line, col, offset);
-    line = spacesBeforeName.endLine;
-    col = spacesBeforeName.endCol;
-    offset = spacesBeforeName.endOffset;
-    const name = tokenizer(nameChars, line, col, offset);
-    line = name.endLine;
-    col = name.endCol;
-    offset = name.endOffset;
-    const spacesBeforeEqual = tokenizer(spacesBeforeEqualChars, line, col, offset);
-    line = spacesBeforeEqual.endLine;
-    col = spacesBeforeEqual.endCol;
-    offset = spacesBeforeEqual.endOffset;
-    const equal = tokenizer(equalChars, line, col, offset);
-    line = equal.endLine;
-    col = equal.endCol;
-    offset = equal.endOffset;
-    const spacesAfterEqual = tokenizer(spacesAfterEqualChars, line, col, offset);
-    line = spacesAfterEqual.endLine;
-    col = spacesAfterEqual.endCol;
-    offset = spacesAfterEqual.endOffset;
-    const startQuote = tokenizer('{', line, col, offset);
-    line = startQuote.endLine;
-    col = startQuote.endCol;
-    offset = startQuote.endOffset;
-    const value = tokenizer(valueChars, line, col, offset);
-    line = value.endLine;
-    col = value.endCol;
-    offset = value.endOffset;
-    const endQuote = tokenizer('}', line, col, offset);
-    line = endQuote.endLine;
-    col = endQuote.endCol;
-    offset = endQuote.endOffset;
-    const result = {
-        type: 'html-attr',
-        uuid: uuid(),
-        raw: attrToken.raw,
-        startOffset: attrToken.startOffset,
-        endOffset: attrToken.endOffset,
-        startLine: attrToken.startLine,
-        endLine: attrToken.endLine,
-        startCol: attrToken.startCol,
-        endCol: attrToken.endCol,
-        spacesBeforeName,
-        name,
-        spacesBeforeEqual,
-        equal,
-        spacesAfterEqual,
-        startQuote,
-        value,
-        endQuote,
-        isDirective: true,
-        isDuplicatable: false,
-        nodeName: name.raw,
-        parentNode: null,
-        nextNode: null,
-        prevNode: null,
-        isFragment: false,
-        isGhost: false,
-    };
-    return result;
+import { AttrState, attrTokenizer } from '@markuplint/parser-utils';
+export function directiveTokenizer(raw, rawValue, line, col, startOffset) {
+    const nameOnly = raw.trim().startsWith('{') && raw.trim().endsWith('}');
+    const directiveToken = attrTokenizer(raw, line, col, startOffset, [
+        { start: '"', end: '"' },
+        { start: "'", end: "'" },
+        { start: '{', end: '}' },
+    ], nameOnly ? AttrState.BeforeValue : AttrState.BeforeName, [
+        { start: '"', end: '"' },
+        { start: "'", end: "'" },
+        { start: '`', end: '`' },
+        { start: '${', end: '}' },
+    ]);
+    directiveToken.isDirective = true;
+    return directiveToken;
 }

package/lib/nodeize.js

@@ -1,5 +1,5 @@
-import { getNamespace, parseRawTag } from '@markuplint/html-parser';
-import { detectElementType, sliceFragment, uuid } from '@markuplint/parser-utils';
+import { getNamespace } from '@markuplint/html-parser';
+import { detectElementType, sliceFragment, uuid, tagParser } from '@markuplint/parser-utils';
 import { attr } from './attr.js';
 import { parseCtrlBlock } from './parse-ctrl-block.js';
 import { traverse } from './traverse.js';
@@ -96,7 +96,7 @@ parentNode, rawHtml, options) {
             const directives = originNode.attributes.map(a => attr(a, rawHtml)) ?? [];
             const attributes = directives.filter((d) => !('__spreadAttr' in d));
             const hasSpreadAttr = directives.some(d => '__spreadAttr' in d);
-            const tagTokens = parseRawTag(startTagLocation.raw, startTagLocation.startLine, startTagLocation.startCol, startTagLocation.startOffset);
+            const tagTokens = tagParser(startTagLocation.raw, startTagLocation.startLine, startTagLocation.startCol, startTagLocation.startOffset);
             const namespace = getNamespace(originNode.name, parentNamespace);
             const startTag = {
                 uuid: uuid(),
@@ -104,7 +104,7 @@ parentNode, rawHtml, options) {
                 nodeName: originNode.name,
                 type: 'starttag',
                 namespace,
-                elementType: detectElementType(originNode.name, options?.authoredElementName, /[A-Z]|\./),
+                elementType: detectElementType(originNode.name, options?.authoredElementName, /[.A-Z]/),
                 attributes,
                 hasSpreadAttr,
                 parentNode,
@@ -112,7 +112,7 @@ parentNode, rawHtml, options) {
                 nextNode,
                 pearNode: endTag,
                 selfClosingSolidus: tagTokens.selfClosingSolidus,
-                endSpace: tagTokens.endSpace,
+                endSpace: tagTokens.afterAttrSpaces,
                 isFragment: false,
                 isGhost: false,
                 tagOpenChar: '<',
@@ -189,7 +189,8 @@ parentNode, rawHtml, options) {
                     awaitCatch.childNodes = traverse(awaitCatchNode.children, awaitCatch, rawHtml, options);
                 }
             }
-            const reEndTag = new RegExp('{/await}$', 'i');
+            // eslint-disable-next-line regexp/strict
+            const reEndTag = /{\/await}$/i;
             let endTag = null;
             if (reEndTag.test(raw)) {
                 const endTagRawMatched = raw.match(reEndTag);
@@ -258,7 +259,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 +284,7 @@ parentNode, rawHtml, options) {
                     };
                 }
             }
-            return endTag != null ? [startTag, endTag] : startTag;
+            return endTag == null ? startTag : [startTag, endTag];
         }
     }
 }

package/lib/parse-ctrl-block.js

@@ -13,7 +13,8 @@ nextNode, options) {
         return parseIfBlock(originNode, raw, rawHtml, startOffset, originNode.start, parentNode, prevNode, nextNode, options);
     }
     const children = originNode.children ?? [];
-    const reEndTag = new RegExp('{/each}$', 'i');
+    // eslint-disable-next-line regexp/strict
+    const reEndTag = /{\/each}$/i;
     const startTagEndOffset = children.length > 0 ? children[0]?.start ?? 0 : raw.replace(reEndTag, '').length + startOffset;
     const startTagLocation = sliceFragment(rawHtml, startOffset, startTagEndOffset);
     const tag = {
@@ -33,7 +34,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 +114,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

@@ -1,41 +1,41 @@
 import { flattenNodes, ParserError, ignoreBlock, restoreNode } from '@markuplint/parser-utils';
-import svelteParse from './svelte-parser/index.js';
+import { svelteParse } from './svelte-parser/index.js';
 import { traverse } from './traverse.js';
 export const parse = (rawCode, options) => {
     const blocks = ignoreBlock(rawCode, [
         {
             type: 'Script',
-            start: /<script/,
-            end: /<\/script>/,
+            start: '<script',
+            end: '</script>',
         },
         {
             type: 'Style',
-            start: /<style/,
-            end: /<\/style>/,
+            start: '<style',
+            end: '</style>',
         },
     ], '-');
     let ast;
     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/svelte-parser/index.d.ts

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

package/lib/svelte-parser/index.js

@@ -1,5 +1,5 @@
 import { parse } from 'svelte/compiler';
-export default function svelteParse(template) {
+export function svelteParse(template) {
     const ast = parse(template, { customElement: true });
     const start = ast.html.start;
     const children = ast.html.children ?? [];

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.3",
+	"version": "4.0.0-alpha.5",
 	"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.3",
-		"@markuplint/ml-ast": "4.0.0-alpha.3",
-		"@markuplint/parser-utils": "4.0.0-alpha.3",
-		"svelte": "^4.2.1",
-		"tslib": "^2.6.2"
+		"@markuplint/html-parser": "4.0.0-alpha.5",
+		"@markuplint/ml-ast": "4.0.0-alpha.5",
+		"@markuplint/parser-utils": "4.0.0-alpha.5",
+		"svelte": "^4.2.2"
 	},
-	"gitHead": "380836f7adc1ff7e8eaf9d869e68d29eee8f3b7e"
+	"gitHead": "0c3e4690662edf1765bcc4b6411ec5507c1e2ea3"
 }