wikilint 2.18.1 → 2.18.3

package/dist/src/transclude.js

@@ -19,6 +19,7 @@ const syntax_1 = require("./syntax");
 class TranscludeToken extends index_1.Token {
     modifier = '';
     #type = 'template';
+    #colon = ':';
     #raw = false;
     #args = new Map();
     #title;
@@ -38,7 +39,7 @@ class TranscludeToken extends index_1.Token {
             title = title.replace(`\0${heading}h\x7F`, accum[heading].toString().replace(/^\n/u, ''));
         }
         super(undefined, config, accum, {});
-        const { parserFunction: [insensitive, sensitive], variable } = config, argSubst = /^(?:\s|\0\d+[cn]\x7F)*\0\d+s\x7F/u.exec(title)?.[0];
+        const { parserFunction: [insensitive, sensitive], variable, functionHook } = config, argSubst = /^(?:\s|\0\d+[cn]\x7F)*\0\d+s\x7F/u.exec(title)?.[0];
         if (argSubst) {
             this.setAttribute('modifier', argSubst);
             title = title.slice(argSubst.length);
@@ -49,19 +50,25 @@ class TranscludeToken extends index_1.Token {
                 title = arg.join(':').slice(mt.length);
             }
         }
-        const isFunction = title.includes(':');
+        const colon = title.search(/[:：]/u), fullWidth = title[colon] === '：', isFunction = colon !== -1;
         if (isFunction || parts.length === 0 && !this.#raw) {
-            const colon = title.indexOf(':'), magicWord = colon === -1 ? title : title.slice(0, colon), arg = colon === -1 ? undefined : title.slice(colon + 1), cleaned = (0, string_1.removeComment)(magicWord), name = cleaned[arg === undefined ? 'trim' : 'trimStart'](), lcName = name.toLowerCase(), isOldSchema = Array.isArray(sensitive), isSensitive = isOldSchema
+            const magicWord = isFunction ? title.slice(0, colon) : title, arg = isFunction && title.slice(colon + 1), cleaned = (0, string_1.removeComment)(magicWord), name = isFunction
+                ? cleaned.slice(cleaned.search(/\S/u)) + (fullWidth ? '：' : '')
+                : cleaned.trim(), lcName = name.toLowerCase(), isOldSchema = Array.isArray(sensitive), isSensitive = isOldSchema
                 ? sensitive.includes(name)
                 : Object.prototype.hasOwnProperty.call(sensitive, name), canonicalName = !isOldSchema && isSensitive
                 ? sensitive[name]
-                : Object.prototype.hasOwnProperty.call(insensitive, lcName) && insensitive[lcName], isVar = isOldSchema && isSensitive || variable.includes(canonicalName);
-            if (isVar || isFunction && canonicalName) {
-                this.setAttribute('name', canonicalName || lcName.replace(/^#/u, ''));
+                : Object.prototype.hasOwnProperty.call(insensitive, lcName) && insensitive[lcName], isFunc = isOldSchema && isSensitive
+                || !('functionHook' in config) || functionHook.includes(canonicalName), isVar = isOldSchema && isSensitive || variable.includes(canonicalName);
+            if (isFunction ? canonicalName && isFunc : isVar) {
+                this.setAttribute('name', canonicalName || lcName.replace(/^#|：$/u, ''));
                 this.#type = 'magic-word';
-                const pattern = new RegExp(String.raw `^\s*${name}\s*$`, isSensitive ? 'u' : 'iu'), token = new syntax_1.SyntaxToken(magicWord, pattern, 'magic-word-name', config, accum, {});
+                if (fullWidth) {
+                    this.#colon = '：';
+                }
+                const token = new syntax_1.SyntaxToken(magicWord, 'magic-word-name', config, accum);
                 super.insertAt(token);
-                if (arg !== undefined) {
+                if (arg !== false) {
                     parts.unshift([arg]);
                 }
                 if (this.name === 'invoke') {
@@ -78,7 +85,7 @@ class TranscludeToken extends index_1.Token {
         }
         if (this.type === 'template') {
             const name = (0, string_1.removeComment)(title).trim();
-            if (!this.normalizeTitle(name, 10, true, true).valid) {
+            if (!this.normalizeTitle(name, 10, { halfParsed: true, temporary: true }).valid) {
                 accum.pop();
                 throw new SyntaxError('Invalid template name');
             }
@@ -137,7 +144,7 @@ class TranscludeToken extends index_1.Token {
     }
     /** 获取模板或模块名 */
     #getTitle() {
-        const isTemplate = this.type === 'template', title = this.normalizeTitle(this.childNodes[isTemplate ? 0 : 1].toString(true), isTemplate ? 10 : 828, true);
+        const isTemplate = this.type === 'template', title = this.normalizeTitle(this.childNodes[isTemplate ? 0 : 1].toString(true), isTemplate ? 10 : 828, { temporary: true });
         return title;
     }
     /**
@@ -177,7 +184,7 @@ class TranscludeToken extends index_1.Token {
     toString(skip) {
         return `{{${this.modifier}${this.type === 'magic-word'
             ? this.firstChild.toString(skip)
-                + (this.length === 1 ? '' : ':')
+                + (this.length === 1 ? '' : this.#colon)
                 + this.childNodes.slice(1).map(child => child.toString(skip)).join('|')
             : super.toString(skip, '|')}}}`;
     }
@@ -187,7 +194,9 @@ class TranscludeToken extends index_1.Token {
         return type === 'magic-word' && name === 'vardefine'
             ? ''
             : `{{${modifier}${type === 'magic-word'
-                ? firstChild.text() + (length === 1 ? '' : ':') + (0, string_1.text)(childNodes.slice(1), '|')
+                ? firstChild.text()
+                    + (length === 1 ? '' : this.#colon)
+                    + (0, string_1.text)(childNodes.slice(1), '|')
                 : super.text('|')}}}`;
     }
     /** @private */
@@ -197,6 +206,8 @@ class TranscludeToken extends index_1.Token {
                 return this.modifier.length + 2;
             case 'title':
                 return this.#title;
+            case 'colon':
+                return this.#colon;
             default:
                 return super.getAttribute(key);
         }

package/dist/util/debug.js

@@ -37,7 +37,14 @@ exports.isToken = isToken;
  * @param inserted 插入的子节点
  */
 const setChildNodes = (parent, position, deleteCount, inserted = []) => {
-    const nodes = parent.getChildNodes(), removed = nodes.splice(position, deleteCount, ...inserted);
+    let nodes = parent.getChildNodes(), removed;
+    if (nodes.length === deleteCount) {
+        removed = nodes;
+        nodes = inserted;
+    }
+    else {
+        removed = nodes.splice(position, deleteCount, ...inserted);
+    }
     for (let i = 0; i < inserted.length; i++) {
         const node = inserted[i];
         node.setAttribute('parentNode', parent);
@@ -46,6 +53,9 @@ const setChildNodes = (parent, position, deleteCount, inserted = []) => {
     }
     nodes[position - 1]?.setAttribute('nextSibling', nodes[position]);
     nodes[position + inserted.length]?.setAttribute('previousSibling', nodes[position + inserted.length - 1]);
+    if (nodes === inserted) {
+        parent.setAttribute('childNodes', nodes);
+    }
     return removed;
 };
 exports.setChildNodes = setChildNodes;

package/dist/util/lint.js

@@ -61,33 +61,34 @@ const cache = (store, compute, update) => {
     return result;
 };
 exports.cache = cache;
-let htmlData;
-try {
-    exports.htmlData = htmlData = require('vscode-html-languageservice')
-        .getDefaultHTMLDataProvider();
-}
-catch {
-    /**
-     * 获取HTML属性值可选列表
-     * @param tag 标签名
-     * @param attribute 属性名
-     */
-    const provideValues = (tag, attribute) => {
-        if (tag === 'ol' && attribute === 'type') {
-            return ['1', 'a', 'A', 'i', 'I'];
-        }
-        else if (tag === 'th' && attribute === 'scope') {
-            return ['row', 'col', 'rowgroup', 'colgroup'];
-        }
-        else if (attribute === 'dir') {
-            return ['ltr', 'rtl', 'auto'];
-        }
-        return attribute === 'aria-hidden' ? ['true', 'false'] : [];
-    };
-    exports.htmlData = htmlData = {
-        /** @implements */
-        provideValues(tag, attribute) {
-            return provideValues(tag, attribute).map(value => ({ name: value }));
-        },
-    };
-}
+exports.htmlData = (() => {
+    try {
+        return require('vscode-html-languageservice')
+            .getDefaultHTMLDataProvider();
+    }
+    catch {
+        /**
+         * 获取HTML属性值可选列表
+         * @param tag 标签名
+         * @param attribute 属性名
+         */
+        const provideValues = (tag, attribute) => {
+            if (tag === 'ol' && attribute === 'type') {
+                return ['1', 'a', 'A', 'i', 'I'];
+            }
+            else if (tag === 'th' && attribute === 'scope') {
+                return ['row', 'col', 'rowgroup', 'colgroup'];
+            }
+            else if (attribute === 'dir') {
+                return ['ltr', 'rtl', 'auto'];
+            }
+            return attribute === 'aria-hidden' ? ['true', 'false'] : [];
+        };
+        return {
+            /** @implements */
+            provideValues(tag, attribute) {
+                return provideValues(tag, attribute).map(value => ({ name: value }));
+            },
+        };
+    }
+})();

package/dist/util/string.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.noWrap = exports.decodeNumber = exports.decodeHtml = exports.text = exports.escapeRegExp = exports.removeComment = exports.tidy = exports.extUrlChar = exports.extUrlCharFirst = exports.zs = exports.rawurldecode = void 0;
+exports.noWrap = exports.decodeNumber = exports.decodeHtml = exports.decodeHtmlBasic = exports.text = exports.escapeRegExp = exports.removeComment = exports.tidy = 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`;
@@ -27,9 +27,8 @@ exports.escapeRegExp = factory(/[\\{}()|.?*+^$[\]]/gu, String.raw `\$&`);
 const text = (childNodes, separator = '') => childNodes.map(child => typeof child === 'string' ? child : child.text()).join(separator);
 exports.text = text;
 const names = { lt: '<', gt: '>', lbrack: '[', rbrack: ']', lbrace: '{', rbrace: '}', nbsp: ' ', amp: '&', quot: '"' };
-/* istanbul ignore next */
 /** decode HTML entities */
-const decodeHtmlBasic = factory(/&(?:#(\d+|[Xx][\da-fA-F]+)|([lg]t|[LG]T|[lr]brac[ke]|nbsp|amp|AMP|quot|QUOT));/gu, (_, code, name) => code
+exports.decodeHtmlBasic = factory(/&(?:#(\d+|[Xx][\da-fA-F]+)|([lg]t|[LG]T|[lr]brac[ke]|nbsp|amp|AMP|quot|QUOT));/gu, (_, code, name) => code
     ? String.fromCodePoint(Number((/^x/iu.test(code) ? '0' : '') + code))
     : names[name.toLowerCase()]);
 /**
@@ -48,7 +47,7 @@ const decodeHtml = (str) => {
     }
     /* istanbul ignore next */
     /* NOT FOR BROWSER ONLY END */
-    return decodeHtmlBasic(str);
+    return (0, exports.decodeHtmlBasic)(str);
 };
 exports.decodeHtml = decodeHtml;
 /** decode numbered HTML entities */

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikilint",
-	"version": "2.18.1",
+	"version": "2.18.3",
 	"description": "A Node.js linter for MediaWiki markup",
 	"keywords": [
 		"mediawiki",
@@ -17,7 +17,6 @@
 	"files": [
 		"/errors/README",
 		"/config/",
-		"!/config/jawiki.json",
 		"/data/",
 		"/i18n/",
 		"/coverage/badge.svg",
@@ -66,7 +65,7 @@
 		]
 	},
 	"dependencies": {
-		"@bhsd/common": "^0.8.0",
+		"@bhsd/common": "^0.9.0",
 		"vscode-languageserver-types": "^3.17.5"
 	},
 	"optionalDependencies": {