@tanglemedia/svelte-starter-directus-api 3.0.0 → 4.0.0

package/README.md

@@ -1,4 +1,4 @@
-# Directus-api
+# [@tanglemedia/svelte-starter-directus-api](https://tanglemedia-svelte-docs.netlify.app/docs/directus-api-package/functionality)
 
 <p align="center" style="align: center;">
   <a href="https://npm.im/@tanglemedia/svelte-starter-directus-api">
@@ -260,3 +260,4 @@ export const formsServiceClient = configureService<FormInterface>(Forms, {
   adapterKey: 'directus-client'
 });
 ```
+### For mode demos and to check out all the components, please visit our [documentation website](https://tanglemedia-svelte-docs.netlify.app/docs/directus-api-package/functionality)

package/dist/adapter/api-adapter.js

@@ -38,11 +38,14 @@ export class DirectusApiAdapter extends ApiAdapterAbstract {
             return null;
         }
         const { filter, search } = query || {};
+        // default to countDistinct. Note that there is a bug in directus where
+        // the wrong counts are being returned if there are nested filters.
+        const k = this.config.configuration.totalAggregate || 'countDistinct';
         const data = await this.directus.request(aggregate(collection, {
-            aggregate: { count: '*' },
+            aggregate: { [k]: '*' },
             query: {
                 ...(filter ? { filter } : {}),
-                ...(search ? { search } : {}),
+                ...(search ? { search } : {})
             }
         }));
         if (data && data.length === 1) {
@@ -85,7 +88,7 @@ export class DirectusApiAdapter extends ApiAdapterAbstract {
         }
     }
     async find(collection, query) {
-        const response = await this.directus.request(readItems(collection, query));
+        const response = (await this.directus.request(readItems(collection, query)));
         const total = await this.includeTotals(collection, query);
         if (null === total) {
             return this.transformResponse({ data: response });
@@ -98,11 +101,13 @@ export class DirectusApiAdapter extends ApiAdapterAbstract {
         return this.transformResponse({ data });
     }
     async aggregate(collection, query) {
-        const { aggregate: aggregate_, ...rest } = (query || {});
+        const { aggregate: aggregate_, ...rest } = query || {};
         const data = await this.directus.request(aggregate(collection, {
-            aggregate: aggregate_ ? aggregate_ : {
-                count: 'id'
-            },
+            aggregate: aggregate_
+                ? aggregate_
+                : {
+                    count: 'id'
+                },
             query: rest
         }));
         return this.transformResponse({ data });
@@ -121,7 +126,7 @@ export class DirectusApiAdapter extends ApiAdapterAbstract {
     }
     async put(collection, key, payload) {
         if (key) {
-            const data = await this.directus.request(updateItem(collection, key, payload));
+            const data = (await this.directus.request(updateItem(collection, key, payload)));
             return this.transformResponse({ data }, 201);
         }
         else {

package/dist/types/adapter.types.d.ts

@@ -19,6 +19,7 @@ export type DirectusApiAdapterOptions = {
         credentials?: RequestCredentials;
     };
     includeTotals?: boolean;
+    totalAggregate?: 'count' | 'countDistinct';
 };
 export type DirectusConfig = BaseApiAdapterConfig<DirectusApiAdapterOptions>;
 export type SchemaShape = Record<string, object>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanglemedia/svelte-starter-directus-api",
-  "version": "3.0.0",
+  "version": "4.0.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "description": "directus API wrapper for all the directus sdk functionality",
@@ -35,8 +35,8 @@
     "svelte-check": "^4.0.4",
     "vite": "^5.4.8",
     "vitest": "^2.1.2",
-    "@tanglemedia/svelte-starter-core": "0.3.0",
-    "@internal/eslint-config": "0.0.0"
+    "@internal/eslint-config": "0.0.0",
+    "@tanglemedia/svelte-starter-core": "0.5.0"
   },
   "dependencies": {
     "@directus/sdk": "^17.0.2",
@@ -46,7 +46,7 @@
   },
   "peerDependencies": {
     "@sveltejs/kit": ">=2 <3",
-    "@tanglemedia/svelte-starter-core": ">=0.3.0",
+    "@tanglemedia/svelte-starter-core": ">=0.5.0",
     "svelte": ">=4 <5"
   },
   "scripts": {

package/src/adapter/api-adapter.ts

@@ -85,8 +85,12 @@ export class DirectusApiAdapter<
 
     const { filter, search } = query || {};
 
+    // default to countDistinct. Note that there is a bug in directus where
+    // the wrong counts are being returned if there are nested filters.
+    const k = this.config.configuration.totalAggregate || 'countDistinct';
+
     const data = await this.directus.request(aggregate(collection, {
-      aggregate: { count: '*' },
+      aggregate: { [k]: '*' },
       query: {
         ...(filter ? { filter } : {}),
         ...(search ? { search } : {}),

package/src/types/adapter.types.ts

@@ -25,6 +25,7 @@ export type DirectusApiAdapterOptions = {
   };
 
   includeTotals?: boolean;
+  totalAggregate?: 'count' | 'countDistinct';
 };
 
 export type DirectusConfig = BaseApiAdapterConfig<DirectusApiAdapterOptions>;