wikiparser-node 1.3.3 → 1.3.4

package/README.en.md

@@ -18,7 +18,7 @@ This version provides a [CLI](https://en.wikipedia.org/wiki/Command-line_interfa
 
 ## Browser-compatible
 
-A browser-compatible version, which can be used for code highlighting or as a linting plugin in conjunction with the [CodeMirror5](https://codemirror.net/5/) editor. ([Usage example](https://bhsd-harry.github.io/wikiparser-node))
+A browser-compatible version, which can be used for code highlighting or as a linting plugin in conjunction with the [CodeMirror](https://codemirror.net/) editor. ([Usage example](https://bhsd-harry.github.io/wikiparser-node))
 
 # Installation
 

package/README.md

@@ -18,7 +18,7 @@ wikiparser-node 是一款由 Bhsd 开发的基于 [Node.js](https://nodejs.org/)
 
 ## Browser-compatible
 
-兼容浏览器的版本，可用于代码高亮或是搭配 [CodeMirror5](https://codemirror.net/5/) 编辑器作为语法分析插件。（[使用实例展示](https://bhsd-harry.github.io/wikiparser-node)）
+兼容浏览器的版本，可用于代码高亮或是搭配 [CodeMirror](https://codemirror.net/) 编辑器作为语法分析插件。（[使用实例展示](https://bhsd-harry.github.io/wikiparser-node)）
 
 # 安装方法
 

package/dist/src/magicLink.js

@@ -64,7 +64,7 @@ class MagicLinkToken extends (0, syntax_1.syntax)(index_1.Token) {
             rect ??= { start, ...this.getRootNode().posFromIndex(start) };
             const refError = (0, lint_1.generateForChild)(child, rect, '', 'warning');
             errors.push(...[...data.matchAll(regexGlobal)].map(({ index, 0: s }) => {
-                const lines = data.slice(0, index).split('\n'), { length: top } = lines, { length: left } = lines.at(-1), startIndex = start + index, startLine = refError.startLine + top - 1, startCol = top === 1 ? refError.startCol + left : left;
+                const lines = data.slice(0, index).split('\n'), { length: top } = lines, { length: left } = lines.at(-1), startIndex = refError.startIndex + index, startLine = refError.startLine + top - 1, startCol = top === 1 ? refError.startCol + left : left;
                 return {
                     ...refError,
                     message: Parser.msg('$1 in URL', s.startsWith('|') ? '"|"' : Parser.msg('full-width punctuation')),

package/dist/src/transclude.js

@@ -10,6 +10,14 @@ const index_1 = require("./index");
 const parameter_1 = require("./parameter");
 const atom_1 = require("./atom");
 const syntax_1 = require("./syntax");
+const insensitiveVars = new Set([
+    'pageid',
+    'articlepath',
+    'server',
+    'servername',
+    'scriptpath',
+    'stylepath',
+]);
 /**
  * 模板或魔术字
  * @classdesc `{childNodes: [AtomToken|SyntaxToken, ...AtomToken, ...ParameterToken]}`
@@ -55,9 +63,9 @@ class TranscludeToken extends index_1.Token {
         }
         const isFunction = title.includes(':');
         if (isFunction || parts.length === 0 && !this.#raw) {
-            const [magicWord, ...arg] = title.split(':'), cleaned = (0, string_1.removeComment)(magicWord), name = cleaned[arg.length > 0 ? 'trimStart' : 'trim'](), isSensitive = sensitive.includes(name), canonicalCame = isFunction && insensitive[name.toLowerCase()];
-            if (isSensitive || canonicalCame) {
-                this.setAttribute('name', canonicalCame || name.toLowerCase());
+            const [magicWord, ...arg] = title.split(':'), cleaned = (0, string_1.removeComment)(magicWord), name = cleaned[arg.length > 0 ? 'trimStart' : 'trim'](), lcName = name.toLowerCase(), canonicalName = insensitive[lcName], isSensitive = sensitive.includes(name), isVar = isSensitive || insensitiveVars.has(canonicalName);
+            if (isVar || isFunction && canonicalName) {
+                this.setAttribute('name', canonicalName ?? lcName);
                 this.type = 'magic-word';
                 const pattern = new RegExp(`^\\s*${name}\\s*$`, isSensitive ? 'u' : 'iu'), token = new syntax_1.SyntaxToken(magicWord, pattern, 'magic-word-name', config, accum, {
                     'Stage-1': ':', '!ExtToken': '',

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikiparser-node",
-	"version": "1.3.3",
+	"version": "1.3.4",
 	"description": "A Node.js parser for MediaWiki markup with AST",
 	"keywords": [
 		"mediawiki",