Fixed issue with unconditional MW params setters side effects

openzim · Nov 3, 2023 · 69654c6 · 69654c6
1 parent 407d26b
commit 69654c6
Showing 1 changed file with 28 additions and 14 deletions.
diff --git a/src/MediaWiki.ts b/src/MediaWiki.ts
@@ -78,37 +78,51 @@ class MediaWiki {
   }
 
   set apiPath(value: string) {
-    this.#apiPath = value
-    this.initApiURLDirector()
+    if (value) {
+      this.#apiPath = value
+      this.initApiURLDirector()
+    }
   }
 
   set restApiPath(value: string) {
-    this.#restApiPath = value
-    this.initApiURLDirector()
+    if (value) {
+      this.#restApiPath = value
+      this.initApiURLDirector()
+    }
   }
 
   set domain(value: string) {
     this.#domain = value
   }
 
   set wikiPath(value: string) {
-    this.#wikiPath = value
-    this.initApiURLDirector()
+    if (value) {
+      this.#wikiPath = value
+      this.initApiURLDirector()
+    }
   }
 
   set base(value: string) {
-    this.baseUrl = basicURLDirector.buildMediawikiBaseURL(value)
-    this.baseUrlDirector = new BaseURLDirector(this.baseUrl.href)
-    this.initMWApis()
-    this.initApiURLDirector()
+    if (value) {
+      this.baseUrl = basicURLDirector.buildMediawikiBaseURL(value)
+      this.baseUrlDirector = new BaseURLDirector(this.baseUrl.href)
+      this.initMWApis()
+      this.initApiURLDirector()
+    }
   }
 
   set modulePathOpt(value: string) {
-    this.#modulePathOpt = value
-    if (this.baseUrlDirector) {
-      this.modulePath = this.baseUrlDirector.buildModuleURL(this.#modulePathOpt)
+    if (value) {
+      this.#modulePathOpt = value
+      if (this.baseUrlDirector) {
+        this.modulePath = this.baseUrlDirector.buildModuleURL(this.#modulePathOpt)
+      } else {
+        logger.error('Base url director should be specified first')
+      }
     } else {
-      logger.error('Base url director should be specified first')
+      if (this.baseUrlDirector) {
+        this.modulePath = this.baseUrlDirector.buildModuleURL(this.#modulePathOpt)
+      }
     }
   }