Merge branch 'mini' into noprint

bhsd-harry · Aug 17, 2024 · 590e64a · 590e64a
2 parents f0ad66e + 9ba535f
commit 590e64a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/index.ts b/index.ts
@@ -8,7 +8,7 @@ import {
 	BuildMethod,
 } from './util/constants';
 import {tidy} from './util/string';
-import type {Config, LintError, Parser as ParserBase} from './base';
+import type {Config, LintError, TokenTypes, Parser as ParserBase} from './base';
 import type {Title} from './lib/title';
 import type {Token} from './internal';
 
@@ -171,5 +171,5 @@ Object.defineProperties(Parser, def);
 // @ts-expect-error mixed export styles
 export = Parser;
 export default Parser;
-export type {Config, LintError};
+export type {Config, LintError, TokenTypes};
 export type * from './internal';
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "wikiparser-node",
-	"version": "1.12.4",
+	"version": "1.12.6",
 	"description": "A Node.js parser for MediaWiki markup with AST",
 	"keywords": [
 		"mediawiki",

diff --git a/src/attribute.ts b/src/attribute.ts
@@ -338,8 +338,8 @@ export abstract class AttributeToken extends Token {
 		}
 		const attrs = extAttrs[tag];
 		if (
-			!(attrs && attrs.has(name))
-			&& (type === 'ext-attr' || !/\{\{[^{]+\}\}/u.test(name))
+			!attrs?.has(name)
+			&& (type === 'ext-attr' ? attrs : !/\{\{[^{]+\}\}/u.test(name))
 			&& (
 				type === 'ext-attr' && !(tag in htmlAttrs)
 				|| !htmlAttrs[tag]?.has(name)