wikiparser-node 1.6.0 → 1.6.1

package/dist/lib/ranges.js

@@ -86,6 +86,9 @@ class Ranges extends Array {
                 this.push(ele);
                 continue;
             }
+            else if (typeof ele === 'string' && !ele.trim()) {
+                continue;
+            }
             const number = Number(ele);
             if (Number.isInteger(number)) {
                 this.push(number);

package/dist/src/imageParameter.js

@@ -37,9 +37,9 @@ function validate(key, val, config, halfParsed = false, ext) {
         case 'manualthumb':
             return true;
         case 'page':
-            return (ext === 'djvu' || ext === 'djv') && Number(value) > 0;
+            return (ext === 'djvu' || ext === 'djv' || ext === 'pdf') && Number(value) > 0;
         default:
-            return !Number.isNaN(Number(value));
+            return Boolean(value) && !isNaN(value);
     }
 }
 /** 图片参数 */

package/dist/src/index.js

@@ -156,7 +156,7 @@ class Token extends element_1.AstElement {
             if (i % 2 === 0) {
                 return new text_1.AstText(s);
             }
-            else if (Number.isNaN(Number(s.slice(-1)))) {
+            else if (isNaN(s.slice(-1))) {
                 return this.#accum[Number(s.slice(0, -1))];
             }
             throw new Error(`解析错误！未正确标记的 Token：${s}`);

package/dist/src/link/base.js

@@ -98,7 +98,7 @@ class LinkBaseToken extends index_2.Token {
     /** @private */
     setAttribute(key, value) {
         if (key === 'bracket') {
-            this.#bracket = Boolean(value);
+            this.#bracket = value;
         }
         else if (key === 'title') {
             this.#title = value;
@@ -196,7 +196,7 @@ class LinkBaseToken extends index_2.Token {
      * @param link 链接目标
      */
     setTarget(link) {
-        const config = this.getAttribute('config'), { childNodes } = index_1.default.parse(String(link), this.getAttribute('include'), 2, config), token = debug_1.Shadow.run(() => new atom_1.AtomToken(undefined, 'link-target', config, [], {
+        const config = this.getAttribute('config'), { childNodes } = index_1.default.parse(link, this.getAttribute('include'), 2, config), token = debug_1.Shadow.run(() => new atom_1.AtomToken(undefined, 'link-target', config, [], {
             'Stage-2': ':', '!ExtToken': '', '!HeadingToken': '',
         }));
         token.append(...childNodes);

package/dist/src/table/index.js

@@ -94,7 +94,11 @@ class TableToken extends trBase_1.TrBaseToken {
                 }
             }
             if (j < length) {
-                errors.push((0, lint_1.generateForChild)(this.getNthRow(j), { start }, 'table-layout', 'inconsistent table layout', 'warning'));
+                const e = (0, lint_1.generateForChild)(this.getNthRow(j), { start }, 'table-layout', 'inconsistent table layout', 'warning');
+                e.startIndex++;
+                e.startLine++;
+                e.startCol = 0;
+                errors.push(e);
             }
         }
         return errors;

package/dist/src/table/td.js

@@ -231,7 +231,7 @@ let TdToken = (() => {
         getAttr(key) {
             const value = super.getAttr(key);
             key = key.toLowerCase().trim();
-            return (key === 'rowspan' || key === 'colspan' ? Number(value) || 1 : value);
+            return (key === 'rowspan' || key === 'colspan' ? parseInt(value) || 1 : value);
         }
         /** @override */
         print() {
@@ -290,10 +290,10 @@ let TdToken = (() => {
         getAttrs() {
             const attr = super.getAttrs();
             if ('rowspan' in attr) {
-                attr.rowspan = Number(attr.rowspan);
+                attr.rowspan = parseInt(attr.rowspan);
             }
             if ('colspan' in attr) {
-                attr.colspan = Number(attr.colspan);
+                attr.colspan = parseInt(attr.colspan);
             }
             return attr;
         }

package/dist/src/transclude.js

@@ -326,7 +326,7 @@ class TranscludeToken extends index_2.Token {
             this.#args.set(keyStr, args);
         }
         /* NOT FOR BROWSER */
-        if (exact && !Number.isNaN(Number(keyStr))) {
+        if (exact && keyStr.trim() && !isNaN(keyStr)) {
             args = new Set([...args].filter(({ anon }) => typeof key === 'number' === anon));
         }
         else if (copy) {
@@ -634,7 +634,7 @@ class TranscludeToken extends index_2.Token {
                     values.set(val, [arg]);
                 }
             }
-            let noMoreAnon = anonCount === 0 || Number.isNaN(Number(key));
+            let noMoreAnon = anonCount === 0 || !key.trim() || isNaN(key);
             const emptyArgs = values.get('') ?? [], duplicatedArgs = [...values].filter(([val, { length }]) => val && length > 1).flatMap(([, curArgs]) => {
                 const anonIndex = noMoreAnon ? -1 : curArgs.findIndex(({ anon }) => anon);
                 if (anonIndex !== -1) {

package/dist/util/debug.js

@@ -82,7 +82,7 @@ const undo = (e, data) => {
             }
             break;
         default:
-            throw new RangeError(`无法撤销未知类型的事件：${String(type)}`);
+            throw new RangeError(`无法撤销未知类型的事件：${type}`);
     }
 };
 exports.undo = undo;

package/package.json

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