wikilint 2.3.1 → 2.3.3

package/dist/index.d.ts

@@ -1,6 +1,6 @@
+import type { Config, LintError, Parser as ParserBase } from './base';
 import type { Title } from './lib/title';
 import type { Token } from './internal';
-import type { Config, LintError, Parser as ParserBase } from './base';
 declare interface Parser extends ParserBase {
     /**
      * 规范化页面标题

package/dist/lib/element.js

@@ -3,23 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AstElement = void 0;
 const string_1 = require("../util/string");
 const node_1 = require("./node");
-const lintIgnoredExt = new Set([
-    'nowiki',
-    'pre',
-    'charinsert',
-    'score',
-    'syntaxhighlight',
-    'source',
-    'math',
-    'chem',
-    'ce',
-    'graph',
-    'mapframe',
-    'maplink',
-    'quiz',
-    'templatedata',
-    'timeline',
-]);
 /** 类似HTMLElement */
 class AstElement extends node_1.AstNode {
     /** 子节点总数 */
@@ -123,11 +106,6 @@ class AstElement extends node_1.AstNode {
      * @param start
      */
     lint(start = this.getAbsoluteIndex()) {
-        const { SyntaxToken } = require('../src/syntax');
-        if (this instanceof SyntaxToken || this.constructor.hidden
-            || this.type === 'ext-inner' && lintIgnoredExt.has(this.name)) {
-            return [];
-        }
         const errors = [];
         for (let i = 0, cur = start + this.getAttribute('padding'); i < this.length; i++) {
             const child = this.childNodes[i];

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 = /<\s*\/?([a-z]\w*)|\{+|\}+|\[{2,}|\[(?![^[]*\])|(?<=^|\])([^[]*?)\]+|\]{2,}|https?[:/]\/+/giu, errorSyntaxUrl = /<\s*\/?([a-z]\w*)|\{+|\}+|\[{2,}|\[(?![^[]*\])|(?<=^|\])([^[]*?)\]+|\]{2,}/giu, disallowedTags = [
     'html',
     'head',
     'style',
@@ -53,14 +53,26 @@ 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');
+        const { NowikiToken } = require('../src/nowiki');
+        const { type, name } = parentNode, nextType = nextSibling?.type, previousType = previousSibling?.type;
+        let errorRegex;
+        if (type === 'ext-inner' && (name === 'pre' || parentNode instanceof NowikiToken)) {
+            errorRegex = new RegExp(`<\\s*\\/?(${name})\\b`, 'giu');
+        }
+        else if (type === 'free-ext-link'
+            || type === 'ext-link-url'
+            || type === 'image-parameter' && name === 'link'
+            || type === 'attr-value') {
+            errorRegex = errorSyntaxUrl;
+        }
+        else {
+            errorRegex = errorSyntax;
+        }
+        const errors = [...data.matchAll(errorRegex)], { ext, html } = this.getRootNode().getAttribute('config');
         if (errors.length > 0) {
-            const root = this.getRootNode(), { top, left } = root.posFromIndex(start), tags = new Set([ext, html, disallowedTags].flat(2));
+            const root = this.getRootNode(), { top, left } = root.posFromIndex(start), tags = new Set(['onlyinclude', 'noinclude', 'includeonly', ext, html, disallowedTags].flat(2));
             return errors
-                .map(({ 0: error, 1: prefix, 2: tag, index }) => {
+                .map(({ 0: error, 1: tag, 2: prefix, index }) => {
                 if (prefix) {
                     const { length } = prefix;
                     index += length;
@@ -69,7 +81,8 @@ class AstText extends node_1.AstNode {
                 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'
+                    || char === '[' && (nextChar === char
+                        || type === 'ext-link-text'
                         || !data.slice(index + 1).trim() && nextType === 'free-ext-link')
                     || char === ']' && (previousChar === char
                         || !data.slice(0, index).trim() && previousType === 'free-ext-link')

package/dist/mixin/hidden.js

@@ -14,6 +14,10 @@ const hidden = (constructor) => {
         text() {
             return '';
         }
+        /** @override */
+        lint() {
+            return [];
+        }
     }
     return AnyHiddenToken;
 };

package/dist/parser/braces.js

@@ -17,8 +17,7 @@ const parseBraces = (wikitext, config = Parser.getConfig(), accum = []) => {
     const source = `${config.excludes?.includes('heading') ? '' : '^(\0\\d+c\x7F)*={1,6}|'}\\[\\[|\\{{2,}|-\\{(?!\\{)`, { parserFunction: [, , , subst] } = config, stack = [], closes = { '=': '\n', '{': '\\}{2,}|\\|', '-': '\\}-', '[': '\\]\\]' }, marks = new Map([['!', '!'], ['!!', '+'], ['(!', '{'], ['!)', '}'], ['!-', '-'], ['=', '~']]);
     let regex = new RegExp(source, 'gmu'), mt = regex.exec(wikitext), moreBraces = wikitext.includes('}}'), lastIndex;
     while (mt
-        || lastIndex !== undefined && lastIndex <= wikitext.length
-            && stack.at(-1)?.[0]?.startsWith('=')) {
+        || lastIndex !== undefined && lastIndex <= wikitext.length && stack.at(-1)?.[0]?.startsWith('=')) {
         if (mt?.[1]) {
             const [, { length }] = mt;
             mt[0] = mt[0].slice(length);

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/src/attribute.js

@@ -201,7 +201,7 @@ 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');
+            const e = (0, lint_1.generateForChild)(lastChild, rect, Parser.msg('unclosed $1', 'quotes'), 'warning');
             errors.push({
                 ...e,
                 startIndex: e.startIndex - 1,
@@ -210,7 +210,8 @@ class AttributeToken extends index_1.Token {
         }
         if (extAttrs[tag] && !extAttrs[tag].has(name)
             || (type === 'ext-attr' ? tag in htmlAttrs : !/\{\{[^{]+\}\}/u.test(name))
-                && !htmlAttrs[tag]?.has(name) && !/^(?:xmlns:[\w:.-]+|data-[^:]*)$/u.test(name)
+                && !htmlAttrs[tag]?.has(name)
+                && !/^(?:xmlns:[\w:.-]+|data-[^:]*)$/u.test(name)
                 && (tag === 'meta' || tag === 'link' || !commonHtmlAttrs.has(name))) {
             rect ??= { start, ...this.getRootNode().posFromIndex(start) };
             errors.push((0, lint_1.generateForChild)(firstChild, rect, 'illegal attribute name'));

package/dist/src/converter.d.ts

@@ -6,6 +6,7 @@ declare const ConverterToken_base: (abstract new (...args: any[]) => {
     readonly firstChild: Parser.ConverterFlagsToken;
     toString(omit?: Set<string> | undefined, separator?: string | undefined): string;
     text(separator?: string | undefined): string;
+    lint(start?: number | undefined): Parser.LintError[];
 }) & typeof Parser.Token;
 /**
  * 转换

package/dist/src/converterFlags.js

@@ -52,7 +52,9 @@ class ConverterFlagsToken extends index_1.Token {
         const rect = { start, ...this.getRootNode().posFromIndex(start) }, { childNodes, length } = this;
         for (let i = 0; i < length; i++) {
             const child = childNodes[i], flag = child.text().trim();
-            if (flag && !variantFlags.has(flag) && !unknownFlags.has(flag)
+            if (flag
+                && !variantFlags.has(flag)
+                && !unknownFlags.has(flag)
                 && (variantFlags.size > 0 || !validFlags.has(flag))) {
                 errors.push((0, lint_1.generateForChild)(child, rect, 'invalid conversion flag'));
             }

package/dist/src/extLink.d.ts

@@ -5,6 +5,7 @@ declare const ExtLinkToken_base: (abstract new (...args: any[]) => {
     readonly firstChild: Parser.MagicLinkToken;
     toString(omit?: Set<string> | undefined, separator?: string | undefined): string;
     text(separator?: string | undefined): string;
+    lint(start?: number | undefined): Parser.LintError[];
 }) & typeof Parser.Token;
 /**
  * 外链

package/dist/src/hidden.d.ts

@@ -1,6 +1,7 @@
 import { Token } from './index';
 declare const HiddenToken_base: ((abstract new (...args: any[]) => {
     text(): string;
+    lint(): import("..").LintError[];
     toString(omit?: Set<string> | undefined, separator?: string | undefined): string;
 }) & {
     readonly hidden: true;

package/dist/src/html.js

@@ -39,8 +39,11 @@ class HtmlToken extends index_1.Token {
     }
     /** @override */
     text() {
-        const { closing } = this;
-        return `<${closing ? '/' : ''}${this.#tag}${closing ? '' : super.text()}${this.#selfClosing ? '/' : ''}>`;
+        const { closing, name } = this, tag = `${this.#tag}${closing ? '' : super.text()}`, { html } = this.getAttribute('config');
+        if (html[2].includes(name)) {
+            return closing && name !== 'br' ? '' : `<${tag}>`;
+        }
+        return `<${closing ? '/' : ''}${tag}${this.#selfClosing && html[1].includes(name) ? '/' : ''}>`;
     }
     /** @private */
     getAttribute(key) {

package/dist/src/link/file.js

@@ -57,7 +57,9 @@ class FileToken extends base_1.LinkBaseToken {
             return visibleNodes.length !== 1 || visibleNodes[0].type !== 'arg';
         }), keys = [...new Set(args.map(({ name }) => name))].filter(key => key !== 'invalid'), frameKeys = keys.filter(key => frame.has(key)), horizAlignKeys = keys.filter(key => horizAlign.has(key)), vertAlignKeys = keys.filter(key => vertAlign.has(key));
         if (args.length === keys.length
-            && frameKeys.length < 2 && horizAlignKeys.length < 2 && vertAlignKeys.length < 2) {
+            && frameKeys.length < 2
+            && horizAlignKeys.length < 2
+            && vertAlignKeys.length < 2) {
             return errors;
         }
         const rect = { start, ...this.getRootNode().posFromIndex(start) };

package/dist/src/nowiki/comment.d.ts

@@ -4,6 +4,7 @@ import type { LintError } from '../../base';
 import type { Token } from '../index';
 declare const CommentToken_base: ((abstract new (...args: any[]) => {
     text(): string;
+    lint(): Parser.LintError[];
     toString(omit?: Set<string> | undefined, separator?: string | undefined): string;
 }) & {
     readonly hidden: true;

package/dist/src/nowiki/comment.js

@@ -21,7 +21,7 @@ class CommentToken extends (0, hidden_1.hidden)(base_1.NowikiBaseToken) {
     }
     /** @override */
     lint(start = this.getAbsoluteIndex()) {
-        return this.closed ? [] : [(0, lint_1.generateForSelf)(this, { start }, 'unclosed HTML comment')];
+        return this.closed ? [] : [(0, lint_1.generateForSelf)(this, { start }, Parser.msg('unclosed $1', 'HTML comment'))];
     }
     /** @private */
     toString(omit) {

package/dist/src/nowiki/doubleUnderscore.d.ts

@@ -3,6 +3,7 @@ import { NowikiBaseToken } from './base';
 import type { Token } from '../index';
 declare const DoubleUnderscoreToken_base: ((abstract new (...args: any[]) => {
     text(): string;
+    lint(): Parser.LintError[];
     toString(omit?: Set<string> | undefined, separator?: string | undefined): string;
 }) & {
     readonly hidden: true;

package/dist/src/nowiki/noinclude.d.ts

@@ -1,6 +1,7 @@
 import { NowikiBaseToken } from './base';
 declare const NoincludeToken_base: ((abstract new (...args: any[]) => {
     text(): string;
+    lint(): import("../..").LintError[];
     toString(omit?: Set<string> | undefined, separator?: string | undefined): string;
 }) & {
     readonly hidden: true;

package/dist/src/syntax.d.ts

@@ -1,10 +1,13 @@
 import * as Parser from '../index';
 import { Token } from './index';
+import type { LintError } from '../base';
 declare type SyntaxTypes = 'plain' | 'heading-trail' | 'magic-word-name' | 'table-syntax';
 /** 满足特定语法格式的plain Token */
 export declare class SyntaxToken extends Token {
     type: SyntaxTypes;
     /** @param pattern 语法正则 */
     constructor(wikitext: string | undefined, pattern: RegExp, type?: SyntaxTypes, config?: Parser.Config, accum?: Token[], acceptable?: Acceptable);
+    /** @override */
+    lint(): LintError[];
 }
 export {};

package/dist/src/syntax.js

@@ -10,5 +10,9 @@ class SyntaxToken extends index_1.Token {
         super(wikitext, config, accum, acceptable);
         this.type = type;
     }
+    /** @override */
+    lint() {
+        return [];
+    }
 }
 exports.SyntaxToken = SyntaxToken;

package/dist/src/table/index.js

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

package/dist/src/table/trBase.js

@@ -16,7 +16,8 @@ class TrBaseToken extends base_1.TableBaseToken {
         isArg = (token) => token.type === 'arg', 
         /** @ignore */
         isTransclude = (token) => token.type === 'magic-word';
-        if (!first || tdPattern.test(String(first))
+        if (!first
+            || tdPattern.test(String(first))
             || isArg(first) && tdPattern.test(first.default || '')) {
             return errors;
         }

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

@@ -1,8 +1,10 @@
 import * as Parser from '../../index';
 import { TagPairToken } from './index';
+import type { LintError } from '../../base';
 import type { AstText, Token } from '../../internal';
 declare const IncludeToken_base: ((abstract new (...args: any[]) => {
     text(): string;
+    lint(): Parser.LintError[];
     toString(omit?: Set<string> | undefined, separator?: string | undefined): string;
 }) & {
     readonly hidden: true;
@@ -23,5 +25,7 @@ export declare class IncludeToken extends IncludeToken_base {
      * @param closed 是否封闭
      */
     constructor(name: string, attr?: string, inner?: string, closed?: string, config?: Parser.Config, accum?: Token[]);
+    /** @override */
+    lint(start?: number): LintError[];
 }
 export {};

package/dist/src/tagPair/include.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IncludeToken = void 0;
+const lint_1 = require("../../util/lint");
 const hidden_1 = require("../../mixin/hidden");
 const Parser = require("../../index");
 const index_1 = require("./index");
@@ -19,5 +20,9 @@ class IncludeToken extends (0, hidden_1.hidden)(index_1.TagPairToken) {
     constructor(name, attr = '', inner, closed, config = Parser.getConfig(), accum = []) {
         super(name, attr, inner ?? '', inner === undefined ? closed : closed ?? '', config, accum);
     }
+    /** @override */
+    lint(start = this.getAbsoluteIndex()) {
+        return this.closed ? [] : [(0, lint_1.generateForSelf)(this, { start }, Parser.msg('unclosed $1', `<${this.name}>`))];
+    }
 }
 exports.IncludeToken = IncludeToken;

package/dist/src/transclude.js

@@ -35,10 +35,11 @@ class TranscludeToken extends index_1.Token {
                 title = arg.join(':').slice(mt.length);
             }
         }
-        if (title.includes(':') || parts.length === 0 && !this.#raw) {
-            const [magicWord, ...arg] = title.split(':'), cleaned = (0, string_1.removeComment)(magicWord), name = cleaned[arg.length > 0 ? 'trimStart' : 'trim'](), isSensitive = sensitive.includes(name), canonicalCame = insensitive[name.toLowerCase()];
+        const isFunction = title.includes(':');
+        if (isFunction || parts.length === 0 && !this.#raw) {
+            const [magicWord, ...arg] = title.split(':'), cleaned = (0, string_1.removeComment)(magicWord), name = cleaned[arg.length > 0 ? 'trimStart' : 'trim'](), isSensitive = sensitive.includes(name), canonicalCame = isFunction && insensitive[name.toLowerCase()];
             if (isSensitive || canonicalCame) {
-                this.setAttribute('name', canonicalCame ?? name.toLowerCase());
+                this.setAttribute('name', canonicalCame || name.toLowerCase());
                 this.type = 'magic-word';
                 const pattern = new RegExp(`^\\s*${name}\\s*$`, isSensitive ? 'u' : 'iu'), token = new syntax_1.SyntaxToken(magicWord, pattern, 'magic-word-name', config, accum, {});
                 super.insertAt(token);
@@ -91,9 +92,9 @@ class TranscludeToken extends index_1.Token {
             return false;
         }
         const magicWord = lcModifier.slice(0, -1).toLowerCase(), isRaw = raw.includes(magicWord), isSubst = subst.includes(magicWord);
-        if (this.#raw && isRaw || !this.#raw && (isSubst || modifier === '')
-            || this.length > 1
-                && (isRaw || isSubst || modifier === '')) {
+        if (this.#raw && isRaw
+            || !this.#raw && (isSubst || modifier === '')
+            || this.length > 1 && (isRaw || isSubst || modifier === '')) {
             this.setAttribute('modifier', modifier);
             this.#raw = isRaw;
             return Boolean(modifier);

package/i18n/zh-hans.json

@@ -14,6 +14,7 @@
 	"frame": "框架",
 	"full-width punctuation": "全角标点",
 	"horizontal-alignment": "水平对齐",
+	"HTML comment": "HTML注释",
 	"HTML tag in table attributes": "表格属性中的HTML标签",
 	"illegal attribute name": "非法的属性名",
 	"illegal module name": "非法的模块名称",
@@ -31,13 +32,13 @@
 	"missing module name": "缺少模块名称",
 	"nonzero tabindex": "不为0的tabindex",
 	"nothing should be in <$1>": "<$1>标签内不应有任何内容",
+	"quotes": "引号",
 	"section header in a HTML tag": "HTML标签属性中的段落标题",
+	"table": "表格",
 	"tag that is both closing and self-closing": "同时闭合和自封闭的标签",
 	"template in an internal link target": "内链目标包含模板",
 	"unbalanced \"=\" in a section header": "段落标题中不平衡的\"=\"",
-	"unclosed HTML comment": "未闭合的HTML注释",
-	"unclosed quotes": "未闭合的引号",
-	"unclosed table": "未闭合的表格",
+	"unclosed $1": "未闭合的$1",
 	"unclosed tag": "未闭合的标签",
 	"unescaped query string in an anonymous parameter": "匿名参数中未转义的查询参数",
 	"unexpected template argument": "未预期的模板参数",

package/i18n/zh-hant.json

@@ -14,6 +14,7 @@
 	"frame": "框架",
 	"full-width punctuation": "全形標點",
 	"horizontal-alignment": "水瓶對齊",
+	"HTML comment": "HTML註釋",
 	"HTML tag in table attributes": "表格屬性中的HTML標籤",
 	"illegal attribute name": "非法的屬性名",
 	"illegal module name": "非法的模組名稱",
@@ -31,13 +32,13 @@
 	"missing module name": "缺少模組名稱",
 	"nonzero tabindex": "不為0的tabindex",
 	"nothing should be in <$1>": "<$1>標籤內不應有任何內容",
+	"quotes": "引號",
 	"section header in a HTML tag": "HTML標籤屬性中的段落標題",
+	"table": "表格",
 	"tag that is both closing and self-closing": "同時閉合和自封閉的標籤",
 	"template in an internal link target": "內部連結目標包含模板",
 	"unbalanced \"=\" in a section header": "段落標題中不平衡的\"=\"",
-	"unclosed HTML comment": "未閉合的HTML註釋",
-	"unclosed quotes": "未閉合的引號",
-	"unclosed table": "未閉合的表格",
+	"unclosed $1": "未閉合的$1",
 	"unclosed tag": "未閉合的標籤",
 	"unescaped query string in an anonymous parameter": "匿名參數中未轉義的查詢參數",
 	"unexpected template argument": "未預期的模板參數",

package/package.json

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