@markuplint/parser-utils 3.13.0 → 4.0.0-alpha.10

package/lib/script-parser.d.ts

@@ -0,0 +1,6 @@
+export declare function scriptParser(script: string): ScriptTokenType[];
+export declare function removeQuote(str: string): string;
+export type ScriptTokenType = {
+    type: 'Identifier' | 'Boolean' | 'Numeric' | 'String' | 'Template' | 'Punctuator';
+    value: string;
+};

package/lib/script-parser.js

@@ -0,0 +1,22 @@
+// @ts-ignore
+import { tokenize } from 'espree';
+export function scriptParser(script) {
+    const tokens = tokenize(script, {
+        ecmaVersion: 'latest',
+        loc: false,
+    });
+    return tokens.map((token) => ({
+        type: token.type,
+        value: token.value,
+    }));
+}
+export function removeQuote(str) {
+    const quote = str[0];
+    if (quote !== '"' && quote !== "'" && quote !== '`') {
+        return str;
+    }
+    if (str.at(-1) !== quote) {
+        return str;
+    }
+    return str.slice(1, -1);
+}

package/lib/sort-nodes.d.ts

@@ -0,0 +1,2 @@
+import type { MLASTNodeTreeItem } from '@markuplint/ml-ast';
+export declare function sortNodes(a: MLASTNodeTreeItem, b: MLASTNodeTreeItem): 1 | 0 | -1;

package/lib/sort-nodes.js

@@ -0,0 +1,18 @@
+export function sortNodes(a, b) {
+    if (a.startOffset === b.startOffset) {
+        return sort(a, b, 'endOffset');
+    }
+    return sort(a, b, 'startOffset');
+}
+function sort(a, b, key) {
+    if (Number.isNaN(a[key]) || Number.isNaN(b[key])) {
+        return 0;
+    }
+    if (a[key] < b[key]) {
+        return -1;
+    }
+    if (a[key] > b[key]) {
+        return 1;
+    }
+    return 0;
+}

package/lib/types.d.ts

@@ -1,18 +1,56 @@
+import type { EndTagType, MLASTParentNode, ParserOptions as ConfigParserOptions } from '@markuplint/ml-ast';
+export type ParserOptions = {
+    readonly booleanish?: boolean;
+    readonly endTagType?: EndTagType;
+    readonly ignoreTags?: readonly IgnoreTag[];
+    readonly maskChar?: string;
+    readonly tagNameCaseSensitive?: boolean;
+    readonly selfCloseType?: SelfCloseType;
+    readonly spaceChars?: readonly string[];
+    readonly rawTextElements?: readonly string[];
+};
+export type ParseOptions = ConfigParserOptions & {
+    readonly offsetOffset?: number;
+    readonly offsetLine?: number;
+    readonly offsetColumn?: number;
+    readonly depth?: number;
+};
+export type Tokenized<N extends {} = {}, State extends unknown = null> = {
+    readonly ast: N[];
+    readonly isFragment: boolean;
+    readonly state?: State;
+};
+export type Token = {
+    readonly raw: string;
+    readonly startOffset: number;
+    readonly startLine: number;
+    readonly startCol: number;
+};
+export type ChildToken = Token & {
+    readonly depth: number;
+    readonly parentNode: MLASTParentNode | null;
+};
+export type SelfCloseType = 'html' | 'xml' | 'html+xml';
 export type Code = {
-	readonly type: string;
-	readonly index: number;
-	readonly startTag: string;
-	readonly taggedCode: string;
-	readonly endTag: string | null;
+    readonly type: string;
+    readonly index: number;
+    readonly startTag: string;
+    readonly taggedCode: string;
+    readonly endTag: string | null;
+    resolved: boolean;
 };
 export type IgnoreTag = {
-	readonly type: string;
-	readonly start: Readonly<RegExp>;
-	readonly end: Readonly<RegExp>;
+    readonly type: string;
+    readonly start: Readonly<RegExp> | string;
+    readonly end: Readonly<RegExp> | string;
 };
 export type IgnoreBlock = {
-	readonly source: string;
-	readonly replaced: string;
-	readonly stack: readonly Code[];
-	readonly maskChar: string;
+    readonly source: string;
+    readonly replaced: string;
+    readonly stack: readonly Code[];
+    readonly maskChar: string;
+};
+export type QuoteSet = {
+    readonly start: string;
+    readonly end: string;
 };

