wikiparser-node 1.0.0-beta.2 → 1.0.0-beta.3

package/dist/src/arg.js

@@ -168,12 +168,12 @@ class ArgToken extends _1.Token {
      */
     setName(name) {
         const root = index_1.default.parse(`{{{${name}}}}`, this.getAttribute('include'), 2, this.getAttribute('config')), { length, firstChild: arg } = root;
-        if (length === 1 && arg instanceof ArgToken && arg.length === 1) {
-            const { firstChild } = arg;
-            arg.destroy();
-            this.firstChild.safeReplaceWith(firstChild);
+        if (length !== 1 || !(arg instanceof ArgToken) || arg.length !== 1) {
+            throw new SyntaxError(`非法的参数名称：${(0, string_1.noWrap)(name)}`);
         }
-        throw new SyntaxError(`非法的参数名称：${(0, string_1.noWrap)(name)}`);
+        const { firstChild } = arg;
+        arg.destroy();
+        this.firstChild.safeReplaceWith(firstChild);
     }
     /**
      * 设置预设值

package/dist/src/attribute.js

@@ -424,12 +424,12 @@ class AttributeToken extends (0, fixed_1.fixed)(_1.Token) {
             attrs = tag.firstChild;
         }
         const { firstChild: attr } = attrs;
-        if (attrs.length === 1 && attr.type === this.type && attr.value === true) {
-            const { firstChild } = attr;
-            attr.destroy();
-            this.firstChild.safeReplaceWith(firstChild);
+        if (attrs.length !== 1 || attr.type !== this.type || attr.value !== true) {
+            throw new SyntaxError(`非法的标签属性名：${(0, string_1.noWrap)(key)}`);
         }
-        throw new SyntaxError(`非法的标签属性名：${(0, string_1.noWrap)(key)}`);
+        const { firstChild } = attr;
+        attr.destroy();
+        this.firstChild.safeReplaceWith(firstChild);
     }
 }
 exports.AttributeToken = AttributeToken;

package/dist/src/converterRule.js

@@ -187,12 +187,12 @@ class ConverterRuleToken extends _1.Token {
             throw new SyntaxError(`非法的转换目标：${(0, string_1.noWrap)(to)}`);
         }
         const { lastChild: converterRule } = converter;
-        if (converter.length === 2 && converterRule.length === 2) {
-            const { lastChild } = converterRule;
-            converterRule.destroy();
-            this.lastChild.safeReplaceWith(lastChild);
+        if (converter.length !== 2 || converterRule.length !== 2) {
+            throw new SyntaxError(`非法的转换目标：${(0, string_1.noWrap)(to)}`);
         }
-        throw new SyntaxError(`非法的转换目标：${(0, string_1.noWrap)(to)}`);
+        const { lastChild } = converterRule;
+        converterRule.destroy();
+        this.lastChild.safeReplaceWith(lastChild);
     }
     /**
      * 设置语言变体

package/dist/src/extLink.js

@@ -126,12 +126,12 @@ class ExtLinkToken extends _1.Token {
      */
     setTarget(url) {
         const strUrl = String(url), root = index_1.default.parse(`[${strUrl}]`, this.getAttribute('include'), 8, this.getAttribute('config')), { length, firstChild: extLink } = root;
-        if (length === 1 && extLink instanceof ExtLinkToken && extLink.length === 1) {
-            const { firstChild } = extLink;
-            extLink.destroy();
-            this.firstChild.safeReplaceWith(firstChild);
+        if (length !== 1 || !(extLink instanceof ExtLinkToken) || extLink.length !== 1) {
+            throw new SyntaxError(`非法的外链目标：${strUrl}`);
         }
-        throw new SyntaxError(`非法的外链目标：${strUrl}`);
+        const { firstChild } = extLink;
+        extLink.destroy();
+        this.firstChild.safeReplaceWith(firstChild);
     }
     /**
      * 设置链接显示文字

package/dist/src/imageParameter.js

@@ -246,10 +246,10 @@ class ImageParameterToken extends _1.Token {
             throw new SyntaxError(`非法的 ${this.name} 参数：${(0, string_1.noWrap)(value)}`);
         }
         const { lastChild: imageParameter, name } = file;
-        if (name === 'File:F' && imageParameter.name === this.name) {
-            this.replaceChildren(...imageParameter.childNodes);
+        if (name !== 'File:F' || imageParameter.name !== this.name) {
+            throw new SyntaxError(`非法的 ${this.name} 参数：${(0, string_1.noWrap)(value)}`);
         }
-        throw new SyntaxError(`非法的 ${this.name} 参数：${(0, string_1.noWrap)(value)}`);
+        this.replaceChildren(...imageParameter.childNodes);
     }
 }
 exports.ImageParameterToken = ImageParameterToken;

package/dist/src/index.js

@@ -806,8 +806,11 @@ class Token extends element_1.AstElement {
                     if (transclusion) {
                         continue;
                     }
-                    target.replaceWith(replace);
                 }
+                else {
+                    continue;
+                }
+                target.replaceWith(replace);
             }
         }
     }

package/dist/src/link/base.js

@@ -192,13 +192,13 @@ class LinkBaseToken extends __1.Token {
             strLink = `:${strLink}`;
         }
         const root = index_1.default.parse(`[[${strLink}]]`, this.getAttribute('include'), 6, this.getAttribute('config')), { length, firstChild: wikiLink } = root;
-        if (length === 1 && wikiLink?.type === this.type && wikiLink.length === 1) {
-            const { firstChild } = wikiLink;
-            wikiLink.destroy();
-            this.firstChild.safeReplaceWith(firstChild);
+        if (length !== 1 || wikiLink?.type !== this.type || wikiLink.length !== 1) {
+            const msgs = { link: '内链', file: '文件链接', category: '分类' };
+            throw new SyntaxError(`非法的${msgs[this.type]}目标：${strLink}`);
         }
-        const msgs = { link: '内链', file: '文件链接', category: '分类' };
-        throw new SyntaxError(`非法的${msgs[this.type]}目标：${strLink}`);
+        const { firstChild } = wikiLink;
+        wikiLink.destroy();
+        this.firstChild.safeReplaceWith(firstChild);
     }
     /**
      * 设置链接显示文字

package/dist/src/link/file.js

@@ -259,10 +259,10 @@ class FileToken extends base_1.LinkBaseToken {
             throw new SyntaxError(`非法的 ${key} 参数：${(0, string_1.noWrap)(value)}`);
         }
         const { name, lastChild: imageParameter } = file;
-        if (name === 'File:F' && imageParameter.name === key) {
-            this.insertAt(imageParameter);
+        if (name !== 'File:F' || imageParameter.name !== key) {
+            throw new SyntaxError(`非法的 ${key} 参数：${(0, string_1.noWrap)(value)}`);
         }
-        throw new SyntaxError(`非法的 ${key} 参数：${(0, string_1.noWrap)(value)}`);
+        this.insertAt(imageParameter);
     }
 }
 exports.FileToken = FileToken;

package/dist/src/link/galleryImage.js

@@ -88,12 +88,12 @@ class GalleryImageToken extends (0, singleLine_1.singleLine)(file_1.FileToken) {
             throw new SyntaxError(`非法的图库文件名：${link}`);
         }
         const { lastChild: gallery } = ext, { firstChild: image } = gallery;
-        if (gallery.length === 1 && image.type === 'gallery-image') {
-            const { firstChild } = image;
-            image.destroy();
-            this.firstChild.safeReplaceWith(firstChild);
+        if (gallery.length !== 1 || image.type !== 'gallery-image') {
+            throw new SyntaxError(`非法的图库文件名：${link}`);
         }
-        throw new SyntaxError(`非法的图库文件名：${link}`);
+        const { firstChild } = image;
+        image.destroy();
+        this.firstChild.safeReplaceWith(firstChild);
     }
 }
 exports.GalleryImageToken = GalleryImageToken;

package/dist/src/magicLink.js

@@ -116,10 +116,10 @@ class MagicLinkToken extends _1.Token {
      */
     setTarget(url) {
         const strUrl = String(url), root = index_1.default.parse(strUrl, this.getAttribute('include'), 9, this.getAttribute('config')), { length, firstChild: freeExtLink } = root;
-        if (length === 1 && freeExtLink.type === 'free-ext-link') {
-            this.replaceChildren(...freeExtLink.childNodes);
+        if (length !== 1 || freeExtLink.type !== 'free-ext-link') {
+            throw new SyntaxError(`非法的自由外链目标：${strUrl}`);
         }
-        throw new SyntaxError(`非法的自由外链目标：${strUrl}`);
+        this.replaceChildren(...freeExtLink.childNodes);
     }
     /** 是否是模板或魔术字参数 */
     isParamValue() {

package/dist/src/parameter.js

@@ -159,12 +159,12 @@ class ParameterToken extends (0, fixed_1.fixed)(_1.Token) {
             throw new SyntaxError(`非法的模板参数：${(0, string_1.noWrap)(value)}`);
         }
         const { lastChild: parameter, name } = transclude, targetName = templateLike ? 'T' : 'lc';
-        if (name === targetName && transclude.length === 2 && parameter.anon === this.anon && parameter.name === '1') {
-            const { lastChild } = parameter;
-            parameter.destroy();
-            this.lastChild.safeReplaceWith(lastChild);
+        if (name !== targetName || transclude.length !== 2 || parameter.anon !== this.anon || parameter.name !== '1') {
+            throw new SyntaxError(`非法的模板参数：${(0, string_1.noWrap)(value)}`);
         }
-        throw new SyntaxError(`非法的模板参数：${(0, string_1.noWrap)(value)}`);
+        const { lastChild } = parameter;
+        parameter.destroy();
+        this.lastChild.safeReplaceWith(lastChild);
     }
     /**
      * 修改参数名

package/dist/src/transclude.js

@@ -527,10 +527,10 @@ class TranscludeToken extends _1.Token {
             throw new SyntaxError(`非法的命名参数：${key}=${(0, string_1.noWrap)(value)}`);
         }
         const { name, lastChild: parameter } = template;
-        if (name === 'T' && parameter.name === key) {
-            this.insertAt(parameter);
+        if (name !== 'T' || parameter.name !== key) {
+            throw new SyntaxError(`非法的命名参数：${key}=${(0, string_1.noWrap)(value)}`);
         }
-        throw new SyntaxError(`非法的命名参数：${key}=${(0, string_1.noWrap)(value)}`);
+        this.insertAt(parameter);
     }
     /**
      * 将匿名参数改写为命名参数
@@ -555,10 +555,10 @@ class TranscludeToken extends _1.Token {
             throw new Error(`${this.constructor.name}.replaceTemplate 方法仅用于更换模板！`);
         }
         const root = index_1.default.parse(`{{${title}}}`, this.getAttribute('include'), 2, this.getAttribute('config')), { length, firstChild: template } = root;
-        if (length === 1 && template.type === 'template' && template.length === 1) {
-            this.firstChild.replaceChildren(...template.firstChild.childNodes);
+        if (length !== 1 || template.type !== 'template' || template.length !== 1) {
+            throw new SyntaxError(`非法的模板名称：${title}`);
         }
-        throw new SyntaxError(`非法的模板名称：${title}`);
+        this.firstChild.replaceChildren(...template.firstChild.childNodes);
     }
     /**
      * 替换模块名

package/package.json

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