wikiparser-node 1.12.4 → 1.12.5

package/config/minimum.json

@@ -69,7 +69,12 @@
 			"link"
 		]
 	],
-	"namespaces": {},
+	"namespaces": {
+		"0": "",
+		"6": "File",
+		"10": "Template",
+		"828": "Module"
+	},
 	"nsid": {
 		"file": 6,
 		"category": 14

package/dist/lib/title.js

@@ -56,7 +56,7 @@ class Title {
     }
     /* NOT FOR BROWSER */
     set extension(extension) {
-        extension ||= '';
+        extension ??= '';
         const { main } = this, i = main.lastIndexOf('.');
         this.main = (i === -1 ? main : main.slice(0, i)) + (extension && '.') + extension;
     }

package/dist/src/arg.js

@@ -73,6 +73,22 @@ class ArgToken extends index_2.Token {
     getGaps() {
         return 1;
     }
+    /** 设置name */
+    #setName() {
+        this.setAttribute('name', this.firstChild.toString(true).trim());
+    }
+    /** @private */
+    afterBuild() {
+        this.#setName();
+        super.afterBuild();
+        /* NOT FOR BROWSER */
+        const /** @implements */ argListener = ({ prevTarget }) => {
+            if (prevTarget === this.firstChild) {
+                this.#setName();
+            }
+        };
+        this.addEventListener(['remove', 'insert', 'replace', 'text'], argListener);
+    }
     /** @private */
     lint(start = this.getAbsoluteIndex(), re) {
         const { childNodes: [argName, argDefault, ...rest] } = this;
@@ -125,21 +141,6 @@ class ArgToken extends index_2.Token {
             return token;
         });
     }
