wikiparser-node 1.1.6 → 1.2.0

package/dist/lib/element.js

@@ -358,7 +358,7 @@ class AstElement extends node_1.AstNode {
      * @throws `SyntaxError` 未定义的伪选择器
      */
     #matches(step) {
-        const { parentNode, type, name, childNodes, link, fixed, constructor: { name: tokenName }, } = this, children = parentNode?.children, childrenOfType = children?.filter(({ type: t }) => t === type), siblingsCount = children?.length ?? 1, siblingsCountOfType = childrenOfType?.length ?? 1, index = (children?.indexOf(this) ?? 0) + 1, indexOfType = (childrenOfType?.indexOf(this) ?? 0) + 1, lastIndex = siblingsCount - index + 1, lastIndexOfType = siblingsCountOfType - indexOfType + 1;
+        const { parentNode, type, name, childNodes, link } = this, children = parentNode?.children, childrenOfType = children?.filter(({ type: t }) => t === type), siblingsCount = children?.length ?? 1, siblingsCountOfType = childrenOfType?.length ?? 1, index = (children?.indexOf(this) ?? 0) + 1, indexOfType = (childrenOfType?.indexOf(this) ?? 0) + 1, lastIndex = siblingsCount - index + 1, lastIndexOfType = siblingsCountOfType - indexOfType + 1;
         return step.every(selector => {
             if (typeof selector === 'string') {
                 switch (selector) { // 情形1：简单伪选择器、type和name
@@ -396,12 +396,8 @@ class AstElement extends node_1.AstNode {
                     case ':local-link':
                         return (type === 'link' || type === 'file' || type === 'gallery-image')
                             && link instanceof title_1.Title && link.title === '';
-                    case ':read-only':
-                        return fixed;
-                    case ':read-write':
-                        return !fixed;
                     case ':invalid':
-                        return type === 'table-inter' || tokenName === 'HiddenToken';
+                        return type === 'table-inter' || type === 'image-parameter' && name === 'invalid';
                     case ':required':
                         return this.#isProtected() === true;
                     case ':optional':

package/dist/parser/links.js

@@ -14,7 +14,7 @@ const category_1 = require("../src/link/category");
  */
 const parseLinks = (wikitext, config = Parser.getConfig(), accum = []) => {
     const { parseQuotes } = require('./quotes');
-    const regex = /^((?:(?!\0\d+!\x7F)[^\n<>[\]{}|])+)(?:(\||\0\d+!\x7F)(.*?[^\]]))?\]\](.*)$/su, regexImg = /^((?:(?!\0\d+!\x7F)[^\n<>[\]{}|])+)(\||\0\d+!\x7F)(.*)$/su, regexExt = new RegExp(`^\\s*(?:${config.protocol})`, 'iu'), bits = wikitext.split('[[');
+    const regex = /^((?:(?!\0\d+!\x7F)[^\n[\]{}|])+)(?:(\||\0\d+!\x7F)(.*?[^\]]))?\]\](.*)$/su, regexImg = /^((?:(?!\0\d+!\x7F)[^\n[\]{}|])+)(\||\0\d+!\x7F)(.*)$/su, regexExt = new RegExp(`^\\s*(?:${config.protocol})`, 'iu'), bits = wikitext.split('[[');
     let s = bits.shift();
     for (let i = 0; i < bits.length; i++) {
         let mightBeImg = false, link, delimiter, text, after;

package/dist/parser/selector.js

@@ -17,9 +17,8 @@ const simplePseudos = new Set([
     'hidden',
     'visible',
     'only-whitespace',
+    'any-link',
     'local-link',
-    'read-only',
-    'read-write',
     'invalid',
     'required',
     'optional',

package/dist/src/attributes.js

@@ -178,7 +178,7 @@ class AttributesToken extends index_1.Token {
     /** @override */
     print() {
         return String(this)
-            ? `<span class="wpb-${this.type}">${this.childNodes.map(child => child.print(child instanceof atom_1.AtomToken && child.text().trim() ? { class: 'hidden' } : undefined)).join('')}</span>`
+            ? `<span class="wpb-${this.type}">${this.childNodes.map(child => child.print(child instanceof atom_1.AtomToken && child.text().trim() ? { class: 'attr-dirty' } : undefined)).join('')}</span>`
             : '';
     }
     /* NOT FOR BROWSER */

package/dist/src/gallery.d.ts

@@ -1,23 +1,23 @@
 import * as Parser from '../index';
 import { Token } from './index';
 import { GalleryImageToken } from './link/galleryImage';
-import { HiddenToken } from './hidden';
+import { NoincludeToken } from './nowiki/noinclude';
 import type { LintError } from '../base';
 import type { AstNodes, AstText, AttributesToken, ExtToken } from '../internal';
 /**
  * gallery标签
- * @classdesc `{childNodes: ...(GalleryImageToken|HiddenToken|AstText)}`
+ * @classdesc `{childNodes: ...(GalleryImageToken|NoincludeToken|AstText)}`
  */
 export declare class GalleryToken extends Token {
     #private;
     readonly type = "ext-inner";
     readonly name: 'gallery';
-    readonly childNodes: (GalleryImageToken | HiddenToken | AstText)[];
-    abstract get children(): (GalleryImageToken | HiddenToken)[];
-    abstract get firstChild(): GalleryImageToken | HiddenToken | AstText | undefined;
-    abstract get firstElementChild(): GalleryImageToken | HiddenToken | undefined;
-    abstract get lastChild(): GalleryImageToken | HiddenToken | AstText | undefined;
-    abstract get lastElementChild(): GalleryImageToken | HiddenToken | undefined;
+    readonly childNodes: (GalleryImageToken | NoincludeToken | AstText)[];
+    abstract get children(): (GalleryImageToken | NoincludeToken)[];
+    abstract get firstChild(): GalleryImageToken | NoincludeToken | AstText | undefined;
+    abstract get firstElementChild(): GalleryImageToken | NoincludeToken | undefined;
+    abstract get lastChild(): GalleryImageToken | NoincludeToken | AstText | undefined;
+    abstract get lastElementChild(): GalleryImageToken | NoincludeToken | undefined;
     abstract get nextSibling(): undefined;
     abstract get nextElementSibling(): undefined;
     abstract get previousSibling(): AttributesToken;

package/dist/src/gallery.js

@@ -6,10 +6,10 @@ const constants_1 = require("../util/constants");
 const Parser = require("../index");
 const index_1 = require("./index");
 const galleryImage_1 = require("./link/galleryImage");
-const hidden_1 = require("./hidden");
+const noinclude_1 = require("./nowiki/noinclude");
 /**
  * gallery标签
- * @classdesc `{childNodes: ...(GalleryImageToken|HiddenToken|AstText)}`
+ * @classdesc `{childNodes: ...(GalleryImageToken|NoincludeToken|AstText)}`
  */
 class GalleryToken extends index_1.Token {
     type = 'ext-inner';
@@ -22,16 +22,12 @@ class GalleryToken extends index_1.Token {
     /** @param inner 标签内部wikitext */
     constructor(inner, config = Parser.getConfig(), accum = []) {
         super(undefined, config, accum, {
-            AstText: ':', GalleryImageToken: ':', HiddenToken: ':',
+            AstText: ':', GalleryImageToken: ':', NoincludeToken: ':',
         });
         for (const line of inner?.split('\n') ?? []) {
             const matches = /^([^|]+)(?:\|(.*))?/u.exec(line);
             if (!matches) {
-                super.insertAt((line.trim()
-                    ? new hidden_1.HiddenToken(line, config, [], {
-                        AstText: ':',
-                    })
-                    : line));
+                super.insertAt((line.trim() ? new noinclude_1.NoincludeToken(line, config) : line));
                 continue;
             }
             const [, file, alt] = matches;
@@ -39,9 +35,7 @@ class GalleryToken extends index_1.Token {
                 super.insertAt(new galleryImage_1.GalleryImageToken('gallery', file, alt, config, accum));
             }
             else {
-                super.insertAt(new hidden_1.HiddenToken(line, config, [], {
-                    AstText: ':',
-                }));
+                super.insertAt(new noinclude_1.NoincludeToken(line, config));
             }
         }
     }
@@ -69,7 +63,7 @@ class GalleryToken extends index_1.Token {
         const { top, left } = this.getRootNode().posFromIndex(start), errors = [];
         for (let i = 0; i < this.length; i++) {
             const child = this.childNodes[i], str = String(child), { length } = str, trimmed = str.trim(), startLine = top + i, startCol = i ? 0 : left;
-            if (child.type === 'hidden' && trimmed && !/^<!--.*-->$/u.test(trimmed)) {
+            if (child.type === 'noinclude' && trimmed && !/^<!--.*-->$/u.test(trimmed)) {
                 errors.push({
                     message: Parser.msg('invalid content in <$1>', 'gallery'),
                     severity: 'error',
@@ -82,7 +76,7 @@ class GalleryToken extends index_1.Token {
                     excerpt: String(child).slice(0, 50),
                 });
             }
-            else if (child.type !== 'hidden' && child.type !== 'text') {
+            else if (child.type !== 'noinclude' && child.type !== 'text') {
                 errors.push(...child.lint(start));
             }
             start += length + 1;
@@ -119,7 +113,7 @@ class GalleryToken extends index_1.Token {
     }
     /** @ignore */
     insertAt(token, i = this.length) {
-        if (typeof token === 'string' && token.trim() || token instanceof hidden_1.HiddenToken) {
+        if (typeof token === 'string' && token.trim() || token instanceof noinclude_1.NoincludeToken) {
             throw new RangeError('请勿向图库中插入不可见内容！');
         }
         return super.insertAt(token, i);

package/dist/src/imageParameter.js

@@ -176,9 +176,12 @@ class ImageParameterToken extends index_1.Token {
     }
     /** @override */
     print() {
-        return this.#syntax
-            ? `<span class="wpb-image-parameter">${this.#syntax.replace('$1', `<span class="wpb-image-caption">${(0, string_1.print)(this.childNodes)}</span>`)}</span>`
-            : super.print({ class: 'image-caption' });
+        if (this.#syntax) {
+            return this.name === 'invalid'
+                ? `<span class="wpb-image-invalid">${this.#syntax.replace('$1', (0, string_1.print)(this.childNodes))}</span>`
+                : `<span class="wpb-image-parameter">${this.#syntax.replace('$1', `<span class="wpb-image-caption">${(0, string_1.print)(this.childNodes)}</span>`)}</span>`;
+        }
+        return super.print({ class: 'image-caption' });
     }
     /* NOT FOR BROWSER */
     /** @override */

package/package.json

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