mediawiki-projects-list 2.3.0 → 2.3.2

package/index.d.ts

@@ -80,7 +80,7 @@ declare module 'mediawiki-projects-list' {
 
 	export function idStringToUrl(idString: string, projectName: string): URL | null;
 
-	export function inputToWikiProject(input: string): {
+	export function inputToFrontendProxy(input: string): {
 		fullNamePath: string;
 		fullArticlePath: string;
 		fullScriptPath: string;

package/index.js

@@ -127,12 +127,14 @@ function inputToWikiProject(input) {
 function urlToIdString(url) {
 	if ( functionCache.urlToIdString.has(url.href) ) return functionCache.urlToIdString.get(url.href);
 	let result = null;
-	let wikiProject = wikiProjects.find( wikiProject => wikiProject.idString && url.hostname.endsWith( wikiProject.name ) );
-	if ( wikiProject ) {
-		let regex = url.href.match( new RegExp( wikiProject.regex ) )?.slice(2);
+	/** @type {WikiProject|FrontendProxy|undefined} */
+	let project = wikiProjects.find( wikiProject => wikiProject.idString && url.hostname.endsWith( wikiProject.name ) );
+	if ( !project ) project = frontendProxies.find( frontendProxy => frontendProxy.idString && url.hostname.endsWith( frontendProxy.name ) );
+	if ( project ) {
+		let regex = url.href.match( new RegExp( project.regex ) )?.slice(2);
 		if ( regex?.length ) {
-			if ( wikiProject.idString.direction === 'desc' ) regex.reverse();
-			result = regex.join(wikiProject.idString.separator);
+			if ( project.idString.direction === 'desc' ) regex.reverse();
+			result = regex.join(project.idString.separator);
 		}
 	}
 	functionCache.urlToIdString.set(url.href, result);
@@ -152,12 +154,12 @@ function idStringToUrl(idString, projectName) {
 		return ( result ? new URL(result) : result );
 	}
 	let result = null;
-	let idString = wikiProjects.find( wikiProject => wikiProject.idString && wikiProject.name === projectName )?.idString;
-	if ( !idString ) idString = frontendProxies.find( frontendProxy => frontendProxy.idString && frontendProxy.name === projectName )?.idString;
-	if ( idString ) {
-		let regex = idString.match( new RegExp( '^' + idString.regex + '$' ) )?.[1].split(idString.separator);
-		if ( regex && regex.length <= idString.scriptPaths.length ) {
-			result = idString.scriptPaths[regex.length - 1].replace( /\$(\d)/g, (match, n) => regex[n - 1] );
+	let project = wikiProjects.find( wikiProject => wikiProject.idString && wikiProject.name === projectName )?.idString;
+	if ( !project ) project = frontendProxies.find( frontendProxy => frontendProxy.idString && frontendProxy.name === projectName )?.idString;
+	if ( project ) {
+		let regex = idString.match( new RegExp( '^' + project.regex + '$' ) )?.[1].split(project.separator);
+		if ( regex && regex.length <= project.scriptPaths.length ) {
+			result = project.scriptPaths[regex.length - 1].replace( /\$(\d)/g, (match, n) => regex[n - 1] );
 		}
 	}
 	functionCache.idStringToUrl.set(cacheKey, result);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mediawiki-projects-list",
-  "version": "2.3.0",
+  "version": "2.3.2",
   "type": "commonjs",
   "description": "List of MediaWiki projects for use in discord-wiki-bot",
   "main": "index.js",

package/projects.json

@@ -3,10 +3,10 @@
 	"frontendProxies": [
 		{
 			"name": "wikiless.org",
-			"regex": "wikiless\\.org/.*?\\?(?:.*?&)?lang=([a-z\\d-]{1,50})(?:&|/?$)",
-			"namePath": "https://wikiless.org/?lang=$1",
-			"articlePath": "https://wikiless.org/wiki/?lang=$1",
-			"scriptPath": "https://$1.wikipedia.org/w/",
+			"regex": "(wikiless\\.org/.*?\\?(?:.*?&)?lang=([a-z\\d-]{1,50}))(?:&|/?$)",
+			"namePath": "https://wikiless.org/?lang=$2",
+			"articlePath": "https://wikiless.org/wiki/?lang=$2",
+			"scriptPath": "https://$2.wikipedia.org/w/",
 			"idString": {
 				"regex": "([a-z\\d-]{1,50})",
 				"scriptPaths": [
@@ -16,10 +16,10 @@
 		},
 		{
 			"name": "wikiwand.com",
-			"regex": "(?:www\\.)?wikiwand\\.com/([a-z\\d-]{1,50})/?",
-			"namePath": "https://www.wikiwand.com/$1/",
-			"articlePath": "https://www.wikiwand.com/$1/",
-			"scriptPath": "https://$1.wikipedia.org/w/",
+			"regex": "((?:www\\.)?wikiwand\\.com/([a-z\\d-]{1,50}))/?",
+			"namePath": "https://www.wikiwand.com/$2/",
+			"articlePath": "https://www.wikiwand.com/$2/",
+			"scriptPath": "https://$2.wikipedia.org/w/",
 			"relativeFix": "^/wiki(?=/)",
 			"idString": {
 				"regex": "([a-z\\d-]{1,50})",
@@ -30,18 +30,18 @@
 		},
 		{
 			"name": "breezewiki.com",
-			"regex": "breezewiki\\.com/([a-z\\d-]{1,50})(?:/wiki/|/?$)",
-			"namePath": "https://breezewiki.com/$1/",
-			"articlePath": "https://breezewiki.com/$1/wiki/",
-			"scriptPath": "https://$1.fandom.com/",
+			"regex": "(breezewiki\\.com/([a-z\\d-]{1,50}))(?:/wiki/|/?$)",
+			"namePath": "https://breezewiki.com/$2/",
+			"articlePath": "https://breezewiki.com/$2/wiki/",
+			"scriptPath": "https://$2.fandom.com/",
 			"note": "Missing language support."
 		},
 		{
 			"name": "breezewiki.pussthecat.org",
-			"regex": "breezewiki\\.pussthecat\\.org/([a-z\\d-]{1,50})(?:/wiki/|/?$)",
-			"namePath": "https://breezewiki.pussthecat.org/$1/",
-			"articlePath": "https://breezewiki.pussthecat.org/$1/wiki/",
-			"scriptPath": "https://$1.fandom.com/",
+			"regex": "(breezewiki\\.pussthecat\\.org/([a-z\\d-]{1,50}))(?:/wiki/|/?$)",
+			"namePath": "https://breezewiki.pussthecat.org/$2/",
+			"articlePath": "https://breezewiki.pussthecat.org/$2/wiki/",
+			"scriptPath": "https://$2.fandom.com/",
 			"note": "Missing language support."
 		}
 	],