wikiparser-node 1.18.0 → 1.18.2

package/dist/src/attribute.js

@@ -51,7 +51,7 @@ const debug_1 = require("../util/debug");
 const document_1 = require("../lib/document");
 const fixed_1 = require("../mixin/fixed");
 const stages = { 'ext-attr': 0, 'html-attr': 2, 'table-attr': 3 };
-const insecureStyle = /expression|(?:accelerator|-o-link(?:-source)?|-o-replace)\s*:|(?:url|image(?:-set)?)\s*\(|attr\s*\([^)]+[\s,]url/u;
+const insecureStyle = /expression|(?:accelerator|-o-link(?:-source)?|-o-replace)\s*:|(?:url|image(?:-set)?)\s*\(|attr\s*\([^)]+[\s,]url/u, complexTypes = new Set(['ext', 'arg', 'magic-word', 'template']);
 /**
  * attribute of extension and HTML tags
  *
@@ -201,9 +201,6 @@ let AttributeToken = (() => {
                 e.suggestions = [{ desc: 'remove', range: [start, start + length], text: '' }];
                 errors.push(e);
             }
-            else if (sharable_1.obsoleteAttrs[tag]?.has(name)) {
-                errors.push((0, lint_1.generateForChild)(firstChild, rect, 'obsolete-attr', 'obsolete attribute', 'warning'));
-            }
             else if (name === 'style' && typeof value === 'string' && insecureStyle.test(value)) {
                 errors.push((0, lint_1.generateForChild)(lastChild, rect, 'insecure-style', 'insecure style'));
             }
@@ -215,6 +212,15 @@ let AttributeToken = (() => {
                 ];
                 errors.push(e);
             }
+            else if (type !== 'ext-attr' && !lastChild.childNodes.some(({ type: t }) => complexTypes.has(t))) {
+                const data = lint_1.htmlData.provideValues(tag, name), v = String(value).toLowerCase();
+                if (data.length > 0 && data.every(({ name: n }) => n !== v)) {
+                    errors.push((0, lint_1.generateForChild)(lastChild, rect, 'illegal-attr', 'illegal attribute value', 'warning'));
+                }
+            }
+            if (sharable_1.obsoleteAttrs[tag]?.has(name)) {
+                errors.push((0, lint_1.generateForChild)(firstChild, rect, 'obsolete-attr', 'obsolete attribute', 'warning'));
+            }
             return errors;
         }
         /**

package/dist/src/index.js

@@ -61,6 +61,7 @@ const range_1 = require("../lib/range");
 /* NOT FOR BROWSER END */
 /* NOT FOR BROWSER ONLY */
 const document_1 = require("../lib/document");
+const lsp_1 = require("../lib/lsp");
 /* NOT FOR BROWSER */
 /**
  * 可接受的Token类型
@@ -524,8 +525,7 @@ class Token extends element_1.AstElement {
             });
             /* NOT FOR BROWSER ONLY */
         }
-        else if (document_1.cssLSP && this.type === 'attr-value' && this.length === 1 && this.firstChild.type === 'text'
-            && this.parentNode.name === 'style') {
+        else if ((0, lsp_1.isAttr)(this, true)) {
             const root = this.getRootNode(), textDoc = new document_1.EmbeddedCSSDocument(root, this);
             errors.push(...document_1.cssLSP.doValidation(textDoc, textDoc.styleSheet)
                 .filter(({ code }) => code !== 'css-ruleorselectorexpected')

package/dist/src/nowiki/doubleUnderscore.js

@@ -62,6 +62,7 @@ let DoubleUnderscoreToken = (() => {
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
             __runInitializers(_classThis, _classExtraInitializers);
         }
+        /* NOT FOR BROWSER */
         #sensitive;
         /* NOT FOR BROWSER END */
         get type() {
@@ -73,10 +74,10 @@ let DoubleUnderscoreToken = (() => {
          */
         constructor(word, sensitive, config, accum) {
             super(word, config, accum);
+            const lc = word.toLowerCase(), { doubleUnderscore: [, , iAlias, sAlias] } = config;
+            this.setAttribute('name', (sensitive ? sAlias?.[word]?.toLowerCase() : iAlias?.[lc]) ?? lc);
             /* NOT FOR BROWSER */
-            const lc = word.toLowerCase();
             this.#sensitive = sensitive;
-            this.setAttribute('name', sensitive ? lc : config.doubleUnderscore[2]?.[lc] ?? lc);
             this.setAttribute('pattern', new RegExp(`^${word}$`, sensitive ? 'u' : 'iu'));
         }
         /** @private */

package/dist/src/transclude.js

@@ -25,6 +25,7 @@ const basicMagicWords = new Map([['=', '='], ['!', '|']]);
 class TranscludeToken extends index_1.Token {
     modifier = '';
     #type = 'template';
+    #colon = ':';
     #raw = false;
     #args = new Map();
     #title;
@@ -60,7 +61,7 @@ class TranscludeToken extends index_1.Token {
         super(undefined, config, accum, {
             AtomToken: 0, SyntaxToken: 0, ParameterToken: '1:',
         });
-        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);
@@ -71,22 +72,28 @@ 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';
+                if (fullWidth) {
+                    this.#colon = '：';
+                }
                 /^\s*uc\s*$/iu; // eslint-disable-line @typescript-eslint/no-unused-expressions
                 const pattern = new RegExp(String.raw `^\s*${name}\s*$`, isSensitive ? 'u' : 'iu'), token = new syntax_1.SyntaxToken(magicWord, pattern, 'magic-word-name', config, accum, {
                     'Stage-1': ':', '!ExtToken': '',
                 });
                 super.insertAt(token);
-                if (arg !== undefined) {
+                if (arg !== false) {
                     parts.unshift([arg]);
                 }
                 if (this.name === 'invoke') {
@@ -241,7 +248,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, '|')}}}`;
     }
@@ -251,7 +258,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 */
@@ -261,6 +270,8 @@ class TranscludeToken extends index_1.Token {
                 return this.modifier.length + 2;
             case 'title':
                 return this.#title;
+            case 'colon':
+                return this.#colon;
             /* NOT FOR BROWSER */
             case 'keys':
                 return this.#keys;
@@ -468,7 +479,7 @@ class TranscludeToken extends index_1.Token {
     print() {
         const { childNodes, length, firstChild, modifier, type } = this;
         return `<span class="wpb-${type}">{{${(0, string_1.escape)(modifier)}${type === 'magic-word'
-            ? firstChild.print() + (length === 1 ? '' : ':') + (0, string_1.print)(childNodes.slice(1), { sep: '|' })
+            ? firstChild.print() + (length === 1 ? '' : this.#colon) + (0, string_1.print)(childNodes.slice(1), { sep: '|' })
             : (0, string_1.print)(childNodes, { sep: '|' })}}}</span>`;
     }
     /* NOT FOR BROWSER */
@@ -476,7 +487,7 @@ class TranscludeToken extends index_1.Token {
         const [first, ...cloned] = this.cloneChildNodes(), config = this.getAttribute('config');
         return debug_1.Shadow.run(() => {
             // @ts-expect-error abstract class
-            const token = new TranscludeToken(this.type === 'template' ? 'T' : `${first.text()}:`, [], config);
+            const token = new TranscludeToken(this.type === 'template' ? 'T' : first.text() + (cloned.length === 0 ? '' : this.#colon), [], config);
             if (this.#raw) {
                 token.setModifier(this.modifier);
             }
@@ -484,7 +495,7 @@ class TranscludeToken extends index_1.Token {
                 token.setAttribute('modifier', this.modifier);
             }
             token.firstChild.safeReplaceWith(first);
-            if (this.type === 'magic-word') {
+            if (token.length > 1) {
                 token.removeAt(1);
             }
             token.append(...cloned);

package/dist/util/diff.js

@@ -73,7 +73,7 @@ const diff = async (oldStr, newStr, uid) => {
         newFile,
     ]);
     console.log(stdout?.split('\n').slice(4).join('\n'));
-    await Promise.all([promises_1.default.unlink(oldFile), promises_1.default.unlink(newFile)]);
+    await Promise.allSettled([promises_1.default.unlink(oldFile), promises_1.default.unlink(newFile)]);
 };
 exports.diff = diff;
 /* istanbul ignore next */

package/dist/util/lint.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cache = exports.generateForSelf = exports.generateForChild = exports.getEndPos = void 0;
+exports.htmlData = exports.cache = exports.generateForSelf = exports.generateForChild = exports.getEndPos = void 0;
 const debug_1 = require("./debug");
 const rect_1 = require("../lib/rect");
 const index_1 = __importDefault(require("../index"));
@@ -65,3 +65,34 @@ const cache = (store, compute, update) => {
     return result;
 };
 exports.cache = cache;
+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/extensions/dist/base.js

@@ -1,6 +1,6 @@
 (() => {
 var _a;
-const version = '1.18.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.18.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)
     ? src.replace(file, '')
     : `https://testingcf.jsdelivr.net/npm/wikiparser-node@${version}`;
 const workerJS = () => {

package/extensions/dist/lsp.js

@@ -11,7 +11,6 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
 var _LanguageService_id, _LanguageService_include;
-let data;
 class LanguageService {
     get include() {
         return __classPrivateFieldGet(this, _LanguageService_include, "f");
@@ -21,10 +20,6 @@ class LanguageService {
         _LanguageService_include.set(this, void 0);
         __classPrivateFieldSet(this, _LanguageService_id, wikiparse.id++, "f");
         __classPrivateFieldSet(this, _LanguageService_include, include, "f");
-        data !== null && data !== void 0 ? data : (data = (async () => (await fetch(`${wikiparse.CDN}/data/signatures.json`)).json())());
-        (async () => {
-            wikiparse.provide('data', __classPrivateFieldGet(this, _LanguageService_id, "f"), await data, __classPrivateFieldGet(this, _LanguageService_include, "f"));
-        })();
     }
     destroy() {
         wikiparse.provide('destroy', __classPrivateFieldGet(this, _LanguageService_id, "f"));

package/extensions/es7/base.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var _a;
-const version = '1.18.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.18.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)
     ? src.replace(file, '')
     : `https://testingcf.jsdelivr.net/npm/wikiparser-node@${version}`;
 const workerJS = () => {

package/i18n/zh-hans.json

@@ -21,6 +21,7 @@
 	"HTML comment": "HTML注释",
 	"HTML tag in table attributes": "表格属性中的HTML标签",
 	"illegal attribute name": "非法的属性名",
+	"illegal attribute value": "非法的属性值",
 	"illegal module name": "非法的模块名称",
 	"inconsistent table layout": "不一致的表格布局",
 	"insecure style": "不安全的样式",

package/i18n/zh-hant.json

@@ -21,6 +21,7 @@
 	"HTML comment": "HTML註釋",
 	"HTML tag in table attributes": "表格屬性中的HTML標籤",
 	"illegal attribute name": "非法的屬性名",
+	"illegal attribute value": "非法的屬性值",
 	"illegal module name": "非法的模組名稱",
 	"inconsistent table layout": "不一致的表格佈局",
 	"insecure style": "不安全的樣式",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikiparser-node",
-	"version": "1.18.0",
+	"version": "1.18.2",
 	"description": "A Node.js parser for MediaWiki markup with AST",
 	"keywords": [
 		"mediawiki",
@@ -55,7 +55,7 @@
 		"diff": "bash diff.sh",
 		"diff:stat": "f() { git diff --stat --ignore-all-space --color=always $1 $2 -- . | grep '\\.ts'; }; f",
 		"lint:ts": "tsc --noEmit && eslint --cache .",
-		"lint:json": "v8r -s config/.schema.json config/*.json && v8r -s data/.schema.json data/*.json && node dist/test/json.js",
+		"lint:json": "v8r -s config/.schema.json config/*.json && v8r -s data/.schema.json data/*.json && mocha dist/test/json.js",
 		"lint": "npm run lint:ts && npm run lint:json",
 		"prof": "node dist/test/prof.js",
 		"coverage": "nyc --cache-dir=./.cache/nyc npm test && node dist/script/coverage.js && open coverage/index.html",
@@ -77,20 +77,23 @@
 		]
 	},
 	"dependencies": {
-		"@bhsd/common": "^0.8.0",
+		"@bhsd/common": "^0.8.1",
 		"vscode-languageserver-types": "^3.17.5"
 	},
 	"optionalDependencies": {
 		"chalk": "^4.1.2",
+		"color-name": "^2.0.0",
 		"entities": "^6.0.0",
 		"stylelint": "^16.14.1",
 		"vscode-css-languageservice": "^6.3.2",
+		"vscode-html-languageservice": "^5.3.1",
 		"vscode-json-languageservice": "^5.4.3"
 	},
 	"devDependencies": {
 		"@codemirror/lint": "^6.8.4",
 		"@stylistic/eslint-plugin": "^3.1.0",
 		"@stylistic/stylelint-plugin": "^3.1.2",
+		"@types/color-name": "^2.0.0",
 		"@types/color-rgba": "^2.1.3",
 		"@types/mocha": "^10.0.10",
 		"@types/node": "^22.13.1",