wikiparser-node 1.41.0 → 1.42.0

package/dist/src/link/file.js

@@ -501,13 +501,13 @@ let FileToken = (() => {
         /* c8 ignore stop */
         /** @private */
         toHtmlInternal(opt) {
-            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({
+            const { link, width, height, type } = this, file = this.getAttribute('title'), fr = this.getFrame(), manual = fr instanceof title_1.Title, framed = fr === 'framed', visibleCaption = manual || framed || fr === 'thumbnail' || type === 'gallery-image', caption = this.getArg('caption')?.toHtmlInternal({
                 ...opt,
                 nowrap: true,
             }) ?? '', 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({
                 ...opt,
                 nowrap: 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}"`, hasWidth = isInteger(width), hasHeight = isInteger(height);
+            })) ?? titleFromCaption, horiz = this.getHorizAlign() ?? '', vert = this.getVertAlign() ?? '', hasWidth = isInteger(width), hasHeight = isInteger(height), className = `${manual || framed || hasWidth || hasHeight ? '' : 'mw-default-size '}${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}"`;
             let src;
             try {
                 src = manual ? fr.getFileUrl() : file.getFileUrl(hasWidth && Number(width), hasHeight && Number(height));
@@ -523,10 +523,10 @@ let FileToken = (() => {
                     if (link === file) {
                         const lang = this.getValue('lang'), page = this.getValue('page');
                         if (lang) {
-                            href += `?lang=${lang}`;
+                            href += `?lang=${(0, string_1.sanitizeId)(lang)}`;
                         }
                         else if (page) {
-                            href += `?page=${page}`;
+                            href += `?page=${(0, string_1.sanitizeId)(page)}`;
                         }
                     }
                 }
@@ -540,7 +540,7 @@ let FileToken = (() => {
                     ? `<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;
+            const parent = this.parentNode, nolines = parent?.parentNode?.getAttr('mode')?.toLowerCase() === 'nolines', padding = nolines ? 0 : 30;
             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">${parent?.parentNode?.hasAttr('showfilename')
                 ? `<a href="${file.getUrl()}" class="galleryfilename galleryfilename-truncate" title="${file.title}">${file.main}</a>\n`
                 : ''}${caption}</div>\n\t</li>`;

package/dist/src/link/galleryImage.js

@@ -144,9 +144,7 @@ let GalleryImageToken = (() => {
          * @param i position to be inserted at / 插入位置
          */
         insertAt(child, i) {
-            if (this.type === 'gallery-image'
-                && child.is('image-parameter')
-                && !constants_1.galleryParams.has(child.name)) {
+            if (this.type === 'gallery-image' && child.is('image-parameter') && !constants_1.galleryParams.has(child.name)) {
                 child.setAttribute('name', 'invalid');
             }
             return super.insertAt(child, i);

package/dist/src/magicLink.js

@@ -246,7 +246,7 @@ let MagicLinkToken = (() => {
                         .getUrl(articlePath)
                     : new URL(link.startsWith('RFC')
                         ? `https://datatracker.ietf.org/doc/html/rfc${link.slice(4)}`
-                        : `https://pubmed.ncbi.nlm.nih.gov/${link.slice(5)}`);
+                        : `https://www.ncbi.nlm.nih.gov/pubmed/${link.slice(5)}?dopt=Abstract`);
             }
         }
         /* PRINT ONLY */
@@ -300,10 +300,11 @@ let MagicLinkToken = (() => {
                 url = this.getUrl();
             }
             catch { }
-            const attrs = type === 'free-ext-link' || type === 'ext-link-url'
-                ? ` rel="nofollow" class="external${type === 'free-ext-link' ? ' free' : ''}"${typeof url === 'object' ? ` href="${url.href}"` : ''}`
-                : (protocol === 'ISBN' ? '' : ' class="external" rel="nofollow"')
-                    + (url === undefined ? '' : ` href="${typeof url === 'string' ? url : url.href}"`);
+            const isISBN = protocol === 'ISBN', attrs = type === 'free-ext-link' || type === 'ext-link-url'
+                ? ` rel="nofollow" class="external free"${typeof url === 'object' ? ` href="${url.href}"` : ''}`
+                : (isISBN ? '' : ` class="external mw-magiclink-${protocol.toLowerCase()}" rel="nofollow"`)
+                    + (url === undefined ? '' : ` href="${typeof url === 'string' ? url : url.href}"`)
+                    + (isISBN ? ' class="internal mw-magiclink-isbn"' : '');
             return `<a${attrs}>${innerText}</a>`;
         }
     };

package/dist/src/multiLine/gallery.js

@@ -176,7 +176,7 @@ let GalleryToken = (() => {
          */
         #getSize(key) {
             LSP: {
-                const widths = this.parentNode?.getAttr(key), mt = typeof widths === 'string' && /^(\d+)\s*(?:px)?$/u.exec(widths)?.[1];
+                const widths = this.parentNode?.getAttr(key), mt = widths && /^(\d+)\s*(?:px)?$/u.exec(widths)?.[1];
                 return mt && Number(mt) || 120;
             }
         }
@@ -208,8 +208,7 @@ let GalleryToken = (() => {
             throw new SyntaxError(`Invalid file name: ${file}`);
         }
         insertAt(token, i = this.length) {
-            if (!debug_1.Shadow.running
-                && (typeof token === 'string' ? token.trim() : !token.is('gallery-image'))) {
+            if (!debug_1.Shadow.running && (typeof token === 'string' ? token.trim() : !token.is('gallery-image'))) {
                 throw new RangeError('Please do not insert invisible content into <gallery>!');
             }
             return super.insertAt(token, i);

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

@@ -20,4 +20,5 @@ export declare abstract class DoubleUnderscoreToken extends NowikiBaseToken {
      */
     constructor(word: string, sensitive: boolean, fullWidth: boolean, config: Config, accum?: Token[]);
     cloneNode(): this;
+    toHtmlInternal(): string;
 }

package/dist/src/nowiki/doubleUnderscore.js

@@ -49,7 +49,7 @@ const syntax_1 = require("../../mixin/syntax");
  * 状态开关
  */
 let DoubleUnderscoreToken = (() => {
-    let _classDecorators = [(0, syntax_1.syntax)(), (0, hidden_1.hiddenToken)(), (0, padded_1.padded)('__')];
+    let _classDecorators = [(0, syntax_1.syntax)(), (0, hidden_1.hiddenToken)(true, false), (0, padded_1.padded)('__')];
     let _classDescriptor;
     let _classExtraInitializers = [];
     let _classThis;
@@ -101,6 +101,9 @@ let DoubleUnderscoreToken = (() => {
             // @ts-expect-error abstract class
             return debug_1.Shadow.run(() => new DoubleUnderscoreToken(this.innerText, this.#sensitive, this.#fullWidth, this.getAttribute('config')));
         }
+        toHtmlInternal() {
+            return this.tocData ?? '';
+        }
     };
     return DoubleUnderscoreToken = _classThis;
 })();

package/dist/src/nowiki/quote.js

@@ -113,9 +113,7 @@ let QuoteToken = (() => {
         /** @private */
         text() {
             const { parentNode, innerText } = this;
-            return parentNode?.is('image-parameter') && parentNode.name !== 'caption'
-                ? ''
-                : innerText;
+            return parentNode?.is('image-parameter') && parentNode.name !== 'caption' ? '' : innerText;
         }
         /** @private */
         lint(start = this.getAbsoluteIndex()) {

package/dist/src/parameter.js

@@ -236,8 +236,11 @@ let ParameterToken = (() => {
          * 获取参数值
          */
         getValue() {
-            const value = (0, string_1.removeCommentLine)(this.lastChild.text());
-            return this.anon && this.parentNode?.isTemplate() !== false ? value : value.trim();
+            const { parentNode, lastChild, anon, name } = this, value = (0, string_1.removeCommentLine)(lastChild.text());
+            return anon && parentNode?.isTemplate() !== false
+                || name === '2' && parentNode?.type === 'magic-word' && parentNode.name === 'tag'
+                ? value
+                : value.trim();
         }
         /**
          * Set the parameter value

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

@@ -8,9 +8,9 @@ export interface TdSpanAttrs {
     rowspan?: number;
     colspan?: number;
 }
-declare type TdAttrGetter<T extends string> = T extends keyof TdSpanAttrs ? number : string | true | undefined;
+declare type TdAttrGetter<T extends string> = T extends keyof TdSpanAttrs ? number : string | undefined;
 declare type TdAttrSetter<T extends string> = T extends keyof TdSpanAttrs ? number : string | boolean;
-export type TdAttrs = Record<string, string | true> & TdSpanAttrs;
+export type TdAttrs = Record<string, string> & TdSpanAttrs;
 /**
  * `<td>`, `<th>` or `<caption>`
  *

package/dist/src/table/td.js

@@ -258,7 +258,7 @@ let TdToken = (() => {
                 key = (0, string_1.trimLc)(key);
                 /* NOT FOR BROWSER END */
                 const value = super.getAttr(key);
-                return (key === 'rowspan' || key === 'colspan' ? parseInt(value) || 1 : value);
+                return (key === 'rowspan' || key === 'colspan' ? parseInt(value || '') || 1 : value);
             }
         }
         /** @private */

package/dist/src/tag/html.js

@@ -88,12 +88,15 @@ let HtmlToken = (() => {
     let _classThis;
     let _classSuper = index_2.TagToken;
     let _instanceExtraInitializers = [];
+    let _getTocLine_decorators;
     let _toHtmlInternal_decorators;
     var HtmlToken = class extends _classSuper {
         static { _classThis = this; }
         static {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+            _getTocLine_decorators = [(0, cached_1.cached)()];
             _toHtmlInternal_decorators = [(0, cached_1.cached)()];
+            __esDecorate(this, null, _getTocLine_decorators, { kind: "method", name: "getTocLine", static: false, private: false, access: { has: obj => "getTocLine" in obj, get: obj => obj.getTocLine }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _toHtmlInternal_decorators, { kind: "method", name: "toHtmlInternal", static: false, private: false, access: { has: obj => "toHtmlInternal" in obj, get: obj => obj.toHtmlInternal }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
             HtmlToken = _classThis = _classDescriptor.value;
@@ -319,25 +322,39 @@ let HtmlToken = (() => {
             }
         }
         /** @private */
+        getTocLine() {
+            if (this.closing || !/^h\d$/u.test(this.name)) {
+                return undefined;
+            }
+            const matched = this.findMatchingTag();
+            if (!matched) {
+                return undefined;
+            }
+            const range = this.createRange();
+            range.setStartAfter(this);
+            range.setEndBefore(matched);
+            const content = (0, html_1.html)(range.cloneContents(), '', { nocc: true });
+            return [(0, html_1.getId)(content), content];
+        }
+        /** @private */
         toHtmlInternal() {
-            const { closing, name } = this, [, selfClosingTags, voidTags] = this.getAttribute('config').html, tag = name + (closing ? '' : super.toHtmlInternal());
+            const { closing, name, selfClosing } = this, [, selfClosingTags, voidTags] = this.getAttribute('config').html, tag = name + (closing ? '' : super.toHtmlInternal());
             if (voidTags.includes(name)) {
                 return closing && name !== 'br' ? '' : `<${tag}>`;
             }
-            const result = `<${closing ? '/' : ''}${tag}>${this.#selfClosing && !closing && selfClosingTags.includes(name) ? `</${name}>` : ''}`;
-            if (/^h\d$/u.test(name) && (this.closing || !this.id)) {
-                const matched = this.findMatchingTag();
-                if (matched) {
-                    if (closing) {
-                        return result + (matched.id ? '' : '</div>');
+            const result = `<${closing ? '/' : ''}${tag}>${selfClosing && !closing && selfClosingTags.includes(name) ? `</${name}>` : ''}`;
+            if (/^h\d$/u.test(name)) {
+                if (closing) {
+                    return result + (this.findMatchingTag()?.id === '' ? '</div>' : '');
+                }
+                else if (!this.id) {
+                    const id = this.getTocLine()?.[0];
+                    if (id !== undefined) {
+                        return `<div class="mw-heading mw-heading${name.slice(-1)}">${result.slice(0, -1)} id="${id}">`;
                     }
-                    const range = this.createRange();
-                    range.setStartAfter(this);
-                    range.setEndBefore(matched);
-                    return `<div class="mw-heading mw-heading${name.slice(-1)}">${result.slice(0, -1)} id="${(0, html_1.getId)(range.cloneContents())}">`;
                 }
             }
-            return result;
+            return (this.tocData ?? '') + result;
         }
         /** @private */
         getRange() {

package/dist/src/tagPair/ext.js

@@ -103,6 +103,7 @@ let ExtToken = (() => {
                         innerToken = new PreToken(inner, newConfig, accum);
                         break;
                     }
+                    newConfig.excludes.push('list');
                 // fall through
                 case 'indicator':
                 case 'poem':
@@ -125,7 +126,9 @@ let ExtToken = (() => {
                         case 'tab':
                             newConfig.ext = newConfig.ext.filter(e => e !== 'tabs');
                             break;
-                        // No default
+                        case 'ref':
+                            newConfig.ext = newConfig.ext.filter(e => e !== 'references');
+                        // no default
                     }
                     innerToken = new index_2.Token(inner, newConfig, accum);
                     break;

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

@@ -26,7 +26,7 @@ export declare abstract class TranslateToken extends TagPairToken implements Omi
      */
     constructor(attr?: string, inner?: string, config?: Config, accum?: Token[]);
     /** @implements */
-    getAttr(key: string): true | undefined;
+    getAttr(key: string): '' | undefined;
     /** @implements */
     hasAttr(key: string): boolean;
     /** @implements */

package/dist/src/tagPair/translate.js

@@ -125,7 +125,7 @@ let TranslateToken = (() => {
         }
         /** @implements */
         getAttr(key) {
-            return (0, string_1.trimLc)(key) === 'nowrap' && this.#isNowrap() || undefined;
+            return (0, string_1.trimLc)(key) === 'nowrap' && this.#isNowrap() ? '' : undefined;
         }
         /** @implements */
         hasAttr(key) {

package/dist/util/debug.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCanonicalName = exports.undo = exports.mixin = exports.emptyArray = exports.getMagicWordInfo = exports.setChildNodes = exports.isLink = exports.isRowEnd = exports.isToken = exports.Shadow = void 0;
+exports.getCanonicalName = exports.undo = exports.mixin = exports.emptyArray = exports.getMagicWordInfo = exports.setChildNodes = exports.isLink = exports.isRowEnd = exports.Shadow = void 0;
+exports.isToken = isToken;
 exports.Shadow = {
     running: false,
     /** @private */
@@ -50,12 +51,9 @@ exports.Shadow = {
     },
     rev: 0,
 };
-/**
- * 是否是某一特定类型的节点
- * @param type 节点类型
- */
-const isToken = (type) => (node) => node.type === type;
-exports.isToken = isToken;
+function isToken(type) {
+    return (node) => node.type === type;
+}
 /**
  * 是否是行尾
  * @param token 节点

package/dist/util/html.js

@@ -95,9 +95,9 @@ const html = (childNodes, separator, opt = {}) => {
             if ((child.length > 0 || /\s$/u.test(innerText))
                 && previousSibling.is('list')
                 && !/[;#*]/u.test(innerText)
-                && child.closest('ext-inner#poem,list-range')?.type === 'ext-inner') {
+                && child.closest('ext#poem,list-range')?.type === 'ext') {
                 lastPrefix = '';
-                result = `<span style="display: inline-block; margin-inline-start: ${previousSibling.indent}em;">${result}</span>`;
+                result = `<span class="mw-poem-indented" style="display: inline-block; margin-inline-start: ${previousSibling.indent}em;">${result}</span>`;
             }
             else {
                 result = result.trim();
@@ -145,15 +145,7 @@ exports.html = html;
  * @param tokens inner tokens of a section heading
  */
 const getId = (tokens) => {
-    let content;
-    if (typeof tokens === 'string') {
-        content = tokens;
-    }
-    else {
-        const opt = { nocc: true };
-        content = Array.isArray(tokens) ? (0, exports.html)(tokens, '', opt) : tokens.toHtmlInternal(opt);
-    }
-    const id = (0, string_1.decodeHtml)((0, string_1.sanitizeAlt)(content.replaceAll('_', ' ')))
+    const content = typeof tokens === 'string' ? tokens : tokens.toHtmlInternal({ nocc: true }), id = (0, string_1.decodeHtml)((0, string_1.sanitizeAlt)(content.replaceAll('_', ' ')))
         .replace(/[\s_]+/gu, '_');
     return id.endsWith('_') ? id.slice(0, -1) : id;
 };

package/extensions/dist/base.js

@@ -1,6 +1,6 @@
 (() => {
 var _a;
-const version = '1.41.0', src = (_a = document.currentScript) === null || _a === void 0 ? void 0 : _a.src, file = /\/extensions\/dist\/base\.(?:min\.)?js$/u, CDN = src && file.test(src)
+const version = '1.42.0', src = (_a = document.currentScript) === null || _a === void 0 ? void 0 : _a.src, file = /\/extensions\/dist\/base\.(?:min\.)?js$/u, CDN = src && file.test(src)
     ? src.replace(file, '')
     : `https://fastly.jsdelivr.net/npm/wikiparser-node@${version}`;
 const workerJS = () => {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikiparser-node",
-	"version": "1.41.0",
+	"version": "1.42.0",
 	"description": "A Node.js parser for MediaWiki markup with AST",
 	"keywords": [
 		"mediawiki",
@@ -104,7 +104,7 @@
 		"@bhsd/code-standard": "^2.5.1",
 		"@bhsd/test-util": "^1.3.1",
 		"@codemirror/lint": "^6.9.6",
-		"@eslint/markdown": "^8.0.1",
+		"@eslint/markdown": "^8.0.2",
 		"@types/color-name": "^2.0.0",
 		"@types/color-rgba": "^2.1.3",
 		"@types/mocha": "^10.0.10",
@@ -116,11 +116,11 @@
 		"color-rgba": "^3.0.0",
 		"diff2html-cli": "^5.2.15",
 		"esbuild": "^0.28.0",
-		"eslint": "^10.4.0",
+		"eslint": "^10.4.1",
 		"markdownlint-cli2": "^0.22.1",
-		"mocha": "^11.7.5",
+		"mocha": "^11.7.6",
 		"monaco-editor": "~0.53.0",
-		"tsx": "^4.22.2",
+		"tsx": "^4.22.3",
 		"typescript": "^6.0.3",
 		"v8r": "^6.1.0",
 		"vscode-languageserver-textdocument": "^1.0.12"