wikiparser-node 1.2.0 → 1.3.0

package/dist/addon/table.js

@@ -1,5 +1,5 @@
 "use strict";
-/* eslint operator-linebreak: [2, "before", {overrides: {"=": "after"}}] */
+/* eslint @stylistic/operator-linebreak: [2, "before", {overrides: {"=": "after"}}] */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Layout = void 0;
 const assert = require("assert/strict");

package/dist/base.d.ts

@@ -23,7 +23,6 @@ export interface LintError {
     readonly startCol: number;
     readonly endLine: number;
     readonly endCol: number;
-    readonly excerpt: string;
 }
 /** 类似Node */
 export interface AstNode {

package/dist/lib/text.js

@@ -4,7 +4,7 @@ exports.AstText = void 0;
 const constants_1 = require("../util/constants");
 const Parser = require("../index");
 const node_1 = require("./node");
-const errorSyntax = /https?:\/\/|\{+|\}+|\[{2,}|\[(?![^[]*\])|(?<=^|\])([^[]*?)\]+|\]{2,}|<\s*\/?([a-z]\w*)/giu, errorSyntaxUrl = /\{+|\}+|\[{2,}|\[(?![^[]*\])|(?<=^|\])([^[]*?)\]+|\]{2,}|<\s*\/?([a-z]\w*)/giu, disallowedTags = [
+const errorSyntax = /https?[:/]\/+|\{+|\}+|\[{2,}|\[(?![^[]*\])|(?<=^|\])([^[]*?)\]+|\]{2,}|<\s*\/?([a-z]\w*)/giu, errorSyntaxUrl = /\{+|\}+|\[{2,}|\[(?![^[]*\])|(?<=^|\])([^[]*?)\]+|\]{2,}|<\s*\/?([a-z]\w*)/giu, disallowedTags = [
     'html',
     'base',
     'head',
@@ -94,6 +94,7 @@ class AstText extends node_1.AstNode {
             throw new Error('无法对孤立文本节点进行语法分析！');
         }
         const { type, name } = parentNode, nextType = nextSibling?.type, previousType = previousSibling?.type, errorRegex = type === 'free-ext-link' || type === 'ext-link-url' || type === 'image-parameter' && name === 'link'
+            || type === 'attr-value'
             ? errorSyntaxUrl
             : errorSyntax, errors = [...data.matchAll(errorRegex)], { ext, html } = this.getRootNode().getAttribute('config');
         if (errors.length > 0) {
@@ -105,7 +106,7 @@ class AstText extends node_1.AstNode {
                     index += length;
                     error = error.slice(length);
                 }
-                const startIndex = start + index, lines = data.slice(0, index).split('\n'), startLine = lines.length + top - 1, line = lines.at(-1), startCol = lines.length === 1 ? left + line.length : line.length, { 0: char, length } = error, endIndex = startIndex + length, end = char === '}' || char === ']' ? endIndex + 1 : startIndex + 49, rootStr = String(root), nextChar = rootStr[endIndex], previousChar = rootStr[startIndex - 1], severity = length > 1 && (char !== '<' || /[\s/>]/u.test(nextChar ?? ''))
+                const startIndex = start + index, lines = data.slice(0, index).split('\n'), startLine = lines.length + top - 1, line = lines.at(-1), startCol = lines.length === 1 ? left + line.length : line.length, { 0: char, length } = error, endIndex = startIndex + length, rootStr = String(root), nextChar = rootStr[endIndex], previousChar = rootStr[startIndex - 1], severity = length > 1 && (char !== '<' || /[\s/>]/u.test(nextChar ?? ''))
                     || char === '{' && (nextChar === char || previousChar === '-')
                     || char === '}' && (previousChar === char || nextChar === '-')
                     || char === '[' && (nextChar === char || type === 'ext-link-text'
@@ -114,7 +115,7 @@ class AstText extends node_1.AstNode {
                         || !data.slice(0, index).trim() && previousType === 'free-ext-link')
                     ? 'error'
                     : 'warning';
-                return (char !== 'h' || index > 0) && (char !== '<' || tags.has(tag.toLowerCase())) && {
+                return (char !== '<' || tags.has(tag.toLowerCase())) && {
                     message: Parser.msg('lonely "$1"', char === 'h' ? error : char),
                     severity,
                     startIndex,
@@ -123,7 +124,6 @@ class AstText extends node_1.AstNode {
                     endLine: startLine,
                     startCol,
                     endCol: startCol + length,
-                    excerpt: rootStr.slice(Math.max(0, end - 50), end),
                 };
             }).filter(Boolean);
         }

package/dist/parser/table.js

@@ -62,7 +62,7 @@ const parseTable = ({ firstChild: { data }, type, name }, config = Parser.getCon
             out += `\n${outLine}`;
             continue;
         }
-        // eslint-disable-next-line operator-linebreak
+        // eslint-disable-next-line @stylistic/operator-linebreak
         const matches = /^(?:(\|\}|\0\d+!\x7F\}|\0\d+\}\x7F)|(\|-+|\0\d+!\x7F-+|\0\d+-\x7F-*)(?!-)|(!|(?:\||\0\d+!\x7F)\+?))(.*)$/u
             .exec(line);
         if (!matches) {

package/dist/src/arg.js

@@ -79,12 +79,11 @@ class ArgToken extends index_1.Token {
         if (rest.length > 0) {
             const rect = { start, ...this.getRootNode().posFromIndex(start) };
             errors.push(...rest.map(child => {
-                const error = (0, lint_1.generateForChild)(child, rect, 'invisible content inside triple braces'), { startIndex, startCol, excerpt, } = error;
+                const error = (0, lint_1.generateForChild)(child, rect, 'invisible content inside triple braces');
                 return {
                     ...error,
-                    startIndex: startIndex - 1,
-                    startCol: startCol - 1,
-                    excerpt: `|${excerpt}`,
+                    startIndex: error.startIndex - 1,
+                    startCol: error.startCol - 1,
                 };
             }));
         }

package/dist/src/attribute.js

@@ -271,12 +271,11 @@ class AttributeToken extends (0, fixed_1.fixed)(index_1.Token) {
         if (!balanced) {
             const root = this.getRootNode();
             rect = { start, ...root.posFromIndex(start) };
-            const e = (0, lint_1.generateForChild)(lastChild, rect, 'unclosed quotes', 'warning'), startIndex = e.startIndex - 1;
+            const e = (0, lint_1.generateForChild)(lastChild, rect, 'unclosed quotes', 'warning');
             errors.push({
                 ...e,
-                startIndex,
+                startIndex: e.startIndex - 1,
                 startCol: e.startCol - 1,
-                excerpt: String(root).slice(startIndex, startIndex + 50),
             });
         }
         if (extAttrs[tag] && !extAttrs[tag].has(name)

package/dist/src/attributes.js

@@ -151,10 +151,7 @@ class AttributesToken extends index_1.Token {
             const attr = childNodes[i];
             if (attr instanceof atom_1.AtomToken && attr.text().trim()) {
                 rect ??= { start, ...this.getRootNode().posFromIndex(start) };
-                errors.push({
-                    ...(0, lint_1.generateForChild)(attr, rect, 'containing invalid attribute'),
-                    excerpt: childNodes.slice(i).map(String).join('').slice(0, 50),
-                });
+                errors.push((0, lint_1.generateForChild)(attr, rect, 'containing invalid attribute'));
             }
             else if (attr instanceof attribute_1.AttributeToken) {
                 const { name } = attr;

package/dist/src/converterFlags.js

@@ -75,8 +75,7 @@ class ConverterFlagsToken extends index_1.Token {
             const child = childNodes[i], flag = child.text().trim();
             if (flag && !variantFlags.has(flag) && !unknownFlags.has(flag)
                 && (variantFlags.size > 0 || !validFlags.has(flag))) {
-                const error = (0, lint_1.generateForChild)(child, rect, 'invalid conversion flag');
-                errors.push({ ...error, excerpt: childNodes.slice(0, i + 1).map(String).join(';').slice(-50) });
+                errors.push((0, lint_1.generateForChild)(child, rect, 'invalid conversion flag'));
             }
         }
         return errors;

package/dist/src/gallery.js

@@ -73,7 +73,6 @@ class GalleryToken extends index_1.Token {
                     endLine: startLine,
                     startCol,
                     endCol: startCol + length,
-                    excerpt: String(child).slice(0, 50),
                 });
             }
             else if (child.type !== 'noinclude' && child.type !== 'text') {

package/dist/src/heading.js

@@ -81,14 +81,13 @@ class HeadingToken extends (0, sol_1.sol)((0, fixed_1.fixed)(index_1.Token)) {
     /** @override */
     lint(start = this.getAbsoluteIndex()) {
         const errors = super.lint(start), { firstChild } = this, innerStr = String(firstChild);
-        const equals = this.#equals, excerpt = `${equals}${innerStr}${equals}`.slice(0, 50);
         let refError;
         if (this.level === 1) {
-            refError = { ...(0, lint_1.generateForChild)(firstChild, { start }, '<h1>'), excerpt };
+            refError = (0, lint_1.generateForChild)(firstChild, { start }, '<h1>');
             errors.push(refError);
         }
         if (innerStr.startsWith('=') || innerStr.endsWith('=')) {
-            refError ??= { ...(0, lint_1.generateForChild)(firstChild, { start }, ''), excerpt };
+            refError ??= (0, lint_1.generateForChild)(firstChild, { start }, '');
             errors.push({ ...refError, message: Parser.msg('unbalanced "=" in a section header') });
         }
         if (this.closest('html-attrs, table-attrs')) {

package/dist/src/html.js

@@ -96,20 +96,16 @@ class HtmlToken extends (0, attributesParent_1.attributesParent)((0, fixed_1.fix
     /** @override */
     lint(start = this.getAbsoluteIndex()) {
         const errors = super.lint(start);
-        let wikitext;
         let refError;
         if (this.name === 'h1' && !this.closing) {
-            wikitext = String(this.getRootNode());
             refError = (0, lint_1.generateForSelf)(this, { start }, '<h1>');
-            errors.push({ ...refError, excerpt: wikitext.slice(start, start + 50) });
+            errors.push(refError);
         }
         if (this.closest('table-attrs')) {
-            wikitext ??= String(this.getRootNode());
             refError ??= (0, lint_1.generateForSelf)(this, { start }, '');
             errors.push({
                 ...refError,
                 message: Parser.msg('HTML tag in table attributes'),
-                excerpt: wikitext.slice(Math.max(0, start - 25), start + 25),
             });
         }
         try {
@@ -118,17 +114,13 @@ class HtmlToken extends (0, attributesParent_1.attributesParent)((0, fixed_1.fix
         catch (e) {
             if (e instanceof SyntaxError) {
                 const { message: errorMsg } = e;
-                wikitext ??= String(this.getRootNode());
                 refError ??= (0, lint_1.generateForSelf)(this, { start }, '');
                 const [msg] = errorMsg.split(':'), error = { ...refError, message: Parser.msg(msg) };
                 if (msg === 'unclosed tag') {
                     error.severity = 'warning';
-                    error.excerpt = wikitext.slice(start, start + 50);
                 }
                 else if (msg === 'unmatched closing tag') {
-                    const end = start + String(this).length;
                     const ancestor = this.closest('magic-word');
-                    error.excerpt = wikitext.slice(Math.max(0, end - 50), end);
                     if (ancestor && magicWords.has(ancestor.name)) {
                         error.severity = 'warning';
                     }

package/dist/src/magicLink.js

@@ -74,7 +74,6 @@ class MagicLinkToken extends (0, syntax_1.syntax)(index_1.Token) {
                     endLine: startLine,
                     startCol,
                     endCol: startCol + s.length,
-                    excerpt: data.slice(Math.max(0, index - 25), index + 25),
                 };
             }));
         }

package/dist/src/nowiki/quote.js

@@ -14,10 +14,8 @@ class QuoteToken extends (0, syntax_1.syntax)(base_1.NowikiBaseToken, /^(?:'{5}|
     lint(start = this.getAbsoluteIndex()) {
         const { previousSibling, nextSibling } = this, message = Parser.msg('lonely "$1"', `'`), errors = [];
         let refError;
-        let wikitext;
         if (previousSibling?.type === 'text' && previousSibling.data.endsWith(`'`)) {
             refError = (0, lint_1.generateForSelf)(this, { start }, message);
-            wikitext = String(this.getRootNode());
             const { startIndex: endIndex, startLine: endLine, startCol: endCol } = refError, [{ length }] = /(?<!')'+$/u.exec(previousSibling.data), startIndex = start - length;
             errors.push({
                 ...refError,
@@ -26,12 +24,10 @@ class QuoteToken extends (0, syntax_1.syntax)(base_1.NowikiBaseToken, /^(?:'{5}|
                 startCol: endCol - length,
                 endLine,
                 endCol,
-                excerpt: wikitext.slice(startIndex, startIndex + 50),
             });
         }
         if (nextSibling?.type === 'text' && nextSibling.data.startsWith(`'`)) {
             refError ??= (0, lint_1.generateForSelf)(this, { start }, message);
-            wikitext ??= String(this.getRootNode());
             const { endIndex: startIndex, endLine: startLine, endCol: startCol } = refError, [{ length }] = /^'+/u.exec(nextSibling.data), endIndex = startIndex + length;
             errors.push({
                 ...refError,
@@ -40,7 +36,6 @@ class QuoteToken extends (0, syntax_1.syntax)(base_1.NowikiBaseToken, /^(?:'{5}|
                 startLine,
                 startCol,
                 endCol: startCol + length,
-                excerpt: wikitext.slice(Math.max(0, endIndex - 50), endIndex),
             });
         }
         return errors;

package/dist/src/parameter.js

@@ -107,7 +107,7 @@ class ParameterToken extends (0, fixed_1.fixed)(index_1.Token) {
     }
     /** @override */
     lint(start = this.getAbsoluteIndex()) {
-        const errors = super.lint(start), { firstChild, lastChild, } = this, link = new RegExp(`https?://${string_1.extUrlCharFirst}${string_1.extUrlChar}$`, 'iu')
+        const errors = super.lint(start), { firstChild } = this, link = new RegExp(`https?://${string_1.extUrlCharFirst}${string_1.extUrlChar}$`, 'iu')
             .exec(firstChild.toString(new Set(['comment', 'noinclude', 'include'])))?.[0];
         if (link && new URL(link).search) {
             const e = (0, lint_1.generateForChild)(firstChild, { start }, 'unescaped query string in an anonymous parameter');
@@ -118,7 +118,6 @@ class ParameterToken extends (0, fixed_1.fixed)(index_1.Token) {
                 startLine: e.endLine,
                 startCol: e.endCol,
                 endCol: e.endCol + 1,
-                excerpt: `${String(firstChild).slice(-25)}=${String(lastChild).slice(0, 25)}`,
             });
         }
         return errors;

package/dist/src/table/index.js

@@ -40,8 +40,7 @@ class TableToken extends trBase_1.TrBaseToken {
     lint(start = this.getAbsoluteIndex()) {
         const errors = super.lint(start);
         if (!this.closed) {
-            const { firstChild, lastChild: tr, } = this, { lastChild } = tr, error = (0, lint_1.generateForChild)(firstChild, { start }, 'unclosed table');
-            errors.push({ ...error, excerpt: String(lastChild?.type === 'td' ? lastChild : tr).slice(0, 50) });
+            errors.push((0, lint_1.generateForChild)(this.firstChild, { start }, 'unclosed table'));
         }
         return errors;
     }

package/dist/src/table/trBase.js

@@ -38,7 +38,6 @@ class TrBaseToken extends base_1.TableBaseToken {
             startIndex: error.startIndex + 1,
             startLine: error.startLine + 1,
             startCol: 0,
-            excerpt: error.excerpt.slice(1),
         });
         return errors;
     }

package/dist/src/tagPair/ext.js

@@ -122,8 +122,8 @@ class ExtToken extends (0, attributesParent_1.attributesParent)(index_2.TagPairT
     lint(start = this.getAbsoluteIndex()) {
         const errors = super.lint(start);
         if (this.name !== 'nowiki' && this.closest('html-attrs, table-attrs')) {
-            const root = this.getRootNode(), excerpt = String(root).slice(Math.max(0, start - 25), start + 25), rect = { start, ...root.posFromIndex(start) };
-            errors.push({ ...(0, lint_1.generateForSelf)(this, rect, 'extension tag in HTML tag attributes'), excerpt });
+            const rect = { start, ...this.getRootNode().posFromIndex(start) };
+            errors.push((0, lint_1.generateForSelf)(this, rect, 'extension tag in HTML tag attributes'));
         }
         return errors;
     }

package/dist/util/lint.js

@@ -10,17 +10,16 @@ const Parser = require("../index");
  * @param severity 严重程度
  */
 const generateForChild = (child, boundingRect, msg, severity = 'error') => {
-    const index = child.getRelativeIndex(), { offsetHeight, offsetWidth, parentNode } = child, { top: offsetTop, left: offsetLeft } = parentNode.posFromIndex(index), { start } = boundingRect, { top, left } = 'top' in boundingRect ? boundingRect : child.getRootNode().posFromIndex(start), str = String(child), startIndex = start + index, startLine = top + offsetTop, startCol = offsetTop ? offsetLeft : left + offsetLeft;
+    const index = child.getRelativeIndex(), { offsetHeight, offsetWidth, parentNode } = child, { top: offsetTop, left: offsetLeft } = parentNode.posFromIndex(index), { start } = boundingRect, { top, left } = 'top' in boundingRect ? boundingRect : child.getRootNode().posFromIndex(start), startIndex = start + index, startLine = top + offsetTop, startCol = offsetTop ? offsetLeft : left + offsetLeft;
     return {
         message: Parser.msg(msg),
         severity,
         startIndex,
-        endIndex: startIndex + str.length,
+        endIndex: startIndex + String(child).length,
         startLine,
         endLine: startLine + offsetHeight - 1,
         startCol,
         endCol: offsetHeight === 1 ? startCol + offsetWidth : offsetWidth,
-        excerpt: str.slice(0, 50),
     };
 };
 exports.generateForChild = generateForChild;
@@ -32,17 +31,16 @@ exports.generateForChild = generateForChild;
  * @param severity 严重程度
  */
 const generateForSelf = (token, boundingRect, msg, severity = 'error') => {
-    const { start } = boundingRect, { offsetHeight, offsetWidth } = token, str = String(token), { top, left } = 'top' in boundingRect ? boundingRect : token.getRootNode().posFromIndex(start);
+    const { start } = boundingRect, { offsetHeight, offsetWidth } = token, { top, left } = 'top' in boundingRect ? boundingRect : token.getRootNode().posFromIndex(start);
     return {
         message: Parser.msg(msg),
         severity,
         startIndex: start,
-        endIndex: start + str.length,
+        endIndex: start + String(token).length,
         startLine: top,
         endLine: top + offsetHeight - 1,
         startCol: left,
         endCol: offsetHeight === 1 ? left + offsetWidth : offsetWidth,
-        excerpt: str.slice(0, 50),
     };
 };
 exports.generateForSelf = generateForSelf;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikiparser-node",
-	"version": "1.2.0",
+	"version": "1.3.0",
 	"description": "A Node.js parser for MediaWiki markup with AST",
 	"keywords": [
 		"mediawiki",
@@ -39,6 +39,7 @@
 	},
 	"devDependencies": {
 		"@cypress/request": "^3.0.1",
+		"@stylistic/eslint-plugin": "^1.5.3",
 		"@types/node": "^20.9.0",
 		"@types/request": "^2.48.12",
 		"@typescript-eslint/eslint-plugin": "^6.12.0",