wikiparser-node 1.3.6 → 1.3.7

package/dist/index.js

@@ -64,7 +64,7 @@ const Parser = {
         debug_1.Shadow.run(() => {
             for (const key of ['main', 'fragment']) {
                 if (titleObj[key]?.includes('\0')) {
-                    titleObj[key] = token.buildFromStr(titleObj[key], 'text');
+                    titleObj[key] = token.buildFromStr(titleObj[key], constants_1.BuildMethod.Text);
                 }
             }
         });
@@ -163,7 +163,7 @@ const Parser = {
     /** @implements */
     isInterwiki(title, { interwiki } = Parser.getConfig()) {
         return new RegExp(`^(${interwiki.join('|')})\\s*:`, 'diu')
-            .exec(title.replaceAll('_', ' ').replace(/^\s*:?\s*/u, ''));
+            .exec(title.replace(/_/gu, ' ').replace(/^\s*:?\s*/u, ''));
     },
     /** @implements */
     reparse(date) {

package/dist/lib/element.js

@@ -51,7 +51,7 @@ class AstElement extends node_1.AstNode {
     }
     /** 末位非文本子节点 */
     get lastElementChild() {
-        return this.children.at(-1);
+        return this.children[this.childElementCount - 1];
     }
     /** 非文本子节点总数 */
     get childElementCount() {
@@ -93,7 +93,11 @@ class AstElement extends node_1.AstNode {
     /** 内部宽度 */
     get clientWidth() {
         const { innerText } = this;
-        return typeof innerText === 'string' ? innerText.split('\n').at(-1).length : undefined;
+        if (typeof innerText === 'string') {
+            const lines = innerText.split('\n');
+            return lines[lines.length - 1].length;
+        }
+        return undefined;
     }
     constructor() {
         super();
@@ -200,7 +204,8 @@ class AstElement extends node_1.AstNode {
      */
     setText(str, i = 0) {
         this.verifyChild(i);
-        const oldText = this.childNodes.at(i), { type, constructor: { name } } = oldText;
+        i += i < 0 ? this.length : 0;
+        const oldText = this.childNodes[i], { type, constructor: { name } } = oldText;
         if (type === 'text') {
             const { data } = oldText;
             oldText.replaceData(str);
@@ -234,11 +239,6 @@ class AstElement extends node_1.AstNode {
     print(opt = {}) {
         return String(this) ? `<span class="wpb-${opt.class ?? this.type}">${(0, string_1.print)(this.childNodes, opt)}</span>` : '';
     }
-    /* NOT FOR BROWSER */
-    /** @private */
-    matchesTypes(types) {
-        return types.has(this.type);
-    }
     /**
      * 保存为JSON
      * @param file 文件名
@@ -253,6 +253,11 @@ class AstElement extends node_1.AstNode {
         }
         return json;
     }
+    /* NOT FOR BROWSER */
+    /** @private */
+    matchesTypes(types) {
+        return types.has(this.type);
+    }
     /** 销毁 */
     destroy() {
         this.parentNode?.destroy();
@@ -432,7 +437,7 @@ class AstElement extends node_1.AstNode {
         const condition = [...copy], step = condition.pop();
         if (this.#matches(step)) {
             const { parentNode, previousElementSibling } = this;
-            switch (condition.at(-1)?.relation) {
+            switch (condition[condition.length - 1]?.relation) {
                 case undefined:
                     return true;
                 case '>':

package/dist/lib/node.js

@@ -29,7 +29,7 @@ class AstNode {
     }
     /** 末位子节点 */
     get lastChild() {
-        return this.childNodes.at(-1);
+        return this.childNodes[this.childNodes.length - 1];
     }
     /** 父节点 */
     get parentNode() {
@@ -118,7 +118,7 @@ class AstNode {
         if (key === 'parentNode') {
             this.#parentNode = value;
         }
-        else if (Object.hasOwn(this, key)) {
+        else if (Object.prototype.hasOwnProperty.call(this, key)) {
             const descriptor = Object.getOwnPropertyDescriptor(this, key);
             if (this.#optional.has(key)) {
                 descriptor.enumerable = Boolean(value);
@@ -148,21 +148,15 @@ class AstNode {
     posFromIndex(index) {
         const str = String(this);
         if (index >= -str.length && index <= str.length) {
-            const lines = str.slice(0, index).split('\n');
-            return {
-                top: lines.length - 1,
-                left: lines.at(-1).length,
-            };
+            const lines = str.slice(0, index).split('\n'), top = lines.length - 1;
+            return { top, left: lines[top].length };
         }
         return undefined;
     }
     /** 获取行数和最后一行的列数 */
     #getDimension() {
-        const lines = String(this).split('\n');
-        return {
-            height: lines.length,
-            width: lines.at(-1).length,
-        };
+        const lines = String(this).split('\n'), height = lines.length;
+        return { height, width: lines[height - 1].length };
     }
     /** @private */
     // eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars

package/dist/lib/text.js

@@ -5,7 +5,7 @@ const constants_1 = require("../util/constants");
 const debug_1 = require("../util/debug");
 const Parser = require("../index");
 const node_1 = require("./node");
-const errorSyntax = /<\s*\/?([a-z]\w*)|\{+|\}+|\[{2,}|\[(?![^[]*\])|(?<=^|\])([^[]*?)\]+|\]{2,}|https?[:/]\/+/giu, errorSyntaxUrl = /<\s*\/?([a-z]\w*)|\{+|\}+|\[{2,}|\[(?![^[]*\])|(?<=^|\])([^[]*?)\]+|\]{2,}/giu, disallowedTags = [
+const errorSyntax = /<\s*\/?([a-z]\w*)|\{+|\}+|\[{2,}|\[(?![^[]*\])|((?:^|\])[^[]*?)\]+|https?[:/]\/+/giu, errorSyntaxUrl = /<\s*\/?([a-z]\w*)|\{+|\}+|\[{2,}|\[(?![^[]*\])|((?:^|\])[^[]*?)\]+/giu, disallowedTags = [
     'html',
     'base',
     'head',
@@ -71,7 +71,10 @@ class AstText extends node_1.AstNode {
     constructor(text) {
         super();
         Object.defineProperties(this, {
-            data: { value: text, writable: false },
+            data: {
+                value: text,
+                writable: false,
+            },
             childNodes: { enumerable: false, configurable: false },
             type: { enumerable: false, writable: false, configurable: false },
         });
@@ -109,17 +112,19 @@ class AstText extends node_1.AstNode {
         else {
             errorRegex = errorSyntax;
         }
-        const errors = [...data.matchAll(errorRegex)], { ext, html } = this.getRootNode().getAttribute('config');
-        if (errors.length > 0) {
+        const errors = [], { ext, html } = this.getRootNode().getAttribute('config');
+        if (data.search(errorRegex) !== -1) {
+            errorRegex.lastIndex = 0;
             const root = this.getRootNode(), { top, left } = root.posFromIndex(start), tags = new Set(['onlyinclude', 'noinclude', 'includeonly', ext, html, disallowedTags].flat(2));
-            return errors
-                .map(({ 0: error, 1: tag, 2: prefix, index }) => {
-                if (prefix) {
+            for (let mt = errorRegex.exec(data); mt; mt = errorRegex.exec(data)) {
+                const [, tag, prefix] = mt;
+                let { 0: error, index } = mt;
+                if (prefix && prefix !== ']') {
                     const { length } = prefix;
                     index += length;
                     error = error.slice(length);
                 }
-                const startIndex = start + index, lines = data.slice(0, index).split('\n'), startLine = lines.length + top - 1, line = lines.at(-1), startCol = lines.length === 1 ? left + line.length : line.length, { 0: char, length } = error, endIndex = startIndex + length, rootStr = String(root), nextChar = rootStr[endIndex], previousChar = rootStr[startIndex - 1], severity = length > 1 && (char !== '<' || /[\s/>]/u.test(nextChar ?? ''))
+                const startIndex = start + index, lines = data.slice(0, index).split('\n'), startLine = lines.length + top - 1, line = lines[lines.length - 1], startCol = lines.length === 1 ? left + line.length : line.length, { 0: char, length } = error, endIndex = startIndex + length, rootStr = String(root), nextChar = rootStr[endIndex], previousChar = rootStr[startIndex - 1], severity = length > 1 && (char !== '<' || /[\s/>]/u.test(nextChar ?? ''))
                     || char === '{' && (nextChar === char || previousChar === '-')
                     || char === '}' && (previousChar === char || nextChar === '-')
                     || char === '[' && (nextChar === char
@@ -129,17 +134,20 @@ class AstText extends node_1.AstNode {
                         || !data.slice(0, index).trim() && previousType === 'free-ext-link')
                     ? 'error'
                     : 'warning';
-                return (char !== '<' || tags.has(tag.toLowerCase())) && {
-                    message: Parser.msg('lonely "$1"', char === 'h' ? error : char),
-                    severity,
-                    startIndex,
-                    endIndex,
-                    startLine,
-                    endLine: startLine,
-                    startCol,
-                    endCol: startCol + length,
-                };
-            }).filter(Boolean);
+                if (char !== '<' || tags.has(tag.toLowerCase())) {
+                    errors.push({
+                        message: Parser.msg('lonely "$1"', char === 'h' ? error : char),
+                        severity,
+                        startIndex,
+                        endIndex,
+                        startLine,
+                        endLine: startLine,
+                        startCol,
+                        endCol: startCol + length,
+                    });
+                }
+            }
+            return errors;
         }
         return [];
     }

package/dist/lib/title.js

@@ -24,7 +24,7 @@ class Title {
         return this.#main;
     }
     set main(title) {
-        title = title.replaceAll('_', ' ').trim();
+        title = title.replace(/_/gu, ' ').trim();
         this.#main = title && `${title[0].toUpperCase()}${title.slice(1)}`;
     }
     /** 命名空间前缀 */
@@ -35,13 +35,13 @@ class Title {
     /** 完整标题 */
     get title() {
         const prefix = `${this.interwiki}${this.interwiki && ':'}${this.prefix}`;
-        let title = `${prefix}${this.main}`.replaceAll(' ', '_');
+        let title = `${prefix}${this.main}`.replace(/ /gu, '_');
         const redirected = this.redirects.get(title);
         if (redirected) {
             return redirected;
         }
         this.autoConvert();
-        title = `${prefix}${this.main}`.replaceAll(' ', '_');
+        title = `${prefix}${this.main}`.replace(/ /gu, '_');
         return this.redirects.get(title) ?? title;
     }
     /** 扩展名 */
@@ -77,7 +77,7 @@ class Title {
             }
             catch { }
         }
-        title = title.replaceAll('_', ' ').trim();
+        title = title.replace(/_/gu, ' ').trim();
         let ns = defaultNs;
         if (title.startsWith(':')) {
             ns = 0;
@@ -108,7 +108,7 @@ class Title {
             }
             else if (fragment.includes('.')) {
                 try {
-                    fragment = decodeURIComponent(fragment.replaceAll('.', '%'));
+                    fragment = decodeURIComponent(fragment.replace(/\./gu, '%'));
                 }
                 catch { }
             }

package/dist/mixin/attributesParent.js

@@ -12,7 +12,7 @@ const attributesParent = (constructor, i = 0) => {
     class AttributesParent extends constructor {
         /** AttributesToken子节点 */
         get #attributesChild() {
-            return this.childNodes.at(i);
+            return this.childNodes[i];
         }
         /** getAttrs()方法的getter写法 */
         get attributes() {

package/dist/mixin/singleLine.js

@@ -11,11 +11,11 @@ const singleLine = (constructor) => {
     class SingleLineToken extends constructor {
         /** @private */
         toString(omit) {
-            return super.toString(omit).replaceAll('\n', ' ');
+            return super.toString(omit).replace(/\n/gu, ' ');
         }
         /** @override */
         text() {
-            return super.text().replaceAll('\n', ' ');
+            return super.text().replace(/\n/gu, ' ');
         }
     }
     Object.defineProperty(SingleLineToken, 'name', { value: `SingleLine${constructor.name}` });

package/dist/parser/braces.js

@@ -18,7 +18,7 @@ const parseBraces = (wikitext, config = Parser.getConfig(), accum = []) => {
     const source = `${config.excludes?.includes('heading') ? '' : '^(\0\\d+c\x7F)*={1,6}|'}\\[\\[|\\{{2,}|-\\{(?!\\{)`, { parserFunction: [, , , subst] } = config, stack = [], closes = { '=': '\n', '{': '\\}{2,}|\\|', '-': '\\}-', '[': '\\]\\]' }, marks = new Map([['!', '!'], ['!!', '+'], ['(!', '{'], ['!)', '}'], ['!-', '-'], ['=', '~']]);
     let regex = new RegExp(source, 'gmu'), mt = regex.exec(wikitext), moreBraces = wikitext.includes('}}'), lastIndex;
     while (mt
-        || lastIndex !== undefined && lastIndex <= wikitext.length && stack.at(-1)?.[0]?.startsWith('=')) {
+        || lastIndex !== undefined && lastIndex <= wikitext.length && stack[stack.length - 1]?.[0]?.startsWith('=')) {
         if (mt?.[1]) {
             const [, { length }] = mt;
             mt[0] = mt[0].slice(length);
@@ -30,14 +30,14 @@ const parseBraces = (wikitext, config = Parser.getConfig(), accum = []) => {
          * @param text wikitext全文
          */
         const push = (text) => {
-            parts.at(-1).push(text.slice(topPos, curIndex));
+            parts[parts.length - 1].push(text.slice(topPos, curIndex));
         };
         if (syntax === ']]' || syntax === '}-') { // 情形1：闭合内链或转换
             lastIndex = curIndex + 2;
         }
         else if (syntax === '\n') { // 情形2：闭合标题或文末
             lastIndex = curIndex + 1;
-            const { pos, findEqual } = stack.at(-1) ?? {};
+            const { pos, findEqual } = stack[stack.length - 1] ?? {};
             if (pos === undefined || findEqual || (0, string_1.removeComment)(wikitext.slice(pos, index)) !== '') {
                 const rmt = /^(={1,6})(.+)\1((?:\s|\0\d+c\x7F)*)$/u
                     .exec(wikitext.slice(index, curIndex));
@@ -113,10 +113,10 @@ const parseBraces = (wikitext, config = Parser.getConfig(), accum = []) => {
             stack.push(...'0' in top ? [top] : [], mt);
         }
         moreBraces &&= wikitext.slice(lastIndex).includes('}}');
-        let curTop = stack.at(-1);
+        let curTop = stack[stack.length - 1];
         if (!moreBraces && curTop?.[0]?.startsWith('{')) {
             stack.pop();
-            curTop = stack.at(-1);
+            curTop = stack[stack.length - 1];
         }
         regex = new RegExp(source + (curTop ? `|${closes[curTop[0][0]]}${curTop.findEqual ? '|=' : ''}` : ''), 'gmu');
         regex.lastIndex = lastIndex;

package/dist/parser/commentAndExt.js

@@ -50,9 +50,12 @@ const parseCommentAndExt = (wikitext, config = Parser.getConfig(), accum = [], i
             return str;
         }
     }
-    const ext = config.ext.join('|'), noincludeRegex = includeOnly ? 'includeonly' : '(?:no|only)include', includeRegex = includeOnly ? 'noinclude' : 'includeonly', regex = new RegExp('<!--.*?(?:-->|$)|' // comment
-        + `<${noincludeRegex}(?:\\s[^>]*?)?>|</${noincludeRegex}\\s*>|` // <noinclude>
-        + `<(${ext})(\\s[^>]*?)?(?:/>|>(.*?)</(\\1\\s*)>)|` // 扩展标签
+    const ext = config.ext.join('|'), noincludeRegex = includeOnly ? 'includeonly' : '(?:no|only)include', includeRegex = includeOnly ? 'noinclude' : 'includeonly', regex = new RegExp('<!--.*?(?:-->|$)' // comment
+        + '|'
+        + `<${noincludeRegex}(?:\\s[^>]*?)?>|</${noincludeRegex}\\s*>` // <noinclude>
+        + '|'
+        + `<(${ext})(\\s[^>]*?)?(?:/>|>(.*?)</(\\1\\s*)>)` // 扩展标签
+        + '|'
         + `<(${includeRegex})(\\s[^>]*?)?(?:/>|>(.*?)(?:</(${includeRegex}\\s*)>|$))`, // <includeonly>
     'gisu');
     return wikitext.replace(regex, (substr, name, attr, inner, closing, include, includeAttr, includeInner, includeClosing) => {

package/dist/parser/converter.js

@@ -16,10 +16,10 @@ const parseConverter = (text, config = Parser.getConfig(), accum = []) => {
     while (mt) {
         const { 0: syntax, index } = mt;
         if (syntax === '}-') {
-            const top = stack.pop(), { length } = accum, str = text.slice(top.index + 2, index), i = str.indexOf('|'), [flags, raw] = i === -1 ? [[], str] : [str.slice(0, i).split(';'), str.slice(i + 1)], 
-            // eslint-disable-next-line regexp/prefer-lookaround
-            temp = raw.replace(/(&[#a-z\d]+);/giu, '$1\x01'), variants = `(?:${config.variants.join('|')})`, rules = temp.split(new RegExp(`;(?=\\s*(?:${variants}|[^;]*?=>\\s*${variants})\\s*:)`, 'u'))
-                .map(rule => rule.replaceAll('\x01', ';'));
+            const top = stack.pop(), { length } = accum, str = text.slice(top.index + 2, index), i = str.indexOf('|'), [flags, raw] = i === -1 ? [[], str] : [str.slice(0, i).split(';'), str.slice(i + 1)], temp = raw.replace(/(&[#a-z\d]+);/giu, '$1\x01'), variants = `(?:${config.variants.join('|')})`, rules = temp.split(new RegExp(`;(?=\\s*(?:${`(?:${variants}|[^;]*?=>\\s*${variants})\\s*:`
+                + '|'
+                + '(?:\0\\d+c\x7f(?:\\s|\0\\d+c\x7f)*)?$' // 末尾的空白
+            }))`, 'u')).map(rule => rule.replace(/\x01/gu, ';'));
             new converter_1.ConverterToken(flags, rules, config, accum);
             text = `${text.slice(0, top.index)}\0${length}v\x7F${text.slice(index + 2)}`;
             if (stack.length === 0) {

package/dist/parser/magicLinks.js

@@ -12,9 +12,9 @@ const magicLink_1 = require("../src/magicLink");
  * @param accum
  */
 const parseMagicLinks = (wikitext, config = Parser.getConfig(), accum = []) => {
-    const regex = new RegExp(`(?<![\\p{L}\\d_])(?:${config.protocol})(${string_1.extUrlCharFirst}${string_1.extUrlChar})`, 'giu');
-    return wikitext.replace(regex, (m, p1) => {
-        let trail = '', url = m;
+    const regex = new RegExp(`(^|[^\\p{L}\\d_])(?:${config.protocol})(${string_1.extUrlCharFirst}${string_1.extUrlChar})`, 'giu');
+    return wikitext.replace(regex, (m, lead, p1) => {
+        let trail = '', url = lead ? m.slice(1) : m;
         const m2 = /&(?:lt|gt|nbsp|#x0*(?:3[ce]|a0)|#0*(?:6[02]|160));/iu.exec(url);
         if (m2) {
             trail = url.slice(m2.index);
@@ -33,7 +33,7 @@ const parseMagicLinks = (wikitext, config = Parser.getConfig(), accum = []) => {
             return m;
         }
         new magicLink_1.MagicLinkToken(url, false, config, accum);
-        return `\0${accum.length - 1}w\x7F${trail}`;
+        return `${lead}\0${accum.length - 1}w\x7F${trail}`;
     });
 };
 exports.parseMagicLinks = parseMagicLinks;

package/dist/parser/quotes.js

@@ -36,7 +36,7 @@ const parseQuotes = (wikitext, config = Parser.getConfig(), accum = []) => {
                         firstSpace = i;
                     }
                 }
-                else if (arr[i - 1].at(-2) === ' ') {
+                else if (arr[i - 1].slice(-2, -1) === ' ') {
                     firstSingle = i;
                 }
                 else {

package/dist/parser/selector.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseSelector = void 0;
 const constants_1 = require("../util/constants");
+const string_1 = require("../util/string");
 const Parser = require("../index");
 const simplePseudos = new Set([
     'root',
@@ -53,7 +54,7 @@ const pseudoRegex = new RegExp(`:(${complexPseudos.join('|')})$`, 'u'), regularR
  */
 const sanitize = (selector) => {
     for (const [c, escaped] of specialChars) {
-        selector = selector.replaceAll(`\\${c}`, escaped);
+        selector = selector.replace(new RegExp((0, string_1.escapeRegExp)(`\\${c}`), 'gu'), escaped);
     }
     return selector;
 };
@@ -63,7 +64,7 @@ const sanitize = (selector) => {
  */
 const desanitize = (selector) => {
     for (const [c, escaped] of specialChars) {
-        selector = selector.replaceAll(escaped, c);
+        selector = selector.replace(new RegExp(escaped, 'gu'), c);
     }
     return selector.trim();
 };

package/dist/parser/table.js

@@ -81,7 +81,7 @@ const parseTable = ({ firstChild: { data }, type, name }, config = Parser.getCon
                 top = stack.pop();
             }
             top.close(`\n${spaces}${closing}`, true);
-            push(attr, stack.at(-1));
+            push(attr, stack[stack.length - 1]);
         }
         else if (row) {
             top = pop();

package/dist/src/attribute.js

@@ -146,7 +146,13 @@ const commonHtmlAttrs = new Set([
     ]),
     tabs: new Set(['plain', 'class', 'container', 'id', 'title', 'style']),
     combobox: new Set(['placeholder', 'value', 'id', 'class', 'text', 'dropdown', 'style']),
-}, insecureStyle = new RegExp(`${'expression'}|${'(?:filter|accelerator|-o-link(?:-source)?|-o-replace)\\s*:'}|${'(?:url|image(?:-set)?)\\s*\\('}|${'attr\\s*\\([^)]+[\\s,]url'}`, 'u');
+}, insecureStyle = new RegExp('expression'
+    + '|'
+    + '(?:filter|accelerator|-o-link(?:-source)?|-o-replace)\\s*:'
+    + '|'
+    + '(?:url|image(?:-set)?)\\s*\\('
+    + '|'
+    + 'attr\\s*\\([^)]+[\\s,]url', 'u');
 /**
  * 扩展和HTML标签属性
  * @classdesc `{childNodes: [AtomToken, Token|AtomToken]}`
@@ -239,7 +245,7 @@ class AttributeToken extends (0, fixed_1.fixed)(index_1.Token) {
     /** @private */
     afterBuild() {
         if (this.#equal.includes('\0')) {
-            this.#equal = this.buildFromStr(this.#equal, 'string');
+            this.#equal = this.buildFromStr(this.#equal, constants_1.BuildMethod.String);
         }
         if (this.parentNode) {
             this.setAttribute('tag', this.parentNode.name);
@@ -303,7 +309,7 @@ class AttributeToken extends (0, fixed_1.fixed)(index_1.Token) {
             if (this.#quotes[1]) {
                 return value;
             }
-            return this.#quotes[0] ? value.trimEnd() : value.trim();
+            return value[this.#quotes[0] ? 'trimEnd' : 'trim']();
         }
         return this.type === 'ext-attr' || '';
     }

package/dist/src/attributes.js

@@ -81,12 +81,11 @@ class AttributesToken extends index_1.Token {
         this.setAttribute('name', name);
         if (attr) {
             const regex = new RegExp('([^\\s/](?:(?!\0\\d+~\x7F)[^\\s/=])*)' // 属性名
-                + '(?:'
-                + '((?:\\s|\0\\d+c\x7F)*' // `=`前的空白字符
-                + '(?:=|\0\\d+~\x7F)' // `=`
-                + '(?:\\s|\0\\d+c\x7F)*)' // `=`后的空白字符
-                + `(?:(["'])(.*?)(\\3|$)|(\\S*))` // 属性值
-                + ')?', 'gsu');
+                + `(?:${'((?:\\s|\0\\d+c\x7F)*' // `=`前的空白字符
+                    + '(?:=|\0\\d+~\x7F)' // `=`
+                    + '(?:\\s|\0\\d+c\x7F)*)' // `=`后的空白字符
+                    + `(?:(["'])(.*?)(\\3|$)|(\\S*))` // 属性值
+                })?`, 'gsu');
             let out = '', mt = regex.exec(attr), lastIndex = 0;
             const insertDirty = /** 插入无效属性 */ () => {
                 if (out) {
@@ -134,7 +133,7 @@ class AttributesToken extends index_1.Token {
      */
     getAttrToken(key) {
         const tokens = this.getAttrTokens(key);
-        return tokens.at(-1);
+        return tokens[tokens.length - 1];
     }
     /**
      * 获取指定属性

package/dist/src/converterRule.js

@@ -15,7 +15,7 @@ class ConverterRuleToken extends index_1.Token {
     /* NOT FOR BROWSER */
     /** 语言变体 */
     get variant() {
-        return this.childNodes.at(-2)?.text().trim() ?? '';
+        return this.childNodes[this.length - 2]?.text().trim() ?? '';
     }
     set variant(variant) {
         this.setVariant(variant);
@@ -122,7 +122,7 @@ class ConverterRuleToken extends index_1.Token {
     afterBuild() {
         const /** @implements */ converterRuleListener = (e, data) => {
             const { prevTarget } = e;
-            if (this.length > 1 && this.childNodes.at(-2) === prevTarget) {
+            if (this.length > 1 && this.childNodes[this.length - 2] === prevTarget) {
                 const { variant } = this;
                 if (!this.getAttribute('config').variants.includes(variant)) {
                     (0, debug_1.undo)(e, data);
@@ -171,7 +171,7 @@ class ConverterRuleToken extends index_1.Token {
             super.insertAt(debug_1.Shadow.run(() => new atom_1.AtomToken(variant, 'converter-rule-variant', config)), 0);
         }
         else {
-            this.childNodes.at(-2).setText(variant);
+            this.childNodes[this.length - 2].setText(variant);
         }
     }
     /**

package/dist/src/index.d.ts

@@ -1,3 +1,4 @@
+import { BuildMethod } from '../util/constants';
 import { AstRange } from '../lib/range';
 import * as Parser from '../index';
 import { AstElement } from '../lib/element';

package/dist/src/index.js

@@ -151,15 +151,15 @@ class Token extends element_1.AstElement {
             if (i % 2 === 0) {
                 return new text_1.AstText(s);
             }
-            else if (Number.isNaN(Number(s.at(-1)))) {
+            else if (Number.isNaN(Number(s.slice(-1)))) {
                 return this.#accum[Number(s.slice(0, -1))];
             }
             throw new Error(`解析错误！未正确标记的 Token：${s}`);
         });
-        if (type === 'string') {
+        if (type === constants_1.BuildMethod.String) {
             return nodes.map(String).join('');
         }
-        else if (type === 'text') {
+        else if (type === constants_1.BuildMethod.Text) {
             return (0, string_1.text)(nodes);
         }
         return nodes;
@@ -303,15 +303,7 @@ class Token extends element_1.AstElement {
                     return this.#include;
                 }
                 const root = this.getRootNode();
-                if (root !== this) {
-                    return root.getAttribute('include');
-                }
-                const includeToken = root.getElementByTypes('include');
-                if (includeToken) {
-                    return (includeToken.name === 'noinclude');
-                }
-                const noincludeToken = root.getElementByTypes('noinclude');
-                return (Boolean(noincludeToken) && !/^<\/?noinclude(?:\s[^>]*)?\/?>$/iu.test(String(noincludeToken)));
+                return (root !== this && root.getAttribute('include'));
             }
             case 'stage':
                 return this.#stage;
@@ -458,7 +450,7 @@ class Token extends element_1.AstElement {
     createComment(data = '') {
         const { CommentToken } = require('./nowiki/comment');
         const config = this.getAttribute('config');
-        return debug_1.Shadow.run(() => new CommentToken(data.replaceAll('-->', '--&gt;'), true, config));
+        return debug_1.Shadow.run(() => new CommentToken(data.replace(/-->/gu, '--&gt;'), true, config));
     }
     /**
      * 创建标签

package/dist/src/link/base.js

@@ -61,7 +61,7 @@ class LinkBaseToken extends index_1.Token {
         this.#title = this.getTitle();
         this.setAttribute('name', this.#title.title);
         if (this.#delimiter.includes('\0')) {
-            this.#delimiter = this.buildFromStr(this.#delimiter, 'string');
+            this.#delimiter = this.buildFromStr(this.#delimiter, constants_1.BuildMethod.String);
         }
         const /** @implements */ linkListener = (e, data) => {
             const { prevTarget } = e;

package/dist/src/link/file.js

@@ -175,7 +175,8 @@ class FileToken extends base_1.LinkBaseToken {
      * @param key 参数名
      */
     getArg(key) {
-        return this.getArgs(key).at(-1);
+        const args = this.getArgs(key);
+        return args[args.length - 1];
     }
     /**
      * 是否具有指定图片参数

package/dist/src/link/index.js

@@ -110,6 +110,7 @@ class LinkToken extends base_1.LinkBaseToken {
             this.setLinkText(m2[1].trim());
             return;
         }
+        // eslint-disable-next-line es-x/no-regexp-lookbehind-assertions
         const m3 = /^:?(?:[ \w\x80-\xFF-]+:)?(.+?)(?:(?<!\()\(.+\))?(?:, |，|، )./u
             .exec(linkText);
         if (m3) {

package/dist/src/magicLink.js

@@ -63,9 +63,10 @@ class MagicLinkToken extends (0, syntax_1.syntax)(index_1.Token) {
             }
             rect ??= { start, ...this.getRootNode().posFromIndex(start) };
             const refError = (0, lint_1.generateForChild)(child, rect, '', 'warning');
-            errors.push(...[...data.matchAll(regexGlobal)].map(({ index, 0: s }) => {
-                const lines = data.slice(0, index).split('\n'), { length: top } = lines, { length: left } = lines.at(-1), startIndex = refError.startIndex + index, startLine = refError.startLine + top - 1, startCol = top === 1 ? refError.startCol + left : left;
-                return {
+            regexGlobal.lastIndex = 0;
+            for (let mt = regexGlobal.exec(data); mt; mt = regexGlobal.exec(data)) {
+                const { index, 0: s } = mt, lines = data.slice(0, index).split('\n'), { length: top } = lines, { length: left } = lines[lines.length - 1], startIndex = refError.startIndex + index, startLine = refError.startLine + top - 1, startCol = top === 1 ? refError.startCol + left : left;
+                errors.push({
                     ...refError,
                     message: Parser.msg('$1 in URL', s.startsWith('|') ? '"|"' : Parser.msg('full-width punctuation')),
                     startIndex,
@@ -74,8 +75,8 @@ class MagicLinkToken extends (0, syntax_1.syntax)(index_1.Token) {
                     endLine: startLine,
                     startCol,
                     endCol: startCol + s.length,
-                };
-            }));
+                });
+            }
         }
         return errors;
     }

package/dist/src/nested.js

@@ -33,9 +33,9 @@ class NestedToken extends index_1.Token {
                 new comment_1.CommentToken(comment.slice(4, closed ? -3 : undefined), closed, config, accum);
             }
             return str;
-        })?.replace(/(?<=^|\0\d+[ce]\x7F)[^\0]+(?=$|\0\d+[ce]\x7F)/gu, substr => {
+        })?.replace(/(^|\0\d+[ce]\x7F)([^\0]+)(?=$|\0\d+[ce]\x7F)/gu, (_, lead, substr) => {
             new noinclude_1.NoincludeToken(substr, config, accum);
-            return `\0${accum.length}c\x7F`;
+            return `${lead}\0${accum.length}c\x7F`;
         });
         super(wikitext, config, accum, {
             NoincludeToken: ':', ExtToken: ':',

package/dist/src/nowiki/quote.js

@@ -16,7 +16,7 @@ class QuoteToken extends (0, syntax_1.syntax)(base_1.NowikiBaseToken, /^(?:'{5}|
         let refError;
         if (previousSibling?.type === 'text' && previousSibling.data.endsWith(`'`)) {
             refError = (0, lint_1.generateForSelf)(this, { start }, message);
-            const { startIndex: endIndex, startLine: endLine, startCol: endCol } = refError, [{ length }] = /(?<!')'+$/u.exec(previousSibling.data), startIndex = start - length;
+            const { startIndex: endIndex, startLine: endLine, startCol: endCol } = refError, [, { length }] = /(?:^|[^'])('+)$/u.exec(previousSibling.data), startIndex = start - length;
             errors.push({
                 ...refError,
                 startIndex,

package/dist/src/parameter.js

@@ -13,7 +13,7 @@ const index_1 = require("./index");
  * @param name 预定的参数名
  */
 const getName = (name) => name.toString(new Set(['comment', 'noinclude', 'include']))
-    .replace(/^[ \t\n\0\v]+|(?<=[^ \t\n\0\v])[ \t\n\0\v]+$/gu, '');
+    .replace(/^[ \t\n\0\v]+|([^ \t\n\0\v])[ \t\n\0\v]+$/gu, '$1');
 /**
  * 模板或魔术字参数
  * @classdesc `{childNodes: [Token, Token]}`

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

@@ -6,6 +6,10 @@ declare const TableBaseToken_base: (abstract new (...args: any[]) => {
     readonly childNodes: Parser.AstNodes[];
     readonly "__#7@#attributesChild": Parser.AttributesToken;
     attributes: Record<string, string | true>;
+    /**
+     * 表格行，含开头的换行，不含结尾的换行
+     * @classdesc `{childNodes: [SyntaxToken, AttributesToken, ...Token]}`
+     */
     className: string;
     classList: Set<string>;
     id: string;

package/dist/src/table/base.js

@@ -15,7 +15,7 @@ const attributes_1 = require("../attributes");
  */
 const escapeTable = (syntax) => {
     const wikitext = syntax.childNodes.map(child => child.type === 'text'
-        ? child.data.replaceAll('|', '{{!}}')
+        ? child.data.replace(/\|/gu, '{{!}}')
         : String(child)).join(''), { childNodes } = Parser.parse(wikitext, syntax.getAttribute('include'), 2, syntax.getAttribute('config'));
     syntax.replaceChildren(...childNodes);
 };

package/dist/src/table/index.js

@@ -69,7 +69,8 @@ class TableToken extends trBase_1.TrBaseToken {
      * @throws `SyntaxError` 表格的闭合部分非法
      */
     insertAt(token, i = this.length) {
-        const previous = this.childNodes.at(i - 1);
+        i += i < 0 ? this.length : 0;
+        const previous = this.childNodes[i - 1];
         if (typeof token !== 'string' && token.type === 'td' && previous?.type === 'tr') {
             Parser.warn('改为将单元格插入当前行。');
             return previous.insertAt(token);

package/dist/src/table/td.js

@@ -67,7 +67,7 @@ class TdToken extends (0, fixed_1.fixed)(base_1.TableBaseToken) {
     }
     /** 表格语法信息 */
     #getSyntax() {
-        const syntax = this.firstChild.text(), esc = syntax.includes('{{'), char = syntax.at(-1);
+        const syntax = this.firstChild.text(), esc = syntax.includes('{{'), char = syntax.slice(-1);
         let subtype = 'td';
         if (char === '!') {
             subtype = 'th';
@@ -96,7 +96,7 @@ class TdToken extends (0, fixed_1.fixed)(base_1.TableBaseToken) {
     /** @private */
     afterBuild() {
         if (this.#innerSyntax.includes('\0')) {
-            this.#innerSyntax = this.buildFromStr(this.#innerSyntax, 'string');
+            this.#innerSyntax = this.buildFromStr(this.#innerSyntax, constants_1.BuildMethod.String);
         }
     }
     /** @private */
@@ -126,8 +126,11 @@ class TdToken extends (0, fixed_1.fixed)(base_1.TableBaseToken) {
         const errors = super.lint(start);
         start += this.getRelativeIndex(this.length - 1);
         for (const child of this.lastChild.childNodes) {
-            if (child.type === 'text' && child.data.includes('|')) {
-                errors.push((0, lint_1.generateForChild)(child, { start }, 'additional "|" in a table cell', 'warning'));
+            if (child.type === 'text') {
+                const { data } = child;
+                if (data.includes('|')) {
+                    errors.push((0, lint_1.generateForChild)(child, { start }, 'additional "|" in a table cell', data.includes('||') ? 'error' : 'warning'));
+                }
             }
         }
         return errors;

package/dist/src/table/trBase.js

@@ -67,7 +67,8 @@ class TrBaseToken extends base_1.TableBaseToken {
      * @param i 移除位置
      */
     removeAt(i) {
-        const child = this.childNodes.at(i);
+        i += i < 0 ? this.length : 0;
+        const child = this.childNodes[i];
         if (child instanceof td_1.TdToken && child.isIndependent()) {
             const { nextSibling } = child;
             if (nextSibling?.type === 'td') {
@@ -90,7 +91,8 @@ class TrBaseToken extends base_1.TableBaseToken {
                 this.typeError('insertAt', 'TrToken', 'TdToken');
             }
         }
-        const child = this.childNodes.at(i);
+        i += i < 0 ? this.length : 0;
+        const child = this.childNodes[i];
         if (token instanceof td_1.TdToken && token.isIndependent() && child instanceof td_1.TdToken) {
             child.independence();
         }

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

@@ -9,7 +9,7 @@ declare const ExtToken_base: (abstract new (...args: any[]) => {
     attributes: Record<string, string | true>;
     className: string;
     classList: Set<string>;
-    id: string;
+    id: string; /** @override */
     hasAttr(key: string): boolean;
     getAttr(key: string): string | true | undefined;
     getAttrNames(): Set<string>;

package/dist/src/tagPair/ext.js

@@ -39,9 +39,7 @@ class ExtToken extends (0, attributesParent_1.attributesParent)(index_2.TagPairT
      * @param closed 是否封闭
      */
     constructor(name, attr, inner, closed, config = Parser.getConfig(), accum = []) {
-        const lcName = name.toLowerCase(), attrToken = new attributes_1.AttributesToken(!attr || attr.trimStart() !== attr
-            ? attr
-            : ` ${attr}`, 'ext-attrs', lcName, config, accum), newConfig = { ...config, ext: del(config.ext, lcName), excludes: [...config.excludes ?? []] };
+        const lcName = name.toLowerCase(), attrToken = new attributes_1.AttributesToken(!attr || attr.trimStart() !== attr ? attr : ` ${attr}`, 'ext-attrs', lcName, config, accum), newConfig = { ...config, ext: del(config.ext, lcName), excludes: [...config.excludes ?? []] };
         let innerToken;
         switch (lcName) {
             case 'tab':

package/dist/src/transclude.js

@@ -146,7 +146,7 @@ class TranscludeToken extends index_1.Token {
     /** @private */
     afterBuild() {
         if (this.modifier.includes('\0')) {
-            this.setAttribute('modifier', this.buildFromStr(this.modifier, 'string'));
+            this.setAttribute('modifier', this.buildFromStr(this.modifier, constants_1.BuildMethod.String));
         }
         if (this.isTemplate()) {
             const isTemplate = this.type === 'template';
@@ -304,7 +304,7 @@ class TranscludeToken extends index_1.Token {
      * @param copy 是否返回一个备份
      */
     getArgs(key, exact = false, copy = true) {
-        const keyStr = String(key).replace(/^[ \t\n\0\v]+|(?<=[^ \t\n\0\v])[ \t\n\0\v]+$/gu, '');
+        const keyStr = String(key).replace(/^[ \t\n\0\v]+|([^ \t\n\0\v])[ \t\n\0\v]+$/gu, '$1');
         let args;
         if (this.#args.has(keyStr)) {
             args = this.#args.get(keyStr);
@@ -441,7 +441,8 @@ class TranscludeToken extends index_1.Token {
      * @param exact 是否匹配匿名性
      */
     getArg(key, exact = false) {
-        return [...this.getArgs(key, exact, false)].sort((a, b) => a.compareDocumentPosition(b)).at(-1);
+        const args = [...this.getArgs(key, exact, false)].sort((a, b) => a.compareDocumentPosition(b));
+        return args[args.length - 1];
     }
     /**
      * 移除指定参数
@@ -639,6 +640,7 @@ class TranscludeToken extends index_1.Token {
             }
             else if (aggressive && (anonCount ? /\D\d+$/u : /(?:^|\D)\d+$/u).test(key)) {
                 let last;
+                // eslint-disable-next-line es-x/no-regexp-lookbehind-assertions
                 const str = key.slice(0, -/(?<!\d)\d+$/u.exec(key)[0].length), regex = new RegExp(`^${(0, string_1.escapeRegExp)(str)}\\d+$`, 'u'), series = this.getAllArgs().filter(({ name }) => regex.test(name)), ordered = series.every(({ name }, i) => {
                     const j = Number(name.slice(str.length)), cmp = j <= i + 1 && (i === 0 || j >= last || name === key);
                     last = j;

package/dist/util/constants.js

@@ -1,7 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.promises = exports.typeAliases = exports.aliases = exports.parsers = exports.mixins = exports.classes = exports.MAX_STAGE = void 0;
+exports.promises = exports.typeAliases = exports.aliases = exports.parsers = exports.mixins = exports.classes = exports.BuildMethod = exports.MAX_STAGE = void 0;
 exports.MAX_STAGE = 11;
+var BuildMethod;
+(function (BuildMethod) {
+    BuildMethod[BuildMethod["String"] = 0] = "String";
+    BuildMethod[BuildMethod["Text"] = 1] = "Text";
+})(BuildMethod || (exports.BuildMethod = BuildMethod = {}));
 /* NOT FOR BROWSER */
 exports.classes = {};
 exports.mixins = {};

package/dist/util/string.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeSpace = exports.print = exports.noWrap = exports.decodeHtml = exports.text = exports.escapeRegExp = exports.removeComment = exports.extUrlChar = exports.extUrlCharFirst = void 0;
-exports.extUrlCharFirst = '(?:\\[[\\da-f:.]+\\]|[^[\\]<>"\\0-\\x1F\\x7F\\p{Zs}\\uFFFD])';
-exports.extUrlChar = '(?:[^[\\]<>"\\0-\\x1F\\x7F\\p{Zs}\\uFFFD]|\\0\\d+[c!~]\\x7F)*';
+exports.extUrlCharFirst = '(?:\\[[\\da-f:.]+\\]|[^[\\]<>"\0-\x1F\x7F\\p{Zs}\uFFFD])';
+exports.extUrlChar = '(?:[^[\\]<>"\0-\x1F\x7F\\p{Zs}\uFFFD]|\0\\d+[c!~]\x7F)*';
 /**
  * 生成正则替换函数
  * @param regex 正则表达式

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikiparser-node",
-	"version": "1.3.6",
+	"version": "1.3.7",
 	"description": "A Node.js parser for MediaWiki markup with AST",
 	"keywords": [
 		"mediawiki",
@@ -18,7 +18,8 @@
 		"/printed/README",
 		"/config/",
 		"/i18n/",
-		"/dist/"
+		"/dist/",
+		"!/dist/[bt]*/"
 	],
 	"main": "./dist/index.js",
 	"repository": {
@@ -27,15 +28,15 @@
 	},
 	"scripts": {
 		"toc": "node ./dist/bin/toc.js",
-		"prepublishOnly": "npm run build; rm dist/internal.js dist/base.js dist/[bmpu]*/*.d.ts; rm -r dist/test",
-		"build": "rm -rf dist/; tsc; grep -rl --include='*.d.ts' '@private' dist/ | xargs gsed -i '/@private/,+1d'",
+		"prepublishOnly": "npm run build && rm dist/internal.js dist/base.js dist/[mpu]*/*.d.ts",
+		"build": "rm -rf dist/; tsc && grep -rl --include='*.d.ts' '@private' dist/ | xargs gsed -i '/@private/,+1d'",
 		"diff": "git diff --ignore-all-space --color-moved",
 		"lint:ts": "tsc --noEmit && eslint --cache .",
 		"lint:json": "ajv -s config/.schema.json -d 'config/*.json' --strict=true --strict-required=false",
 		"lint": "npm run lint:ts && npm run lint:json",
 		"test": "node dist/test/test.js",
 		"test:real": "node dist/test/real.js",
-		"test:single": "node dist/test/single.js; node --prof dist/test/single.js && node --prof-process isolate-0x*-v8.log > test/processed.txt && rm isolate-0x*-v8.log"
+		"test:single": "node dist/test/single.js && node --prof dist/test/single.js && node --prof-process isolate-0x*-v8.log > test/processed.txt && rm isolate-0x*-v8.log"
 	},
 	"devDependencies": {
 		"@cypress/request": "^3.0.1",
@@ -46,6 +47,7 @@
 		"@typescript-eslint/parser": "^6.12.0",
 		"ajv-cli": "^5.0.0",
 		"eslint": "^8.56.0",
+		"eslint-plugin-es-x": "^7.3.0",
 		"eslint-plugin-eslint-comments": "^3.2.0",
 		"eslint-plugin-jsdoc": "^47.0.2",
 		"eslint-plugin-json-es": "^1.5.7",

package/dist/bin/toc.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs = require("fs");
-const path = require("path");
-const { argv: [, , filename] } = process;
-if (!filename) {
-    throw new RangeError('请指定文档文件！');
-}
-const fullpath = path.join(__dirname, '..', '..', 'wiki', `${filename}.md`), isEnglish = filename.endsWith('-(EN)');
-if (!fs.existsSync(fullpath)) {
-    throw new RangeError(`文档 ${filename}.md 不存在！`);
-}
-const content = fs.readFileSync(fullpath, 'utf8');
-if (/^- \[[^\]]+\]\(#[^)]+\)$/mu.test(content)) {
-    throw new Error(`文档 ${filename}.md 中已包含目录！`);
-}
-const toc = content.split('\n').filter(line => line.startsWith('#')).map(line => line.replace(/^(#+)\s+(\S.*)$/u, (_, { length }, title) => `${'\t'.repeat(length - 1)}- [${title}](#${title.toLowerCase().replaceAll(' ', '-').replaceAll('.', '')})`)).join('\n');
-fs.writeFileSync(fullpath, `<details>\n\t<summary>${isEnglish ? 'Table of Contents' : '目录'}</summary>\n\n${toc}\n\n</details>\n\n# Other Languages\n\n- [${isEnglish ? '简体中文' : 'English'}](./${isEnglish ? filename.slice(0, -5) : `${filename}-%28EN%29`})\n\n${content}`);