wikiparser-node 1.18.4 → 1.20.0

package/dist/parser/braces.js

@@ -43,7 +43,7 @@ catch {
  * @param s 模板或魔术字名
  */
 const getSymbol = (s) => {
-    const name = (0, string_1.removeComment)(s).trim().toLowerCase();
+    const name = (0, string_1.trimLc)((0, string_1.removeComment)(s));
     if (marks.has(name)) {
         return marks.get(name); // 标记{{!}}等
     }
@@ -64,12 +64,7 @@ const getSymbol = (s) => {
  * @throws `TranscludeToken.constructor()`
  */
 const parseBraces = (wikitext, config, accum) => {
-    const source = String.raw `${config.excludes?.includes('heading') ? '' : String.raw `^((?:\0\d+[cno]\x7F)*)={1,6}|`}\[\[|-\{(?!\{)`, { parserFunction: [, , , subst] } = config, stack = [], linkStack = [];
-    /**
-     * 恢复内链
-     * @param s 不含内链的字符串
-     */
-    const restore = (s) => s.replace(/\0(\d+)\x7F/gu, (_, p1) => linkStack[p1]);
+    const source = String.raw `${config.excludes.includes('heading') ? '' : String.raw `^((?:\0\d+[cno]\x7F)*)={1,6}|`}\[\[|-\{(?!\{)`, { parserFunction: [, , , subst] } = config, stack = [], linkStack = [];
     /**
      * 填入模板内容
      * @param text wikitext全文
@@ -78,7 +73,7 @@ const parseBraces = (wikitext, config, accum) => {
      * @param index 匹配位置
      */
     const push = (text, parts, lastIndex, index) => {
-        parts[parts.length - 1].push(restore(text.slice(lastIndex, index)));
+        parts[parts.length - 1].push((0, string_1.restore)(text.slice(lastIndex, index), linkStack));
     };
     let replaced;
     do {
@@ -90,9 +85,10 @@ const parseBraces = (wikitext, config, accum) => {
                 try {
                     const { length } = accum, parts = (p1 ?? p2).split('|');
                     // @ts-expect-error abstract class
-                    new transclude_1.TranscludeToken(restore(parts[0]), parts.slice(1).map(part => {
+                    new transclude_1.TranscludeToken((0, string_1.restore)(parts[0], linkStack), parts.slice(1).map(part => {
                         const i = part.indexOf('=');
-                        return (i === -1 ? [part] : [part.slice(0, i), part.slice(i + 1)]).map(restore);
+                        return (i === -1 ? [part] : [part.slice(0, i), part.slice(i + 1)])
+                            .map(s => (0, string_1.restore)(s, linkStack));
                     }), config, accum);
                     return `\0${length}${getSymbol(parts[0])}\x7F`;
                 }
@@ -103,7 +99,7 @@ const parseBraces = (wikitext, config, accum) => {
                     }
                 }
             }
-            linkStack.push(restore(m));
+            linkStack.push((0, string_1.restore)(m, linkStack));
             return `\0${linkStack.length - 1}\x7F`;
         });
     } while (replaced !== wikitext);
@@ -137,7 +133,7 @@ const parseBraces = (wikitext, config, accum) => {
                 const rmt = /^(={1,6})(.+)\1((?:\s|\0\d+[cn]\x7F)*)$/u
                     .exec(wikitext.slice(index, curIndex));
                 if (rmt) {
-                    rmt[2] = restore(rmt[2]);
+                    rmt[2] = (0, string_1.restore)(rmt[2], linkStack);
                     if (!rmt[2].includes('\n')) {
                         wikitext = `${wikitext.slice(0, index)}\0${accum.length}h\x7F${wikitext.slice(curIndex)}`;
                         lastIndex = index + 4 + String(accum.length).length;
@@ -221,7 +217,7 @@ const parseBraces = (wikitext, config, accum) => {
         regex.lastIndex = lastIndex;
         mt = regex.exec(wikitext);
     }
-    return restore(wikitext);
+    return (0, string_1.restore)(wikitext, linkStack);
 };
 exports.parseBraces = parseBraces;
 constants_1.parsers['parseBraces'] = __filename;

package/dist/parser/commentAndExt.js

@@ -2,8 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseCommentAndExt = void 0;
 const common_1 = require("@bhsd/common");
+const string_1 = require("../util/string");
 const onlyinclude_1 = require("../src/onlyinclude");
 const noinclude_1 = require("../src/nowiki/noinclude");
+const translate_1 = require("../src/tagPair/translate");
 const include_1 = require("../src/tagPair/include");
 const ext_1 = require("../src/tagPair/ext");
 const comment_1 = require("../src/nowiki/comment");
@@ -61,13 +63,27 @@ const parseCommentAndExt = (wikitext, config, accum, includeOnly) => {
             return str;
         }
     }
-    return wikitext.replace(getRegex[includeOnly ? 1 : 0](config.ext), (substr, name, attr, inner, closing, include, includeAttr, includeInner, includeClosing) => {
+    const { ext } = config, newExt = ext.filter(e => e !== 'translate' && e !== 'tvar'), newConfig = { ...config, ext: newExt };
+    if (ext.includes('translate')) {
+        const stack = [];
+        wikitext = wikitext.replace(/<nowiki>[\s\S]*?<\/nowiki>/giu, m => {
+            stack.push(m);
+            return `\0${stack.length - 1}\x7F`;
+        }).replace(/<translate( nowrap)?>([\s\S]+?)?<\/translate>/gu, (_, p1, p2) => {
+            const l = accum.length;
+            // @ts-expect-error abstract class
+            new translate_1.TranslateToken(p1, p2 && (0, string_1.restore)(p2, stack), newConfig, accum);
+            return `\0${l}g\x7F`;
+        });
+        wikitext = (0, string_1.restore)(wikitext, stack);
+    }
+    return wikitext.replace(getRegex[includeOnly ? 1 : 0](newExt), (substr, name, attr, inner, closing, include, includeAttr, includeInner, includeClosing) => {
         const l = accum.length;
         let ch = 'n';
         if (name) {
             ch = 'e';
             // @ts-expect-error abstract class
-            new ext_1.ExtToken(name, attr, inner, closing, config, include, accum);
+            new ext_1.ExtToken(name, attr, inner, closing, newConfig, include, accum);
         }
         else if (substr.startsWith('<!--')) {
             ch = 'c';

package/dist/parser/magicLinks.js

@@ -17,8 +17,8 @@ const parseMagicLinks = (wikitext, config, accum) => {
     if (!config.regexMagicLinks) {
         try {
             // eslint-disable-next-line @typescript-eslint/no-unused-expressions, es-x/no-regexp-unicode-property-escapes
-            /(^|[^\p{L}\d_])(?:(?:ftp:\/\/|http:\/\/)((?:\[[\da-f:.]+\]|[^[\]<>"\t\n\p{Zs}])[^[\]<>"\0\t\n\p{Zs}]*)|(?:rfc|pmid)[\p{Zs}\t]+\d+\b|isbn[\p{Zs}\t]+(?:97[89][\p{Zs}\t-]?)?(?:\d[\p{Zs}\t-]?){9}[\dx]\b)/giu;
-            config.regexMagicLinks = new RegExp(String.raw `(^|[^\p{L}\d_])(?:(?:${config.protocol})(${string_1.extUrlCharFirst}${string_1.extUrlChar})|${magicLinkPattern})`, 'giu');
+            /(^|[^\p{L}\p{N}_])(?:(?:ftp:\/\/|http:\/\/)((?:\[[\da-f:.]+\]|[^[\]<>"\t\n\p{Zs}])[^[\]<>"\0\t\n\p{Zs}]*)|(?:rfc|pmid)[\p{Zs}\t]+\d+\b|isbn[\p{Zs}\t]+(?:97[89][\p{Zs}\t-]?)?(?:\d[\p{Zs}\t-]?){9}[\dx]\b)/giu;
+            config.regexMagicLinks = new RegExp(String.raw `(^|[^\p{L}\p{N}_])(?:(?:${config.protocol})(${string_1.extUrlCharFirst}${string_1.extUrlChar})|${magicLinkPattern})`, 'giu');
         }
         catch /* istanbul ignore next */ {
             // eslint-disable-next-line @typescript-eslint/no-unused-expressions

package/dist/parser/selector.js

@@ -14,8 +14,11 @@ const attributes_1 = require("../lib/attributes");
  * @param name
  */
 const basic = (selector, type, name) => {
-    const [t, ...names] = selector.split('#');
-    return (!t || t === type) && names.every(n => n === name);
+    if (selector.includes('#')) {
+        const [t, ...names] = selector.split('#');
+        return (!t || t === type) && names.every(n => n === name);
+    }
+    return !selector || selector === type;
 };
 /* NOT FOR BROWSER */
 const simplePseudos = new Set([

package/dist/src/arg.js

@@ -41,6 +41,8 @@ exports.ArgToken = void 0;
 const string_1 = require("../util/string");
 const lint_1 = require("../util/lint");
 const rect_1 = require("../lib/rect");
+const padded_1 = require("../mixin/padded");
+const gapped_1 = require("../mixin/gapped");
 const index_1 = require("./index");
 const atom_1 = require("./atom");
 const hidden_1 = require("./hidden");
@@ -57,7 +59,7 @@ const index_2 = __importDefault(require("../index"));
  * @classdesc `{childNodes: [AtomToken, ?Token, ...HiddenToken[]]}`
  */
 let ArgToken = (() => {
-    let _classDecorators = [noEscape_1.noEscape];
+    let _classDecorators = [noEscape_1.noEscape, (0, padded_1.padded)('{{{'), (0, gapped_1.gapped)()];
     let _classDescriptor;
     let _classExtraInitializers = [];
     let _classThis;
@@ -119,14 +121,6 @@ let ArgToken = (() => {
         text() {
             return `{{{${(0, string_1.text)(this.childNodes.slice(0, 2), '|')}}}}`;
         }
-        /** @private */
-        getAttribute(key) {
-            return key === 'padding' ? 3 : super.getAttribute(key);
-        }
-        /** @private */
-        getGaps() {
-            return 1;
-        }
         /** 设置name */
         #setName() {
             // eslint-disable-next-line no-unused-labels
@@ -160,7 +154,10 @@ let ArgToken = (() => {
             if (argDefault) {
                 const index = start + 4 + argName.toString().length;
                 argDefault.setAttribute('aIndex', index);
-                errors.push(...argDefault.lint(index, re));
+                const childErrors = argDefault.lint(index, re);
+                if (childErrors.length > 0) {
+                    errors.push(...childErrors);
+                }
             }
             if (rest.length > 0) {
                 const rect = new rect_1.BoundingRect(this, start);
@@ -194,7 +191,7 @@ let ArgToken = (() => {
                 // @ts-expect-error abstract class
                 const token = new ArgToken([''], this.getAttribute('config'));
                 token.firstChild.safeReplaceWith(name);
-                token.append(...cloned);
+                token.safeAppend(cloned);
                 return token;
             });
         }
@@ -251,7 +248,7 @@ let ArgToken = (() => {
         setName(name) {
             const { childNodes } = index_2.default
                 .parse(name, this.getAttribute('include'), 2, this.getAttribute('config'));
-            this.firstChild.replaceChildren(...childNodes);
+            this.firstChild.safeReplaceChildren(childNodes);
         }
         /**
          * Set the default value
@@ -267,7 +264,7 @@ let ArgToken = (() => {
             const root = index_2.default
                 .parse(value, this.getAttribute('include'), undefined, this.getAttribute('config')), { childNodes: [, oldDefault] } = this;
             if (oldDefault) {
-                oldDefault.replaceChildren(...root.childNodes);
+                oldDefault.safeReplaceChildren(root.childNodes);
             }
             else {
                 root.type = 'arg-default';

package/dist/src/atom.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AtomToken = void 0;
 const index_1 = require("./index");
 /* 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 */
 const atomTypes = [
     'arg-name',
@@ -47,12 +47,7 @@ class AtomToken extends index_1.Token {
     }
     /* NOT FOR BROWSER */
     cloneNode() {
-        const cloned = this.cloneChildNodes(), config = this.getAttribute('config'), acceptable = this.getAcceptable();
-        return debug_1.Shadow.run(() => {
-            const token = new AtomToken(undefined, this.type, config, [], acceptable);
-            token.append(...cloned);
-            return token;
-        });
+        return (0, html_1.cloneNode)(this, () => new AtomToken(undefined, this.type, this.getAttribute('config'), [], this.getAcceptable()));
     }
 }
 exports.AtomToken = AtomToken;

package/dist/src/attribute.js

@@ -153,7 +153,7 @@ let AttributeToken = (() => {
             this.#equal = equal;
             this.#quotes = [...quotes];
             this.#tag = tag;
-            this.setAttribute('name', (0, string_1.removeComment)(key).trim().toLowerCase());
+            this.setAttribute('name', (0, string_1.trimLc)((0, string_1.removeComment)(key)));
         }
         /** @private */
         afterBuild() {
@@ -163,7 +163,7 @@ let AttributeToken = (() => {
             if (this.parentNode) {
                 this.#tag = this.parentNode.name;
             }
-            this.setAttribute('name', this.firstChild.text().trim().toLowerCase());
+            this.setAttribute('name', (0, string_1.trimLc)(this.firstChild.text()));
             super.afterBuild();
         }
         /** @private */
@@ -213,8 +213,8 @@ let AttributeToken = (() => {
                 errors.push(e);
             }
             else if (type !== 'ext-attr' && !lastChild.childNodes.some(({ type: t }) => complexTypes.has(t))) {
-                const data = lint_1.htmlData.provideValues(tag, name), v = String(value).toLowerCase();
-                if (data.length > 0 && data.every(({ name: n }) => n !== v)) {
+                const data = (0, lint_1.provideValues)(tag, name), v = String(value).toLowerCase();
+                if (data.length > 0 && data.every(n => n !== v)) {
                     errors.push((0, lint_1.generateForChild)(lastChild, rect, 'illegal-attr', 'illegal attribute value', 'warning'));
                 }
             }
@@ -293,7 +293,7 @@ let AttributeToken = (() => {
                 throw new RangeError('Attribute values cannot contain single and double quotes simultaneously!');
             }
             const config = this.getAttribute('config'), { childNodes } = index_1.default.parse(value, this.getAttribute('include'), stages[type] + 1, config);
-            lastChild.replaceChildren(...childNodes);
+            lastChild.safeReplaceChildren(childNodes);
             if (value.includes('"')) {
                 this.#quotes = [`'`, `'`];
             }
@@ -316,7 +316,7 @@ let AttributeToken = (() => {
                 throw new Error(`${this.name} attribute cannot be renamed!`);
             }
             const config = this.getAttribute('config'), { childNodes } = index_1.default.parse(key, this.getAttribute('include'), stages[this.type] + 1, config);
-            this.firstChild.replaceChildren(...childNodes);
+            this.firstChild.safeReplaceChildren(childNodes);
         }
         /** @private */
         toHtmlInternal() {

package/dist/src/attributes.js

@@ -29,7 +29,7 @@ const toDirty = (type) => `${toAttributeType(type)}-dirty`;
 let wordRegex;
 try {
     // eslint-disable-next-line prefer-regex-literals, es-x/no-regexp-unicode-property-escapes
-    wordRegex = new RegExp(String.raw `[\p{L}\d]`, 'u');
+    wordRegex = new RegExp(String.raw `[\p{L}\p{N}]`, 'u');
 }
 catch /* istanbul ignore next */ {
     wordRegex = /[^\W_]/u;
@@ -162,7 +162,7 @@ class AttributesToken extends index_2.Token {
      * @param key attribute name / 属性名
      */
     getAttrTokens(key) {
-        return this.childNodes.filter((child) => child instanceof attribute_1.AttributeToken && (!key || child.name === key.toLowerCase().trim()));
+        return this.childNodes.filter((child) => child instanceof attribute_1.AttributeToken && (!key || child.name === (0, string_1.trimLc)(key)));
     }
     /**
      * Get the last AttributeToken with the specified attribute name
@@ -260,13 +260,9 @@ class AttributesToken extends index_2.Token {
         }
     }
     cloneNode() {
-        const cloned = this.cloneChildNodes();
-        return debug_1.Shadow.run(() => {
-            // @ts-expect-error abstract class
-            const token = new AttributesToken(undefined, this.type, this.name, this.getAttribute('config'));
-            token.append(...cloned);
-            return token;
-        });
+        return (0, html_1.cloneNode)(this, 
+        // @ts-expect-error abstract class
+        () => new AttributesToken(undefined, this.type, this.name, this.getAttribute('config')));
     }
     /**
      * @override
@@ -308,7 +304,7 @@ class AttributesToken extends index_2.Token {
         return token;
     }
     setAttr(keyOrProp, value) {
-        if (typeof keyOrProp !== 'string') {
+        if (typeof keyOrProp === 'object') {
             for (const [key, val] of Object.entries(keyOrProp)) {
                 this.setAttr(key, val);
             }
@@ -318,7 +314,7 @@ class AttributesToken extends index_2.Token {
         if (type === 'ext-attrs' && typeof value === 'string' && value.includes('>')) {
             throw new RangeError('Attributes of an extension tag cannot contain ">"!');
         }
-        const key = keyOrProp.toLowerCase().trim(), attr = this.getAttrToken(key);
+        const key = (0, string_1.trimLc)(keyOrProp), attr = this.getAttrToken(key);
         if (attr) {
             attr.setValue(value);
             return;
@@ -375,7 +371,7 @@ class AttributesToken extends index_2.Token {
      * @throws `RangeError` 不为Boolean类型的属性值
      */
     toggleAttr(key, force) {
-        key = key.toLowerCase().trim();
+        key = (0, string_1.trimLc)(key);
         const attr = this.getAttrToken(key);
         if (attr && attr.getValue() !== true) {
             throw new RangeError(`${key} attribute is not Boolean!`);

package/dist/src/commented.d.ts

@@ -0,0 +1,26 @@
+import { Token } from './index';
+import { CommentToken } from './nowiki/comment';
+import type { Config, LintError } from '../base';
+import type { AstText, AttributesToken, ExtToken } from '../internal';
+/**
+ * `<hiero>`
+ * @classdesc `{childNodes: (AstText|CommentToken)[]}`
+ */
+export declare abstract class CommentedToken extends Token {
+    readonly childNodes: readonly (AstText | CommentToken)[];
+    abstract get firstChild(): AstText | CommentToken | undefined;
+    abstract get lastChild(): AstText | CommentToken | undefined;
+    abstract get nextSibling(): undefined;
+    abstract get previousSibling(): AttributesToken | undefined;
+    abstract get parentNode(): ExtToken | undefined;
+    abstract get children(): CommentToken[];
+    abstract get firstElementChild(): CommentToken | undefined;
+    abstract get lastElementChild(): CommentToken | undefined;
+    abstract get previousElementSibling(): AttributesToken | undefined;
+    abstract get nextElementSibling(): undefined;
+    abstract get parentElement(): ExtToken | undefined;
+    get type(): 'ext-inner';
+    /** @class */
+    constructor(wikitext?: string, config?: Config, accum?: Token[]);
+    cloneNode(): this;
+}

package/dist/src/commented.js

@@ -0,0 +1,52 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CommentedToken = void 0;
+const index_1 = require("./index");
+const comment_1 = require("./nowiki/comment");
+/* NOT FOR BROWSER */
+const constants_1 = require("../util/constants");
+const html_1 = require("../util/html");
+/* NOT FOR BROWSER END */
+/**
+ * `<hiero>`
+ * @classdesc `{childNodes: (AstText|CommentToken)[]}`
+ */
+class CommentedToken extends index_1.Token {
+    /* NOT FOR BROWSER END */
+    get type() {
+        return 'ext-inner';
+    }
+    /** @class */
+    constructor(wikitext, config, accum = []) {
+        super(undefined, config, accum, {
+            AstText: ':', CommentToken: ':',
+        });
+        if (wikitext) {
+            let i = wikitext.indexOf('<!--'), j = i !== -1 && wikitext.indexOf('-->', i + 4), lastIndex = 0;
+            while (j !== false && j !== -1) {
+                if (i > lastIndex) {
+                    this.insertAt(wikitext.slice(lastIndex, i));
+                }
+                // @ts-expect-error abstract class
+                this.insertAt(new comment_1.CommentToken(wikitext.slice(i + 4, j), true, config, accum));
+                lastIndex = j + 3;
+                i = wikitext.indexOf('<!--', lastIndex);
+                j = i !== -1 && wikitext.indexOf('-->', i + 4);
+            }
+            if (lastIndex < wikitext.length) {
+                this.insertAt(wikitext.slice(lastIndex));
+            }
+        }
+    }
+    /** @private */
+    lint(start = this.getAbsoluteIndex()) {
+        return super.lint(start, /<\s*(?:\/\s*)?(hiero)\b/giu);
+    }
+    /* NOT FOR BROWSER */
+    cloneNode() {
+        // @ts-expect-error abstract class
+        return (0, html_1.cloneNode)(this, () => new CommentedToken(undefined, this.getAttribute('config')));
+    }
+}
+exports.CommentedToken = CommentedToken;
+constants_1.classes['CommentedToken'] = __filename;

package/dist/src/converter.js

@@ -36,6 +36,7 @@ var __runInitializers = (this && this.__runInitializers) || function (thisArg, i
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConverterToken = void 0;
 const string_1 = require("../util/string");
+const padded_1 = require("../mixin/padded");
 const index_1 = require("./index");
 const converterFlags_1 = require("./converterFlags");
 const converterRule_1 = require("./converterRule");
@@ -52,7 +53,7 @@ const noEscape_1 = require("../mixin/noEscape");
  * @classdesc `{childNodes: [ConverterFlagsToken, ...ConverterRuleToken[]]}`
  */
 let ConverterToken = (() => {
-    let _classDecorators = [noEscape_1.noEscape];
+    let _classDecorators = [noEscape_1.noEscape, (0, padded_1.padded)('-{')];
     let _classDescriptor;
     let _classExtraInitializers = [];
     let _classThis;
@@ -119,10 +120,6 @@ let ConverterToken = (() => {
             return `-{${flags.text()}|${(0, string_1.text)(rules, ';')}}-`;
         }
         /** @private */
-        getAttribute(key) {
-            return key === 'padding' ? 2 : super.getAttribute(key);
-        }
-        /** @private */
         getGaps(i) {
             return i || this.firstChild.length > 0 ? 1 : 0;
         }
@@ -139,7 +136,7 @@ let ConverterToken = (() => {
                 const token = new ConverterToken([], [''], this.getAttribute('config'));
                 token.firstChild.safeReplaceWith(flags);
                 token.removeAt(1);
-                token.append(...rules);
+                token.safeAppend(rules);
                 return token;
             });
         }