wikilint 2.28.1 → 2.29.0

package/dist/src/nowiki/index.js

@@ -8,6 +8,21 @@ const common_1 = require("@bhsd/common");
 const lint_1 = require("../../util/lint");
 const index_1 = __importDefault(require("../../index"));
 const base_1 = require("./base");
+/* NOT FOR BROWSER ONLY */
+const constants_1 = require("../../util/constants");
+const document_1 = require("../../lib/document");
+/** @ignore */
+const updateLocation = ({ startIndex, startLine, startCol, endIndex, endLine, endCol }, { offset, line, column }, n) => {
+    const index = startIndex + offset - n;
+    if (index < startIndex) {
+        return [startIndex, startLine, startCol];
+    }
+    else if (index > endIndex) {
+        return [endIndex, endLine, endCol];
+    }
+    return [index, startLine + line - 1, (line === 1 ? startCol - n : 0) + column - 1];
+};
+/* NOT FOR BROWSER ONLY END */
 const getLintRegex = /* #__PURE__ */ (0, common_1.getRegex)(name => new RegExp(String.raw `<\s*(?:/\s*)${name === 'nowiki' ? '' : '?'}(${name})\b`, 'giu'));
 const voidExt = new Set(['languages', 'section', 'templatestyles']);
 /**
@@ -27,7 +42,10 @@ class NowikiToken extends base_1.NowikiBaseToken {
     /** @private */
     lint(start = this.getAbsoluteIndex()) {
         LINT: { // eslint-disable-line no-unused-labels
-            const { name } = this, rule = 'void-ext', { lintConfig } = index_1.default, s = lintConfig.getSeverity(rule, name);
+            const { name, 
+            /* NOT FOR BROWSER ONLY */
+            innerText, previousSibling, } = this, { lintConfig } = index_1.default;
+            let rule = 'void-ext', s = lintConfig.getSeverity(rule, name);
             if (s && this.#lint()) {
                 const e = (0, lint_1.generateForSelf)(this, { start }, rule, index_1.default.msg('nothing-in', name), s);
                 if (lintConfig.computeEditInfo) {
@@ -35,7 +53,46 @@ class NowikiToken extends base_1.NowikiBaseToken {
                 }
                 return [e];
             }
-            return super.lint(start, getLintRegex(name));
+            const errors = super.lint(start, getLintRegex(name));
+            /* NOT FOR BROWSER ONLY */
+            rule = 'invalid-math';
+            s = lintConfig.getSeverity(rule);
+            if (s && document_1.texvcjs && constants_1.mathTags.has(name)) {
+                const isChem = name !== 'math', display = previousSibling?.getAttr('display') ?? 'block';
+                let tex = innerText, n = 0;
+                if (isChem) {
+                    tex = String.raw `\ce{${tex}}`;
+                    n = 4;
+                }
+                switch (display) {
+                    case 'block':
+                        tex = String.raw `{\displaystyle ${tex}}`;
+                        n += 15;
+                        break;
+                    case 'inline':
+                        tex = String.raw `{\textstyle ${tex}}`;
+                        n += 12;
+                        break;
+                    case 'linebreak':
+                        tex = String.raw `\[ ${tex} \]`;
+                        n += 3;
+                    // no default
+                }
+                const result = document_1.texvcjs.check(tex, {
+                    usemhchem: isChem || Boolean(previousSibling?.hasAttr('chem')),
+                });
+                if (result.status !== '+') {
+                    const e = (0, lint_1.generateForSelf)(this, { start }, rule, 'chem-required', s);
+                    if (result.status !== 'C') {
+                        const { error: { message, location } } = result, [endIndex, endLine, endCol] = updateLocation(e, location.end, n);
+                        [e.startIndex, e.startLine, e.startCol] = updateLocation(e, location.start, n);
+                        Object.assign(e, { endIndex, endLine, endCol, message });
+                    }
+                    errors.push(e);
+                }
+            }
+            /* NOT FOR BROWSER ONLY END */
+            return errors;
         }
     }
 }

package/dist/src/table/base.js

