wikiparser-node 1.16.1 → 1.16.2

package/dist/util/debug.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.undo = exports.compare = exports.typeError = exports.mixin = exports.emptyArray = exports.setChildNodes = exports.isToken = exports.Shadow = void 0;
+exports.undo = exports.typeError = exports.mixin = exports.setChildNodes = exports.isToken = exports.Shadow = void 0;
+/* NOT FOR BROWSER END */
 exports.Shadow = {
     running: false,
     /** @private */
@@ -37,12 +38,21 @@ exports.isToken = isToken;
  * @param inserted 插入的子节点
  */
 const setChildNodes = (parent, position, deleteCount, inserted = []) => {
-    const childNodes = [...parent.childNodes], removed = childNodes.splice(position, deleteCount, ...inserted);
-    parent.setAttribute('childNodes', childNodes);
-    for (const node of inserted) {
+    const Parser = require('../index');
+    const { childNodes } = parent, nodes = Object.isFrozen(childNodes)
+        || !Parser.viewOnly
+        ? [...childNodes]
+        : childNodes, removed = nodes.splice(position, deleteCount, ...inserted);
+    for (let i = 0; i < inserted.length; i++) {
+        const node = inserted[i];
         node.setAttribute('parentNode', parent);
+        node.setAttribute('nextSibling', nodes[position + i + 1]);
+        node.setAttribute('previousSibling', nodes[position + i - 1]);
     }
+    nodes[position - 1]?.setAttribute('nextSibling', nodes[position]);
+    nodes[position + inserted.length]?.setAttribute('previousSibling', nodes[position + inserted.length - 1]);
     /* NOT FOR BROWSER */
+    parent.setAttribute('childNodes', nodes);
     for (const node of removed) {
         node.setAttribute('parentNode', undefined);
     }
@@ -50,13 +60,6 @@ const setChildNodes = (parent, position, deleteCount, inserted = []) => {
     return removed;
 };
 exports.setChildNodes = setChildNodes;
-/**
- * 生成一个指定长度的空数组
- * @param n 数组长度
- * @param callback 回调函数
- */
-const emptyArray = (n, callback) => new Array(n).fill(undefined).map((_, i) => callback(i));
-exports.emptyArray = emptyArray;
 /**
  * 同步混入的类名
  * @param target 混入的目标
@@ -79,13 +82,6 @@ const typeError = ({ name }, method, ...args) => {
 };
 exports.typeError = typeError;
 /* NOT FOR BROWSER */
-/**
- * 比较两个数
- * @param a
- * @param b
- */
-const compare = (a, b) => a - b;
-exports.compare = compare;
 /**
  * 撤销最近一次Mutation
  * @param e 事件

package/dist/util/html.js

@@ -1,6 +1,8 @@
 "use strict";
+/* NOT FOR BROWSER */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.font = exports.html = exports.getCommon = void 0;
+/* NOT FOR BROWSER END */
 /**
  * get common prefix length
  * @param prefix

package/dist/util/lint.js

@@ -1,16 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateForSelf = exports.generateForChild = exports.getEndPos = void 0;
+exports.cache = exports.generateForSelf = exports.generateForChild = exports.getEndPos = void 0;
+const debug_1 = require("./debug");
 const rect_1 = require("../lib/rect");
 const index_1 = require("../index");
 /**
  * 计算结束位置
  * @param top 起始行
  * @param left 起始列
- * @param width 宽度
  * @param height 高度
+ * @param width 宽度
  */
-const getEndPos = (top, left, width, height) => ({
+const getEndPos = (top, left, height, width) => ({
     line: top + height - 1,
     character: (height === 1 ? left : 0) + width,
 });
@@ -20,7 +21,7 @@ exports.getEndPos = getEndPos;
  * @param func lint函数
  */
 const factory = (func) => (token, rect, rule, msg, severity = 'error') => {
-    const { start } = rect, { top, left } = rect instanceof rect_1.BoundingRect ? rect : new rect_1.BoundingRect(token, start), { offsetHeight, offsetWidth } = token, { startIndex, startLine, startCol } = func(token, start, top, left), { line, character } = (0, exports.getEndPos)(startLine, startCol, offsetWidth, offsetHeight);
+    const { start } = rect, { top, left } = rect instanceof rect_1.BoundingRect ? rect : new rect_1.BoundingRect(token, start), { offsetHeight, offsetWidth } = token, { startIndex, startLine, startCol } = func(token, start, top, left), { line, character } = (0, exports.getEndPos)(startLine, startCol, offsetHeight, offsetWidth);
     return {
         rule,
         message: index_1.default.msg(msg),
@@ -42,3 +43,22 @@ exports.generateForChild = factory((child, start, line, col) => {
     };
 });
 exports.generateForSelf = factory((_, startIndex, startLine, startCol) => ({ startIndex, startLine, startCol }));
+/**
+ * 缓存计算结果
+ * @param store 缓存的值
+ * @param compute 计算新值的函数
+ * @param update 更新缓存的函数
+ */
+const cache = (store, compute, update) => {
+    if (store
+        && store[0] === debug_1.Shadow.rev
+        && index_1.default.viewOnly) {
+        return store[1];
+    }
+    const result = compute();
+    if (index_1.default.viewOnly) {
+        update([debug_1.Shadow.rev, result]);
+    }
+    return result;
+};
+exports.cache = cache;

package/dist/util/string.js

@@ -36,11 +36,15 @@ const decodeHtmlBasic = factory(/&(?:#(\d+|[Xx][\da-fA-F]+)|([lg]t|[LG]T|[lr]bra
  * decode HTML entities
  * @param str
  */
-const decodeHtml = (str) => 
-// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-typeof process === 'object' && typeof process.versions?.node === 'string'
-    ? require('entities').decodeHTMLStrict(str).replace(/\xA0/gu, ' ')
-    : /* istanbul ignore next */ decodeHtmlBasic(str);
+const decodeHtml = (str) => {
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+    if (typeof process === 'object' && typeof process.versions?.node === 'string') {
+        const { decodeHTMLStrict } = require('entities');
+        return decodeHTMLStrict(str).replace(/\xA0/gu, ' ');
+    }
+    /* istanbul ignore next */
+    return decodeHtmlBasic(str);
+};
 exports.decodeHtml = decodeHtml;
 /** decode numbered HTML entities */
 exports.decodeNumber = factory(/&#(\d+|x[\da-f]+);/giu, (_, code) => String.fromCodePoint(Number((/^x/iu.test(code) ? '0' : '') + code)));

package/extensions/es7/base.js

@@ -9,14 +9,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var _a;
-const version = '1.16.1', src = (_a = document.currentScript) === null || _a === void 0 ? void 0 : _a.src, file = /\/extensions\/dist\/base\.(?:min\.)?js$/u, CDN = src && file.test(src)
+const version = '1.16.2', src = (_a = document.currentScript) === null || _a === void 0 ? void 0 : _a.src, file = /\/extensions\/dist\/base\.(?:min\.)?js$/u, CDN = src && file.test(src)
     ? src.replace(file, '')
     : `https://testingcf.jsdelivr.net/npm/wikiparser-node@${version}`;
 const workerJS = () => {
     importScripts('$CDN/bundle/bundle.es7.js');
     const entities = { '&': 'amp', '<': 'lt', '>': 'gt' }, lsps = new Map();
-    const getLSP = (qid) => {
-        const id = Math.floor(qid);
+    const getLSP = (qid, signature) => {
+        let id = Math.floor(qid);
+        if (signature) {
+            id += 0.5;
+        }
         if (lsps.has(id)) {
             return lsps.get(id);
         }
@@ -76,10 +79,13 @@ const workerJS = () => {
                 break;
             case 'destroy':
                 getLSP(qid).destroy();
+                getLSP(qid, true).destroy();
                 lsps.delete(qid);
+                lsps.delete(qid + 0.5);
                 break;
             case 'data':
                 getLSP(qid).data = wikitext;
+                getLSP(qid, true).data = wikitext;
                 break;
             case 'colorPresentations':
                 postMessage([qid, getLSP(qid).provideColorPresentations(wikitext)]);
@@ -101,7 +107,7 @@ const workerJS = () => {
                 break;
             case 'diagnostics':
                 (() => __awaiter(void 0, void 0, void 0, function* () {
-                    postMessage([qid, yield getLSP(qid).provideDiagnostics(wikitext), wikitext]);
+                    postMessage([qid, yield getLSP(qid).provideDiagnostics(wikitext, include), wikitext]);
                 }))();
                 break;
             case 'completionItems':
@@ -133,6 +139,16 @@ const workerJS = () => {
                 (() => __awaiter(void 0, void 0, void 0, function* () {
                     postMessage([qid, yield getLSP(qid).provideHover(wikitext, include), wikitext]);
                 }))();
+                break;
+            case 'signatureHelp':
+                (() => __awaiter(void 0, void 0, void 0, function* () {
+                    postMessage([qid, yield getLSP(qid, true).provideSignatureHelp(wikitext, include), wikitext]);
+                }))();
+                break;
+            case 'inlayHints':
+                (() => __awaiter(void 0, void 0, void 0, function* () {
+                    postMessage([qid, yield getLSP(qid).provideInlayHints(wikitext), wikitext]);
+                }))();
         }
     };
 };
@@ -152,6 +168,7 @@ const setI18N = (i18n) => {
 };
 const setConfig = (config) => {
     worker.postMessage(['setConfig', config]);
+    wikiparse.config = config;
 };
 const getFeedback = (command, qid, strict, raw, ...args) => new Promise(resolve => {
     worker.addEventListener('message', getListener(qid, resolve, strict ? raw : undefined));
@@ -264,6 +281,7 @@ const wikiparse = {
     version,
     CDN,
     id: 0,
+    config: {},
     setI18N,
     setConfig,
     getConfig,

package/extensions/es7/lint.js

@@ -19,21 +19,28 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _Linter_instances, _Linter_id, _Linter_wikitext, _Linter_running, _Linter_lint;
+var _Linter_instances, _Linter_id, _Linter_wikitext, _Linter_running, _Linter_done, _Linter_config, _Linter_lint;
 class Linter {
     constructor(include) {
         _Linter_instances.add(this);
         _Linter_id.set(this, void 0);
         _Linter_wikitext.set(this, void 0);
         _Linter_running.set(this, void 0);
+        _Linter_done.set(this, void 0);
+        _Linter_config.set(this, void 0);
         __classPrivateFieldSet(this, _Linter_id, wikiparse.id++, "f");
         this.include = Boolean(include);
     }
     queue(wikitext) {
-        var _a;
-        __classPrivateFieldSet(this, _Linter_wikitext, wikitext, "f");
-        __classPrivateFieldSet(this, _Linter_running, (_a = __classPrivateFieldGet(this, _Linter_running, "f")) !== null && _a !== void 0 ? _a : __classPrivateFieldGet(this, _Linter_instances, "m", _Linter_lint).call(this, wikitext), "f");
-        return __classPrivateFieldGet(this, _Linter_running, "f");
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            if (__classPrivateFieldGet(this, _Linter_wikitext, "f") === wikitext && __classPrivateFieldGet(this, _Linter_config, "f") === wikiparse.config && !__classPrivateFieldGet(this, _Linter_running, "f")) {
+                return __classPrivateFieldGet(this, _Linter_done, "f");
+            }
+            __classPrivateFieldSet(this, _Linter_wikitext, wikitext, "f");
+            __classPrivateFieldSet(this, _Linter_running, (_a = __classPrivateFieldGet(this, _Linter_running, "f")) !== null && _a !== void 0 ? _a : __classPrivateFieldGet(this, _Linter_instances, "m", _Linter_lint).call(this, wikitext), "f");
+            return __classPrivateFieldGet(this, _Linter_running, "f");
+        });
     }
     codemirror(wikitext) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -43,7 +50,6 @@ class Linter {
                 from: startIndex,
                 to: endIndex,
                 severity,
-                rule,
                 message: `${message} (${rule})`,
                 actions: [
                     ...fix ? [{ name: `Fix: ${fix.desc}`, fix }] : [],
@@ -59,24 +65,27 @@ class Linter {
     }
     monaco(wikitext) {
         return __awaiter(this, void 0, void 0, function* () {
-            return (yield this.queue(wikitext)).map(({ startLine, startCol, endLine, endCol, severity, message, rule }) => ({
-                source: `WikiLint(${rule})`,
+            return (yield this.queue(wikitext))
+                .map(({ startLine, startCol, endLine, endCol, severity, message, rule }) => ({
+                source: `WikiLint`,
                 startLineNumber: startLine + 1,
                 startColumn: startCol + 1,
                 endLineNumber: endLine + 1,
                 endColumn: endCol + 1,
                 severity: severity === 'error' ? 8 : 4,
-                rule,
+                code: rule,
                 message,
             }));
         });
     }
 }
-_Linter_id = new WeakMap(), _Linter_wikitext = new WeakMap(), _Linter_running = new WeakMap(), _Linter_instances = new WeakSet(), _Linter_lint = function _Linter_lint(wikitext) {
+_Linter_id = new WeakMap(), _Linter_wikitext = new WeakMap(), _Linter_running = new WeakMap(), _Linter_done = new WeakMap(), _Linter_config = new WeakMap(), _Linter_instances = new WeakSet(), _Linter_lint = function _Linter_lint(wikitext) {
     return __awaiter(this, void 0, void 0, function* () {
+        __classPrivateFieldSet(this, _Linter_config, wikiparse.config, "f");
         const { include } = this, errors = yield wikiparse.lint(wikitext, include, __classPrivateFieldGet(this, _Linter_id, "f"));
-        if (this.include === include && __classPrivateFieldGet(this, _Linter_wikitext, "f") === wikitext) {
+        if (this.include === include && __classPrivateFieldGet(this, _Linter_wikitext, "f") === wikitext && __classPrivateFieldGet(this, _Linter_config, "f") === wikiparse.config) {
             __classPrivateFieldSet(this, _Linter_running, undefined, "f");
+            __classPrivateFieldSet(this, _Linter_done, errors, "f");
             return errors;
         }
         __classPrivateFieldSet(this, _Linter_running, __classPrivateFieldGet(this, _Linter_instances, "m", _Linter_lint).call(this, __classPrivateFieldGet(this, _Linter_wikitext, "f")), "f");

package/extensions/typings.d.ts

@@ -37,8 +37,7 @@ export interface LanguageServiceBase extends Omit<LanguageService, 'provideDocum
 export interface wikiparse {
 	version: string;
 	CDN: string;
-	id: number;
-	setI18N: (i18n: Record<string, string>) => void;
+	setI18N: (i18n?: Record<string, string>) => void;
 	setConfig: (config: Config) => void;
 	getConfig: () => Promise<Config>;
 	json: (wikitext: string, include: boolean, qid?: number, stage?: number) => Promise<AST>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikiparser-node",
-	"version": "1.16.1",
+	"version": "1.16.2",
 	"description": "A Node.js parser for MediaWiki markup with AST",
 	"keywords": [
 		"mediawiki",
@@ -14,8 +14,6 @@
 	"license": "GPL-3.0",
 	"author": "Bhsd",
 	"files": [
-		"/errors/README",
-		"/printed/README",
 		"/bundle/bundle.*.js",
 		"/extensions/typings.d.ts",
 		"/extensions/*/*.js",
@@ -26,6 +24,8 @@
 		"!/extensions/test-page.css",
 		"!/extensions/dist/compare.js",
 		"!/extensions/compare.css",
+		"/printed/README",
+		"/errors/README",
 		"/config/",
 		"/data/",
 		"/i18n/",
@@ -82,6 +82,7 @@
 	"devDependencies": {
 		"@stylistic/eslint-plugin": "^3.1.0",
 		"@stylistic/stylelint-plugin": "^3.1.2",
+		"@types/color-rgba": "^2.1.3",
 		"@types/mocha": "^10.0.10",
 		"@types/node": "^22.13.1",
 		"@typescript-eslint/eslint-plugin": "^8.23.0",