chore: wip

Author: glennmichael123

storage/framework/core/api/src/ofetch.ts

@@ -1,126 +1,85 @@
-import { ofetch } from 'ofetch'
-import { ref } from 'vue'
+import { type FetchOptions, ofetch } from 'ofetch'
 
 interface Params {
   [key: string]: any // Replace 'any' with more specific types if possible
 }
 
-interface FetchRequestHeaders {
-  'Content-Type'?: string
-  Authorization?: string
-  Accept?: string
-  'User-Agent'?: string
-  Referer?: string
-  Origin?: string
-  'Cache-Control'?: string
-  Pragma?: string
-  Cookie?: string
-  'If-Modified-Since'?: string
-  'If-None-Match'?: string
-  'X-Requested-With'?: string
-  'Accept-Encoding'?: string
-  'Accept-Language'?: string
-  [key: string]: string | undefined // To allow additional headers
-}
-
-interface FetchRequestParams {
-  headers?: FetchRequestHeaders
-  method?: string
-  baseURL?: string
-  body?: any // Optional, for request bodies like in POST or PUT requests
-  mode?: RequestMode // Optional, e.g., 'cors', 'no-cors', 'same-origin'
-  credentials?: RequestCredentials // Optional, e.g., 'include', 'same-origin', 'omit'
-  cache?: RequestCache // Optional, e.g., 'default', 'no-store', 'reload'
-  redirect?: RequestRedirect // Optional, e.g., 'follow', 'manual', 'error'
-  referrerPolicy?: ReferrerPolicy // Optional, e.g., 'no-referrer', 'origin'
-  integrity?: string // Optional, for subresource integrity
-  keepalive?: boolean // Optional, for whether the request should outlive the page
-  signal?: AbortSignal // Optional, to abort the request
-  [key: string]: any // To allow additional parameters
+interface ApiFetch {
+  get(url: string, params?: Params): Promise<FetchResponse>
+  post(url: string, params?: Params): Promise<FetchResponse>
+  destroy(url: string, params?: Params): Promise<FetchResponse>
+  patch(url: string, params?: Params): Promise<FetchResponse>
+  put(url: string, params?: Params): Promise<FetchResponse>
+  setToken(authToken: string): void
+  baseURL: '/' | string
+  loading: boolean
+  token: string
 }
 
 type FetchResponse = string | Blob | ArrayBuffer | ReadableStream<Uint8Array>
 
-const loading = ref(false)
-const token = ref('')
+let loading = false
+let token = ''
 const baseURL = '/'
 
-async function post(url: string, params?: Params): Promise<any> {
-  const headers: FetchRequestHeaders = { Accept: 'application/json' }
+async function get(url: string, params?: Params, headers?: Headers): Promise<FetchResponse> {
+  if (headers) if (token) headers.set('Authorization', `Bearer ${token}`)
 
-  if (token.value) headers.Authorization = `Bearer ${token.value}`
+  return await ofetch(url, { method: 'GET', baseURL, params, headers })
+}
 
-  const parameters: FetchRequestParams = {
-    ...params,
-    ...{
-      headers,
-      parseResponse: JSON.parse,
-      method: 'POST',
-      baseURL,
-    },
-  }
+async function post(url: string, params?: Params, headers?: Headers): Promise<any> {
+  if (headers) if (token) headers.set('Authorization', `Bearer ${token}`)
 
-  loading.value = true
+  loading = true
 
   try {
-    const result: string | FetchResponse | Blob | ArrayBuffer | ReadableStream<Uint8Array> = await ofetch(
-      url,
-      parameters,
-    )
+    const result: string | FetchResponse | Blob | ArrayBuffer | ReadableStream<Uint8Array> = await ofetch(url, {
+      method: 'POST',
+      baseURL,
+      params,
+      headers,
+    })
 
-    loading.value = false
+    loading = false
     return result
   } catch (err: any) {
-    loading.value = false
+    loading = false
 
     throw err
   }
 }
 
-async function get(url: string, params?: Params): Promise<any> {
-  const headers: FetchRequestHeaders = { Accept: 'application/json' }
+async function patch(url: string, params?: Params, headers?: Headers): Promise<FetchResponse> {
+  if (headers) if (token) headers.set('Authorization', `Bearer ${token}`)
 
-  if (token.value) headers.Authorization = `Bearer ${token.value}`
+  loading = true
 
-  const parameters: FetchRequestParams = {
-    ...params,
-    ...{
-      headers,
-      parseResponse: JSON.parse,
-      method: 'GET',
-      baseURL,
-    },
-  }
-
-  return (await ofetch(url, parameters)) as FetchResponse
+  return await ofetch(url, {
+    method: 'PATCH',
+    baseURL,
+    params,
+    headers,
+  })
 }
 
-async function patch(url: string, params?: Params): Promise<any> {
-  const headers: FetchRequestHeaders = { Accept: 'application/json' }
-
-  if (token.value) headers.Authorization = `Bearer ${token.value}`
-
-  const parameters: FetchRequestParams = {
-    ...params,
-    ...{
-      headers,
-      parseResponse: JSON.parse,
-      method: 'PATCH',
-      baseURL,
-    },
-  }
+async function put(url: string, params?: Params, headers?: Headers): Promise<FetchResponse> {
+  if (headers) if (token) headers.set('Authorization', `Bearer ${token}`)
 
-  loading.value = true
+  loading = true
 
-  return (await ofetch(url, parameters)) as FetchResponse
+  return await ofetch(url, {
+    method: 'PUT',
+    baseURL,
+    params,
+    headers,
+  })
 }
 
-async function destroy(url: string, params?: Params): Promise<any> {
-  const headers: FetchRequestHeaders = { Accept: 'application/json' }
-
-  if (token.value) headers.Authorization = `Bearer ${token.value}`
+async function destroy(url: string, params?: Params, headers?: Headers): Promise<FetchResponse> {
+  if (headers) if (token) headers.set('Authorization', `Bearer ${token}`)
 
-  const parameters: FetchRequestParams = {
+  const parameters = {
     ...params,
     ...{
       headers,
@@ -129,22 +88,28 @@ async function destroy(url: string, params?: Params): Promise<any> {
     },
   }
 
-  loading.value = true
+  loading = true
 
-  return (await ofetch(url, parameters)) as FetchResponse
+  return await ofetch(url, {
+    method: 'DELETE',
+    baseURL,
+    params,
+    headers,
+  })
 }
 
 function setToken(authToken: string): void {
-  token.value = authToken
+  token = authToken
 }
 
-export const Fetch = {
-  post,
-  get,
-  patch,
-  destroy,
-  baseURL,
-  loading,
-  token,
-  setToken,
+export const Fetch: ApiFetch = {
+  get: get,
+  post: post,
+  patch: patch,
+  put: put,
+  destroy: destroy,
+  baseURL: baseURL,
+  token: token,
+  setToken: setToken,
+  loading: loading,
 }

storage/framework/core/testing/src/cache.ts

@@ -0,0 +1,7 @@
+import { dynamoDb } from 'dynamodb-tooling'
+
+async function launch(): Promise<void> {
+  await dynamoDb.launch()
+}
+
+await launch()