apple-maps-server-sdk 1.0.4 → 1.0.6

package/lib/index.js

@@ -31,12 +31,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const axios_1 = __importStar(require("axios"));
-const qs_1 = __importDefault(require("qs"));
 class AppleMaps {
     constructor({ authorizationToken }) {
         this.accessToken = "";
@@ -46,9 +42,6 @@ class AppleMaps {
         }
         this.apiClient = axios_1.default.create({
             baseURL: "https://maps-api.apple.com/v1",
-            paramsSerializer: {
-                serialize: (params) => qs_1.default.stringify(params, { arrayFormat: "comma" }),
-            },
         });
         this.getAccessToken();
     }
@@ -71,13 +64,12 @@ class AppleMaps {
     geocode(input) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const params = qs_1.default.stringify(input);
             try {
                 const response = yield this.apiClient.get("/geocode", {
                     headers: {
                         Authorization: `Bearer ${this.accessToken}`,
                     },
-                    params,
+                    params: input,
                 });
                 return response.data;
             }
@@ -97,15 +89,14 @@ class AppleMaps {
         });
     }
     reverseGeocode(input) {
-        var _a;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            const params = qs_1.default.stringify(input);
             try {
                 const response = yield this.apiClient.get("/reverseGeocode", {
                     headers: {
                         Authorization: `Bearer ${this.accessToken}`,
                     },
-                    params,
+                    params: input,
                 });
                 return response.data;
             }
@@ -116,7 +107,7 @@ class AppleMaps {
                         return this.reverseGeocode(input);
                     }
                     else {
-                        throw error;
+                        throw (_b = error.response) === null || _b === void 0 ? void 0 : _b.data;
                     }
                 }
                 else
@@ -125,15 +116,14 @@ class AppleMaps {
         });
     }
     eta(input) {
-        var _a;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            const params = qs_1.default.stringify(input);
             try {
                 const response = yield this.apiClient.get("/etas", {
                     headers: {
                         Authorization: `Bearer ${this.accessToken}`,
                     },
-                    params,
+                    params: input,
                 });
                 return response.data;
             }
@@ -144,7 +134,7 @@ class AppleMaps {
                         return this.eta(input);
                     }
                     else {
-                        throw error;
+                        throw (_b = error.response) === null || _b === void 0 ? void 0 : _b.data;
                     }
                 }
                 else
@@ -153,15 +143,14 @@ class AppleMaps {
         });
     }
     search(input) {
-        var _a;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            const params = qs_1.default.stringify(input);
             try {
                 const response = yield this.apiClient.get("/search", {
                     headers: {
                         Authorization: `Bearer ${this.accessToken}`,
                     },
-                    params,
+                    params: input,
                 });
                 return response.data;
             }
@@ -172,7 +161,7 @@ class AppleMaps {
                         return this.search(input);
                     }
                     else {
-                        throw error;
+                        throw (_b = error.response) === null || _b === void 0 ? void 0 : _b.data;
                     }
                 }
                 else

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apple-maps-server-sdk",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "An SDK for the Apple Maps Server API",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/{types.d.ts → globals.d.ts}

