@tanglemedia/svelte-starter-directus-api 7.0.0 → 8.1.0

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

@@ -1,12 +1,10 @@
-import { type AllCollections, type DirectusClient, type RegularCollections, type RestClient } from '@directus/sdk';
-import { ApiAdapterAbstract, type AnyObject, type ApiAdapterHandle, type ApiAdapterRequestConfig, type ApiAggregateQuery, type ApiCreateManyQuery, type ApiDeleteManyQuery, type ApiFindQuery, type ApiId, type ApiResponse, type ApiUpdateManyQuery, type BaseApiMethods, type HandleEvent } from '@tanglemedia/svelte-starter-core';
-import type { DirectusConfig, SchemaShape } from '../types/adapter.types';
-export type AdapterClient<Schema extends SchemaShape = SchemaShape> = DirectusClient<Schema> & RestClient<Schema>;
-/**
- * TODO: Various types fixes. The current adapter doesn't correctly follow the types defined under the ApiAdapterAbstract.
- * See the fetch adapter under the core
- */
-export declare class DirectusApiAdapter<Schema extends SchemaShape = SchemaShape, Path extends RegularCollections<Schema> = RegularCollections<Schema>> extends ApiAdapterAbstract<DirectusConfig, ApiAdapterRequestConfig, Path, AdapterClient> implements ApiAdapterHandle {
+import { type RegularCollections } from '@directus/sdk';
+import { ApiAdapterAbstract, type AnyObject, type ApiAdapterHandle, type ApiAdapterRequestConfig, type ApiAggregateQuery, type ApiCreateManyQuery, type ApiDeleteManyQuery, type ApiFindQuery, type ApiId, type ApiPatchQuery, type ApiPostQuery, type ApiPutQuery, type ApiResponse, type ApiUpdateManyQuery, type BaseApiMethods, type HandleEvent } from '@tanglemedia/svelte-starter-core';
+import type { DirectusAdapterClient, DirectusConfig, SchemaShape } from '../types/adapter.types';
+type PathKey<Schema extends SchemaShape> = Extract<RegularCollections<Schema>, string>;
+export type AdapterClient<Schema extends SchemaShape = SchemaShape> = DirectusAdapterClient<Schema>;
+type Q = Record<string, unknown>;
+export declare class DirectusApiAdapter<Schema extends SchemaShape = SchemaShape, Path extends PathKey<Schema> = PathKey<Schema>> extends ApiAdapterAbstract<DirectusConfig, ApiAdapterRequestConfig, Path, AdapterClient<Schema>> implements ApiAdapterHandle {
     protected config: DirectusConfig;
     private readonly directus;
     constructor(config: DirectusConfig, directus: AdapterClient<Schema>);
@@ -19,25 +17,42 @@ export declare class DirectusApiAdapter<Schema extends SchemaShape = SchemaShape
         total: number;
         displayed: number;
     };
-    includeTotals(collection: AllCollections<Schema>, query?: ApiFindQuery<any>): Promise<number | null>;
+    /**
+     * Counts the items matching the query's `filter` and `search`, or returns `null` when
+     * `includeTotals` is not enabled on the adapter. Side effect: sends an aggregate request
+     * to Directus.
+     *
+     * A per-request `config.configuration` can override `totalAggregate` and `totalField`,
+     * for example to count a collection whose primary key is not `id`.
+     *
+     * @example
+     * await adapter.includeTotals('clinics', { filter }, { configuration: { totalField: 'ID' } });
+     * // requests aggregate={"countDistinct":"ID"} when the adapter uses countDistinct
+     */
+    includeTotals(collection: Path, query?: ApiFindQuery<any>, config?: ApiAdapterRequestConfig): Promise<number | null>;
     transformResponse<T, M extends object = AnyObject>(res: {
         data: T;
         meta?: AnyObject;
-    }, status?: number): Promise<ApiResponse<T, Response, M>>;
-    getConfig(configuration?: unknown): DirectusConfig;
-    normalizeQuery(config?: ApiAdapterRequestConfig, merge?: Record<string, unknown>): {
+    }, status?: number): Promise<ApiResponse<T, null, M>>;
+    normalizeQuery(config?: ApiAdapterRequestConfig, merge?: Q): {
         [x: string]: unknown;
     };