package/lib/types.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/package.json

@@ -1,12 +1,20 @@
 {
 	"name": "@markuplint/parser-utils",
-	"version": "3.13.0",
+	"version": "4.0.0-alpha.10",
 	"description": "Utility module for markuplint parser plugin",
 	"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"
+		},
+		"./location": {
+			"import": "./lib/get-location.js"
+		}
+	},
 	"types": "lib/index.d.ts",
 	"publishConfig": {
 		"access": "public"
@@ -19,12 +27,13 @@
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@markuplint/ml-ast": "3.2.0",
-		"@markuplint/types": "3.12.0",
-		"@types/uuid": "^9.0.7",
-		"tslib": "^2.6.2",
-		"type-fest": "^4.8.2",
+		"@markuplint/ml-ast": "4.0.0-alpha.10",
+		"@markuplint/ml-spec": "4.0.0-alpha.10",
+		"@markuplint/types": "4.0.0-alpha.10",
+		"@types/uuid": "^9.0.8",
+		"espree": "^10.0.0",
+		"type-fest": "^4.10.1",
 		"uuid": "^9.0.1"
 	},
-	"gitHead": "b37b749d7ac0f9e6cbd022ee7031bc020c6677d3"
+	"gitHead": "b41153ea665aa8f091daf6114a06047f4ccb8350"
 }

package/lib/create-token.d.ts

@@ -1,9 +0,0 @@
-import type { MLToken } from '@markuplint/ml-ast';
-export declare function tokenizer(
-	raw: string | null,
-	startLine: number,
-	startCol: number,
-	startOffset: number,
-): MLToken;
-export declare function createTokenFromRawCode(raw: string | null, startOffset: number, rawCode: string): MLToken;
-export declare function uuid(): string;

package/lib/create-token.js

@@ -1,35 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.uuid = exports.createTokenFromRawCode = exports.tokenizer = void 0;
-const uuid_1 = require("uuid");
-const get_location_1 = require("./get-location");
-function tokenizer(raw, startLine, startCol, startOffset) {
-    raw = raw !== null && raw !== void 0 ? raw : '';
-    const endLine = (0, get_location_1.getEndLine)(raw, startLine);
-    const endCol = (0, get_location_1.getEndCol)(raw, startCol);
-    const endOffset = startOffset + raw.length;
-    return {
-        uuid: uuid(),
-        raw,
-        startOffset,
-        endOffset,
-        startLine,
-        endLine,
-        startCol,
-        endCol,
-    };
-}
-exports.tokenizer = tokenizer;
-function createTokenFromRawCode(raw, startOffset, rawCode) {
-    raw = raw !== null && raw !== void 0 ? raw : '';
-    const loc = (0, get_location_1.sliceFragment)(rawCode, startOffset, startOffset + raw.length);
-    return {
-        uuid: uuid(),
-        ...loc,
-    };
-}
-exports.createTokenFromRawCode = createTokenFromRawCode;
-function uuid() {
-    return (0, uuid_1.v4)();
-}
-exports.uuid = uuid;

package/lib/flatten-nodes.d.ts

@@ -1,2 +0,0 @@
-import type { MLASTNode } from '@markuplint/ml-ast';
-export declare function flattenNodes(nodeTree: MLASTNode[], rawHtml: string, createLastText?: boolean): MLASTNode[];

package/lib/flatten-nodes.js

