@markuplint/svelte-parser 4.6.1 → 4.7.0-alpha.0

package/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.6.2](https://github.com/markuplint/markuplint/compare/@markuplint/svelte-parser@4.6.1...@markuplint/svelte-parser@4.6.2) (2024-05-12)
+
+**Note:** Version bump only for package @markuplint/svelte-parser
+
 ## [4.6.1](https://github.com/markuplint/markuplint/compare/@markuplint/svelte-parser@4.6.1-alpha.0...@markuplint/svelte-parser@4.6.1) (2024-05-04)
 
 **Note:** Version bump only for package @markuplint/svelte-parser

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/svelte-parser",
-	"version": "4.6.1",
+	"version": "4.7.0-alpha.0",
 	"description": "Svelte parser for markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -24,10 +24,9 @@
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@markuplint/html-parser": "4.6.1",
+		"@markuplint/html-parser": "4.6.2",
 		"@markuplint/ml-ast": "4.3.1",
-		"@markuplint/parser-utils": "4.6.1",
-		"svelte": "4.2.15"
-	},
-	"gitHead": "7a5967fce14fdf66f0d8eae9d93ae5b350648d3d"
+		"@markuplint/parser-utils": "4.6.2",
+		"svelte": "next"
+	}
 }

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2017-2024 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
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

package/lib/index.d.ts

@@ -1 +0,0 @@
-export { parser } from './parser.js';

package/lib/index.js

@@ -1 +0,0 @@
-export { parser } from './parser.js';

package/lib/parser.d.ts

@@ -1,63 +0,0 @@
-/// <reference types="svelte" />
-import type { SvelteNode } from './svelte-parser/index.js';
-import type { MLASTParentNode, MLASTPreprocessorSpecificBlock, MLASTPreprocessorSpecificBlockConditionalType } from '@markuplint/ml-ast';
-import type { ChildToken, ParseOptions, Token } from '@markuplint/parser-utils';
-import { ParserError, Parser } from '@markuplint/parser-utils';
-declare class SvelteParser extends Parser<SvelteNode> {
-    #private;
-    readonly specificBindDirective: ReadonlySet<string>;
-    constructor();
-    tokenize(): {
-        ast: import("svelte/types/compiler/interfaces").TemplateNode[];
-        isFragment: boolean;
-    };
-    parse(raw: string, options?: ParseOptions): import("@markuplint/ml-ast").MLASTDocument;
-    parseError(error: any): ParserError;
-    nodeize(originNode: SvelteNode, parentNode: MLASTParentNode | null, depth: number): readonly import("@markuplint/ml-ast").MLASTNodeTreeItem[];
-    visitPsBlock(token: ChildToken & {
-        readonly nodeName: string;
-    }, childNodes?: readonly SvelteNode[], conditionalType?: MLASTPreprocessorSpecificBlockConditionalType): readonly [MLASTPreprocessorSpecificBlock];
-    visitChildren(children: readonly SvelteNode[], parentNode: MLASTParentNode | null): never[];
-    visitAttr(token: Token): (import("@markuplint/ml-ast").MLASTSpreadAttr & {
-        __rightText?: string | undefined;
-    }) | {
-        isDynamicValue: true | undefined;
-        isDirective: true | undefined;
-        isDuplicatable: boolean;
-        potentialName: string | undefined;
-        type: "attr";
-        nodeName: string;
-        spacesBeforeName: import("@markuplint/ml-ast").MLASTToken;
-        name: import("@markuplint/ml-ast").MLASTToken;
-        spacesBeforeEqual: import("@markuplint/ml-ast").MLASTToken;
-        equal: import("@markuplint/ml-ast").MLASTToken;
-        spacesAfterEqual: import("@markuplint/ml-ast").MLASTToken;
-        startQuote: import("@markuplint/ml-ast").MLASTToken;
-        value: import("@markuplint/ml-ast").MLASTToken;
-        endQuote: import("@markuplint/ml-ast").MLASTToken;
-        potentialValue?: string | undefined;
-        valueType?: "string" | "number" | "boolean" | "code" | undefined;
-        candidate?: string | undefined;
-        uuid: string;
-        raw: string;
-        startOffset: number;
-        endOffset: number;
-        startLine: number;
-        endLine: number;
-        startCol: number;
-        endCol: number;
-        __rightText?: string | undefined;
-    };
-    /**
-     * > A lowercase tag, like `<div>`, denotes a regular HTML element.
-     * A capitalised tag, such as `<Widget>` or `<Namespace.Widget>`, indicates a component.
-     *
-     * @see https://svelte.io/docs/basic-markup#tags
-     * @param nodeName
-     * @returns
-     */
-    detectElementType(nodeName: string): import("@markuplint/ml-ast").ElementType;
-    visitExpression(token: ChildToken, originBlockNode: SvelteNode): MLASTPreprocessorSpecificBlock[];
-}
-export declare const parser: SvelteParser;
-export {};