-    /** 设置name */
-    #setName() {
-        this.setAttribute('name', this.firstChild.toString(true).trim());
-    }
-    /** @private */
-    afterBuild() {
-        this.#setName();
-        super.afterBuild();
-        const /** @implements */ argListener = ({ prevTarget }) => {
-            if (prevTarget === this.firstChild) {
-                this.#setName();
-            }
-        };
-        this.addEventListener(['remove', 'insert', 'replace', 'text'], argListener);
-    }
     /** 移除无效部分 */
     removeRedundant() {
         debug_1.Shadow.run(() => {

package/dist/src/attribute.js

@@ -102,10 +102,14 @@ const commonHtmlAttrs = new Set([
     time: new Set(['datetime']),
     meta: new Set(['itemprop', 'content']),
     link: new Set(['itemprop', 'href', 'title']),
-    gallery: new Set(['mode', 'showfilename', 'caption', 'perrow', 'widths', 'heights', 'showthumbnails', 'type']),
-    poem: new Set(['compact', 'align']),
+    gallery: typeAttrs,
+    poem: blockAttrs,
+    categorytree: blockAttrs,
+    combooption: blockAttrs,
+}, empty = new Set(), extAttrs = {
+    gallery: new Set(['mode', 'showfilename', 'caption', 'perrow', 'widths', 'heights', 'showthumbnails']),
+    poem: new Set(['compact']),
     categorytree: new Set([
-        'align',
         'hideroot',
         'onlyroot',
         'depth',
@@ -115,8 +119,7 @@ const commonHtmlAttrs = new Set([
         'showcount',
         'notranslations',
     ]),
-    combooption: new Set(['name', 'for', 'inline', 'align']),
-}, empty = new Set(), extAttrs = {
+    combooption: new Set(['name', 'for', 'inline']),
     nowiki: empty,
     indicator: new Set(['name']),
     langconvert: new Set(['from', 'to']),
@@ -349,11 +352,12 @@ let AttributeToken = (() => {
                 errors.push(e);
             }
             const attrs = extAttrs[tag];
-            if (attrs && !attrs.has(name)
-                || (type === 'ext-attr' ? tag in htmlAttrs : !/\{\{[^{]+\}\}/u.test(name))
-                    && !htmlAttrs[tag]?.has(name)
-                    && !/^(?:xmlns:[\w:.-]+|data-(?!ooui|mw|parsoid)[^:]*)$/u.test(name)
-                    && (tag === 'meta' || tag === 'link' || !commonHtmlAttrs.has(name))) {
+            if (!(attrs && attrs.has(name))
+                && (type === 'ext-attr' || !/\{\{[^{]+\}\}/u.test(name))
+                && (type === 'ext-attr' && !(tag in htmlAttrs)
+                    || !htmlAttrs[tag]?.has(name)
+                        && !/^(?:xmlns:[\w:.-]+|data-(?!ooui|mw|parsoid)[^:]*)$/u.test(name)
+                        && (tag === 'meta' || tag === 'link' || !commonHtmlAttrs.has(name)))) {
                 errors.push((0, lint_1.generateForChild)(firstChild, rect, 'illegal-attr', 'illegal attribute name'));
             }
             else if (obsoleteAttrs[tag]?.has(name)) {

package/dist/src/attributes.js

@@ -117,7 +117,7 @@ class AttributesToken extends index_2.Token {
             while (mt) {
                 const { index, 0: full, 1: key, 2: equal, 3: quoteStart, 4: quoted, 5: quoteEnd, 6: unquoted } = mt;
                 out += attr.slice(lastIndex, index);
-                if (/^(?:[\w:]|\0\d+[t!~{}+-]\x7F)(?:[\w:.-]|\0\d+[t!~{}+-]\x7F)*$/u.test((0, string_1.removeComment)(key).trim())) {
+                if (/^(?:[\w:]|\0\d+t\x7F)(?:[\w:.-]|\0\d+t\x7F)*$/u.test((0, string_1.removeComment)(key).trim())) {
                     const value = quoted ?? unquoted, quotes = [quoteStart, quoteEnd], 
                     // @ts-expect-error abstract class
                     token = new attribute_1.AttributeToken(toAttributeType(type), name, key, equal, value, quotes, config, accum);

package/dist/src/gallery.d.ts

@@ -24,6 +24,10 @@ export declare abstract class GalleryToken extends Token {
     abstract get previousElementSibling(): AttributesToken;
     abstract get parentElement(): ExtToken | undefined;
     get type(): 'ext-inner';
+    /** 图片宽度 */
+    get widths(): number;
+    /** 图片高度 */
+    get heights(): number;
     /** 所有图片 */
     get images(): GalleryImageToken[];
     /** @param inner 标签内部wikitext */

package/dist/src/gallery.js

@@ -8,6 +8,7 @@ const noinclude_1 = require("./nowiki/noinclude");
 /* NOT FOR BROWSER */
 const debug_1 = require("../util/debug");
 const constants_1 = require("../util/constants");
+const html_1 = require("../util/html");
 /* NOT FOR BROWSER END */
 /**
  * gallery标签
@@ -19,6 +20,14 @@ class GalleryToken extends index_2.Token {
         return 'ext-inner';
     }
     /* NOT FOR BROWSER */
+    /** 图片宽度 */
+    get widths() {
+        return this.#getSize('widths');
+    }
+    /** 图片高度 */
+    get heights() {
+        return this.#getSize('heights');
+    }
     /** 所有图片 */
     get images() {
         return this.childNodes.filter((0, debug_1.isToken)('gallery-image'));
@@ -140,6 +149,18 @@ class GalleryToken extends index_2.Token {
         }
         return super.insertAt(token, i);
     }
+    /**
+     * 获取图片的宽度或高度
+     * @param key `widths` 或 `heights`
+     */
+    #getSize(key) {
+        const widths = this.parentNode?.getAttr(key), mt = typeof widths === 'string' && /^(\d+)\s*(?:px)?$/u.exec(widths)?.[1];
+        return mt && Number(mt) || 120;
+    }
+    /** @private */
+    toHtmlInternal() {
+        return (0, html_1.html)(this.childNodes.filter((0, debug_1.isToken)('gallery-image')), '\n');
+    }
 }
 exports.GalleryToken = GalleryToken;
 constants_1.classes['GalleryToken'] = __filename;

package/dist/src/link/file.js

@@ -77,7 +77,9 @@ class FileToken extends base_1.LinkBaseToken {
     }
     /** 图片宽度 */
     get width() {
-        return this.size?.width;
+        return this.type === 'gallery-image'
+            ? this.parentNode?.widths.toString()
+            : this.size?.width;
     }
     set width(width) {
         const arg = this.getArg('width');
@@ -90,7 +92,9 @@ class FileToken extends base_1.LinkBaseToken {
     }
     /** 图片高度 */
     get height() {
-        return this.size?.height;
+        return this.type === 'gallery-image'
+            ? this.parentNode?.heights.toString()
+            : this.size?.height;
     }
     set height(height) {
         const arg = this.getArg('width');
@@ -306,7 +310,7 @@ class FileToken extends base_1.LinkBaseToken {
     toHtmlInternal(_, nocc) {
         /** @ignore */
         const isInteger = (n) => Boolean(n && /^\d+$/u.test(n));
-        const { link, width, height } = this, file = this.getAttribute('title'), fr = this.getFrame(), manual = fr instanceof title_1.Title, visibleCaption = manual || fr === 'thumbnail' || fr === 'framed', caption = this.getArg('caption')?.toHtmlInternal(true, nocc) ?? '', titleFromCaption = visibleCaption ? '' : (0, string_1.sanitizeAlt)(caption), hasLink = manual || link !== file, title = titleFromCaption || (hasLink && typeof link !== 'string' ? link.getTitleAttr() : ''), titleAttr = title && ` title="${title}"`, alt = (0, string_1.sanitizeAlt)(this.getArg('alt')?.toHtmlInternal(true)) ?? titleFromCaption, horiz = this.getHorizAlign() ?? '', vert = this.getVertAlign() ?? '', className = `${horiz ? `mw-halign-${horiz}` : vert && `mw-valign-${vert}`}${this.getValue('border') ? ' mw-image-border' : ''} ${(0, string_1.sanitizeAlt)(this.getValue('class')) ?? ''}`.trim(), classAttr = className && ` class="${className}"`, img = `<img${alt && ` alt="${alt}"`} src="${(manual ? fr : file).getUrl()}" class="mw-file-element"${isInteger(width) ? ` width="${width}"` : ''}${isInteger(height) ? ` height="${height}"` : ''}>`;
+        const { link, width, height, type } = this, file = this.getAttribute('title'), fr = this.getFrame(), manual = fr instanceof title_1.Title, visibleCaption = manual || fr === 'thumbnail' || fr === 'framed' || type === 'gallery-image', caption = this.getArg('caption')?.toHtmlInternal(true, nocc) ?? '', titleFromCaption = visibleCaption && type !== 'gallery-image' ? '' : (0, string_1.sanitizeAlt)(caption), hasLink = manual || link !== file, title = titleFromCaption || (hasLink && typeof link !== 'string' ? link.getTitleAttr() : ''), titleAttr = title && ` title="${title}"`, alt = (0, string_1.sanitizeAlt)(this.getArg('alt')?.toHtmlInternal(true)) ?? titleFromCaption, horiz = this.getHorizAlign() ?? '', vert = this.getVertAlign() ?? '', className = `${horiz ? `mw-halign-${horiz}` : vert && `mw-valign-${vert}`}${this.getValue('border') ? ' mw-image-border' : ''} ${(0, string_1.sanitizeAlt)(this.getValue('class')) ?? ''}`.trim(), classAttr = className && ` class="${className}"`, img = `<img${alt && ` alt="${alt}"`} src="${(manual ? fr : file).getUrl()}" class="mw-file-element"${isInteger(width) ? ` width="${width}"` : ''}${isInteger(height) ? ` height="${height}"` : ''}>`;
         let href = '';
         if (link) {
             try {
@@ -326,9 +330,15 @@ class FileToken extends base_1.LinkBaseToken {
         const a = link
             ? `<a${href && ` href="${href}"`}${hasLink ? '' : ` class="mw-file-description"`}${titleAttr}${typeof link === 'string' ? ` rel="nofollow"` : ''}>${img}</a>`
             : `<span${titleAttr}>${img}</span>`;
-        return (0, html_1.font)(this, horiz || vert || visibleCaption
-            ? `<figure${classAttr} typeof="mw:File${fr ? `/${manual ? 'Thumb' : frame.get(fr)}` : ''}">${a}<figcaption>${caption}</figcaption></figure>`
-            : `<span${classAttr}>${a}</span>`);
+        if (type !== 'gallery-image') {
+            return (0, html_1.font)(this, horiz || vert || visibleCaption
+                ? `<figure${classAttr} typeof="mw:File${fr ? `/${manual ? 'Thumb' : frame.get(fr)}` : ''}">${a}<figcaption>${caption}</figcaption></figure>`
+                : `<span${classAttr}>${a}</span>`);
+        }
+        const parent = this.parentNode, mode = parent?.parentNode?.getAttr('mode'), nolines = typeof mode === 'string' && mode.toLowerCase() === 'nolines', padding = nolines ? 0 : 30, showfilename = parent?.parentNode?.getAttr('showfilename') !== undefined;
+        return `\t<li class="gallerybox" style="width: ${Number(width) + padding + 5}px">\n\t\t<div class="thumb" style="width: ${Number(width) + padding}px${nolines ? '' : `; height: ${Number(height) + padding}px`}"><span>${a}</span></div>\n\t\t<div class="gallerytext">${showfilename
+            ? `<a href="${file.getUrl()}" class="galleryfilename galleryfilename-truncate" title="${file.title}">${file.main}</a>\n`
+            : ''}${caption}</div>\n\t</li>`;
     }
 }
 exports.FileToken = FileToken;

package/dist/src/tagPair/ext.js

@@ -206,6 +206,18 @@ let ExtToken = (() => {
                     firstChild.classList.add('poem');
                     return (0, html_1.font)(this, `<div${firstChild.toHtmlInternal()}>${lastChild.toHtmlInternal(false, nocc).replace(/(?<!^|<hr>)\n(?!$)/gu, '<br>\n')
                         .replace(/^ +/gmu, p => '&nbsp;'.repeat(p.length))}</div>`);
+                case 'gallery': {
+                    const caption = firstChild.getAttrToken('caption'), perrow = parseInt(String(firstChild.getAttr('perrow'))), mode = firstChild.getAttr('mode'), nolines = typeof mode === 'string' && mode.toLowerCase() === 'nolines', padding = nolines ? 9 : 43;
+                    firstChild.classList.add('gallery');
+                    if (nolines) {
+                        firstChild.classList.add('mw-gallery-nolines');
+                    }
+                    if (perrow > 0) {
+                        const style = firstChild.getAttr('style');
+                        firstChild.setAttr('style', `max-width: ${(lastChild.widths + padding) * perrow}px;${typeof style === 'string' ? style : ''}`);
+                    }
+                    return (0, html_1.font)(this, `<ul${firstChild.toHtmlInternal()}>\n${caption ? `\t<li class="gallerycaption">${caption.lastChild.toHtmlInternal(true)}</li>\n` : ''}${lastChild.toHtmlInternal()}\n</ul>`);
+                }
                 default:
                     return '';
             }

package/dist/src/transclude.js

@@ -164,12 +164,12 @@ class TranscludeToken extends index_2.Token {
             this.setAttribute('modifier', this.buildFromStr(this.modifier, constants_1.BuildMethod.String));
         }
         super.afterBuild();
-        /* NOT FOR BROWSER */
         if (this.isTemplate()) {
             const isTemplate = this.type === 'template';
             if (isTemplate) {
                 this.setAttribute('name', this.#getTitle().title);
             }
+            /* NOT FOR BROWSER */
             /**
              * 当事件bubble到`parameter`时，将`oldKey`和`newKey`保存进AstEventData。
              * 当继续bubble到`template`时，处理并删除`oldKey`和`newKey`。

package/package.json

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