wikilint 2.3.7 → 2.3.8

package/dist/mixin/hidden.js

@@ -10,7 +10,6 @@ const hidden = (constructor) => {
     class AnyHiddenToken extends constructor {
         static hidden = true;
         /** 没有可见部分 */
-        // eslint-disable-next-line class-methods-use-this
         text() {
             return '';
         }

package/dist/parser/commentAndExt.js

@@ -49,9 +49,14 @@ const parseCommentAndExt = (wikitext, config = Parser.getConfig(), accum = [], i
             return str;
         }
     }
+    /* eslint-disable @typescript-eslint/no-unused-expressions */
+    /<foo(?:\s[^>]*)?>|<\/foo\s*>/giu;
+    /<(bar)(\s[^>]*?)?(?:\/>|>(.*?)<\/(\1\s*)>)/gisu;
+    /<(baz)(\s[^>]*?)?(?:\/>|>(.*?)(?:<\/(baz\s*)>|$))/gisu;
+    /* eslint-enable @typescript-eslint/no-unused-expressions */
     const ext = config.ext.join('|'), noincludeRegex = includeOnly ? 'includeonly' : '(?:no|only)include', includeRegex = includeOnly ? 'noinclude' : 'includeonly', regex = new RegExp('<!--.*?(?:-->|$)' // comment
         + '|'
-        + `<${noincludeRegex}(?:\\s[^>]*?)?>|</${noincludeRegex}\\s*>` // <noinclude>
+        + `<${noincludeRegex}(?:\\s[^>]*)?>|</${noincludeRegex}\\s*>` // <noinclude>
         + '|'
         + `<(${ext})(\\s[^>]*?)?(?:/>|>(.*?)</(\\1\\s*)>)` // 扩展标签
         + '|'

package/dist/parser/converter.js

@@ -15,10 +15,10 @@ const parseConverter = (text, config = Parser.getConfig(), accum = []) => {
     while (mt) {
         const { 0: syntax, index } = mt;
         if (syntax === '}-') {
-            const top = stack.pop(), { length } = accum, str = text.slice(top.index + 2, index), i = str.indexOf('|'), [flags, raw] = i === -1 ? [[], str] : [str.slice(0, i).split(';'), str.slice(i + 1)], temp = raw.replace(/(&[#a-z\d]+);/giu, '$1\x01'), variants = `(?:${config.variants.join('|')})`, rules = temp.split(new RegExp(`;(?=\\s*(?:${`(?:${variants}|[^;]*?=>\\s*${variants})\\s*:`
-                + '|'
-                + '(?:\0\\d+c\x7f(?:\\s|\0\\d+c\x7f)*)?$' // 末尾的空白
-            }))`, 'u')).map(rule => rule.replace(/\x01/gu, ';'));
+            // eslint-disable-next-line @typescript-eslint/no-unused-expressions
+            /;(?=(?:[^;]*?=>)?\s*foo\s*:|(?:\s|\0\d+c\x7F)*$)/u;
+            const top = stack.pop(), { length } = accum, str = text.slice(top.index + 2, index), i = str.indexOf('|'), [flags, raw] = i === -1 ? [[], str] : [str.slice(0, i).split(';'), str.slice(i + 1)], temp = raw.replace(/(&[#a-z\d]+);/giu, '$1\x01'), variants = `(?:${config.variants.join('|')})`, rules = temp.split(new RegExp(`;(?=(?:[^;]*?=>)?\\s*${variants}\\s*:|(?:\\s|\0\\d+c\x7F)*$)`, 'u'))
+                .map(rule => rule.replace(/\x01/gu, ';'));
             new converter_1.ConverterToken(flags, rules, config, accum);
             text = `${text.slice(0, top.index)}\0${length}v\x7F${text.slice(index + 2)}`;
             if (stack.length === 0) {

package/dist/parser/externalLinks.js

@@ -11,7 +11,10 @@ const extLink_1 = require("../src/extLink");
  * @param accum
  */
 const parseExternalLinks = (wikitext, config = Parser.getConfig(), accum = []) => {
-    const regex = new RegExp(`\\[((?:(?:${config.protocol}|//)${string_1.extUrlCharFirst}|\0\\d+m\x7F)${string_1.extUrlChar})(\\p{Zs}*)([^\\]\x01-\x08\x0A-\x1F\uFFFD]*)\\]`, 'giu');
+    // eslint-disable-next-line @typescript-eslint/no-unused-expressions
+    /\[((?:\[[\da-f:.]+\]|[^[\]\t\n\p{Zs}])[^[\]\t\n\p{Zs}]*(?=[[\]\t\p{Zs}]|\0\d))(\p{Zs}*(?=\P{Zs}))([^\]\n]*)\]/giu;
+    const regex = new RegExp(`\\[((?:(?:${config.protocol}|//)${string_1.extUrlCharFirst}|\0\\d+m\x7F)${string_1.extUrlChar}(?=[[\\]<>"\\t\\p{Zs}]|\0\\d))`
+        + '(\\p{Zs}*(?=\\P{Zs}))([^\\]\x01-\x08\x0A-\x1F\uFFFD]*)\\]', 'giu');
     return wikitext.replace(regex, (_, url, space, text) => {
         const { length } = accum, mt = /&[lg]t;/u.exec(url);
         if (mt) {

package/dist/parser/magicLinks.js

@@ -11,6 +11,8 @@ const magicLink_1 = require("../src/magicLink");
  * @param accum
  */
 const parseMagicLinks = (wikitext, config = Parser.getConfig(), accum = []) => {
+    // eslint-disable-next-line @typescript-eslint/no-unused-expressions
+    /(^|[^\p{L}\d_])((?:\[[\da-f:.]+\]|[^[\]<>"\t\n\p{Zs}])(?:[^[\]<>"\0\t\n\p{Zs}]|\0\d+c\x7F)*)/giu;
     const regex = new RegExp(`(^|[^\\p{L}\\d_])(?:${config.protocol})(${string_1.extUrlCharFirst}${string_1.extUrlChar})`, 'giu');
     return wikitext.replace(regex, (m, lead, p1) => {
         let trail = '', url = lead ? m.slice(1) : m;

package/dist/src/attribute.js

@@ -124,6 +124,7 @@ const commonHtmlAttrs = new Set([
  * @classdesc `{childNodes: [AtomToken, Token|AtomToken]}`
  */
 class AttributeToken extends index_1.Token {
+    tag;
     #equal;
     #quotes;
     /** 引号是否匹配 */

package/dist/src/attributes.js

@@ -32,10 +32,10 @@ class AttributesToken extends index_1.Token {
         this.type = type;
         this.setAttribute('name', name);
         if (attr) {
+            // eslint-disable-next-line @typescript-eslint/no-unused-expressions
+            /([^\s/](?:(?!\0\d+~\x7F)[^\s/=])*)(?:(\s*(?:=|\0\d+~\x7F)\s*)(?:(["'])(.*?)(\3|$)|(\S*)))?/gsu;
             const regex = new RegExp('([^\\s/](?:(?!\0\\d+~\x7F)[^\\s/=])*)' // 属性名
-                + `(?:${'((?:\\s|\0\\d+c\x7F)*' // `=`前的空白字符
-                    + '(?:=|\0\\d+~\x7F)' // `=`
-                    + '(?:\\s|\0\\d+c\x7F)*)' // `=`后的空白字符
+                + `(?:${'((?:\\s|\0\\d+c\x7F)*(?:=|\0\\d+~\x7F)(?:\\s|\0\\d+c\x7F)*)' // `=`和前后的空白字符
                     + `(?:(["'])(.*?)(\\3|$)|(\\S*))` // 属性值
                 })?`, 'gsu');
             let out = '', mt = regex.exec(attr), lastIndex = 0;

package/dist/src/html.d.ts

@@ -30,7 +30,7 @@ export declare class HtmlToken extends Token {
      * 搜索匹配的标签
      * @throws `SyntaxError` 同时闭合和自封闭的标签
      * @throws `SyntaxError` 无效自封闭标签
-     * @throws `SyntaxError` 未闭合的标签
+     * @throws `SyntaxError` 未匹配的标签
      */
     findMatchingTag(): this | undefined;
 }

package/dist/src/html.js

@@ -92,7 +92,7 @@ class HtmlToken extends index_1.Token {
      * 搜索匹配的标签
      * @throws `SyntaxError` 同时闭合和自封闭的标签
      * @throws `SyntaxError` 无效自封闭标签
-     * @throws `SyntaxError` 未闭合的标签
+     * @throws `SyntaxError` 未匹配的标签
      */
     findMatchingTag() {
         const { html } = this.getAttribute('config'), { name: tagName, parentNode, closing } = this, string = (0, string_1.noWrap)(String(this));

package/dist/src/imageParameter.js

@@ -16,6 +16,8 @@ function validate(key, val, config = Parser.getConfig(), halfParsed = false) {
             if (!value) {
                 return val;
             }
+            // eslint-disable-next-line @typescript-eslint/no-unused-expressions
+            /^(?:\/\/(?:\[[\da-f:.]+\]|[^[\]<>"\t\n\p{Zs}])|\0\d+m\x7F)(?:[^[\]<>"\0\t\n\p{Zs}]|\0\d+c\x7F)*$/iu;
             const regex = new RegExp(`^(?:(?:${config.protocol}|//)${string_1.extUrlCharFirst}|\0\\d+m\x7F)${string_1.extUrlChar}$`, 'iu');
             if (regex.test(value)) {
                 return val;

package/dist/src/imagemap.js

@@ -59,7 +59,7 @@ class ImagemapToken extends index_1.Token {
                 }
                 else if (protocols.has(substr.slice(1, substr.indexOf(':') + 1))
                     || protocols.has(substr.slice(1, substr.indexOf('//') + 2))) {
-                    const mtEx = /^\[([^\]\s]+)(?:(\s+)(\S[^\]]*)?)?\][\w\s]*$/u
+                    const mtEx = /^\[([^\]\s]+)(?:(\s+(?=\S))([^\]]*))?\][\w\s]*$/u
                         .exec(substr);
                     if (mtEx) {
                         super.insertAt(new imagemapLink_1.ImagemapLinkToken(line.slice(0, i), mtEx.slice(1), substr.slice(substr.indexOf(']') + 1), config, accum));

package/dist/src/parameter.js

@@ -59,6 +59,8 @@ class ParameterToken extends index_1.Token {
     }
     /** @override */
     lint(start = this.getAbsoluteIndex()) {
+        // eslint-disable-next-line @typescript-eslint/no-unused-expressions
+        /https?:\/\/(?:\[[\da-f:.]+\]|[^[\]<>"\t\n\p{Zs}])(?:[^[\]<>"\0\t\n\p{Zs}]|\0\d+c\x7F)*$/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) {

package/dist/src/tagPair/ext.d.ts

@@ -9,6 +9,7 @@ import type { LintError } from '../../base';
  */
 export declare class ExtToken extends TagPairToken {
     readonly type = "ext";
+    closed: true;
     readonly childNodes: [AttributesToken, Token];
     abstract get firstChild(): AttributesToken;
     abstract get lastChild(): Token;

package/dist/src/tagPair/index.d.ts

@@ -6,11 +6,11 @@ export declare abstract class TagPairToken extends Token {
     #private;
     type: 'ext' | 'include';
     readonly name: string;
+    closed: boolean;
+    selfClosing: boolean;
     readonly childNodes: [AstNodes, AstNodes];
     abstract get firstChild(): AstNodes;
     abstract get lastChild(): AstNodes;
-    /** 是否闭合 */
-    get closed(): boolean;
     /**
      * @param name 标签名
      * @param attr 标签属性

package/dist/src/tagPair/index.js

@@ -5,13 +5,9 @@ const Parser = require("../../index");
 const index_1 = require("../index");
 /** 成对标签 */
 class TagPairToken extends index_1.Token {
-    #selfClosing;
-    #closed;
     #tags;
-    /** 是否闭合 */
-    get closed() {
-        return this.#closed;
-    }
+    closed;
+    selfClosing;
     /**
      * @param name 标签名
      * @param attr 标签属性
@@ -22,23 +18,23 @@ class TagPairToken extends index_1.Token {
         super(undefined, config);
         this.setAttribute('name', name.toLowerCase());
         this.#tags = [name, closed || name];
-        this.#selfClosing = closed === undefined;
-        this.#closed = closed !== '';
+        this.closed = closed !== '';
+        this.selfClosing = closed === undefined;
         this.append(attr, inner);
         const index = typeof attr === 'string' ? -1 : accum.indexOf(attr);
         accum.splice(index === -1 ? Infinity : index, 0, this);
     }
     /** @private */
     toString(omit) {
-        const { firstChild, lastChild, } = this, [opening, closing] = this.#tags;
-        return this.#selfClosing
+        const { selfClosing, firstChild, lastChild, } = this, [opening, closing] = this.#tags;
+        return selfClosing
             ? `<${opening}${firstChild.toString(omit)}/>`
             : `<${opening}${firstChild.toString(omit)}>${lastChild.toString(omit)}${this.closed ? `</${closing}>` : ''}`;
     }
     /** @override */
     text() {
         const [opening, closing] = this.#tags;
-        return this.#selfClosing
+        return this.selfClosing
             ? `<${opening}${this.firstChild.text()}/>`
             : `<${opening}${super.text('>')}${this.closed ? `</${closing}>` : ''}`;
     }

package/dist/src/transclude.d.ts

@@ -11,7 +11,7 @@ import type { LintError } from '../base';
 export declare class TranscludeToken extends Token {
     #private;
     type: 'template' | 'magic-word';
-    readonly modifier = "";
+    readonly modifier: string;
     readonly childNodes: [AtomToken | SyntaxToken, ...ParameterToken[]] | [SyntaxToken, AtomToken, AtomToken, ...ParameterToken[]];
     abstract get firstChild(): AtomToken | SyntaxToken;
     abstract get lastChild(): AtomToken | SyntaxToken | ParameterToken;

package/dist/src/transclude.js

@@ -118,7 +118,7 @@ class TranscludeToken extends index_1.Token {
     /** 获取模板或模块名 */
     #getTitle() {
         const isTemplate = this.type === 'template', child = this.childNodes[isTemplate ? 0 : 1];
-        return child && this.normalizeTitle(child.text(), isTemplate ? 10 : 828);
+        return this.normalizeTitle(child.text(), isTemplate ? 10 : 828);
     }
     /** @private */
     afterBuild() {
@@ -162,12 +162,7 @@ class TranscludeToken extends index_1.Token {
             return errors;
         }
         const title = this.#getTitle();
-        if (!title) {
-            rect = { start, ...this.getRootNode().posFromIndex(start) };
-            errors.push((0, lint_1.generateForSelf)(this, rect, 'missing module name'));
-            return errors;
-        }
-        else if (title.fragment !== undefined) {
+        if (title.fragment !== undefined) {
             rect = { start, ...this.getRootNode().posFromIndex(start) };
             errors.push((0, lint_1.generateForChild)(childNodes[type === 'template' ? 0 : 1], rect, 'useless fragment'));
         }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikilint",
-	"version": "2.3.7",
+	"version": "2.3.8",
 	"description": "A Node.js linter for MediaWiki markup",
 	"keywords": [
 		"mediawiki",