package/lib/parser.js

@@ -1,344 +0,0 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _SvelteParser_instances, _SvelteParser_traverseIfBlock;
-import { getNamespace } from '@markuplint/html-parser';
-import { ParserError, Parser, AttrState } from '@markuplint/parser-utils';
-import { svelteParse } from './svelte-parser/index.js';
-class SvelteParser extends Parser {
-    constructor() {
-        super({
-            endTagType: 'xml',
-            tagNameCaseSensitive: true,
-            ignoreTags: [
-                {
-                    type: 'Script',
-                    start: '<script',
-                    end: '</script>',
-                },
-                {
-                    type: 'Style',
-                    start: '<style',
-                    end: '</style>',
-                },
-            ],
-            maskChar: '-',
-        });
-        _SvelteParser_instances.add(this);
-        this.specificBindDirective = new Set(['group', 'this']);
-    }
-    tokenize() {
-        return {
-            ast: svelteParse(this.rawCode),
-            isFragment: true,
-        };
-    }
-    parse(raw, options) {
-        return super.parse(raw, {
-            ...options,
-            ignoreFrontMatter: false,
-        });
-    }
-    parseError(error) {
-        if (error instanceof Error && 'start' in error && 'end' in error && 'frame' in error) {
-            // @ts-ignore
-            const token = this.sliceFragment(error.start.character, error.end.character);
-            throw new ParserError(error.message + '\n' + error.frame, token);
-        }
-        return super.parseError(error);
-    }
-    nodeize(
-    // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
-    originNode, parentNode, depth) {
-        const token = this.sliceFragment(originNode.start, originNode.end);
-        const parentNamespace = parentNode && 'namespace' in parentNode ? parentNode.namespace : 'http://www.w3.org/1999/xhtml';
-        switch (originNode.type) {
-            case 'Text': {
-                return this.visitText({
-                    ...token,
-                    depth,
-                    parentNode,
-                });
-            }
-            case 'Comment': {
-                return this.visitComment({
-                    ...token,
-                    depth,
-                    parentNode,
-                });
-            }
-            case 'MustacheTag': {
-                return this.visitPsBlock({
-                    ...token,
-                    depth,
-                    parentNode,
-                    nodeName: 'MustacheTag',
-                });
-            }
-            case 'InlineComponent':
-            case 'Element': {
-                const children = originNode.children ?? [];
-                const reEndTag = new RegExp(`</${originNode.name}\\s*>$`, 'i');
-                const startTagEndOffset = children.length > 0
-                    ? children[0]?.start ?? 0
-                    : token.raw.replace(reEndTag, '').length + token.startOffset;
-                const startTagLocation = this.sliceFragment(token.startOffset, startTagEndOffset);
-                return this.visitElement({
-                    ...startTagLocation,
-                    depth,
-                    parentNode,
-                    nodeName: originNode.name,
-                    namespace: getNamespace(originNode.name, parentNamespace),
-                }, originNode.children, {
-                    createEndTagToken: () => {
-                        if (!reEndTag.test(token.raw)) {
-                            return null;
-                        }
-                        const endTagRawMatched = token.raw.match(reEndTag);
-                        if (!endTagRawMatched) {
-                            throw new Error('Parse error');
-                        }
-                        const endTagRaw = endTagRawMatched[0];
-                        const endTagStartOffset = token.startOffset + token.raw.lastIndexOf(endTagRaw);
-                        const endTagEndOffset = endTagStartOffset + endTagRaw.length;
-                        const endTagLocation = this.sliceFragment(endTagStartOffset, endTagEndOffset);
-                        return {
-                            ...endTagLocation,
-                            depth,
-                            parentNode,
-                        };
-                    },
-                });
-            }
-            default: {
-                return this.visitExpression({
-                    ...token,
-                    depth,
-                    parentNode,
-                }, originNode);
-            }
-        }
-    }
-    visitPsBlock(token, childNodes = [], conditionalType = null) {
-        const nodes = super.visitPsBlock(token, childNodes, conditionalType);
-        const block = nodes.at(0);
-        if (!block || block.type !== 'psblock') {
-            throw new ParserError('Parse error', token);
-        }
-        if (nodes.length > 1) {
-            throw new ParserError('Parse error', nodes.at(1));
-        }
-        return [block];
-    }
-    visitChildren(
-    // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
-    children, parentNode) {
-        const siblings = super.visitChildren(children, parentNode);
-        if (siblings.length > 0) {
-            throw new ParserError('Discovered child nodes with differing hierarchy levels', siblings[0]);
-        }
-        return [];
-    }
-    visitAttr(token) {
-        const attr = super.visitAttr(token, {
-            quoteSet: [
-                { start: '"', end: '"', type: 'string' },
-                { start: "'", end: "'", type: 'string' },
-                { start: '{', end: '}', type: 'script' },
-            ],
-            startState: 
-            // is shorthand attribute
-            token.raw.trim().startsWith('{') ? AttrState.BeforeValue : AttrState.BeforeName,
-        });
-        if (attr.type === 'spread') {
-            return attr;
-        }
-        let isDynamicValue = attr.startQuote.raw === '{' || undefined;
-        let potentialName;
-        let isDirective;
-        let isDuplicatable = false;
-        if (isDynamicValue && attr.name.raw === '') {
-            potentialName = attr.value.raw;
-        }
-        const [baseName, subName] = attr.name.raw.split(':');
-        if (subName) {
-            isDirective = true;
-            if (baseName === 'bind' && !this.specificBindDirective.has(subName)) {
-                potentialName = subName;
-                isDirective = undefined;
-                isDynamicValue = true;
-            }
-        }
-        if (baseName?.toLowerCase() === 'class') {
-            isDuplicatable = true;
-            if (subName) {
-                potentialName = 'class';
-                isDynamicValue = true;
-            }
-        }
-        if (attr.startQuote.raw === '{' && attr.endQuote.raw === '}') {
-            isDynamicValue = true;
-        }
-        return {
-            ...attr,
-            isDynamicValue,
-            isDirective,
-            isDuplicatable,
-            potentialName,
-        };
-    }
-    /**
-     * > A lowercase tag, like `<div>`, denotes a regular HTML element.
-     * A capitalised tag, such as `<Widget>` or `<Namespace.Widget>`, indicates a component.
-     *
-     * @see https://svelte.io/docs/basic-markup#tags
-     * @param nodeName
-     * @returns
-     */
-    detectElementType(nodeName) {
-        return super.detectElementType(nodeName, /^[A-Z]|\./);
-    }
-    visitExpression(token, 
-    // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
-    originBlockNode) {
-        const props = ['', 'else', 'pending', 'then', 'catch'];
-        const expressions = [];
-        if (originBlockNode.type === 'IfBlock') {
-            const ifElseBlocks = __classPrivateFieldGet(this, _SvelteParser_instances, "m", _SvelteParser_traverseIfBlock).call(this, originBlockNode);
-            for (const ifElseBlock of ifElseBlocks) {
-                const expression = this.visitPsBlock({
-                    ...ifElseBlock,
-                    depth: token.depth,
-                    parentNode: token.parentNode,
-                    nodeName: ifElseBlock.nodeName,
-                }, ifElseBlock.children, {
-                    if: 'if',
-                    elseif: 'if:elseif',
-                    else: 'if:else',
-                    '/if': 'end',
-                }[ifElseBlock.nodeName])[0];
-                expressions.push(expression);
-            }
-            return expressions;
-        }
-        const blockType = originBlockNode.type.toLowerCase().replace('block', '');
-        const nodeList = new Map();
-        for (const prop of props) {
-            let node = (originBlockNode[prop] ?? originBlockNode);
-            if (nodeList.has(node)) {
-                continue;
-            }
-            if (node.type === 'ElseBlock' && node.children?.[0]?.elseif) {
-                node = node.children[0];
-                while (node != null) {
-                    if (!['IfBlock', 'ElseBlock'].includes(node.type)) {
-                        break;
-                    }
-                    const type = node.elseif ? 'if:elseif' : 'if:else';
-                    nodeList.set(node, type);
-                    node = node.else ?? node.children?.[0] ?? null;
-                }
-                continue;
-            }
-            const typeMap = {
-                if: 'if',
-                else: 'if:else',
-                each: 'each',
-                pending: 'await',
-                then: 'await:then', // eslint-disable-line unicorn/no-thenable
-                catch: 'await:catch',
-            };
-            const type = typeMap[prop || blockType] ?? null;
-            nodeList.set(node, type);
-        }
-        let lastChild = null;
-        for (const [node, _type] of nodeList.entries()) {
-            let type = _type;
-            let start = node.start;
-            let end = node.end;
-            if (type === 'await') {
-                start = originBlockNode.start;
-            }
-            end = node.children?.[0]?.start ?? end;
-            if (type === 'if:else' && originBlockNode.type === 'EachBlock') {
-                type = 'each:empty';
-                start = lastChild?.end ?? start;
-            }
-            if (['if:else', 'if:elseif'].includes(type) &&
-                originBlockNode.type === 'IfBlock') {
-                start = lastChild?.end ?? start;
-            }
-            const tag = this.sliceFragment(start, end);
-            if (type === 'if:else' && node.type === 'ElseBlock' && node.children?.[0]?.type === 'IfBlock') {
-                type = 'if:elseif';
-            }
-            if (node.children && Array.isArray(node.children)) {
-                lastChild = node.children.at(-1) ?? null;
-            }
-            if (tag.raw === '') {
-                continue;
-            }
-            const expression = this.visitPsBlock({
-                ...tag,
-                depth: token.depth,
-                parentNode: token.parentNode,
-                nodeName: type ?? blockType,
-            }, node.children, type)[0];
-            expressions.push(expression);
-        }
-        const lastText = this.sliceFragment(lastChild?.end ?? originBlockNode.end, originBlockNode.end);
-        if (lastText.raw) {
-            // Cut before whitespace
-            const index = lastText.raw.search(/\S/);
-            const lastToken = this.sliceFragment(lastText.startOffset + index, originBlockNode.end);
-            if (lastToken.raw) {
-                const expression = this.visitPsBlock({
-                    ...lastToken,
-                    depth: token.depth,
-                    parentNode: token.parentNode,
-                    nodeName: '/' + blockType,
-                }, [], 'end')[0];
-                expressions.push(expression);
-            }
-        }
-        return expressions;
-    }
-}
-_SvelteParser_instances = new WeakSet(), _SvelteParser_traverseIfBlock = function _SvelteParser_traverseIfBlock(
-// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
-originBlockNode, start, nodeName = 'if') {
-    const result = [];
-    start = start ?? originBlockNode.start;
-    const end = originBlockNode.children?.[0]?.start ?? originBlockNode.end;
-    const tag = this.sliceFragment(start, end);
-    const children = originBlockNode.children ?? [];
-    result.push({ ...tag, children, nodeName });
-    if (originBlockNode.else) {
-        if (originBlockNode.else.children[0].type === 'IfBlock') {
-            const elseif = __classPrivateFieldGet(this, _SvelteParser_instances, "m", _SvelteParser_traverseIfBlock).call(this, originBlockNode.else.children[0], children.at(-1)?.end, 'elseif');
-            result.push(...elseif);
-        }
-        else {
-            const start = children.at(-1)?.end ?? originBlockNode.end;
-            const end = originBlockNode.else.children[0].start;
-            const tag = this.sliceFragment(start, end);
-            result.push({
-                ...tag,
-                children: originBlockNode.else.children,
-                nodeName: 'else',
-            });
-        }
-    }
-    {
-        const start = result.at(-1)?.children.at(-1)?.end ?? originBlockNode.end;
-        const end = originBlockNode.end;
-        const tag = this.sliceFragment(start, end);
-        if (tag.raw) {
-            result.push({ ...tag, children: [], nodeName: '/if' });
-        }
-    }
-    return result;
-};
-export const parser = new SvelteParser();

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

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

package/lib/svelte-parser/index.js

@@ -1,10 +0,0 @@
-import { parse } from 'svelte/compiler';
-export function svelteParse(template) {
-    const ast = parse(template, { customElement: true });
-    const start = ast.html.start;
-    const children = ast.html.children ?? [];
-    if (children[0] && children[0].end === start) {
-        children.shift();
-    }
-    return children;
-}

package/lib/sveltekit-parser.d.ts

@@ -1,6 +0,0 @@
-import { HtmlParser } from '@markuplint/html-parser';
-declare class SvelteKitTemplateParser extends HtmlParser {
-    constructor();
-}
-export declare const parser: SvelteKitTemplateParser;
-export {};

package/lib/sveltekit-parser.js

@@ -1,15 +0,0 @@
-import { HtmlParser } from '@markuplint/html-parser';
-class SvelteKitTemplateParser extends HtmlParser {
-    constructor() {
-        super({
-            ignoreTags: [
-                {
-                    type: 'sveltekit-placeholder',
-                    start: '%sveltekit.',
-                    end: '%',
-                },
-            ],
-        });
-    }
-}
-export const parser = new SvelteKitTemplateParser();