wikiparser-node 1.5.4 → 1.5.5

package/dist/lib/element.js

@@ -33,6 +33,7 @@ const matchesLang = ({ attributes }, regex) => {
     const lang = attributes?.['lang'];
     return typeof lang === 'string' && regex.test(lang);
 };
+const primitives = new Set(['string', 'number', 'boolean', 'undefined']);
 /* NOT FOR BROWSER END */
 /** 类似HTMLElement */
 class AstElement extends node_1.AstNode {
@@ -316,9 +317,6 @@ class AstElement extends node_1.AstNode {
         if (!(key in this) && (!isAttr || !this.hasAttr(key))) {
             return equal === '!=';
         }
-        else if (!equal) {
-            return true;
-        }
         const v = toCase(val, i);
         let thisVal = this.getAttribute(key);
         if (isAttr) {
@@ -327,7 +325,10 @@ class AstElement extends node_1.AstNode {
                 thisVal = attr === true ? '' : attr;
             }
         }
-        if (thisVal instanceof RegExp) {
+        if (!equal) {
+            return thisVal !== undefined && thisVal !== false;
+        }
+        else if (thisVal instanceof RegExp) {
             thisVal = thisVal.source;
         }
         if (equal === '~=') {
@@ -335,10 +336,10 @@ class AstElement extends node_1.AstNode {
             return Boolean(thisVals?.[Symbol.iterator])
                 && [...thisVals].some(w => typeof w === 'string' && toCase(w, i) === v);
         }
-        else if (typeof thisVal !== 'string') {
+        else if (!primitives.has(typeof thisVal) && !(thisVal instanceof title_1.Title)) {
             throw new RangeError(`复杂属性 ${key} 不能用于选择器！`);
         }
-        const stringVal = toCase(thisVal, i);
+        const stringVal = toCase(String(thisVal), i);
         switch (equal) {
             case '|=':
                 return stringVal === v || stringVal.startsWith(`${v}-`);

package/dist/lib/node.js

@@ -111,9 +111,7 @@ class AstNode {
             return new Set(this.#optional);
             /* NOT FOR BROWSER END */
         }
-        return key in this
-            ? String(this[key])
-            : undefined;
+        return this[key];
     }
     /** @private */
     setAttribute(key, value) {

package/dist/src/heading.js

@@ -79,7 +79,7 @@ let HeadingToken = (() => {
         }
         /** 内部wikitext */
         get innerText() {
-            return this.firstChild.text();
+            return this.firstChild.text().trim();
         }
         /** @throws `Error` 首尾包含`=` */
         set innerText(text) {

package/dist/src/imagemap.d.ts

@@ -26,8 +26,6 @@ export declare abstract class ImagemapToken extends Token {
     abstract get parentElement(): ExtToken | undefined;
     /** 图片 */
     get image(): GalleryImageToken | undefined;
-    /** 链接 */
-    get links(): ImagemapLinkToken[];
     /** @param inner 标签内部wikitext */
     constructor(inner?: string, config?: Parser.Config, accum?: Token[]);
     /** @override */

package/dist/src/imagemap.js

@@ -21,12 +21,6 @@ class ImagemapToken extends index_2.Token {
     get image() {
         return this.childNodes.find((0, debug_1.isToken)('imagemap-image'));
     }
-    /* NOT FOR BROWSER */
-    /** 链接 */
-    get links() {
-        return this.childNodes.filter((0, debug_1.isToken)('imagemap-link'));
-    }
-    /* NOT FOR BROWSER END */
     /** @param inner 标签内部wikitext */
     constructor(inner, config = index_1.default.getConfig(), accum = []) {
         super(undefined, config, accum, {

package/dist/src/index.d.ts

@@ -6,7 +6,7 @@ import { AstText } from '../lib/text';
 import type { LintError } from '../base';
 import type { Range } from '../lib/ranges';
 import type { Title } from '../lib/title';
-import type { AstNodes, IncludeToken, HtmlToken, ExtToken, TranscludeToken, CommentToken, FileToken, LinkToken, ExtLinkToken, MagicLinkToken, ImageParameterToken, ImagemapLinkToken } from '../internal';
+import type { AstNodes, IncludeToken, HtmlToken, ExtToken, TranscludeToken, CommentToken, FileToken, LinkToken, ExtLinkToken, MagicLinkToken, ImageParameterToken } from '../internal';
 import type { CaretPosition } from '../lib/node';
 import type { TokenTypes } from '../util/constants';
 declare type TagToken = IncludeToken | ExtToken | HtmlToken;
@@ -20,7 +20,7 @@ export declare class Token extends AstElement {
     /** 所有图片，包括图库 */
     get images(): FileToken[];
     /** 所有内链、外链和自由外链 */
-    get links(): (LinkToken | ExtLinkToken | MagicLinkToken | ImageParameterToken | ImagemapLinkToken)[];
+    get links(): (LinkToken | ExtLinkToken | MagicLinkToken | ImageParameterToken)[];
     /** 所有模板和模块 */
     get embeds(): TranscludeToken[];
     /** @class */

package/dist/src/link/index.js

@@ -12,7 +12,7 @@ class LinkToken extends base_1.LinkBaseToken {
     type = 'link';
     /** 链接显示文字 */
     get innerText() {
-        return this.length > 1 ? this.lastChild.text() : this.firstChild.text().replace(/^\s*:/u, '');
+        return this.length > 1 ? this.lastChild.text() : this.firstChild.text().replace(/^\s*:?/u, '');
     }
     set innerText(text) {
         this.setLinkText(text);

package/dist/src/nowiki/list.js

@@ -75,14 +75,26 @@ let ListToken = (() => {
         /** 获取列表行的范围 */
         getRange() {
             const range = this.createRange();
+            let nDt = this.dt ? this.innerText.split(';').length - 2 : 0;
             range.setStartBefore(this);
             let { nextSibling } = this;
             while (nextSibling && (nextSibling.type !== 'text' || !nextSibling.data.includes('\n'))) {
+                if (nextSibling.type === 'dd') {
+                    nDt -= nextSibling.indent;
+                }
+                if (nDt < 0) {
+                    break;
+                }
                 ({ nextSibling } = nextSibling);
             }
             if (nextSibling) {
-                const i = nextSibling.data.indexOf('\n');
-                range.setEnd(nextSibling, i);
+                if (nDt < 0) {
+                    range.setEndBefore(nextSibling);
+                }
+                else {
+                    const i = nextSibling.data.indexOf('\n');
+                    range.setEnd(nextSibling, i);
+                }
             }
             else {
                 const { parentNode } = this;

package/dist/src/table/td.js

@@ -89,7 +89,7 @@ let TdToken = (() => {
         }
         /** 内部wikitext */
         get innerText() {
-            return this.lastChild.text();
+            return this.lastChild.text().trim();
         }
         set innerText(text) {
             this.lastChild.replaceChildren(...index_1.default.parse(text, true, undefined, this.getAttribute('config')).childNodes);
@@ -245,7 +245,7 @@ let TdToken = (() => {
         /** @private */
         setAttribute(key, value) {
             if (key === 'innerSyntax') {
-                this.#innerSyntax = value ?? '';
+                this.#innerSyntax = (value ?? '');
             }
             else {
                 super.setAttribute(key, value);

package/package.json

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