wikiparser-node 1.21.2 → 1.22.0

package/dist/util/html.js

@@ -1,8 +1,8 @@
 "use strict";
 /* NOT FOR BROWSER */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cloneNode = exports.html = exports.getCommon = void 0;
-const debug_1 = require("./debug");
+exports.getId = exports.html = exports.getCommon = void 0;
+const string_1 = require("./string");
 /* NOT FOR BROWSER END */
 /**
  * get common prefix length
@@ -90,38 +90,48 @@ const html = (childNodes, separator = '', opt) => {
         const child = childNodes[j];
         let result = child.toHtmlInternal(opt);
         if (child.is('list-range')) {
-            result = result.trim();
-            const { previousSibling: { firstChild: { data } } } = child, prefix = data.trim(), prefix2 = prefix.replaceAll(';', ':'), commonPrefixLength = (0, exports.getCommon)(prefix2, lastPrefix);
-            let pre = closeList(lastPrefix.slice(commonPrefixLength), state);
-            if (prefix.length === commonPrefixLength) {
-                pre += nextItem(prefix.slice(-1), state);
+            const { previousSibling } = child, { innerText } = previousSibling;
+            if ((child.length > 0 || /\s$/u.test(innerText))
+                && previousSibling.is('list')
+                && !/[;#*]/u.test(innerText)
+                && child.closest('ext#poem,list-range')?.is('ext')) {
+                lastPrefix = '';
+                result = `<span style="display: inline-block; margin-inline-start: ${previousSibling.indent}em;">${result}</span>`;
             }
             else {
-                if (state.dt[0] && prefix[commonPrefixLength - 1] === ':') {
-                    pre += nextItem(':', state);
+                result = result.trim();
+                const prefix = innerText.trim(), prefix2 = prefix.replaceAll(';', ':'), commonPrefixLength = (0, exports.getCommon)(prefix2, lastPrefix);
+                let pre = closeList(lastPrefix.slice(commonPrefixLength), state);
+                if (prefix.length === commonPrefixLength) {
+                    pre += nextItem(prefix.slice(-1), state);
                 }
-                if (lastPrefix) {
-                    pre += '\n';
+                else {
+                    if (state.dt[0] && prefix[commonPrefixLength - 1] === ':') {
+                        pre += nextItem(':', state);
+                    }
+                    if (lastPrefix) {
+                        pre += '\n';
+                    }
+                    pre += openList(prefix.slice(commonPrefixLength), state);
+                }
+                result = pre + result;
+                let { nextSibling } = child;
+                while (nextSibling?.is('dd')) {
+                    const next = nextSibling.nextSibling;
+                    result += nextItem(':', state) + next.toHtmlInternal(opt).trim();
+                    ({ nextSibling } = next);
+                    j += 2;
+                }
+                if (nextSibling?.type === 'text'
+                    && nextSibling.data === '\n'
+                    && nextSibling.nextVisibleSibling?.is('list')) {
+                    j += 2;
+                    lastPrefix = prefix2;
+                }
+                else {
+                    lastPrefix = '';
+                    result += closeList(prefix2, state);
                 }
-                pre += openList(prefix.slice(commonPrefixLength), state);
-            }
-            result = pre + result;
-            let { nextSibling } = child;
-            while (nextSibling?.is('dd')) {
-                const next = nextSibling.nextSibling;
-                result += nextItem(':', state) + next.toHtmlInternal(opt).trim();
-                ({ nextSibling } = next);
-                j += 2;
-            }
-            if (nextSibling?.type === 'text'
-                && nextSibling.data === '\n'
-                && nextSibling.nextVisibleSibling?.is('list')) {
-                j += 2;
-                lastPrefix = prefix2;
-            }
-            else {
-                lastPrefix = '';
-                result += closeList(prefix2, state);
             }
         }
         results.push(result);
@@ -130,16 +140,11 @@ const html = (childNodes, separator = '', opt) => {
 };
 exports.html = html;
 /**
- * basic function of `cloneNode`
- * @param token token to clone
- * @param f empty token constructor
+ * get the id of a section heading
+ * @param tokens inner tokens of a section heading
  */
