wikiparser-node 1.5.1 → 1.5.2

package/config/default.json

@@ -830,8 +830,7 @@
 		"page=$1": "page",
 		"page $1": "page",
 		"页数=$1": "page",
-		"$1页": "page",
-		"lossy=$1": "lossy"
+		"$1页": "page"
 	},
 	"variants": [
 		"zh",

package/config/enwiki.json

@@ -1217,8 +1217,7 @@
 		"text-bottom": "text-bottom",
 		"lang=$1": "lang",
 		"page=$1": "page",
-		"page $1": "page",
-		"lossy=$1": "lossy"
+		"page $1": "page"
 	},
 	"variants": []
 }

package/dist/lib/element.js

@@ -285,10 +285,6 @@ class AstElement extends node_1.AstNode {
         return json;
     }
     /* NOT FOR BROWSER */
-    /** @private */
-    matchesTypes(types) {
-        return types.has(this.type);
-    }
     /** 销毁 */
     destroy() {
         this.parentNode?.destroy();

package/dist/lib/text.js

@@ -121,8 +121,18 @@ class AstText extends node_1.AstNode {
             throw new Error('无法对孤立文本节点进行语法分析！');
             /* NOT FOR BROWSER END */
         }
+        const { type, name, parentNode: grandparent } = parentNode, nowiki = name === 'nowiki' || name === 'pre';
+        let isHtmlAttrVal = false;
+        if (type === 'attr-value') {
+            const { type: grandType, name: grandName, tag } = grandparent;
+            if (grandType !== 'ext-attr') {
+                isHtmlAttrVal = true;
+            }
+            else if (tag === 'choose' && (grandName === 'before' || grandName === 'after')) {
+                return [];
+            }
+        }
         const { NowikiToken } = require('../src/nowiki');
-        const { type, name } = parentNode, nowiki = name === 'nowiki' || name === 'pre', isHtmlAttrVal = type === 'attr-value' && parentNode.parentNode.type !== 'ext-attr';
         let errorRegex;
         if (type === 'ext-inner' && (name === 'pre' || parentNode instanceof NowikiToken)) {
             errorRegex = new RegExp(`<\\s*(?:\\/\\s*)${nowiki ? '' : '?'}(${name})\\b`, 'giu');

package/dist/lib/title.d.ts

@@ -9,13 +9,13 @@ export declare class Title {
     /** 不含命名空间的标题主体部分 */
     get main(): string;
     set main(title: string);
+    /** 扩展名 */
+    get extension(): string | undefined;
+    set extension(extension: string | undefined);
     /** 命名空间前缀 */
     get prefix(): string;
     /** 完整标题 */
     get title(): string;
-    /** 扩展名 */
-    get extension(): string | undefined;
-    set extension(extension: string | undefined);
     /**
      * @param title 标题（含或不含命名空间前缀）
      * @param defaultNs 命名空间

package/dist/lib/title.js

@@ -11,14 +11,15 @@ class Title {
     fragment;
     /** @private */
     encoded = false;
+    #main;
     /* NOT FOR BROWSER */
     #namespaces;
-    #main;
     interwiki = '';
     /** @private */
     conversionTable = new Map();
     /** @private */
     redirects = new Map();
+    /* NOT FOR BROWSER END */
     /** 不含命名空间的标题主体部分 */
     get main() {
         return this.#main;
@@ -27,6 +28,16 @@ class Title {
         title = title.replace(/_/gu, ' ').trim();
         this.#main = title && `${title[0].toUpperCase()}${title.slice(1)}`;
     }
+    /** 扩展名 */
+    get extension() {
+        const { main } = this, i = main.lastIndexOf('.');
+        return i === -1 ? undefined : main.slice(i + 1).toLowerCase();
+    }
+    /* NOT FOR BROWSER */
+    set extension(extension) {
+        const { main } = this, i = main.lastIndexOf('.');
+        this.main = `${i === -1 ? main : main.slice(0, i)}.${extension}`;
+    }
     /** 命名空间前缀 */
     get prefix() {
         const namespace = this.#namespaces[this.ns];
@@ -44,15 +55,6 @@ class Title {
         title = `${prefix}${this.main}`.replace(/ /gu, '_');
         return this.redirects.get(title) ?? title;
     }
-    /** 扩展名 */
-    get extension() {
-        const { main } = this, i = main.lastIndexOf('.');
-        return i === -1 ? undefined : main.slice(i + 1).toLowerCase();
-    }
-    set extension(extension) {
-        const { main } = this, i = main.lastIndexOf('.');
-        this.main = `${i === -1 ? main : main.slice(0, i)}.${extension}`;
-    }
     /* NOT FOR BROWSER END */
     /**
      * @param title 标题（含或不含命名空间前缀）
@@ -112,9 +114,9 @@ class Title {
         }
         this.valid = Boolean(title || this.interwiki || selfLink && this.fragment !== undefined)
             && !/^:|\0\d+[eh!+-]\x7F|[<>[\]{}|]|%[\da-f]{2}/iu.test(title);
+        this.main = title;
         /* NOT FOR BROWSER */
         this.#namespaces = config.namespaces;
-        this.main = title;
         Object.defineProperties(this, {
             valid: { writable: false },
             encoded: { enumerable: false, writable: false },

package/dist/parser/list.js

@@ -23,8 +23,8 @@ const parseList = (wikitext, config = index_1.default.getConfig(), accum = []) =
     if (!dt) {
         return text;
     }
-    const { html: [normalTags] } = config, fullRegex = /:+|-\{|\0\d+x\x7F/gu;
-    let regex = fullRegex, ex = regex.exec(text), lt = 0, lc = 0;
+    const { html: [normalTags] } = config, fullRegex = /:+|-\{|\0\d+[xq]\x7F/gu;
+    let regex = fullRegex, ex = regex.exec(text), lt = 0, lb = false, li = false, lc = 0;
     /**
      * 创建`DdToken`
      * @param syntax `:`
@@ -35,6 +35,18 @@ const parseList = (wikitext, config = index_1.default.getConfig(), accum = []) =
         new dd_1.DdToken(syntax, config, accum);
         return `${text.slice(0, index)}\0${accum.length - 1}d\x7F${text.slice(index + syntax.length)}`;
     };
+    /**
+     * 更新 `lt`
+     * @param closing 是否是闭合标签
+     */
+    const update = (closing) => {
+        if (!closing) {
+            lt++;
+        }
+        else if (lt) {
+            lt--;
+        }
+    };
     while (ex && dt) {
         const { 0: syntax, index } = ex;
         if (syntax === '-{') {
@@ -53,15 +65,21 @@ const parseList = (wikitext, config = index_1.default.getConfig(), accum = []) =
                 regex.lastIndex = lastIndex;
             }
         }
-        else if (syntax.startsWith('\0')) {
+        else if (syntax.endsWith('x\x7F')) {
             const { name, closing, selfClosing } = accum[Number(syntax.slice(1, -2))];
             if (!selfClosing || normalTags.includes(name)) {
-                if (!closing) {
-                    lt++;
-                }
-                else if (lt) {
-                    lt--;
-                }
+                update(closing);
+            }
+        }
+        else if (syntax.endsWith('q\x7F')) {
+            const { bold, italic } = accum[Number(syntax.slice(1, -2))];
+            if (bold) {
+                update(lb);
+                lb = !lb;
+            }
+            if (italic) {
+                update(li);
+                li = !li;
             }
         }
         else if (lt === 0) { // syntax === ':'

package/dist/src/attribute.d.ts

@@ -24,6 +24,8 @@ export declare abstract class AttributeToken extends Token {
     abstract get parentElement(): AttributesToken | undefined;
     abstract get nextElementSibling(): AtomToken | this | undefined;
     abstract get previousElementSibling(): AtomToken | this | undefined;
+    /** 标签名 */
+    get tag(): string;
     /** 引号是否匹配 */
     get balanced(): boolean;
     set balanced(value: boolean);

package/dist/src/attribute.js

@@ -232,7 +232,7 @@ let AttributeToken = (() => {
         #equal;
         #quotes;
         /* NOT FOR BROWSER END */
-        /** @private */
+        /** 标签名 */
         get tag() {
             return this.#tag;
         }

package/dist/src/imageParameter.d.ts

@@ -37,7 +37,7 @@ export declare abstract class ImageParameterToken extends Token {
     get height(): string | undefined;
     set height(height: string | undefined);
     /** @param str 图片参数 */
-    constructor(str: string, config?: Parser.Config, accum?: Token[]);
+    constructor(str: string, extension: string | undefined, config?: Parser.Config, accum?: Token[]);
     /** @override */
     text(): string;
     /** @override */

package/dist/src/imageParameter.js

@@ -8,7 +8,7 @@ const constants_1 = require("../util/constants");
 const index_1 = require("../index");
 const index_2 = require("./index");
 exports.galleryParams = new Set(['alt', 'link', 'lang', 'page', 'caption']);
-function validate(key, val, config = index_1.default.getConfig(), halfParsed = false) {
+function validate(key, val, config, halfParsed = false, ext) {
     val = val.trim();
     let value = val.replace(/\0\d+t\x7F/gu, '').trim();
     switch (key) {
@@ -31,11 +31,13 @@ function validate(key, val, config = index_1.default.getConfig(), halfParsed = f
             return title.valid && title;
         }
         case 'lang':
-            return !value || config.variants.includes(value);
+            return (ext === 'svg' || ext === 'svgz') && !/[^a-z\d-]/u.test(value);
         case 'alt':
         case 'class':
         case 'manualthumb':
             return true;
+        case 'page':
+            return (ext === 'djvu' || ext === 'djv') && Number(value) > 0;
         default:
             return !Number.isNaN(Number(value));
     }
@@ -44,6 +46,7 @@ function validate(key, val, config = index_1.default.getConfig(), halfParsed = f
 class ImageParameterToken extends index_2.Token {
     type = 'image-parameter';
     #syntax = '';
+    #extension;
     /* NOT FOR BROWSER END */
     /** 图片链接 */
     get link() {
@@ -106,7 +109,7 @@ class ImageParameterToken extends index_2.Token {
     }
     /* NOT FOR BROWSER END */
     /** @param str 图片参数 */
-    constructor(str, config = index_1.default.getConfig(), accum = []) {
+    constructor(str, extension, config = index_1.default.getConfig(), accum = []) {
         let mt;
         const regexes = Object.entries(config.img).map(([syntax, param]) => [
             syntax,
@@ -115,7 +118,8 @@ class ImageParameterToken extends index_2.Token {
         ]), param = regexes.find(([, key, regex]) => {
             mt = regex.exec(str);
             return mt
-                && (mt.length !== 4 || validate(key, mt[2], config, true) !== false);
+                && (mt.length !== 4
+                    || validate(key, mt[2], config, true, extension) !== false);
         });
         // @ts-expect-error mt already assigned
         if (param && mt) {
@@ -135,6 +139,8 @@ class ImageParameterToken extends index_2.Token {
         super(str, { ...config, excludes: [...config.excludes ?? [], 'list'] }, accum);
         this.setAttribute('name', 'caption');
         this.setAttribute('stage', 7);
+        /* NOT FOR BROWSER */
+        this.#extension = extension;
     }
     /** @private */
     afterBuild() {
@@ -201,7 +207,7 @@ class ImageParameterToken extends index_2.Token {
         const cloned = this.cloneChildNodes(), config = this.getAttribute('config');
         return debug_1.Shadow.run(() => {
             // @ts-expect-error abstract class
-            const token = new ImageParameterToken(this.#syntax.replace('$1', ''), config);
+            const token = new ImageParameterToken(this.#syntax.replace('$1', ''), this.#extension, config);
             token.replaceChildren(...cloned);
             token.setAttribute('name', this.name);
             token.setAttribute('syntax', this.#syntax);

package/dist/src/link/file.d.ts

@@ -15,6 +15,8 @@ export declare abstract class FileToken extends LinkBaseToken {
     abstract get lastChild(): AtomToken | ImageParameterToken;
     abstract get children(): [AtomToken, ...ImageParameterToken[]];
     abstract get lastElementChild(): AtomToken | ImageParameterToken;
+    /** 扩展名 */
+    get extension(): string | undefined;
     /** 图片链接 */
     get link(): string | Title;
     set link(value: string);

package/dist/src/link/file.js

@@ -42,6 +42,12 @@ const explode = (start, end, separator, str) => {
  */
 class FileToken extends base_1.LinkBaseToken {
     type = 'file';
+    /* NOT FOR BROWSER END */
+    /** 扩展名 */
+    get extension() {
+        return this.getTitle().extension;
+    }
+    /* NOT FOR BROWSER */
     /** 图片链接 */
     get link() {
         return this.getArg('link')?.link ?? super.link;
@@ -93,9 +99,10 @@ class FileToken extends base_1.LinkBaseToken {
         /* NOT FOR BROWSER */
         this.setAttribute('acceptable', { AtomToken: 0, ImageParameterToken: '1:' });
         /* NOT FOR BROWSER END */
+        const { extension } = this;
         this.append(...explode('-{', '}-', '|', text).map(
         // @ts-expect-error abstract class
-        part => new imageParameter_1.ImageParameterToken(part, config, accum)));
+        part => new imageParameter_1.ImageParameterToken(part, extension, config, accum)));
     }
     /** @override */
     lint(start = this.getAbsoluteIndex()) {
@@ -245,7 +252,7 @@ class FileToken extends base_1.LinkBaseToken {
         }
         const parameter = debug_1.Shadow.run(
         // @ts-expect-error abstract class
-        () => new imageParameter_1.ImageParameterToken(syntax.replace('$1', ''), config));
+        () => new imageParameter_1.ImageParameterToken(syntax.replace('$1', ''), this.extension, config));
         if (free) {
             const { childNodes } = index_1.default.parse(value, this.getAttribute('include'), undefined, config);
             parameter.replaceChildren(...childNodes);

package/dist/src/table/td.d.ts

@@ -54,12 +54,6 @@ export declare abstract class TdToken extends TableBaseToken {
     isIndependent(): boolean;
     /** @override */
     cloneNode(): this;
-    /**
-     * @override
-     * @param syntax 表格语法
-     * @param esc 是否需要转义
-     */
-    setSyntax(syntax: string, esc?: boolean): void;
     /** 改为独占一行 */
     independence(): void;
     /**

package/dist/src/table/td.js

@@ -251,11 +251,7 @@ let TdToken = (() => {
                 super.setAttribute(key, value);
             }
         }
-        /**
-         * @override
-         * @param syntax 表格语法
-         * @param esc 是否需要转义
-         */
+        /** @private */
         setSyntax(syntax, esc = false) {
             const aliases = { td: '\n|', th: '\n!', caption: '\n|+' };
             super.setSyntax(aliases[syntax] ?? syntax, esc);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikiparser-node",
-	"version": "1.5.1",
+	"version": "1.5.2",
 	"description": "A Node.js parser for MediaWiki markup with AST",
 	"keywords": [
 		"mediawiki",