wikilint 2.0.0 → 2.1.0

package/dist/index.js

@@ -10,6 +10,11 @@ const constants_1 = require("./util/constants");
  * @param dir 子路径
  */
 const rootRequire = (file, dir) => require(file.startsWith('/') ? file : `../${file.includes('/') ? '' : dir}${file}`);
+/**
+ * 清理解析专用的不可见字符
+ * @param text 源文本
+ */
+const tidy = (text) => text.replace(/[\0\x7F]/gu, '');
 // eslint-disable-next-line @typescript-eslint/no-redeclare
 const Parser = {
     config: 'default',
@@ -46,11 +51,10 @@ const Parser = {
     /** @implements */
     parse(wikitext, include, maxStage = constants_1.MAX_STAGE, config = Parser.getConfig()) {
         const { Token } = require('./src/index');
-        let token;
-        debug_1.Shadow.run(() => {
-            token = new Token(wikitext.replace(/[\0\x7F]/gu, ''), config);
+        const root = debug_1.Shadow.run(() => {
+            const token = new Token(tidy(wikitext), config);
             try {
-                token.parse(maxStage, include);
+                return token.parse(maxStage, include);
             }
             catch (e) {
                 if (e instanceof Error) {
@@ -64,7 +68,7 @@ const Parser = {
                 throw e;
             }
         });
-        return token;
+        return root;
     },
 };
 const def = {}, enumerable = new Set([

package/dist/lib/node.js

@@ -19,12 +19,12 @@ class AstNode {
     }
     /** 后一个兄弟节点 */
     get nextSibling() {
-        const childNodes = this.#parentNode?.childNodes;
+        const childNodes = this.parentNode?.childNodes;
         return childNodes && childNodes[childNodes.indexOf(this) + 1];
     }
     /** 前一个兄弟节点 */
     get previousSibling() {
-        const childNodes = this.#parentNode?.childNodes;
+        const childNodes = this.parentNode?.childNodes;
         return childNodes && childNodes[childNodes.indexOf(this) - 1];
     }
     /** 行数 */

package/dist/lib/text.js

@@ -60,8 +60,9 @@ class AstText extends node_1.AstNode {
             return errors
                 .map(({ 0: error, 1: prefix, 2: tag, index }) => {
                 if (prefix) {
-                    index += prefix.length;
-                    error = error.slice(prefix.length);
+                    const { length } = prefix;
+                    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, rootStr = String(root), nextChar = rootStr[endIndex], previousChar = rootStr[startIndex - 1], severity = length > 1 && (char !== '<' || /[\s/>]/u.test(nextChar ?? ''))
                     || char === '{' && (nextChar === char || previousChar === '-')

package/dist/lib/title.d.ts

@@ -4,7 +4,6 @@ export declare class Title {
     valid: boolean;
     ns: number;
     fragment: string | undefined;
-    encoded: boolean;
     /**
      * @param title 标题（含或不含命名空间前缀）
      * @param defaultNs 命名空间

package/dist/lib/title.js

@@ -8,6 +8,7 @@ class Title {
     valid;
     ns;
     fragment;
+    /** @private */
     encoded = false;
     /**
      * @param title 标题（含或不含命名空间前缀）
@@ -16,8 +17,7 @@ class Title {
      * @param selfLink 是否允许selfLink
      */
     constructor(title, defaultNs = 0, config = Parser.getConfig(), decode = false, selfLink = false) {
-        const { namespaces, nsid } = config;
-        let namespace = namespaces[defaultNs] ?? '';
+        const { nsid, } = config;
         title = (0, string_1.decodeHtml)(title);
         if (decode && title.includes('%')) {
             try {
@@ -28,29 +28,29 @@ class Title {
             catch { }
         }
         title = title.replaceAll('_', ' ').trim();
+        let ns = defaultNs;
         if (title.startsWith(':')) {
-            namespace = '';
+            ns = 0;
             title = title.slice(1).trim();
         }
         const m = title.split(':');
         if (m.length > 1) {
-            const ns = nsid[m[0].trim().toLowerCase()], id = ns === undefined ? undefined : namespaces[ns];
+            const id = nsid[m[0].trim().toLowerCase()];
             if (id !== undefined) {
-                namespace = id;
+                ns = id;
                 title = m.slice(1).join(':').trim();
             }
         }
-        this.ns = nsid[namespace.toLowerCase()];
+        this.ns = ns;
         const i = title.indexOf('#');
-        let fragment;
         if (i !== -1) {
-            fragment = title.slice(i + 1).trimEnd();
+            // eslint-disable-next-line prefer-const
+            let fragment = title.slice(i + 1).trimEnd();
+            this.fragment = fragment;
             title = title.slice(0, i).trim();
         }
         this.valid = Boolean(title
-            || selfLink && fragment !== undefined)
-            && !/\0\d+[eh!+-]\x7F|[<>[\]{}|]|%[\da-f]{2}/iu.test(title);
-        this.fragment = fragment;
+            || selfLink && this.fragment !== undefined) && !/\0\d+[eh!+-]\x7F|[<>[\]{}|]|%[\da-f]{2}/iu.test(title);
     }
 }
 exports.Title = Title;

package/dist/parser/commentAndExt.js

@@ -34,7 +34,11 @@ const parseCommentAndExt = (wikitext, config = Parser.getConfig(), accum = [], i
                 i = wikitext.indexOf(onlyincludeLeft);
                 j = wikitext.indexOf(onlyincludeRight, i + length);
             }
-            return `${str}${wikitext}`;
+            if (wikitext) {
+                new noinclude_1.NoincludeToken(wikitext, config, accum);
+                str += `\0${accum.length - 1}c\x7F`;
+            }
+            return str;
         }
     }
     const ext = config.ext.join('|'), includeRegex = includeOnly ? 'includeonly' : '(?:no|only)include', noincludeRegex = includeOnly ? 'noinclude' : 'includeonly', regex = new RegExp('<!--.*?(?:-->|$)|' // comment

package/dist/src/html.js

@@ -35,23 +35,24 @@ class HtmlToken extends index_1.Token {
     }
     /** @private */
     toString(omit) {
-        return `<${this.#closing ? '/' : ''}${this.#tag}${super.toString()}${this.#selfClosing ? '/' : ''}>`;
+        return `<${this.closing ? '/' : ''}${this.#tag}${super.toString()}${this.#selfClosing ? '/' : ''}>`;
     }
     /** @override */
     text() {
-        return `<${this.#closing ? '/' : ''}${this.#tag}${this.#closing ? '' : super.text()}${this.#selfClosing ? '/' : ''}>`;
+        const { closing } = this;
+        return `<${closing ? '/' : ''}${this.#tag}${closing ? '' : super.text()}${this.#selfClosing ? '/' : ''}>`;
     }
     /** @private */
     getAttribute(key) {
         return key === 'padding'
-            ? this.#tag.length + (this.#closing ? 2 : 1)
+            ? this.#tag.length + (this.closing ? 2 : 1)
             : super.getAttribute(key);
     }
     /** @override */
     lint(start = this.getAbsoluteIndex()) {
         const errors = super.lint(start);
         let refError;
-        if (this.name === 'h1' && !this.#closing) {
+        if (this.name === 'h1' && !this.closing) {
             refError = (0, lint_1.generateForSelf)(this, { start }, '<h1>');
             errors.push(refError);
         }
@@ -91,8 +92,8 @@ class HtmlToken extends index_1.Token {
      * @throws `SyntaxError` 未闭合的标签
      */
     findMatchingTag() {
-        const { html } = this.getAttribute('config'), { name: tagName, parentNode } = this, string = (0, string_1.noWrap)(String(this));
-        if (this.#closing && (this.#selfClosing || html[2].includes(tagName))) {
+        const { html } = this.getAttribute('config'), { name: tagName, parentNode, closing } = this, string = (0, string_1.noWrap)(String(this));
+        if (closing && (this.#selfClosing || html[2].includes(tagName))) {
             throw new SyntaxError(`tag that is both closing and self-closing: ${string}`);
         }
         else if (html[2].includes(tagName) || this.#selfClosing && html[1].includes(tagName)) { // 自封闭标签
@@ -104,10 +105,10 @@ class HtmlToken extends index_1.Token {
         else if (!parentNode) {
             return undefined;
         }
-        const { childNodes } = parentNode, i = childNodes.indexOf(this), siblings = this.#closing
+        const { childNodes } = parentNode, i = childNodes.indexOf(this), siblings = closing
             ? childNodes.slice(0, i).reverse().filter(({ type, name }) => type === 'html' && name === tagName)
             : childNodes.slice(i + 1).filter(({ type, name }) => type === 'html' && name === tagName);
-        let imbalance = this.#closing ? -1 : 1;
+        let imbalance = closing ? -1 : 1;
         for (const token of siblings) {
             if (token.#closing) {
                 imbalance--;
@@ -119,7 +120,7 @@ class HtmlToken extends index_1.Token {
                 return token;
             }
         }
-        throw new SyntaxError(`${this.#closing ? 'unmatched closing' : 'unclosed'} tag: ${string}`);
+        throw new SyntaxError(`${closing ? 'unmatched closing' : 'unclosed'} tag: ${string}`);
     }
 }
 exports.HtmlToken = HtmlToken;

package/package.json

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