@@ -93,3 +93,54 @@ interface ETA {
 interface SearchResponsePlace extends Place {
   poiCategory: PoiCategory;
 }
+
+interface GeocodeInput {
+  q: string;
+  limitToCountries?: string[];
+  lang?: string;
+  searchLocation?: string;
+  searchRegion?: string;
+  userLocation?: string;
+}
+
+interface ReverseGeocodeInput {
+  q: string;
+  lang?: string;
+}
+
+interface ETAInput {
+  origin: string;
+  destinations: string[];
+  transportType?: TransportType;
+  departureDate?: string;
+  arrivalDate?: string;
+}
+
+interface SearchInput {
+  q: string;
+  excludePoiCategories?: PoiCategory[];
+  includePoiCategories?: PoiCategory[];
+  limitToCountries?: string[];
+  resultTypeFilter?: "Poi" | "Address";
+  lang?: string;
+  searchLocation?: string;
+  searchRegion?: string;
+  userLocation?: string;
+}
+
+interface GeocodeResponse {
+  response: Place[];
+}
+
+interface ReverseGeocodeResponse {
+  response: Place[];
+}
+
+interface ETAResponse {
+  etas: ETA[];
+}
+
+interface SearchResponse {
+  displayMapRegion: MapRegion;
+  results: SearchResponsePlace[];
+}

package/src/index.ts

@@ -1,5 +1,4 @@
 import axios, { AxiosError, AxiosInstance } from "axios";
-import qs from "qs";
 
 class AppleMaps {
   accessToken: string;
@@ -16,9 +15,6 @@ class AppleMaps {
 
     this.apiClient = axios.create({
       baseURL: "https://maps-api.apple.com/v1",
-      paramsSerializer: {
-        serialize: (params) => qs.stringify(params, { arrayFormat: "comma" }),
-      },
     });
 
     this.getAccessToken();
@@ -41,14 +37,12 @@ class AppleMaps {
   }
 
   async geocode(input: GeocodeInput): Promise<GeocodeResponse> {
-    const params = qs.stringify(input);
-
     try {
       const response = await this.apiClient.get("/geocode", {
         headers: {
           Authorization: `Bearer ${this.accessToken}`,
         },
-        params,
+        params: input,
       });
 
       return response.data;
@@ -65,14 +59,12 @@ class AppleMaps {
   }
 
   async reverseGeocode(input: ReverseGeocodeInput): Promise<ReverseGeocodeResponse> {
-    const params = qs.stringify(input);
-
     try {
       const response = await this.apiClient.get("/reverseGeocode", {
         headers: {
           Authorization: `Bearer ${this.accessToken}`,
         },
-        params,
+        params: input,
       });
 
       return response.data;
@@ -82,21 +74,19 @@ class AppleMaps {
           await this.getAccessToken();
           return this.reverseGeocode(input);
         } else {
-          throw error;
+          throw error.response?.data;
         }
       } else throw error;
     }
   }
 
   async eta(input: ETAInput): Promise<ETAResponse> {
-    const params = qs.stringify(input);
-
     try {
       const response = await this.apiClient.get("/etas", {
         headers: {
           Authorization: `Bearer ${this.accessToken}`,
         },
-        params,
+        params: input,
       });
 
       return response.data;
@@ -106,21 +96,19 @@ class AppleMaps {
           await this.getAccessToken();
           return this.eta(input);
         } else {
-          throw error;
+          throw error.response?.data;
         }
       } else throw error;
     }
   }
 
   async search(input: SearchInput): Promise<SearchResponse> {
-    const params = qs.stringify(input);
-
     try {
       const response = await this.apiClient.get("/search", {
         headers: {
           Authorization: `Bearer ${this.accessToken}`,
         },
-        params,
+        params: input,
       });
 
       return response.data;
@@ -130,7 +118,7 @@ class AppleMaps {
           await this.getAccessToken();
           return this.search(input);
         } else {
-          throw error;
+          throw error.response?.data;
         }
       } else throw error;
     }

package/src/inputs.d.ts

@@ -1,33 +0,0 @@
-interface GeocodeInput {
-  q: string;
-  limitToCountries?: string[];
-  lang?: string;
-  searchLocation?: string;
-  searchRegion?: string;
-  userLocation?: string;
-}
-
-interface ReverseGeocodeInput {
-  q: string;
-  lang?: string;
-}
-
-interface ETAInput {
-  origin: string;
-  destinations: string[];
-  transportType?: TransportType;
-  departureDate?: string;
-  arrivalDate?: string;
-}
-
-interface SearchInput {
-  q: string;
-  excludePoiCategories?: PoiCategory[];
-  includePoiCategories?: PoiCategory[];
-  limitToCountries?: string[];
-  resultTypeFilter?: "Poi" | "Address";
-  lang?: string;
-  searchLocation?: string;
-  searchRegion?: string;
-  userLocation?: string;
-}

package/src/responses.d.ts

@@ -1,16 +0,0 @@
-interface GeocodeResponse {
-  response: Place[];
-}
-
-interface ReverseGeocodeResponse {
-  response: Place[];
-}
-
-interface ETAResponse {
-  etas: ETA[];
-}
-
-interface SearchResponse {
-  displayMapRegion: MapRegion;
-  results: SearchResponsePlace[];
-}