@wise-old-man/utils 2.2.3 → 3.0.0

package/dist/index.d.ts

@@ -292,7 +292,6 @@ type Prisma_Base_Snapshot = {
   guardians_of_the_riftRank: number;
 };
 
-import { AxiosInstance } from 'axios';
 
 /**
  * Prisma currently seems to ignore the @map() in enum declarations.
@@ -1866,8 +1865,11 @@ interface DeltaLeaderboardFilter extends BasePlayerFilter {
 }
 
 declare class BaseAPIClient {
-    private axiosInstance;
-    constructor(axiosInstance: AxiosInstance);
+    private headers;
+    private baseUrl;
+    constructor(headers: object, baseUrl: string);
+    private buildParams;
+    private request;
     postRequest<T>(path: string, body?: unknown): Promise<T>;
     putRequest<T>(path: string, body?: unknown): Promise<T>;
     deleteRequest<T>(path: string, body?: unknown): Promise<T>;

package/dist/index.js

@@ -2,13 +2,11 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var axios = require('axios');
 var dayjs = require('dayjs');
 var customParseFormatPlugin = require('dayjs/plugin/customParseFormat');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
-var axios__default = /*#__PURE__*/_interopDefaultLegacy(axios);
 var dayjs__default = /*#__PURE__*/_interopDefaultLegacy(dayjs);
 var customParseFormatPlugin__default = /*#__PURE__*/_interopDefaultLegacy(customParseFormatPlugin);
 
@@ -32,6 +30,18 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 ***************************************************************************** */
 
+function __rest(s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+}
+
 function __awaiter(thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -62,25 +72,23 @@ function isValidISODate(input) {
 function transformDates(input) {
     return traverseTransform(input, val => (isValidISODate(val) ? new Date(val) : val));
 }
-function handleError(requestURL, e) {
-    var _a;
-    if (!((_a = e.response) === null || _a === void 0 ? void 0 : _a.data))
+function handleError(status, path, data) {
+    if (!data)
         return;
-    const data = e.response.data;
-    if (e.response.status === 400) {
-        throw new BadRequestError(requestURL, data.message, data.data);
+    if (status === 400) {
+        throw new BadRequestError(path, data.message, data.data);
     }
-    if (e.response.status === 403) {
-        throw new ForbiddenError(requestURL, data.message);
+    if (status === 403) {
+        throw new ForbiddenError(path, data.message);
     }
-    if (e.response.status === 404) {
-        throw new NotFoundError(requestURL, data.message);
+    if (status === 404) {
+        throw new NotFoundError(path, data.message);
     }
-    if (e.response.status === 429) {
-        throw new RateLimitError(requestURL, data.message);
+    if (status === 429) {
+        throw new RateLimitError(path, data.message);
     }
-    if (e.response.status === 500) {
-        throw new InternalServerError(requestURL, data.message);
+    if (status === 500) {
+        throw new InternalServerError(path, data.message);
     }
 }
 class BadRequestError extends Error {
@@ -126,55 +134,55 @@ class InternalServerError extends Error {
 }
 
 class BaseAPIClient {
-    constructor(axiosInstance) {
-        this.axiosInstance = axiosInstance;
+    constructor(headers, baseUrl) {
+        this.baseUrl = baseUrl;
+        this.headers = Object.assign({ Accept: 'application/json', 'Content-Type': 'application/json' }, headers);
+    }
+    buildParams(_a) {
+        var params = __rest(_a, []);
+        const builder = new URLSearchParams();
+        Object.keys(params)
+            .filter(k => params[k] !== undefined)
+            .forEach(k => builder.set(k, params[k]));
+        const query = builder.toString();
+        return query ? `?${query}` : '';
+    }
+    request({ method, path, body, params }) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const req = { method, body: undefined, headers: this.headers };
+            let query = '';
+            if (body) {
+                req.body = JSON.stringify(body);
+            }
+            if (params) {
+                query = this.buildParams(params);
+            }
+            const res = yield fetch(this.baseUrl + path + query, req);
+            const data = yield res.json();
+            if (res.ok) {
+                return transformDates(data);
+            }
+            handleError(res.status, path, data);
+        });
     }
     postRequest(path, body) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.axiosInstance
-                .post(path, body || {})
-                .then(response => transformDates(response.data))
-                .catch(e => {
-                if (axios__default["default"].isAxiosError(e))
-                    handleError(path, e);
-                throw e;
-            });
+            return yield this.request({ method: 'POST', path, body: body || {} });
         });
     }
     putRequest(path, body) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.axiosInstance
-                .put(path, body || {})
-                .then(response => transformDates(response.data))
-                .catch(e => {
-                if (axios__default["default"].isAxiosError(e))
-                    handleError(path, e);
-                throw e;
-            });
+            return yield this.request({ method: 'PUT', path, body: body || {} });
         });
     }
     deleteRequest(path, body) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.axiosInstance
-                .delete(path, { data: body })
-                .then(response => transformDates(response.data))
-                .catch(e => {
-                if (axios__default["default"].isAxiosError(e))
-                    handleError(path, e);
-                throw e;
-            });
+            return yield this.request({ method: 'DELETE', path, body: body || {} });
         });
     }
     getRequest(path, params) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.axiosInstance
