wikiparser-node 1.40.0 → 1.42.0

package/dist/src/tag/html.js

@@ -88,12 +88,15 @@ let HtmlToken = (() => {
     let _classThis;
     let _classSuper = index_2.TagToken;
     let _instanceExtraInitializers = [];
+    let _getTocLine_decorators;
     let _toHtmlInternal_decorators;
     var HtmlToken = class extends _classSuper {
         static { _classThis = this; }
         static {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+            _getTocLine_decorators = [(0, cached_1.cached)()];
             _toHtmlInternal_decorators = [(0, cached_1.cached)()];
+            __esDecorate(this, null, _getTocLine_decorators, { kind: "method", name: "getTocLine", static: false, private: false, access: { has: obj => "getTocLine" in obj, get: obj => obj.getTocLine }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(this, null, _toHtmlInternal_decorators, { kind: "method", name: "toHtmlInternal", static: false, private: false, access: { has: obj => "toHtmlInternal" in obj, get: obj => obj.toHtmlInternal }, metadata: _metadata }, null, _instanceExtraInitializers);
             __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
             HtmlToken = _classThis = _classDescriptor.value;
@@ -319,25 +322,39 @@ let HtmlToken = (() => {
             }
         }
         /** @private */
+        getTocLine() {
+            if (this.closing || !/^h\d$/u.test(this.name)) {
+                return undefined;
+            }
+            const matched = this.findMatchingTag();
+            if (!matched) {
+                return undefined;
+            }
+            const range = this.createRange();
+            range.setStartAfter(this);
+            range.setEndBefore(matched);
+            const content = (0, html_1.html)(range.cloneContents(), '', { nocc: true });
+            return [(0, html_1.getId)(content), content];
+        }
+        /** @private */
         toHtmlInternal() {
-            const { closing, name } = this, [, selfClosingTags, voidTags] = this.getAttribute('config').html, tag = name + (closing ? '' : super.toHtmlInternal());
+            const { closing, name, selfClosing } = this, [, selfClosingTags, voidTags] = this.getAttribute('config').html, tag = name + (closing ? '' : super.toHtmlInternal());
             if (voidTags.includes(name)) {
                 return closing && name !== 'br' ? '' : `<${tag}>`;
             }
-            const result = `<${closing ? '/' : ''}${tag}>${this.#selfClosing && !closing && selfClosingTags.includes(name) ? `</${name}>` : ''}`;
-            if (/^h\d$/u.test(name) && (this.closing || !this.id)) {
-                const matched = this.findMatchingTag();
-                if (matched) {
-                    if (closing) {
-                        return result + (matched.id ? '' : '</div>');
+            const result = `<${closing ? '/' : ''}${tag}>${selfClosing && !closing && selfClosingTags.includes(name) ? `</${name}>` : ''}`;
+            if (/^h\d$/u.test(name)) {
+                if (closing) {
+                    return result + (this.findMatchingTag()?.id === '' ? '</div>' : '');
+                }
+                else if (!this.id) {
+                    const id = this.getTocLine()?.[0];
+                    if (id !== undefined) {
+                        return `<div class="mw-heading mw-heading${name.slice(-1)}">${result.slice(0, -1)} id="${id}">`;
                     }
-                    const range = this.createRange();
-                    range.setStartAfter(this);
-                    range.setEndBefore(matched);
-                    return `<div class="mw-heading mw-heading${name.slice(-1)}">${result.slice(0, -1)} id="${(0, html_1.getId)(range.cloneContents())}">`;
                 }
             }
-            return result;
+            return (this.tocData ?? '') + result;
         }
         /** @private */
         getRange() {

package/dist/src/tagPair/ext.js

@@ -103,6 +103,7 @@ let ExtToken = (() => {
                         innerToken = new PreToken(inner, newConfig, accum);
                         break;
                     }
+                    newConfig.excludes.push('list');
                 // fall through
                 case 'indicator':
                 case 'poem':
@@ -125,7 +126,9 @@ let ExtToken = (() => {
                         case 'tab':
                             newConfig.ext = newConfig.ext.filter(e => e !== 'tabs');
                             break;
-                        // No default
+                        case 'ref':
+                            newConfig.ext = newConfig.ext.filter(e => e !== 'references');
+                        // no default
                     }
                     innerToken = new index_2.Token(inner, newConfig, accum);
                     break;

package/dist/src/tagPair/translate.d.ts

@@ -26,7 +26,7 @@ export declare abstract class TranslateToken extends TagPairToken implements Omi
      */
     constructor(attr?: string, inner?: string, config?: Config, accum?: Token[]);
     /** @implements */
-    getAttr(key: string): true | undefined;
+    getAttr(key: string): '' | undefined;
     /** @implements */
     hasAttr(key: string): boolean;
     /** @implements */

package/dist/src/tagPair/translate.js

@@ -125,7 +125,7 @@ let TranslateToken = (() => {
         }
         /** @implements */
         getAttr(key) {
-            return (0, string_1.trimLc)(key) === 'nowrap' && this.#isNowrap() || undefined;
+            return (0, string_1.trimLc)(key) === 'nowrap' && this.#isNowrap() ? '' : undefined;
         }
         /** @implements */
         hasAttr(key) {

package/dist/util/debug.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCanonicalName = exports.undo = exports.mixin = exports.emptyArray = exports.getMagicWordInfo = exports.setChildNodes = exports.isLink = exports.isRowEnd = exports.isToken = exports.Shadow = void 0;
+exports.getCanonicalName = exports.undo = exports.mixin = exports.emptyArray = exports.getMagicWordInfo = exports.setChildNodes = exports.isLink = exports.isRowEnd = exports.Shadow = void 0;
+exports.isToken = isToken;
 exports.Shadow = {
     running: false,
     /** @private */
@@ -50,12 +51,9 @@ exports.Shadow = {
     },
     rev: 0,
 };
-/**
- * 是否是某一特定类型的节点
- * @param type 节点类型
- */
-const isToken = (type) => (node) => node.type === type;
-exports.isToken = isToken;
+function isToken(type) {
+    return (node) => node.type === type;
+}
 /**
  * 是否是行尾
  * @param token 节点

package/dist/util/html.js

@@ -95,9 +95,9 @@ const html = (childNodes, separator, opt = {}) => {
             if ((child.length > 0 || /\s$/u.test(innerText))
                 && previousSibling.is('list')
                 && !/[;#*]/u.test(innerText)
-                && child.closest('ext-inner#poem,list-range')?.type === 'ext-inner') {
+                && child.closest('ext#poem,list-range')?.type === 'ext') {
                 lastPrefix = '';
-                result = `<span style="display: inline-block; margin-inline-start: ${previousSibling.indent}em;">${result}</span>`;
+                result = `<span class="mw-poem-indented" style="display: inline-block; margin-inline-start: ${previousSibling.indent}em;">${result}</span>`;
             }
             else {
                 result = result.trim();
@@ -145,15 +145,7 @@ exports.html = html;
  * @param tokens inner tokens of a section heading
  */
 const getId = (tokens) => {
-    let content;
-    if (typeof tokens === 'string') {
-        content = tokens;
-    }
-    else {
-        const opt = { nocc: true };
-        content = Array.isArray(tokens) ? (0, exports.html)(tokens, '', opt) : tokens.toHtmlInternal(opt);
-    }
-    const id = (0, string_1.decodeHtml)((0, string_1.sanitizeAlt)(content.replaceAll('_', ' ')))
+    const content = typeof tokens === 'string' ? tokens : tokens.toHtmlInternal({ nocc: true }), id = (0, string_1.decodeHtml)((0, string_1.sanitizeAlt)(content.replaceAll('_', ' ')))
         .replace(/[\s_]+/gu, '_');
     return id.endsWith('_') ? id.slice(0, -1) : id;
 };

package/dist/util/sharable.js

@@ -88,6 +88,8 @@ exports.htmlAttrs = (() => ({
     categorytree: blockAttrs,
     combooption: blockAttrs,
     img: new Set(['alt', 'src', 'width', 'height', 'loading', 'srcset']),
+    /* NOT FOR BROWSER ONLY */
+    a: new Set(['href', 'rel', 'rev']),
 }))();
 exports.extAttrs = (() => ({
     pre: new Set(['format']),

package/dist/util/sharable.mjs

@@ -85,7 +85,9 @@ const htmlAttrs = /* @__PURE__ */ (() => ({
   poem: blockAttrs,
   categorytree: blockAttrs,
   combooption: blockAttrs,
-  img: /* @__PURE__ */ new Set(["alt", "src", "width", "height", "loading", "srcset"])
+  img: /* @__PURE__ */ new Set(["alt", "src", "width", "height", "loading", "srcset"]),
+  /* NOT FOR BROWSER ONLY */
+  a: /* @__PURE__ */ new Set(["href", "rel", "rev"])
 }))();
 const extAttrs = /* @__PURE__ */ (() => ({
   pre: /* @__PURE__ */ new Set(["format"]),

package/extensions/dist/base.js

@@ -1,6 +1,6 @@
 (() => {
 var _a;
-const version = '1.40.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)
+const version = '1.42.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://fastly.jsdelivr.net/npm/wikiparser-node@${version}`;
 const workerJS = () => {

package/extensions/dist/env.js

@@ -0,0 +1,34 @@
+(() => {
+const execute = (obj) => {
+    Object.entries(obj.files).find(([k]) => k.endsWith('.data.js'))[1]();
+};
+Object.assign(globalThis, {
+    mw: {
+        loader: {
+            done: false,
+            impl(callback) {
+                execute(callback()[1]);
+            },
+            implement(name, callback) {
+                if (typeof callback === 'object') {
+                    execute(callback);
+                }
+                else if (!this.done) {
+                    callback();
+                }
+                if (name.startsWith('ext.CodeMirror.data')) {
+                    this.done = true;
+                }
+            },
+            state() {
+            },
+        },
+        config: {
+            values: {},
+            set({ extCodeMirrorConfig }) {
+                this.values.extCodeMirrorConfig = extCodeMirrorConfig;
+            },
+        },
+    },
+});
+})();

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikiparser-node",
-	"version": "1.40.0",
+	"version": "1.42.0",
 	"description": "A Node.js parser for MediaWiki markup with AST",
 	"keywords": [
 		"mediawiki",
@@ -8,7 +8,7 @@
 		"parser",
 		"browser"
 	],
-	"homepage": "https://github.com/bhsd-harry/wikiparser-node/wiki",
+	"homepage": "https://github.com/bhsd-harry/wikiparser-node#readme",
 	"bugs": {
 		"url": "https://github.com/bhsd-harry/wikiparser-node/issues"
 	},
@@ -24,7 +24,7 @@
 		"/errors/README",
 		"/config/",
 		"!/config/mediawikiwiki.json",
-		"!/config/testwiki.json",
+		"!/config/github.json",
 		"/data/",
 		"/i18n/",
 		"/coverage/badge.svg",
@@ -82,10 +82,10 @@
 		]
 	},
 	"dependencies": {
-		"@bhsd/cm-util": "^1.1.0",
+		"@bhsd/cm-util": "^2.0.1",
 		"@bhsd/common": "^2.2.1",
-		"@bhsd/nodejs": "^1.0.0",
-		"@bhsd/stylelint-util": "^1.0.2",
+		"@bhsd/nodejs": "^1.0.1",
+		"@bhsd/stylelint-util": "^1.0.3",
 		"binary-search": "^1.3.6",
 		"vscode-languageserver-types": "^3.17.5"
 	},
@@ -93,37 +93,36 @@
 		"color-name": "~2.0.2",
 		"entities": "^8.0.0",
 		"mathoid-texvcjs": "^0.6.0",
-		"prism-wiki": "^2.1.0",
+		"prism-wiki": "^2.1.1",
 		"prismjs": "^1.30.0",
-		"stylelint": "^17.11.0",
+		"stylelint": "^17.12.0",
 		"vscode-css-languageservice": "^6.3.10",
 		"vscode-html-languageservice": "^5.6.2",
 		"vscode-json-languageservice": "^5.7.2"
 	},
 	"devDependencies": {
-		"@bhsd/code-standard": "^2.4.2",
-		"@bhsd/test-util": "^1.2.0",
-		"@codemirror/lint": "^6.9.5",
-		"@eslint/markdown": "^8.0.1",
+		"@bhsd/code-standard": "^2.5.1",
+		"@bhsd/test-util": "^1.3.1",
+		"@codemirror/lint": "^6.9.6",
+		"@eslint/markdown": "^8.0.2",
 		"@types/color-name": "^2.0.0",
 		"@types/color-rgba": "^2.1.3",
 		"@types/mocha": "^10.0.10",
-		"@types/node": "^24.11.0",
+		"@types/node": "^25.9.0",
 		"@types/prismjs": "^1.26.6",
-		"@typescript-eslint/eslint-plugin": "^8.59.2",
-		"@typescript-eslint/parser": "^8.59.2",
+		"@typescript-eslint/parser": "^8.59.4",
 		"c8": "^11.0.0",
-		"codejar-async": "^4.3.0",
+		"codejar-async": "^4.3.1",
 		"color-rgba": "^3.0.0",
 		"diff2html-cli": "^5.2.15",
 		"esbuild": "^0.28.0",
-		"eslint": "^10.3.0",
+		"eslint": "^10.4.1",
 		"markdownlint-cli2": "^0.22.1",
-		"mocha": "^11.7.5",
+		"mocha": "^11.7.6",
 		"monaco-editor": "~0.53.0",
-		"tsx": "^4.21.0",
+		"tsx": "^4.22.3",
 		"typescript": "^6.0.3",
-		"v8r": "^6.0.0",
+		"v8r": "^6.1.0",
 		"vscode-languageserver-textdocument": "^1.0.12"
 	},
 	"engines": {