wikilint 2.1.6 → 2.3.0

package/dist/lib/text.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AstText = void 0;
 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',
     'head',
     'style',
@@ -54,6 +54,7 @@ class AstText extends node_1.AstNode {
     lint(start = this.getAbsoluteIndex()) {
         const { data, parentNode, nextSibling, previousSibling } = this;
         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) {
@@ -74,7 +75,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,

package/dist/parser/links.js

@@ -13,7 +13,7 @@ const category_1 = require("../src/link/category");
  */
 const parseLinks = (wikitext, config = Parser.getConfig(), accum = []) => {
     const { parseQuotes } = require('./quotes');
-    const regex = /^((?:(?!\0\d+!\x7F)[^\n<>[\]{}|])+)(?:(\||\0\d+!\x7F)(.*?[^\]]))?\]\](.*)$/su, regexImg = /^((?:(?!\0\d+!\x7F)[^\n<>[\]{}|])+)(\||\0\d+!\x7F)(.*)$/su, regexExt = new RegExp(`^\\s*(?:${config.protocol})`, 'iu'), bits = wikitext.split('[[');
+    const regex = /^((?:(?!\0\d+!\x7F)[^\n[\]{}|])+)(?:(\||\0\d+!\x7F)(.*?[^\]]))?\]\](.*)$/su, regexImg = /^((?:(?!\0\d+!\x7F)[^\n[\]{}|])+)(\||\0\d+!\x7F)(.*)$/su, regexExt = new RegExp(`^\\s*(?:${config.protocol})`, 'iu'), bits = wikitext.split('[[');
     let s = bits.shift();
     for (let i = 0; i < bits.length; i++) {
         let mightBeImg = false, link, delimiter, text, after;

package/dist/parser/table.js

@@ -61,7 +61,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

@@ -65,11 +65,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, } = error;
+                const error = (0, lint_1.generateForChild)(child, rect, 'invisible content inside triple braces');
                 return {
                     ...error,
-                    startIndex: startIndex - 1,
-                    startCol: startCol - 1,
+                    startIndex: error.startIndex - 1,
+                    startCol: error.startCol - 1,
                 };
             }));
         }

package/dist/src/attribute.js

@@ -201,10 +201,10 @@ class AttributeToken extends 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,
             });
         }

package/dist/src/converterFlags.js

@@ -54,8 +54,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);
+                errors.push((0, lint_1.generateForChild)(child, rect, 'invalid conversion flag'));
             }
         }
         return errors;

package/dist/src/gallery.d.ts

@@ -1,20 +1,20 @@
 import * as Parser from '../index';
 import { Token } from './index';
 import { GalleryImageToken } from './link/galleryImage';