-    request<T>(method: BaseApiMethods, url: string, query?: ApiAdapterRequestConfig): Promise<T>;
-    find<T, Q = T, R = T>(collection: Path, query: ApiFindQuery<Q>, config?: ApiAdapterRequestConfig): Promise<ApiResponse<R[]>>;
-    findOne<T>(collection: Path, key?: ApiId, query?: ApiAdapterRequestConfig): Promise<ApiResponse<T>>;
-    aggregate<T, Q = T, R = T>(collection: Path, query: ApiAggregateQuery<Q>, config?: ApiAdapterRequestConfig): Promise<ApiResponse<R>>;
-    patch<T>(collection: Path, key: ApiId, query?: Record<string, unknown>, config?: ApiAdapterRequestConfig): Promise<ApiResponse<T>>;
-    post<T>(collection: Path, data: AnyObject, query?: Record<string, unknown>, config?: ApiAdapterRequestConfig): Promise<ApiResponse<T>>;
-    delete<T>(collection: Path, key?: ApiId, config?: ApiAdapterRequestConfig): Promise<ApiResponse<T>>;
-    put<T extends object, R = T>(collection: Path, key?: ApiId, payload?: AnyObject, query?: ApiAdapterRequestConfig): Promise<ApiResponse<R>>;
-    upload<T>(path: string | undefined, data: FormData, config?: ApiAdapterRequestConfig): Promise<ApiResponse<T>>;
-    createMany<T, R = T>(path: Path, body: ApiCreateManyQuery<T>, config?: ApiAdapterRequestConfig): Promise<ApiResponse<R[], Response, AnyObject>>;
-    updateMany<T, R = T>(path: Path, body: ApiUpdateManyQuery<T>, config?: ApiAdapterRequestConfig): Promise<ApiResponse<R[], Response, AnyObject>>;
-    deleteMany<R = null>(path: Path, body: ApiDeleteManyQuery<ApiId>, config?: ApiAdapterRequestConfig): Promise<ApiResponse<R, Response, AnyObject>>;
+    getId(data: object, config?: ApiAdapterRequestConfig): ApiId | null;
+    stripId(config?: ApiAdapterRequestConfig): ApiAdapterRequestConfig | undefined;
+    request<T, R = T>(method: BaseApiMethods, url: Path, query?: ApiAdapterRequestConfig): Promise<ApiResponse<R>>;
+    find<T, F = T, R = T>(collection: Path, query: ApiFindQuery<F>, config?: ApiAdapterRequestConfig): Promise<ApiResponse<R[]>>;
+    findOne<T, R = T>(collection: Path, key: ApiId, query?: ApiAdapterRequestConfig): Promise<ApiResponse<R>>;
+    aggregate<T, F = T, R = T>(collection: Path, query: ApiAggregateQuery<F>, config?: ApiAdapterRequestConfig): Promise<ApiResponse<R>>;
+    patch<T extends object, R = T>(collection: Path, key: ApiId, data: ApiPatchQuery<T>, config?: ApiAdapterRequestConfig): Promise<ApiResponse<R>>;
+    post<T extends object, R = T>(collection: Path, data: ApiPostQuery<T>, config?: ApiAdapterRequestConfig): Promise<ApiResponse<R>>;
+    delete<T, R = T>(collection: Path, key: ApiId, config?: ApiAdapterRequestConfig): Promise<ApiResponse<R>>;
+    put<T extends object, R = T>(collection: Path, data: ApiPutQuery<T>, config?: ApiAdapterRequestConfig): Promise<ApiResponse<R>>;
+    put<T extends object, R = T>(collection: Path, key: ApiId, data?: AnyObject, config?: ApiAdapterRequestConfig): Promise<ApiResponse<R>>;
+    upload<T, R = T>(path: Path, data: FormData, config?: ApiAdapterRequestConfig & {
+        method?: BaseApiMethods;
+    }): Promise<ApiResponse<R>>;
+    createMany<T, R = T>(path: Path, body: ApiCreateManyQuery<T>, config?: ApiAdapterRequestConfig): Promise<ApiResponse<R[]>>;
+    updateMany<T, R = T>(path: Path, body: ApiUpdateManyQuery<T>, config?: ApiAdapterRequestConfig): Promise<ApiResponse<R[]>>;
+    deleteMany<R>(path: Path, body: ApiDeleteManyQuery<ApiId>, config?: ApiAdapterRequestConfig): Promise<ApiResponse<R[]>>;
 }
+export {};

package/dist/adapter/api-adapter.js

@@ -16,10 +16,6 @@ const allowedQueryKeys = [
     'deep',
     'alias'
 ];
