@tanglemedia/svelte-starter-directus-api 2.0.3 → 2.1.0

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

@@ -1,5 +1,5 @@
 import { type AllCollections, type DirectusClient, type RegularCollections, type RestClient } from '@directus/sdk';
-import { ApiAdapterAbstract, type AnyObject, type ApiAdapterRequestConfig, type ApiCreateManyQuery, type ApiDeleteManyQuery, type ApiFindQuery, type ApiId, type ApiResponse, type ApiUpdateManyQuery, type BaseApiMethods } from '@tanglemedia/svelte-starter-core';
+import { ApiAdapterAbstract, type AnyObject, type ApiAdapterRequestConfig, type ApiAggregateQuery, type ApiCreateManyQuery, type ApiDeleteManyQuery, type ApiFindQuery, type ApiId, type ApiResponse, type ApiUpdateManyQuery, type BaseApiMethods } from '@tanglemedia/svelte-starter-core';
 import type { DirectusConfig, SchemaShape } from '../types/adapter.types';
 export type AdapterClient<Schema extends SchemaShape = SchemaShape> = DirectusClient<Schema> & RestClient<Schema>;
 /**
@@ -27,7 +27,7 @@ export declare class DirectusApiAdapter<Schema extends SchemaShape = SchemaShape
     request<T>(method: BaseApiMethods, url: string, query?: Record<string, unknown>): Promise<T>;
     find<T, Q = T, R = T>(collection: Path, query: ApiFindQuery<Q>): Promise<ApiResponse<R[]>>;
     findOne<T>(collection: Path, key?: ApiId, query?: Record<string, unknown>): Promise<ApiResponse<T>>;
-    aggregate<T>(collection: Path, query?: Record<string, unknown>): Promise<ApiResponse<T>>;
+    aggregate<T, Q = T, R = T>(collection: Path, query: ApiAggregateQuery<Q>): Promise<ApiResponse<R>>;
     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>>;

package/dist/adapter/api-adapter.js

@@ -36,7 +36,10 @@ export class DirectusApiAdapter extends ApiAdapterAbstract {
         const { filter, search } = query || {};
         const data = await this.directus.request(aggregate(collection, {
             aggregate: { count: '*' },
-            query: { filter, search }
+            query: {
+                ...(filter ? { filter } : {}),
+                ...(search ? { search } : {}),
+            }
         }));
         if (data && data.length === 1) {
             return Number(data[0].count);
@@ -91,11 +94,12 @@ export class DirectusApiAdapter extends ApiAdapterAbstract {
         return this.transformResponse({ data });
     }
     async aggregate(collection, query) {
+        const { aggregate: aggregate_, ...rest } = (query || {});
         const data = await this.directus.request(aggregate(collection, {
-            aggregate: {
+            aggregate: aggregate_ ? aggregate_ : {
                 count: 'id'
             },
-            query
+            query: rest
         }));
         return this.transformResponse({ data });
     }

package/dist/services/auth.d.ts

@@ -1,7 +1,6 @@
-import type { AuthenticationClient } from '@directus/sdk';
-import type { DirectusClient, RestClient } from '@directus/sdk';
-import { ServiceAdapterAbstract } from '@tanglemedia/svelte-starter-core';
-declare class DirectusAuthServices extends ServiceAdapterAbstract {
+import type { AuthenticationClient, DirectusClient, RestClient } from '@directus/sdk';
+import { ServiceAbstract } from '@tanglemedia/svelte-starter-core';
+declare class DirectusAuthServices extends ServiceAbstract {
     getDirectus(): Promise<DirectusClient<object> & RestClient<object> & AuthenticationClient<object>>;
     refresh(): Promise<import("@directus/sdk").AuthenticationData>;
     getToken(): Promise<string | null>;

package/dist/services/auth.js

@@ -1,6 +1,6 @@
 import { readFiles, readMe, updateMe } from '@directus/sdk';
-import { ServiceAdapterAbstract } from '@tanglemedia/svelte-starter-core';
-class DirectusAuthServices extends ServiceAdapterAbstract {
+import { ServiceAbstract } from '@tanglemedia/svelte-starter-core';
+class DirectusAuthServices extends ServiceAbstract {
     getDirectus() {
         return this.getAdapterClient();
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanglemedia/svelte-starter-directus-api",
-  "version": "2.0.3",
+  "version": "2.1.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "description": "directus API wrapper for all the directus sdk functionality",
@@ -36,17 +36,17 @@
     "vite": "^5.4.2",
     "vitest": "^2.0.5",
     "@internal/eslint-config": "0.0.0",
-    "@tanglemedia/svelte-starter-core": "0.2.1"
+    "@tanglemedia/svelte-starter-core": "0.2.2"
   },
   "dependencies": {
-    "@directus/sdk": "^17.0.0",
+    "@directus/sdk": "^17.0.1",
     "@types/js-cookie": "^3.0.6",
     "esm-env": "^1.0.0",
     "js-cookie": "^3.0.5"
   },
   "peerDependencies": {
     "@sveltejs/kit": ">=2 <3",
-    "@tanglemedia/svelte-starter-core": ">=0.2.1",
+    "@tanglemedia/svelte-starter-core": ">=0.2.2",
     "svelte": ">=4 <5"
   },
   "scripts": {

package/src/adapter/api-adapter.ts

@@ -18,6 +18,7 @@ import {
   ApiAdapterAbstract,
   type AnyObject,
   type ApiAdapterRequestConfig,
+  type ApiAggregateQuery,
   type ApiCreateManyQuery,
   type ApiDeleteManyQuery,
   type ApiFindQuery,
@@ -79,7 +80,10 @@ export class DirectusApiAdapter<
 
     const data = await this.directus.request(aggregate(collection, {
       aggregate: { count: '*' },
-      query: { filter, search }
+      query: {
+        ...(filter ? { filter } : {}),
+        ...(search ? { search } : {}),
+      }
     }));
 
     if (data && data.length === 1) {
@@ -157,18 +161,21 @@ export class DirectusApiAdapter<
     return this.transformResponse({ data });
   }
 
-  public async aggregate<T>(
+  public async aggregate<T, Q = T, R = T>(
     collection: Path,
-    query?: Record<string, unknown>
-  ): Promise<ApiResponse<T>> {
+    query: ApiAggregateQuery<Q>
+  ): Promise<ApiResponse<R>> {
+    const { aggregate: aggregate_, ...rest } = (query || {});
+
     const data = await this.directus.request<T>(
       aggregate(collection, {
-        aggregate: {
+        aggregate: aggregate_ ? aggregate_ : {
           count: 'id'
         },
-        query
+        query: rest
       })
     );
+
     return this.transformResponse({ data });
   }
 

package/src/services/auth.ts

@@ -1,9 +1,8 @@
-import type { AuthenticationClient } from '@directus/sdk';
+import type { AuthenticationClient, DirectusClient, RestClient } from '@directus/sdk';
 import { readFiles, readMe, updateMe } from '@directus/sdk';
-import type { DirectusClient, RestClient } from '@directus/sdk';
-import { ServiceAdapterAbstract } from '@tanglemedia/svelte-starter-core';
+import { ServiceAbstract } from '@tanglemedia/svelte-starter-core';
 
-class DirectusAuthServices extends ServiceAdapterAbstract {
+class DirectusAuthServices extends ServiceAbstract {
   public getDirectus() {
     return this.getAdapterClient<
       DirectusClient<object> & RestClient<object> & AuthenticationClient<object>