@ibertran/fortytwo-intra-client 4.0.0 → 4.1.0

package/dist/errors/validationError.d.ts

@@ -0,0 +1,7 @@
+import { ZodError } from "zod";
+export declare class FortytwoIntraClientValidationError extends Error {
+    schemaErrors: ZodError;
+    data: unknown;
+    constructor(schemaErrors: ZodError, data: unknown);
+}
+export declare function isFortytwoIntraClientValidationError(error: unknown): error is FortytwoIntraClientValidationError;

package/dist/errors/validationError.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FortytwoIntraClientValidationError = void 0;
+exports.isFortytwoIntraClientValidationError = isFortytwoIntraClientValidationError;
+class FortytwoIntraClientValidationError extends Error {
+    schemaErrors;
+    data;
+    constructor(schemaErrors, data) {
+        // const errorMessages = schemaErrors.errors
+        // 	.map((error) => `${error.path.join(".")} - ${error.message}`)
+        // 	.join("; ");
+        const message = `Schema validation failed: `;
+        super(message);
+        this.name = "FortytwoIntraClientValidationError";
+        this.schemaErrors = schemaErrors;
+        this.data = data;
+    }
+}
+exports.FortytwoIntraClientValidationError = FortytwoIntraClientValidationError;
+function isFortytwoIntraClientValidationError(error) {
+    return error instanceof FortytwoIntraClientValidationError;
+}

package/dist/index.d.ts

