wikilint 2.9.3 → 2.11.0

package/config/.schema.json

@@ -162,6 +162,11 @@
 				"minItems": 2,
 				"maxItems": 2
 			}
+		},
+		"articlePath": {
+			"description": "base URL of internal links",
+			"type": "string",
+			"pattern": "\\$1"
 		}
 	},
 	"required": [

package/config/enwiki.json

@@ -409,5 +409,6 @@
 	"redirection": [
 		"#redirect"
 	],
-	"variants": []
+	"variants": [],
+	"articlePath": "/wiki/$1"
 }

package/config/llwiki.json

@@ -597,5 +597,6 @@
 		"zh-sg",
 		"zh-my",
 		"zh-mo"
-	]
+	],
+	"articlePath": "/zh/$1"
 }

package/config/moegirl.json

@@ -687,5 +687,6 @@
 		"zh-cn",
 		"zh-tw",
 		"zh-hk"
-	]
+	],
+	"articlePath": "/$1"
 }

package/config/zhwiki.json

@@ -805,5 +805,6 @@
 		"zh-sg",
 		"zh-my",
 		"zh-mo"
-	]
+	],
+	"articlePath": "/wiki/$1"
 }

package/dist/base.d.ts

@@ -11,7 +11,7 @@ export interface Config {
     readonly variants: string[];
     readonly excludes?: string[];
 }
