wikilint 2.48.1 → 3.0.0

package/README.md

@@ -97,6 +97,6 @@ repos:
         # You can add any CLI options as needed
         entry: wikilint
         language: node
-        additional_dependencies: ['wikilint@2.48.1']
+        additional_dependencies: ['wikilint@3.0.0']
         files: \.(mediawiki|wiki|wikitext)$
 ```

package/data/signatures.json

@@ -2658,13 +2658,13 @@
 			"aliases": [
 				"!"
 			],
-			"description": "Used to include a vertical bar (pipe).\n\nSee [help](https://www.mediawiki.org/wiki/Help:Extension:ParserFunctions#Escaping_pipe_characters_in_tables) for further explanation."
+			"description": "Used to include an escaped [pipe](https://en.wikipedia.org/wiki/Vertical_bar) (`|`) character as part of template or parser function arguments to prevent interpretation as a parameter separator during expansion.\n\nSee [help](https://www.mediawiki.org/wiki/Help:Extension:ParserFunctions#Escaping_pipe_characters_in_tables) for further explanation."
 		},
 		{
 			"aliases": [
 				"="
 			],
-			"description": "Used to include an equal sign.\n\nSee [help](https://www.mediawiki.org/wiki/Help:Extension:ParserFunctions#Raw_equal_signs) for further explanation."
+			"description": "Used to include an escaped equal sign (`=`) character as part of template or parser function arguments to prevent interpretation as a name-value separator during expansion.\n\nSee [help](https://www.mediawiki.org/wiki/Help:Extension:ParserFunctions#Raw_equal_signs) for further explanation."
 		},
 		{
 			"aliases": [

package/dist/base.d.mts

@@ -15,7 +15,7 @@ export interface Config {
     articlePath?: string;
 }
 export type ConfigData = Omit<Config, 'excludes'>;
-export type TokenTypes = 'root' | 'plain' | 'redirect' | 'redirect-syntax' | 'redirect-target' | 'translate' | 'translate-attr' | 'translate-inner' | 'tvar' | 'tvar-name' | 'onlyinclude' | 'noinclude' | 'include' | 'comment' | 'ext' | 'ext-attrs' | 'ext-attr-dirty' | 'ext-attr' | 'attr-key' | 'attr-value' | 'ext-inner' | 'arg' | 'arg-name' | 'arg-default' | 'hidden' | 'magic-word' | 'magic-word-name' | 'invoke-function' | 'invoke-module' | 'template' | 'template-name' | 'parameter' | 'parameter-key' | 'parameter-value' | 'heading' | 'heading-title' | 'heading-trail' | 'html' | 'html-attrs' | 'html-attr-dirty' | 'html-attr' | 'table' | 'tr' | 'td' | 'table-syntax' | 'table-attrs' | 'table-attr-dirty' | 'table-attr' | 'table-inter' | 'td-inner' | 'hr' | 'double-underscore' | 'link' | 'link-target' | 'link-text' | 'category' | 'file' | 'gallery-image' | 'imagemap-image' | 'image-parameter' | 'quote' | 'ext-link' | 'ext-link-text' | 'ext-link-url' | 'free-ext-link' | 'magic-link' | 'list' | 'dd' | 'converter' | 'converter-flags' | 'converter-flag' | 'converter-rule' | 'converter-rule-variant' | 'converter-rule-to' | 'converter-rule-from' | 'param-line' | 'param-line-key' | 'param-line-value' | 'imagemap-link' | 'charinsert-line';
+export type TokenTypes = 'root' | 'plain' | 'redirect' | 'redirect-syntax' | 'redirect-target' | 'translate' | 'translate-attr' | 'translate-inner' | 'tvar' | 'tvar-name' | 'onlyinclude' | 'noinclude' | 'include' | 'comment' | 'ext' | 'ext-attrs' | 'ext-attr-dirty' | 'ext-attr' | 'attr-key' | 'attr-value' | 'ext-inner' | 'arg' | 'arg-name' | 'arg-default' | 'hidden' | 'magic-word' | 'magic-word-name' | 'invoke-function' | 'invoke-module' | 'template' | 'template-name' | 'parameter' | 'parameter-key' | 'parameter-value' | 'heading' | 'heading-title' | 'heading-trail' | 'html' | 'html-attrs' | 'html-attr-dirty' | 'html-attr' | 'table' | 'tr' | 'td' | 'table-syntax' | 'table-attrs' | 'table-attr-dirty' | 'table-attr' | 'table-inter' | 'td-inner' | 'hr' | 'double-underscore' | 'link' | 'link-target' | 'link-text' | 'category' | 'file' | 'gallery-image' | 'imagemap-image' | 'image-parameter' | 'quote' | 'ext-link' | 'ext-link-text' | 'ext-link-url' | 'free-ext-link' | 'magic-link' | 'list' | 'dd' | 'converter' | 'converter-flags' | 'converter-flag' | 'converter-rule' | 'converter-rule-variant' | 'converter-rule-to' | 'converter-rule-from' | 'param-line' | 'param-line-key' | 'param-line-value' | 'imagemap-link' | 'charinsert-line' | 'list-range';
 export declare const stages: {
     redirect: number;
     onlyinclude: number;
@@ -41,8 +41,9 @@ export declare const stages: {
     list: number;
     dd: number;
     converter: number;
+    'list-range': number;
 };
-export type Stage = keyof typeof stages;
+declare type Stage = keyof typeof stages;
 export declare const rules: readonly ["arg-in-ext", "blank-alt", "bold-header", "format-leakage", "fostered-content", "h1", "illegal-attr", "insecure-style", "invalid-gallery", "invalid-imagemap", "invalid-invoke", "invalid-isbn", "invalid-json", "invalid-ref", "invalid-url", "lonely-apos", "lonely-bracket", "lonely-http", "nested-link", "no-arg", "no-duplicate", "no-ignored", "obsolete-attr", "obsolete-tag", "parsing-order", "pipe-like", "required-attr", "syntax-like", "table-layout", "tag-like", "unbalanced-header", "unclosed-comment", "unclosed-quote", "unclosed-table", "unescaped", "unknown-page", "unmatched-tag", "unterminated-url", "url-encoding", "var-anchor", "void-ext", "invalid-css", "invalid-math"];
 export declare namespace LintError {
     type Severity = 'error' | 'warning';

package/dist/base.d.ts

@@ -15,7 +15,7 @@ export interface Config {
     articlePath?: string;
 }
 export type ConfigData = Omit<Config, 'excludes'>;
-export type TokenTypes = 'root' | 'plain' | 'redirect' | 'redirect-syntax' | 'redirect-target' | 'translate' | 'translate-attr' | 'translate-inner' | 'tvar' | 'tvar-name' | 'onlyinclude' | 'noinclude' | 'include' | 'comment' | 'ext' | 'ext-attrs' | 'ext-attr-dirty' | 'ext-attr' | 'attr-key' | 'attr-value' | 'ext-inner' | 'arg' | 'arg-name' | 'arg-default' | 'hidden' | 'magic-word' | 'magic-word-name' | 'invoke-function' | 'invoke-module' | 'template' | 'template-name' | 'parameter' | 'parameter-key' | 'parameter-value' | 'heading' | 'heading-title' | 'heading-trail' | 'html' | 'html-attrs' | 'html-attr-dirty' | 'html-attr' | 'table' | 'tr' | 'td' | 'table-syntax' | 'table-attrs' | 'table-attr-dirty' | 'table-attr' | 'table-inter' | 'td-inner' | 'hr' | 'double-underscore' | 'link' | 'link-target' | 'link-text' | 'category' | 'file' | 'gallery-image' | 'imagemap-image' | 'image-parameter' | 'quote' | 'ext-link' | 'ext-link-text' | 'ext-link-url' | 'free-ext-link' | 'magic-link' | 'list' | 'dd' | 'converter' | 'converter-flags' | 'converter-flag' | 'converter-rule' | 'converter-rule-variant' | 'converter-rule-to' | 'converter-rule-from' | 'param-line' | 'param-line-key' | 'param-line-value' | 'imagemap-link' | 'charinsert-line';
+export type TokenTypes = 'root' | 'plain' | 'redirect' | 'redirect-syntax' | 'redirect-target' | 'translate' | 'translate-attr' | 'translate-inner' | 'tvar' | 'tvar-name' | 'onlyinclude' | 'noinclude' | 'include' | 'comment' | 'ext' | 'ext-attrs' | 'ext-attr-dirty' | 'ext-attr' | 'attr-key' | 'attr-value' | 'ext-inner' | 'arg' | 'arg-name' | 'arg-default' | 'hidden' | 'magic-word' | 'magic-word-name' | 'invoke-function' | 'invoke-module' | 'template' | 'template-name' | 'parameter' | 'parameter-key' | 'parameter-value' | 'heading' | 'heading-title' | 'heading-trail' | 'html' | 'html-attrs' | 'html-attr-dirty' | 'html-attr' | 'table' | 'tr' | 'td' | 'table-syntax' | 'table-attrs' | 'table-attr-dirty' | 'table-attr' | 'table-inter' | 'td-inner' | 'hr' | 'double-underscore' | 'link' | 'link-target' | 'link-text' | 'category' | 'file' | 'gallery-image' | 'imagemap-image' | 'image-parameter' | 'quote' | 'ext-link' | 'ext-link-text' | 'ext-link-url' | 'free-ext-link' | 'magic-link' | 'list' | 'dd' | 'converter' | 'converter-flags' | 'converter-flag' | 'converter-rule' | 'converter-rule-variant' | 'converter-rule-to' | 'converter-rule-from' | 'param-line' | 'param-line-key' | 'param-line-value' | 'imagemap-link' | 'charinsert-line' | 'list-range';
 export declare const stages: {
     redirect: number;
     onlyinclude: number;
@@ -41,8 +41,9 @@ export declare const stages: {
     list: number;
     dd: number;
     converter: number;
+    'list-range': number;
 };
-export type Stage = keyof typeof stages;
+declare type Stage = keyof typeof stages;
 export declare const rules: readonly ["arg-in-ext", "blank-alt", "bold-header", "format-leakage", "fostered-content", "h1", "illegal-attr", "insecure-style", "invalid-gallery", "invalid-imagemap", "invalid-invoke", "invalid-isbn", "invalid-json", "invalid-ref", "invalid-url", "lonely-apos", "lonely-bracket", "lonely-http", "nested-link", "no-arg", "no-duplicate", "no-ignored", "obsolete-attr", "obsolete-tag", "parsing-order", "pipe-like", "required-attr", "syntax-like", "table-layout", "tag-like", "unbalanced-header", "unclosed-comment", "unclosed-quote", "unclosed-table", "unescaped", "unknown-page", "unmatched-tag", "unterminated-url", "url-encoding", "var-anchor", "void-ext", "invalid-css", "invalid-math"];
 export declare namespace LintError {
     type Severity = 'error' | 'warning';

package/dist/base.js

@@ -27,6 +27,7 @@ exports.stages = (() => {
         list: 10,
         dd: 10,
         converter: 11,
+        'list-range': 12,
     };
     Object.setPrototypeOf(obj, null);
     return obj;

package/dist/base.mjs

@@ -23,7 +23,8 @@ const stages = /* @__PURE__ */ (() => {
     "magic-link": 9,
     list: 10,
     dd: 10,
-    converter: 11
+    converter: 11,
+    "list-range": 12
   };
   Object.setPrototypeOf(obj, null);
   return obj;

package/dist/bin/config.js

@@ -41,7 +41,7 @@ const filterGadget = (id) => {
     const n = Number(id);
     return n < 2300 || n > 2303; // Gadget, Gadget talk, Gadget definition, Gadget definition talk
 };
-const pkg = 'wikilint', version = '2.48.1';
+const pkg = 'wikilint', version = '3.0.0';
 /**
  * Get the parser configuration for a Wikimedia Foundation project.
  * @param site site nickname

package/dist/index.d.ts

@@ -52,7 +52,6 @@ declare interface Parser extends ParserBase {
 declare const Parser: Parser;
 // @ts-expect-error mixed export styles
 export = Parser;
-export default Parser;
 export type { Config, ConfigData, LintConfig, LintError, TokenTypes, LanguageService, QuickFixData, Title, };
 export type * from './internal';
 declare global { type WikiParserAcceptable = Record<string, any>; }

package/dist/index.js

@@ -189,13 +189,11 @@ const Parser = {
             config = configOrStage;
             page = pageOrConfig;
         }
-        maxStage ??= constants_1.MAX_STAGE;
+        maxStage ??= constants_1.MAX_STAGE + 1;
         config ??= this.getConfig();
-        // eslint-disable-next-line unicorn/prefer-smaller-scope
-        let types;
         LSP: if (typeof maxStage !== 'number') {
-            types = Array.isArray(maxStage) ? maxStage : [maxStage];
-            maxStage = Math.max(...types.map(t => base_1.stages[t] || constants_1.MAX_STAGE));
+            const types = Array.isArray(maxStage) ? maxStage : [maxStage];
+            maxStage = Math.max(...types.map(t => base_1.stages[t] || constants_1.MAX_STAGE + 1));
         }
         const { Token } = require('./src/index');
         const root = debug_1.Shadow.run(() => {
@@ -203,20 +201,29 @@ const Parser = {
             token.type = 'root';
             token.pageName = page;
             try {
-                return token.parse(maxStage, include);
+                token.parse(maxStage, include);
+                PRINT: if (maxStage > constants_1.MAX_STAGE) {
+                    token.buildLists();
+                }
+                return token;
                 /* NOT FOR BROWSER ONLY */
             }
             catch (e) /* c8 ignore start */ {
                 if (e instanceof Error) {
-                    const file = path_1.default.join(__dirname, '..', 'errors', new Date().toISOString()), stage = token.getAttribute('stage');
+                    const file = path_1.default.join(__dirname, '..', 'errors', new Date().toISOString()), stage = token.getAttribute('stage'), isMax = stage === constants_1.MAX_STAGE;
                     for (const k in config) {
                         if (k.startsWith('regex') || config[k] instanceof Set) {
                             delete config[k];
                         }
                     }
-                    fs_1.default.writeFileSync(file, stage === constants_1.MAX_STAGE ? wikitext : token.toString());
+                    fs_1.default.writeFileSync(file, isMax ? wikitext : token.toString());
                     fs_1.default.writeFileSync(`${file}.err`, e.stack);
-                    fs_1.default.writeFileSync(`${file}.json`, JSON.stringify({ stage, include, config, page }, null, '\t'));
+                    fs_1.default.writeFileSync(`${file}.json`, JSON.stringify({
+                        stage: isMax ? maxStage : stage,
+                        include,
+                        config,
+                        page,
+                    }, null, '\t'));
                 }
                 throw e;
             }
@@ -240,7 +247,7 @@ const Parser = {
     lint(wikitext, includeOrPage, configOrInclude, pageOrConfig) {
         LINT: {
             const [include, config, page] = getParams(includeOrPage, configOrInclude, pageOrConfig);
-            return debug_1.Shadow.internal(() => this.parse(wikitext, include, undefined, config, page).lint(), this);
+            return debug_1.Shadow.internal(() => this.parse(wikitext, include, constants_1.MAX_STAGE, config, page).lint(), this);
         }
     },
     /* NOT FOR BROWSER ONLY */
@@ -278,5 +285,4 @@ for (const key in Parser) {
     }
 }
 Object.defineProperties(Parser, def);
-exports.default = Parser;
 module.exports = Parser;

package/dist/internal.d.ts

@@ -55,3 +55,4 @@ export type { CommentLineToken } from './src/nowiki/commentLine';
 export type { TranslateToken } from './src/tagPair/translate';
 export type { TvarToken } from './src/tag/tvar';
 export type { FuncTagToken } from './src/funcTag';
+export type { ListRangeToken } from './src/nowiki/listBase';

package/dist/lib/document.d.ts

@@ -66,8 +66,8 @@ declare abstract class EmbeddedDocument implements TextDocument {
 /** embedded JSON document */
 export declare class EmbeddedJSONDocument extends EmbeddedDocument {
     jsonDoc: JsonLanguageService.JSONDocument;
-    abstract getLineRange(): Range;
-    abstract getEOLCharacters(): string;
+    getLineRange: () => Range;
+    getEOLCharacters: () => string;
     /**
      * @param root root token
      * @param token current token
@@ -77,8 +77,8 @@ export declare class EmbeddedJSONDocument extends EmbeddedDocument {
 /** embedded CSS document */
 export declare class EmbeddedCSSDocument extends EmbeddedDocument {
     styleSheet: CssLanguageService.Stylesheet;
-    abstract getLineRange(): Range;
-    abstract getEOLCharacters(): string;
+    getLineRange: () => Range;
+    getEOLCharacters: () => string;
     /**
      * @param root root token
      * @param token current token

package/dist/lib/lintConfig.js

@@ -123,6 +123,7 @@ const defaultLintRuleConfig = {
             // imageParameter: 2,
             // parameter: 2,
             unknownImageParameter: 1,
+            // indicator: 2,
             // dynamicpagelist: 2,
             // inputbox: 2,
             // seo: 2,

package/dist/lib/lsp.js

@@ -339,6 +339,9 @@ function getStylelintPos(rect, bottom, lineOrCode, columnOrOffset) {
  * @param errors LilyPond errors
  */
 const getLilyPondDiagnostics = (root, token, errors) => {
+    if (!errors) {
+        return [];
+    }
     const { top, left } = root.posFromIndex(token.lastChild.getAbsoluteIndex());
     return errors.map(({ line, col, message }) => {
         const pos = (0, lint_1.getEndPos)(top, left, line, col);
@@ -952,7 +955,7 @@ class LanguageService {
                     try {
                         // eslint-disable-next-line @typescript-eslint/strict-void-return
                         await util_1.default.promisify(child_process_1.execFile)(this.lilypond, ['-dno-print-pages', '-s', '-o', dir, file]);
-                        scores.set(score, []);
+                        scores.set(score, undefined);
                     }
                     catch (e) {
                         const { stderr } = e;
@@ -1393,7 +1396,7 @@ class LanguageService {
             contents: {
                 kind: 'markdown',
                 value: (info.signatures
-                    ? `${info.signatures.map(params => `- **{{ ${f}${params.length === 0 ? '**' : `${colon}** `}${params.map(({ label, const: c }) => c ? label : `*${label}*`).join(' **|** ')} **}}**`).join('\n')}\n\n`
+                    ? `${info.signatures.map(params => `- **{{ ${f}${params.length === 0 ? '**' : `${colon}** `}${params.map(({ label, const: c }) => c ? label : `*${label}*`).join(' **|** ')} **}}**\n`).join('')}\n`
                     : '')
                     + info.description,
             },
@@ -1537,7 +1540,7 @@ class LanguageService {
      * @param diagnostics grammar diagnostics / 语法诊断信息
      */
     provideCodeAction(diagnostics) {
-        const actionable = diagnostics.filter((diagnostic) => diagnostic.data), fixable = actionable.filter(({ source, data }) => source === 'WikiLint' && data.some(({ fix }) => fix)), fixableRules = [...new Set(fixable.map(({ code }) => code))];
+        const actionable = diagnostics.filter((diagnostic) => diagnostic.data), fixable = actionable.filter(({ source, data }) => source === 'WikiLint' && data.some(({ fix }) => fix));
         return [
             ...actionable.flatMap(diagnostic => diagnostic.data.map((data) => ({
                 title: data.title,
@@ -1551,7 +1554,7 @@ class LanguageService {
             ...fixable.length === 0
                 ? []
                 : [
-                    ...fixableRules.map((rule) => ({
+                    ...[...new Set(fixable.map(({ code }) => code))].map((rule) => ({
                         title: `Fix all: ${rule}`,
                         kind: 'source.fixAll',
                         diagnostics: fixable.filter(({ code }) => code === rule),

package/dist/lib/node.d.ts

@@ -11,10 +11,6 @@ export interface Position {
     readonly top: number;
     readonly left: number;
 }
-export interface CaretPosition {
-    readonly offsetNode: AstNodes;
-    readonly offset: number;
-}
 export interface Font {
     bold: boolean;
     italic: boolean;

package/dist/lib/node.js

@@ -250,6 +250,14 @@ let AstNode = (() => {
         getLines() {
             LINT: return (0, common_1.splitLines)(String(this));
         }
+        /** @private */
+        removeInternal() {
+            PRINT: {
+                const { parentNode } = this, i = parentNode?.childNodes.indexOf(this);
+                parentNode?.removeAt(i);
+                return i;
+            }
+        }
     };
     return AstNode = _classThis;
 })();

package/dist/map.d.ts

@@ -1,4 +1,4 @@
-import type { RedirectToken, RedirectTargetToken, OnlyincludeToken, IncludeToken, CommentToken, ExtToken, AttributesToken, AttributeToken, AtomToken, ArgToken, TranscludeToken, SyntaxToken, ParameterToken, HeadingToken, HtmlToken, TableToken, TrToken, TdToken, DoubleUnderscoreToken, HrToken, LinkToken, CategoryToken, FileToken, ImageParameterToken, QuoteToken, ExtLinkToken, MagicLinkToken, ListToken, DdToken, ConverterToken, ConverterFlagsToken, ConverterRuleToken, TranslateToken, TvarToken, HiddenToken, GalleryImageToken, ParamLineToken, ImagemapLinkToken, CharinsertLineToken } from './internal';
+import type { RedirectToken, RedirectTargetToken, OnlyincludeToken, IncludeToken, CommentToken, ExtToken, AttributesToken, AttributeToken, AtomToken, ArgToken, TranscludeToken, SyntaxToken, ParameterToken, HeadingToken, HtmlToken, TableToken, TrToken, TdToken, DoubleUnderscoreToken, HrToken, LinkToken, CategoryToken, FileToken, ImageParameterToken, QuoteToken, ExtLinkToken, MagicLinkToken, ListToken, DdToken, ConverterToken, ConverterFlagsToken, ConverterRuleToken, TranslateToken, TvarToken, HiddenToken, GalleryImageToken, ParamLineToken, ImagemapLinkToken, CharinsertLineToken, ListRangeToken } from './internal';
 export interface TokenTypeMap {
     redirect: RedirectToken;
     'redirect-syntax': SyntaxToken;
@@ -64,5 +64,6 @@ export interface TokenTypeMap {
     'param-line-value': AtomToken;
     'imagemap-link': ImagemapLinkToken;
     'charinsert-line': CharinsertLineToken;
+    'list-range': ListRangeToken;
 }
 export type SelectedTokenTypes = keyof TokenTypeMap;

package/dist/parser/commentAndExt.js

@@ -10,8 +10,7 @@ const ext_1 = require("../src/tagPair/ext");
 const comment_1 = require("../src/nowiki/comment");
 const onlyincludeLeft = '<onlyinclude>', onlyincludeRight = '</onlyinclude>', { length } = onlyincludeLeft, getExtRegex = [false, true].map(includeOnly => {
     const noincludeRegex = includeOnly ? 'includeonly' : '(?:no|only)include', includeRegex = includeOnly ? 'noinclude' : 'includeonly';
-    return (0, common_1.getRegex)(exts => new RegExp(String.raw `<!--.*?(?:-->|$)|<${noincludeRegex}(?:\s[^>]*)?/?>|</${noincludeRegex}\s*>|<(${exts // eslint-disable-next-line unicorn/prefer-string-raw
-    })(\s[^>]*?)?(?:/>|>(.*?)</(${'\\1'}\s*)>)|<(${includeRegex})(\s[^>]*?)?(?:/>|>(.*?)(?:</(${includeRegex}\s*)>|$))`, 'gisu'));
+    return (0, common_1.getRegex)(exts => new RegExp(String.raw `<!--.*?(?:-->|$)|<${noincludeRegex}(?:\s[^>]*)?/?>|</${noincludeRegex}\s*>|<(${exts})(\s[^>]*?)?(?:/>|>(.*?)</(${'\\1'}\s*)>)|<(${includeRegex})(\s[^>]*?)?(?:/>|>(.*?)(?:</(${includeRegex}\s*)>|$))`, 'gisu'));
 });
 /**
  * 更新`<onlyinclude>`和`</onlyinclude>`的位置

package/dist/parser/hrAndDoubleUnderscore.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseHrAndDoubleUnderscore = void 0;
 const cm_util_1 = require("@bhsd/cm-util");
+const debug_1 = require("../util/debug");
 const hr_1 = require("../src/nowiki/hr");
 const doubleUnderscore_1 = require("../src/nowiki/doubleUnderscore");
 const heading_1 = require("../src/heading");
@@ -16,7 +17,7 @@ const parseHrAndDoubleUnderscore = ({ firstChild: { data }, type, name }, config
     config.insensitiveDoubleUnderscore ??= new Set(insensitive.filter(cm_util_1.isUnderscore));
     config.sensitiveDoubleUnderscore ??= new Set(sensitive.filter(cm_util_1.isUnderscore));
     config.regexHrAndDoubleUnderscore ??= new RegExp(String.raw `^((?:\0\d+[cno]\x7F)*)(-{4,})|__(${all.filter(cm_util_1.isUnderscore).join('|')})__|＿{2}(${all.filter(s => !(0, cm_util_1.isUnderscore)(s)).map(s => s.slice(2, -2)).join('|')})＿{2}`, 'gimu');
-    if (type !== 'root' && (type !== 'ext-inner' || name !== 'poem')) {
+    if (type !== 'root' && (type !== 'ext-inner' || !(0, debug_1.isIsolated)(name))) {
         data = `\0${data}`;
     }
     data = data.replace(config.regexHrAndDoubleUnderscore, (m, p1, p2, p3, p4) => {
@@ -41,6 +42,6 @@ const parseHrAndDoubleUnderscore = ({ firstChild: { data }, type, name }, config
             return text;
         });
     }
-    return type === 'root' || type === 'ext-inner' && name === 'poem' ? data : data.slice(1);
+    return type === 'root' || type === 'ext-inner' && (0, debug_1.isIsolated)(name) ? data : data.slice(1);
 };
 exports.parseHrAndDoubleUnderscore = parseHrAndDoubleUnderscore;

package/dist/parser/table.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseTable = void 0;
+const debug_1 = require("../util/debug");
 const index_1 = require("../src/index");
 const index_2 = require("../src/table/index");
 const tr_1 = require("../src/table/tr");
@@ -25,7 +26,7 @@ const pop = (top, stack) => top.is('td') ? stack.pop() : top;
  */
 const parseTable = ({ firstChild: { data }, type, name }, config, accum) => {
     const stack = [], lines = data.split('\n');
-    let out = type === 'root' || type === 'parameter-value' || type === 'ext-inner' && name === 'poem'
+    let out = type === 'root' || type === 'parameter-value' || type === 'ext-inner' && (0, debug_1.isIsolated)(name)
         ? ''
         : `\n${lines.shift()}`, top;
     /**

package/dist/src/arg.d.ts

@@ -6,7 +6,7 @@ import type { Config, LintError } from '../base';
  * argument wrapped in `{{{}}}`
  *
  * `{{{}}}`包裹的参数
- * @classdesc `{childNodes: [AtomToken, ?Token, ...HiddenToken[]]}`
+ * @classdesc `{childNodes: [AtomToken] | [AtomToken, Token, ...HiddenToken[]]}`
  */
 export declare abstract class ArgToken extends Token {
     #private;

package/dist/src/arg.js

@@ -51,7 +51,7 @@ const hidden_1 = require("./hidden");
  * argument wrapped in `{{{}}}`
  *
  * `{{{}}}`包裹的参数
- * @classdesc `{childNodes: [AtomToken, ?Token, ...HiddenToken[]]}`
+ * @classdesc `{childNodes: [AtomToken] | [AtomToken, Token, ...HiddenToken[]]}`
  */
 let ArgToken = (() => {
     let _classDecorators = [noEscape_1.noEscape, (0, padded_1.padded)('{{{'), (0, gapped_1.gapped)()];

package/dist/src/attributes.d.ts

@@ -7,6 +7,7 @@ import type { ExtToken, HtmlToken, SyntaxToken } from '../internal';
 import type { AttributeTypes } from './attribute';
 import type { TableTokens } from './table/index';
 declare type AttributesTypes = `${AttributeTypes}s`;
+declare type Child = AtomToken | AttributeToken;
 /**
  * 将属性类型转换为单属性类型
  * @param type 属性类型
@@ -21,9 +22,9 @@ export declare const toAttributeType: (type: AttributesTypes) => AttributeTypes;
 export declare abstract class AttributesToken extends Token {
     #private;
     readonly name: string;
-    readonly childNodes: readonly (AtomToken | AttributeToken)[];
-    abstract get firstChild(): AtomToken | AttributeToken | undefined;
-    abstract get lastChild(): AtomToken | AttributeToken | undefined;
+    readonly childNodes: readonly Child[];
+    abstract get firstChild(): Child | undefined;
+    abstract get lastChild(): Child | undefined;
     abstract get parentNode(): ExtToken | HtmlToken | TableTokens | undefined;
     abstract get previousSibling(): SyntaxToken | undefined;
     get type(): AttributesTypes;

package/dist/src/converter.d.ts

@@ -6,7 +6,7 @@ import type { Config } from '../base';
  * language conversion
  *
  * 转换
- * @classdesc `{childNodes: [ConverterFlagsToken, ...ConverterRuleToken[]]}`
+ * @classdesc `{childNodes: [ConverterFlagsToken, ConverterRuleToken, ...ConverterRuleToken[]]}`
  */
 export declare abstract class ConverterToken extends Token {
     readonly childNodes: readonly [ConverterFlagsToken, ConverterRuleToken, ...ConverterRuleToken[]];

package/dist/src/converter.js

@@ -45,7 +45,7 @@ const converterRule_1 = require("./converterRule");
  * language conversion
  *
  * 转换
- * @classdesc `{childNodes: [ConverterFlagsToken, ...ConverterRuleToken[]]}`
+ * @classdesc `{childNodes: [ConverterFlagsToken, ConverterRuleToken, ...ConverterRuleToken[]]}`
  */
 let ConverterToken = (() => {
     let _classDecorators = [noEscape_1.noEscape, (0, padded_1.padded)('-{')];

package/dist/src/converterRule.d.ts

@@ -6,7 +6,7 @@ import type { ConverterToken, ConverterFlagsToken } from '../internal';
  * language conversion rule
  *
  * 转换规则
- * @classdesc `{childNodes: [Token?, AtomToken?, Token]}`
+ * @classdesc `{childNodes: [Token] | [Token?, AtomToken, Token]}`
  */
 export declare abstract class ConverterRuleToken extends Token {
     readonly childNodes: readonly [Token] | readonly [AtomToken, Token] | readonly [Token, AtomToken, Token];

package/dist/src/converterRule.js

@@ -60,7 +60,7 @@ const getRuleFromTo = (text, type, config, accum) => {
  * language conversion rule
  *
  * 转换规则
- * @classdesc `{childNodes: [Token?, AtomToken?, Token]}`
+ * @classdesc `{childNodes: [Token] | [Token?, AtomToken, Token]}`
  */
 let ConverterRuleToken = (() => {
     let _classDecorators = [noEscape_1.noEscape];

package/dist/src/extLink.d.ts

@@ -5,7 +5,7 @@ import type { Config, LintError } from '../base';
  * external link
  *
  * 外链
- * @classdesc `{childNodes: [MagicLinkToken, ?Token]}`
+ * @classdesc `{childNodes: [MagicLinkToken, Token?]}`
  */
 export declare abstract class ExtLinkToken extends Token {
     #private;

package/dist/src/extLink.js

@@ -48,7 +48,7 @@ const magicLink_1 = require("./magicLink");
  * external link
  *
  * 外链
- * @classdesc `{childNodes: [MagicLinkToken, ?Token]}`
+ * @classdesc `{childNodes: [MagicLinkToken, Token?]}`
  */
 let ExtLinkToken = (() => {
     let _classDecorators = [(0, padded_1.padded)('[')];

package/dist/src/index.js

@@ -55,7 +55,7 @@ const debug_1 = require("../util/debug");
 const index_1 = __importDefault(require("../index"));
 const element_1 = require("../lib/element");
 const text_1 = require("../lib/text");
-const lintSelectors = ['category', 'html-attr#id,ext-attr#id,table-attr#id'];
+const lintSelectors = ['category', 'html-attr#id,ext-attr#id,table-attr#id', 'ext#indicator'];
 /**
  * base class for all tokens
  *
@@ -302,7 +302,7 @@ class Token extends element_1.AstElement {
         }
         const { parseList } = require('../parser/list');
         const { firstChild, type, name } = this, lines = firstChild.toString().split('\n'), state = { lastPrefix: '' };
-        let i = type === 'root' || type === 'ext-inner' && name === 'poem' ? 0 : 1;
+        let i = type === 'root' || type === 'ext-inner' && (0, debug_1.isIsolated)(name) ? 0 : 1;
         for (; i < lines.length; i++) {
             lines[i] = parseList(lines[i], state, this.#config, this.#accum);
         }
@@ -386,18 +386,24 @@ class Token extends element_1.AstElement {
             const { lintConfig } = index_1.default, { computeEditInfo, fix: needFix, ignoreDisables, configurationComment } = lintConfig;
             let errors = super.lint(start, re);
             if (this.type === 'root') {
-                const record = new Map(), r = 'no-duplicate', s = ['category', 'id'].map(key => lintConfig.getSeverity(r, key)), wikitext = this.toString(), selector = lintSelectors.filter((_, i) => s[i]).join();
-                if (selector) {
+                const r = 'no-duplicate', s = ['category', 'id', 'indicator'].map(key => lintConfig.getSeverity(r, key)), msgs = ['category', 'id', 'name'], wikitext = this.toString();
+                for (let i = 0; i < s.length; i++) {
+                    const severity = s[i];
+                    if (!severity) {
+                        continue;
+                    }
+                    const record = new Map(), selector = lintSelectors[i];
                     for (const cat of this.querySelectorAll(selector)) {
                         let key;
-                        if (cat.is('category')) {
+                        if (i === 0) { // category
                             key = cat.name;
                         }
-                        else {
-                            const value = cat.getValue();
-                            if (value) {
-                                key = `#${value}`;
-                            }
+                        else if (i === 1) { // id
+                            key = cat.getValue().replace(/\s+/gu, '_');
+                        }
+                        else { // indicator
+                            key = cat.getAttr('name')
+                                ?.replace(/\s+/gu, '_');
                         }
                         if (key) {
                             const thisCat = record.get(key);
@@ -410,11 +416,10 @@ class Token extends element_1.AstElement {
                         }
                     }
                     for (const [key, value] of record) {
-                        if (value.size > 1 && !key.startsWith('#mw-customcollapsible-')) {
-                            const isCat = !key.startsWith('#'), msg = `duplicate-${isCat ? 'category' : 'id'}`, severity = s[isCat ? 0 : 1];
+                        if (value.size > 1 && (i !== 1 || !key.startsWith('mw-customcollapsible-'))) {
                             errors.push(...[...value].map(cat => {
-                                const e = (0, lint_1.generateForSelf)(cat, { start: cat.getAbsoluteIndex() }, r, msg, severity);
-                                if (computeEditInfo && isCat) {
+                                const e = (0, lint_1.generateForSelf)(cat, { start: cat.getAbsoluteIndex() }, r, `duplicate-${msgs[i]}`, severity);
+                                if (computeEditInfo && i === 0) {
                                     e.suggestions = [(0, lint_1.fixByRemove)(e)];
                                 }
                                 return e;
@@ -496,5 +501,40 @@ class Token extends element_1.AstElement {
                 }
             });
     }
+    /**
+     * 构建列表
+     * @param recursive 是否递归
+     */
+    #buildLists(recursive) {
+        PRINT: for (let i = 0; i < this.length; i++) {
+            const child = this.childNodes[i];
+            if (child.is('list') || child.is('dd')) {
+                child.getRange();
+            }
+            else if (recursive && child.type !== 'text') {
+                child.#buildLists(true);
+            }
+        }
+    }
+    /** @private */
+    buildLists() {
+        PRINT: this.#buildLists(true);
+    }
+    /** @private */
+    concat(elements) {
+        PRINT: {
+            if (elements.length === 0) {
+                return;
+            }
+            const { childNodes, lastChild } = this, first = elements[0], last = elements.at(-1);
+            for (const element of elements) {
+                element.setAttribute('parentNode', this);
+            }
+            lastChild?.setAttribute('nextSibling', first);
+            first.setAttribute('previousSibling', lastChild);
+            last.setAttribute('nextSibling', undefined);
+            this.setAttribute('childNodes', [...childNodes, ...elements]);
+        }
+    }
 }
 exports.Token = Token;

package/dist/src/link/category.d.ts

@@ -5,7 +5,7 @@ import type { Token, AtomToken } from '../../internal';
  * category
  *
  * 分类
- * @classdesc `{childNodes: [AtomToken, ?Token]}`
+ * @classdesc `{childNodes: [AtomToken, Token?]}`
  */
 export declare abstract class CategoryToken extends LinkBaseToken {
     readonly childNodes: readonly [AtomToken] | readonly [AtomToken, Token];

package/dist/src/link/category.js

@@ -6,7 +6,7 @@ const base_1 = require("./base");
  * category
  *
  * 分类
- * @classdesc `{childNodes: [AtomToken, ?Token]}`
+ * @classdesc `{childNodes: [AtomToken, Token?]}`
  */
 class CategoryToken extends base_1.LinkBaseToken {
     get type() {

package/dist/src/link/index.d.ts

@@ -6,7 +6,7 @@ import type { Token, AtomToken } from '../../internal';
  * internal link
  *
  * 内链
- * @classdesc `{childNodes: [AtomToken, ?Token]}`
+ * @classdesc `{childNodes: [AtomToken, Token?]}`
  */
 export declare abstract class LinkToken extends LinkBaseToken {
     readonly childNodes: readonly [AtomToken] | readonly [AtomToken, Token];

package/dist/src/link/index.js

@@ -12,7 +12,7 @@ const base_1 = require("./base");
  * internal link
  *
  * 内链
- * @classdesc `{childNodes: [AtomToken, ?Token]}`
+ * @classdesc `{childNodes: [AtomToken, Token?]}`
  */
 class LinkToken extends base_1.LinkBaseToken {
     get type() {