@markuplint/pug-parser 3.12.0 → 4.0.0-alpha.10

package/package.json

@@ -1,12 +1,17 @@
 {
 	"name": "@markuplint/pug-parser",
-	"version": "3.12.0",
+	"version": "4.0.0-alpha.10",
 	"description": "Pug parser for markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
 	"license": "MIT",
 	"private": false,
-	"main": "lib/index.js",
+	"type": "module",
+	"exports": {
+		".": {
+			"import": "./lib/index.js"
+		}
+	},
 	"types": "lib/index.d.ts",
 	"publishConfig": {
 		"access": "public"
@@ -16,12 +21,11 @@
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@markuplint/html-parser": "3.13.0",
-		"@markuplint/ml-ast": "3.2.0",
-		"@markuplint/parser-utils": "3.13.0",
+		"@markuplint/html-parser": "4.0.0-alpha.10",
+		"@markuplint/ml-ast": "4.0.0-alpha.10",
+		"@markuplint/parser-utils": "4.0.0-alpha.10",
 		"pug-lexer": "^5.0.1",
-		"pug-parser": "^6.0.0",
-		"tslib": "^2.6.2"
+		"pug-parser": "^6.0.0"
 	},
-	"gitHead": "b37b749d7ac0f9e6cbd022ee7031bc020c6677d3"
+	"gitHead": "b41153ea665aa8f091daf6114a06047f4ccb8350"
 }

package/lib/attr-tokenizer.d.ts

@@ -1,3 +0,0 @@
-import type { ASTAttr } from './pug-parser';
-import type { MLASTAttr } from '@markuplint/ml-ast';
-export default function attrTokenizer(attr: ASTAttr): MLASTAttr;

package/lib/attr-tokenizer.js