@@ -37,24 +37,25 @@ export declare class FortytwoIntraClient {
     private reqHandler;
     private logSuccess;
     private logError;
-    get(endpoint: URL | string, options?: Omit<inputOptions, "body" | "perPage" | "maxPage">): Promise<any>;
-    get<S extends z.ZodType>(endpoint: URL | string, options: Omit<inputOptions, "body" | "perPage" | "maxPage"> & {
+    private validate;
+    get(endpoint: URL | string, options?: Omit<inputOptions, "body" | "perPage" | "maxPages">): Promise<any>;
+    get<S extends z.ZodType>(endpoint: URL | string, options: Omit<inputOptions, "body" | "perPage" | "maxPages"> & {
         schema: S;
     }): Promise<z.infer<S>>;
-    post(endpoint: URL | string, options?: Omit<inputOptions, "perPage" | "maxPage">): Promise<any>;
-    post<S extends z.ZodType>(endpoint: URL | string, options: Omit<inputOptions, "perPage" | "maxPage"> & {
+    post(endpoint: URL | string, options?: Omit<inputOptions, "perPage" | "maxPages">): Promise<any>;
+    post<S extends z.ZodType>(endpoint: URL | string, options: Omit<inputOptions, "perPage" | "maxPages"> & {
         schema: S;
     }): Promise<z.infer<S>>;
-    put(endpoint: URL | string, options?: Omit<inputOptions, "perPage" | "maxPage">): Promise<any>;
-    put<S extends z.ZodType>(endpoint: URL | string, options: Omit<inputOptions, "perPage" | "maxPage"> & {
+    put(endpoint: URL | string, options?: Omit<inputOptions, "perPage" | "maxPages">): Promise<any>;
+    put<S extends z.ZodType>(endpoint: URL | string, options: Omit<inputOptions, "perPage" | "maxPages"> & {
         schema: S;
     }): Promise<z.infer<S>>;
-    patch(endpoint: URL | string, options?: Omit<inputOptions, "perPage" | "maxPage">): Promise<any>;
-    patch<S extends z.ZodType>(endpoint: URL | string, options: Omit<inputOptions, "perPage" | "maxPage"> & {
+    patch(endpoint: URL | string, options?: Omit<inputOptions, "perPage" | "maxPages">): Promise<any>;
+    patch<S extends z.ZodType>(endpoint: URL | string, options: Omit<inputOptions, "perPage" | "maxPages"> & {
         schema: S;
     }): Promise<z.infer<S>>;
-    delete(endpoint: URL | string, options?: Omit<inputOptions, "perPage" | "maxPage">): Promise<any>;
-    delete<S extends z.ZodType>(endpoint: URL | string, options: Omit<inputOptions, "perPage" | "maxPage"> & {
+    delete(endpoint: URL | string, options?: Omit<inputOptions, "perPage" | "maxPages">): Promise<any>;
+    delete<S extends z.ZodType>(endpoint: URL | string, options: Omit<inputOptions, "perPage" | "maxPages"> & {
         schema: S;
     }): Promise<z.infer<S>>;
     getAll(endpoint: URL | string, options?: Omit<inputOptions, "body">): Promise<any>;
@@ -70,6 +71,6 @@ export declare class FortytwoIntraClient {
         state: string | null;
     };
     exchangeOAuthCode(code: string, redirect_uri?: string): Promise<any>;
-    tokenInfos(options?: Omit<inputOptions, "body" | "perPage" | "maxPage">): Promise<any>;
+    tokenInfos(options?: Omit<inputOptions, "body" | "perPage" | "maxPages">): Promise<any>;
 }
 export { FortytwoIntraClientError, isFortytwoIntraClientError };

package/dist/index.js

@@ -44,6 +44,8 @@ const logs_1 = require("./lib/logs");
 const errors_1 = require("./lib/errors");
 Object.defineProperty(exports, "FortytwoIntraClientError", { enumerable: true, get: function () { return errors_1.FortytwoIntraClientError; } });
 Object.defineProperty(exports, "isFortytwoIntraClientError", { enumerable: true, get: function () { return errors_1.isFortytwoIntraClientError; } });
+const zod_1 = require("zod");
+const validationError_1 = require("./errors/validationError");
 const defaultConf = {
     redirect_uri: null,
     base_url: "https://api.intra.42.fr/v2/",
@@ -113,9 +115,7 @@ class FortytwoIntraClient {
             this.access_token = await this.generateToken();
         }
         // Attach access_token
-        const accessToken = options.token
-            ? options.token.access_token
-            : this.access_token;
+        const accessToken = options.token ? options.token.access_token : this.access_token;
         // Extract query parameters from URL and combine with options.query
         const urlParams = {};
         url.searchParams.forEach((value, key) => {
@@ -125,7 +125,7 @@ class FortytwoIntraClient {
         const combinedParams = { ...urlParams, ...query };
         // Create clean URL without query parameters
         const cleanUrl = new URL(url);
-        cleanUrl.search = '';
+        cleanUrl.search = "";
         // Use the rate-limited axios instance
         return this.axiosInstance.request({
             method: method.toLowerCase(),
@@ -183,6 +183,20 @@ class FortytwoIntraClient {
             console.log(line, logBody ? body : "");
         }
     }
+    validate(data, schema) {
+        if (!schema) {
+            return data;
+        }
+        try {
+            return schema.parse(data);
+        }
+        catch (err) {
+            if (err instanceof zod_1.z.ZodError) {
+                throw new validationError_1.FortytwoIntraClientValidationError(err, data);
+            }
+            throw err;
+        }
+    }
     async get(endpoint, options = {}) {
         if (endpoint instanceof URL === false) {
             endpoint = new URL(endpoint, this.base_url);
@@ -195,10 +209,7 @@ class FortytwoIntraClient {
             errLogBody: this.errLogBody,
             ...options,
         });
-        if (options.schema) {
-            return options.schema.parse(res.data);
-        }
-        return res.data;
+        return this.validate(res.data, options.schema);
     }
     async post(endpoint, options = {}) {
         if (endpoint instanceof URL === false) {
@@ -212,10 +223,7 @@ class FortytwoIntraClient {
             errLogBody: this.errLogBody,
             ...options,
         });
-        if (options.schema) {
-            return options.schema.parse(res.data);
-        }
-        return res.data;
+        return this.validate(res.data, options.schema);
     }
     async put(endpoint, options = {}) {
         if (endpoint instanceof URL === false) {
@@ -229,10 +237,7 @@ class FortytwoIntraClient {
             errLogBody: this.errLogBody,
             ...options,
         });
-        if (options.schema) {
-            return options.schema.parse(res.data);
-        }
-        return res.data;
+        return this.validate(res.data, options.schema);
     }
     async patch(endpoint, options = {}) {
         if (endpoint instanceof URL === false) {
@@ -246,10 +251,7 @@ class FortytwoIntraClient {
             errLogBody: this.errLogBody,
             ...options,
         });
-        if (options.schema) {
-            return options.schema.parse(res.data);
-        }
-        return res.data;
+        return this.validate(res.data, options.schema);
     }
     async delete(endpoint, options = {}) {
         if (endpoint instanceof URL === false) {
@@ -263,10 +265,7 @@ class FortytwoIntraClient {
             errLogBody: this.errLogBody,
             ...options,
         });
-        if (options.schema) {
-            return options.schema.parse(res.data);
-        }
-        return res.data;
+        return this.validate(res.data, options.schema);
     }
     async getAll(endpoint, options = {}) {
         if (endpoint instanceof URL === false) {
@@ -287,26 +286,19 @@ class FortytwoIntraClient {
                 ...options.query,
                 page: 1,
                 per_page: perPage,
-            }
+            },
         });
         if (!Array.isArray(firstPage.data)) {
-            if (options.schema) {
-                return options.schema.parse(firstPage.data);
-            }
-            return firstPage.data;
+            return this.validate(firstPage.data, options.schema);
         }
         let lastPage;
         try {
             lastPage = Math.min((0, pagination_1.getLastPage)(firstPage.headers["link"]), options.maxPages || Infinity);
         }
         catch (err) {
-            if (options.schema) {
-                return options.schema.parse(firstPage.data);
-            }
-            return firstPage.data;
+            return this.validate(firstPage.data, options.schema);
         }
-        const promises = Array.from({ length: lastPage - 1 }, (_, i) => i + 2)
-            .map(pageNumber => this.reqHandler(url, {
+        const promises = Array.from({ length: lastPage - 1 }, (_, i) => i + 2).map((pageNumber) => this.reqHandler(url, {
             method: "GET",
             attempt: 0,
             currpage: pageNumber,
@@ -319,14 +311,11 @@ class FortytwoIntraClient {
                 ...options.query,
                 page: pageNumber,
                 per_page: perPage,
-            }
+            },
         }));
         const otherPages = await Promise.all(promises);
         const allData = [...firstPage.data, ...otherPages.flatMap((res) => res.data)];
-        if (options.schema) {
-            return options.schema.parse(allData);
-        }
-        return allData;
+        return this.validate(allData, options.schema);
     }
     URL(endpoint) {
         return new URL(endpoint, this.base_url);

package/dist/lib/errors.js

@@ -11,9 +11,7 @@ class FortytwoIntraClientError extends Error {
         const route = error.config?.url ?? null;
         const statusCode = error.response?.status ?? NaN;
         const statusText = error.response?.statusText ?? "Unknown";
-        const message = method && route
-            ? `${method} ${route} - HTTP ${statusCode} ${statusText}`
-            : error.message;
+        const message = method && route ? `${method} ${route} - HTTP ${statusCode} ${statusText}` : error.message;
         super(message);
         this.name = "FortytwoIntraClientError";
         this.statusCode = statusCode;

package/dist/lib/logs.js

@@ -15,7 +15,7 @@ function formatQueryParams(params) {
         depth: Infinity,
         compact: true,
         breakLength: Infinity,
-        colors: true
+        colors: true,
     });
 }
 function getLogLine(res, options) {

package/dist/lib/pagination.js

@@ -5,9 +5,7 @@ function getLastPage(header) {
     if (!header) {
         throw Error("No pagination link header");
     }
-    const paginationlinks = header
-        .split(",")
-        .reduce((links, part) => {
+    const paginationlinks = header.split(",").reduce((links, part) => {
         const match = part.match(/<([^>]+)>\s*;\s*rel="([^"]+)"/);
         if (match) {
             const url = match[1];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ibertran/fortytwo-intra-client",
-	"version": "4.0.0",
+	"version": "4.1.0",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
 	"author": {