wikiparser-node 1.0.1-b → 1.0.3-b

package/extensions/dist/base.js

@@ -1,11 +1,10 @@
 (() => {
     const MAX_STAGE = 11;
-    /** web worker */
     const workerJS = () => {
-        self.importScripts('https://fastly.jsdelivr.net/gh/bhsd-harry/wikiparser-node@1.0.1-b/bundle/bundle.min.js');
+        self.importScripts('https://fastly.jsdelivr.net/gh/bhsd-harry/wikiparser-node@1.0.3-b/bundle/bundle.min.js');
         const { Parser } = self, entities = { '&': 'amp', '<': 'lt', '>': 'gt' };
-        /** @implements */
         self.onmessage = ({ data }) => {
+            var _a;
             const [command, qid, ...args] = data;
             switch (command) {
                 case 'setI18N':
@@ -20,9 +19,8 @@
                 case 'lint':
                     self.postMessage([qid, Parser.parse(...args).lint(), args[0]]);
                     break;
-                // case 'print':
                 default: {
-                    const stage = args[2] === undefined ? MAX_STAGE : args[2];
+                    const stage = (_a = args[2]) !== null && _a !== void 0 ? _a : MAX_STAGE;
                     self.postMessage([
                         qid,
                         Parser.parse(...args).childNodes.map(child => [
@@ -39,18 +37,7 @@
     };
     const blob = new Blob([`(${String(workerJS).replace(/MAX_STAGE/gu, String(MAX_STAGE))})()`], { type: 'text/javascript' }), url = URL.createObjectURL(blob), worker = new Worker(url);
     URL.revokeObjectURL(url);
-    /**
-     * 生成事件监听函数
-     * @param qid 输入id
-     * @param resolve Promise对象的resolve函数
-     * @param raw 原始文本
-     */
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const getListener = (qid, resolve, raw) => {
-        /**
-         * 事件监听函数
-         * @param {{data: [number, unknown, string]}} e 消息事件
-         */
         const listener = ({ data: [rid, res, resRaw] }) => {
             if (rid === qid && (raw === undefined || raw === resRaw)) {
                 worker.removeEventListener('message', listener);
@@ -59,42 +46,20 @@
         };
         return listener;
     };
-    /**
-     * 更新I18N消息
-     * @param i18n I18N消息
-     */
     const setI18N = (i18n) => {
         worker.postMessage(['setI18N', i18n]);
     };
-    /**
-     * 更新解析设置
-     * @param config 设置
-     */
     const setConfig = (config) => {
         worker.postMessage(['setConfig', config]);
     };
-    /** 获取Parser.minConfig */
     const getConfig = () => new Promise(resolve => {
         worker.addEventListener('message', getListener(-3, resolve));
         worker.postMessage(['getConfig', -3]);
     });
-    /**
-     * 将解析改为异步执行
-     * @param wikitext wikitext
-     * @param include 是否嵌入
-     * @param stage 解析层级
-     * @param qid Printer编号
-     */
     const print = (wikitext, include, stage, qid = -1) => new Promise(resolve => {
         worker.addEventListener('message', getListener(qid, resolve));
         worker.postMessage(['print', qid, wikitext, include, stage]);
     });
-    /**
-     * 将语法分析改为异步执行
-     * @param wikitext wikitext
-     * @param include 是否嵌入
-     * @param qid Linter编号，暂时固定为`-2`
-     */
     const lint = (wikitext, include, qid = -2) => new Promise(resolve => {
         worker.addEventListener('message', getListener(qid, resolve, wikitext));
         worker.postMessage(['lint', qid, wikitext, include]);

package/extensions/dist/editor.js

@@ -7,87 +7,74 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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 _Printer_instances, _Printer_id, _Printer_preview, _Printer_textbox, _Printer_root, _Printer_viewportChanged, _Printer_tick, _Printer_paint;
     const { wikiparse } = window, { MAX_STAGE } = wikiparse;
-    /** 用于打印AST */
     class Printer {
-        /* eslint-enable es-x/no-class-fields */
-        /**
-         * @param preview 置于下层的代码高亮
-         * @param textbox 置于上层的文本框
-         * @param include 是否嵌入
-         */
         constructor(preview, textbox, include) {
-            this.id = wikiparse.id++;
+            _Printer_instances.add(this);
+            _Printer_id.set(this, void 0);
+            _Printer_preview.set(this, void 0);
+            _Printer_textbox.set(this, void 0);
+            _Printer_root.set(this, void 0);
+            _Printer_viewportChanged.set(this, void 0);
+            __classPrivateFieldSet(this, _Printer_id, wikiparse.id++, "f");
+            __classPrivateFieldSet(this, _Printer_preview, preview, "f");
+            __classPrivateFieldSet(this, _Printer_textbox, textbox, "f");
+            __classPrivateFieldSet(this, _Printer_root, [], "f");
+            __classPrivateFieldSet(this, _Printer_viewportChanged, false, "f");
             this.include = Boolean(include);
-            this.preview = preview;
-            this.textbox = textbox;
-            this.root = [];
             this.running = undefined;
-            this.viewportChanged = false;
             this.ticks = [0, undefined];
         }
-        /** 倒计时 */
-        tick() {
-            setTimeout(() => {
-                const { ticks } = this;
-                if (ticks[0] > 0) {
-                    ticks[0] -= 500;
-                    this[ticks[0] <= 0 ? ticks[1] : 'tick']();
-                }
-            }, 500);
-        }
-        /**
-         * 用于debounce
-         * @param delay 延迟
-         * @param method 方法
-         */
         queue(delay, method) {
             const { ticks } = this, [state] = ticks;
             if (state <= 0 || method === 'coarsePrint' || ticks[1] !== 'coarsePrint') {
                 ticks[0] = delay;
                 ticks[1] = method;
                 if (state <= 0) {
-                    this.tick();
+                    __classPrivateFieldGet(this, _Printer_instances, "m", _Printer_tick).call(this);
                 }
             }
         }
-        /** 渲染 */
-        paint() {
-            this.preview.innerHTML = `<span class="wpb-root">${this.root.map(([, , printed]) => printed).join('')}</span> `;
-            this.preview.scrollTop = this.textbox.scrollTop;
-            this.preview.classList.remove('active');
-            this.textbox.style.color = 'transparent';
-        }
-        /** 初步解析 */
         coarsePrint() {
             return __awaiter(this, void 0, void 0, function* () {
                 if (this.running) {
                     return undefined;
                 }
-                const { include, textbox: { value } } = this, parsed = yield wikiparse.print(value, include, 2, this.id);
-                if (this.include !== include || this.textbox.value !== value) {
+                const { include } = this, { value } = __classPrivateFieldGet(this, _Printer_textbox, "f"), parsed = yield wikiparse.print(value, include, 2, __classPrivateFieldGet(this, _Printer_id, "f"));
+                if (this.include !== include || __classPrivateFieldGet(this, _Printer_textbox, "f").value !== value) {
                     this.running = undefined;
                     this.running = this.coarsePrint();
                     return this.running;
                 }
-                this.root = parsed;
-                this.paint();
+                __classPrivateFieldSet(this, _Printer_root, parsed, "f");
+                __classPrivateFieldGet(this, _Printer_instances, "m", _Printer_paint).call(this);
                 this.running = undefined;
                 this.running = this.finePrint();
                 return this.running;
             });
         }
-        /** 根据可见范围精细解析 */
         finePrint() {
             return __awaiter(this, void 0, void 0, function* () {
                 if (this.running) {
-                    this.viewportChanged = true;
+                    __classPrivateFieldSet(this, _Printer_viewportChanged, true, "f");
                     return undefined;
                 }
-                this.viewportChanged = false;
-                const { root, preview: { scrollHeight, offsetHeight: parentHeight, scrollTop, children: [rootNode] }, include, textbox: { value }, } = this;
-                let text = value, start = 0, { length: end } = root;
+                __classPrivateFieldSet(this, _Printer_viewportChanged, false, "f");
+                const { include } = this, { value } = __classPrivateFieldGet(this, _Printer_textbox, "f"), { scrollHeight, offsetHeight: parentHeight, scrollTop, children: [rootNode] } = __classPrivateFieldGet(this, _Printer_preview, "f");
+                let text = value, start = 0, { length: end } = __classPrivateFieldGet(this, _Printer_root, "f");
                 if (scrollHeight > parentHeight) {
                     const childNodes = [...rootNode.childNodes], headings = childNodes.filter(({ className }) => className === 'wpb-heading'), { length } = headings;
                     if (length > 0) {
@@ -96,26 +83,26 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                         let j = headings.slice(i).findIndex(({ offsetTop }) => offsetTop >= scrollTop + parentHeight);
                         j = j === -1 ? length : i + j;
                         start = i ? childNodes.indexOf(headings[i - 1]) : 0;
-                        while (i <= j && root[start][0] === MAX_STAGE) {
+                        while (i <= j && __classPrivateFieldGet(this, _Printer_root, "f")[start][0] === MAX_STAGE) {
                             start = childNodes.indexOf(headings[i++]);
                         }
                         end = j === length ? end : childNodes.indexOf(headings[j]);
-                        while (i <= j && root[end - 1][0] === MAX_STAGE) {
+                        while (i <= j && __classPrivateFieldGet(this, _Printer_root, "f")[end - 1][0] === MAX_STAGE) {
                             end = childNodes.indexOf(headings[--j]);
                         }
-                        text = root.slice(start, end).map(([, str]) => str).join('');
+                        text = __classPrivateFieldGet(this, _Printer_root, "f").slice(start, end).map(([, str]) => str).join('');
                     }
                 }
                 if (start === end) {
                     this.running = undefined;
                     return undefined;
                 }
-                const parsed = yield wikiparse.print(text, include, MAX_STAGE, this.id);
-                if (this.include === include && this.textbox.value === value) {
-                    this.root.splice(start, end - start, ...parsed);
-                    this.paint();
+                const parsed = yield wikiparse.print(text, include, MAX_STAGE, __classPrivateFieldGet(this, _Printer_id, "f"));
+                if (this.include === include && __classPrivateFieldGet(this, _Printer_textbox, "f").value === value) {
+                    __classPrivateFieldGet(this, _Printer_root, "f").splice(start, end - start, ...parsed);
+                    __classPrivateFieldGet(this, _Printer_instances, "m", _Printer_paint).call(this);
                     this.running = undefined;
-                    if (this.viewportChanged) {
+                    if (__classPrivateFieldGet(this, _Printer_viewportChanged, "f")) {
                         this.running = this.finePrint();
                     }
                 }
@@ -127,12 +114,25 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
             });
         }
     }
-    /**
-     * 高亮textarea
-     * @param textbox textarea元素
-     * @param include 是否嵌入
-     * @throws `TypeError` 不是textarea
-     */
+    _Printer_id = new WeakMap(), _Printer_preview = new WeakMap(), _Printer_textbox = new WeakMap(), _Printer_root = new WeakMap(), _Printer_viewportChanged = new WeakMap(), _Printer_instances = new WeakSet(), _Printer_tick = function _Printer_tick() {
+        setTimeout(() => {
+            const { ticks } = this, [t, method] = ticks;
+            if (t > 0) {
+                ticks[0] -= 500;
+                if (t <= 500) {
+                    this[method]();
+                }
+                else {
+                    __classPrivateFieldGet(this, _Printer_instances, "m", _Printer_tick).call(this);
+                }
+            }
+        }, 500);
+    }, _Printer_paint = function _Printer_paint() {
+        __classPrivateFieldGet(this, _Printer_preview, "f").innerHTML = `<span class="wpb-root">${__classPrivateFieldGet(this, _Printer_root, "f").map(([, , printed]) => printed).join('')}</span> `;
+        __classPrivateFieldGet(this, _Printer_preview, "f").scrollTop = __classPrivateFieldGet(this, _Printer_textbox, "f").scrollTop;
+        __classPrivateFieldGet(this, _Printer_preview, "f").classList.remove('active');
+        __classPrivateFieldGet(this, _Printer_textbox, "f").style.color = 'transparent';
+    };
     const edit = (textbox, include) => {
         if (!(textbox instanceof HTMLTextAreaElement)) {
             throw new TypeError('wikiparse.edit方法仅可用于textarea元素！');

package/extensions/dist/highlight.js

@@ -9,12 +9,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 (() => {
     const { wikiparse } = window;
-    /**
-     * 高亮代码块
-     * @param ele 代码块
-     * @param linenums 是否添加行号
-     * @param start 起始行号
-     */
     const highlight = (ele, linenums, start = 1) => __awaiter(void 0, void 0, void 0, function* () {
         if (ele.classList.contains('highlighted')) {
             return;
@@ -22,7 +16,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         const html = (yield wikiparse.print(ele.innerText)).map(([, , printed]) => printed).join('');
         ele.classList.add('highlighted');
         if (linenums) {
-            // 添加行号。这里不使用<table>排版，而是使用<ol>
             const lines = html.split('\n').map((line, i) => {
                 const li = document.createElement('li');
                 li.id = `L${i + start}`;
@@ -34,7 +27,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
             }
             const ol = document.createElement('ol');
             ol.start = start;
-            ol.style.paddingLeft = `${(lines.length + start - 1).toString().length + 2.5}ch`;
+            ol.style.paddingLeft = `${String(lines.length + start - 1).length + 2.5}ch`;
             ol.append(...lines);
             ele.replaceChildren(ol);
         }

package/extensions/dist/lint.js

@@ -7,37 +7,42 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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;
     const { wikiparse } = window;
-    /** 用于语法分析 */
     class Linter {
-        /* eslint-enable es-x/no-class-fields */
-        /** @param include 是否嵌入 */
         constructor(include) {
-            this.id = wikiparse.id++;
+            _Linter_instances.add(this);
+            _Linter_id.set(this, void 0);
+            _Linter_wikitext.set(this, void 0);
+            _Linter_running.set(this, void 0);
+            __classPrivateFieldSet(this, _Linter_id, wikiparse.id++, "f");
+            __classPrivateFieldSet(this, _Linter_wikitext, undefined, "f");
+            __classPrivateFieldSet(this, _Linter_running, undefined, "f");
             this.include = Boolean(include);
-            this.wikitext = undefined;
-            this.running = undefined;
         }
-        /**
-         * 提交语法分析
-         * @param wikitext 待分析的文本
-         */
         queue(wikitext) {
-            this.wikitext = wikitext;
-            this.running = this.lint(wikitext);
-            return this.running;
-        }
-        /**
-         * 执行语法分析
-         * @param wikitext 待分析的文本
-         */
-        lint(wikitext) {
-            return __awaiter(this, void 0, void 0, function* () {
-                const { include } = this, errors = yield wikiparse.lint(wikitext, include, this.id);
-                return this.include === include && this.wikitext === wikitext ? errors : this.running;
-            });
+            __classPrivateFieldSet(this, _Linter_wikitext, wikitext, "f");
+            __classPrivateFieldSet(this, _Linter_running, __classPrivateFieldGet(this, _Linter_instances, "m", _Linter_lint).call(this, wikitext), "f");
+            return __classPrivateFieldGet(this, _Linter_running, "f");
         }
     }
+    _Linter_id = new WeakMap(), _Linter_wikitext = new WeakMap(), _Linter_running = new WeakMap(), _Linter_instances = new WeakSet(), _Linter_lint = function _Linter_lint(wikitext) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { include } = this, errors = yield wikiparse.lint(wikitext, include, __classPrivateFieldGet(this, _Linter_id, "f"));
+            return this.include === include && __classPrivateFieldGet(this, _Linter_wikitext, "f") === wikitext ? errors : __classPrivateFieldGet(this, _Linter_running, "f");
+        });
+    };
     wikiparse.Linter = Linter;
 })();

package/i18n/zh-hans.json

@@ -27,6 +27,8 @@
 	"invalid self-closing tag": "无效自封闭标签",
 	"invisible content inside triple brackets": "三重括号内的不可见部分",
 	"lonely \"$1\"": "孤立的\"$1\"",
+	"missing module function": "缺少模块函数",
+	"missing module name": "缺少模块名称",
 	"nonzero tabindex": "不为0的tabindex",
 	"nothing should be in <$1>": "<$1>标签内不应有任何内容",
 	"section header in a HTML tag": "HTML标签属性中的段落标题",

package/i18n/zh-hant.json

@@ -27,6 +27,8 @@
 	"invalid self-closing tag": "無效自封閉標籤",
 	"invisible content inside triple brackets": "三重括號內的不可見部分",
 	"lonely \"$1\"": "孤立的\"$1\"",
+	"missing module function": "缺少模組函式",
+	"missing module name": "缺少模組名稱",
 	"nonzero tabindex": "不為0的tabindex",
 	"nothing should be in <$1>": "<$1>標籤內不應有任何內容",
 	"section header in a HTML tag": "HTML標籤屬性中的段落標題",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikiparser-node",
-	"version": "1.0.1-b",
+	"version": "1.0.3-b",
 	"description": "A Node.js parser for MediaWiki markup with AST",
 	"keywords": [
 		"mediawiki",
@@ -31,12 +31,12 @@
 	},
 	"scripts": {
 		"prepublishOnly": "webpack build --mode production && npm run build:ext",
-		"build:core": "rm bundle/*.js; webpack build --mode development; webpack build --mode production",
-		"build:ext": "rm -rf extensions/dist/; tsc --project extensions/tsconfig.json; ls extensions/dist/*.js | xargs gsed -i '/export {};/d'",
+		"build:core": "rm bundle/*.js; webpack build --mode development; webpack build --mode production; eslint --no-eslintrc -c .eslintrc.browser.json bundle/",
+		"build:ext": "rm -rf extensions/dist/; tsc --project extensions/tsconfig.json; ls extensions/dist/*.js | xargs gsed -i '/export {};/d'; eslint --no-eslintrc -c .eslintrc.browser.json extensions/dist/",
 		"build:test": "rm -rf dist/; tsc; gsed -i 's|./config/minimum|../config/minimum|' dist/index.js",
 		"build": "npm run build:core && npm run build:ext",
 		"diff": "git diff --ignore-all-space --color-moved",
-		"lint:ts": "eslint --cache --ignore-pattern 'dist/' .",
+		"lint:ts": "tsc --noEmit && eslint --cache .",
 		"lint:json": "ajv -s config/.schema.json -d 'config/*.json' --strict=true --strict-required=false",
 		"lint:css": "stylelint extensions/*.css",
 		"lint": "npm run lint:ts && npm run lint:json && npm run lint:css",
@@ -61,10 +61,10 @@
 		"eslint-plugin-regexp": "^2.1.1",
 		"eslint-plugin-unicorn": "^49.0.0",
 		"stylelint": "^15.11.0",
-		"stylelint-config-recommended": "^10.0.1",
-		"typescript": "^5.0.3",
+		"stylelint-config-recommended": "^13.0.0",
 		"webpack-cli": "^5.1.4",
-		"webpack": "^5.89.0"
+		"webpack": "^5.89.0",
+		"typescript": "^5.1.6"
 	},
 	"engines": {
 		"node": "^20.9.0"