wikilint 2.48.2 → 3.1.0

package/dist/src/singleLine/charinsertLine.d.ts

@@ -6,7 +6,7 @@ import type { Token, CharinsertToken, AstText } from '../../internal';
  * lines in `<charinsert>`
  *
  * `<charinsert>` 的行
- * @classdesc `{childNodes: (AstText | ExtToken)[]}`
+ * @classdesc `{childNodes: (AstText|ExtToken)[]}`
  */
 export declare abstract class CharinsertLineToken extends SingleLineToken {
     readonly childNodes: readonly (AstText | ExtToken)[];

package/dist/src/singleLine/charinsertLine.js

@@ -14,7 +14,7 @@ const ext_1 = require("../tagPair/ext");
  * lines in `<charinsert>`
  *
  * `<charinsert>` 的行
- * @classdesc `{childNodes: (AstText | ExtToken)[]}`
+ * @classdesc `{childNodes: (AstText|ExtToken)[]}`
  */
 class CharinsertLineToken extends index_2.SingleLineToken {
     get type() {

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

@@ -6,13 +6,13 @@ import type { TableCoords } from './trBase';
 export type TableTokens = TableToken | TrToken | TdToken;
 /** @extends {Array<TableCoords[]>} */
 export declare class Layout extends Array<TableCoords[]> {
-    abstract static from(arr: TableCoords[][]): Layout;
+    static from: (arr: TableCoords[][]) => Layout;
 }
 /**
  * table
  *
  * 表格
- * @classdesc `{childNodes: [SyntaxToken, AttributesToken, ?Token, ...TdToken[], ...TrToken[], ?SyntaxToken]}`
+ * @classdesc `{childNodes: [SyntaxToken, AttributesToken, ...TdToken[], ...TrToken[], SyntaxToken?]}`
  */
 export declare abstract class TableToken extends TrBaseToken {
     readonly childNodes: readonly [SyntaxToken, AttributesToken, ...(TdToken | TrToken)[], SyntaxToken] | readonly [SyntaxToken, AttributesToken, ...(TdToken | TrToken)[]];

package/dist/src/table/index.js

@@ -53,7 +53,7 @@ exports.Layout = Layout;
  * table
  *
  * 表格
- * @classdesc `{childNodes: [SyntaxToken, AttributesToken, ?Token, ...TdToken[], ...TrToken[], ?SyntaxToken]}`
+ * @classdesc `{childNodes: [SyntaxToken, AttributesToken, ...TdToken[], ...TrToken[], SyntaxToken?]}`
  */
 let TableToken = (() => {
     let _classSuper = trBase_1.TrBaseToken;

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

@@ -5,7 +5,7 @@ import type { Token, TdToken, TableToken, SyntaxToken, AttributesToken } from '.
  * table row that contains the newline at the beginning but not at the end
  *
  * 表格行，含开头的换行，不含结尾的换行
- * @classdesc `{childNodes: [SyntaxToken, AttributesToken, ?Token, ...TdToken[]]}`
+ * @classdesc `{childNodes: [SyntaxToken, AttributesToken, ...TdToken[]]}`
  */
 export declare abstract class TrToken extends TrBaseToken {
     readonly childNodes: readonly [SyntaxToken, AttributesToken, ...TdToken[]];

package/dist/src/table/tr.js

@@ -6,7 +6,7 @@ const trBase_1 = require("./trBase");
  * table row that contains the newline at the beginning but not at the end
  *
  * 表格行，含开头的换行，不含结尾的换行
- * @classdesc `{childNodes: [SyntaxToken, AttributesToken, ?Token, ...TdToken[]]}`
+ * @classdesc `{childNodes: [SyntaxToken, AttributesToken, ...TdToken[]]}`
  */
 class TrToken extends trBase_1.TrBaseToken {
     get type() {

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

@@ -1,17 +1,18 @@
 import { Token } from '../index';
 import type { Config } from '../../base';
 import type { AttributesToken, SyntaxToken } from '../../internal';
+declare type Child = AttributesToken | SyntaxToken;
 /**
  * HTML tag
  *
  * HTML标签
- * @classdesc `{childNodes: [AttributesToken]}`
+ * @classdesc `{childNodes: [AttributesToken|SyntaxToken]}`
  */
 export declare abstract class TagToken extends Token {
     #private;
-    readonly childNodes: readonly [AttributesToken | SyntaxToken];
-    abstract get firstChild(): AttributesToken | SyntaxToken;
-    abstract get lastChild(): AttributesToken | SyntaxToken;
+    readonly childNodes: readonly [Child];
+    abstract get firstChild(): Child;
+    abstract get lastChild(): Child;
     abstract get type(): 'html' | 'tvar';
     abstract get selfClosing(): boolean | undefined;
     /** whether to be a closing tag / 是否是闭合标签 */
@@ -21,7 +22,7 @@ export declare abstract class TagToken extends Token {
      * @param attr 标签属性
      * @param closing 是否闭合
      */
-    constructor(tag: string, attr: AttributesToken | SyntaxToken, closing: boolean, config?: Config, accum?: Token[]);
+    constructor(tag: string, attr: Child, closing: boolean, config?: Config, accum?: Token[]);
     /**
      * Find the matching tag
      *
@@ -29,3 +30,4 @@ export declare abstract class TagToken extends Token {
      */
     findMatchingTag(): this | undefined;
 }
+export {};

package/dist/src/tag/index.js

@@ -8,7 +8,7 @@ const index_1 = require("../index");
  * HTML tag
  *
  * HTML标签
- * @classdesc `{childNodes: [AttributesToken]}`
+ * @classdesc `{childNodes: [AttributesToken|SyntaxToken]}`
  */
 class TagToken extends index_1.Token {
     #closing;
@@ -47,7 +47,6 @@ class TagToken extends index_1.Token {
     findMatchingTag() {
         LINT: return (0, lint_1.cache)(this.#match, () => {
             const { type, name, closing, selfClosing, } = this;
-            // eslint-disable-next-line prefer-const
             let { parentNode } = this, isVoid = false, isFlexible = false;
             if (type === 'html') {
                 const [, flexibleTags, voidTags] = this.getAttribute('config').html;
@@ -63,9 +62,15 @@ class TagToken extends index_1.Token {
             }
             const { childNodes } = parentNode, i = childNodes.indexOf(this), siblings = closing ? childNodes.slice(0, i) : childNodes.slice(i + 1).reverse(), stack = [this], { rev } = debug_1.Shadow;
             let cur = siblings.pop(), until;
-            while (cur) {
-                // eslint-disable-next-line no-empty, @typescript-eslint/no-unnecessary-condition
+            while (cur || parentNode.is('list-range') && parentNode.parentNode) {
                 if (!cur) {
+                    const parent = parentNode.parentNode, ch = parent.childNodes, j = ch.indexOf(parentNode);
+                    Array.prototype.push.apply(siblings, closing ? ch.slice(0, j) : ch.slice(j + 1).reverse());
+                    parentNode = parent;
+                }
+                else if (cur.is('list-range')) {
+                    const ch = cur.childNodes;
+                    Array.prototype.push.apply(siblings, closing ? ch : [...ch].reverse());
                 }
                 else if (until) {
                     if (cur === until) {

package/dist/src/tagPair/ext.js

@@ -223,7 +223,7 @@ let ExtToken = (() => {
             LINT: {
                 const refName = this.getAttr('name'), text = this.innerText?.trim();
                 let msg = '';
-                if (this.closest('ext#references')) {
+                if (this.closest('ext-inner#references')) {
                     if (!refName) {
                         msg = 'no-named-in-references';
                     }

package/dist/src/transclude.d.ts

@@ -8,7 +8,7 @@ export declare const invalidTemplateMsg = "Invalid template name";
  * template or magic word
  *
  * 模板或魔术字
- * @classdesc `{childNodes: [AtomToken|SyntaxToken, ...AtomToken[], ...ParameterToken[]]}`
+ * @classdesc `{childNodes: [AtomToken|SyntaxToken, ...ParameterToken[]]}`
  */
 export declare abstract class TranscludeToken extends Token {
     #private;

package/dist/src/transclude.js

@@ -55,7 +55,7 @@ const sortArgs = /** @ignore */ ({ childNodes }, args) => [...args].sort((a, b)
  * template or magic word
  *
  * 模板或魔术字
- * @classdesc `{childNodes: [AtomToken|SyntaxToken, ...AtomToken[], ...ParameterToken[]]}`
+ * @classdesc `{childNodes: [AtomToken|SyntaxToken, ...ParameterToken[]]}`
  */
 let TranscludeToken = (() => {
     let _classDecorators = [noEscape_1.noEscape, (0, gapped_1.gapped)()];

package/dist/util/debug.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mixin = exports.emptyArray = exports.getMagicWordInfo = exports.setChildNodes = exports.isLink = exports.isRowEnd = exports.Shadow = void 0;
+exports.mixin = exports.emptyArray = exports.getMagicWordInfo = exports.setChildNodes = exports.isLink = exports.isRowEnd = exports.isIsolated = exports.Shadow = void 0;
 exports.isToken = isToken;
 exports.Shadow = {
     running: false,
@@ -37,6 +37,12 @@ exports.Shadow = {
 function isToken(type) {
     return (node) => node.type === type;
 }
+/**
+ * 扩展节点是否提供独立解析环境
+ * @param name 扩展节点名称
+ */
+const isIsolated = (name) => name === 'poem' || name === 'indicator';
+exports.isIsolated = isIsolated;
 /**
  * 是否是行尾
  * @param token 节点

package/i18n/en.json

@@ -17,6 +17,7 @@
 	"duplicate-ext-parameter": "duplicate parameter of <$1>",
 	"duplicate-id": "duplicate HTML id",
 	"duplicate-image-parameter": "duplicate image $1 parameter",
+	"duplicate-name": "duplicate name of <indicator>",
 	"duplicate-parameter": "duplicate template parameter",
 	"encode": null,
 	"escape": null,

package/i18n/zh-hans.json

@@ -17,6 +17,7 @@
 	"duplicate-ext-parameter": "重复的<$1>参数",
 	"duplicate-id": "重复的HTML id属性",
 	"duplicate-image-parameter": "重复的图像$1参数",
+	"duplicate-name": "重复的<indicator> name属性",
 	"duplicate-parameter": "重复的模板参数",
 	"encode": "编码",
 	"escape": "转义",

package/i18n/zh-hant.json

@@ -17,6 +17,7 @@
 	"duplicate-ext-parameter": "重複的<$1>參數",
 	"duplicate-id": "重複的HTML id屬性",
 	"duplicate-image-parameter": "重複的圖片$1參數",
+	"duplicate-name": "重複的<indicator> name屬性",
 	"duplicate-parameter": "重複的模板參數",
 	"encode": "編碼",
 	"escape": "跳脫",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikilint",
-	"version": "2.48.2",
+	"version": "3.1.0",
 	"description": "A Node.js linter for MediaWiki markup",
 	"keywords": [
 		"mediawiki",
@@ -125,6 +125,6 @@
 		"vscode-languageserver-textdocument": "^1.0.16"
 	},
 	"engines": {
-		"node": "^20.19.0 || ^22.13.0 || >=24.11.0"
+		"node": "^22.13.0 || >=24.11.0"
 	}
 }