wikiparser-node 0.0.1 → 0.0.2

package/README.md

@@ -1,3 +1,4 @@
+[![npm version](https://badge.fury.io/js/wikiparser-node.svg)](https://www.npmjs.com/package/wikiparser-node)
 # 目录
 <details>
     <summary>展开</summary>
@@ -161,17 +162,18 @@
         6. [getKeys](#filetoken.getkeys)
         7. [getValue](#filetoken.getvalue)
         8. [setValue](#filetoken.setvalue)
+    2. [原型属性](#filetoken.prototype.properties)
+        1. [link](#filetoken.link)
+        2. [size](#filetoken.size)
+        3. [width](#filetoken.width)
+        4. [height](#filetoken.height)
 18. [ImageParameterToken](#imageparametertoken)
     1. [原型方法](#imageparametertoken.prototype.methods)
         1. [getValue](#imageparametertoken.getvalue)
         2. [setValue](#imageparametertoken.setvalue)
 19. [ExtLinkToken](#extlinktoken)
     1. [原型方法](#extlinktoken.prototype.methods)
-        1. [getUrl](#extlinktoken.geturl)
-        2. [setTarget](#extlinktoken.settarget)
-        3. [setLinkText](#extlinktoken.setlinktext)
-    2. [原型属性](#extlinktoken.prototype.properties)
-        1. [protocol](#extlinktoken.protocol)
+        1. [setLinkText](#extlinktoken.setlinktext)
 20. [MagicLinkToken](#magiclinktoken)
     1. [原型方法](#magiclinktoken.prototype.methods)
         1. [getUrl](#magiclinktoken.geturl)
@@ -1654,6 +1656,53 @@ assert(root.toString() === '[[file:a|100px|framed]]');
 ```
 </details>
 
+## 原型属性<a id="filetoken.prototype.properties"></a>
+<details>
+    <summary>展开</summary>
+
+**link**: string\|symbol<a id="filetoken.link"></a>
+- 链接目标。
+
+```js
+var root = Parser.parse('[[file:a|link=[[talk:b]]]]'),
+    file = root.firstChild;
+assert(file.link === 'Talk:B');
+file.link = '//c';
+assert(root.toString() === '[[file:a|link=//c]]');
+```
+
+**size**: {width: string, height: string}<a id="filetoken.size"></a>
+- 图片尺寸。
+
+```js
+var root = Parser.parse('[[file:a|x1px]]'),
+    file = root.firstChild;
+assert.deepStrictEqual(file.size, {width: '', height: '1'});
+```
+
+**width**: number<a id="filetoken.width"></a>
+- 图片宽度。
+
+```js
+var root = Parser.parse('[[file:a|1x1px]]'),
+    file = root.firstChild;
+assert(file.width === '1');
+file.width = undefined;
+assert(root.toString() === '[[file:a|x1px]]');
+```
+
+**height**: number<a id="filetoken.height"></a>
+- 图片高度。
+
+```js
+var root = Parser.parse('[[file:a|1x1px]]'),
+    file = root.firstChild;
+assert(file.height === '1');
+file.height = undefined;
+assert(root.toString() === '[[file:a|1px]]');
+```
+</details>
+
 [返回目录](#目录)
 
 # ImageParameterToken
@@ -1688,18 +1737,12 @@ assert(root.toString() === '[[file:a|x100px]]');
 [返回目录](#目录)
 
 # ExtLinkToken
-`[]`内的外部链接。
+`[]`内的外部链接。这个类同时混合了 [MagicLinkToken](#magiclinktoken) 类的方法和原型属性。
 
 ## 原型方法<a id="extlinktoken.prototype.methods"></a>
 <details>
     <summary>展开</summary>
 
-**getUrl**(): URL<a id="extlinktoken.geturl"></a>
-- 混合自 [MagicLinkToken.getUrl](#magiclinktoken.geturl)。
-
-**setTarget**(url: string\|URL): void<a id="extlinktoken.settarget"></a>
-- 混合自 [MagicLinkToken.setTarget](#magiclinktoken.settarget)。
-
 **setLinkText**(text: string): void<a id="extlinktoken.setlinktext"></a>
 - 修改外链文本。
 
@@ -1711,14 +1754,6 @@ assert(root.toString() === '[//example.org]');
 ```
 </details>
 
-## 原型属性<a id="extlinktoken.prototype.properties"></a>
-<details>
-    <summary>展开</summary>
-
-**protocol**: string<a id="extlinktoken.protocol"></a>
-- 混合自 [MagicLinkToken.protocol](#magiclinktoken.protocol)。
-</details>
-
 [返回目录](#目录)
 
 # MagicLinkToken

package/config/default.json

@@ -119,6 +119,7 @@
 		"829": "Module talk"
 	},
 	"nsid": {
+		"": 0,
 		"media": -2,
 		"媒体": -2,
 		"媒体文件": -2,

package/config/llwiki.json

@@ -110,6 +110,7 @@
 		"829": "Module talk"
 	},
 	"nsid": {
+		"": 0,
 		"media": -2,
 		"媒体": -2,
 		"媒体文件": -2,

package/config/moegirl.json

@@ -114,6 +114,7 @@
 		"829": "Module talk"
 	},
 	"nsid": {
+		"": 0,
 		"media": -2,
 		"媒体": -2,
 		"媒体文件": -2,

package/package.json

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

package/src/extLink.js

@@ -12,16 +12,13 @@ class ExtLinkToken extends Token {
 	type = 'ext-link';
 	#space;
 
-	/** @this {ExtLinkToken & {firstElementChild: MagicLinkToken}} */
+	/** @this {{firstChild: MagicLinkToken}} */
 	get protocol() {
-		return this.firstElementChild.protocol;
+		return this.firstChild.protocol;
 	}
-	/**
-	 * @this {ExtLinkToken & {firstElementChild: MagicLinkToken}}
-	 * @param {string} value
-	 */
+	/** @this {{firstChild: MagicLinkToken}} */
 	set protocol(value) {
-		this.firstElementChild.protocol = value;
+		this.firstChild.protocol = value;
 	}
 
 	/**

package/src/imageParameter.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const {typeError} = require('../util/debug'),
-	{extUrlChar} = require('../util/string'),
+	{text, extUrlChar} = require('../util/string'),
 	Title = require('../lib/title'),
 	/** @type {Parser} */ Parser = require('..'),
 	Token = require('.');
@@ -14,9 +14,13 @@ class ImageParameterToken extends Token {
 	type = 'image-parameter';
 	#syntax = '';
 
+	static #noLink = Symbol('no-link');
+
 	/**
-	 * @param {string} key
+	 * @template {string} T
+	 * @param {T} key
 	 * @param {string} value
+	 * @returns {T extends 'link' ? string|Symbol : boolean}
 	 */
 	static #validate(key, value, config = Parser.getConfig()) {
 		value = value.replace(/\x00\d+t\x7f/g, '').trim();
@@ -26,11 +30,11 @@ class ImageParameterToken extends Token {
 			return true;
 		} else if (key === 'link') {
 			if (!value) {
-				return true;
+				return this.#noLink;
 			}
 			const regex = new RegExp(`(?:${config.protocol}|//)${extUrlChar}`, 'ui');
 			if (regex.test(value)) {
-				return true;
+				return value;
 			}
 			if (/^\[\[.+]]$/.test(value)) {
 				value = value.slice(2, -2);
@@ -40,11 +44,62 @@ class ImageParameterToken extends Token {
 					value = decodeURIComponent(value);
 				} catch {}
 			}
-			return new Title(value, 0, config).valid;
+			const {title, fragment, valid} = new Title(value, 0, config);
+			return valid && `${title}${fragment && '#'}${fragment}`;
 		}
 		return !isNaN(value);
 	}
 
+	get link() {
+		if (this.name === 'link') {
+			return ImageParameterToken.#validate('link', this.getValue(), this.getAttribute('config'));
+		}
+		return undefined;
+	}
+	set link(value) {
+		if (this.name === 'link') {
+			value = value === ImageParameterToken.#noLink ? '' : value;
+			this.setValue(value);
+		}
+	}
+	get size() {
+		if (this.name === 'width') {
+			const /** @type {string} */ size = this.getValue().trim();
+			if (!size.includes('{{')) {
+				const [width, height = ''] = size.split('x');
+				return {width, height};
+			}
+			const token = Parser.parse(size, false, 2, this.getAttribute('config')),
+				{childNodes} = token,
+				i = childNodes.findIndex(child => typeof child === 'string' && child.includes('x'));
+			if (i === -1) {
+				return {width: size, height: ''};
+			}
+			token.splitText(i, childNodes[i].indexOf('x'));
+			token.splitText(i + 1, 1);
+			return {width: text(token.childNodes.slice(0, i + 1)), height: text(token.childNodes.slice(i + 2))};
+		}
+		return undefined;
+	}
+	get width() {
+		return this.size?.width;
+	}
+	set width(width) {
+		if (this.name === 'width') {
+			const {height} = this;
+			this.setValue(`${String(width || '')}${height && 'x'}${height}`);
+		}
+	}
+	get height() {
+		return this.size?.height;
+	}
+	set height(height) {
+		height = String(height || '');
+		if (this.name === 'width') {
+			this.setValue(`${this.width}${height && 'x'}${height}`);
+		}
+	}
+
 	/**
 	 * @param {string} str
 	 * @param {accum} accum

package/src/link/file.js

@@ -20,6 +20,38 @@ class FileToken extends LinkToken {
 	setLinkText = undefined;
 	pipeTrick = undefined;
 
+	get link() {
+		return this.getArg('link')?.link;
+	}
+	set link(value) {
+		this.setValue('link', value);
+	}
+	get size() {
+		return this.getArg('width')?.size;
+	}
+	get width() {
+		return this.size?.width;
+	}
+	set width(width) {
+		const arg = this.getArg('width');
+		if (arg) {
+			arg.width = width;
+		} else {
+			this.setValue('width', width);
+		}
+	}
+	get height() {
+		return this.size?.height;
+	}
+	set height(height) {
+		const arg = this.getArg('width');
+		if (arg) {
+			arg.height = height;
+		} else {
+			this.setValue('width', `x${height}`);
+		}
+	}
+
 	/**
 	 * @param {string} link
 	 * @param {string|undefined} text

package/src/magicLink.js

@@ -15,7 +15,6 @@ class MagicLinkToken extends Token {
 	get protocol() {
 		return this.text().match(this.#protocolRegex)?.[0];
 	}
-	/** @param {string} value */
 	set protocol(value) {
 		if (typeof value !== 'string') {
 			typeError(this, 'protocol', 'String');
@@ -38,6 +37,14 @@ class MagicLinkToken extends Token {
 		this.#protocolRegex = new RegExp(`^(?:${config.protocol}${doubleSlash ? '|//' : ''})`, 'i');
 	}
 
+	afterBuild() {
+		const ParameterToken = require('./parameter'), // eslint-disable-line no-unused-vars
+			/** @type {ParameterToken} */ parameter = this.closest('parameter');
+		if (parameter?.getValue() === this.text()) {
+			this.replaceWith(this.toString());
+		}
+	}
+
 	getUrl() {
 		const url = this.text();
 		try {