klaim 1.5.1 → 1.6.1

package/README.md

@@ -1,10 +1,3 @@
-# Klaim 📦
-
-[![JSR Score](https://jsr.io/badges/@antharuu/klaim/score)](https://jsr.io/@antharuu/klaim)
-
-Klaim is a lightweight TypeScript library designed to manage APIs and record requests, optimized for an optimal user
-experience.
-
 ## 📚 Table of Contents
 
 - [Features](#-features)
@@ -17,6 +10,7 @@ experience.
     - [Hook Subscription](#hook-subscription)
     - [Caching Requests](#caching-requests)
     - [Retry Mechanism](#retry-mechanism)
+    - [Response Validation](#response-validation)
 - [Links](#-links)
 - [Contributing](#-contributing)
 - [License](#-license)
@@ -32,6 +26,7 @@ experience.
 - **Caching**: Enable caching on requests to reduce network load and improve performance.
 - **Retry Mechanism**: Automatically retry failed requests to enhance reliability.
 - **TypeScript Support**: Fully typed for enhanced code quality and developer experience.
+- **Response Validation**: Validate responses using schemas for increased reliability and consistency.
 
 ## 📥 Installation
 
@@ -218,6 +213,40 @@ Api.create("hello", "https://jsonplaceholder.typicode.com/", () => {
 
 Now, when a request fails, it will be retried the specified number of times before ultimately failing.
 
+### Response Validation
+
+You can use [Yup](https://www.npmjs.com/package/yup) to validate the response schema for increased reliability and consistency. You can specify a schema for
+individual routes to ensure the response data conforms to the expected structure.
+
+⚠️ **Note**: This feature requires the `yup` package to be installed.
+
+#### Adding Validation to Individual Routes
+
+Enable validation on individual routes:
+
+```typescript
+import * as yup from 'yup';
+
+// Define the schema using Yup
+const todoSchema = yup.object().shape({
+    userId: yup.number().required(),
+    id: yup.number().min(1).max(10).required(),
+    title: yup.string().required(),
+    completed: yup.boolean().required()
+});
+
+Api.create("hello", "https://jsonplaceholder.typicode.com/", () => {
+    // Get a specific todo by id with validation
+    Route.get<Todo>("getTodo", "todos/[id]").validate(todoSchema);
+});
+
+// This request will fail because the id is out of range
+const todoFail = await Klaim.hello.getTodo<Todo>({id: 15});
+
+// This request will succeed
+const todo = await Klaim.hello.getTodo<Todo>({id: 1});
+```
+
 ## 🔗 Links
 
 - [NPM](https://www.npmjs.com/package/klaim)

package/deno.json

@@ -1,6 +1,6 @@
 {
     "name": "@antharuu/klaim",
-    "version": "1.5.1",
+    "version": "1.6.1",
     "description": "Klaim is a lightweight TypeScript library designed to manage APIs and record requests, optimized for an optimal user experience.",
     "repository": {
         "type": "git",

package/dist/klaim.cjs

@@ -1 +1 @@
-"use strict";var S=Object.defineProperty;var k=(n,t,a)=>t in n?S(n,t,{enumerable:!0,configurable:!0,writable:!0,value:a}):n[t]=a;var i=(n,t,a)=>k(n,typeof t!="symbol"?t+"":t,a);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});function C(n){return n.replace(/([-_][a-z])/gi,t=>t.toUpperCase().replace("-","").replace("_","")).replace(/(^\w)/,t=>t.toLowerCase())}function O(n){return n.trim().replace(/^\/|\/$/g,"")}class P{constructor(t,a,r={}){i(this,"name");i(this,"url");i(this,"headers");i(this,"callbacks",{before:null,after:null,call:null});i(this,"cache",!1);i(this,"retry",!1);this.name=C(t),this.name!==t&&console.warn(`Name "${t}" has been camelCased to "${this.name}"`),this.url=O(a),this.headers=r||{}}before(t){return this.callbacks.before=t,this}after(t){return this.callbacks.after=t,this}onCall(t){return this.callbacks.call=t,this}withCache(t=20){return this.cache=t,this}withRetry(t=2){return this.retry=t,this}}const u=class u{constructor(){i(this,"cache");this.cache=new Map}static get i(){return u._instance||(u._instance=new u),u._instance}set(t,a,r=0){const e=Date.now()+r;this.cache.set(t,{data:a,expiry:e})}has(t){const a=this.cache.get(t);return a?Date.now()>a.expiry?(this.cache.delete(t),!1):!0:!1}get(t){return this.has(t)?this.cache.get(t).data:null}};i(u,"_instance");let f=u;function _(n){let r=2166136261;for(let s=0;s<n.length;s++)r^=n.charCodeAt(s),r*=16777619;let e=(r>>>0).toString(16).padStart(8,"0");for(;e.length<32;)r^=e.charCodeAt(e.length%e.length),r*=16777619,e+=(r>>>0).toString(16).padStart(8,"0");return e.substring(0,32)}async function I(n,t,a){const r=`${n.toString()}${JSON.stringify(t)}`,e=_(r);if(f.i.has(e))return f.i.get(e);const c=await(await fetch(n,t)).json();return f.i.set(e,c,a),c}class E{static subscribe(t,a){this._callbacks.set(t,a)}static run(t){const a=this._callbacks.get(t);a&&a()}}i(E,"_callbacks",new Map);var $=(n=>(n.GET="GET",n.POST="POST",n.PUT="PUT",n.DELETE="DELETE",n.PATCH="PATCH",n.OPTIONS="OPTIONS",n))($||{});class T extends P{constructor(a,r,e,s="GET"){super(a,r,e);i(this,"api","undefined");i(this,"method");i(this,"arguments",new Set);this.method=s,this.detectArguments()}static createRoute(a,r,e,s){const c=new T(a,r,e,s);return o.i.registerRoute(c),c}static get(a,r,e={}){return this.createRoute(a,r,e,"GET")}static post(a,r,e){return this.createRoute(a,r,e,"POST")}static put(a,r,e){return this.createRoute(a,r,e,"PUT")}static delete(a,r,e){return this.createRoute(a,r,e,"DELETE")}static patch(a,r,e){return this.createRoute(a,r,e,"PATCH")}static options(a,r,e){return this.createRoute(a,r,e,"OPTIONS")}detectArguments(){const a=this.url.match(/\[([^\]]+)]/g);a&&a.forEach(r=>{const e=r.replace("[","").replace("]","");this.arguments.add(e)})}}const b={};async function D(n,t,a={},r={}){let e=N(`${n.url}/${t.url}`,t,a),s={};r&&t.method!==$.GET&&(s.body=JSON.stringify(r)),s.headers={"Content-Type":"application/json",...n.headers,...t.headers},s.method=t.method;const{beforeRoute:c,beforeApi:h,beforeUrl:d,beforeConfig:w}=R({route:t,api:n,url:e,config:s});e=d,s=w,n=o.updateApi(h),t=o.updateRoute(c);const p=await H(n,t,e,s),{afterRoute:g,afterApi:m,afterData:A}=x({route:t,api:n,response:p,data:p});return o.updateApi(m),o.updateRoute(g),E.run(`${n.name}.${t.name}`),A}async function U(n,t,a,r){return n?await I(t,a,r.cache):await(await fetch(t,a)).json()}async function H(n,t,a,r){var p,g,m;const e=n.cache||t.cache,s=t.retry||n.retry||0;let c,h=0,d=!1;const w=((p=t.callbacks)==null?void 0:p.call)!==null?(g=t.callbacks)==null?void 0:g.call:(m=n.callbacks)==null?void 0:m.call;for(;h<=s&&!d;){w&&w({});try{c=await U(!!e,a,r,n),d=!0}catch(A){if(h++,h>s)throw A.message=`Failed to fetch ${a} after ${s} attempts`,A}}return c}function N(n,t,a){let r=n;return t.arguments.forEach(e=>{if(a[e]===void 0)throw new Error(`Argument ${e} is missing`);r=r.replace(`[${e}]`,a[e])}),r}function R({route:n,api:t,url:a,config:r}){var s,c;const e=(c=(s=n.callbacks).before)==null?void 0:c.call(s,{route:n,api:t,url:a,config:r});return{beforeRoute:(e==null?void 0:e.route)||n,beforeApi:(e==null?void 0:e.api)||t,beforeUrl:(e==null?void 0:e.url)||a,beforeConfig:(e==null?void 0:e.config)||r}}function x({route:n,api:t,response:a,data:r}){var s,c;const e=(c=(s=n.callbacks).after)==null?void 0:c.call(s,{route:n,api:t,response:a,data:r});return{afterRoute:(e==null?void 0:e.route)||n,afterApi:(e==null?void 0:e.api)||t,afterResponse:(e==null?void 0:e.response)||a,afterData:(e==null?void 0:e.data)||r}}const l=class l{constructor(){i(this,"_apis",new Map);i(this,"_currentApi",null)}static get i(){return l._instance||(l._instance=new l),l._instance}registerApi(t){this._apis.set(t.name,t),b[t.name]={}}setCurrent(t){const a=this._apis.get(t);if(!a)throw new Error(`API ${t} not found`);this._currentApi=a}clearCurrent(){this._currentApi=null}registerRoute(t){if(!this._currentApi)throw new Error("No current API set, use Route only inside Api.create callback");t.api=this._currentApi.name,this._currentApi.routes.set(t.name,t),this.addToKlaimRoute(t.api,t)}getApi(t){return this._apis.get(t)}getRoute(t,a){const r=this._apis.get(t);if(!r)throw new Error(`API ${t} not found`);return r.routes.get(a)}static updateApi(t){return l.i._apis.has(t.name)||l.i.registerApi(t),l.i._apis.set(t.name,t),t}static updateRoute(t){const a=l.i._apis.get(t.api);if(!a)throw new Error(`API ${t.api} not found`);return a.routes.set(t.name,t),t}addToKlaimRoute(t,a){b[t][a.name]=async(r={},e={})=>{const s=l.i._apis.get(t);if(!s)throw new Error(`API ${a.api} not found`);return D(s,a,r,e)}}};i(l,"_instance");let o=l;class y extends P{constructor(){super(...arguments);i(this,"routes",new Map)}static create(a,r,e,s={}){const c=C(a);c!==a&&console.warn(`API name "${a}" has been camelCased to "${c}"`);const h=new y(c,r,s);return o.i.registerApi(h),o.i.setCurrent(c),e(),o.i.clearCurrent(),h}}exports.Api=y;exports.Hook=E;exports.Klaim=b;exports.Registry=o;exports.Route=T;
+"use strict";var S=Object.defineProperty;var k=(r,t,e)=>t in r?S(r,t,{enumerable:!0,configurable:!0,writable:!0,value:e}):r[t]=e;var i=(r,t,e)=>k(r,typeof t!="symbol"?t+"":t,e);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});function C(r){return r.replace(/([-_][a-z])/gi,t=>t.toUpperCase().replace("-","").replace("_","")).replace(/(^\w)/,t=>t.toLowerCase())}function O(r){return r.trim().replace(/^\/|\/$/g,"")}class P{constructor(t,e,s={}){i(this,"name");i(this,"url");i(this,"headers");i(this,"callbacks",{before:null,after:null,call:null});i(this,"cache",!1);i(this,"retry",!1);this.name=C(t),this.name!==t&&console.warn(`Name "${t}" has been camelCased to "${this.name}"`),this.url=O(e),this.headers=s||{}}before(t){return this.callbacks.before=t,this}after(t){return this.callbacks.after=t,this}onCall(t){return this.callbacks.call=t,this}withCache(t=20){return this.cache=t,this}withRetry(t=2){return this.retry=t,this}}const p=class p{constructor(){i(this,"cache");this.cache=new Map}static get i(){return p._instance||(p._instance=new p),p._instance}set(t,e,s=0){const a=Date.now()+s;this.cache.set(t,{data:e,expiry:a})}has(t){const e=this.cache.get(t);return e?Date.now()>e.expiry?(this.cache.delete(t),!1):!0:!1}get(t){return this.has(t)?this.cache.get(t).data:null}};i(p,"_instance");let f=p;function _(r){let s=2166136261;for(let n=0;n<r.length;n++)s^=r.charCodeAt(n),s*=16777619;let a=(s>>>0).toString(16).padStart(8,"0");for(;a.length<32;)s^=a.charCodeAt(a.length%a.length),s*=16777619,a+=(s>>>0).toString(16).padStart(8,"0");return a.substring(0,32)}async function I(r,t,e){const s=`${r.toString()}${JSON.stringify(t)}`,a=_(s);if(f.i.has(a))return f.i.get(a);const c=await(await fetch(r,t)).json();return f.i.set(a,c,e),c}class E{static subscribe(t,e){this._callbacks.set(t,e)}static run(t){const e=this._callbacks.get(t);e&&e()}}i(E,"_callbacks",new Map);var $=(r=>(r.GET="GET",r.POST="POST",r.PUT="PUT",r.DELETE="DELETE",r.PATCH="PATCH",r.OPTIONS="OPTIONS",r))($||{});class T extends P{constructor(e,s,a,n="GET"){super(e,s,a);i(this,"api","undefined");i(this,"method");i(this,"arguments",new Set);i(this,"schema");this.method=n,this.detectArguments()}static createRoute(e,s,a,n){const c=new T(e,s,a,n);return o.i.registerRoute(c),c}static get(e,s,a={}){return this.createRoute(e,s,a,"GET")}static post(e,s,a){return this.createRoute(e,s,a,"POST")}static put(e,s,a){return this.createRoute(e,s,a,"PUT")}static delete(e,s,a){return this.createRoute(e,s,a,"DELETE")}static patch(e,s,a){return this.createRoute(e,s,a,"PATCH")}static options(e,s,a){return this.createRoute(e,s,a,"OPTIONS")}detectArguments(){const e=this.url.match(/\[([^\]]+)]/g);e&&e.forEach(s=>{const a=s.replace("[","").replace("]","");this.arguments.add(a)})}validate(e){return this.schema=e,this}}const b={};async function v(r,t,e={},s={}){let a=H(`${r.url}/${t.url}`,t,e),n={};s&&t.method!==$.GET&&(n.body=JSON.stringify(s)),n.headers={"Content-Type":"application/json",...r.headers,...t.headers},n.method=t.method;const{beforeRoute:c,beforeApi:h,beforeUrl:d,beforeConfig:m}=N({route:t,api:r,url:a,config:n});a=d,n=m,r=o.updateApi(h),t=o.updateRoute(c);let u=await U(r,t,a,n);t.schema&&"validate"in t.schema&&(u=await t.schema.validate(u));const{afterRoute:w,afterApi:g,afterData:A}=R({route:t,api:r,response:u,data:u});return o.updateApi(g),o.updateRoute(w),E.run(`${r.name}.${t.name}`),A}async function D(r,t,e,s){return r?await I(t,e,s.cache):await(await fetch(t,e)).json()}async function U(r,t,e,s){var u,w,g;const a=r.cache||t.cache,n=t.retry||r.retry||0;let c,h=0,d=!1;const m=((u=t.callbacks)==null?void 0:u.call)!==null?(w=t.callbacks)==null?void 0:w.call:(g=r.callbacks)==null?void 0:g.call;for(;h<=n&&!d;){m&&m({});try{c=await D(!!a,e,s,r),d=!0}catch(A){if(h++,h>n)throw A.message=`Failed to fetch ${e} after ${n} attempts`,A}}return c}function H(r,t,e){let s=r;return t.arguments.forEach(a=>{if(e[a]===void 0)throw new Error(`Argument ${a} is missing`);s=s.replace(`[${a}]`,e[a])}),s}function N({route:r,api:t,url:e,config:s}){var n,c;const a=(c=(n=r.callbacks).before)==null?void 0:c.call(n,{route:r,api:t,url:e,config:s});return{beforeRoute:(a==null?void 0:a.route)||r,beforeApi:(a==null?void 0:a.api)||t,beforeUrl:(a==null?void 0:a.url)||e,beforeConfig:(a==null?void 0:a.config)||s}}function R({route:r,api:t,response:e,data:s}){var n,c;const a=(c=(n=r.callbacks).after)==null?void 0:c.call(n,{route:r,api:t,response:e,data:s});return{afterRoute:(a==null?void 0:a.route)||r,afterApi:(a==null?void 0:a.api)||t,afterResponse:(a==null?void 0:a.response)||e,afterData:(a==null?void 0:a.data)||s}}const l=class l{constructor(){i(this,"_apis",new Map);i(this,"_currentApi",null)}static get i(){return l._instance||(l._instance=new l),l._instance}registerApi(t){this._apis.set(t.name,t),b[t.name]={}}setCurrent(t){const e=this._apis.get(t);if(!e)throw new Error(`API ${t} not found`);this._currentApi=e}clearCurrent(){this._currentApi=null}registerRoute(t){if(!this._currentApi)throw new Error("No current API set, use Route only inside Api.create callback");t.api=this._currentApi.name,this._currentApi.routes.set(t.name,t),this.addToKlaimRoute(t.api,t)}getApi(t){return this._apis.get(t)}getRoute(t,e){const s=this._apis.get(t);if(!s)throw new Error(`API ${t} not found`);return s.routes.get(e)}static updateApi(t){return l.i._apis.has(t.name)||l.i.registerApi(t),l.i._apis.set(t.name,t),t}static updateRoute(t){const e=l.i._apis.get(t.api);if(!e)throw new Error(`API ${t.api} not found`);return e.routes.set(t.name,t),t}addToKlaimRoute(t,e){b[t][e.name]=async(s={},a={})=>{const n=l.i._apis.get(t);if(!n)throw new Error(`API ${e.api} not found`);return v(n,e,s,a)}}};i(l,"_instance");let o=l;class y extends P{constructor(){super(...arguments);i(this,"routes",new Map)}static create(e,s,a,n={}){const c=C(e);c!==e&&console.warn(`API name "${e}" has been camelCased to "${c}"`);const h=new y(c,s,n);return o.i.registerApi(h),o.i.setCurrent(c),a(),o.i.clearCurrent(),h}}exports.Api=y;exports.Hook=E;exports.Klaim=b;exports.Registry=o;exports.Route=T;

package/dist/klaim.es.js

@@ -1,11 +1,11 @@
 var S = Object.defineProperty;
-var k = (n, t, a) => t in n ? S(n, t, { enumerable: !0, configurable: !0, writable: !0, value: a }) : n[t] = a;
-var i = (n, t, a) => k(n, typeof t != "symbol" ? t + "" : t, a);
-function E(n) {
-  return n.replace(/([-_][a-z])/gi, (t) => t.toUpperCase().replace("-", "").replace("_", "")).replace(/(^\w)/, (t) => t.toLowerCase());
+var k = (r, t, e) => t in r ? S(r, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : r[t] = e;
+var i = (r, t, e) => k(r, typeof t != "symbol" ? t + "" : t, e);
+function E(r) {
+  return r.replace(/([-_][a-z])/gi, (t) => t.toUpperCase().replace("-", "").replace("_", "")).replace(/(^\w)/, (t) => t.toLowerCase());
 }
-function O(n) {
-  return n.trim().replace(/^\/|\/$/g, "");
+function O(r) {
+  return r.trim().replace(/^\/|\/$/g, "");
 }
 class T {
   /**
@@ -15,7 +15,7 @@ class T {
    * @param url - The base URL of the element
    * @param headers - The headers to be sent with each request
    */
-  constructor(t, a, r = {}) {
+  constructor(t, e, s = {}) {
     i(this, "name");
     i(this, "url");
     i(this, "headers");
@@ -35,7 +35,7 @@ class T {
     });
     i(this, "cache", !1);
     i(this, "retry", !1);
-    this.name = E(t), this.name !== t && console.warn(`Name "${t}" has been camelCased to "${this.name}"`), this.url = O(a), this.headers = r || {};
+    this.name = E(t), this.name !== t && console.warn(`Name "${t}" has been camelCased to "${this.name}"`), this.url = O(e), this.headers = s || {};
   }
   /**
    * Sets the before callback
@@ -83,7 +83,7 @@ class T {
     return this.retry = t, this;
   }
 }
-const u = class u {
+const p = class p {
   /**
    * Private constructor to prevent instantiation from outside the class.
    */
@@ -97,7 +97,7 @@ const u = class u {
    * @returns The singleton instance of Cache.
    */
   static get i() {
-    return u._instance || (u._instance = new u()), u._instance;
+    return p._instance || (p._instance = new p()), p._instance;
   }
   /**
    * Sets the cache for a specific key.
@@ -106,9 +106,9 @@ const u = class u {
    * @param value The value to be cached.
    * @param ttl Time to live in milliseconds.
    */
-  set(t, a, r = 0) {
-    const e = Date.now() + r;
-    this.cache.set(t, { data: a, expiry: e });
+  set(t, e, s = 0) {
+    const a = Date.now() + s;
+    this.cache.set(t, { data: e, expiry: a });
   }
   /**
    * Checks if the cache has a valid entry for the given key.
@@ -117,8 +117,8 @@ const u = class u {
    * @returns True if a valid cache entry exists, otherwise false.
    */
   has(t) {
-    const a = this.cache.get(t);
-    return a ? Date.now() > a.expiry ? (this.cache.delete(t), !1) : !0 : !1;
+    const e = this.cache.get(t);
+    return e ? Date.now() > e.expiry ? (this.cache.delete(t), !1) : !0 : !1;
   }
   /**
    * Gets the cached value for the given key.
@@ -130,23 +130,23 @@ const u = class u {
     return this.has(t) ? this.cache.get(t).data : null;
   }
 };
-i(u, "_instance");
-let f = u;
-function _(n) {
-  let r = 2166136261;
-  for (let s = 0; s < n.length; s++)
-    r ^= n.charCodeAt(s), r *= 16777619;
-  let e = (r >>> 0).toString(16).padStart(8, "0");
-  for (; e.length < 32; )
-    r ^= e.charCodeAt(e.length % e.length), r *= 16777619, e += (r >>> 0).toString(16).padStart(8, "0");
-  return e.substring(0, 32);
+i(p, "_instance");
+let f = p;
+function _(r) {
+  let s = 2166136261;
+  for (let n = 0; n < r.length; n++)
+    s ^= r.charCodeAt(n), s *= 16777619;
+  let a = (s >>> 0).toString(16).padStart(8, "0");
+  for (; a.length < 32; )
+    s ^= a.charCodeAt(a.length % a.length), s *= 16777619, a += (s >>> 0).toString(16).padStart(8, "0");
+  return a.substring(0, 32);
 }
-async function I(n, t, a) {
-  const r = `${n.toString()}${JSON.stringify(t)}`, e = _(r);
-  if (f.i.has(e))
-    return f.i.get(e);
-  const c = await (await fetch(n, t)).json();
-  return f.i.set(e, c, a), c;
+async function I(r, t, e) {
+  const s = `${r.toString()}${JSON.stringify(t)}`, a = _(s);
+  if (f.i.has(a))
+    return f.i.get(a);
+  const c = await (await fetch(r, t)).json();
+  return f.i.set(a, c, e), c;
 }
 class C {
   /**
@@ -155,8 +155,8 @@ class C {
    * @param routeName - The name of the route to subscribe to
    * @param callback - The callback to subscribe
    */
-  static subscribe(t, a) {
-    this._callbacks.set(t, a);
+  static subscribe(t, e) {
+    this._callbacks.set(t, e);
   }
   /**
    * Runs the hook
@@ -164,12 +164,12 @@ class C {
    * @param routeName - The name of the route to run
    */
   static run(t) {
-    const a = this._callbacks.get(t);
-    a && a();
+    const e = this._callbacks.get(t);
+    e && e();
   }
 }
 i(C, "_callbacks", /* @__PURE__ */ new Map());
-var y = /* @__PURE__ */ ((n) => (n.GET = "GET", n.POST = "POST", n.PUT = "PUT", n.DELETE = "DELETE", n.PATCH = "PATCH", n.OPTIONS = "OPTIONS", n))(y || {});
+var y = /* @__PURE__ */ ((r) => (r.GET = "GET", r.POST = "POST", r.PUT = "PUT", r.DELETE = "DELETE", r.PATCH = "PATCH", r.OPTIONS = "OPTIONS", r))(y || {});
 class $ extends T {
   /**
    * Constructor
@@ -179,12 +179,13 @@ class $ extends T {
    * @param headers - The headers to be sent with the request
    * @param method - The HTTP method of the route
    */
-  constructor(a, r, e, s = "GET") {
-    super(a, r, e);
+  constructor(e, s, a, n = "GET") {
+    super(e, s, a);
     i(this, "api", "undefined");
     i(this, "method");
     i(this, "arguments", /* @__PURE__ */ new Set());
-    this.method = s, this.detectArguments();
+    i(this, "schema");
+    this.method = n, this.detectArguments();
   }
   /**
    * Creates a new route
@@ -195,9 +196,9 @@ class $ extends T {
    * @param method - The HTTP method of the route
    * @returns The new route
    */
-  static createRoute(a, r, e, s) {
-    const c = new $(a, r, e, s);
-    return o.i.registerRoute(c), c;
+  static createRoute(e, s, a, n) {
+    const c = new $(e, s, a, n);
+    return h.i.registerRoute(c), c;
   }
   /**
    * Creates a new route with the GET method
@@ -207,11 +208,11 @@ class $ extends T {
    * @param headers - The headers to be sent with the request
    * @returns The new route
    */
-  static get(a, r, e = {}) {
+  static get(e, s, a = {}) {
     return this.createRoute(
-      a,
-      r,
       e,
+      s,
+      a,
       "GET"
       /* GET */
     );
@@ -224,11 +225,11 @@ class $ extends T {
    * @param headers - The headers to be sent with the request
    * @returns The new route
    */
-  static post(a, r, e) {
+  static post(e, s, a) {
     return this.createRoute(
-      a,
-      r,
       e,
+      s,
+      a,
       "POST"
       /* POST */
     );
@@ -241,11 +242,11 @@ class $ extends T {
    * @param headers - The headers to be sent with the request
    * @returns The new route
    */
-  static put(a, r, e) {
+  static put(e, s, a) {
     return this.createRoute(
-      a,
-      r,
       e,
+      s,
+      a,
       "PUT"
       /* PUT */
     );
@@ -258,11 +259,11 @@ class $ extends T {
    * @param headers - The headers to be sent with the request
    * @returns The new route
    */
-  static delete(a, r, e) {
+  static delete(e, s, a) {
     return this.createRoute(
-      a,
-      r,
       e,
+      s,
+      a,
       "DELETE"
       /* DELETE */
     );
@@ -275,11 +276,11 @@ class $ extends T {
    * @param headers - The headers to be sent with the request
    * @returns The new route
    */
-  static patch(a, r, e) {
+  static patch(e, s, a) {
     return this.createRoute(
-      a,
-      r,
       e,
+      s,
+      a,
       "PATCH"
       /* PATCH */
     );
@@ -292,11 +293,11 @@ class $ extends T {
    * @param headers - The headers to be sent with the request
    * @returns The new route
    */
-  static options(a, r, e) {
+  static options(e, s, a) {
     return this.createRoute(
-      a,
-      r,
       e,
+      s,
+      a,
       "OPTIONS"
       /* OPTIONS */
     );
@@ -305,80 +306,91 @@ class $ extends T {
    * Detects the arguments in the URL
    */
   detectArguments() {
-    const a = this.url.match(/\[([^\]]+)]/g);
-    a && a.forEach((r) => {
-      const e = r.replace("[", "").replace("]", "");
-      this.arguments.add(e);
+    const e = this.url.match(/\[([^\]]+)]/g);
+    e && e.forEach((s) => {
+      const a = s.replace("[", "").replace("]", "");
+      this.arguments.add(a);
     });
   }
+  /**
+   * Schema validation (Yup)
+   *
+   * @param schema - The schema to validate
+   * @returns The route
+   */
+  validate(e) {
+    return this.schema = e, this;
+  }
 }
 const b = {};
-async function D(n, t, a = {}, r = {}) {
-  let e = N(`${n.url}/${t.url}`, t, a), s = {};
-  r && t.method !== y.GET && (s.body = JSON.stringify(r)), s.headers = {
+async function D(r, t, e = {}, s = {}) {
+  let a = x(`${r.url}/${t.url}`, t, e), n = {};
+  s && t.method !== y.GET && (n.body = JSON.stringify(s)), n.headers = {
     "Content-Type": "application/json",
-    ...n.headers,
+    ...r.headers,
     ...t.headers
-  }, s.method = t.method;
+  }, n.method = t.method;
   const {
     beforeRoute: c,
-    beforeApi: h,
-    beforeUrl: w,
-    beforeConfig: d
-  } = H({ route: t, api: n, url: e, config: s });
-  e = w, s = d, n = o.updateApi(h), t = o.updateRoute(c);
-  const p = await x(n, t, e, s), {
-    afterRoute: g,
-    afterApi: m,
+    beforeApi: o,
+    beforeUrl: d,
+    beforeConfig: m
+  } = N({ route: t, api: r, url: a, config: n });
+  a = d, n = m, r = h.updateApi(o), t = h.updateRoute(c);
+  let u = await v(r, t, a, n);
+  t.schema && "validate" in t.schema && (u = await t.schema.validate(u));
+  const {
+    afterRoute: w,
+    afterApi: g,
     afterData: A
-  } = G({ route: t, api: n, response: p, data: p });
-  return o.updateApi(m), o.updateRoute(g), C.run(`${n.name}.${t.name}`), A;
+  } = H({ route: t, api: r, response: u, data: u });
+  return h.updateApi(g), h.updateRoute(w), C.run(`${r.name}.${t.name}`), A;
 }
-async function U(n, t, a, r) {
-  return n ? await I(t, a, r.cache) : await (await fetch(t, a)).json();
+async function U(r, t, e, s) {
+  return r ? await I(t, e, s.cache) : await (await fetch(t, e)).json();
 }
-async function x(n, t, a, r) {
-  var p, g, m;
-  const e = n.cache || t.cache, s = t.retry || n.retry || 0;
-  let c, h = 0, w = !1;
-  const d = ((p = t.callbacks) == null ? void 0 : p.call) !== null ? (g = t.callbacks) == null ? void 0 : g.call : (m = n.callbacks) == null ? void 0 : m.call;
-  for (; h <= s && !w; ) {
-    d && d({});
+async function v(r, t, e, s) {
+  var u, w, g;
+  const a = r.cache || t.cache, n = t.retry || r.retry || 0;
+  let c, o = 0, d = !1;
+  const m = ((u = t.callbacks) == null ? void 0 : u.call) !== null ? (w = t.callbacks) == null ? void 0 : w.call : (g = r.callbacks) == null ? void 0 : g.call;
+  for (; o <= n && !d; ) {
+    m && m({});
     try {
-      c = await U(!!e, a, r, n), w = !0;
+      c = await U(!!a, e, s, r), d = !0;
     } catch (A) {
-      if (h++, h > s)
-        throw A.message = `Failed to fetch ${a} after ${s} attempts`, A;
+      if (o++, o > n)
+        throw A.message = `Failed to fetch ${e} after ${n} attempts`, A;
     }
   }
   return c;
 }
-function N(n, t, a) {
-  let r = n;
-  return t.arguments.forEach((e) => {
-    if (a[e] === void 0)
-      throw new Error(`Argument ${e} is missing`);
-    r = r.replace(`[${e}]`, a[e]);
-  }), r;
+function x(r, t, e) {
+  let s = r;
+  return t.arguments.forEach((a) => {
+    if (e[a] === void 0)
+      throw new Error(`Argument ${a} is missing`);
+    s = s.replace(`[${a}]`, e[a]);
+  }), s;
 }
-function H({ route: n, api: t, url: a, config: r }) {
-  var s, c;
-  const e = (c = (s = n.callbacks).before) == null ? void 0 : c.call(s, { route: n, api: t, url: a, config: r });
+function N({ route: r, api: t, url: e, config: s }) {
+  var n, c;
+  const a = (c = (n = r.callbacks).before) == null ? void 0 : c.call(n, { route: r, api: t, url: e, config: s });
   return {
-    beforeRoute: (e == null ? void 0 : e.route) || n,
-    beforeApi: (e == null ? void 0 : e.api) || t,
-    beforeUrl: (e == null ? void 0 : e.url) || a,
-    beforeConfig: (e == null ? void 0 : e.config) || r
+    beforeRoute: (a == null ? void 0 : a.route) || r,
+    beforeApi: (a == null ? void 0 : a.api) || t,
+    beforeUrl: (a == null ? void 0 : a.url) || e,
+    beforeConfig: (a == null ? void 0 : a.config) || s
   };
 }
-function G({ route: n, api: t, response: a, data: r }) {
-  var s, c;
-  const e = (c = (s = n.callbacks).after) == null ? void 0 : c.call(s, { route: n, api: t, response: a, data: r });
+function H({ route: r, api: t, response: e, data: s }) {
+  var n, c;
+  const a = (c = (n = r.callbacks).after) == null ? void 0 : c.call(n, { route: r, api: t, response: e, data: s });
   return {
-    afterRoute: (e == null ? void 0 : e.route) || n,
-    afterApi: (e == null ? void 0 : e.api) || t,
-    afterResponse: (e == null ? void 0 : e.response) || a,
-    afterData: (e == null ? void 0 : e.data) || r
+    afterRoute: (a == null ? void 0 : a.route) || r,
+    afterApi: (a == null ? void 0 : a.api) || t,
+    afterResponse: (a == null ? void 0 : a.response) || e,
+    afterData: (a == null ? void 0 : a.data) || s
   };
 }
 const l = class l {
@@ -411,10 +423,10 @@ const l = class l {
    * @param name - The name of the API
    */
   setCurrent(t) {
-    const a = this._apis.get(t);
-    if (!a)
+    const e = this._apis.get(t);
+    if (!e)
       throw new Error(`API ${t} not found`);
-    this._currentApi = a;
+    this._currentApi = e;
   }
   /**
    * Clears the current API
@@ -448,11 +460,11 @@ const l = class l {
    * @param name - The name of the route
    * @returns The route
    */
-  getRoute(t, a) {
-    const r = this._apis.get(t);
-    if (!r)
+  getRoute(t, e) {
+    const s = this._apis.get(t);
+    if (!s)
       throw new Error(`API ${t} not found`);
-    return r.routes.get(a);
+    return s.routes.get(e);
   }
   /**
    * Updates an API
@@ -470,10 +482,10 @@ const l = class l {
    * @returns The updated route
    */
   static updateRoute(t) {
-    const a = l.i._apis.get(t.api);
-    if (!a)
+    const e = l.i._apis.get(t.api);
+    if (!e)
       throw new Error(`API ${t.api} not found`);
-    return a.routes.set(t.name, t), t;
+    return e.routes.set(t.name, t), t;
   }
   /**
    * Adds a route to Klaim object
@@ -481,17 +493,17 @@ const l = class l {
    * @param apiName - The name of the API
    * @param route - The route to add
    */
-  addToKlaimRoute(t, a) {
-    b[t][a.name] = async (r = {}, e = {}) => {
-      const s = l.i._apis.get(t);
-      if (!s)
-        throw new Error(`API ${a.api} not found`);
-      return D(s, a, r, e);
+  addToKlaimRoute(t, e) {
+    b[t][e.name] = async (s = {}, a = {}) => {
+      const n = l.i._apis.get(t);
+      if (!n)
+        throw new Error(`API ${e.api} not found`);
+      return D(n, e, s, a);
     };
   }
 };
 i(l, "_instance");
-let o = l;
+let h = l;
 class P extends T {
   constructor() {
     super(...arguments);
@@ -506,17 +518,17 @@ class P extends T {
    * @param headers - The headers to be sent with each request
    * @returns The new API
    */
-  static create(a, r, e, s = {}) {
-    const c = E(a);
-    c !== a && console.warn(`API name "${a}" has been camelCased to "${c}"`);
-    const h = new P(c, r, s);
-    return o.i.registerApi(h), o.i.setCurrent(c), e(), o.i.clearCurrent(), h;
+  static create(e, s, a, n = {}) {
+    const c = E(e);
+    c !== e && console.warn(`API name "${e}" has been camelCased to "${c}"`);
+    const o = new P(c, s, n);
+    return h.i.registerApi(o), h.i.setCurrent(c), a(), h.i.clearCurrent(), o;
   }
 }
 export {
   P as Api,
   C as Hook,
   b as Klaim,
-  o as Registry,
+  h as Registry,
   $ as Route
 };

package/dist/klaim.umd.js

@@ -1 +1 @@
-(function(l,o){typeof exports=="object"&&typeof module<"u"?o(exports):typeof define=="function"&&define.amd?define(["exports"],o):(l=typeof globalThis<"u"?globalThis:l||self,o(l.klaim={}))})(this,function(l){"use strict";var j=Object.defineProperty;var v=(l,o,d)=>o in l?j(l,o,{enumerable:!0,configurable:!0,writable:!0,value:d}):l[o]=d;var c=(l,o,d)=>v(l,typeof o!="symbol"?o+"":o,d);function o(r){return r.replace(/([-_][a-z])/gi,t=>t.toUpperCase().replace("-","").replace("_","")).replace(/(^\w)/,t=>t.toLowerCase())}function d(r){return r.trim().replace(/^\/|\/$/g,"")}class S{constructor(t,a,n={}){c(this,"name");c(this,"url");c(this,"headers");c(this,"callbacks",{before:null,after:null,call:null});c(this,"cache",!1);c(this,"retry",!1);this.name=o(t),this.name!==t&&console.warn(`Name "${t}" has been camelCased to "${this.name}"`),this.url=d(a),this.headers=n||{}}before(t){return this.callbacks.before=t,this}after(t){return this.callbacks.after=t,this}onCall(t){return this.callbacks.call=t,this}withCache(t=20){return this.cache=t,this}withRetry(t=2){return this.retry=t,this}}const p=class p{constructor(){c(this,"cache");this.cache=new Map}static get i(){return p._instance||(p._instance=new p),p._instance}set(t,a,n=0){const e=Date.now()+n;this.cache.set(t,{data:a,expiry:e})}has(t){const a=this.cache.get(t);return a?Date.now()>a.expiry?(this.cache.delete(t),!1):!0:!1}get(t){return this.has(t)?this.cache.get(t).data:null}};c(p,"_instance");let m=p;function O(r){let n=2166136261;for(let s=0;s<r.length;s++)n^=r.charCodeAt(s),n*=16777619;let e=(n>>>0).toString(16).padStart(8,"0");for(;e.length<32;)n^=e.charCodeAt(e.length%e.length),n*=16777619,e+=(n>>>0).toString(16).padStart(8,"0");return e.substring(0,32)}async function _(r,t,a){const n=`${r.toString()}${JSON.stringify(t)}`,e=O(n);if(m.i.has(e))return m.i.get(e);const i=await(await fetch(r,t)).json();return m.i.set(e,i,a),i}class E{static subscribe(t,a){this._callbacks.set(t,a)}static run(t){const a=this._callbacks.get(t);a&&a()}}c(E,"_callbacks",new Map);var k=(r=>(r.GET="GET",r.POST="POST",r.PUT="PUT",r.DELETE="DELETE",r.PATCH="PATCH",r.OPTIONS="OPTIONS",r))(k||{});class C extends S{constructor(a,n,e,s="GET"){super(a,n,e);c(this,"api","undefined");c(this,"method");c(this,"arguments",new Set);this.method=s,this.detectArguments()}static createRoute(a,n,e,s){const i=new C(a,n,e,s);return u.i.registerRoute(i),i}static get(a,n,e={}){return this.createRoute(a,n,e,"GET")}static post(a,n,e){return this.createRoute(a,n,e,"POST")}static put(a,n,e){return this.createRoute(a,n,e,"PUT")}static delete(a,n,e){return this.createRoute(a,n,e,"DELETE")}static patch(a,n,e){return this.createRoute(a,n,e,"PATCH")}static options(a,n,e){return this.createRoute(a,n,e,"OPTIONS")}detectArguments(){const a=this.url.match(/\[([^\]]+)]/g);a&&a.forEach(n=>{const e=n.replace("[","").replace("]","");this.arguments.add(e)})}}const P={};async function I(r,t,a={},n={}){let e=H(`${r.url}/${t.url}`,t,a),s={};n&&t.method!==k.GET&&(s.body=JSON.stringify(n)),s.headers={"Content-Type":"application/json",...r.headers,...t.headers},s.method=t.method;const{beforeRoute:i,beforeApi:f,beforeUrl:g,beforeConfig:A}=N({route:t,api:r,url:e,config:s});e=g,s=A,r=u.updateApi(f),t=u.updateRoute(i);const w=await U(r,t,e,s),{afterRoute:b,afterApi:T,afterData:y}=R({route:t,api:r,response:w,data:w});return u.updateApi(T),u.updateRoute(b),E.run(`${r.name}.${t.name}`),y}async function D(r,t,a,n){return r?await _(t,a,n.cache):await(await fetch(t,a)).json()}async function U(r,t,a,n){var w,b,T;const e=r.cache||t.cache,s=t.retry||r.retry||0;let i,f=0,g=!1;const A=((w=t.callbacks)==null?void 0:w.call)!==null?(b=t.callbacks)==null?void 0:b.call:(T=r.callbacks)==null?void 0:T.call;for(;f<=s&&!g;){A&&A({});try{i=await D(!!e,a,n,r),g=!0}catch(y){if(f++,f>s)throw y.message=`Failed to fetch ${a} after ${s} attempts`,y}}return i}function H(r,t,a){let n=r;return t.arguments.forEach(e=>{if(a[e]===void 0)throw new Error(`Argument ${e} is missing`);n=n.replace(`[${e}]`,a[e])}),n}function N({route:r,api:t,url:a,config:n}){var s,i;const e=(i=(s=r.callbacks).before)==null?void 0:i.call(s,{route:r,api:t,url:a,config:n});return{beforeRoute:(e==null?void 0:e.route)||r,beforeApi:(e==null?void 0:e.api)||t,beforeUrl:(e==null?void 0:e.url)||a,beforeConfig:(e==null?void 0:e.config)||n}}function R({route:r,api:t,response:a,data:n}){var s,i;const e=(i=(s=r.callbacks).after)==null?void 0:i.call(s,{route:r,api:t,response:a,data:n});return{afterRoute:(e==null?void 0:e.route)||r,afterApi:(e==null?void 0:e.api)||t,afterResponse:(e==null?void 0:e.response)||a,afterData:(e==null?void 0:e.data)||n}}const h=class h{constructor(){c(this,"_apis",new Map);c(this,"_currentApi",null)}static get i(){return h._instance||(h._instance=new h),h._instance}registerApi(t){this._apis.set(t.name,t),P[t.name]={}}setCurrent(t){const a=this._apis.get(t);if(!a)throw new Error(`API ${t} not found`);this._currentApi=a}clearCurrent(){this._currentApi=null}registerRoute(t){if(!this._currentApi)throw new Error("No current API set, use Route only inside Api.create callback");t.api=this._currentApi.name,this._currentApi.routes.set(t.name,t),this.addToKlaimRoute(t.api,t)}getApi(t){return this._apis.get(t)}getRoute(t,a){const n=this._apis.get(t);if(!n)throw new Error(`API ${t} not found`);return n.routes.get(a)}static updateApi(t){return h.i._apis.has(t.name)||h.i.registerApi(t),h.i._apis.set(t.name,t),t}static updateRoute(t){const a=h.i._apis.get(t.api);if(!a)throw new Error(`API ${t.api} not found`);return a.routes.set(t.name,t),t}addToKlaimRoute(t,a){P[t][a.name]=async(n={},e={})=>{const s=h.i._apis.get(t);if(!s)throw new Error(`API ${a.api} not found`);return I(s,a,n,e)}}};c(h,"_instance");let u=h;class $ extends S{constructor(){super(...arguments);c(this,"routes",new Map)}static create(a,n,e,s={}){const i=o(a);i!==a&&console.warn(`API name "${a}" has been camelCased to "${i}"`);const f=new $(i,n,s);return u.i.registerApi(f),u.i.setCurrent(i),e(),u.i.clearCurrent(),f}}l.Api=$,l.Hook=E,l.Klaim=P,l.Registry=u,l.Route=C,Object.defineProperty(l,Symbol.toStringTag,{value:"Module"})});
+(function(l,o){typeof exports=="object"&&typeof module<"u"?o(exports):typeof define=="function"&&define.amd?define(["exports"],o):(l=typeof globalThis<"u"?globalThis:l||self,o(l.klaim={}))})(this,function(l){"use strict";var R=Object.defineProperty;var j=(l,o,m)=>o in l?R(l,o,{enumerable:!0,configurable:!0,writable:!0,value:m}):l[o]=m;var c=(l,o,m)=>j(l,typeof o!="symbol"?o+"":o,m);function o(s){return s.replace(/([-_][a-z])/gi,t=>t.toUpperCase().replace("-","").replace("_","")).replace(/(^\w)/,t=>t.toLowerCase())}function m(s){return s.trim().replace(/^\/|\/$/g,"")}class S{constructor(t,a,n={}){c(this,"name");c(this,"url");c(this,"headers");c(this,"callbacks",{before:null,after:null,call:null});c(this,"cache",!1);c(this,"retry",!1);this.name=o(t),this.name!==t&&console.warn(`Name "${t}" has been camelCased to "${this.name}"`),this.url=m(a),this.headers=n||{}}before(t){return this.callbacks.before=t,this}after(t){return this.callbacks.after=t,this}onCall(t){return this.callbacks.call=t,this}withCache(t=20){return this.cache=t,this}withRetry(t=2){return this.retry=t,this}}const p=class p{constructor(){c(this,"cache");this.cache=new Map}static get i(){return p._instance||(p._instance=new p),p._instance}set(t,a,n=0){const e=Date.now()+n;this.cache.set(t,{data:a,expiry:e})}has(t){const a=this.cache.get(t);return a?Date.now()>a.expiry?(this.cache.delete(t),!1):!0:!1}get(t){return this.has(t)?this.cache.get(t).data:null}};c(p,"_instance");let w=p;function O(s){let n=2166136261;for(let r=0;r<s.length;r++)n^=s.charCodeAt(r),n*=16777619;let e=(n>>>0).toString(16).padStart(8,"0");for(;e.length<32;)n^=e.charCodeAt(e.length%e.length),n*=16777619,e+=(n>>>0).toString(16).padStart(8,"0");return e.substring(0,32)}async function _(s,t,a){const n=`${s.toString()}${JSON.stringify(t)}`,e=O(n);if(w.i.has(e))return w.i.get(e);const i=await(await fetch(s,t)).json();return w.i.set(e,i,a),i}class E{static subscribe(t,a){this._callbacks.set(t,a)}static run(t){const a=this._callbacks.get(t);a&&a()}}c(E,"_callbacks",new Map);var k=(s=>(s.GET="GET",s.POST="POST",s.PUT="PUT",s.DELETE="DELETE",s.PATCH="PATCH",s.OPTIONS="OPTIONS",s))(k||{});class C extends S{constructor(a,n,e,r="GET"){super(a,n,e);c(this,"api","undefined");c(this,"method");c(this,"arguments",new Set);c(this,"schema");this.method=r,this.detectArguments()}static createRoute(a,n,e,r){const i=new C(a,n,e,r);return u.i.registerRoute(i),i}static get(a,n,e={}){return this.createRoute(a,n,e,"GET")}static post(a,n,e){return this.createRoute(a,n,e,"POST")}static put(a,n,e){return this.createRoute(a,n,e,"PUT")}static delete(a,n,e){return this.createRoute(a,n,e,"DELETE")}static patch(a,n,e){return this.createRoute(a,n,e,"PATCH")}static options(a,n,e){return this.createRoute(a,n,e,"OPTIONS")}detectArguments(){const a=this.url.match(/\[([^\]]+)]/g);a&&a.forEach(n=>{const e=n.replace("[","").replace("]","");this.arguments.add(e)})}validate(a){return this.schema=a,this}}const P={};async function I(s,t,a={},n={}){let e=U(`${s.url}/${t.url}`,t,a),r={};n&&t.method!==k.GET&&(r.body=JSON.stringify(n)),r.headers={"Content-Type":"application/json",...s.headers,...t.headers},r.method=t.method;const{beforeRoute:i,beforeApi:f,beforeUrl:g,beforeConfig:A}=H({route:t,api:s,url:e,config:r});e=g,r=A,s=u.updateApi(f),t=u.updateRoute(i);let d=await D(s,t,e,r);t.schema&&"validate"in t.schema&&(d=await t.schema.validate(d));const{afterRoute:b,afterApi:T,afterData:y}=N({route:t,api:s,response:d,data:d});return u.updateApi(T),u.updateRoute(b),E.run(`${s.name}.${t.name}`),y}async function v(s,t,a,n){return s?await _(t,a,n.cache):await(await fetch(t,a)).json()}async function D(s,t,a,n){var d,b,T;const e=s.cache||t.cache,r=t.retry||s.retry||0;let i,f=0,g=!1;const A=((d=t.callbacks)==null?void 0:d.call)!==null?(b=t.callbacks)==null?void 0:b.call:(T=s.callbacks)==null?void 0:T.call;for(;f<=r&&!g;){A&&A({});try{i=await v(!!e,a,n,s),g=!0}catch(y){if(f++,f>r)throw y.message=`Failed to fetch ${a} after ${r} attempts`,y}}return i}function U(s,t,a){let n=s;return t.arguments.forEach(e=>{if(a[e]===void 0)throw new Error(`Argument ${e} is missing`);n=n.replace(`[${e}]`,a[e])}),n}function H({route:s,api:t,url:a,config:n}){var r,i;const e=(i=(r=s.callbacks).before)==null?void 0:i.call(r,{route:s,api:t,url:a,config:n});return{beforeRoute:(e==null?void 0:e.route)||s,beforeApi:(e==null?void 0:e.api)||t,beforeUrl:(e==null?void 0:e.url)||a,beforeConfig:(e==null?void 0:e.config)||n}}function N({route:s,api:t,response:a,data:n}){var r,i;const e=(i=(r=s.callbacks).after)==null?void 0:i.call(r,{route:s,api:t,response:a,data:n});return{afterRoute:(e==null?void 0:e.route)||s,afterApi:(e==null?void 0:e.api)||t,afterResponse:(e==null?void 0:e.response)||a,afterData:(e==null?void 0:e.data)||n}}const h=class h{constructor(){c(this,"_apis",new Map);c(this,"_currentApi",null)}static get i(){return h._instance||(h._instance=new h),h._instance}registerApi(t){this._apis.set(t.name,t),P[t.name]={}}setCurrent(t){const a=this._apis.get(t);if(!a)throw new Error(`API ${t} not found`);this._currentApi=a}clearCurrent(){this._currentApi=null}registerRoute(t){if(!this._currentApi)throw new Error("No current API set, use Route only inside Api.create callback");t.api=this._currentApi.name,this._currentApi.routes.set(t.name,t),this.addToKlaimRoute(t.api,t)}getApi(t){return this._apis.get(t)}getRoute(t,a){const n=this._apis.get(t);if(!n)throw new Error(`API ${t} not found`);return n.routes.get(a)}static updateApi(t){return h.i._apis.has(t.name)||h.i.registerApi(t),h.i._apis.set(t.name,t),t}static updateRoute(t){const a=h.i._apis.get(t.api);if(!a)throw new Error(`API ${t.api} not found`);return a.routes.set(t.name,t),t}addToKlaimRoute(t,a){P[t][a.name]=async(n={},e={})=>{const r=h.i._apis.get(t);if(!r)throw new Error(`API ${a.api} not found`);return I(r,a,n,e)}}};c(h,"_instance");let u=h;class $ extends S{constructor(){super(...arguments);c(this,"routes",new Map)}static create(a,n,e,r={}){const i=o(a);i!==a&&console.warn(`API name "${a}" has been camelCased to "${i}"`);const f=new $(i,n,r);return u.i.registerApi(f),u.i.setCurrent(i),e(),u.i.clearCurrent(),f}}l.Api=$,l.Hook=E,l.Klaim=P,l.Registry=u,l.Route=C,Object.defineProperty(l,Symbol.toStringTag,{value:"Module"})});

package/package.json

@@ -1,10 +1,37 @@
 {
     "name": "klaim",
-    "description": "Klaim is a lightweight TypeScript library designed to manage APIs and record requests, optimized for an optimal user experience.",
+    "version": "1.6.1",
+    "author": "antharuu",
     "repository": {
         "type": "git",
         "url": "git+https://github.com/antharuu/klaim.git"
     },
+    "main": "dist/klaim.cjs.js",
+    "module": "dist/klaim.es.js",
+    "devDependencies": {
+        "@eslint/js": "^9.7.0",
+        "@stylistic/eslint-plugin": "^2.3.0",
+        "@types/bun": "latest",
+        "@types/eslint__js": "^8.42.3",
+        "@types/node": "^20.14.10",
+        "@vitest/coverage-v8": "^2.0.2",
+        "@vitest/ui": "^2.0.2",
+        "dotenv-cli": "^7.4.2",
+        "eslint": "^9.7.0",
+        "eslint-plugin-jsdoc": "^48.7.0",
+        "eslint-plugin-simple-import-sort": "^12.1.1",
+        "jsdom": "^24.1.0",
+        "release-it": "^17.5.0",
+        "typescript-eslint": "^7.16.0",
+        "vite": "^5.3.3",
+        "vitest": "^2.0.2",
+        "yup": "^1.4.0"
+    },
+    "bugs": {
+        "url": "https://github.com/antharuu/klaim/issues"
+    },
+    "description": "Klaim is a lightweight TypeScript library designed to manage APIs and record requests, optimized for an optimal user experience.",
+    "homepage": "https://github.com/antharuu/klaim#readme",
     "keywords": [
         "typescript",
         "api",
@@ -13,17 +40,7 @@
         "optimization",
         "lightweight"
     ],
-    "author": "antharuu",
     "license": "MIT",
-    "bugs": {
-        "url": "https://github.com/antharuu/klaim/issues"
-    },
-    "homepage": "https://github.com/antharuu/klaim#readme",
-    "type": "module",
-    "version": "1.5.1",
-    "main": "dist/klaim.cjs.js",
-    "module": "dist/klaim.es.js",
-    "types": "dist/index.d.ts",
     "scripts": {
         "build": "vite build",
         "dev": "vite build --watch",
@@ -36,25 +53,6 @@
         "release:minor": "dotenv release-it -- minor --config release-it.config.cjs --ci",
         "release:major": "dotenv release-it -- major --config release-it.config.cjs --ci"
     },
-    "devDependencies": {
-        "@eslint/js": "^9.6.0",
-        "@stylistic/eslint-plugin": "^2.3.0",
-        "@types/bun": "latest",
-        "@types/eslint__js": "^8.42.3",
-        "@types/node": "^20.14.9",
-        "@vitest/coverage-v8": "^1.6.0",
-        "@vitest/ui": "^1.6.0",
-        "dotenv-cli": "^7.4.2",
-        "eslint": "^9.6.0",
-        "eslint-plugin-jsdoc": "^48.5.0",
-        "eslint-plugin-simple-import-sort": "^12.1.1",
-        "jsdom": "^24.1.0",
-        "release-it": "^17.4.1",
-        "typescript-eslint": "^7.15.0",
-        "vite": "^5.3.3",
-        "vitest": "^1.6.0"
-    },
-    "peerDependencies": {
-        "typescript": "^5.5.3"
-    }
+    "type": "module",
+    "types": "dist/index.d.ts"
 }

package/src/core/Klaim.ts

@@ -61,7 +61,11 @@ export async function callApi<T> (
     api = Registry.updateApi(beforeApi);
     route = Registry.updateRoute(beforeRoute);
 
-    const response = await fetchWithRetry(api, route, url, config);
+    let response = await fetchWithRetry(api, route, url, config);
+
+    if (route.schema && "validate" in route.schema) {
+        response = await route.schema.validate(response);
+    }
 
     const {
         afterRoute,
@@ -141,6 +145,7 @@ async function fetchWithRetry (
             }
         }
     }
+
     return response;
 }
 

package/src/core/Route.ts

@@ -21,6 +21,8 @@ export class Route extends Element {
 
     public arguments: Set<string> = new Set<string>();
 
+    public schema: any;
+
     /**
      * Constructor
      *
@@ -149,4 +151,15 @@ export class Route extends Element {
             });
         }
     }
+
+    /**
+     * Schema validation (Yup)
+     *
+     * @param schema - The schema to validate
+     * @returns The route
+     */
+    public validate (schema: any): Route {
+        this.schema = schema;
+        return this;
+    }
 }

package/tests/04.klaim.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { Api, Klaim, Registry, Route } from "../src/index";
+import { Api, Klaim, Route } from "../src/index";
 
 const apiName = "testApi";
 const apiUrl = "https://jsonplaceholder.typicode.com";

package/tests/07.validate.test.ts

@@ -0,0 +1,61 @@
+import {describe, it} from "vitest";
+import {Api, Klaim, Route} from "../src/index";
+import * as yup from "yup";
+
+const apiName = "testApi";
+const apiUrl = "https://jsonplaceholder.typicode.com";
+
+const routeName = "testRoute";
+const routeUrl = "todos/[id]";
+
+const schema = yup.object().shape({
+    userId: yup.number().required(),
+    id: yup.number().min(1).max(10).required(),
+    title: yup.string().required(),
+    completed: yup.boolean().required()
+});
+
+describe("Validate Yup", async () => {
+    it("should not fail", async () => {
+        Api.create(apiName, apiUrl, () => {
+            Route.get(routeName, routeUrl);
+        });
+
+        // Expect the validation to not fail the promise
+        expect(await Klaim[apiName][routeName]({id: 1})).toStrictEqual({
+            userId: 1,
+            id: 1,
+            title: "delectus aut autem",
+            completed: false
+        });
+    });
+
+    it("should fail", async () => {
+        Api.create(apiName, apiUrl, () => {
+            Route.get(routeName, routeUrl).validate(schema);
+        });
+
+        // Expect the validation to fail the promise
+        await expect(Klaim[apiName][routeName]({id: 15})).rejects.toThrow();
+    });
+
+    it("should reformat if possible", async () => {
+        Api.create(apiName, apiUrl, () => {
+            Route.get(routeName, routeUrl).validate(yup.object().shape({
+                    userId: yup.number().required(),
+                    id: yup.string().required(),
+                    title: yup.string().required(),
+                    completed: yup.boolean().required()
+                })
+            );
+        });
+
+        // Expect the id to be a string
+        expect(await Klaim[apiName][routeName]({id: "1"})).toStrictEqual({
+            userId: 1,
+            id: "1",
+            title: "delectus aut autem",
+            completed: false
+        });
+    });
+});