wikilint 2.1.6 → 2.2.0

package/dist/parser/links.js

@@ -13,7 +13,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/src/gallery.d.ts

@@ -1,20 +1,20 @@
 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 { 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 firstChild(): GalleryImageToken | HiddenToken | AstText | undefined;
-    abstract get lastChild(): GalleryImageToken | HiddenToken | AstText | undefined;
+    readonly childNodes: (GalleryImageToken | NoincludeToken | AstText)[];
+    abstract get firstChild(): GalleryImageToken | NoincludeToken | AstText | undefined;
+    abstract get lastChild(): GalleryImageToken | NoincludeToken | AstText | undefined;
     abstract get nextSibling(): undefined;
     abstract get previousSibling(): AttributesToken;
     abstract get parentNode(): ExtToken | undefined;

package/dist/src/gallery.js

@@ -4,10 +4,10 @@ exports.GalleryToken = void 0;
 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';
@@ -17,9 +17,7 @@ class GalleryToken extends index_1.Token {
         for (const line of inner?.split('\n') ?? []) {
             const matches = /^([^|]+)(?:\|(.*))?/u.exec(line);
             if (!matches) {
-                super.insertAt((line.trim()
-                    ? new hidden_1.HiddenToken(line, config, [], {})
-                    : line));
+                super.insertAt((line.trim() ? new noinclude_1.NoincludeToken(line, config) : line));
                 continue;
             }
             const [, file, alt] = matches;
@@ -27,7 +25,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, [], {}));
+                super.insertAt(new noinclude_1.NoincludeToken(line, config));
             }
         }
     }
@@ -55,7 +53,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',
@@ -67,7 +65,7 @@ class GalleryToken extends index_1.Token {
                     endCol: startCol + length,
                 });
             }
-            else if (child.type !== 'hidden' && child.type !== 'text') {
+            else if (child.type !== 'noinclude' && child.type !== 'text') {
                 errors.push(...child.lint(start));
             }
             start += length + 1;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikilint",
-	"version": "2.1.6",
+	"version": "2.2.0",
 	"description": "A Node.js linter for MediaWiki markup",
 	"keywords": [
 		"mediawiki",