wikiparser-node 1.22.1 → 1.24.0

package/dist/src/table/td.js

@@ -228,20 +228,10 @@ let TdToken = (() => {
                             const e = (0, lint_1.generateForChild)(child, rect, rule, 'additional "|" in a table cell', s);
                             if (double) {
                                 const syntax = { caption: '|+', td: '|', th: '!' }[this.subtype];
-                                e.fix = {
-                                    desc: 'newline',
-                                    range: [e.startIndex, e.endIndex],
-                                    text: data.replace(/\|\|/gu, `\n${syntax}`),
-                                };
+                                e.fix = (0, lint_1.fixBy)(e, 'newline', data.replace(/\|\|/gu, `\n${syntax}`));
                             }
                             else {
-                                e.suggestions = [
-                                    {
-                                        desc: 'escape',
-                                        range: [e.startIndex, e.endIndex],
-                                        text: data.replace(/\|/gu, '|'),
-                                    },
-                                ];
+                                e.suggestions = [(0, lint_1.fixByPipe)(e.startIndex, data)];
                             }
                             errors.push(e);
                         }
@@ -263,6 +253,17 @@ let TdToken = (() => {
             key = (0, string_1.trimLc)(key);
             return (key === 'rowspan' || key === 'colspan' ? parseInt(value) || 1 : value);
         }
+        escape() {
+            LSP: { // eslint-disable-line no-unused-labels
+                super.escape();
+                if (this.childNodes[1].toString()) {
+                    this.#innerSyntax ||= '{{!}}';
+                }
+                if (this.#innerSyntax === '|') {
+                    this.#innerSyntax = '{{!}}';
+                }
+            }
+        }
         /** @private */
         print() {
             const { childNodes: [syntax, attr, inner] } = this;
@@ -345,15 +346,6 @@ let TdToken = (() => {
                 this.#innerSyntax = '';
             }
         }
-        escape() {
-            super.escape();
-            if (this.childNodes[1].toString()) {
-                this.#innerSyntax ||= '{{!}}';
-            }
-            if (this.#innerSyntax === '|') {
-                this.#innerSyntax = '{{!}}';
-            }
-        }
         /** @private */
         toHtmlInternal(opt) {
             const { subtype, childNodes: [, attr, inner], nextSibling } = this, notEOL = nextSibling?.toString().startsWith('\n') === false, lf = opt?.nowrap ? ' ' : '\n';

package/dist/src/tagPair/include.js

@@ -104,12 +104,12 @@ let IncludeToken = (() => {
             const errors = [], { firstChild, closed, name } = this, rect = new rect_1.BoundingRect(this, start), rules = ['no-ignored', 'unclosed-comment'], s = rules.map(rule => index_1.default.lintConfig.getSeverity(rule, 'include'));
             if (s[0] && firstChild.data.trim()) {
                 const e = (0, lint_1.generateForChild)(firstChild, rect, rules[0], 'useless attribute', s[0]);
-                e.suggestions = [{ desc: 'remove', range: [e.startIndex, e.endIndex], text: '' }];
+                e.suggestions = [(0, lint_1.fixByRemove)(e)];
                 errors.push(e);
             }
             if (s[1] && !closed) {
                 const e = (0, lint_1.generateForSelf)(this, rect, rules[1], index_1.default.msg('unclosed $1', `<${name}>`), s[1]);
-                e.suggestions = [{ desc: 'close', range: [e.endIndex, e.endIndex], text: `</${name}>` }];
+                e.suggestions = [(0, lint_1.fixByClose)(e.endIndex, `</${name}>`)];
                 errors.push(e);
             }
             return errors;

package/dist/src/tagPair/index.js

@@ -39,11 +39,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TagPairToken = void 0;
 const gapped_1 = require("../../mixin/gapped");
+const noEscape_1 = require("../../mixin/noEscape");
 const index_1 = require("../index");
 /* NOT FOR BROWSER */
 const constants_1 = require("../../util/constants");
 const fixed_1 = require("../../mixin/fixed");
-const noEscape_1 = require("../../mixin/noEscape");
 const index_2 = __importDefault(require("../../index"));
 /* NOT FOR BROWSER END */
 /**
@@ -52,7 +52,7 @@ const index_2 = __importDefault(require("../../index"));
  * 成对标签
  */
 let TagPairToken = (() => {
-    let _classDecorators = [fixed_1.fixedToken, noEscape_1.noEscape, (0, gapped_1.gapped)()];
+    let _classDecorators = [fixed_1.fixedToken, (0, gapped_1.gapped)(), noEscape_1.noEscape];
     let _classDescriptor;
     let _classExtraInitializers = [];
     let _classThis;

package/dist/src/transclude.js

@@ -44,13 +44,13 @@ const debug_1 = require("../util/debug");
 const constants_1 = require("../util/constants");
 const rect_1 = require("../lib/rect");
 const gapped_1 = require("../mixin/gapped");
+const noEscape_1 = require("../mixin/noEscape");
 const index_1 = __importDefault(require("../index"));
 const index_2 = require("./index");
 const parameter_1 = require("./parameter");
 const atom_1 = require("./atom");
 const syntax_1 = require("./syntax");
 /* NOT FOR BROWSER */
-const noEscape_1 = require("../mixin/noEscape");
 const cached_1 = require("../mixin/cached");
 const basicMagicWords = new Map([['=', '='], ['!', '|']]);
 /**
@@ -306,10 +306,11 @@ let TranscludeToken = (() => {
         }
         /** @private */
         toString(skip) {
-            return `{{${this.modifier}${this.type === 'magic-word'
-                ? this.firstChild.toString(skip)
-                    + (this.length === 1 ? '' : this.#colon)
-                    + this.childNodes.slice(1).map(child => child.toString(skip)).join('|')
+            const { childNodes, length, firstChild, modifier, type } = this;
+            return `{{${modifier}${type === 'magic-word'
+                ? firstChild.toString(skip)
+                    + (length === 1 ? '' : this.#colon)
+                    + childNodes.slice(1).map(child => child.toString(skip)).join('|')
                 : super.toString(skip, '|')}}}`;
         }
         /** @private */
@@ -365,14 +366,7 @@ let TranscludeToken = (() => {
                     .findIndex(c => c.type === 'text' && (0, string_1.decodeHtml)(c.data).includes('#')), textNode = child.childNodes[i];
                 if (textNode) {
                     const e = (0, lint_1.generateForChild)(child, rect, rule, 'useless fragment', s);
-                    e.fix = {
-                        desc: 'remove',
-                        range: [
-                            e.startIndex + child.getRelativeIndex(i) + textNode.data.indexOf('#'),
-                            e.endIndex,
-                        ],
-                        text: '',
-                    };
+                    e.suggestions = [(0, lint_1.fixByRemove)(e, child.getRelativeIndex(i) + textNode.data.indexOf('#'))];
                     errors.push(e);
                 }
             }
@@ -390,7 +384,7 @@ let TranscludeToken = (() => {
                 for (const [, args] of duplicatedArgs) {
                     errors.push(...args.map(arg => {
                         const e = (0, lint_1.generateForChild)(arg, rect, rule, msg, s);
-                        e.suggestions = [{ desc: 'remove', range: [e.startIndex - 1, e.endIndex], text: '' }];
+                        e.suggestions = [(0, lint_1.fixByRemove)(e, -1)];
                         return e;
                     }));
                 }
@@ -636,7 +630,7 @@ let TranscludeToken = (() => {
          * @param exact whether to match anonymosity / 是否匹配匿名性
          */
         getArg(key, exact) {
-            return [...this.getArgs(key, exact, false)].sort((a, b) => a.compareDocumentPosition(b)).at(-1);
+            return [...this.getArgs(key, exact, false)].sort((a, b) => b.compareDocumentPosition(a))[0];
         }
         /**
          * Remove parameters with the specified name

package/dist/util/debug.js

@@ -62,6 +62,7 @@ const setChildNodes = (parent, position, deleteCount, inserted = []) => {
     return removed;
 };
 exports.setChildNodes = setChildNodes;
+/* NOT FOR BROWSER ONLY */
 /**
  * 同步混入的类名
  * @param target 混入的目标
@@ -71,6 +72,7 @@ const mixin = (target, source) => {
     Object.defineProperty(target, 'name', { value: source.name });
 };
 exports.mixin = mixin;
+/* NOT FOR BROWSER ONLY END */
 /* NOT FOR BROWSER */
 /**
  * 撤销最近一次Mutation

package/dist/util/lint.js

@@ -3,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.provideValues = exports.cache = exports.generateForSelf = exports.generateForChild = exports.getEndPos = exports.isFostered = void 0;
+exports.provideValues = exports.cache = exports.fixByPipe = exports.fixByEscape = exports.fixBySpace = exports.fixByUpper = exports.fixByComment = exports.fixByOpen = exports.fixByClose = exports.fixByDecode = exports.fixByRemove = exports.fixByInsert = exports.fixBy = exports.generateForSelf = exports.generateForChild = exports.getEndPos = exports.isFostered = void 0;
+const common_1 = require("@bhsd/common");
 const debug_1 = require("./debug");
 const rect_1 = require("../lib/rect");
 const index_1 = __importDefault(require("../index"));
@@ -76,6 +77,92 @@ exports.generateForChild = factory((child, start, line, col) => {
     };
 });
 exports.generateForSelf = factory((_, startIndex, startLine, startCol) => ({ startIndex, startLine, startCol }));
+/**
+ * Quick fix
+ * @param e LintError
+ * @param desc description of the fix
+ * @param text replacement text
+ * @param offset offset to the start index
+ */
+const fixBy = (e, desc, text, offset = 0) => ({ desc, range: [e.startIndex + offset, e.endIndex], text });
+exports.fixBy = fixBy;
+/**
+ * Quick fix: insert the text
+ * @param index the index to insert the text
+ * @param desc description of the fix
+ * @param text inserted text
+ */
+const fixByInsert = (index, desc, text) => ({ desc, range: [index, index], text });
+exports.fixByInsert = fixByInsert;
+/**
+ * Quick fix: remove the error
+ * @param e LintError
+ * @param offset offset to the start index
+ * @param text replacement text
+ */
+const fixByRemove = (e, offset = 0, text = '') => typeof e === 'number' ? { desc: 'remove', range: [e, e + offset], text } : (0, exports.fixBy)(e, 'remove', text, offset);
+exports.fixByRemove = fixByRemove;
+/**
+ * Quick fix: decode the link
+ * @param e LintError
+ * @param link the link to decode
+ */
+const fixByDecode = (e, link) => (0, exports.fixBy)(e, 'decode', (0, common_1.rawurldecode)(link.text().replace(/%(?=21|3[ce]|5[bd]|7[b-d])/giu, '%25')));
+exports.fixByDecode = fixByDecode;
+/**
+ * Quick fix: close the syntax
+ * @param index the index to insert the closing syntax
+ * @param text the closing syntax text
+ * @param offset offset to the start index
+ */
+const fixByClose = (index, text, offset = 0) => ({ desc: 'close', range: [index + offset, index], text });
+exports.fixByClose = fixByClose;
+/**
+ * Quick fix: open the syntax
+ * @param index the index of the tag to open
+ */
+const fixByOpen = (index) => ({ desc: 'open', range: [index + 1, index + 2], text: '' });
+exports.fixByOpen = fixByOpen;
+/**
+ * Quick fix: comment out
+ * @param e LintError
+ * @param text the closing syntax text
+ */
+const fixByComment = (e, text) => (0, exports.fixBy)(e, 'comment', `<!--${text}-->`);
+exports.fixByComment = fixByComment;
+/**
+ * Quick fix: convert to upper case
+ * @param e LintError
+ * @param text the closing syntax text
+ */
+const fixByUpper = (e, text) => (0, exports.fixBy)(e, 'uppercase', text.toUpperCase());
+exports.fixByUpper = fixByUpper;
+/**
+ * Quick fix: insert space
+ * @param index the index to insert the space
+ * @param offset offset to the end index
+ */
+const fixBySpace = (index, offset = 0) => ({ desc: 'whitespace', range: [index, index + offset], text: ' ' });
+exports.fixBySpace = fixBySpace;
+/**
+ * Quick fix: escape the character
+ * @param index the index to escape the character
+ * @param char the escaped character
+ * @param offset offset to the end index
+ */
+const fixByEscape = (index, char, offset = 1) => ({ desc: 'escape', range: [index, index + offset], text: char.repeat(offset) });
+exports.fixByEscape = fixByEscape;
+/**
+ * Quick fix: escape the `|` character
+ * @param index the index to escape the character
+ * @param text the text to be replaced
+ */
+const fixByPipe = (index, text) => ({
+    desc: 'escape',
+    range: [index, index + text.length],
+    text: text.replace(/\|/gu, '&#124;'),
+});
+exports.fixByPipe = fixByPipe;
 /**
  * 缓存计算结果
  * @param store 缓存的值
@@ -84,9 +171,7 @@ exports.generateForSelf = factory((_, startIndex, startLine, startCol) => ({ sta
  * @param force 是否强制缓存
  */
 const cache = (store, compute, update, force) => {
-    if (store
-        /* PRINT ONLY */
-        && (force || index_1.default.viewOnly && store[0] === debug_1.Shadow.rev)) {
+    if (store && (force || index_1.default.viewOnly && store[0] === debug_1.Shadow.rev)) {
         return store[1];
     }
     const result = compute();

package/dist/util/sharable.js

@@ -78,7 +78,7 @@ exports.commonHtmlAttrs = new Set([
     math: empty,
     chem: empty,
     ce: empty,
-    img: new Set(['alt', 'src', 'width', 'height', 'loading']),
+    img: new Set(['alt', 'src', 'width', 'height', 'loading', 'srcset']),
 }))(), exports.extAttrs = (() => ({
     gallery: new Set(['mode', 'showfilename', 'caption', 'perrow', 'widths', 'heights', 'showthumbnails']),
     poem: new Set(['compact']),
@@ -96,7 +96,7 @@ exports.commonHtmlAttrs = new Set([
     nowiki: empty,
     indicator: new Set(['name']),
     langconvert: new Set(['from', 'to']),
-    ref: new Set(['group', 'name', 'extends', 'follow', 'dir']),
+    ref: new Set(['group', 'name', 'follow', 'dir', 'details']),
     references: new Set(['group', 'responsive']),
     charinsert: new Set(['label']),
     choose: new Set(['uncached', 'before', 'after']),

package/dist/util/sharable.mjs

@@ -76,7 +76,7 @@ const commonHtmlAttrs = /* @__PURE__ */ new Set([
   math: empty,
   chem: empty,
   ce: empty,
-  img: /* @__PURE__ */ new Set(["alt", "src", "width", "height", "loading"])
+  img: /* @__PURE__ */ new Set(["alt", "src", "width", "height", "loading", "srcset"])
 }))(), extAttrs = /* @__PURE__ */ (() => ({
   gallery: /* @__PURE__ */ new Set(["mode", "showfilename", "caption", "perrow", "widths", "heights", "showthumbnails"]),
   poem: /* @__PURE__ */ new Set(["compact"]),
@@ -94,7 +94,7 @@ const commonHtmlAttrs = /* @__PURE__ */ new Set([
   nowiki: empty,
   indicator: /* @__PURE__ */ new Set(["name"]),
   langconvert: /* @__PURE__ */ new Set(["from", "to"]),
-  ref: /* @__PURE__ */ new Set(["group", "name", "extends", "follow", "dir"]),
+  ref: /* @__PURE__ */ new Set(["group", "name", "follow", "dir", "details"]),
   references: /* @__PURE__ */ new Set(["group", "responsive"]),
   charinsert: /* @__PURE__ */ new Set(["label"]),
   choose: /* @__PURE__ */ new Set(["uncached", "before", "after"]),

package/dist/util/string.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeCommentLine = exports.newline = exports.sanitizeAlt = exports.sanitizeId = exports.sanitizeAttr = exports.sanitize = exports.normalizeSpace = exports.encode = exports.noWrap = exports.escapeRegExp = exports.print = exports.escape = exports.decodeNumber = exports.decodeHtml = exports.decodeHtmlBasic = exports.text = exports.removeComment = exports.tidy = exports.restore = exports.trimLc = exports.extUrlChar = exports.extUrlCharFirst = exports.zs = exports.rawurldecode = void 0;
-var common_1 = require("@bhsd/common");
-Object.defineProperty(exports, "rawurldecode", { enumerable: true, get: function () { return common_1.rawurldecode; } });
+exports.removeCommentLine = exports.newline = exports.sanitizeAlt = exports.sanitizeId = exports.sanitizeAttr = exports.sanitize = exports.normalizeSpace = exports.encode = exports.noWrap = exports.escapeRegExp = exports.print = exports.escape = exports.decodeNumber = exports.decodeHtml = exports.decodeHtmlBasic = exports.text = exports.removeComment = exports.tidy = exports.trimLc = exports.extUrlChar = exports.extUrlCharFirst = exports.zs = void 0;
+exports.restore = restore;
 exports.zs = String.raw ` \xA0\u1680\u2000-\u200A\u202F\u205F\u3000`;
 const commonExtUrlChar = String.raw `[^[\]<>"\0-\x1F\x7F${exports.zs}\uFFFD]`;
 exports.extUrlCharFirst = String.raw `(?:\[[\da-f:.]+\]|${commonExtUrlChar})`;
@@ -13,13 +12,15 @@ exports.extUrlChar = String.raw `(?:${commonExtUrlChar}|\0\d+[cn!~]\x7F)*`;
  */
 const trimLc = (s) => s.trim().toLowerCase();
 exports.trimLc = trimLc;
-/**
- * 恢复原始字符串
- * @param s 更改后的字符串
- * @param stack 原始字符串片段
- */
-const restore = (s, stack) => s.replace(/\0(\d+)\x7F/gu, (_, p1) => stack[p1]);
-exports.restore = restore;
+function restore(s, stack, translate) {
+    if (translate === 1) {
+        return s.replace(/\0(\d+)g\x7F/gu, (_, p1) => restore(String(stack[p1]), stack, 2));
+    }
+    else if (translate === 2) {
+        return s.replace(/\0(\d+)n\x7F/gu, (_, p1) => String(stack[p1]));
+    }
+    return s.replace(/\0(\d+)\x7F/gu, (_, p1) => stack[p1]);
+}
 /**
  * 生成正则替换函数
  * @param regex 正则表达式

package/extensions/typings.d.ts

@@ -6,6 +6,7 @@ import type {CodeJar} from 'codejar-async';
 import type {
 	ColorInformation,
 	ColorPresentation,
+	CodeAction,
 } from 'vscode-languageserver-types';
 // 必须写在一行内
 import type {Config, ConfigData, LintConfig, LintError, AST, LanguageService} from '../base';
@@ -32,10 +33,11 @@ export type codejar = (textbox: HTMLTextAreaElement, include?: boolean, linenums
 
 export interface LanguageServiceBase extends Omit<
 	LanguageService,
-	'provideDocumentSymbols' | 'provideCodeAction' | 'findStyleTokens'
+	'provideDocumentSymbols' | 'provideCodeAction'
 > {
 	provideDocumentColors(text: string): Promise<ColorInformation[]>;
 	provideColorPresentations(color: ColorInformation): Promise<ColorPresentation[]>;
+	resolveCodeAction(rule?: string): Promise<CodeAction>;
 	findStyleTokens(): Promise<AST[]>;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikiparser-node",
-	"version": "1.22.1",
+	"version": "1.24.0",
 	"description": "A Node.js parser for MediaWiki markup with AST",
 	"keywords": [
 		"mediawiki",
@@ -46,7 +46,6 @@
 	},
 	"scripts": {
 		"toc": "node dist/script/toc.js",
-		"declaration": "grep -rl --include='*.d.ts' '@private' dist/ | xargs bash sed.sh -i -E '/^\\s+\\/\\*\\* @private/,+1d'; grep -rl --include='*.d.ts' '/util/' dist/ | xargs bash sed.sh -i -E '/^import .+\\/util\\//d'; bash sed.sh -i -E 's/abstract (lint|print|text)\\b/\\1/' dist/lib/node.d.ts; node dist/script/declaration.js",
 		"prepublishOnly": "npm run build:core",
 		"build:core": "bash build.sh",
 		"build": "npm run build:core && node dist/script/parserTests.js",
@@ -77,9 +76,9 @@
 		]
 	},
 	"dependencies": {
-		"@bhsd/cm-util": "^0.0.0",
-		"@bhsd/common": "^1.0.0",
-		"@bhsd/stylelint-util": "^0.0.0",
+		"@bhsd/cm-util": "^0.0.1",
+		"@bhsd/common": "^1.0.1",
+		"@bhsd/stylelint-util": "^0.1.0",
 		"vscode-languageserver-types": "^3.17.5"
 	},
 	"optionalDependencies": {
@@ -87,14 +86,14 @@
 		"color-name": "^2.0.0",
 		"entities": "^6.0.0",
 		"mathjax": "^3.2.2",
-		"stylelint": "^16.22.0",
+		"stylelint": "^16.23.1",
 		"vscode-css-languageservice": "^6.3.7",
 		"vscode-html-languageservice": "^5.5.1",
 		"vscode-json-languageservice": "^5.6.1"
 	},
 	"devDependencies": {
-		"@bhsd/code-standard": "^1.0.0",
-		"@bhsd/test-util": "^0.0.0",
+		"@bhsd/code-standard": "^1.0.1",
+		"@bhsd/test-util": "^0.1.0",
 		"@codemirror/lint": "^6.8.5",
 		"@stylistic/eslint-plugin": "^3.1.0",
 		"@types/color-name": "^2.0.0",
@@ -108,7 +107,7 @@
 		"esbuild": "^0.25.5",
 		"eslint": "^8.57.1",
 		"eslint-plugin-eslint-comments": "^3.2.0",
-		"eslint-plugin-jsdoc": "^51.3.3",
+		"eslint-plugin-jsdoc": "^52.0.2",
 		"eslint-plugin-json-es": "^1.6.0",
 		"eslint-plugin-markdown": "5.1.0",
 		"eslint-plugin-n": "^17.20.0",