Update client.ts

Author: mythz

src/use/client.ts

@@ -2,7 +2,7 @@ import type { ApiRequest, IReturn, IReturnVoid, ApiState, IResponseError, IRespo
 import type { JsonServiceClient } from "@servicestack/client"
 import { inject, provide, ref } from "vue"
 import { ResponseError, ResponseStatus, ApiResult, appendQueryString, nameOf } from "@servicestack/client"
-import { unRefs, setRef } from "./utils"
+import { unRefs, setRef, swrApi } from "./utils"
 import { Sole } from "./config"
 
 export function useClient() {
@@ -78,39 +78,11 @@ export function useClient() {
         return api
     }
 
-    function swrCacheKey<TResponse>(request:IReturn<TResponse> | ApiRequest, args?: any) {
-        const key = appendQueryString(`swr.${nameOf(request)}`, !args ? request : Object.assign({}, request, args))
-        return key
-    }
-    function fromCache(key:string) {
-        const json = Sole.config.storage!.getItem(key)
-        const ret = json
-            ? JSON.parse(json)
-            : null
-        return ret
-    }
-    function swrClear<TResponse>(options:{ request:IReturn<TResponse> | ApiRequest, args?: any }) {
-        if (options.request) {
-            const key = swrCacheKey(options.request, options.args)
-            Sole.config.storage!.removeItem(key)
-        }
-    }
-
     async function swr<TResponse>(request:IReturn<TResponse> | ApiRequest, fn:(r:ApiResult<TResponse>) => void, args?: any, method?: string) {
-        const key = swrCacheKey(request, args)
-
-        fn(new ApiResult({ response: fromCache(key) }))
-        const api = await client.api(request, args, method)
-        if (api.succeeded && api.response) {
-            api.response._date = new Date().valueOf()
-            const json = JSON.stringify(api.response)
-            Sole.config.storage!.setItem(key, json)
-            fn(api)
-        }
-        return api
+        return swrApi(client, request, fn, args, method)
     }
 
-    let ctx:ApiState = { setError, addFieldError, loading, error, api, apiVoid, apiForm, apiFormVoid, swr, unRefs, setRef, swrCacheKey, swrClear }
+    let ctx:ApiState = { setError, addFieldError, loading, error, api, apiVoid, apiForm, apiFormVoid, swr, unRefs, setRef }
     provide('ApiState', ctx)
     return ctx
 }