@@ -1,251 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.flattenNodes = void 0;
-const tslib_1 = require("tslib");
-const remove_deprecated_node_1 = require("./remove-deprecated-node");
-const tag_splitter_1 = tslib_1.__importDefault(require("./tag-splitter"));
-const parser_utils_1 = require("@markuplint/parser-utils");
-function flattenNodes(
-// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
-nodeTree, rawHtml, createLastText = true) {
-    var _a, _b, _c, _d;
-    const nodeOrders = arrayize(nodeTree, rawHtml);
-    {
-        /**
-         * Correction prev/next/parent
-         */
-        let prevToken = null;
-        for (const node of nodeOrders) {
-            if (!prevToken) {
-                prevToken = node;
-                continue;
-            }
-            if (node.type !== 'endtag') {
-                prevToken = node;
-                continue;
-            }
-            const endTag = node;
-            if (endTag.nodeName.toLowerCase() === 'body' && prevToken.type === 'text') {
-                const prevWreckagesText = prevToken;
-                const wreckages = (0, tag_splitter_1.default)(prevWreckagesText.raw, prevWreckagesText.startLine, prevWreckagesText.startCol);
-                if (wreckages.length > 0 && wreckages[0]) {
-                    // console.log('wreckages\n', wreckages);
-                    const lastText = wreckages[0];
-                    const raw = lastText.raw;
-                    const startLine = lastText.line;
-                    const startCol = lastText.col;
-                    prevWreckagesText.raw = raw;
-                    prevWreckagesText.endOffset = prevWreckagesText.startOffset + raw.length;
-                    prevWreckagesText.startLine = startLine;
-                    prevWreckagesText.endLine = (0, parser_utils_1.getEndLine)(raw, startLine);
-                    prevWreckagesText.startCol = startCol;
-                    prevWreckagesText.endCol = (0, parser_utils_1.getEndCol)(raw, startCol);
-                }
-            }
-        }
-    }
-    (0, remove_deprecated_node_1.removeDeprecatedNode)(nodeOrders);
-    {
-        /**
-         * getting last node
-         */
-        let lastNode = null;
-        for (const node of nodeOrders) {
-            if (node.isGhost) {
-                continue;
-            }
-            lastNode = node;
-        }
-        if (lastNode) {
-            if (lastNode.type === 'text') {
-                // Correction for Parse5 AST
-                // prev node: ? -> html
-                lastNode.prevNode = (_b = (_a = lastNode.parentNode) === null || _a === void 0 ? void 0 : _a.parentNode) !== null && _b !== void 0 ? _b : lastNode.parentNode;
-                if (lastNode.prevNode) {
-                    lastNode.prevNode.nextNode = lastNode;
-                }
-                // parent node: body -> null
-                lastNode.parentNode = null;
-                // next node: ? -> null
-                lastNode.nextNode = null;
-            }
-            else if (createLastText) {
-                /**
-                 * create Last spaces
-                 */
-                let lastOffset = 0;
-                nodeOrders.forEach((node, i) => {
-                    lastOffset = Math.max(node.endOffset, lastOffset);
-                });
-                // console.log(lastOffset);
-                const lastTextContent = rawHtml.slice(lastOffset);
-                // console.log(`"${lastTextContent}"`);
-                if (lastTextContent) {
-                    const line = (_c = lastNode === null || lastNode === void 0 ? void 0 : lastNode.endLine) !== null && _c !== void 0 ? _c : 0;
-                    const col = (_d = lastNode === null || lastNode === void 0 ? void 0 : lastNode.endCol) !== null && _d !== void 0 ? _d : 0;
-                    const lastTextNode = {
-                        uuid: (0, parser_utils_1.uuid)(),
-                        raw: lastTextContent,
-                        startOffset: lastOffset,
-                        endOffset: lastOffset + lastTextContent.length,
-                        startLine: line,
-                        endLine: (0, parser_utils_1.getEndLine)(lastTextContent, line),
-                        startCol: col,
-                        endCol: (0, parser_utils_1.getEndCol)(lastTextContent, col),
-                        nodeName: '#text',
-                        type: 'text',
-                        parentNode: null,
-                        prevNode: lastNode,
-                        nextNode: null,
-                        isFragment: false,
-                        isGhost: false,
-                    };
-                    lastNode.nextNode = lastTextNode;
-                    if ((lastNode.type === 'starttag' || lastNode.type === 'endtag') && lastNode.pearNode) {
-                        lastNode.pearNode.nextNode = lastTextNode;
-                    }
-                    nodeOrders.push(lastTextNode);
-                }
-            }
-        }
-    }
-    /**
-     * concat text nodes
-     */
-    const result = [];
-    nodeOrders.forEach(node => {
-        var _a, _b;
-        const prevNode = (_a = result[result.length - 1]) !== null && _a !== void 0 ? _a : null;
-        if (node.type === 'text' && (prevNode === null || prevNode === void 0 ? void 0 : prevNode.type) === 'text') {
-            prevNode.raw = prevNode.raw + node.raw;
-            prevNode.endOffset = node.endOffset;
-            prevNode.endLine = node.endLine;
-            prevNode.endCol = node.endCol;
-            prevNode.nextNode = node.nextNode;
-            if (prevNode.parentNode) {
-                if (prevNode.parentNode.childNodes) {
-                    if (prevNode.parentNode.childNodes.findIndex(currentChild => currentChild.uuid === prevNode.uuid) === -1) {
-                        prevNode.parentNode.childNodes.unshift(prevNode);
-                    }
-                    else {
-                        prevNode.parentNode.childNodes = [prevNode];
-                    }
-                }
-                prevNode.parentNode.childNodes = (_b = prevNode.parentNode.childNodes) === null || _b === void 0 ? void 0 : _b.filter(n => n.uuid !== node.uuid);
-            }
-            if (node.nextNode) {
-                node.nextNode.prevNode = prevNode;
-            }
-            return;
-        }
-        result.push(node);
-    });
-    {
-        /**
-         * Correction prev/next/parent
-         */
-        let prevToken = null;
-        for (const node of result) {
-            if (!prevToken) {
-                prevToken = node;
-                continue;
-            }
-            if (((prevToken.type === 'endtag' && prevToken.nodeName.toLowerCase() === 'body') ||
-                prevToken.type === 'doctype') &&
-                node.type === 'text') {
-                const nextNode = prevToken.nextNode;
-                prevToken.nextNode = node;
-                if (prevToken.type === 'endtag' && prevToken.pearNode) {
-                    prevToken.pearNode.nextNode = node;
-                }
-                node.prevNode = prevToken;
-                node.nextNode = nextNode;
-                node.parentNode = prevToken.parentNode;
-            }
-            // EndTag
-            if (node.type === 'starttag' && node.pearNode) {
-                const endTag = node.pearNode;
-                endTag.pearNode = node;
-                endTag.prevNode = node.prevNode;
-                endTag.nextNode = node.nextNode;
-            }
-            // Children
-            if (node.type === 'text') {
-                const parent = node.parentNode;
-                if (parent && parent.type === 'starttag' && parent.nodeName.toLowerCase() === 'html') {
-                    if (parent.childNodes && !parent.childNodes.some(n => n.uuid === node.uuid)) {
-                        parent.childNodes.push(node);
-                    }
-                }
-            }
-            prevToken = node;
-        }
-    }
-    // console.log(nodeOrders.map((n, i) => `${i}: ${n.raw.trim()}`));
-    return result;
-}
-exports.flattenNodes = flattenNodes;
-function arrayize(
-// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
-nodeTree, rawHtml) {
-    const nodeOrders = [];
-    let prevLine = 1;
-    let prevCol = 1;
-    let currentEndOffset = 0;
-    /**
-     * pushing list
-     */
-    (0, parser_utils_1.walk)(nodeTree, node => {
-        var _a;
-        const diff = node.startOffset - currentEndOffset;
-        if (diff > 0) {
-            const html = rawHtml.slice(currentEndOffset, node.startOffset);
-            /**
-             * first white spaces
-             */
-            if (/^\s+$/.test(html)) {
-                const spaces = html;
-                const textNode = {
-                    uuid: (0, parser_utils_1.uuid)(),
-                    raw: spaces,
-                    startOffset: currentEndOffset,
-                    endOffset: currentEndOffset + spaces.length,
-                    startLine: prevLine,
-                    endLine: (0, parser_utils_1.getEndLine)(spaces, prevLine),
-                    startCol: prevCol,
-                    endCol: (0, parser_utils_1.getEndCol)(spaces, prevCol),
-                    nodeName: '#text',
-                    type: 'text',
-                    parentNode: node.parentNode,
-                    prevNode: node.prevNode,
-                    nextNode: node,
-                    isFragment: false,
-                    isGhost: false,
-                };
-                node.prevNode = textNode;
-                if (node.parentNode && node.parentNode.childNodes) {
-                    const newChildNodes = [...node.parentNode.childNodes];
-                    if (newChildNodes.some(child => {
-                        return (
-                        // Out of start offset
-                        textNode.endOffset < child.startOffset ||
-                            // Out of end offset
-                            child.endOffset < textNode.startOffset);
-                    })) {
-                        newChildNodes.push(textNode);
-                    }
-                    newChildNodes.sort((a, b) => a.startOffset - b.startOffset);
-                    node.parentNode.childNodes = newChildNodes;
-                }
-                nodeOrders.push(textNode);
-            }
-        }
-        currentEndOffset = node.startOffset + node.raw.length;
-        prevLine = node.endLine;
-        prevCol = node.endCol;
-        // for ghost nodes
-        node.endOffset = (_a = node.endOffset) !== null && _a !== void 0 ? _a : currentEndOffset;
-        nodeOrders.push(node);
-    });
-    return nodeOrders.slice();
-}