-export type TokenTypes = 'root' | 'plain' | 'redirect' | 'redirect-syntax' | 'redirect-target' | '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' | 'imagemap-link';
+export type TokenTypes = 'root' | 'plain' | 'redirect' | 'redirect-syntax' | 'redirect-target' | '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' | 'list-range' | 'converter' | 'converter-flags' | 'converter-flag' | 'converter-rule' | 'converter-rule-variant' | 'converter-rule-to' | 'converter-rule-from' | 'param-line' | 'imagemap-link';
 export declare const rules: readonly ["bold-header", "format-leakage", "fostered-content", "h1", "illegal-attr", "insecure-style", "invalid-gallery", "invalid-imagemap", "invalid-invoke", "invalid-isbn", "lonely-apos", "lonely-bracket", "lonely-http", "nested-link", "no-arg", "no-duplicate", "no-ignored", "obsolete-attr", "obsolete-tag", "parsing-order", "pipe-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"];
 export declare namespace LintError {
     type Severity = 'error' | 'warning';
@@ -38,8 +38,9 @@ export interface LintError {
 }
 /** 类似Node */
 export interface AstNode {
-    type: string;
     readonly childNodes: readonly AstNode[];
+    /** 节点类型 */
+    type: string;
     /** Linter */
     lint(): LintError[];
 }

package/dist/index.js

@@ -11,8 +11,7 @@ const string_1 = require("./util/string");
  * @param file 文件名
  * @param dir 子路径
  */
-const rootRequire = (file, dir) => require(file.startsWith('/') ? file : `../${file.includes('/') ? '' : dir}${file}`);
-// eslint-disable-next-line @typescript-eslint/no-redeclare
+const rootRequire = (file, dir) => require(path.isAbsolute(file) ? file : path.join('..', file.includes('/') ? '' : dir, file));
 const Parser = {
     config: 'default',
     i18n: undefined,
@@ -20,7 +19,7 @@ const Parser = {
     /** @implements */
     getConfig() {
         if (typeof this.config === 'string') {
-            this.config = rootRequire(this.config, 'config/');
+            this.config = rootRequire(this.config, 'config');
             return this.getConfig();
         }
         return {
@@ -31,7 +30,7 @@ const Parser = {
     /** @implements */
     msg(msg, arg = '') {
         if (typeof this.i18n === 'string') {
-            this.i18n = rootRequire(this.i18n, 'i18n/');
+            this.i18n = rootRequire(this.i18n, 'i18n');
             return this.msg(msg, arg);
         }
         return msg && (this.i18n?.[msg] ?? msg).replace('$1', this.msg(arg));
@@ -39,23 +38,27 @@ const Parser = {
     /** @implements */
     normalizeTitle(title, defaultNs = 0, include, config = Parser.getConfig(), halfParsed, decode = false, selfLink = false) {
         const { Title } = require('./lib/title');
+        let titleObj;
         if (halfParsed) {
-            return new Title(title, defaultNs, config, decode, selfLink);
+            titleObj = new Title(title, defaultNs, config, decode, selfLink);
         }
-        const { Token } = require('./src/index');
-        return debug_1.Shadow.run(() => {
-            const root = new Token(title, config);
-            root.type = 'root';
-            root.parseOnce(0, include).parseOnce();
-            const titleObj = new Title(root.toString(), defaultNs, config, decode, selfLink);
-            for (const key of ['main', 'fragment']) {
-                const str = titleObj[key];
-                if (str?.includes('\0')) {
-                    titleObj[key] = root.buildFromStr(str, constants_1.BuildMethod.Text);
+        else {
+            const { Token } = require('./src/index');
+            titleObj = debug_1.Shadow.run(() => {
+                const root = new Token(title, config);
+                root.type = 'root';
+                root.parseOnce(0, include).parseOnce();
+                const t = new Title(root.toString(), defaultNs, config, decode, selfLink);
+                for (const key of ['main', 'fragment']) {
+                    const str = t[key];
+                    if (str?.includes('\0')) {
+                        t[key] = root.buildFromStr(str, constants_1.BuildMethod.Text);
+                    }
                 }
-            }
-            return titleObj;
-        });
+                return t;
+            });
+        }
+        return titleObj;
     },
     /** @implements */
     parse(wikitext, include, maxStage = constants_1.MAX_STAGE, config = Parser.getConfig()) {

package/dist/lib/element.js

@@ -158,8 +158,8 @@ class AstElement extends node_1.AstNode {
         return data;
     }
     /** @private */
-    toString(separator = '') {
-        return this.childNodes.map(String).join(separator);
+    toString(skip, separator = '') {
+        return this.childNodes.map(child => child.toString(skip)).join(separator);
     }
     /** @private */
     lint(start = this.getAbsoluteIndex(), re) {

package/dist/lib/node.d.ts

@@ -18,9 +18,9 @@ export declare abstract class AstNode implements AstNodeBase {
     #private;
     data?: string | undefined;
     readonly childNodes: readonly AstNodes[];
-    /** 节点类型 */
     abstract get type(): TokenTypes | 'text';
     abstract set type(value: TokenTypes | 'text');
+    /** 可见部分 */
     text(): string;
     lint(): LintError[];
     /** 首位子节点 */
@@ -51,4 +51,9 @@ export declare abstract class AstNode implements AstNodeBase {
     getRelativeIndex(j?: number): number;
     /** 获取当前节点的绝对位置 */
     getAbsoluteIndex(): number;
+    /**
+     * 是否是某种类型的节点
+     * @param type 节点类型
+     */
+    is<T extends Token>(type: string): this is T;
 }

package/dist/lib/node.js

@@ -114,5 +114,12 @@ class AstNode {
             configurable: true,
         });
     }
+    /**
+     * 是否是某种类型的节点
+     * @param type 节点类型
+     */
+    is(type) {
+        return this.type === type;
+    }
 }
 exports.AstNode = AstNode;

package/dist/lib/text.d.ts

@@ -8,8 +8,6 @@ export declare class AstText extends AstNode {
     get type(): 'text';
     /** @param text 包含文本 */
     constructor(text: string);
-    /** 可见部分 */
-    text(): string;
     /**
      * 替换字符串
      * @param text 替换的字符串

package/dist/lib/text.js

@@ -60,15 +60,18 @@ class AstText extends node_1.AstNode {
         });
     }
     /** @private */
-    toString() {
-        return this.data;
+    toString(skip) {
+        return skip && !this.parentNode?.getAttribute('built') ? (0, string_1.removeComment)(this.data) : this.data;
     }
-    /** 可见部分 */
+    /** @private */
     text() {
         return this.data;
     }
     /** @private */
     lint(start = this.getAbsoluteIndex(), errorRegex) {
+        if (errorRegex === false) {
+            return [];
+        }
         const { data, parentNode, nextSibling, previousSibling } = this;
         if (!parentNode) {
             throw new Error('An isolated text node cannot be linted!');
@@ -108,9 +111,7 @@ class AstText extends node_1.AstNode {
                 || char === '['
                     && type === 'ext-link-text'
                     && (/&(?:rbrack|#93|#x5[Dd];);/u.test(data.slice(index + 1))
-                        || nextType === 'ext'
-                            && nextName === 'nowiki'
-                            && nextSibling.innerText?.includes(']'))) {
+                        || nextSibling?.is('ext') && nextName === 'nowiki' && nextSibling.innerText?.includes(']'))) {
                 continue;
             }
             else if (char === ']' && (index || length > 1)) {
@@ -191,10 +192,7 @@ class AstText extends node_1.AstNode {
             }
             else if (char === ']' && previousType === 'free-ext-link' && severity === 'error') {
                 const i = start - previousSibling.toString().length;
-                e.fix = {
-                    range: [i, i],
-                    text: '[',
-                };
+                e.fix = { range: [i, i], text: '[' };
             }
             errors.push(e);
         }

package/dist/lib/title.js

@@ -2,11 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Title = void 0;
 const string_1 = require("../util/string");
-/**
- * PHP的`rawurldecode`函数的JavaScript实现
- * @param str 要解码的字符串
- */
-const rawurldecode = (str) => decodeURIComponent(str.replace(/%(?![\da-f]{2})/giu, '%25'));
 /** MediaWiki页面标题对象 */
 class Title {
     #main;
@@ -56,12 +51,12 @@ class Title {
         if (decode && title.includes('%')) {
             try {
                 const encoded = /%(?!21|3[ce]|5[bd]|7[b-d])[\da-f]{2}/iu.test(title);
-                title = rawurldecode(title);
+                title = (0, string_1.rawurldecode)(title);
                 this.encoded = encoded;
             }
             catch { }
         }
-        title = title.replace(/_/gu, ' ').trim();
+        title = title.replace(/[_ ]+/gu, ' ').trim();
         if (subpage) {
             this.ns = 0;
         }
@@ -73,7 +68,7 @@ class Title {
             }
             const m = title.split(':');
             if (m.length > 1) {
-                const id = config.nsid[m[0].trim().toLowerCase()];
+                const k = m[0].trim().toLowerCase(), id = Object.prototype.hasOwnProperty.call(config.nsid, k) && config.nsid[k];
                 if (id) {
                     ns = id;
                     title = m.slice(1).join(':').trim();
@@ -86,7 +81,7 @@ class Title {
             let fragment = title.slice(i + 1).trimEnd();
             if (fragment.includes('%')) {
                 try {
-                    fragment = rawurldecode(fragment);
+                    fragment = (0, string_1.rawurldecode)(fragment);
                 }
                 catch { }
             }

package/dist/mixin/hidden.d.ts

@@ -1,6 +1,7 @@
 /**
  * 解析后不可见的类
  * @param linter 是否覆写 lint 方法
+ * @param html 是否覆写 toHtml 方法
  * @param constructor 基类
  * @param _ context
  */

package/dist/mixin/hidden.js

@@ -5,17 +5,17 @@ const debug_1 = require("../util/debug");
 /**
  * 解析后不可见的类
  * @param linter 是否覆写 lint 方法
+ * @param html 是否覆写 toHtml 方法
  * @param constructor 基类
  * @param _ context
  */
-const hiddenToken = (linter) => (constructor, _) => {
+const hiddenToken = (linter = true, html = true) => (constructor, _) => {
     /** 解析后不可见的类 */
     class AnyHiddenToken extends constructor {
         /** 没有可见部分 */
         text() {
             return '';
         }
-        /** @private */
         lint(start) {
             // @ts-expect-error private argument
             return linter ? [] : super.lint(start);

package/dist/parser/list.js

@@ -1,23 +1,40 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseList = void 0;
+const html_1 = require("../util/html");
 const list_1 = require("../src/nowiki/list");
 const dd_1 = require("../src/nowiki/dd");
 /**
  * 解析列表
  * @param wikitext
+ * @param state
+ * @param state.lastPrefix 上一个列表的前缀
  * @param config
  * @param accum
  */
-const parseList = (wikitext, config, accum) => {
-    const mt = /^((?:\0\d+c\x7F)*)([;:*#]+)/u.exec(wikitext);
+const parseList = (wikitext, state, config, accum) => {
+    const mt = /^((?:\0\d+c\x7F)*)([;:*#]+\s*)/u.exec(wikitext);
     if (!mt) {
+        state.lastPrefix = '';
         return wikitext;
     }
-    const [total, comment, prefix] = mt;
-    let text = `${comment}\0${accum.length}d\x7F${wikitext.slice(total.length)}`, dt = prefix.split(';').length - 1;
-    // @ts-expect-error abstract class
-    new list_1.ListToken(prefix, config, accum);
+    const [total, comment, prefix] = mt, prefix2 = prefix.replace(/;/gu, ':'), commonPrefixLength = (0, html_1.getCommon)(prefix2, state.lastPrefix), parts = (commonPrefixLength > 1 ? prefix.slice(commonPrefixLength - 1) : prefix).split(/(?=;)/u), isDt = parts[0].startsWith(';');
+    let dt = parts.length - (isDt ? 0 : 1);
+    if (commonPrefixLength > 1) {
+        const commonPrefix = prefix.slice(0, commonPrefixLength - 1);
+        if (isDt) {
+            parts.unshift(commonPrefix);
+        }
+        else {
+            parts[0] = commonPrefix + parts[0];
+        }
+    }
+    state.lastPrefix = prefix2;
+    let text = comment + parts.map((_, i) => `\0${accum.length + i}d\x7F`).join('') + wikitext.slice(total.length);
+    for (const part of parts) {
+        // @ts-expect-error abstract class
+        new list_1.ListToken(part, config, accum);
+    }
     if (!dt) {
         return text;
     }

package/dist/parser/magicLinks.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseMagicLinks = void 0;
 const string_1 = require("../util/string");
 const magicLink_1 = require("../src/magicLink");
-const sepRegex = /[^,;\\.:!?)][,;\\.:!?)]+$/u, sepLparRegex = /[^,;\\.:!?][,;\\.:!?]+$/u;
 /**
  * 解析自由外链
  * @param wikitext
@@ -21,7 +20,7 @@ const parseMagicLinks = (wikitext, config, accum) => {
                 trail = url.slice(m2.index);
                 url = url.slice(0, m2.index);
             }
-            const sep = url.includes('(') ? sepLparRegex : sepRegex, sepChars = sep.exec(url);
+            const sep = url.includes('(') ? /[^,;\\.:!?][,;\\.:!?]+$/u : /[^,;\\.:!?)][,;\\.:!?)]+$/u, sepChars = sep.exec(url);
             if (sepChars) {
                 let correction = 1;
                 if (sepChars[0][1] === ';'

package/dist/parser/table.js

@@ -67,8 +67,8 @@ const parseTable = ({ firstChild: { data }, type, name }, config, accum) => {
             out += `\n${outLine}`;
             continue;
         }
-        // eslint-disable-next-line @stylistic/operator-linebreak
-        const matches = /^(?:(\|\}|\0\d+!\x7F\}|\0\d+\}\x7F)|(\|-+|\0\d+!\x7F-+|\0\d+-\x7F-*)(?!-)|(!|(?:\||\0\d+!\x7F)\+?))(.*)$/u
+        const matches = // eslint-disable-line @stylistic/operator-linebreak
+         /^(?:(\|\}|\0\d+!\x7F\}|\0\d+\}\x7F)|(\|-+|\0\d+!\x7F-+|\0\d+-\x7F-*)(?!-)|(!|(?:\||\0\d+!\x7F)\+?))(.*)$/u
             .exec(line);
         if (!matches) {
             push(`\n${outLine}`, top);

package/dist/src/arg.js

@@ -41,8 +41,8 @@ class ArgToken extends index_2.Token {
         }
     }
     /** @private */
-    toString() {
-        return `{{{${super.toString('|')}}}}`;
+    toString(skip) {
+        return `{{{${super.toString(skip, '|')}}}}`;
     }
     /** @private */
     text() {
@@ -62,10 +62,7 @@ class ArgToken extends index_2.Token {
         if (!this.getAttribute('include')) {
             const e = (0, lint_1.generateForSelf)(this, { start }, 'no-arg', 'unexpected template argument');
             if (argDefault) {
-                e.fix = {
-                    range: [start, e.endIndex],
-                    text: argDefault.text(),
-                };
+                e.fix = { range: [start, e.endIndex], text: argDefault.text() };
             }
             return [e];
         }

package/dist/src/attribute.js

@@ -60,7 +60,6 @@ const commonHtmlAttrs = new Set([
     img: new Set(['alt', 'src', 'width', 'height', 'srcset']),
     font: new Set(['size', 'color', 'face']),
     hr: widthAttrs,
-    rt: new Set(['rbspan']),
     data: new Set(['value']),
     time: new Set(['datetime']),
     meta: new Set(['itemprop', 'content']),
@@ -194,23 +193,15 @@ class AttributeToken extends index_2.Token {
      * @param quotes 引号
      */
     constructor(type, tag, key, equal = '', value, quotes = [], config = index_1.default.getConfig(), accum = []) {
-        const keyToken = new atom_1.AtomToken(key, 'attr-key', config, accum, {});
+        const keyToken = new atom_1.AtomToken(key, 'attr-key', config, accum);
         let valueToken;
         if (key === 'title' || tag === 'img' && key === 'alt') {
             valueToken = new index_2.Token(value, config, accum, {});
             valueToken.type = 'attr-value';
             valueToken.setAttribute('stage', constants_1.MAX_STAGE - 1);
         }
-        else if (tag === 'gallery' && key === 'caption') {
-            const newConfig = {
-                ...config,
-                excludes: [...config.excludes, 'quote', 'extLink', 'magicLink', 'list'],
-            };
-            valueToken = new index_2.Token(value, newConfig, accum, {});
-            valueToken.type = 'attr-value';
-            valueToken.setAttribute('stage', 5);
-        }
-        else if (tag === 'choose' && (key === 'before' || key === 'after')) {
+        else if (tag === 'gallery' && key === 'caption'
+            || tag === 'choose' && (key === 'before' || key === 'after')) {
             const newConfig = {
                 ...config,
                 excludes: [...config.excludes, 'heading', 'html', 'table', 'hr', 'list'],
@@ -238,13 +229,13 @@ class AttributeToken extends index_2.Token {
         if (this.parentNode) {
             this.#tag = this.parentNode.name;
         }
-        this.setAttribute('name', this.firstChild.text().trim().toLowerCase());
+        this.setAttribute('name', this.firstChild.toString(true).trim().toLowerCase());
         super.afterBuild();
     }
     /** @private */
-    toString() {
+    toString(skip) {
         const [quoteStart = '', quoteEnd = ''] = this.#quotes;
-        return this.#equal ? super.toString(this.#equal + quoteStart) + quoteEnd : this.firstChild.toString();
+        return this.#equal ? super.toString(skip, this.#equal + quoteStart) + quoteEnd : this.firstChild.toString(skip);
     }
     /** @private */
     text() {
@@ -261,10 +252,7 @@ class AttributeToken extends index_2.Token {
             const e = (0, lint_1.generateForChild)(lastChild, rect, 'unclosed-quote', index_1.default.msg('unclosed $1', 'quotes'), 'warning');
             e.startIndex--;
             e.startCol--;
-            const fix = {
-                range: [e.endIndex, e.endIndex],
-                text: this.#quotes[0],
-            };
+            const fix = { range: [e.endIndex, e.endIndex], text: this.#quotes[0] };
             if (lastChild.childNodes.some(({ type: t, data }) => t === 'text' && /\s/u.test(data))) {
                 e.suggestions = [
                     {
@@ -292,7 +280,7 @@ class AttributeToken extends index_2.Token {
         else if (name === 'style' && typeof value === 'string' && insecureStyle.test(value)) {
             errors.push((0, lint_1.generateForChild)(lastChild, rect, 'insecure-style', 'insecure style'));
         }
-        else if (name === 'tabindex' && typeof value === 'string' && value.trim() !== '0') {
+        else if (name === 'tabindex' && typeof value === 'string' && value !== '0') {
             const e = (0, lint_1.generateForChild)(lastChild, rect, 'illegal-attr', 'nonzero tabindex');
             e.suggestions = [
                 {
@@ -312,14 +300,7 @@ class AttributeToken extends index_2.Token {
     }
     /** 获取属性值 */
     getValue() {
-        if (this.#equal) {
-            const value = this.lastChild.text();
-            if (this.#quotes[1]) {
-                return value;
-            }
-            return value[this.#quotes[0] ? 'trimEnd' : 'trim']();
-        }
-        return this.type === 'ext-attr' || '';
+        return this.#equal ? this.lastChild.text().trim() : this.type === 'ext-attr' || '';
     }
 }
 exports.AttributeToken = AttributeToken;

package/dist/src/attributes.js

@@ -8,7 +8,6 @@ const index_1 = require("../index");
 const index_2 = require("./index");
 const atom_1 = require("./atom");
 const attribute_1 = require("./attribute");
-const regex = /([^\s/](?:(?!\0\d+~\x7F)[^\s/=])*)(?:((?:\s(?:\s|\0\d+c\x7F)*)?(?:=|\0\d+~\x7F)(?:\s|\0\d+c\x7F)*)(?:(["'])(.*?)(\3|$)|(\S*)))?/gsu;
 /**
  * 将属性类型转换为单属性类型
  * @param type 属性类型
@@ -38,7 +37,7 @@ class AttributesToken extends index_2.Token {
         this.#type = type;
         this.setAttribute('name', name);
         if (attr) {
-            regex.lastIndex = 0;
+            const regex = /([^\s/](?:(?!\0\d+~\x7F)[^\s/=])*)(?:((?:\s(?:\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) {
@@ -123,7 +122,7 @@ class AttributesToken extends index_2.Token {
                     duplicated.add(name);
                     attrs.get(name).push(attr);
                 }
-                else if (name !== 'class') {
+                else {
                     attrs.set(name, [attr]);
                 }
             }

package/dist/src/converter.d.ts

@@ -7,7 +7,7 @@ import { ConverterRuleToken } from './converterRule';
  * @classdesc `{childNodes: [ConverterFlagsToken, ...ConverterRuleToken]}`
  */
 export declare abstract class ConverterToken extends Token {
-    readonly childNodes: readonly [ConverterFlagsToken, ...ConverterRuleToken[]];
+    readonly childNodes: readonly [ConverterFlagsToken, ConverterRuleToken, ...ConverterRuleToken[]];
     abstract get firstChild(): ConverterFlagsToken;
     abstract get lastChild(): ConverterFlagsToken | ConverterRuleToken;
     get type(): 'converter';

package/dist/src/converter.js

@@ -25,7 +25,8 @@ class ConverterToken extends index_2.Token {
         const [firstRule] = rules, hasColon = firstRule.includes(':'), 
         // @ts-expect-error abstract class
         firstRuleToken = new converterRule_1.ConverterRuleToken(firstRule, hasColon, config, accum);
-        if (hasColon && firstRuleToken.length === 1) {
+        if (hasColon && firstRuleToken.length === 1
+            || !hasColon && rules.length === 2 && !(0, string_1.removeComment)(rules[1]).trim()) {
             // @ts-expect-error abstract class
             this.insertAt(new converterRule_1.ConverterRuleToken(rules.join(';'), false, config, accum));
         }
@@ -36,9 +37,9 @@ class ConverterToken extends index_2.Token {
         }
     }
     /** @private */
-    toString() {
+    toString(skip) {
         const { childNodes: [flags, ...rules] } = this;
-        return `-{${flags.toString()}${flags.length > 0 ? '|' : ''}${rules.map(String).join(';')}}-`;
+        return `-{${flags.toString(skip)}${flags.length > 0 ? '|' : ''}${rules.map(rule => rule.toString(skip)).join(';')}}-`;
     }
     /** @private */
     text() {

package/dist/src/converterFlags.js

@@ -27,8 +27,8 @@ class ConverterFlagsToken extends index_2.Token {
         super.afterBuild();
     }
     /** @private */
-    toString() {
-        return super.toString(';');
+    toString(skip) {
+        return super.toString(skip, ';');
     }
     /** @private */
     text() {
@@ -62,16 +62,13 @@ class ConverterFlagsToken extends index_2.Token {
                 && (variantFlags.size > 0 || !validFlags.has(flag))) {
                 const e = (0, lint_1.generateForChild)(child, rect, 'no-ignored', 'invalid conversion flag');
                 if (variantFlags.size === 0 && definedFlags.has(flag.toUpperCase())) {
-                    e.fix = {
-                        range: [e.startIndex, e.endIndex],
-                        text: flag.toUpperCase(),
-                    };
+                    e.fix = { range: [e.startIndex, e.endIndex], text: flag.toUpperCase() };
                 }
                 else {
                     e.suggestions = [
                         {
                             desc: 'remove',
-                            range: [e.startIndex, e.endIndex],
+                            range: [e.startIndex - (i && 1), e.endIndex],
                             text: '',
                         },
                     ];

package/dist/src/converterRule.js

@@ -31,22 +31,18 @@ class ConverterRuleToken extends index_2.Token {
         }
     }
     /** @private */
-    toString() {
-        const { childNodes } = this;
-        if (childNodes.length === 3) {
-            const [from, variant, to] = childNodes;
-            return `${from.toString()}=>${variant.toString()}:${to.toString()}`;
-        }
-        return super.toString(':');
+    toString(skip) {
+        const { childNodes, firstChild, lastChild } = this;
+        return childNodes.length === 3
+            ? `${firstChild.toString(skip)}=>${childNodes[1].toString(skip)}:${lastChild.toString(skip)}`
+            : super.toString(skip, ':');
     }
     /** @private */
     text() {
-        const { childNodes } = this;
-        if (childNodes.length === 3) {
-            const [from, variant, to] = childNodes;
-            return `${from.text()}=>${variant.text()}:${to.text()}`;
-        }
-        return super.text(':');
+        const { childNodes, firstChild, lastChild } = this;
+        return childNodes.length === 3
+            ? `${firstChild.text()}=>${childNodes[1].text()}:${lastChild.text()}`
+            : super.text(':');
     }
     /** @private */
     getGaps(i) {