-import { HiddenToken } from './hidden';
+import { NoincludeToken } from './nowiki/noinclude';
 import type { LintError } from '../base';
 import type { AstText, AttributesToken, ExtToken } from '../internal';
 /**
  * gallery标签
- * @classdesc `{childNodes: ...(GalleryImageToken|HiddenToken|AstText)}`
+ * @classdesc `{childNodes: ...(GalleryImageToken|NoincludeToken|AstText)}`
  */
 export declare class GalleryToken extends Token {
     #private;
     readonly type = "ext-inner";
     readonly name: 'gallery';
-    readonly childNodes: (GalleryImageToken | HiddenToken | AstText)[];
-    abstract get firstChild(): GalleryImageToken | HiddenToken | AstText | undefined;
-    abstract get lastChild(): GalleryImageToken | HiddenToken | AstText | undefined;
+    readonly childNodes: (GalleryImageToken | NoincludeToken | AstText)[];
+    abstract get firstChild(): GalleryImageToken | NoincludeToken | AstText | undefined;
+    abstract get lastChild(): GalleryImageToken | NoincludeToken | AstText | undefined;
     abstract get nextSibling(): undefined;
     abstract get previousSibling(): AttributesToken;
     abstract get parentNode(): ExtToken | undefined;

package/dist/src/gallery.js

@@ -4,10 +4,10 @@ exports.GalleryToken = void 0;
 const Parser = require("../index");
 const index_1 = require("./index");
 const galleryImage_1 = require("./link/galleryImage");
-const hidden_1 = require("./hidden");
+const noinclude_1 = require("./nowiki/noinclude");
 /**
  * gallery标签
- * @classdesc `{childNodes: ...(GalleryImageToken|HiddenToken|AstText)}`
+ * @classdesc `{childNodes: ...(GalleryImageToken|NoincludeToken|AstText)}`
  */
 class GalleryToken extends index_1.Token {
     type = 'ext-inner';
@@ -17,9 +17,7 @@ class GalleryToken extends index_1.Token {
         for (const line of inner?.split('\n') ?? []) {
             const matches = /^([^|]+)(?:\|(.*))?/u.exec(line);
             if (!matches) {
-                super.insertAt((line.trim()
-                    ? new hidden_1.HiddenToken(line, config, [], {})
-                    : line));
+                super.insertAt((line.trim() ? new noinclude_1.NoincludeToken(line, config) : line));
                 continue;
             }
             const [, file, alt] = matches;
@@ -27,7 +25,7 @@ class GalleryToken extends index_1.Token {
                 super.insertAt(new galleryImage_1.GalleryImageToken('gallery', file, alt, config, accum));
             }
             else {
-                super.insertAt(new hidden_1.HiddenToken(line, config, [], {}));
+                super.insertAt(new noinclude_1.NoincludeToken(line, config));
             }
         }
     }
@@ -55,7 +53,7 @@ class GalleryToken extends index_1.Token {
         const { top, left } = this.getRootNode().posFromIndex(start), errors = [];
         for (let i = 0; i < this.length; i++) {
             const child = this.childNodes[i], str = String(child), { length } = str, trimmed = str.trim(), startLine = top + i, startCol = i ? 0 : left;
-            if (child.type === 'hidden' && trimmed && !/^<!--.*-->$/u.test(trimmed)) {
+            if (child.type === 'noinclude' && trimmed && !/^<!--.*-->$/u.test(trimmed)) {
                 errors.push({
                     message: Parser.msg('invalid content in <$1>', 'gallery'),
                     severity: 'error',
@@ -67,7 +65,7 @@ class GalleryToken extends index_1.Token {
                     endCol: startCol + length,
                 });
             }
-            else if (child.type !== 'hidden' && child.type !== 'text') {
+            else if (child.type !== 'noinclude' && child.type !== 'text') {
                 errors.push(...child.lint(start));
             }
             start += length + 1;

package/dist/src/parameter.js

@@ -59,7 +59,7 @@ class ParameterToken extends index_1.Token {
     }
     /** @override */
     lint(start = this.getAbsoluteIndex()) {
-        const errors = super.lint(start), { firstChild, } = 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');

package/dist/src/table/index.js

@@ -29,8 +29,7 @@ class TableToken extends trBase_1.TrBaseToken {
     lint(start = this.getAbsoluteIndex()) {
         const errors = super.lint(start);
         if (!this.closed) {
-            const { firstChild, } = this, error = (0, lint_1.generateForChild)(firstChild, { start }, 'unclosed table');
-            errors.push(error);
+            errors.push((0, lint_1.generateForChild)(this.firstChild, { start }, 'unclosed table'));
         }
         return errors;
     }

package/dist/src/tagPair/ext.js

@@ -112,7 +112,7 @@ class ExtToken extends index_2.TagPairToken {
     lint(start = this.getAbsoluteIndex()) {
         const errors = super.lint(start);
         if (this.name !== 'nowiki' && this.closest('html-attrs, table-attrs')) {
-            const root = this.getRootNode(), rect = { start, ...root.posFromIndex(start) };
+            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,12 +10,12 @@ 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,
@@ -31,12 +31,12 @@ 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,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikilint",
-	"version": "2.1.6",
+	"version": "2.3.0",
 	"description": "A Node.js linter for MediaWiki markup",
 	"keywords": [
 		"mediawiki",
@@ -42,6 +42,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",