mediawiki-projects-list 1.1.2 → 1.2.2

package/index.d.ts

@@ -10,6 +10,8 @@ declare module 'mediawiki-projects-list' {
 		articlePath: string;
 		/** Script path of the project */
 		scriptPath: string;
+		/** Only exists when the hostname contains a single wiki: Full script path to the wiki */
+		fullScriptPath?: string;
 		/** Only exists when the hostname contains multiple wikis: How to handle the id string */
 		idString?: {
 			/** Separator to join or split the id string on */
@@ -24,9 +26,9 @@ declare module 'mediawiki-projects-list' {
 		/** Whether the paths include matches of the regex */
 		regexPaths: boolean;
 		/** Wiki farm of the project */
-		wikiFarm: ("wikimedia" | "fandom" | "miraheze" | "wiki.gg" | "biligame" | "huijiwiki" | "shoutwiki") | null;
+		wikiFarm: ("biligame" | "fandom" | "huijiwiki" | "miraheze" | "shoutwiki" | "wiki.gg" | "wikimedia") | null;
 		/** List of extensions providing useful API endpoints */
-		extensions: ("CentralAuth" | "Cargo")[];
+		extensions: ("Cargo" | "CentralAuth" | "OAuth")[];
 		/** Replacement for spaces in the article URL */
 		urlSpaceReplacement: string;
 		/** Note about the specific project */

package/index.js

@@ -7,14 +7,15 @@ const {properties: {wikiProjects: {items: {properties: wikiProjectSchema}}}} = r
  * @property {string} regex - Regex to match the project url
  * @property {string} articlePath - Article path of the project
  * @property {string} scriptPath - Script path of the project
+ * @property {string} [fullScriptPath] - Only exists when the hostname contains a single wiki: Full script path to the wiki
  * @property {object} [idString] - Only exists when the hostname contains multiple wikis: How to handle the id string
  * @property {string} idString.separator - Separator to join or split the id string on
  * @property {"asc"|"desc"} idString.direction - Order in which the project regex additional group matches should be chained to gain the id string
  * @property {string} idString.regex - Regex to match the id string
  * @property {string[]} idString.scriptPaths - How to turn the group matches of the id string regex into an URL to the script path, index based on group matches
  * @property {boolean} regexPaths - Whether the paths include matches of the regex
- * @property {?("wikimedia"|"fandom"|"miraheze"|"wiki.gg"|"biligame"|"huijiwiki"|"shoutwiki")} wikiFarm - Wiki farm of the project
- * @property {("CentralAuth"|"Cargo")[]} extensions - List of extensions providing useful API endpoints
+ * @property {?("biligame"|"fandom"|"huijiwiki"|"miraheze"|"shoutwiki"|"wiki.gg"|"wikimedia")} wikiFarm - Wiki farm of the project
+ * @property {("Cargo"|"CentralAuth"|"OAuth")[]} extensions - List of extensions providing useful API endpoints
  * @property {string} urlSpaceReplacement - Replacement for spaces in the article URL
  * @property {?string} note - Note about the specific project
  */
@@ -59,8 +60,8 @@ function inputToWikiProject(input) {
 	let result = null;
 	let wikiProject = wikiProjects.find( wikiProject => input.split('/').slice(0, 3).some( part => part.endsWith( wikiProject.name ) ) );
 	if ( wikiProject ) {
-		let articlePath = ( wikiProject.regexPaths ? '/' : wikiProject.articlePath );
-		let scriptPath = ( wikiProject.regexPaths ? '/' : wikiProject.scriptPath );
+		let articlePath = ( wikiProject.regexPaths ? '/' : wikiProject.articlePath.split('?')[0] ).replace(/[.*+?^${}()|\[\]\\]/g, '\\$&');
+		let scriptPath = ( wikiProject.regexPaths ? '/' : wikiProject.scriptPath ).replace(/[.*+?^${}()|\[\]\\]/g, '\\$&');
 		let regex = input.match( new RegExp( wikiProject.regex + `(?:${articlePath}|${scriptPath}|/?$)` ) );
 		if ( regex ) {
 			if ( wikiProject.regexPaths ) {

package/package.json

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

package/projects-schema.json

@@ -32,6 +32,10 @@
 						"type": "string",
 						"description": "Script path of the project"
 					},
+					"fullScriptPath": {
+						"type": "string",
+						"description": "Only exists when the hostname contains a single wiki: Full script path to the wiki"
+					},
 					"idString": {
 						"type": "object",
 						"description": "Only exists when the hostname contains multiple wikis: How to handle the id string",
@@ -80,13 +84,13 @@
 						"type": "string",
 						"description": "Wiki farm of the project",
 						"enum": [
-							"wikimedia",
+							"biligame",
 							"fandom",
+							"huijiwiki",
 							"miraheze",
+							"shoutwiki",
 							"wiki.gg",
-							"biligame",
-							"huijiwiki",
-							"shoutwiki"
+							"wikimedia"
 						],
 						"default": null
 					},
@@ -97,8 +101,9 @@
 							"type": "string",
 							"description": "Name of an extension providing useful API endpoints",
 							"enum": [
+								"Cargo",
 								"CentralAuth",
-								"Cargo"
+								"OAuth"
 							]
 						},
 						"default": [],