wikiparser-node 1.13.0 → 1.13.1

package/config/default.json

@@ -140,10 +140,6 @@
 		"711": "TimedText talk",
 		"828": "Module",
 		"829": "Module talk",
-		"2300": "Gadget",
-		"2301": "Gadget talk",
-		"2302": "Gadget definition",
-		"2303": "Gadget definition talk",
 		"2600": "Topic"
 	},
 	"nsid": {
@@ -300,11 +296,7 @@
 		"模組討論": 829,
 		"模组对话": 829,
 		"模组讨论": 829,
-		"モジュール・トーク": 829,
-		"gadget": 2300,
-		"gadget talk": 2301,
-		"gadget definition": 2302,
-		"gadget definition talk": 2303
+		"モジュール・トーク": 829
 	},
 	"parserFunction": [
 		{

package/config/enwiki.json

@@ -125,11 +125,7 @@
 		"710": "TimedText",
 		"711": "TimedText talk",
 		"828": "Module",
-		"829": "Module talk",
-		"2300": "Gadget",
-		"2301": "Gadget talk",
-		"2302": "Gadget definition",
-		"2303": "Gadget definition talk"
+		"829": "Module talk"
 	},
 	"nsid": {
 		"": 0,
@@ -165,11 +161,7 @@
 		"timedtext": 710,
 		"timedtext talk": 711,
 		"module": 828,
-		"module talk": 829,
-		"gadget": 2300,
-		"gadget talk": 2301,
-		"gadget definition": 2302,
-		"gadget definition talk": 2303
+		"module talk": 829
 	},
 	"parserFunction": [
 		{

package/dist/base.d.ts

@@ -72,6 +72,7 @@ export type AST = Record<string, string | number | boolean> & {
     type?: TokenTypes;
     name?: string;
     childNodes?: AST[];
+    data?: string;
 };
 /** 类似Node */
 export interface AstNode {

package/dist/src/paramTag/index.js

@@ -48,7 +48,7 @@ class ParamTagToken extends index_2.Token {
     lint(start = this.getAbsoluteIndex()) {
         const rect = new rect_1.BoundingRect(this, start);
         return this.childNodes.filter(child => {
-            const { childNodes } = child, i = childNodes.findIndex(({ type }) => type !== 'text'), str = (i >= 0 ? childNodes.slice(0, i).map(String).join('') : child.toString()).trim();
+            const childNodes = child.childNodes.filter(({ type }) => type !== 'comment'), i = childNodes.findIndex(({ type }) => type !== 'text'), str = childNodes.slice(0, i >= 0 ? i : undefined).map(String).join('');
             return str && !(i >= 0 ? /^[a-z]+(?:\[\])?\s*(?:=|$)/iu : /^[a-z]+(?:\[\])?\s*=/iu).test(str);
         }).map(child => {
             const e = (0, lint_1.generateForChild)(child, rect, 'no-ignored', index_1.default.msg('invalid parameter of <$1>', this.name));

package/dist/src/paramTag/inputbox.js

@@ -4,19 +4,33 @@ exports.InputboxToken = void 0;
 const braces_1 = require("../../parser/braces");
 const index_1 = require("../../index");
 const index_2 = require("./index");
+const comment_1 = require("../nowiki/comment");
 /* NOT FOR BROWSER */
 const constants_1 = require("../../util/constants");
 /* NOT FOR BROWSER END */
+/**
+ * 解析注释
+ * @param wikitext 维基文本
+ * @param config
+ * @param accum
+ */
+const parseComment = (wikitext, config, accum) => wikitext.replace(/<!--.*?(?:-->|$)/gsu, comment => {
+    const str = `\0${accum.length + 1}c\x7F`, closed = comment.endsWith('-->');
+    // @ts-expect-error abstract class
+    new comment_1.CommentToken(comment.slice(4, closed ? -3 : undefined), closed, config, accum);
+    return str;
+});
 /** `<inputbox>` */
 class InputboxToken extends index_2.ParamTagToken {
     /** @class */
     constructor(wikitext, config = index_1.default.getConfig(), accum = []) {
+        wikitext &&= parseComment(wikitext, config, accum);
         const placeholder = Symbol('InputboxToken'), { length } = accum;
         accum.push(placeholder);
         wikitext &&= (0, braces_1.parseBraces)(wikitext, config, accum);
         accum.splice(length, 1);
         super(wikitext, config, accum, {
-            ArgToken: ':', TranscludeToken: ':',
+            CommentToken: ':', ArgToken: ':', TranscludeToken: ':',
         });
     }
 }

package/dist/src/pre.js

@@ -20,19 +20,27 @@ class PreToken extends index_2.Token {
     /** @class */
     constructor(wikitext, config = index_1.default.getConfig(), accum = []) {
         if (wikitext) {
-            const opening = '<nowiki>', closing = '</nowiki>', { length } = opening;
-            let i = wikitext.indexOf(opening), j = wikitext.indexOf(closing, i + length), str = '';
-            while (i !== -1 && j !== -1) {
+            const opening = /<nowiki>/giu, closing = /<\/nowiki>/giu, { length } = opening.source;
+            let i = opening.exec(wikitext);
+            if (i) {
+                closing.lastIndex = i.index + length;
+            }
+            let j = closing.exec(wikitext), lastIndex = 0, str = '';
+            while (i && j) {
                 // @ts-expect-error abstract class
-                new noinclude_1.NoincludeToken(opening, config, accum);
+                new noinclude_1.NoincludeToken(i[0], config, accum);
                 // @ts-expect-error abstract class
-                new noinclude_1.NoincludeToken(closing, config, accum);
-                str += `${wikitext.slice(0, i)}\0${accum.length - 1}n\x7F${wikitext.slice(i + length, j)}\0${accum.length}n\x7F`;
-                wikitext = wikitext.slice(j + length + 1);
-                i = wikitext.indexOf(opening);
-                j = wikitext.indexOf(closing, i + length);
+                new noinclude_1.NoincludeToken(j[0], config, accum);
+                str += `${wikitext.slice(lastIndex, i.index)}\0${accum.length - 1}n\x7F${wikitext.slice(i.index + length, j.index)}\0${accum.length}n\x7F`;
+                lastIndex = j.index + length + 1;
+                opening.lastIndex = lastIndex;
+                i = opening.exec(wikitext);
+                if (i) {
+                    closing.lastIndex = i.index + length;
+                }
+                j = closing.exec(wikitext);
             }
-            wikitext = str + wikitext;
+            wikitext = str + wikitext.slice(lastIndex);
         }
         super(wikitext, config, accum, {
             AstText: ':', NoincludeToken: ':', ConverterToken: ':',

package/dist/src/tagPair/include.js

@@ -36,6 +36,7 @@ var __runInitializers = (this && this.__runInitializers) || function (thisArg, i
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IncludeToken = void 0;
 const lint_1 = require("../../util/lint");
+const rect_1 = require("../../lib/rect");
 const hidden_1 = require("../../mixin/hidden");
 const index_1 = require("../../index");
 const index_2 = require("./index");
@@ -95,18 +96,30 @@ let IncludeToken = (() => {
         }
         /** @private */
         lint(start = this.getAbsoluteIndex()) {
-            if (this.closed) {
-                return [];
+            const errors = [], { firstChild, closed, name } = this, rect = new rect_1.BoundingRect(this, start);
+            if (firstChild.data.trim()) {
+                const e = (0, lint_1.generateForChild)(firstChild, rect, 'no-ignored', 'useless attribute', 'warning');
+                e.suggestions = [
+                    {
+                        desc: 'remove',
+                        range: [e.startIndex, e.endIndex],
+                        text: '',
+                    },
+                ];
+                errors.push(e);
             }
-            const e = (0, lint_1.generateForSelf)(this, { start }, 'unclosed-comment', index_1.default.msg('unclosed $1', `<${this.name}>`));
-            e.suggestions = [
-                {
-                    desc: 'close',
-                    range: [e.endIndex, e.endIndex],
-                    text: `</${this.name}>`,
-                },
-            ];
-            return [e];
+            if (!closed) {
+                const e = (0, lint_1.generateForSelf)(this, rect, 'unclosed-comment', index_1.default.msg('unclosed $1', `<${name}>`));
+                e.suggestions = [
+                    {
+                        desc: 'close',
+                        range: [e.endIndex, e.endIndex],
+                        text: `</${name}>`,
+                    },
+                ];
+                errors.push(e);
+            }
+            return errors;
         }
         /* NOT FOR BROWSER */
         cloneNode() {

package/i18n/zh-hans.json

@@ -53,6 +53,7 @@
 	"unexpected template argument": "未预期的模板参数",
 	"unmatched closing tag": "未匹配的闭合标签",
 	"unnecessary URL encoding in an internal link": "内链中不必要的URL编码",
+	"useless attribute": "无用的属性",
 	"useless fragment": "无用的fragment",
 	"useless link text": "无用的链接文字",
 	"variable anchor in a section header": "段落标题中可变的锚点",

package/i18n/zh-hant.json

@@ -53,6 +53,7 @@
 	"unexpected template argument": "未預期的模板參數",
 	"unmatched closing tag": "未匹配的閉合標籤",
 	"unnecessary URL encoding in an internal link": "內部連結中不必要的URL編碼",
+	"useless attribute": "無用的屬性",
 	"useless fragment": "無用的fragment",
 	"useless link text": "無用的連結文字",
 	"variable anchor in a section header": "段落標題中可變的錨點",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikiparser-node",
-	"version": "1.13.0",
+	"version": "1.13.1",
 	"description": "A Node.js parser for MediaWiki markup with AST",
 	"keywords": [
 		"mediawiki",
@@ -48,7 +48,7 @@
 		"chalk": "^4.1.2"
 	},
 	"devDependencies": {
-		"@bhsd/common": "^0.1.1",
+		"@bhsd/common": "^0.3.0",
 		"@codemirror/lint": "^6.8.0",
 		"@types/node": "^20.11.6",
 		"codejar-async": "^4.2.3",