-/**
- * TODO: Various types fixes. The current adapter doesn't correctly follow the types defined under the ApiAdapterAbstract.
- * See the fetch adapter under the core
- */
 export class DirectusApiAdapter extends ApiAdapterAbstract {
     config;
     directus;
@@ -29,36 +25,43 @@ export class DirectusApiAdapter extends ApiAdapterAbstract {
         this.directus = directus;
     }
     async handle(event) {
-        const f = event.fetch;
-        this.directus.globals.fetch = f;
+        this.directus.globals.fetch = event.fetch;
     }
     getAdapterClient() {
         return this.directus;
     }
     normalizeMeta(response) {
         const payload = response.data, meta = response.meta;
-        if (!meta) {
-            return {};
-        }
-        if (typeof meta.total === 'undefined') {
+        if (!meta || typeof meta.total === 'undefined') {
             return {};
         }
         const displayed = Array.isArray(payload) ? payload.length : 0;
         const total = Number(meta.total);
-        // todo: Transform or attempt to get meta information
-        // consider pulling count based on existing filters in order to determine pagination
         return { total, displayed };
     }
-    async includeTotals(collection, query) {
+    /**
+     * Counts the items matching the query's `filter` and `search`, or returns `null` when
+     * `includeTotals` is not enabled on the adapter. Side effect: sends an aggregate request
+     * to Directus.
+     *
+     * A per-request `config.configuration` can override `totalAggregate` and `totalField`,
+     * for example to count a collection whose primary key is not `id`.
+     *
+     * @example
+     * await adapter.includeTotals('clinics', { filter }, { configuration: { totalField: 'ID' } });
+     * // requests aggregate={"countDistinct":"ID"} when the adapter uses countDistinct
+     */
+    async includeTotals(collection, query, config) {
         if (true !== this.config.configuration.includeTotals) {
             return null;
         }
         const { filter, search } = query || {};
+        const override = config?.configuration;
         // default to count. Note that there is a bug in directus where
         // the wrong counts are being returned if there are nested filters.
         // A quick fix is to set totalAggregate to countDistinct
-        const k = this.config.configuration.totalAggregate || 'count';
-        const f = this.config.configuration.totalField || 'id';
+        const k = override?.totalAggregate ?? (this.config.configuration.totalAggregate || 'count');
+        const f = override?.totalField ?? (this.config.configuration.totalField || 'id');
         const data = await this.directus.request(aggregate(collection, {
             aggregate: { [k]: f },
             query: {
@@ -75,26 +78,16 @@ export class DirectusApiAdapter extends ApiAdapterAbstract {
     }
     async transformResponse(res, status = 200) {
         return {
-            body: await this.envelopeResponse(res.data, (res.meta ? this.normalizeMeta(res) : {})),
-            status: status,
+            body: (await this.envelopeResponse(res.data, (res.meta ? this.normalizeMeta(res) : {}))),
+            status,
             statusText: 'OK',
             headers: {},
             adapterResponse: null
         };
     }
-    getConfig(configuration) {
-        const client = this.directus;
-        // Add the 'configuration' property to the returned object
-        const config = {
-            ...this.config,
-            configuration: configuration ?? this.config.configuration ?? {} // Use the provided configuration or an empty object if not provided
-        };
-        return Object.assign(client, config);
-    }
     normalizeQuery(config = {}, merge) {
         const q = { ...(config?.params || {}) };
         const c = { ...config };
-        // legacy support, this pulls the directus specific keys from the config
         const r = allowedQueryKeys.reduce((acc, k) => (typeof c[k] !== 'undefined' ? ((acc[k] = c[k]), acc) : acc), {});
         return {
             ...q,
@@ -102,16 +95,46 @@ export class DirectusApiAdapter extends ApiAdapterAbstract {
             ...(merge || {})
         };
     }
+    getId(data, config) {
+        const d = data;
+        const q = config?.params;
+        if (typeof d.id === 'string' || typeof d.id === 'number') {
+            return d.id;
+        }
+        if (q && (typeof q.id === 'string' || typeof q.id === 'number')) {
+            return q.id;
+        }
+        return null;
+    }
+    stripId(config) {
+        const q = config?.params;
+        if (!q || typeof q.id === 'undefined') {
+            return config;
+        }
+        const { id: _id, ...params } = q;
+        return {
+            ...config,
+            params
+        };
+    }
     async request(method, url, query) {
         try {
-            const response = await this.directus.request(() => {
-                const params = JSON.stringify(query);
-                return {
-                    path: `${url}?${params}`,
-                    method: method
-                };
-            });
-            return response;
+            const { body, headers } = query || {};
+            const params = this.normalizeQuery(query);
+            const data = await this.directus.request((() => ({
+                path: url,
+                method,
+                headers,
+                params,
+                ...(typeof body === 'undefined'
+                    ? {}
+                    : {
+                        body: body instanceof FormData || typeof body === 'string'
+                            ? body
+                            : JSON.stringify(body)
+                    })
+            })));
+            return this.transformResponse({ data }, method === 'POST' ? 201 : method === 'DELETE' ? 202 : 200);
         }
         catch (error) {
             console.error(`Error request:`, error);
@@ -119,72 +142,82 @@ export class DirectusApiAdapter extends ApiAdapterAbstract {
         }
     }
     async find(collection, query, config) {
-        query = this.normalizeQuery(config, query);
-        const response = (await this.directus.request(readItems(collection, query)));
-        const total = await this.includeTotals(collection, query);
+        const q = this.normalizeQuery(config, query);
+        const data = await this.directus.request(readItems(collection, q));
+        const total = await this.includeTotals(collection, query, config);
         if (null === total) {
-            return this.transformResponse({ data: response });
+            return this.transformResponse({ data });
         }
-        // console.log('find meta', response, total)
-        return this.transformResponse({ data: response, meta: { total } });
+        return this.transformResponse({ data, meta: { total } });
     }
     async findOne(collection, key, query) {
         const q = this.normalizeQuery(query);
-        const data = await this.directus.request(readItem(collection, key, query));
+        const data = await this.directus.request(readItem(collection, key, q));
         return this.transformResponse({ data });
     }
     async aggregate(collection, query, config) {
-        const { aggregate: aggregate_, ...rest } = this.normalizeQuery(config, query);
+        const { aggregate: a, ...rest } = this.normalizeQuery(config, query);
         const data = await this.directus.request(aggregate(collection, {
-            aggregate: aggregate_
-                ? aggregate_
-                : {
-                    count: 'id'
-                },
+            aggregate: a ? a : { count: 'id' },
             query: rest
         }));
         return this.transformResponse({ data });
     }
-    async patch(collection, key, query, config) {
-        const data = await this.directus.request(updateItem(collection, key, query));
-        return this.transformResponse({ data });
+    async patch(collection, key, data, config) {
+        const q = this.normalizeQuery(config);
+        const res = await this.directus.request(updateItem(collection, key, data, q));
+        return this.transformResponse({ data: res });
     }
-    async post(collection, data, query, config) {
-        const response = await this.directus.request(createItem(collection, data, query));
-        return this.transformResponse({ data: response }, 201);
+    async post(collection, data, config) {
+        const q = this.normalizeQuery(config);
+        const res = await this.directus.request(createItem(collection, data, q));
+        return this.transformResponse({ data: res }, 201);
     }
     async delete(collection, key, config) {
+        void config;
         const data = await this.directus.request(deleteItem(collection, key));
         return this.transformResponse({ data }, 202);
     }
-    async put(collection, key, payload, query) {
-        if (key) {
-            const data = (await this.directus.request(updateItem(collection, key, payload, query)));
-            return this.transformResponse({ data }, 201);
-        }
-        else {
-            console.error(`Error updating all ${collection}: no key specified`);
+    async put(collection, keyOrData, dataOrConfig, config) {
+        const key = typeof keyOrData === 'string' || typeof keyOrData === 'number'
+            ? keyOrData
+            : this.getId(keyOrData, dataOrConfig);
+        const data = typeof keyOrData === 'string' || typeof keyOrData === 'number'
+            ? dataOrConfig
+            : keyOrData;
+        const q = typeof keyOrData === 'string' || typeof keyOrData === 'number'
+            ? config
+            : dataOrConfig;
+        if (!key) {
             throw new Error('No key specified');
         }
+        const res = await this.directus.request(updateItem(collection, key, data, this.normalizeQuery(this.stripId(q))));
+        return this.transformResponse({ data: res }, 201);
     }
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async upload(path = '', data, config) {
-        const response = await this.directus.request(uploadFiles(data));
-        return this.transformResponse({ data: response }, 201);
+    async upload(path, data, config) {
+        void path;
+        void config;
+        const res = await this.directus.request(uploadFiles(data));
+        return this.transformResponse({ data: res }, 201);
     }
     async createMany(path, body, config) {
-        const data = await this.directus.request(createItems(path, body.data, body?.query));
+        const q = this.normalizeQuery(config, body.query || {});
+        const data = await this.directus.request(createItems(path, body.data, q));
         return this.transformResponse({ data }, 200);
     }
     async updateMany(path, body, config) {
         if (!body.ids) {
             throw Error('You must provide an array of keys to update');
         }
-        const data = await this.directus.request(updateItems(path, body.ids || [], body.data, body?.query));
+        const q = this.normalizeQuery(config, body.query || {});
+        const ids = body.ids;
+        const data = await this.directus.request(updateItems(path, ids, body.data, q));
         return this.transformResponse({ data }, 200);
     }
     async deleteMany(path, body, config) {
-        const data = await this.directus.request(deleteItems(path, body.ids));
+        void config;
+        const ids = body.ids;
+        const data = await this.directus.request(deleteItems(path, ids));
         return this.transformResponse({ data }, 201);
     }
 }

package/dist/index.d.ts

@@ -4,3 +4,4 @@ export * from './services/auth';
 export * from './services/register';
 export type * from './types';
 export * from './provider/api-references-functions.provider';
+export * from './utils/directus-error';

package/dist/index.js

@@ -3,3 +3,4 @@ export * from './provider/directus.factory';
 export * from './services/auth';
 export * from './services/register';
 export * from './provider/api-references-functions.provider';
+export * from './utils/directus-error';

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

@@ -1,7 +1,7 @@
-import type { AdapterProviderRegister, ApiAdapterInterface, ApiAdapterProviderInterface } from '@tanglemedia/svelte-starter-core';
-import type { DirectusConfig } from '../types/adapter.types';
+import type { AdapterProviderRegister, ApiAdapterRequestConfig, ApiAdapterInterface, ApiAdapterProviderInterface } from '@tanglemedia/svelte-starter-core';
+import type { DirectusAdapterClient, DirectusConfig, SchemaShape } from '../types/adapter.types';
 export declare class DirectusApiProvider implements ApiAdapterProviderInterface<DirectusConfig> {
-    loadAdapter(key?: string, config?: DirectusConfig): Promise<ApiAdapterInterface<DirectusConfig>>;
-    createDirectusClient<T extends object>(config: DirectusConfig): import("@directus/sdk").DirectusClient<T> & import("@directus/sdk").RestClient<T>;
+    loadAdapter(key?: string, config?: DirectusConfig): Promise<ApiAdapterInterface<DirectusConfig, ApiAdapterRequestConfig, string, DirectusAdapterClient<SchemaShape>>>;
+    createDirectusClient<T extends SchemaShape>(config: DirectusConfig): DirectusAdapterClient<T>;
 }
 export declare const registerDirectusProvider: () => AdapterProviderRegister;

package/dist/provider/api-references-functions.provider.d.ts

@@ -1 +1,10 @@
-export * from '@directus/sdk';
+export { authentication, createDirectus, memoryStorage, rest, staticToken } from '@directus/sdk';
+export { login, logout, passwordRequest, passwordReset, readProviders, refresh, } from '@directus/sdk';
+export { createCollection, createComment, createComments, createContentVersion, createContentVersions, createDashboard, createDashboards, createField, createFlow, createFlows, createFolder, createFolders, createItem, createItems, createNotification, createNotifications, createOperation, createOperations, createPanel, createPanels, createPermission, createPermissions, createPolicies, createPolicy, createPreset, createPresets, createRelation, createRole, createRoles, createShare, createShares, createTranslation, createTranslations, createUser, createUsers, importFile, uploadFiles, } from '@directus/sdk';
+export { aggregate, downloadFilesZip, downloadFolderZip, readActivities, readActivity, readAssetArrayBuffer, readAssetBlob, readAssetRaw, readCollection, readCollections, readComment, readComments, readContentVersion, readContentVersions, readDashboard, readDashboards, readExtensions, readField, readFields, readFieldsByCollection, readFile, readFiles, readFlow, readFlows, readFolder, readFolders, readGraphqlSdl, readItem, readItemPermissions, readItems, readMe, readNotification, readNotifications, readOpenApiSpec, readOperation, readOperations, readPanel, readPanels, readPermission, readPermissions, readPolicies, readPolicy, readPolicyGlobals, readPreset, readPresets, readRelation, readRelationByCollection, readRelations, readRevision, readRevisions, readRole, readRoles, readRolesMe, readSettings, readShare, readShareInfo, readShares, readSingleton, readTranslation, readTranslations, readUser, readUserPermissions, readUsers, } from '@directus/sdk';
+export { updateCollection, updateCollectionsBatch, updateComment, updateComments, updateCommentsBatch, updateContentVersion, updateContentVersions, updateContentVersionsBatch, updateDashboard, updateDashboards, updateDashboardsBatch, updateExtension, updateField, updateFields, updateFile, updateFiles, updateFilesBatch, updateFlow, updateFlows, updateFlowsBatch, updateFolder, updateFolders, updateFoldersBatch, updateItem, updateItems, updateItemsBatch, updateMe, updateNotification, updateNotifications, updateNotificationsBatch, updateOperation, updateOperations, updateOperationsBatch, updatePanel, updatePanels, updatePanelsBatch, updatePermission, updatePermissions, updatePermissionsBatch, updatePolicies, updatePoliciesBatch, updatePolicy, updatePreset, updatePresets, updatePresetsBatch, updateRelation, updateRole, updateRoles, updateRolesBatch, updateSettings, updateShare, updateShares, updateSharesBatch, updateSingleton, updateTranslation, updateTranslations, updateTranslationsBatch, updateUser, updateUsers, updateUsersBatch, } from '@directus/sdk';
+export { deleteCollection, deleteComment, deleteComments, deleteContentVersion, deleteContentVersions, deleteDashboard, deleteDashboards, deleteField, deleteFile, deleteFiles, deleteFlow, deleteFlows, deleteFolder, deleteFolders, deleteItem, deleteItems, deleteNotification, deleteNotifications, deleteOperation, deleteOperations, deletePanel, deletePanels, deletePermission, deletePermissions, deletePolicies, deletePolicy, deletePreset, deletePresets, deleteRelation, deleteRole, deleteRoles, deleteShare, deleteShares, deleteTranslation, deleteTranslations, deleteUser, deleteUsers, } from '@directus/sdk';
+export { schemaApply, schemaDiff, schemaSnapshot } from '@directus/sdk';
+export { serverHealth, serverInfo, serverPing } from '@directus/sdk';
+export { acceptUserInvite, authenticateShare, clearCache, compareContentVersion, customEndpoint, disableTwoFactor, enableTwoFactor, generateHash, generateTwoFactorSecret, inviteShare, inviteUser, isDirectusError, promoteContentVersion, randomString, registerUser, registerUserVerify, saveToContentVersion, triggerFlow, utilitySort, utilsExport, utilsImport, verifyHash, withOptions, withSearch, withToken, } from '@directus/sdk';
+export type { DirectusClient, RestClient, RestCommand } from '@directus/sdk';

package/dist/provider/api-references-functions.provider.js

@@ -1 +1,18 @@
-export * from '@directus/sdk';
+// Client setup
+export { authentication, createDirectus, memoryStorage, rest, staticToken } from '@directus/sdk';
+// Auth commands
+export { login, logout, passwordRequest, passwordReset, readProviders, refresh, } from '@directus/sdk';
+// Create commands
+export { createCollection, createComment, createComments, createContentVersion, createContentVersions, createDashboard, createDashboards, createField, createFlow, createFlows, createFolder, createFolders, createItem, createItems, createNotification, createNotifications, createOperation, createOperations, createPanel, createPanels, createPermission, createPermissions, createPolicies, createPolicy, createPreset, createPresets, createRelation, createRole, createRoles, createShare, createShares, createTranslation, createTranslations, createUser, createUsers, importFile, uploadFiles, } from '@directus/sdk';
+// Read commands
+export { aggregate, downloadFilesZip, downloadFolderZip, readActivities, readActivity, readAssetArrayBuffer, readAssetBlob, readAssetRaw, readCollection, readCollections, readComment, readComments, readContentVersion, readContentVersions, readDashboard, readDashboards, readExtensions, readField, readFields, readFieldsByCollection, readFile, readFiles, readFlow, readFlows, readFolder, readFolders, readGraphqlSdl, readItem, readItemPermissions, readItems, readMe, readNotification, readNotifications, readOpenApiSpec, readOperation, readOperations, readPanel, readPanels, readPermission, readPermissions, readPolicies, readPolicy, readPolicyGlobals, readPreset, readPresets, readRelation, readRelationByCollection, readRelations, readRevision, readRevisions, readRole, readRoles, readRolesMe, readSettings, readShare, readShareInfo, readShares, readSingleton, readTranslation, readTranslations, readUser, readUserPermissions, readUsers, } from '@directus/sdk';
+// Update commands
+export { updateCollection, updateCollectionsBatch, updateComment, updateComments, updateCommentsBatch, updateContentVersion, updateContentVersions, updateContentVersionsBatch, updateDashboard, updateDashboards, updateDashboardsBatch, updateExtension, updateField, updateFields, updateFile, updateFiles, updateFilesBatch, updateFlow, updateFlows, updateFlowsBatch, updateFolder, updateFolders, updateFoldersBatch, updateItem, updateItems, updateItemsBatch, updateMe, updateNotification, updateNotifications, updateNotificationsBatch, updateOperation, updateOperations, updateOperationsBatch, updatePanel, updatePanels, updatePanelsBatch, updatePermission, updatePermissions, updatePermissionsBatch, updatePolicies, updatePoliciesBatch, updatePolicy, updatePreset, updatePresets, updatePresetsBatch, updateRelation, updateRole, updateRoles, updateRolesBatch, updateSettings, updateShare, updateShares, updateSharesBatch, updateSingleton, updateTranslation, updateTranslations, updateTranslationsBatch, updateUser, updateUsers, updateUsersBatch, } from '@directus/sdk';
+// Delete commands
+export { deleteCollection, deleteComment, deleteComments, deleteContentVersion, deleteContentVersions, deleteDashboard, deleteDashboards, deleteField, deleteFile, deleteFiles, deleteFlow, deleteFlows, deleteFolder, deleteFolders, deleteItem, deleteItems, deleteNotification, deleteNotifications, deleteOperation, deleteOperations, deletePanel, deletePanels, deletePermission, deletePermissions, deletePolicies, deletePolicy, deletePreset, deletePresets, deleteRelation, deleteRole, deleteRoles, deleteShare, deleteShares, deleteTranslation, deleteTranslations, deleteUser, deleteUsers, } from '@directus/sdk';
+// Schema commands
+export { schemaApply, schemaDiff, schemaSnapshot } from '@directus/sdk';
+// Server commands
+export { serverHealth, serverInfo, serverPing } from '@directus/sdk';
+// Utility functions
+export { acceptUserInvite, authenticateShare, clearCache, compareContentVersion, customEndpoint, disableTwoFactor, enableTwoFactor, generateHash, generateTwoFactorSecret, inviteShare, inviteUser, isDirectusError, promoteContentVersion, randomString, registerUser, registerUserVerify, saveToContentVersion, triggerFlow, utilitySort, utilsExport, utilsImport, verifyHash, withOptions, withSearch, withToken, } from '@directus/sdk';

package/dist/provider/directus.factory.d.ts

@@ -1,6 +1,6 @@
 import { type ClientOptions } from '@directus/sdk';
-import type { DirectusConfig } from '../types/adapter.types';
+import type { DirectusAdapterClient, DirectusConfig, SchemaShape } from '../types/adapter.types';
 /**
  * Creates a directus client based on the application configuration
  */
-export declare const createDirectusClientFactory: <T extends object>({ baseUrl, configuration: { protocol, host, auth, staticToken: token, graphql: gql, rest: rs } }: DirectusConfig, options?: ClientOptions) => import("@directus/sdk").DirectusClient<T> & import("@directus/sdk").RestClient<T>;
+export declare const createDirectusClientFactory: <T extends SchemaShape>({ baseUrl, configuration: { protocol, host, auth, staticToken: token, graphql: gql, rest: rs } }: DirectusConfig, options?: ClientOptions) => DirectusAdapterClient<T>;

package/dist/services/auth.d.ts

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

package/dist/services/auth.js

@@ -4,12 +4,19 @@ class DirectusAuthServices extends ServiceAbstract {
     getDirectus() {
         return this.getAdapterClient();
     }
+    async getAuthenticatedDirectus() {
+        const directus = await this.getDirectus();
+        if (!directus.refresh || !directus.getToken || !directus.login || !directus.logout) {
+            throw new Error('Directus client is missing authentication methods');
+        }
+        return directus;
+    }
     // public getConfig<T extends object>(): DirectusClient<T> & RestClient<object> {
     //   return this.directus as DirectusClient<T> & RestClient<object>;
     // }
     async refresh() {
         try {
-            const response = await (await this.getDirectus()).refresh();
+            const response = await (await this.getAuthenticatedDirectus()).refresh();
             return response;
         }
         catch (error) {
@@ -19,7 +26,7 @@ class DirectusAuthServices extends ServiceAbstract {
     }
     async getToken() {
         try {
-            const response = await (await this.getDirectus()).getToken();
+            const response = await (await this.getAuthenticatedDirectus()).getToken();
             return response;
         }
         catch (error) {
@@ -29,7 +36,7 @@ class DirectusAuthServices extends ServiceAbstract {
     }
     async login(email, password) {
         try {
-            const response = await (await this.getDirectus()).login(email, password);
+            const response = await (await this.getAuthenticatedDirectus()).login({ email, password });
             return response;
         }
         catch (error) {
@@ -39,7 +46,7 @@ class DirectusAuthServices extends ServiceAbstract {
     }
     async logout() {
         try {
-            const response = await (await this.getDirectus()).logout();
+            const response = await (await this.getAuthenticatedDirectus()).logout();
             return response;
         }
         catch (error) {
@@ -51,7 +58,8 @@ class DirectusAuthServices extends ServiceAbstract {
         try {
             if (!(await this.getToken()))
                 await this.refresh();
-            const response = await (await this.getDirectus()).request(readMe({ fields: fields ? fields : ['*', 'roles.*'] }));
+            const queryFields = (fields ?? ['*', 'roles.*']);
+            const response = await (await this.getDirectus()).request(readMe({ fields: queryFields }));
             return response;
         }
         catch (error) {

package/dist/services/register.js

@@ -7,7 +7,7 @@ class DirectusStaticServices extends ServiceAdapterAbstract {
     async createUser(data) {
         try {
             await (await this.getDirectus()).request(createUser(data));
-            return { message: 'You have successfully registered your account', type: 'success' };
+            return { message: 'You have registered your account', type: 'success' };
         }
         catch (error) {
             console.error(`Error creating a user:`, error);

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

@@ -1,6 +1,7 @@
-import type { AuthenticationMode, GraphqlConfig } from '@directus/sdk';
+import type { AuthenticationClient, AuthenticationMode, DirectusClient, GraphqlClient, GraphqlConfig, RestClient, StaticTokenClient } from '@directus/sdk';
 import type { BaseApiAdapterConfig } from '@tanglemedia/svelte-starter-core';
-export { type AllCollections, type DirectusClient, type RegularCollections, type RestClient, type StaticTokenClient, type AuthenticationClient } from '@directus/sdk';
+export type { AllCollections, RegularCollections, DirectusClient, RestClient, StaticTokenClient, AuthenticationClient } from '@directus/sdk';
+export type * from '@directus/types';
 export type DirectusApiAuthOptions = {
     mode: AuthenticationMode;
     config?: Partial<{
@@ -24,4 +25,5 @@ export type DirectusApiAdapterOptions = {
     totalField?: string;
 };
 export type DirectusConfig = BaseApiAdapterConfig<DirectusApiAdapterOptions>;
-export type SchemaShape = Record<string, object>;
+export type SchemaShape = Record<string, object | object[]>;
+export type DirectusAdapterClient<Schema extends SchemaShape = SchemaShape> = DirectusClient<Schema> & RestClient<Schema> & Partial<AuthenticationClient<Schema>> & Partial<StaticTokenClient<Schema>> & Partial<GraphqlClient<Schema>>;

package/dist/types/adapter.types.js

@@ -1 +1 @@
-export {} from '@directus/sdk';
+export {};

package/dist/utils/directus-error.d.ts

@@ -0,0 +1,6 @@
+export type DirectusErrorCode = 'FAILED_VALIDATION' | 'FORBIDDEN' | 'INVALID_TOKEN' | 'TOKEN_EXPIRED' | 'INVALID_CREDENTIALS' | 'INVALID_IP' | 'INVALID_OTP' | 'INVALID_PAYLOAD' | 'INVALID_QUERY' | 'UNSUPPORTED_MEDIA_TYPE' | 'REQUESTS_EXCEEDED' | 'ROUTE_NOT_FOUND' | 'SERVICE_UNAVAILABLE' | 'UNPROCESSABLE_CONTENT';
+/**
+ * Returns the Directus error code from the first error in a Directus API error response,
+ * or null if the value is not a Directus error shape.
+ */
+export declare function extractDirectusErrorCode(err: unknown): DirectusErrorCode | null;

package/dist/utils/directus-error.js

@@ -0,0 +1,42 @@
+function parseDirectusErrorCandidate(err) {
+    if (typeof err !== 'object' || err === null) {
+        return err;
+    }
+    if (isDirectusErrorShape(err)) {
+        return err;
+    }
+    if (!(err instanceof Error)) {
+        return err;
+    }
+    try {
+        return JSON.parse(err.message);
+    }
+    catch {
+        return err;
+    }
+}
+function isDirectusErrorShape(err) {
+    if (typeof err !== 'object' || err === null) {
+        return false;
+    }
+    const candidate = err;
+    if (!Array.isArray(candidate['errors']) || candidate['errors'].length === 0) {
+        return false;
+    }
+    const first = candidate['errors'][0];
+    return (typeof first['extensions'] === 'object' &&
+        first['extensions'] !== null &&
+        'code' in first['extensions']);
+}
+/**
+ * Returns the Directus error code from the first error in a Directus API error response,
+ * or null if the value is not a Directus error shape.
+ */
+export function extractDirectusErrorCode(err) {
+    const candidate = parseDirectusErrorCandidate(err);
+    if (!isDirectusErrorShape(candidate)) {
+        return null;
+    }
+    const code = candidate.errors[0].extensions.code;
+    return code ?? null;
+}