refactor: use './utils' instead of 'xior/utils'

src/index.ts

@@ -2,8 +2,7 @@ import { Xior } from './xior';
 
 export * from './xior';
 export * from './types';
-// @ts-ignore
-export * from 'xior/utils';
+export * from './utils';
 
 const xior = Object.assign(Xior.create(), { create: Xior.create, VERSION: Xior.VERSION });
 export default xior;

src/interceptors.ts

@@ -1,8 +1,5 @@
-// @ts-ignore
-import { encodeParams, merge } from 'xior/utils';
-
 import type { XiorInterceptorRequestConfig } from './types';
-import { trimUndefined } from './utils';
+import { trimUndefined, encodeParams, merge } from './utils';
 
 const appPrefix = 'application/';
 const formUrl = `${appPrefix}x-www-form-urlencoded`;

src/plugins/cache/index.ts

@@ -1,6 +1,6 @@
 import { lru } from 'tiny-lru';
 // @ts-ignore
-import { buildSortedURL, isAbsoluteURL, joinPath } from 'xior/utils';
+import { buildSortedURL, isAbsoluteURL, joinPath } from 'xior';
 
 import { ICacheLike } from './utils';
 import type { XiorPlugin, XiorRequestConfig, XiorResponse } from '../../types';
@@ -28,6 +28,7 @@ declare module 'xior' {
   interface XiorResponse {
     fromCache?: boolean;
     cacheTime?: number;
+    cacheKey?: string;
   }
 }
 
@@ -62,40 +63,43 @@ export default function xiorCachePlugin(options: XiorCacheOptions = {}): XiorPlu
         enabled = t === 'undefined' ? isGet : Boolean(enableCache);
       }
 
+      let key = '';
       if (enabled) {
         const cache: ICacheLike<XiorPromise> = defaultCache;
 
-        const index = buildSortedURL(
+        key = buildSortedURL(
           config.url && isAbsoluteURL(config.url)
             ? config.url
             : joinPath(config.baseURL, config.url),
           { a: config.data, b: config.params },
           paramsSerializer as (obj: Record<string, any>) => string
         );
-        let responsePromise = cache.get(index);
+        let responsePromise = cache.get(key);
 
         if (!responsePromise || forceUpdate) {
           responsePromise = (async () => {
             try {
               return await adapter(config);
             } catch (reason) {
               if ('delete' in cache) {
-                cache.delete(index);
+                cache.delete(key);
               } else {
-                cache.del(index);
+                cache.del(key);
               }
               throw reason;
             }
           })();
 
-          cache.set(index, responsePromise);
+          cache.set(key, responsePromise);
 
           return responsePromise;
         }
 
         return responsePromise.then((res) => {
           (res as any).fromCache = true;
           (res as any).cacheTime = Date.now();
+          (res as any).cacheKey = key;
+
           return res;
         });
       }

src/plugins/dedupe.ts

@@ -1,5 +1,5 @@
 // @ts-ignore
-import { joinPath, isAbsoluteURL, buildSortedURL } from 'xior/utils';
+import { joinPath, isAbsoluteURL, buildSortedURL } from 'xior';
 
 import type { XiorPlugin, XiorRequestConfig } from '../types';
 

src/plugins/error-cache.ts

@@ -1,6 +1,6 @@
 import { lru } from 'tiny-lru';
 // @ts-ignore
-import { XiorError, joinPath, isAbsoluteURL, buildSortedURL } from 'xior/utils';
+import { XiorError, joinPath, isAbsoluteURL, buildSortedURL } from 'xior';
 
 import { ICacheLike } from './utils';
 import type { XiorPlugin, XiorRequestConfig, XiorResponse } from '../types';

src/plugins/error-retry.ts

@@ -1,5 +1,5 @@
 // @ts-ignore
-import { XiorError, delay } from 'xior/utils';
+import { XiorError, delay } from 'xior';
 
 import { XiorInterceptorRequestConfig, XiorPlugin, XiorRequestConfig } from '../types';
 

src/plugins/mock/index.ts

@@ -9,7 +9,7 @@ import {
   joinPath,
   merge,
   // @ts-ignore
-} from 'xior/utils';
+} from 'xior';
 
 import { MockHeaders, StatusOrCallback, RequestOptions, RequestData, VERBS } from './types';
 import type {

src/plugins/throttle.ts

@@ -1,6 +1,6 @@
 import { lru } from 'tiny-lru';
 // @ts-ignore
-import { isAbsoluteURL, joinPath, buildSortedURL } from 'xior/utils';
+import { isAbsoluteURL, joinPath, buildSortedURL } from 'xior';
 
 import { ICacheLike } from './cache/utils';
 import type { XiorPlugin, XiorRequestConfig, XiorResponse } from '../types';

src/xior.ts

@@ -1,15 +1,3 @@
-import {
-  ClearableSignal,
-  XiorTimeoutError,
-  anySignal,
-  isAbsoluteURL,
-  XiorError,
-  merge,
-  joinPath,
-  encodeParams,
-  // @ts-ignore
-} from 'xior/utils';
-
 import defaultRequestInterceptor from './interceptors';
 import type {
   XiorInterceptorOptions,
@@ -19,6 +7,16 @@ import type {
   XiorResponse,
   XiorResponseInterceptorConfig,
 } from './types';
+import {
+  ClearableSignal,
+  XiorTimeoutError,
+  anySignal,
+  isAbsoluteURL,
+  XiorError,
+  merge,
+  joinPath,
+  encodeParams,
+} from './utils';
 
 const undefinedValue = undefined;
 const supportAbortController = typeof AbortController !== `${undefinedValue}`;