Updated code quality

Author: Cole J Calamos

.eslintrc.js

@@ -13,7 +13,4 @@ module.exports = {
         "plugin:@typescript-eslint/recommended",
         "prettier/@typescript-eslint",
     ],
-    rules: {
-      "@typescript-eslint/ban-types": 0
-    },
 };

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ccalamos/gatsby-source-googlemaps-static",
   "description": "Gatsby source plugin for Google Maps Static API",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "author": "Cole Calamos <cole@colejcalamos.com>",
   "bugs": {
     "url": "https://github.com/ccalamos/gatsby-source-googlemaps-static/issues"

src/__tests__/path.test.ts

@@ -24,10 +24,10 @@ describe("path", () => {
 
     it("with config options filled", () => {
       const path = new Path({
-        points: ["40.737102,-73.990318", "40.749825,-73.987963"],
         color: "0x00000000",
         fillColor: "0xFFFF0033",
         geoDesic: true,
+        points: ["40.737102,-73.990318", "40.749825,-73.987963"],
         weight: "5",
       });
 

src/cache-file.ts

@@ -12,15 +12,14 @@ abstract class CacheFile {
   private axiosClient: AxiosInstance;
   private cache: NodePluginArgs["cache"];
 
-  private _hash = "";
+  private hash = "";
   private guid = "";
   private cacheId = "";
   private isCached = false;
 
   protected constructor(cache: NodePluginArgs["cache"], hash: string) {
     this.cache = cache;
-    this.hash = hash;
-
+    this.setHash(hash);
     this.checkCache();
 
     this.axiosClient = Axios.create({
@@ -48,7 +47,7 @@ abstract class CacheFile {
     return new Promise((resolve) =>
       resolve(
         this.path
-          ? { path: this.path, hash: this._hash }
+          ? { path: this.path, hash: this.hash }
           : this.downloadFile(url, store, ext),
       ),
     );
@@ -73,8 +72,8 @@ abstract class CacheFile {
       .then((path: string) => this.setCache(path));
   }
 
-  private set hash(newHash: string) {
-    this._hash = newHash;
+  private setHash(newHash: string) {
+    this.hash = newHash;
     this.guid = this.generateGUID();
     this.cacheId = `google-maps-static-cache-${this.guid}`;
   }
@@ -91,7 +90,7 @@ abstract class CacheFile {
   private async setCache(path: string): Promise<CachePath> {
     return this.cache.set(this.cacheId, path).then(() => {
       this.path = path;
-      return { path: this.path, hash: this._hash };
+      return { path: this.path, hash: this.hash };
     });
   }
 
@@ -100,7 +99,7 @@ abstract class CacheFile {
   }
 
   private generateGUID(): string {
-    return crypto.createHash("sha256").update(this._hash).digest("hex");
+    return crypto.createHash("sha256").update(this.hash).digest("hex");
   }
 }
 

src/marker.ts

@@ -15,6 +15,10 @@ class Marker {
     }
   }
 
+  public toString(): string {
+    return this.options ?? "";
+  }
+
   private encodeOptions(color?: string, size?: string, label?: string): string {
     return (
       this.generateEncoding("color", color) +
@@ -42,10 +46,6 @@ class Marker {
           value,
         )}${encodeURIComponent("|")}`;
   }
-
-  public toString(): string {
-    return this.options ?? "";
-  }
 }
 
 export default Marker;

src/path.ts

@@ -13,6 +13,10 @@ class Path {
     this.points = options.points.map((point) => encodeURIComponent(point));
   }
 
+  public toString(): string {
+    return this.generateParams();
+  }
+
   private newOption(key: string, value: string | boolean | undefined): string {
     return value ? `${key}:${value}${encodeURIComponent("|")}` : "";
   }
@@ -26,10 +30,6 @@ class Path {
       this.points.join(encodeURIComponent("|"))
     );
   }
-
-  public toString(): string {
-    return this.generateParams();
-  }
 }
 
 export default Path;

src/static-map.ts

@@ -25,7 +25,7 @@ class StaticMap
   private paths?: Path[];
   private markers?: Marker[];
   private styles?: Style[];
-  private visible?: String[];
+  private visible?: Stringable[];
 
   public constructor(
     options: ConfigOptions,
@@ -120,7 +120,7 @@ class StaticMap
     );
   }
 
-  private getWayPoints(): (String | Path | Marker)[] {
+  private getWayPoints(): Stringable[] {
     return [...(this.markers ?? this.visible ?? this.paths ?? [])];
   }
 }

src/style.ts

@@ -11,6 +11,10 @@ class Style {
     );
   }
 
+  public toString(): string {
+    return this.generateParams();
+  }
+
   private newOption(key: string, value: string | undefined): string {
     return value ? `${key}:${value}${encodeURIComponent("|")}` : "";
   }
@@ -28,10 +32,6 @@ class Style {
       ruleStr
     );
   }
-
-  public toString(): string {
-    return this.generateParams();
-  }
 }
 
 export default Style;