package/lib/get-space-before.d.ts

@@ -1 +0,0 @@
-export declare function getSpaceBefore(offset: number, rawCode: string): import('@markuplint/ml-ast').MLToken;

package/lib/get-space-before.js

@@ -1,13 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSpaceBefore = void 0;
-const create_token_1 = require("./create-token");
-function getSpaceBefore(offset, rawCode) {
-    var _a;
-    const aboveCode = rawCode.slice(0, offset);
-    const aboveAttrMatched = aboveCode.match(/\s+$/m);
-    const aboveAttrChar = (_a = aboveAttrMatched === null || aboveAttrMatched === void 0 ? void 0 : aboveAttrMatched[0]) !== null && _a !== void 0 ? _a : '';
-    const spacesBefore = (0, create_token_1.createTokenFromRawCode)(aboveAttrChar, offset - aboveAttrChar.length, rawCode);
-    return spacesBefore;
-}
-exports.getSpaceBefore = getSpaceBefore;

package/lib/idl-attributes.test.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/idl-attributes.test.js

@@ -1,45 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const idl_attributes_1 = require("./idl-attributes");
-it('basic', () => {
-    expect((0, idl_attributes_1.searchIDLAttribute)('class')).toStrictEqual({
-        idlPropName: 'className',
-        contentAttrName: 'class',
-    });
-    expect((0, idl_attributes_1.searchIDLAttribute)('for')).toStrictEqual({
-        idlPropName: 'htmlFor',
-        contentAttrName: 'for',
-    });
-    expect((0, idl_attributes_1.searchIDLAttribute)('className')).toStrictEqual({
-        idlPropName: 'className',
-        contentAttrName: 'class',
-    });
-    expect((0, idl_attributes_1.searchIDLAttribute)('htmlFor')).toStrictEqual({
-        idlPropName: 'htmlFor',
-        contentAttrName: 'for',
-    });
-    expect((0, idl_attributes_1.searchIDLAttribute)('tabindex')).toStrictEqual({
-        idlPropName: 'tabIndex',
-        contentAttrName: 'tabindex',
-    });
-    expect((0, idl_attributes_1.searchIDLAttribute)('tab-index')).toStrictEqual({
-        idlPropName: 'tabIndex',
-        contentAttrName: 'tabindex',
-    });
-    expect((0, idl_attributes_1.searchIDLAttribute)('TabIndex')).toStrictEqual({
-        idlPropName: 'tabIndex',
-        contentAttrName: 'tabindex',
-    });
-    expect((0, idl_attributes_1.searchIDLAttribute)('x')).toStrictEqual({
-        idlPropName: 'x',
-        contentAttrName: 'x',
-    });
-    expect((0, idl_attributes_1.searchIDLAttribute)('y')).toStrictEqual({
-        idlPropName: 'y',
-        contentAttrName: 'y',
-    });
-    expect((0, idl_attributes_1.searchIDLAttribute)('attribute-name')).toStrictEqual({
-        idlPropName: 'attributeName',
-        contentAttrName: 'attributeName',
-    });
-});

package/lib/parse-attr.d.ts

@@ -1,27 +0,0 @@
-import type { MLASTHTMLAttr } from '@markuplint/ml-ast';
-type ParseAttrOptions = {
-	readonly booleanish?: boolean;
-	readonly valueDelimiters?: readonly ValueDelimiter[];
-	readonly equal?: string;
-};
-type ValueDelimiter = {
-	readonly start: string;
-	readonly end: string;
-};
-export declare const defaultValueDelimiters: readonly ValueDelimiter[];
-export declare function parseAttr(raw: string, offset: number, html: string, options?: ParseAttrOptions): MLASTHTMLAttr;
-export declare function tokenize(
-	raw: string,
-	options?: ParseAttrOptions,
-): {
-	beforeName: string;
-	name: string;
-	afterName: string;
-	equal: string;
-	beforeValue: string;
-	startQuote: string;
-	value: string;
-	endQuote: string;
-	afterAttr: string;
-};
-export {};