@tanglemedia/svelte-starter-directus-api 0.1.0 → 0.1.2

package/dist/adapter/api-adapter.d.ts

@@ -17,6 +17,6 @@ export declare class DirectusApiAdapter<Schema extends SchemaShape = SchemaShape
     patch<T>(collection: Path, key: ApiId, query?: Record<string, unknown>): Promise<ApiResponse<T>>;
     post<T>(collection: Path, data: AnyObject, query?: Record<string, unknown>): Promise<ApiResponse<T>>;
     delete<T>(collection: Path, key?: ApiId): Promise<ApiResponse<T>>;
-    put<T>(collection: Path, key?: ApiId, payload?: AnyObject, config?: ApiAdapterRequestConfig): Promise<ApiResponse<T>>;
+    put<T>(collection: Path, key?: ApiId, payload?: AnyObject): Promise<ApiResponse<T>>;
     upload<T>(path: string | undefined, data: FormData): Promise<ApiResponse<T>>;
 }

package/dist/adapter/api-adapter.js

@@ -1,4 +1,4 @@
-import { aggregate, createItem, deleteItem, readItem, readItems, updateItem, uploadFiles } from '@directus/sdk';
+import { aggregate, createItem, deleteItem, readFiles, readItem, readItems, updateItem, uploadFiles } from '@directus/sdk';
 import { ApiAdapterAbstract } from '@tanglemedia/svelte-starter-core';
 export class DirectusApiAdapter extends ApiAdapterAbstract {
     config;
@@ -82,7 +82,7 @@ export class DirectusApiAdapter extends ApiAdapterAbstract {
         const response = await this.directus.request(deleteItem(collection, key));
         return this.transformResponse(response, 202);
     }
-    async put(collection, key, payload, config) {
+    async put(collection, key, payload) {
         if (key) {
             const response = await this.directus.request(updateItem(collection, key, payload));
             return this.transformResponse(response, 201);

package/dist/provider/directus.factory.js

@@ -23,18 +23,13 @@ export const createDirectusClientFactory = ({ baseUrl, configuration: { protocol
     }
     let client = createDirectus(url, options).with(rest(rs));
     if (auth) {
-        if (auth.config?.storage === 'localStorage') {
-            const authenticationConfig = {
-                storage: new AuthLocalStorage(),
-                autoRefresh: auth.config.autoRefresh || false,
-                msRefreshBeforeExpires: auth.config.msRefreshBeforeExpires || 0,
-                credentials: auth.config.credentials || 'include'
-            };
-            client = client.with(authentication(auth.mode, authenticationConfig));
-        }
-        else {
-            client = client.with(authentication(auth.mode));
+        const { config: c, mode } = auth;
+        const { storage, ...config } = { ...authConfigDefaults, ...(c || {}) };
+        const authConfig = config;
+        if (storage === 'localStorage') {
+            authConfig.storage = new AuthLocalStorage();
         }
+        client = client.with(authentication(mode, authConfig));
     }
     if (token) {
         client = client.with(staticToken(token));

package/dist/services/auth.d.ts

@@ -3,11 +3,12 @@ import type { DirectusClient, RestClient } from '@directus/sdk';
 import { ServiceAdapterAbstract } from '@tanglemedia/svelte-starter-core';
 declare class DirectusAuthServices extends ServiceAdapterAbstract {
     getDirectus(): Promise<DirectusClient<object> & RestClient<object> & AuthenticationClient<object>>;
-    refresh<T>(): Promise<T>;
+    refresh(): Promise<import("@directus/sdk/dist/login-M53C1LeV").a>;
     getToken(): Promise<string | null>;
     login(email: string, password: string): Promise<import("@directus/sdk/dist/login-M53C1LeV").a>;
     logout(): Promise<void>;
     getCurrentUser<T>(fields?: string[] | null): Promise<T>;
     updateCurrentUser<T>(data: object): Promise<T>;
+    readFile<T>(query?: Record<string, unknown>): Promise<T>;
 }
 export { DirectusAuthServices };

package/dist/services/auth.js

@@ -1,4 +1,4 @@
-import { readMe, refresh, updateMe } from '@directus/sdk';
+import { readFiles, readMe, updateMe } from '@directus/sdk';
 import { ServiceAdapterAbstract } from '@tanglemedia/svelte-starter-core';
 class DirectusAuthServices extends ServiceAdapterAbstract {
     getDirectus() {
@@ -9,11 +9,11 @@ class DirectusAuthServices extends ServiceAdapterAbstract {
     // }
     async refresh() {
         try {
-            const response = await (await this.getDirectus()).request(refresh());
+            const response = await (await this.getDirectus()).refresh();
             return response;
         }
         catch (error) {
-            console.error(`Error refreshing :`, error);
+            console.error(`Error on directus sdk refresh() :`, error);
             throw error;
         }
     }
@@ -23,7 +23,7 @@ class DirectusAuthServices extends ServiceAdapterAbstract {
             return response;
         }
         catch (error) {
-            console.error(`Error refreshing :`, error);
+            console.error(`Error on directus sdk getToken() :`, error);
             throw error;
         }
     }
@@ -33,7 +33,7 @@ class DirectusAuthServices extends ServiceAdapterAbstract {
             return response;
         }
         catch (error) {
-            console.error(`Error login :`, error);
+            console.error(`Error on directus sdk login() :`, error);
             throw error;
         }
     }
@@ -43,31 +43,41 @@ class DirectusAuthServices extends ServiceAdapterAbstract {
             return response;
         }
         catch (error) {
-            console.error(`Error refreshing :`, error);
+            console.error(`Error on directus sdk logout() :`, error);
             throw error;
         }
     }
     async getCurrentUser(fields = null) {
         try {
-            if (!this.getToken())
+            if (!await this.getToken())
                 await this.refresh();
             const response = await (await this.getDirectus()).request(readMe({ fields: fields ? fields : ['*', 'roles.*'] }));
             return response;
         }
         catch (error) {
-            console.error(`Error refreshing :`, error);
+            console.error(`Error on directus sdk readMe() :`, error);
             throw error;
         }
     }
     async updateCurrentUser(data) {
         try {
-            if (!this.getToken())
+            if (!await this.getToken())
                 await this.refresh();
             const response = await (await this.getDirectus()).request(updateMe(data));
             return response;
         }
         catch (error) {
-            console.error(`Error refreshing :`, error);
+            console.error(`Error on directus sdk updateMe() :`, error);
+            throw error;
+        }
+    }
+    async readFile(query) {
+        try {
+            const response = await (await this.getDirectus()).request(readFiles(query));
+            return response;
+        }
+        catch (error) {
+            console.error('Error on directus sdk readFiles():', error);
             throw error;
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanglemedia/svelte-starter-directus-api",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "description": "directus API wrapper for all the directus sdk functionality",
@@ -22,18 +22,18 @@
     }
   },
   "devDependencies": {
-    "@sveltejs/adapter-auto": "^3.1.0",
+    "@sveltejs/adapter-auto": "^3.1.1",
     "@sveltejs/package": "^2.2.6",
-    "@sveltejs/vite-plugin-svelte": "^3.0.1",
-    "@testing-library/jest-dom": "^6.2.0",
-    "@testing-library/svelte": "^4.0.5",
-    "@vitest/coverage-v8": "^1.2.1",
-    "jsdom": "^23.2.0",
-    "msw": "^2.1.2",
+    "@sveltejs/vite-plugin-svelte": "^3.0.2",
+    "@testing-library/jest-dom": "^6.4.0",
+    "@testing-library/svelte": "^4.1.0",
+    "@vitest/coverage-v8": "^1.2.2",
+    "jsdom": "^24.0.0",
+    "msw": "^2.1.5",
     "svelte": "^4.2.9",
     "svelte-check": "^3.6.3",
     "vite": "^5.0.12",
-    "vitest": "^1.2.1",
+    "vitest": "^1.2.2",
     "eslint-config-custom": "0.0.0"
   },
   "dependencies": {
@@ -41,7 +41,7 @@
     "@types/js-cookie": "^3.0.6",
     "esm-env": "^1.0.0",
     "js-cookie": "^3.0.5",
-    "@tanglemedia/svelte-starter-core": "0.0.17"
+    "@tanglemedia/svelte-starter-core": "0.0.18"
   },
   "peerDependencies": {
     "@sveltejs/kit": ">=2 <3",

package/src/adapter/api-adapter.ts

@@ -2,6 +2,7 @@ import {
   aggregate,
   createItem,
   deleteItem,
+  readFiles,
   readItem,
   readItems,
   updateItem,
@@ -145,12 +146,7 @@ export class DirectusApiAdapter<
     return this.transformResponse(response, 202);
   }
 
-  public async put<T>(
-    collection: Path,
-    key?: ApiId,
-    payload?: AnyObject,
-    config?: ApiAdapterRequestConfig
-  ): Promise<ApiResponse<T>> {
+  public async put<T>(collection: Path, key?: ApiId, payload?: AnyObject): Promise<ApiResponse<T>> {
     if (key) {
       const response = await this.directus.request<T>(updateItem(collection, key, payload));
       return this.transformResponse(response, 201);

package/src/provider/directus.factory.ts

@@ -45,17 +45,16 @@ export const createDirectusClientFactory = <T extends object>(
   let client = createDirectus<T>(url, options).with(rest(rs));
 
   if (auth) {
-    if (auth.config?.storage === 'localStorage') {
-      const authenticationConfig: AuthenticationConfig = {
-        storage: new AuthLocalStorage(),
-        autoRefresh: auth.config.autoRefresh || false,
-        msRefreshBeforeExpires: auth.config.msRefreshBeforeExpires || 0,
-        credentials: auth.config.credentials || 'include'
-      };
-      client = client.with(authentication(auth.mode, authenticationConfig));
-    } else {
-      client = client.with(authentication(auth.mode));
+    const { config: c, mode } = auth;
+    const { storage, ...config } = { ...authConfigDefaults, ...(c || {}) };
+
+    const authConfig: AuthenticationConfig = config;
+
+    if (storage === 'localStorage') {
+      authConfig.storage = new AuthLocalStorage();
     }
+
+    client = client.with(authentication(mode, authConfig));
   }
 
   if (token) {

package/src/services/auth.ts

@@ -1,5 +1,5 @@
 import type { AuthenticationClient } from '@directus/sdk';
-import { readMe, refresh, updateMe } from '@directus/sdk';
+import { readFiles, readMe, updateMe } from '@directus/sdk';
 import type { DirectusClient, RestClient } from '@directus/sdk';
 import { ServiceAdapterAbstract } from '@tanglemedia/svelte-starter-core';
 
@@ -14,12 +14,12 @@ class DirectusAuthServices extends ServiceAdapterAbstract {
   //   return this.directus as DirectusClient<T> & RestClient<object>;
   // }
 
-  public async refresh<T>(): Promise<T> {
+  public async refresh() {
     try {
-      const response = await (await this.getDirectus()).request<T>(refresh());
+      const response = await (await this.getDirectus()).refresh();
       return response;
     } catch (error) {
-      console.error(`Error refreshing :`, error);
+      console.error(`Error on directus sdk refresh() :`, error);
       throw error;
     }
   }
@@ -29,7 +29,7 @@ class DirectusAuthServices extends ServiceAdapterAbstract {
       const response = await (await this.getDirectus()).getToken();
       return response;
     } catch (error) {
-      console.error(`Error refreshing :`, error);
+      console.error(`Error on directus sdk getToken() :`, error);
       throw error;
     }
   }
@@ -39,7 +39,7 @@ class DirectusAuthServices extends ServiceAdapterAbstract {
       const response = await (await this.getDirectus()).login(email, password);
       return response;
     } catch (error) {
-      console.error(`Error login :`, error);
+      console.error(`Error on directus sdk login() :`, error);
       throw error;
     }
   }
@@ -49,31 +49,41 @@ class DirectusAuthServices extends ServiceAdapterAbstract {
       const response = await (await this.getDirectus()).logout();
       return response;
     } catch (error) {
-      console.error(`Error refreshing :`, error);
+      console.error(`Error on directus sdk logout() :`, error);
       throw error;
     }
   }
 
   public async getCurrentUser<T>(fields: string[] | null = null): Promise<T> {
     try {
-      if (!this.getToken()) await this.refresh();
+      if (!await this.getToken()) await this.refresh();
       const response = await (
         await this.getDirectus()
       ).request<T>(readMe({ fields: fields ? fields : ['*', 'roles.*'] }));
       return response;
     } catch (error) {
-      console.error(`Error refreshing :`, error);
+      console.error(`Error on directus sdk readMe() :`, error);
       throw error;
     }
   }
 
   public async updateCurrentUser<T>(data: object): Promise<T> {
     try {
-      if (!this.getToken()) await this.refresh();
+      if (!await this.getToken()) await this.refresh();
       const response = await (await this.getDirectus()).request<T>(updateMe(data));
       return response;
     } catch (error) {
-      console.error(`Error refreshing :`, error);
+      console.error(`Error on directus sdk updateMe() :`, error);
+      throw error;
+    }
+  }
+
+  public async readFile<T>(query?: Record<string, unknown>): Promise<T> {
+    try {
+      const response = await (await this.getDirectus()).request<T>(readFiles(query));
+      return response;
+    } catch (error) {
+      console.error('Error on directus sdk readFiles():', error);
       throw error;
     }
   }