-                .get(path, { params })
-                .then(response => transformDates(response.data))
-                .catch(e => {
-                if (axios__default["default"].isAxiosError(e))
-                    handleError(path, e);
-                throw e;
-            });
+            return yield this.request({ method: 'GET', path, params });
         });
     }
 }
@@ -2542,24 +2550,21 @@ class CompetitionsClient extends BaseAPIClient {
 
 class WOMClient extends BaseAPIClient {
     constructor(options) {
+        const baseApiUrl = (options === null || options === void 0 ? void 0 : options.baseAPIUrl) || config.baseAPIUrl;
         const headers = {
             'x-user-agent': (options === null || options === void 0 ? void 0 : options.userAgent) || config.defaultUserAgent
         };
         if (options === null || options === void 0 ? void 0 : options.apiKey) {
             headers['x-api-key'] = options.apiKey;
         }
-        const axiosInstance = axios__default["default"].create({
-            baseURL: (options === null || options === void 0 ? void 0 : options.baseAPIUrl) || config.baseAPIUrl,
-            headers
-        });
-        super(axiosInstance);
-        this.deltas = new DeltasClient(axiosInstance);
-        this.groups = new GroupsClient(axiosInstance);
-        this.players = new PlayersClient(axiosInstance);
-        this.records = new RecordsClient(axiosInstance);
-        this.efficiency = new EfficiencyClient(axiosInstance);
-        this.nameChanges = new NameChangesClient(axiosInstance);
-        this.competitions = new CompetitionsClient(axiosInstance);
+        super(headers, baseApiUrl);
+        this.deltas = new DeltasClient(headers, baseApiUrl);
+        this.groups = new GroupsClient(headers, baseApiUrl);
+        this.players = new PlayersClient(headers, baseApiUrl);
+        this.records = new RecordsClient(headers, baseApiUrl);
+        this.efficiency = new EfficiencyClient(headers, baseApiUrl);
+        this.nameChanges = new NameChangesClient(headers, baseApiUrl);
+        this.competitions = new CompetitionsClient(headers, baseApiUrl);
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wise-old-man/utils",
-  "version": "2.2.3",
+  "version": "3.0.0",
   "description": "A JavaScript/TypeScript client that interfaces and consumes the Wise Old Man API, an API that tracks and measures players' progress in Old School Runescape.",
   "keywords": [
     "wiseoldman",
@@ -41,7 +41,6 @@
     "typescript": "^4.7.4"
   },
   "dependencies": {
-    "axios": "^0.27.2",
     "dayjs": "^1.11.5"
   }
 }