@@ -51,8 +51,7 @@ const escapeTable = (syntax) => {
     const wikitext = syntax.childNodes.map(child => child.type === 'text'
         ? child.data.replace(/\|\|/gu, '{{!!}}')
             .replace(/\|/gu, '{{!}}')
-        : child.toString()).join(''), { childNodes } = index_1.default
-        .parse(wikitext, syntax.getAttribute('include'), 2, syntax.getAttribute('config'));
+        : child.toString()).join(''), { childNodes } = index_1.default.parseWithRef(wikitext, syntax, 2);
     syntax.safeReplaceChildren(childNodes);
 };
 /**

package/dist/src/table/index.js

@@ -140,9 +140,8 @@ let TableToken = (() => {
          * @param syntax syntax of the table end / 表格结尾语法
          */
         close(syntax = '\n|}', halfParsed) {
-            const config = this.getAttribute('config'), accum = this.getAttribute('accum');
             debug_1.Shadow.run(() => {
-                const token = new syntax_1.SyntaxToken(halfParsed ? syntax : undefined, 'table-syntax', config, accum);
+                const token = new syntax_1.SyntaxToken(halfParsed ? syntax : undefined, 'table-syntax', this.getAttribute('config'), this.getAttribute('accum'));
                 super.insertAt(token);
             });
         }

package/dist/src/transclude.js

@@ -219,7 +219,7 @@ let TranscludeToken = (() => {
         }
         /** 获取模板或模块名 */
         #getTitle() {
-            const isTemplate = this.type === 'template', title = this.normalizeTitle(this.childNodes[isTemplate ? 0 : 1].text(), isTemplate ? 10 : 828, { temporary: true });
+            const isTemplate = this.type === 'template', title = this.normalizeTitle((isTemplate ? '' : 'Module:') + this.childNodes[isTemplate ? 0 : 1].text(), 10, { temporary: true, ...!isTemplate && { page: '' } });
             return title;
         }
         /** @private */
