@directus/api 12.0.2 → 12.1.0

package/dist/auth/drivers/oauth2.js

@@ -183,11 +183,11 @@ const handleError = (e) => {
     if (e instanceof errors.OPError) {
         if (e.error === 'invalid_grant') {
             // Invalid token
-            logger.trace(e, `[OAuth2] Invalid grant`);
+            logger.warn(e, `[OAuth2] Invalid grant`);
             return new InvalidTokenError();
         }
         // Server response error
-        logger.trace(e, `[OAuth2] Unknown OP error`);
+        logger.warn(e, `[OAuth2] Unknown OP error`);
         return new ServiceUnavailableError({
             service: 'oauth2',
             reason: `Service returned unexpected response: ${e.error_description}`,
@@ -195,10 +195,10 @@ const handleError = (e) => {
     }
     else if (e instanceof errors.RPError) {
         // Internal client error
-        logger.trace(e, `[OAuth2] Unknown RP error`);
+        logger.warn(e, `[OAuth2] Unknown RP error`);
         return new InvalidCredentialsError();
     }
-    logger.trace(e, `[OAuth2] Unknown error`);
+    logger.warn(e, `[OAuth2] Unknown error`);
     return e;
 };
 export function createOAuth2AuthRouter(providerName) {

package/dist/auth/drivers/openid.js

@@ -205,11 +205,11 @@ const handleError = (e) => {
     if (e instanceof errors.OPError) {
         if (e.error === 'invalid_grant') {
             // Invalid token
-            logger.trace(e, `[OpenID] Invalid grant`);
+            logger.warn(e, `[OpenID] Invalid grant`);
             return new InvalidTokenError();
         }
         // Server response error
-        logger.trace(e, `[OpenID] Unknown OP error`);
+        logger.warn(e, `[OpenID] Unknown OP error`);
         return new ServiceUnavailableError({
             service: 'openid',
             reason: `Service returned unexpected response: ${e.error_description}`,
@@ -217,10 +217,10 @@ const handleError = (e) => {
     }
     else if (e instanceof errors.RPError) {
         // Internal client error
-        logger.trace(e, `[OpenID] Unknown RP error`);
+        logger.warn(e, `[OpenID] Unknown RP error`);
         return new InvalidCredentialsError();
     }
-    logger.trace(e, `[OpenID] Unknown error`);
+    logger.warn(e, `[OpenID] Unknown error`);
     return e;
 };
 export function createOpenIDAuthRouter(providerName) {

package/dist/auth/drivers/saml.js

@@ -45,7 +45,7 @@ export class SAMLAuthDriver extends LocalAuthDriver {
         if (userID)
             return userID;
         if (!allowPublicRegistration) {
-            logger.trace(`[SAML] User doesn't exist, and public registration not allowed for provider "${provider}"`);
+            logger.warn(`[SAML] User doesn't exist, and public registration not allowed for provider "${provider}"`);
             throw new InvalidCredentialsError();
         }
         const firstName = payload[givenNameKey ?? 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname'];

package/dist/database/migrations/20230721A-require-shares-fields.d.ts

@@ -0,0 +1,3 @@
+import type { Knex } from 'knex';
+export declare function up(knex: Knex): Promise<void>;
+export declare function down(knex: Knex): Promise<void>;

package/dist/database/migrations/20230721A-require-shares-fields.js

@@ -0,0 +1,12 @@
+export async function up(knex) {
+    await knex.schema.alterTable('directus_shares', (table) => {
+        table.dropNullable('collection');
+        table.dropNullable('item');
+    });
+}
+export async function down(knex) {
+    await knex.schema.alterTable('directus_shares', (table) => {
+        table.setNullable('collection');
+        table.setNullable('item');
+    });
+}

package/dist/database/system-data/fields/shares.yaml

@@ -35,7 +35,7 @@ fields:
       iconRight: lock
       masked: true
     width: half
-    note: $t:shared_leave_blank_for_unlimited
+    note: $t:shared_leave_blank_for_passwordless_access
 
   - field: date_start
     width: half

package/dist/middleware/error-handler.js

@@ -12,20 +12,7 @@ const errorHandler = (err, req, res, _next) => {
         errors: [],
     };
     const errors = toArray(err);
-    if (errors.some((err) => isDirectusError(err) === false)) {
-        res.status(500);
-    }
-    else {
-        let status = errors[0].status;
-        for (const err of errors) {
-            if (status !== err.status) {
-                // If there's multiple different status codes in the errors, use 500
-                status = 500;
-                break;
-            }
-        }
-        res.status(status);
-    }
+    let status = null;
     for (const err of errors) {
         if (env['NODE_ENV'] === 'development') {
             err.extensions = {
@@ -35,7 +22,12 @@ const errorHandler = (err, req, res, _next) => {
         }
         if (isDirectusError(err)) {
             logger.debug(err);
-            res.status(err.status);
+            if (!status) {
+                status = err.status;
+            }
+            else if (status !== err.status) {
+                status = 500;
+            }
             payload.errors.push({
                 message: err.message,
                 extensions: {
@@ -49,7 +41,7 @@ const errorHandler = (err, req, res, _next) => {
         }
         else {
             logger.error(err);
-            res.status(500);
+            status = 500;
             if (req.accountability?.admin === true) {
                 payload = {
                     errors: [
@@ -77,6 +69,7 @@ const errorHandler = (err, req, res, _next) => {
             }
         }
     }
+    res.status(status ?? 500);
     emitter
         .emitFilter('request.error', payload.errors, {}, {
         database: getDatabase(),

package/dist/operations/notification/index.d.ts

@@ -3,6 +3,8 @@ type Options = {
     subject: string;
     message?: unknown | null;
     permissions: string;
+    collection?: string;
+    item?: string;
 };
 declare const _default: import("@directus/types").OperationApiConfig<Options>;
 export default _default;

package/dist/operations/notification/index.js

@@ -3,7 +3,7 @@ import { NotificationsService } from '../../services/notifications.js';
 import { getAccountabilityForRole } from '../../utils/get-accountability-for-role.js';
 export default defineOperationApi({
     id: 'notification',
-    handler: async ({ recipient, subject, message, permissions }, { accountability, database, getSchema }) => {
+    handler: async ({ recipient, subject, message, permissions, collection, item }, { accountability, database, getSchema }) => {
         const schema = await getSchema({ database });
         let customAccountability;
         if (!permissions || permissions === '$trigger') {
@@ -24,12 +24,16 @@ export default defineOperationApi({
             knex: database,
         });
         const messageString = message ? optionToString(message) : null;
+        const collectionString = message ? optionToString(collection) : null;
+        const itemString = message ? optionToString(item) : null;
         const payload = toArray(recipient).map((userId) => {
             return {
                 recipient: userId,
                 sender: customAccountability?.user ?? null,
                 subject,
                 message: messageString,
+                collection: collectionString,
+                item: itemString,
             };
         });
         const result = await notificationsService.createMany(payload);

package/dist/services/graphql/subscription.d.ts

@@ -3,14 +3,20 @@ import type { GraphQLResolveInfo } from 'graphql';
 export declare function bindPubSub(): void;
 export declare function createSubscriptionGenerator(self: GraphQLService, event: string): (_x: unknown, _y: unknown, _z: unknown, request: GraphQLResolveInfo) => AsyncGenerator<{
     [x: string]: {
-        key: any;
-        data: import("../../types/items.js").Item;
-        event: string;
+        key: string | number;
+        data: null;
+        event: "delete";
     };
 } | {
     [x: string]: {
-        key: any;
-        data: null;
-        event: string;
+        key: string | number;
+        data: any;
+        event: "create";
+    };
+} | {
+    [x: string]: {
+        key: string | number;
+        data: any;
+        event: "update";
     };
 }, void, unknown>;

package/dist/services/graphql/subscription.js

@@ -1,7 +1,8 @@
 import { EventEmitter, on } from 'events';
 import { getMessenger } from '../../messenger.js';
 import { getSchema } from '../../utils/get-schema.js';
-import { ItemsService } from '../items.js';
+import { refreshAccountability } from '../../websocket/authenticate.js';
+import { getSinglePayload } from '../../websocket/utils/items.js';
 const messages = createPubSub(new EventEmitter());
 export function bindPubSub() {
     const messenger = getMessenger();
@@ -18,25 +19,51 @@ export function createSubscriptionGenerator(self, event) {
             if ('event' in args && eventData['action'] !== args['event']) {
                 continue; // skip filtered events
             }
+            const accountability = await refreshAccountability(self.accountability);
             const schema = await getSchema();
-            if (eventData['action'] === 'create') {
-                const { collection, key } = eventData;
-                const service = new ItemsService(collection, { schema });
-                const data = await service.readOne(key, { fields });
-                yield { [event]: { key, data, event: 'create' } };
+            const subscription = {
+                collection: eventData['collection'],
+                event: eventData['action'],
+                query: { fields },
+            };
+            if (eventData['action'] === 'delete') {
+                // we have no data to send besides the key
+                for (const key of eventData.keys) {
+                    yield { [event]: { key, data: null, event: eventData['action'] } };
+                }
             }
-            if (eventData['action'] === 'update') {
-                const { collection, keys } = eventData;
-                const service = new ItemsService(collection, { schema });
-                for (const key of keys) {
-                    const data = await service.readOne(key, { fields });
-                    yield { [event]: { key, data, event: 'update' } };
+            if (eventData['action'] === 'create') {
+                try {
+                    subscription.item = eventData['key'];
+                    const result = await getSinglePayload(subscription, accountability, schema, eventData);
+                    yield {
+                        [event]: {
+                            key: eventData['key'],
+                            data: result['data'],
+                            event: eventData['action'],
+                        },
+                    };
+                }
+                catch {
+                    // dont notify the subscription of permission errors
                 }
             }
-            if (eventData['action'] === 'delete') {
-                const { keys } = eventData;
-                for (const key of keys) {
-                    yield { [event]: { key, data: null, event: 'delete' } };
+            if (eventData['action'] === 'update') {
+                for (const key of eventData['keys']) {
+                    try {
+                        subscription.item = key;
+                        const result = await getSinglePayload(subscription, accountability, schema, eventData);
+                        yield {
+                            [event]: {
+                                key,
+                                data: result['data'],
+                                event: eventData['action'],
+                            },
+                        };
+                    }
+                    catch {
+                        // dont notify the subscription of permission errors
+                    }
                 }
             }
         }

package/dist/services/import-export.js

@@ -169,6 +169,11 @@ export class ExportService {
                     schema: this.schema,
                     knex: trx,
                 });
+                const { primary } = this.schema.collections[collection];
+                const sort = query.sort ?? [];
+                if (sort.includes(primary) === false) {
+                    sort.push(primary);
+                }
                 const totalCount = await service
                     .readByQuery({
                     ...query,
@@ -188,6 +193,7 @@ export class ExportService {
                     }
                     const result = await service.readByQuery({
                         ...query,
+                        sort,
                         limit,
                         offset: batch * env['EXPORT_BATCH_SIZE'],
                     });

package/dist/services/mail/templates/base.liquid

@@ -35,7 +35,7 @@ a[x-apple-data-detectors] {
    line-height: inherit !important;
 }
 body a {
-    color: #6644ff;
+    color: {{projectColor}};
     text-decoration: none;
 }
 hr {
@@ -74,7 +74,7 @@ hr {
         color: #FFFFFF !important;
     }
     .link {
-    	color: #6644ff !important;
+    	color: {{projectColor}} !important;
     }
     .button {
     	background-color:#0BA582 !important;

package/dist/services/meta.js

@@ -42,8 +42,9 @@ export class MetaService {
         return Number(result?.count ?? 0);
     }
     async filterCount(collection, query) {
-        const dbQuery = this.knex(collection).count('*', { as: 'count' });
+        const dbQuery = this.knex(collection);
         let filter = query.filter || {};
+        let hasJoins = false;
         if (this.accountability?.admin !== true) {
             const permissionsRecord = this.accountability?.permissions?.find((permission) => {
                 return permission.action === 'read' && permission.collection === collection;
@@ -59,12 +60,19 @@ export class MetaService {
             }
         }
         if (Object.keys(filter).length > 0) {
-            applyFilter(this.knex, this.schema, dbQuery, filter, collection, {});
+            ({ hasJoins } = applyFilter(this.knex, this.schema, dbQuery, filter, collection, {}));
         }
         if (query.search) {
             applySearch(this.schema, dbQuery, query.search, collection);
         }
+        if (hasJoins) {
+            const primaryKeyName = this.schema.collections[collection].primary;
+            dbQuery.countDistinct({ count: [`${collection}.${primaryKeyName}`] });
+        }
+        else {
+            dbQuery.count('*', { as: 'count' });
+        }
         const records = await dbQuery;
-        return Number(records[0].count);
+        return Number(records[0]['count']);
     }
 }

package/dist/services/utils.js

@@ -2,6 +2,8 @@ import getDatabase from '../database/index.js';
 import { systemCollectionRows } from '../database/system-data/collections/index.js';
 import emitter from '../emitter.js';
 import { ForbiddenError, InvalidPayloadError } from '../errors/index.js';
+import { getCache } from '../cache.js';
+import { shouldClearCache } from '../utils/should-clear-cache.js';
 export class UtilsService {
     knex;
     accountability;
@@ -95,6 +97,11 @@ export class UtilsService {
                 .andWhere(sortField, '<=', sourceSortValue)
                 .andWhereNot({ [primaryKeyField]: item });
         }
+        // check if cache should be cleared
+        const { cache } = getCache();
+        if (shouldClearCache(cache, undefined, collection)) {
+            await cache.clear();
+        }
         emitter.emitAction(['items.sort', `${collection}.items.sort`], {
             collection,
             item,

package/dist/storage/get-storage-driver.js

@@ -1,6 +1,7 @@
 export const _aliasMap = {
     local: '@directus/storage-driver-local',
     s3: '@directus/storage-driver-s3',
+    supabase: '@directus/storage-driver-supabase',
     gcs: '@directus/storage-driver-gcs',
     azure: '@directus/storage-driver-azure',
     cloudinary: '@directus/storage-driver-cloudinary',

package/dist/utils/should-clear-cache.js

@@ -8,11 +8,13 @@ import { getEnv } from '../env.js';
  */
 export function shouldClearCache(cache, opts, collection) {
     const env = getEnv();
-    if (collection && env['CACHE_AUTO_PURGE_IGNORE_LIST'].includes(collection)) {
-        return false;
-    }
-    if (cache && env['CACHE_AUTO_PURGE'] && opts?.autoPurgeCache !== false) {
-        return true;
+    if (env['CACHE_AUTO_PURGE']) {
+        if (collection && env['CACHE_AUTO_PURGE_IGNORE_LIST'].includes(collection)) {
+            return false;
+        }
+        if (cache && opts?.autoPurgeCache !== false) {
+            return true;
+        }
     }
     return false;
 }

package/dist/utils/url.d.ts

@@ -5,6 +5,7 @@ export declare class Url {
     path: string[];
     query: Record<string, string>;
     hash: string | null;
+    hasTrailingSlash: boolean;
     constructor(url: string);
     isAbsolute(): boolean;
     isProtocolRelative(): boolean;

package/dist/utils/url.js

@@ -6,6 +6,7 @@ export class Url {
     path;
     query;
     hash;
+    hasTrailingSlash;
     constructor(url) {
         const parsedUrl = new URL(url, 'http://localhost');
         const isProtocolRelative = /^\/\//.test(url);
@@ -20,6 +21,7 @@ export class Url {
         this.path = parsedUrl.pathname.split('/').filter((p) => p !== '');
         this.query = Object.fromEntries(parsedUrl.searchParams.entries());
         this.hash = parsedUrl.hash !== '' ? parsedUrl.hash.substring(1) : null;
+        this.hasTrailingSlash = parsedUrl.pathname.length > 1 ? parsedUrl.pathname.endsWith('/') : url.endsWith('/');
     }
     isAbsolute() {
         return this.protocol !== null && this.host !== null;
@@ -52,8 +54,9 @@ export class Url {
         const port = this.port !== null ? `:${this.port}` : '';
         const origin = `${this.host !== null ? `${protocol}//` : ''}${host}${port}`;
         const path = this.path.length ? `/${this.path.join('/')}` : '';
+        const trailingSlash = this.hasTrailingSlash ? '/' : '';
         const query = Object.keys(this.query).length !== 0 ? `?${new URLSearchParams(this.query).toString()}` : '';
         const hash = this.hash !== null ? `#${this.hash}` : '';
-        return `${!rootRelative ? origin : ''}${path}${query}${hash}`;
+        return `${!rootRelative ? origin : ''}${path}${trailingSlash}${query}${hash}`;
     }
 }

package/dist/websocket/controllers/hooks.js

@@ -9,18 +9,24 @@ export function registerWebSocketEvents() {
         'items',
         'activity',
         'collections',
+        'dashboards',
         'folders',
+        'notifications',
+        'operations',
+        'panels',
         'permissions',
         'presets',
         'revisions',
         'roles',
         'settings',
+        'shares',
         'users',
         'webhooks',
     ]);
     registerFieldsHooks();
     registerFilesHooks();
     registerRelationsHooks();
+    registerSortHooks();
 }
 function registerActionHooks(modules) {
     // register event hooks that can be handled in an uniform manner
@@ -108,6 +114,14 @@ function registerRelationsHooks() {
         payload: { collection, fields: payload },
     }));
 }
+function registerSortHooks() {
+    registerAction('items.sort', ({ collection, item }) => ({
+        collection,
+        action: 'update',
+        keys: [item],
+        payload: {},
+    }));
+}
 /**
  * Wrapper for emitter.onAction to hook into system events
  * @param event The action event to watch

package/dist/websocket/handlers/subscribe.d.ts

@@ -34,10 +34,5 @@ export declare class SubscribeHandler {
      * Handle incoming (un)subscribe requests
      */
     onMessage(client: WebSocketClient, message: WebSocketSubscribeMessage): Promise<void>;
-    private getSinglePayload;
-    private getMultiPayload;
-    private getCollectionPayload;
-    private getFieldsPayload;
-    private getItemsPayload;
     private getSubscription;
 }

package/dist/websocket/handlers/subscribe.js

@@ -1,14 +1,13 @@
 import emitter from '../../emitter.js';
 import { InvalidPayloadError } from '../../errors/index.js';
 import { getMessenger } from '../../messenger.js';
-import { CollectionsService, FieldsService, MetaService } from '../../services/index.js';
 import { getSchema } from '../../utils/get-schema.js';
-import { getService } from '../../utils/get-service.js';
 import { sanitizeQuery } from '../../utils/sanitize-query.js';
 import { refreshAccountability } from '../authenticate.js';
 import { WebSocketError, handleWebSocketError } from '../errors.js';
 import { WebSocketSubscribeMessage } from '../messages.js';
 import { fmtMessage, getMessageType } from '../utils/message.js';
+import { getMultiPayload, getSinglePayload } from '../utils/items.js';
 /**
  * Handler responsible for subscriptions
  */
@@ -108,8 +107,8 @@ export class SubscribeHandler {
             try {
                 client.accountability = await refreshAccountability(client.accountability);
                 const result = 'item' in subscription
-                    ? await this.getSinglePayload(subscription, client.accountability, schema, event)
-                    : await this.getMultiPayload(subscription, client.accountability, schema, event);
+                    ? await getSinglePayload(subscription, client.accountability, schema, event)
+                    : await getMultiPayload(subscription, client.accountability, schema, event);
                 if (Array.isArray(result?.['data']) && result?.['data']?.length === 0)
                     return;
                 client.send(fmtMessage('subscription', result, subscription.uid));
@@ -152,8 +151,8 @@ export class SubscribeHandler {
                 if (subscription.event === undefined) {
                     data =
                         'item' in subscription
-                            ? await this.getSinglePayload(subscription, accountability, schema)
-                            : await this.getMultiPayload(subscription, accountability, schema);
+                            ? await getSinglePayload(subscription, accountability, schema)
+                            : await getMultiPayload(subscription, accountability, schema);
                 }
                 else {
                     data = { event: 'init' };
@@ -177,94 +176,6 @@ export class SubscribeHandler {
             }
         }
     }
-    async getSinglePayload(subscription, accountability, schema, event) {
-        const metaService = new MetaService({ schema, accountability });
-        const query = subscription.query ?? {};
-        const id = subscription.item;
-        const result = {
-            event: event?.action ?? 'init',
-        };
-        if (subscription.collection === 'directus_collections') {
-            const service = new CollectionsService({ schema, accountability });
-            result['data'] = await service.readOne(String(id));
-        }
-        else {
-            const service = getService(subscription.collection, { schema, accountability });
-            result['data'] = await service.readOne(id, query);
-        }
-        if ('meta' in query) {
-            result['meta'] = await metaService.getMetaForQuery(subscription.collection, query);
-        }
-        return result;
-    }
-    async getMultiPayload(subscription, accountability, schema, event) {
-        const metaService = new MetaService({ schema, accountability });
-        const result = {
-            event: event?.action ?? 'init',
-        };
-        switch (subscription.collection) {
-            case 'directus_collections':
-                result['data'] = await this.getCollectionPayload(accountability, schema, event);
-                break;
-            case 'directus_fields':
-                result['data'] = await this.getFieldsPayload(accountability, schema, event);
-                break;
-            case 'directus_relations':
-                result['data'] = event?.payload;
-                break;
-            default:
-                result['data'] = await this.getItemsPayload(subscription, accountability, schema, event);
-                break;
-        }
-        const query = subscription.query ?? {};
-        if ('meta' in query) {
-            result['meta'] = await metaService.getMetaForQuery(subscription.collection, query);
-        }
-        return result;
-    }
-    async getCollectionPayload(accountability, schema, event) {
-        const service = new CollectionsService({ schema, accountability });
-        if (!event?.action) {
-            return await service.readByQuery();
-        }
-        else if (event.action === 'create') {
-            return await service.readMany([String(event.key)]);
-        }
-        else if (event.action === 'delete') {
-            return event.keys;
-        }
-        else {
-            return await service.readMany(event.keys.map((key) => String(key)));
-        }
-    }
-    async getFieldsPayload(accountability, schema, event) {
-        const service = new FieldsService({ schema, accountability });
-        if (!event?.action) {
-            return await service.readAll();
-        }
-        else if (event.action === 'delete') {
-            return event.keys;
-        }
-        else {
-            return await service.readOne(event.payload?.['collection'], event.payload?.['field']);
-        }
-    }
-    async getItemsPayload(subscription, accountability, schema, event) {
-        const query = subscription.query ?? {};
-        const service = getService(subscription.collection, { schema, accountability });
-        if (!event?.action) {
-            return await service.readByQuery(query);
-        }
-        else if (event.action === 'create') {
-            return await service.readMany([event.key], query);
-        }
-        else if (event.action === 'delete') {
-            return event.keys;
-        }
-        else {
-            return await service.readMany(event.keys, query);
-        }
-    }
     getSubscription(client, uid) {
         for (const userSubscriptions of Object.values(this.subscriptions)) {
             for (const subscription of userSubscriptions) {

package/dist/websocket/utils/items.d.ts

@@ -0,0 +1,53 @@
+import type { Accountability, SchemaOverview } from '@directus/types';
+import type { WebSocketEvent } from '../messages.js';
+import type { Subscription } from '../types.js';
+type PSubscription = Omit<Subscription, 'client'>;
+/**
+ * Get a single item from a collection using the appropriate service
+ *
+ * @param subscription Subscription object
+ * @param accountability Accountability object
+ * @param schema Schema object
+ * @param event Event data
+ * @returns the fetched item
+ */
+export declare function getSinglePayload(subscription: PSubscription, accountability: Accountability | null, schema: SchemaOverview, event?: WebSocketEvent): Promise<Record<string, any>>;
+/**
+ * Get items from a collection using the appropriate service
+ *
+ * @param subscription Subscription object
+ * @param accountability Accountability object
+ * @param schema Schema object
+ * @param event Event data
+ * @returns the fetched items
+ */
+export declare function getMultiPayload(subscription: PSubscription, accountability: Accountability | null, schema: SchemaOverview, event?: WebSocketEvent): Promise<Record<string, any>>;
+/**
+ * Get collection items
+ *
+ * @param accountability Accountability object
+ * @param schema Schema object
+ * @param event Event data
+ * @returns the fetched collection data
+ */
+export declare function getCollectionPayload(accountability: Accountability | null, schema: SchemaOverview, event?: WebSocketEvent): Promise<(string | number)[] | import("../../types/collection.js").Collection[]>;
+/**
+ * Get fields items
+ *
+ * @param accountability Accountability object
+ * @param schema Schema object
+ * @param event Event data
+ * @returns the fetched field data
+ */
+export declare function getFieldsPayload(accountability: Accountability | null, schema: SchemaOverview, event?: WebSocketEvent): Promise<Record<string, any> | import("@directus/types").Field[] | (string | number)[]>;
+/**
+ * Get items from a collection using the appropriate service
+ *
+ * @param subscription Subscription object
+ * @param accountability Accountability object
+ * @param schema Schema object
+ * @param event Event data
+ * @returns the fetched data
+ */
+export declare function getItemsPayload(subscription: PSubscription, accountability: Accountability | null, schema: SchemaOverview, event?: WebSocketEvent): Promise<(string | number)[] | import("../../types/items.js").Item[]>;
+export {};

package/dist/websocket/utils/items.js

@@ -0,0 +1,133 @@
+import { getService } from '../../utils/get-service.js';
+import { CollectionsService, FieldsService, MetaService } from '../../services/index.js';
+/**
+ * Get a single item from a collection using the appropriate service
+ *
+ * @param subscription Subscription object
+ * @param accountability Accountability object
+ * @param schema Schema object
+ * @param event Event data
+ * @returns the fetched item
+ */
+export async function getSinglePayload(subscription, accountability, schema, event) {
+    const metaService = new MetaService({ schema, accountability });
+    const query = subscription.query ?? {};
+    const id = subscription.item;
+    const result = {
+        event: event?.action ?? 'init',
+    };
+    if (subscription.collection === 'directus_collections') {
+        const service = new CollectionsService({ schema, accountability });
+        result['data'] = await service.readOne(String(id));
+    }
+    else {
+        const service = getService(subscription.collection, { schema, accountability });
+        result['data'] = await service.readOne(id, query);
+    }
+    if ('meta' in query) {
+        result['meta'] = await metaService.getMetaForQuery(subscription.collection, query);
+    }
+    return result;
+}
+/**
+ * Get items from a collection using the appropriate service
+ *
+ * @param subscription Subscription object
+ * @param accountability Accountability object
+ * @param schema Schema object
+ * @param event Event data
+ * @returns the fetched items
+ */
+export async function getMultiPayload(subscription, accountability, schema, event) {
+    const metaService = new MetaService({ schema, accountability });
+    const result = {
+        event: event?.action ?? 'init',
+    };
+    switch (subscription.collection) {
+        case 'directus_collections':
+            result['data'] = await getCollectionPayload(accountability, schema, event);
+            break;
+        case 'directus_fields':
+            result['data'] = await getFieldsPayload(accountability, schema, event);
+            break;
+        case 'directus_relations':
+            result['data'] = event?.payload;
+            break;
+        default:
+            result['data'] = await getItemsPayload(subscription, accountability, schema, event);
+            break;
+    }
+    const query = subscription.query ?? {};
+    if ('meta' in query) {
+        result['meta'] = await metaService.getMetaForQuery(subscription.collection, query);
+    }
+    return result;
+}
+/**
+ * Get collection items
+ *
+ * @param accountability Accountability object
+ * @param schema Schema object
+ * @param event Event data
+ * @returns the fetched collection data
+ */
+export async function getCollectionPayload(accountability, schema, event) {
+    const service = new CollectionsService({ schema, accountability });
+    if (!event?.action) {
+        return await service.readByQuery();
+    }
+    else if (event.action === 'create') {
+        return await service.readMany([String(event.key)]);
+    }
+    else if (event.action === 'delete') {
+        return event.keys;
+    }
+    else {
+        return await service.readMany(event.keys.map((key) => String(key)));
+    }
+}
+/**
+ * Get fields items
+ *
+ * @param accountability Accountability object
+ * @param schema Schema object
+ * @param event Event data
+ * @returns the fetched field data
+ */
+export async function getFieldsPayload(accountability, schema, event) {
+    const service = new FieldsService({ schema, accountability });
+    if (!event?.action) {
+        return await service.readAll();
+    }
+    else if (event.action === 'delete') {
+        return event.keys;
+    }
+    else {
+        return await service.readOne(event.payload?.['collection'], event.payload?.['field']);
+    }
+}
+/**
+ * Get items from a collection using the appropriate service
+ *
+ * @param subscription Subscription object
+ * @param accountability Accountability object
+ * @param schema Schema object
+ * @param event Event data
+ * @returns the fetched data
+ */
+export async function getItemsPayload(subscription, accountability, schema, event) {
+    const query = subscription.query ?? {};
+    const service = getService(subscription.collection, { schema, accountability });
+    if (!event?.action) {
+        return await service.readByQuery(query);
+    }
+    else if (event.action === 'create') {
+        return await service.readMany([event.key], query);
+    }
+    else if (event.action === 'delete') {
+        return event.keys;
+    }
+    else {
+        return await service.readMany(event.keys, query);
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@directus/api",
-  "version": "12.0.2",
+  "version": "12.1.0",
   "description": "Directus is a real-time API and App dashboard for managing SQL database content",
   "keywords": [
     "directus",
@@ -143,21 +143,22 @@
     "ws": "8.12.1",
     "zod": "3.21.4",
     "zod-validation-error": "1.0.1",
-    "@directus/app": "10.4.2",
-    "@directus/constants": "10.2.1",
-    "@directus/errors": "0.0.1",
-    "@directus/extensions-sdk": "10.1.5",
-    "@directus/pressure": "1.0.5",
-    "@directus/schema": "10.0.1",
+    "@directus/app": "10.6.0",
+    "@directus/constants": "10.2.2",
+    "@directus/errors": "0.0.2",
+    "@directus/extensions-sdk": "10.1.7",
+    "@directus/pressure": "1.0.7",
+    "@directus/schema": "10.0.2",
     "@directus/specs": "10.1.1",
-    "@directus/storage": "10.0.4",
-    "@directus/storage-driver-azure": "10.0.6",
-    "@directus/storage-driver-cloudinary": "10.0.6",
-    "@directus/storage-driver-gcs": "10.0.6",
-    "@directus/storage-driver-local": "10.0.6",
-    "@directus/storage-driver-s3": "10.0.6",
-    "@directus/utils": "10.0.6",
-    "@directus/validation": "0.0.1"
+    "@directus/storage": "10.0.5",
+    "@directus/storage-driver-azure": "10.0.8",
+    "@directus/storage-driver-cloudinary": "10.0.8",
+    "@directus/storage-driver-gcs": "10.0.8",
+    "@directus/storage-driver-local": "10.0.8",
+    "@directus/storage-driver-s3": "10.0.8",
+    "@directus/storage-driver-supabase": "1.0.0",
+    "@directus/utils": "10.0.8",
+    "@directus/validation": "0.0.3"
   },
   "devDependencies": {
     "@ngneat/falso": "6.4.0",
@@ -204,9 +205,9 @@
     "supertest": "6.3.3",
     "typescript": "5.0.4",
     "vitest": "0.31.1",
-    "@directus/random": "0.2.1",
-    "@directus/tsconfig": "0.0.7",
-    "@directus/types": "10.1.2"
+    "@directus/random": "0.2.2",
+    "@directus/tsconfig": "1.0.0",
+    "@directus/types": "10.1.3"
   },
   "optionalDependencies": {
     "@keyv/redis": "2.5.8",