-const cloneNode = (token, f) => {
-    const cloned = token.cloneChildNodes();
-    return debug_1.Shadow.run(() => {
-        const newToken = f();
-        newToken.safeAppend(cloned);
-        return newToken;
-    });
+const getId = (tokens) => {
+    const opt = { nocc: true }, content = Array.isArray(tokens) ? (0, exports.html)(tokens, '', opt) : tokens.toHtmlInternal(opt), id = (0, string_1.decodeHtml)((0, string_1.sanitizeAlt)(content)).replace(/[\s_]+/gu, '_');
+    return id.endsWith('_') ? id.slice(0, -1) : id;
 };
-exports.cloneNode = cloneNode;
+exports.getId = getId;

package/dist/util/lint.js

@@ -27,16 +27,14 @@ const isFostered = (token) => {
     else if (first.is('magic-word')) {
         try {
             const severity = first.getPossibleValues().map(exports.isFostered);
-            return severity.includes('error')
-                ? 'error'
-                : severity.includes('warning') && 'warning';
+            return severity.includes(2) ? 2 : severity.includes(1) && 1;
         }
         catch { }
     }
     return first.is('template')
         || first.is('magic-word') && first.name === 'invoke'
-        ? 'warning'
-        : 'error';
+        ? 1
+        : 2;
 };
 exports.isFostered = isFostered;
 /**
@@ -83,16 +81,16 @@ exports.generateForSelf = factory((_, startIndex, startLine, startCol) => ({ sta
  * @param store 缓存的值
  * @param compute 计算新值的函数
  * @param update 更新缓存的函数
+ * @param force 是否强制缓存
  */
-const cache = (store, compute, update) => {
+const cache = (store, compute, update, force) => {
     if (store
         /* PRINT ONLY */
-        && index_1.default.viewOnly
-        && store[0] === debug_1.Shadow.rev) {
+        && (force || index_1.default.viewOnly && store[0] === debug_1.Shadow.rev)) {
         return store[1];
     }
     const result = compute();
-    if (index_1.default.viewOnly) {
+    if (force || index_1.default.viewOnly) {
         update([debug_1.Shadow.rev, result]);
     }
     return result;

package/dist/util/sharable.js

@@ -65,7 +65,6 @@ exports.commonHtmlAttrs = new Set([
     tr: trAttrs,
     td: tdAttrs,
     th: tdAttrs,
-    img: new Set(['alt', 'src', 'width', 'height', 'srcset']),
     font: new Set(['size', 'color', 'face']),
     hr: widthAttrs,
     data: new Set(['value']),
@@ -79,6 +78,7 @@ exports.commonHtmlAttrs = new Set([
     math: empty,
     chem: empty,
     ce: empty,
+    img: new Set(['alt', 'src', 'width', 'height', 'loading']),
 }))(), exports.extAttrs = (() => ({
     gallery: new Set(['mode', 'showfilename', 'caption', 'perrow', 'widths', 'heights', 'showthumbnails']),
     poem: new Set(['compact']),

package/dist/util/sharable.mjs

@@ -63,7 +63,6 @@ const commonHtmlAttrs = /* @__PURE__ */ new Set([
   tr: trAttrs,
   td: tdAttrs,
   th: tdAttrs,
-  img: /* @__PURE__ */ new Set(["alt", "src", "width", "height", "srcset"]),
   font: /* @__PURE__ */ new Set(["size", "color", "face"]),
   hr: widthAttrs,
   data: /* @__PURE__ */ new Set(["value"]),
@@ -76,7 +75,8 @@ const commonHtmlAttrs = /* @__PURE__ */ new Set([
   combooption: blockAttrs,
   math: empty,
   chem: empty,
-  ce: empty
+  ce: empty,
+  img: /* @__PURE__ */ new Set(["alt", "src", "width", "height", "loading"])
 }))(), extAttrs = /* @__PURE__ */ (() => ({
   gallery: /* @__PURE__ */ new Set(["mode", "showfilename", "caption", "perrow", "widths", "heights", "showthumbnails"]),
   poem: /* @__PURE__ */ new Set(["compact"]),

package/dist/util/string.js

@@ -1,6 +1,6 @@
 "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.print = exports.escape = exports.noWrap = exports.decodeNumber = exports.decodeHtml = exports.decodeHtmlBasic = exports.text = exports.escapeRegExp = exports.removeComment = exports.tidy = exports.restore = exports.trimLc = exports.extUrlChar = exports.extUrlCharFirst = exports.zs = exports.rawurldecode = void 0;
+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.zs = String.raw ` \xA0\u1680\u2000-\u200A\u202F\u205F\u3000`;
@@ -30,8 +30,6 @@ const factory = (regex, replace) => (str) => str.replace(regex, replace);
 exports.tidy = factory(/[\0\x7F]|\r$/gmu, '');
 /** remove half-parsed comment-like tokens */
 exports.removeComment = factory(/\0\d+[cn]\x7F/gu, '');
-/** escape special chars for RegExp constructor */
-exports.escapeRegExp = factory(/[\\{}()|.?*+^$[\]]/gu, String.raw `\$&`);
 /**
  * extract effective wikitext
  * @param childNodes a Token's contents
@@ -65,8 +63,6 @@ const decodeHtml = (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)));
-/** escape newlines */
-exports.noWrap = factory(/\n/gu, String.raw `\n`);
 /* PRINT ONLY */
 const entities = { '&': 'amp', '<': 'lt', '>': 'gt', '"': 'quot', '\n': '#10' };
 /**
@@ -88,6 +84,10 @@ const print = (childNodes, opt = {}) => {
 exports.print = print;
 /* PRINT ONLY END */
 /* NOT FOR BROWSER */
+/** escape special chars for RegExp constructor */
+exports.escapeRegExp = factory(/[\\{}()|.?*+^$[\]]/gu, String.raw `\$&`);
+/** escape newlines */
+exports.noWrap = factory(/\n/gu, String.raw `\n`);
 /** encode URI */
 exports.encode = factory(/[<>[\]#|=]+/gu, encodeURIComponent);
 /**
@@ -106,8 +106,14 @@ const normalizeSpace = (token) => {
 exports.normalizeSpace = normalizeSpace;
 /** escape HTML entities */
 exports.sanitize = replaceEntities(/[<>]|&(?=amp(?!;))/giu);
-/** escape HTML entities in attributes */
-exports.sanitizeAttr = replaceEntities(/[<>"]/gu);
+const replaceAttrEntities = replaceEntities(/[<>"]/gu);
+/**
+ * escape HTML entities in attributes
+ * @param attr 属性值
+ * @param id 是否是`id`属性
+ */
+const sanitizeAttr = (attr, id) => replaceAttrEntities(attr.replace(/\s+|&#10;/gu, id ? '_' : ' '));
+exports.sanitizeAttr = sanitizeAttr;
 /** escape HTML entities in heading id */
 exports.sanitizeId = replaceEntities(/["&]/gu);
 /**

package/extensions/dist/base.js

@@ -1,6 +1,6 @@
 (() => {
 var _a;
-const version = '1.21.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)
+const version = '1.22.0', 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 = () => {
@@ -22,7 +22,7 @@ const workerJS = () => {
         if (lsps.has(id)) {
             return lsps.get(id);
         }
-        const lsp = Parser.createLanguageService({});
+        const lsp = Parser.createLanguageService();
         lsp.include = include;
         lsps.set(id, lsp);
         return lsp;
@@ -55,6 +55,9 @@ const workerJS = () => {
             case 'setI18N':
                 Parser.i18n = qid;
                 break;
+            case 'setLintConfig':
+                Parser.lintConfig = qid;
+                break;
             case 'setConfig':
                 Parser.config = qid;
                 delete last.wikitext;
@@ -210,6 +213,9 @@ const getListener = (command, qid, resolve, raw) => {
 const setI18N = (i18n) => {
     worker.postMessage(['setI18N', i18n]);
 };
+const setLintConfig = (config) => {
+    worker.postMessage(['setLintConfig', config]);
+};
 const setConfig = (config) => {
     worker.postMessage(['setConfig', config]);
     wikiparse.config = config;
@@ -334,6 +340,7 @@ const wikiparse = {
     id: 0,
     config: {},
     setI18N,
+    setLintConfig,
     setConfig,
     getConfig,
     print,

package/extensions/typings.d.ts

@@ -8,7 +8,7 @@ import type {
 	ColorPresentation,
 } from 'vscode-languageserver-types';
 // 必须写在一行内
-import type {Config, ConfigData, LintError, AST, LanguageService} from '../base';
+import type {Config, ConfigData, LintConfig, LintError, AST, LanguageService} from '../base';
 
 export type Diagnostic = DiagnosticBase & {rule: LintError.Rule};
 
@@ -44,6 +44,7 @@ export interface wikiparse {
 	version: string;
 	CDN: string;
 	setI18N: (i18n?: Record<string, string>) => void;
+	setLintConfig: (config?: LintConfig) => void;
 	setConfig: (config: ConfigData) => void;
 	getConfig: () => Promise<Config>;
 	json: (wikitext: string, include: boolean, qid?: number, stage?: number) => Promise<AST>;

package/i18n/zh-hans.json

@@ -8,7 +8,7 @@
 	"bold in section header": "段落标题中的粗体",
 	"conflicting image $1 parameter": "冲突的图片$1参数",
 	"containing invalid attribute": "包含无效属性",
-	"content to be moved out from the table": "将被移出表格的内容",
+	"content to be moved outside the table": "将被移出表格的内容",
 	"duplicated $1 attribute": "重复的$1属性",
 	"duplicated category": "重复的分类",
 	"duplicated id": "重复的id",

package/i18n/zh-hant.json

@@ -8,7 +8,7 @@
 	"bold in section header": "段落標題中的粗體",
 	"conflicting image $1 parameter": "衝突的圖片$1參數",
 	"containing invalid attribute": "包含無效屬性",
-	"content to be moved out from the table": "將被移出表格的內容",
+	"content to be moved outside the table": "將被移出表格的內容",
 	"duplicated $1 attribute": "重複的$1屬性",
 	"duplicated category": "重複的分類",
 	"duplicated id": "重複的id",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikiparser-node",
-	"version": "1.21.2",
+	"version": "1.22.0",
 	"description": "A Node.js parser for MediaWiki markup with AST",
 	"keywords": [
 		"mediawiki",
@@ -24,6 +24,7 @@
 		"/errors/README",
 		"/config/",
 		"!/config/mediawikiwiki.json",
+		"!/config/testwiki.json",
 		"/data/",
 		"/i18n/",
 		"/coverage/badge.svg",
@@ -76,7 +77,9 @@
 		]
 	},
 	"dependencies": {
-		"@bhsd/common": "^0.12.0",
+		"@bhsd/cm-util": "^0.0.0",
+		"@bhsd/common": "^1.0.0",
+		"@bhsd/stylelint-util": "^0.0.0",
 		"vscode-languageserver-types": "^3.17.5"
 	},
 	"optionalDependencies": {
@@ -84,33 +87,35 @@
 		"color-name": "^2.0.0",
 		"entities": "^6.0.0",
 		"mathjax": "^3.2.2",
-		"stylelint": "^16.20.0",
-		"vscode-css-languageservice": "^6.3.4",
-		"vscode-html-languageservice": "^5.3.3",
-		"vscode-json-languageservice": "^5.4.4"
+		"stylelint": "^16.21.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",
 		"@codemirror/lint": "^6.8.5",
 		"@stylistic/eslint-plugin": "^3.1.0",
 		"@types/color-name": "^2.0.0",
 		"@types/color-rgba": "^2.1.3",
 		"@types/mocha": "^10.0.10",
-		"@types/node": "^22.13.1",
-		"@typescript-eslint/eslint-plugin": "^8.29.0",
-		"@typescript-eslint/parser": "^8.29.0",
+		"@types/node": "^24.0.10",
+		"@typescript-eslint/eslint-plugin": "^8.35.1",
+		"@typescript-eslint/parser": "^8.35.1",
 		"codejar-async": "^4.2.7",
 		"color-rgba": "^3.0.0",
-		"esbuild": "^0.25.2",
+		"esbuild": "^0.25.5",
 		"eslint": "^8.57.1",
 		"eslint-plugin-eslint-comments": "^3.2.0",
-		"eslint-plugin-jsdoc": "^50.6.3",
+		"eslint-plugin-jsdoc": "^51.3.3",
 		"eslint-plugin-json-es": "^1.6.0",
-		"eslint-plugin-markdown": "4.0.1",
-		"eslint-plugin-n": "^17.15.1",
+		"eslint-plugin-markdown": "5.1.0",
+		"eslint-plugin-n": "^17.20.0",
 		"eslint-plugin-promise": "^7.2.1",
-		"eslint-plugin-regexp": "^2.7.0",
+		"eslint-plugin-regexp": "^2.9.0",
 		"eslint-plugin-unicorn": "^56.0.1",
-		"mocha": "^11.1.0",
+		"mocha": "^11.7.1",
 		"monaco-editor": "^0.52.2",
 		"nyc": "^17.1.0",
 		"typescript": "^5.8.2",