@@ -310,7 +310,7 @@ let TranscludeToken = (() => {
                     const duplicatedArgs = this.getDuplicatedArgs()
                         .filter(([, parameter]) => !parameter[0].querySelector('ext')), msg = 'duplicate-parameter';
                     for (const [, args] of duplicatedArgs) {
-                        errors.push(...args.map(arg => {
+                        Array.prototype.push.apply(errors, args.map(arg => {
                             const e = (0, lint_1.generateForChild)(arg, rect, rule, msg, s);
                             if (computeEditInfo) {
                                 e.suggestions = [(0, lint_1.fixByRemove)(e, -1)];
@@ -442,7 +442,7 @@ let TranscludeToken = (() => {
                 else {
                     try {
                         const possibleValues = first.getPossibleValues();
-                        queue.splice(i, 1, ...possibleValues);
+                        Array.prototype.splice.apply(queue, [i, 1, ...possibleValues]);
                         i += possibleValues.length;
                     }
                     catch {

package/dist/util/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.enMsg = exports.BuildMethod = exports.MAX_STAGE = void 0;
+exports.mathTags = exports.enMsg = exports.BuildMethod = exports.MAX_STAGE = void 0;
 exports.MAX_STAGE = 11;
 var BuildMethod;
 (function (BuildMethod) {
@@ -9,3 +9,5 @@ var BuildMethod;
 })(BuildMethod || (exports.BuildMethod = BuildMethod = {}));
 // eslint-disable-next-line n/no-missing-require
 exports.enMsg = (() => require('../../i18n/en.json'))();
+/* NOT FOR BROWSER ONLY */
+exports.mathTags = new Set(['math', 'chem', 'ce']);

package/dist/util/debug.js

@@ -43,7 +43,7 @@ const setChildNodes = (parent, position, deleteCount, inserted = []) => {
         nodes = inserted;
     }
     else {
-        removed = nodes.splice(position, deleteCount, ...inserted);
+        removed = Array.prototype.splice.apply(nodes, [position, deleteCount, ...inserted]);
     }
     for (let i = 0; i < inserted.length; i++) {
         const node = inserted[i];

package/dist/util/search.js

@@ -0,0 +1,16 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const binary_search_1 = __importDefault(require("binary-search"));
+/**
+ * 二分法查找索引
+ * @param haystack 数组
+ * @param needle 目标值
+ * @param comparator 比较函数
+ */
+exports.default = (haystack, needle, comparator) => {
+    const found = (0, binary_search_1.default)(haystack, needle, comparator);
+    return found < 0 ? ~found : found; // eslint-disable-line no-bitwise
+};

package/dist/util/sharable.js

@@ -15,6 +15,17 @@ const blockAttrs = new Set(['align']), citeAttrs = new Set(['cite']), citeAndAtt
     'copy',
     'highlight',
     'start',
+]), weightAttrs = new Set(['weight']), mapAttrs = new Set([
+    'width',
+    'height',
+    'zoom',
+    'latitude',
+    'longitude',
+    'align',
+    'mapstyle',
+    'lang',
+    'alt',
+    'text',
 ]), empty = new Set();
 exports.commonHtmlAttrs = new Set([
     'id',
@@ -100,14 +111,13 @@ exports.commonHtmlAttrs = new Set([
     references: new Set(['group', 'responsive']),
     charinsert: new Set(['label']),
     choose: new Set(['uncached', 'before', 'after']),
-    option: new Set(['weight']),
+    option: weightAttrs,
+    choicetemplate: weightAttrs,
     imagemap: empty,
     inputbox: empty,
     templatestyles: new Set(['src', 'wrapper']),
     dynamicpagelist: empty,
     poll: new Set(['id', 'show-results-before-voting']),
-    sm2: typeAttrs,
-    flashmp3: typeAttrs,
     score: new Set([
         'line_width_inches',
         'lang',
@@ -170,6 +180,20 @@ exports.commonHtmlAttrs = new Set([
     timeline: new Set(['method', 'font']),
     quiz: new Set(['display', 'shuffleanswers', 'points', 'shuffle', 'case']),
     languages: empty,
+    mapframe: new Set([...mapAttrs, 'frameless']),
+    maplink: new Set([...mapAttrs, 'class']),
+    rss: new Set([
+        'template',
+        'templatename',
+        'max',
+        'highlight',
+        'filter',
+        'filterout',
+        'reverse',
+        'date',
+        'item-max-length',
+    ]),
+    'page-collection': new Set(['lang', 'name', 'description', 'end-date']),
 }))(), exports.obsoleteAttrs = (() => ({
     table: obsoleteTableAttrs,
     td: new Set([...obsoleteTdAttrs, 'scope']),

package/dist/util/sharable.mjs

@@ -13,6 +13,17 @@ const blockAttrs = /* @__PURE__ */ new Set(["align"]), citeAttrs = /* @__PURE__
   "copy",
   "highlight",
   "start"
+]), weightAttrs = /* @__PURE__ */ new Set(["weight"]), mapAttrs = /* @__PURE__ */ new Set([
+  "width",
+  "height",
+  "zoom",
+  "latitude",
+  "longitude",
+  "align",
+  "mapstyle",
+  "lang",
+  "alt",
+  "text"
 ]), empty = /* @__PURE__ */ new Set();
 const commonHtmlAttrs = /* @__PURE__ */ new Set([
   "id",
@@ -98,14 +109,13 @@ const commonHtmlAttrs = /* @__PURE__ */ new Set([
   references: /* @__PURE__ */ new Set(["group", "responsive"]),
   charinsert: /* @__PURE__ */ new Set(["label"]),
   choose: /* @__PURE__ */ new Set(["uncached", "before", "after"]),
-  option: /* @__PURE__ */ new Set(["weight"]),
+  option: weightAttrs,
+  choicetemplate: weightAttrs,
   imagemap: empty,
   inputbox: empty,
   templatestyles: /* @__PURE__ */ new Set(["src", "wrapper"]),
   dynamicpagelist: empty,
   poll: /* @__PURE__ */ new Set(["id", "show-results-before-voting"]),
-  sm2: typeAttrs,
-  flashmp3: typeAttrs,
   score: /* @__PURE__ */ new Set([
     "line_width_inches",
     "lang",
@@ -167,7 +177,21 @@ const commonHtmlAttrs = /* @__PURE__ */ new Set([
   templatedata: empty,
   timeline: /* @__PURE__ */ new Set(["method", "font"]),
   quiz: /* @__PURE__ */ new Set(["display", "shuffleanswers", "points", "shuffle", "case"]),
-  languages: empty
+  languages: empty,
+  mapframe: /* @__PURE__ */ new Set([...mapAttrs, "frameless"]),
+  maplink: /* @__PURE__ */ new Set([...mapAttrs, "class"]),
+  rss: /* @__PURE__ */ new Set([
+    "template",
+    "templatename",
+    "max",
+    "highlight",
+    "filter",
+    "filterout",
+    "reverse",
+    "date",
+    "item-max-length"
+  ]),
+  "page-collection": /* @__PURE__ */ new Set(["lang", "name", "description", "end-date"])
 }))(), obsoleteAttrs = /* @__PURE__ */ (() => ({
   table: obsoleteTableAttrs,
   td: /* @__PURE__ */ new Set([...obsoleteTdAttrs, "scope"]),

package/i18n/en.json

@@ -2,6 +2,7 @@
 	"attributes-of-closing-tag": "attributes of a closing tag",
 	"bold-apostrophes": "bold apostrophes",
 	"bold-in-header": "bold text in a section header",
+	"chem-required": "chem attribute required",
 	"close": null,
 	"closing-and-self-closing": "tag that is both closing and self-closing",
 	"comment": null,
@@ -39,6 +40,7 @@
 	"invalid-isbn": "invalid ISBN",
 	"invalid-parameter": "invalid parameter of <$1>",
 	"invalid-self-closing": "invalid self-closing tag",
+	"invalid-thumb": "invalid thumbnail filename",
 	"invalid-url": "invalid URL",
 	"invisible-triple-braces": "invisible content inside triple braces",
 	"italic-apostrophes": "italic apostrophes",

package/i18n/zh-hans.json

@@ -2,6 +2,7 @@
 	"attributes-of-closing-tag": "闭合标签的属性",
 	"bold-apostrophes": "粗体单引号",
 	"bold-in-header": "章节标题中的粗体文本",
+	"chem-required": "需要chem属性",
 	"close": "闭合",
 	"closing-and-self-closing": "同时闭合和自封闭的标签",
 	"comment": "注释",
@@ -39,6 +40,7 @@
 	"invalid-isbn": "无效的ISBN",
 	"invalid-parameter": "<$1>的无效参数",
 	"invalid-self-closing": "无效自封闭标签",
+	"invalid-thumb": "无效的缩略图文件名",
 	"invalid-url": "无效的URL",
 	"invisible-triple-braces": "三重括号内的不可见部分",
 	"italic-apostrophes": "斜体单引号",

package/i18n/zh-hant.json

@@ -2,6 +2,7 @@
 	"attributes-of-closing-tag": "結束標籤的屬性",
 	"bold-apostrophes": "粗體撇號",
 	"bold-in-header": "章節標題中的粗體文本",
+	"chem-required": "需要chem屬性",
 	"close": "閉合",
 	"closing-and-self-closing": "同時閉合和自封閉的標籤",
 	"comment": "註解",
@@ -39,6 +40,7 @@
 	"invalid-isbn": "無效的ISBN",
 	"invalid-parameter": "<$1>的無效參數",
 	"invalid-self-closing": "無效自封閉標籤",
+	"invalid-thumb": "無效的縮略圖檔名",
 	"invalid-url": "無效的URL",
 	"invisible-triple-braces": "三重括號內的不可見部分",
 	"italic-apostrophes": "斜體撇號",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikilint",
-	"version": "2.28.1",
+	"version": "2.29.0",
 	"description": "A Node.js linter for MediaWiki markup",
 	"keywords": [
 		"mediawiki",
@@ -52,6 +52,7 @@
 		"test:unit": "mocha dist/test/test.js",
 		"test:parser": "mocha dist/test/parserTests.js",
 		"test": "npm run test:unit && npm run test:parser",
+		"test:ci": "LSP=0 npm test",
 		"test:end": "pkill -x http-server",
 		"test:real": "node dist/test/real.js"
 	},
@@ -71,13 +72,14 @@
 		"@bhsd/cm-util": "^0.1.0",
 		"@bhsd/common": "^1.0.1",
 		"@bhsd/stylelint-util": "^0.1.0",
+		"binary-search": "^1.3.6",
 		"vscode-languageserver-types": "^3.17.5"
 	},
 	"optionalDependencies": {
 		"chalk": "^4.1.2",
 		"color-name": "^2.0.0",
 		"entities": "^6.0.0",
-		"mathjax": "^3.2.2",
+		"mathoid-texvcjs": "^0.5.4",
 		"minimatch": "^10.0.1",
 		"stylelint": "^16.25.0",
 		"vscode-css-languageservice": "^6.3.7",
@@ -86,7 +88,7 @@
 	},
 	"devDependencies": {
 		"@bhsd/code-standard": "^1.2.0",
-		"@bhsd/test-util": "^0.1.0",
+		"@bhsd/test-util": "^0.2.1",
 		"@stylistic/eslint-plugin": "^3.1.0",
 		"@types/color-name": "^2.0.0",
 		"@types/color-rgba": "^2.1.3",

package/data/ext/maplink.json

@@ -1,4 +0,0 @@
-{
-	"$schema": "http://json-schema.org/draft-07/schema#",
-	"$ref": "https://geojson.org/schema/GeoJSON.json"
-}