@@ -1,141 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const parser_utils_1 = require("@markuplint/parser-utils");
-function attrTokenizer(
-// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
-attr) {
-    var _a, _b, _c;
-    if (attr.raw[0] === '#' || attr.raw[0] === '.') {
-        let value = '';
-        if (typeof attr.val === 'string') {
-            [, , value] = (_a = attr.val.match(/(['"`]?)([^\1]+)(\1)/)) !== null && _a !== void 0 ? _a : ['', '', ''];
-        }
-        else {
-            value = `${attr.val}`;
-        }
-        return {
-            type: 'ps-attr',
-            uuid: (0, parser_utils_1.uuid)(),
-            raw: attr.raw,
-            startOffset: attr.offset,
-            endOffset: attr.endOffset,
-            startLine: attr.line,
-            endLine: attr.endLine,
-            startCol: attr.column,
-            endCol: attr.endColumn,
-            potentialName: attr.name,
-            potentialValue: value !== null && value !== void 0 ? value : '',
-            valueType: 'string',
-            isDuplicatable: attr.raw[0] === '.',
-            nodeName: '#pug-special-attr',
-            parentNode: null,
-            nextNode: null,
-            prevNode: null,
-            isFragment: false,
-            isGhost: false,
-        };
-    }
-    const spacesBeforeAttrString = '';
-    const nameChars = attr.name;
-    let spacesBeforeEqualChars;
-    let equalChars;
-    let spacesAfterEqualChars;
-    let quoteChars;
-    let valueChars;
-    let isDynamicValue = undefined;
-    if (attr.val === true) {
-        spacesBeforeEqualChars = '';
-        equalChars = '';
-        spacesAfterEqualChars = '';
-        quoteChars = '';
-        valueChars = '';
-    }
-    else {
-        const withoutName = attr.raw.slice(attr.name.length);
-        const valueOffset = withoutName.indexOf(attr.val);
-        const equalAndBeforeSpaceAfterSpace = withoutName.slice(0, valueOffset);
-        const [, before, equal, after] = (_b = equalAndBeforeSpaceAfterSpace.match(/^(\s*)(=)(\s*)$/)) !== null && _b !== void 0 ? _b : ['', '', '', ''];
-        const [, quote, coreValue] = (_c = attr.val.match(/(['"`]?)([^\1]+)(\1)/)) !== null && _c !== void 0 ? _c : ['', '', ''];
-        spacesBeforeEqualChars = before !== null && before !== void 0 ? before : '';
-        equalChars = equal !== null && equal !== void 0 ? equal : '';
-        spacesAfterEqualChars = after !== null && after !== void 0 ? after : '';
-        quoteChars = quote !== null && quote !== void 0 ? quote : '';
-        valueChars = coreValue !== null && coreValue !== void 0 ? coreValue : '';
-        if (quote === '`' || quote === '') {
-            isDynamicValue = true;
-        }
-    }
-    const invalid = !!(valueChars && quoteChars === null && /["'=<>`]/.test(valueChars)) ||
-        !!(equalChars && quoteChars === null && valueChars === null);
-    if (invalid) {
-        throw new Error('Parse error: It has invalid attribute');
-    }
-    let offset = attr.offset;
-    let line = attr.line;
-    let col = attr.column;
-    const attrToken = (0, parser_utils_1.tokenizer)(attr.raw, line, col, offset);
-    const spacesBeforeName = (0, parser_utils_1.tokenizer)(spacesBeforeAttrString, line, col, offset);
-    line = spacesBeforeName.endLine;
-    col = spacesBeforeName.endCol;
-    offset = spacesBeforeName.endOffset;
-    const name = (0, parser_utils_1.tokenizer)(nameChars, line, col, offset);
-    line = name.endLine;
-    col = name.endCol;
-    offset = name.endOffset;
-    const spacesBeforeEqual = (0, parser_utils_1.tokenizer)(spacesBeforeEqualChars, line, col, offset);
-    line = spacesBeforeEqual.endLine;
-    col = spacesBeforeEqual.endCol;
-    offset = spacesBeforeEqual.endOffset;
-    const equal = (0, parser_utils_1.tokenizer)(equalChars, line, col, offset);
-    line = equal.endLine;
-    col = equal.endCol;
-    offset = equal.endOffset;
-    const spacesAfterEqual = (0, parser_utils_1.tokenizer)(spacesAfterEqualChars, line, col, offset);
-    line = spacesAfterEqual.endLine;
-    col = spacesAfterEqual.endCol;
-    offset = spacesAfterEqual.endOffset;
-    const startQuote = (0, parser_utils_1.tokenizer)(quoteChars, line, col, offset);
-    line = startQuote.endLine;
-    col = startQuote.endCol;
-    offset = startQuote.endOffset;
-    const value = (0, parser_utils_1.tokenizer)(valueChars, line, col, offset);
-    line = value.endLine;
-    col = value.endCol;
-    offset = value.endOffset;
-    const endQuote = (0, parser_utils_1.tokenizer)(quoteChars, line, col, offset);
-    line = endQuote.endLine;
-    col = endQuote.endCol;
-    offset = endQuote.endOffset;
-    let isDuplicatable = false;
-    if (name.raw.toLowerCase() === 'class') {
-        isDuplicatable = true;
-    }
-    return {
-        type: 'html-attr',
-        uuid: (0, parser_utils_1.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,
-        isDynamicValue,
-        isDuplicatable,
-        nodeName: name.raw,
-        parentNode: null,
-        nextNode: null,
-        prevNode: null,
-        isFragment: false,
-        isGhost: false,
-    };
-}
-exports.default = attrTokenizer;

package/lib/parse.d.ts

@@ -1,2 +0,0 @@
-import type { Parse } from '@markuplint/ml-ast';
-export declare const parse: Parse;

package/lib/parse.js

@@ -1,250 +0,0 @@
-"use strict";
-var _Parser_ast;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parse = void 0;
-const tslib_1 = require("tslib");
-const html_parser_1 = require("@markuplint/html-parser");
-const parser_utils_1 = require("@markuplint/parser-utils");
-const attr_tokenizer_1 = tslib_1.__importDefault(require("./attr-tokenizer"));
-const pug_parser_1 = require("./pug-parser");
-const parse = (rawCode, options) => {
-    let unknownParseError;
-    let nodeList;
-    if (options === null || options === void 0 ? void 0 : options.ignoreFrontMatter) {
-        rawCode = (0, parser_utils_1.ignoreFrontMatter)(rawCode);
-    }
-    try {
-        const parser = new Parser(rawCode);
-        nodeList = parser.getNodeList();
-    }
-    catch (err) {
-        nodeList = [];
-        if (err instanceof Error && 'msg' in err && 'line' in err && 'column' in err && 'src' in err) {
-            throw new parser_utils_1.ParserError(
-            // @ts-ignore
-            err.msg, {
-                // @ts-ignore
-                line: err.line,
-                // @ts-ignore
-                col: err.column,
-                // @ts-ignore
-                raw: err.src,
-            });
-        }
-        unknownParseError = err instanceof Error ? err.message : new Error(`${err}`).message;
-    }
-    return {
-        nodeList,
-        isFragment: (0, html_parser_1.isDocumentFragment)(rawCode),
-        unknownParseError: unknownParseError,
-    };
-};
-exports.parse = parse;
-class Parser {
-    constructor(raw) {
-        _Parser_ast.set(this, void 0);
-        tslib_1.__classPrivateFieldSet(this, _Parser_ast, (0, pug_parser_1.pugParse)(raw), "f");
-        // console.log(JSON.stringify(this.#ast, null, 2));
-    }
-    flattenNodes(
-    // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
-    nodeTree) {
-        const nodeOrders = [];
-        (0, parser_utils_1.walk)(nodeTree, node => {
-            nodeOrders.push(node);
-        });
-        (0, parser_utils_1.removeDeprecatedNode)(nodeOrders);
-        return nodeOrders;
-    }
-    getNodeList() {
-        const nodeTree = this.traverse(tslib_1.__classPrivateFieldGet(this, _Parser_ast, "f").nodes, null);
-        return this.flattenNodes(nodeTree);
-    }
-    nodeize(
-    // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
-    originNode, 
-    // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
-    prevNode, 
-    // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
-    parentNode) {
-        var _a;
-        const nextNode = null;
-        const startOffset = originNode.offset;
-        const endOffset = originNode.endOffset;
-        const startLine = originNode.line;
-        const endLine = originNode.endLine;
-        const startCol = originNode.column;
-        const endCol = originNode.endColumn;
-        const parentNamespace = parentNode && 'namespace' in parentNode ? parentNode.namespace : 'http://www.w3.org/1999/xhtml';
-        switch (originNode.type) {
-            case 'Doctype': {
-                return {
-                    uuid: (0, parser_utils_1.uuid)(),
-                    raw: originNode.raw,
-                    name: (_a = originNode.val) !== null && _a !== void 0 ? _a : '',
-                    // TODO:
-                    publicId: '',
-                    // TODO:
-                    systemId: '',
-                    startOffset,
-                    endOffset,
-                    startLine,
-                    endLine,
-                    startCol,
-                    endCol,
-                    nodeName: '#doctype',
-                    type: 'doctype',
-                    parentNode,
-                    prevNode,
-                    _addPrevNode: 102,
-                    nextNode,
-                    isFragment: false,
-                    isGhost: false,
-                };
-            }
-            case 'Text': {
-                if (parentNode && /^script$|^style$/i.test(parentNode.nodeName)) {
-                    return {
-                        uuid: (0, parser_utils_1.uuid)(),
-                        raw: originNode.raw,
-                        startOffset,
-                        endOffset,
-                        startLine,
-                        endLine,
-                        startCol,
-                        endCol,
-                        nodeName: '#text',
-                        type: 'text',
-                        parentNode,
-                        prevNode,
-                        nextNode,
-                        isFragment: false,
-                        isGhost: false,
-                    };
-                }
-                const htmlDoc = (0, html_parser_1.parse)(originNode.raw, {
-                    offsetOffset: originNode.offset,
-                    offsetLine: originNode.line - 1,
-                    offsetColumn: originNode.column - 1,
-                });
-                const nodes = htmlDoc.nodeList.filter(node => {
-                    return node.parentNode == null && node.type !== 'endtag';
-                });
-                return nodes;
-            }
-            case 'Comment': {
-                return {
-                    uuid: (0, parser_utils_1.uuid)(),
-                    raw: originNode.raw,
-                    startOffset,
-                    endOffset,
-                    startLine,
-                    endLine,
-                    startCol,
-                    endCol,
-                    nodeName: '#comment',
-                    type: 'comment',
-                    parentNode,
-                    prevNode,
-                    nextNode,
-                    isFragment: false,
-                    isGhost: false,
-                };
-            }
-            case 'Tag': {
-                const namespace = (0, html_parser_1.getNamespace)(originNode.name, parentNamespace);
-                const tag = {
-                    uuid: (0, parser_utils_1.uuid)(),
-                    raw: originNode.raw,
-                    startOffset,
-                    endOffset,
-                    startLine,
-                    endLine,
-                    startCol,
-                    endCol,
-                    nodeName: originNode.name,
-                    type: 'starttag',
-                    namespace,
-                    elementType: (0, parser_utils_1.detectElementType)(originNode.name),
-                    attributes: originNode.attrs.map(attr => (0, attr_tokenizer_1.default)(attr)),
-                    hasSpreadAttr: false,
-                    parentNode,
-                    prevNode,
-                    nextNode,
-                    pearNode: null,
-                    selfClosingSolidus: (0, parser_utils_1.tokenizer)('', originNode.line, originNode.column, originNode.offset),
-                    endSpace: (0, parser_utils_1.tokenizer)('', originNode.line, originNode.column, originNode.offset),
-                    isFragment: false,
-                    isGhost: false,
-                    tagOpenChar: '',
-                    tagCloseChar: '',
-                };
-                if (originNode.block.nodes.length > 0) {
-                    tag.childNodes = this.traverse(originNode.block.nodes, tag);
-                }
-                return tag;
-            }
-            default: {
-                const tag = {
-                    uuid: (0, parser_utils_1.uuid)(),
-                    raw: originNode.raw,
-                    startOffset,
-                    endOffset,
-                    startLine,
-                    endLine,
-                    startCol,
-                    endCol,
-                    type: 'psblock',
-                    nodeName: originNode.type,
-                    parentNode,
-                    prevNode,
-                    nextNode,
-                    isFragment: true,
-                    isGhost: false,
-                };
-                if ('block' in originNode && originNode.block && originNode.block.nodes.length > 0) {
-                    tag.childNodes = this.traverse(originNode.block.nodes, tag);
-                }
-                return tag;
-            }
-        }
-    }
-    traverse(
-    // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
-    astNodes, parentNode = null) {
-        const nodeList = [];
-        let prevNode = null;
-        for (const astNode of astNodes) {
-            const nodes = this.nodeize(astNode, prevNode, parentNode);
-            if (!nodes || (Array.isArray(nodes) && nodes.length === 0)) {
-                continue;
-            }
-            let node;
-            if (Array.isArray(nodes)) {
-                const lastNode = nodes[nodes.length - 1];
-                if (!lastNode) {
-                    continue;
-                }
-                node = lastNode;
-            }
-            else {
-                node = nodes;
-            }
-            if (prevNode) {
-                if (node.type !== 'endtag') {
-                    prevNode.nextNode = node;
-                }
-                node.prevNode = prevNode;
-            }
-            prevNode = node;
-            if (Array.isArray(nodes)) {
-                nodeList.push(...nodes);
-            }
-            else {
-                nodeList.push(nodes);
-            }
-        }
-        return nodeList;
-    }
-}
-_Parser_ast = new WeakMap();