@directus/api 19.0.0 → 19.0.2

package/dist/cli/utils/create-env/env-stub.liquid

@@ -312,8 +312,8 @@ EXTENSIONS_AUTO_RELOAD=false
 ####################################################################################################
 ### Email
 
-# Email address from which emails are sent ["no-reply@directus.io"]
-EMAIL_FROM="no-reply@directus.io"
+# Email address from which emails are sent ["no-reply@example.com"]
+EMAIL_FROM="no-reply@example.com"
 
 # What to use to send emails. One of
 # sendmail, smtp, mailgun, sendgrid, ses.

package/dist/controllers/assets.js

@@ -180,17 +180,10 @@ asyncHandler(async (req, res) => {
         res.setHeader('Content-Length', stat.size);
         return res.end();
     }
-    let isDataSent = false;
-    stream.on('data', (chunk) => {
-        isDataSent = true;
-        res.write(chunk);
-    });
-    stream.on('end', () => {
-        res.end();
-    });
-    stream.on('error', (e) => {
-        logger.error(e, `Couldn't stream file ${file.id} to the client`);
-        if (!isDataSent) {
+    stream
+        .on('error', (error) => {
+        logger.error(error, `Couldn't stream file ${file.id} to the client`);
+        if (!res.headersSent) {
             res.removeHeader('Content-Type');
             res.removeHeader('Content-Disposition');
             res.removeHeader('Cache-Control');
@@ -205,7 +198,11 @@ asyncHandler(async (req, res) => {
                 ],
             });
         }
-    });
+        else {
+            res.end();
+        }
+    })
+        .pipe(res);
     return undefined;
 }));
 export default router;

package/dist/controllers/collections.js

@@ -1,6 +1,5 @@
-import { isDirectusError } from '@directus/errors';
+import { ErrorCode, isDirectusError } from '@directus/errors';
 import { Router } from 'express';
-import { ErrorCode } from '@directus/errors';
 import { respond } from '../middleware/respond.js';
 import { validateBatch } from '../middleware/validate-batch.js';
 import { CollectionsService } from '../services/collections.js';

package/dist/controllers/dashboards.js

@@ -1,6 +1,5 @@
-import { isDirectusError } from '@directus/errors';
+import { ErrorCode, isDirectusError } from '@directus/errors';
 import express from 'express';
-import { ErrorCode } from '@directus/errors';
 import { respond } from '../middleware/respond.js';
 import useCollection from '../middleware/use-collection.js';
 import { validateBatch } from '../middleware/validate-batch.js';

package/dist/controllers/flows.js

@@ -1,7 +1,6 @@
-import { isDirectusError } from '@directus/errors';
+import { ErrorCode, isDirectusError } from '@directus/errors';
 import express from 'express';
 import { UUID_REGEX } from '../constants.js';
-import { ErrorCode } from '@directus/errors';
 import { getFlowManager } from '../flows.js';
 import { respond } from '../middleware/respond.js';
 import useCollection from '../middleware/use-collection.js';

package/dist/controllers/folders.js

@@ -1,6 +1,5 @@
-import { isDirectusError } from '@directus/errors';
+import { ErrorCode, isDirectusError } from '@directus/errors';
 import express from 'express';
-import { ErrorCode } from '@directus/errors';
 import { respond } from '../middleware/respond.js';
 import useCollection from '../middleware/use-collection.js';
 import { validateBatch } from '../middleware/validate-batch.js';

package/dist/controllers/items.js

@@ -1,15 +1,14 @@
-import { isDirectusError } from '@directus/errors';
+import { ErrorCode, ForbiddenError, RouteNotFoundError, isDirectusError } from '@directus/errors';
+import { isSystemCollection } from '@directus/system-data';
 import express from 'express';
-import { ErrorCode, ForbiddenError, RouteNotFoundError } from '@directus/errors';
 import collectionExists from '../middleware/collection-exists.js';
+import { mergeContentVersions } from '../middleware/merge-content-versions.js';
 import { respond } from '../middleware/respond.js';
 import { validateBatch } from '../middleware/validate-batch.js';
-import { mergeContentVersions } from '../middleware/merge-content-versions.js';
 import { ItemsService } from '../services/items.js';
 import { MetaService } from '../services/meta.js';
 import asyncHandler from '../utils/async-handler.js';
 import { sanitizeQuery } from '../utils/sanitize-query.js';
-import { isSystemCollection } from '@directus/system-data';
 const router = express.Router();
 router.post('/:collection', collectionExists, asyncHandler(async (req, res, next) => {
     if (isSystemCollection(req.params['collection']))

package/dist/controllers/notifications.js

@@ -1,6 +1,5 @@
-import { isDirectusError } from '@directus/errors';
+import { ErrorCode, isDirectusError } from '@directus/errors';
 import express from 'express';
-import { ErrorCode } from '@directus/errors';
 import { respond } from '../middleware/respond.js';
 import useCollection from '../middleware/use-collection.js';
 import { validateBatch } from '../middleware/validate-batch.js';

package/dist/controllers/operations.js

@@ -1,6 +1,5 @@
+import { ErrorCode, isDirectusError } from '@directus/errors';
 import express from 'express';
-import { isDirectusError } from '@directus/errors';
-import { ErrorCode } from '@directus/errors';
 import { respond } from '../middleware/respond.js';
 import useCollection from '../middleware/use-collection.js';
 import { validateBatch } from '../middleware/validate-batch.js';

package/dist/controllers/panels.js

@@ -1,6 +1,5 @@
-import { isDirectusError } from '@directus/errors';
+import { ErrorCode, isDirectusError } from '@directus/errors';
 import express from 'express';
-import { ErrorCode } from '@directus/errors';
 import { respond } from '../middleware/respond.js';
 import useCollection from '../middleware/use-collection.js';
 import { validateBatch } from '../middleware/validate-batch.js';

package/dist/controllers/presets.js

@@ -1,6 +1,5 @@
-import { isDirectusError } from '@directus/errors';
+import { ErrorCode, isDirectusError } from '@directus/errors';
 import express from 'express';
-import { ErrorCode } from '@directus/errors';
 import { respond } from '../middleware/respond.js';
 import useCollection from '../middleware/use-collection.js';
 import { validateBatch } from '../middleware/validate-batch.js';

package/dist/controllers/roles.js

@@ -1,6 +1,5 @@
-import { isDirectusError } from '@directus/errors';
+import { ErrorCode, isDirectusError } from '@directus/errors';
 import express from 'express';
-import { ErrorCode } from '@directus/errors';
 import { respond } from '../middleware/respond.js';
 import useCollection from '../middleware/use-collection.js';
 import { validateBatch } from '../middleware/validate-batch.js';

package/dist/controllers/translations.js

@@ -1,6 +1,5 @@
-import { isDirectusError } from '@directus/errors';
+import { ErrorCode, isDirectusError } from '@directus/errors';
 import express from 'express';
-import { ErrorCode } from '@directus/errors';
 import { respond } from '../middleware/respond.js';
 import useCollection from '../middleware/use-collection.js';
 import { validateBatch } from '../middleware/validate-batch.js';

package/dist/controllers/users.js

@@ -1,7 +1,6 @@
-import { isDirectusError } from '@directus/errors';
+import { ErrorCode, ForbiddenError, InvalidCredentialsError, InvalidPayloadError, isDirectusError, } from '@directus/errors';
 import express from 'express';
 import Joi from 'joi';
-import { ErrorCode, ForbiddenError, InvalidCredentialsError, InvalidPayloadError } from '@directus/errors';
 import { respond } from '../middleware/respond.js';
 import useCollection from '../middleware/use-collection.js';
 import { validateBatch } from '../middleware/validate-batch.js';

package/dist/controllers/utils.js

@@ -114,7 +114,8 @@ router.post('/cache/clear', asyncHandler(async (req, res) => {
         accountability: req.accountability,
         schema: req.schema,
     });
-    await service.clearCache();
+    const clearSystemCache = 'system' in req.query && (req.query['system'] === '' || Boolean(req.query['system']));
+    await service.clearCache({ system: clearSystemCache });
     res.status(200).end();
 }));
 export default router;

package/dist/database/run-ast.js

@@ -324,14 +324,15 @@ function mergeWithParentItems(schema, nestedItem, parentItem, nestedNode) {
                     nestedItem[nestedNode.relation.field]?.[schema.collections[nestedNode.relation.related_collection].primary] == parentItem[schema.collections[nestedNode.relation.related_collection].primary]);
             });
             parentItem[nestedNode.fieldKey].push(...itemChildren);
+            const limit = nestedNode.query.limit ?? Number(env['QUERY_LIMIT_DEFAULT']);
             if (nestedNode.query.page && nestedNode.query.page > 1) {
-                parentItem[nestedNode.fieldKey] = parentItem[nestedNode.fieldKey].slice((nestedNode.query.limit ?? Number(env['QUERY_LIMIT_DEFAULT'])) * (nestedNode.query.page - 1));
+                parentItem[nestedNode.fieldKey] = parentItem[nestedNode.fieldKey].slice(limit * (nestedNode.query.page - 1));
             }
             if (nestedNode.query.offset && nestedNode.query.offset >= 0) {
                 parentItem[nestedNode.fieldKey] = parentItem[nestedNode.fieldKey].slice(nestedNode.query.offset);
             }
-            if (nestedNode.query.limit !== -1) {
-                parentItem[nestedNode.fieldKey] = parentItem[nestedNode.fieldKey].slice(0, nestedNode.query.limit ?? Number(env['QUERY_LIMIT_DEFAULT']));
+            if (limit !== -1) {
+                parentItem[nestedNode.fieldKey] = parentItem[nestedNode.fieldKey].slice(0, limit);
             }
             parentItem[nestedNode.fieldKey] = parentItem[nestedNode.fieldKey].sort((a, b) => {
                 // This is pre-filled in get-ast-from-query

package/dist/services/activity.d.ts

@@ -1,4 +1,5 @@
-import type { AbstractServiceOptions, Item, MutationOptions, PrimaryKey } from '../types/index.js';
+import type { Item, PrimaryKey } from '@directus/types';
+import type { AbstractServiceOptions, MutationOptions } from '../types/index.js';
 import { ItemsService } from './items.js';
 import { NotificationsService } from './notifications.js';
 import { UsersService } from './users.js';

package/dist/services/authorization.d.ts

@@ -1,6 +1,6 @@
-import type { Accountability, PermissionsAction, SchemaOverview } from '@directus/types';
+import type { Accountability, Item, PermissionsAction, PrimaryKey, SchemaOverview } from '@directus/types';
 import type { Knex } from 'knex';
-import type { AST, AbstractServiceOptions, Item, PrimaryKey } from '../types/index.js';
+import type { AST, AbstractServiceOptions } from '../types/index.js';
 import { PayloadService } from './payload.js';
 export declare class AuthorizationService {
     knex: Knex;

package/dist/services/collections.d.ts

@@ -1,10 +1,10 @@
 import type { SchemaInspector, Table } from '@directus/schema';
+import { type BaseCollectionMeta } from '@directus/system-data';
 import type { Accountability, RawField, SchemaOverview } from '@directus/types';
 import type Keyv from 'keyv';
 import type { Knex } from 'knex';
 import type { Helpers } from '../database/helpers/index.js';
 import type { AbstractServiceOptions, Collection, MutationOptions } from '../types/index.js';
-import { type BaseCollectionMeta } from '@directus/system-data';
 export type RawCollection = {
     collection: string;
     fields?: RawField[];

package/dist/services/collections.js

@@ -1,6 +1,7 @@
 import { useEnv } from '@directus/env';
 import { ForbiddenError, InvalidPayloadError } from '@directus/errors';
 import { createInspector } from '@directus/schema';
+import { systemCollectionRows } from '@directus/system-data';
 import { addFieldFlag } from '@directus/utils';
 import { chunk, groupBy, merge, omit } from 'lodash-es';
 import { clearSystemCache, getCache } from '../cache.js';
@@ -10,9 +11,9 @@ import getDatabase, { getSchemaInspector } from '../database/index.js';
 import emitter from '../emitter.js';
 import { getSchema } from '../utils/get-schema.js';
 import { shouldClearCache } from '../utils/should-clear-cache.js';
+import { transaction } from '../utils/transaction.js';
 import { FieldsService } from './fields.js';
 import { ItemsService } from './items.js';
-import { systemCollectionRows } from '@directus/system-data';
 export class CollectionsService {
     knex;
     helpers;
@@ -56,7 +57,7 @@ export class CollectionsService {
             // Create the collection/fields in a transaction so it'll be reverted in case of errors or
             // permission problems. This might not work reliably in MySQL, as it doesn't support DDL in
             // transactions.
-            await this.knex.transaction(async (trx) => {
+            await transaction(this.knex, async (trx) => {
                 if (payload.schema) {
                     // Directus heavily relies on the primary key of a collection, so we have to make sure that
                     // every collection that is created has a primary key. If no primary key field is created
@@ -167,7 +168,7 @@ export class CollectionsService {
     async createMany(payloads, opts) {
         const nestedActionEvents = [];
         try {
-            const collections = await this.knex.transaction(async (trx) => {
+            const collections = await transaction(this.knex, async (trx) => {
                 const service = new CollectionsService({
                     schema: this.schema,
                     accountability: this.accountability,
@@ -361,7 +362,7 @@ export class CollectionsService {
         const collectionKeys = [];
         const nestedActionEvents = [];
         try {
-            await this.knex.transaction(async (trx) => {
+            await transaction(this.knex, async (trx) => {
                 const collectionItemsService = new CollectionsService({
                     knex: trx,
                     accountability: this.accountability,
@@ -406,7 +407,7 @@ export class CollectionsService {
         }
         const nestedActionEvents = [];
         try {
-            await this.knex.transaction(async (trx) => {
+            await transaction(this.knex, async (trx) => {
                 const service = new CollectionsService({
                     schema: this.schema,
                     accountability: this.accountability,
@@ -453,7 +454,7 @@ export class CollectionsService {
             if (!!collectionToBeDeleted === false) {
                 throw new ForbiddenError();
             }
-            await this.knex.transaction(async (trx) => {
+            await transaction(this.knex, async (trx) => {
                 if (collectionToBeDeleted.schema) {
                     await trx.schema.dropTable(collectionKey);
                 }
@@ -552,7 +553,7 @@ export class CollectionsService {
         }
         const nestedActionEvents = [];
         try {
-            await this.knex.transaction(async (trx) => {
+            await transaction(this.knex, async (trx) => {
                 const service = new CollectionsService({
                     schema: this.schema,
                     accountability: this.accountability,

package/dist/services/extensions.js

@@ -4,6 +4,7 @@ import { describe } from '@directus/extensions-registry';
 import { isObject } from '@directus/utils';
 import getDatabase from '../database/index.js';
 import { getExtensionManager } from '../extensions/index.js';
+import { transaction } from '../utils/transaction.js';
 import { ItemsService } from './items.js';
 export class ExtensionReadError extends Error {
     originalError;
@@ -147,7 +148,7 @@ export class ExtensionsService {
         };
     }
     async updateOne(id, data) {
-        const result = await this.knex.transaction(async (trx) => {
+        const result = await transaction(this.knex, async (trx) => {
             if (!isObject(data.meta)) {
                 throw new InvalidPayloadError({ reason: `"meta" is required` });
             }

package/dist/services/fields.js

@@ -15,6 +15,7 @@ import getLocalType from '../utils/get-local-type.js';
 import { getSchema } from '../utils/get-schema.js';
 import { sanitizeColumn } from '../utils/sanitize-schema.js';
 import { shouldClearCache } from '../utils/should-clear-cache.js';
+import { transaction } from '../utils/transaction.js';
 import { ItemsService } from './items.js';
 import { PayloadService } from './payload.js';
 import { RelationsService } from './relations.js';
@@ -218,7 +219,7 @@ export class FieldsService {
             if (flagToAdd) {
                 addFieldFlag(field, flagToAdd);
             }
-            await this.knex.transaction(async (trx) => {
+            await transaction(this.knex, async (trx) => {
                 const itemsService = new ItemsService('directus_fields', {
                     knex: trx,
                     accountability: this.accountability,
@@ -337,7 +338,7 @@ export class FieldsService {
                 const columnToCompare = opts?.bypassLimits && opts.autoPurgeSystemCache === false ? sanitizeColumn(existingColumn) : existingColumn;
                 if (!isEqual(columnToCompare, hookAdjustedField.schema)) {
                     try {
-                        await this.knex.transaction(async (trx) => {
+                        await transaction(this.knex, async (trx) => {
                             await trx.schema.alterTable(collection, async (table) => {
                                 if (!hookAdjustedField.schema)
                                     return;
@@ -451,7 +452,7 @@ export class FieldsService {
                     accountability: this.accountability,
                 });
             }
-            await this.knex.transaction(async (trx) => {
+            await transaction(this.knex, async (trx) => {
                 const relations = this.schema.relations.filter((relation) => {
                     return ((relation.collection === collection && relation.field === field) ||
                         (relation.related_collection === collection && relation.meta?.one_field === field));

package/dist/services/files.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" resolution-mode="require"/>
-import type { BusboyFileStream, File } from '@directus/types';
+import type { BusboyFileStream, File, PrimaryKey } from '@directus/types';
 import type { Readable } from 'node:stream';
-import type { AbstractServiceOptions, MutationOptions, PrimaryKey } from '../types/index.js';
+import type { AbstractServiceOptions, MutationOptions } from '../types/index.js';
 import { ItemsService } from './items.js';
 type Metadata = Partial<Pick<File, 'height' | 'width' | 'description' | 'title' | 'tags' | 'metadata'>>;
 export declare class FilesService extends ItemsService {

package/dist/services/flows.d.ts

@@ -1,5 +1,5 @@
-import type { FlowRaw } from '@directus/types';
-import type { AbstractServiceOptions, Item, MutationOptions, PrimaryKey } from '../types/index.js';
+import type { FlowRaw, Item, PrimaryKey } from '@directus/types';
+import type { AbstractServiceOptions, MutationOptions } from '../types/index.js';
 import { ItemsService } from './items.js';
 export declare class FlowsService extends ItemsService<FlowRaw> {
     constructor(options: AbstractServiceOptions);

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

@@ -1,10 +1,10 @@
 import { type DirectusError } from '@directus/errors';
-import type { Accountability, Filter, Query, SchemaOverview } from '@directus/types';
+import type { Accountability, Filter, Item, Query, SchemaOverview } from '@directus/types';
 import type { ArgumentNode, FormattedExecutionResult, FragmentDefinitionNode, GraphQLResolveInfo, SelectionNode } from 'graphql';
 import { GraphQLError, GraphQLSchema } from 'graphql';
 import { ObjectTypeComposer, SchemaComposer } from 'graphql-compose';
 import type { Knex } from 'knex';
-import type { AbstractServiceOptions, GraphQLParams, Item } from '../../types/index.js';
+import type { AbstractServiceOptions, GraphQLParams } from '../../types/index.js';
 export declare class GraphQLService {
     accountability: Accountability | null;
     knex: Knex;

package/dist/services/graphql/index.js

@@ -929,6 +929,11 @@ export class GraphQLService {
                         },
                     };
                 }
+                else {
+                    resolver.args = {
+                        version: GraphQLString,
+                    };
+                }
                 ReadCollectionTypes[collection.collection].addResolver(resolver);
                 ReadCollectionTypes[collection.collection].addResolver({
                     name: `${collection.collection}_aggregated`,

package/dist/services/import-export.js

@@ -16,6 +16,7 @@ import getDatabase from '../database/index.js';
 import emitter from '../emitter.js';
 import { useLogger } from '../logger.js';
 import { getDateFormatted } from '../utils/get-date-formatted.js';
+import { transaction } from '../utils/transaction.js';
 import { Url } from '../utils/url.js';
 import { userName } from '../utils/user-name.js';
 import { FilesService } from './files.js';
@@ -54,7 +55,7 @@ export class ImportService {
     importJSON(collection, stream) {
         const extractJSON = StreamArray.withParser();
         const nestedActionEvents = [];
-        return this.knex.transaction((trx) => {
+        return transaction(this.knex, (trx) => {
             const service = new ItemsService(collection, {
                 knex: trx,
                 schema: this.schema,
@@ -92,7 +93,7 @@ export class ImportService {
         if (!tmpFile)
             throw new Error('Failed to create temporary file for import');
         const nestedActionEvents = [];
-        return this.knex.transaction((trx) => {
+        return transaction(this.knex, (trx) => {
             const service = new ItemsService(collection, {
                 knex: trx,
                 schema: this.schema,
@@ -211,7 +212,7 @@ export class ExportService {
                 yaml: 'text/yaml',
             };
             const database = getDatabase();
-            await database.transaction(async (trx) => {
+            await transaction(database, async (trx) => {
                 const service = new ItemsService(collection, {
                     accountability: this.accountability,
                     schema: this.schema,

package/dist/services/items.d.ts

@@ -1,7 +1,7 @@
-import type { Accountability, PermissionsAction, Query, SchemaOverview } from '@directus/types';
+import type { Accountability, Item as AnyItem, PermissionsAction, PrimaryKey, Query, SchemaOverview } from '@directus/types';
 import type Keyv from 'keyv';
 import type { Knex } from 'knex';
-import type { AbstractService, AbstractServiceOptions, Item as AnyItem, MutationOptions, PrimaryKey } from '../types/index.js';
+import type { AbstractService, AbstractServiceOptions, MutationOptions } from '../types/index.js';
 export type QueryOptions = {
     stripNonRequested?: boolean;
     permissionsAction?: PermissionsAction;

package/dist/services/items.js

@@ -1,6 +1,7 @@
 import { Action } from '@directus/constants';
 import { useEnv } from '@directus/env';
 import { ForbiddenError, InvalidPayloadError } from '@directus/errors';
+import { isSystemCollection } from '@directus/system-data';
 import { assign, clone, cloneDeep, omit, pick, without } from 'lodash-es';
 import { getCache } from '../cache.js';
 import { translateDatabaseError } from '../database/errors/translate.js';
@@ -10,10 +11,10 @@ import runAST from '../database/run-ast.js';
 import emitter from '../emitter.js';
 import getASTFromQuery from '../utils/get-ast-from-query.js';
 import { shouldClearCache } from '../utils/should-clear-cache.js';
+import { transaction } from '../utils/transaction.js';
 import { validateKeys } from '../utils/validate-keys.js';
 import { AuthorizationService } from './authorization.js';
 import { PayloadService } from './payload.js';
-import { isSystemCollection } from '@directus/system-data';
 const env = useEnv();
 export class ItemsService {
     collection;
@@ -82,7 +83,7 @@ export class ItemsService {
         // changes in the DB if any of the parts contained within throws an error. This also means
         // that any errors thrown in any nested relational changes will bubble up and cancel the whole
         // update tree
-        const primaryKey = await this.knex.transaction(async (trx) => {
+        const primaryKey = await transaction(this.knex, async (trx) => {
             // We're creating new services instances so they can use the transaction as their Knex interface
             const payloadService = new PayloadService(this.collection, {
                 accountability: this.accountability,
@@ -255,11 +256,11 @@ export class ItemsService {
     async createMany(data, opts = {}) {
         if (!opts.mutationTracker)
             opts.mutationTracker = this.createMutationTracker();
-        const { primaryKeys, nestedActionEvents } = await this.knex.transaction(async (trx) => {
+        const { primaryKeys, nestedActionEvents } = await transaction(this.knex, async (knex) => {
             const service = new ItemsService(this.collection, {
                 accountability: this.accountability,
                 schema: this.schema,
-                knex: trx,
+                knex: knex,
             });
             const primaryKeys = [];
             const nestedActionEvents = [];
@@ -418,7 +419,7 @@ export class ItemsService {
         const primaryKeyField = this.schema.collections[this.collection].primary;
         const keys = [];
         try {
-            await this.knex.transaction(async (trx) => {
+            await transaction(this.knex, async (trx) => {
                 const service = new ItemsService(this.collection, {
                     accountability: this.accountability,
                     knex: trx,
@@ -488,7 +489,7 @@ export class ItemsService {
         if (opts.preMutationError) {
             throw opts.preMutationError;
         }
-        await this.knex.transaction(async (trx) => {
+        await transaction(this.knex, async (trx) => {
             const payloadService = new PayloadService(this.collection, {
                 accountability: this.accountability,
                 knex: trx,
@@ -629,7 +630,7 @@ export class ItemsService {
     async upsertMany(payloads, opts = {}) {
         if (!opts.mutationTracker)
             opts.mutationTracker = this.createMutationTracker();
-        const primaryKeys = await this.knex.transaction(async (trx) => {
+        const primaryKeys = await transaction(this.knex, async (trx) => {
             const service = new ItemsService(this.collection, {
                 accountability: this.accountability,
                 schema: this.schema,
@@ -697,7 +698,7 @@ export class ItemsService {
                 accountability: this.accountability,
             });
         }
-        await this.knex.transaction(async (trx) => {
+        await transaction(this.knex, async (trx) => {
             await trx(this.collection).whereIn(primaryKeyField, keys).delete();
             if (this.accountability && this.schema.collections[this.collection].accountability !== null) {
                 const activityService = new ActivityService({

package/dist/services/notifications.d.ts

@@ -1,5 +1,5 @@
-import type { Notification } from '@directus/types';
-import type { AbstractServiceOptions, MutationOptions, PrimaryKey } from '../types/index.js';
+import type { Notification, PrimaryKey } from '@directus/types';
+import type { AbstractServiceOptions, MutationOptions } from '../types/index.js';
 import { ItemsService } from './items.js';
 import { MailService } from './mail/index.js';
 import { UsersService } from './users.js';

package/dist/services/operations.d.ts

@@ -1,5 +1,5 @@
-import type { OperationRaw } from '@directus/types';
-import type { AbstractServiceOptions, Item, MutationOptions, PrimaryKey } from '../types/index.js';
+import type { Item, OperationRaw, PrimaryKey } from '@directus/types';
+import type { AbstractServiceOptions, MutationOptions } from '../types/index.js';
 import { ItemsService } from './items.js';
 export declare class OperationsService extends ItemsService<OperationRaw> {
     constructor(options: AbstractServiceOptions);

package/dist/services/payload.d.ts

@@ -1,7 +1,7 @@
-import type { Accountability, SchemaOverview } from '@directus/types';
+import type { Accountability, Item, PrimaryKey, SchemaOverview } from '@directus/types';
 import type { Knex } from 'knex';
 import type { Helpers } from '../database/helpers/index.js';
-import type { AbstractServiceOptions, ActionEventParams, Item, MutationOptions, PrimaryKey } from '../types/index.js';
+import type { AbstractServiceOptions, ActionEventParams, MutationOptions } from '../types/index.js';
 type Action = 'create' | 'read' | 'update';
 type Transformers = {
     [type: string]: (context: {

package/dist/services/permissions/index.d.ts

@@ -1,6 +1,6 @@
-import type { ItemPermissions, PermissionsAction, Query } from '@directus/types';
+import type { Item, ItemPermissions, PermissionsAction, PrimaryKey, Query } from '@directus/types';
 import type Keyv from 'keyv';
-import type { AbstractServiceOptions, Item, MutationOptions, PrimaryKey } from '../../types/index.js';
+import type { AbstractServiceOptions, MutationOptions } from '../../types/index.js';
 import type { QueryOptions } from '../items.js';
 import { ItemsService } from '../items.js';
 export declare class PermissionsService extends ItemsService {

package/dist/services/relations.js

@@ -8,6 +8,7 @@ import getDatabase, { getSchemaInspector } from '../database/index.js';
 import emitter from '../emitter.js';
 import { getDefaultIndexName } from '../utils/get-default-index-name.js';
 import { getSchema } from '../utils/get-schema.js';
+import { transaction } from '../utils/transaction.js';
 import { ItemsService } from './items.js';
 import { PermissionsService } from './permissions/index.js';
 export class RelationsService {
@@ -150,7 +151,7 @@ export class RelationsService {
                 many_field: relation.field,
                 one_collection: relation.related_collection || null,
             };
-            await this.knex.transaction(async (trx) => {
+            await transaction(this.knex, async (trx) => {
                 if (relation.related_collection) {
                     await trx.schema.alterTable(relation.collection, async (table) => {
                         this.alterType(table, relation, fieldSchema.nullable);
@@ -221,7 +222,7 @@ export class RelationsService {
         this.helpers.schema.preRelationChange(relation);
         const nestedActionEvents = [];
         try {
-            await this.knex.transaction(async (trx) => {
+            await transaction(this.knex, async (trx) => {
                 if (existingRelation.related_collection) {
                     await trx.schema.alterTable(collection, async (table) => {
                         let constraintName = getDefaultIndexName('foreign', collection, field);
@@ -308,7 +309,7 @@ export class RelationsService {
         const runPostColumnChange = await this.helpers.schema.preColumnChange();
         const nestedActionEvents = [];
         try {
-            await this.knex.transaction(async (trx) => {
+            await transaction(this.knex, async (trx) => {
                 const existingConstraints = await this.schemaInspector.foreignKeys();
                 const constraintNames = existingConstraints.map((key) => key.constraint_name);
                 if (existingRelation.schema?.constraint_name &&

package/dist/services/revisions.d.ts

@@ -1,4 +1,5 @@
-import type { AbstractServiceOptions, Item, MutationOptions, PrimaryKey } from '../types/index.js';
+import type { Item, PrimaryKey } from '@directus/types';
+import type { AbstractServiceOptions, MutationOptions } from '../types/index.js';
 import { ItemsService } from './items.js';
 export declare class RevisionsService extends ItemsService {
     constructor(options: AbstractServiceOptions);

package/dist/services/roles.d.ts

@@ -1,5 +1,5 @@
-import type { Query } from '@directus/types';
-import type { AbstractServiceOptions, Item, MutationOptions, PrimaryKey } from '../types/index.js';
+import type { Item, PrimaryKey, Query } from '@directus/types';
+import type { AbstractServiceOptions, MutationOptions } from '../types/index.js';
 import { ItemsService } from './items.js';
 export declare class RolesService extends ItemsService {
     constructor(options: AbstractServiceOptions);

package/dist/services/roles.js

@@ -1,5 +1,6 @@
 import { ForbiddenError, InvalidPayloadError, UnprocessableContentError } from '@directus/errors';
 import { getMatch } from 'ip-matching';
+import { transaction } from '../utils/transaction.js';
 import { ItemsService } from './items.js';
 import { PermissionsService } from './permissions/index.js';
 import { PresetsService } from './presets.js';
@@ -217,7 +218,7 @@ export class RolesService extends ItemsService {
         catch (err) {
             opts.preMutationError = err;
         }
-        await this.knex.transaction(async (trx) => {
+        await transaction(this.knex, async (trx) => {
             const itemsService = new ItemsService('directus_roles', {
                 knex: trx,
                 accountability: this.accountability,

package/dist/services/shares.d.ts

@@ -1,4 +1,5 @@
-import type { AbstractServiceOptions, Item, LoginResult, MutationOptions, PrimaryKey } from '../types/index.js';
+import type { Item, PrimaryKey } from '@directus/types';
+import type { AbstractServiceOptions, LoginResult, MutationOptions } from '../types/index.js';
 import { AuthorizationService } from './authorization.js';
 import { ItemsService } from './items.js';
 export declare class SharesService extends ItemsService {

package/dist/services/shares.js

@@ -2,6 +2,7 @@ import { useEnv } from '@directus/env';
 import { ForbiddenError, InvalidCredentialsError } from '@directus/errors';
 import argon2 from 'argon2';
 import jwt from 'jsonwebtoken';
+import { useLogger } from '../logger.js';
 import { getMilliseconds } from '../utils/get-milliseconds.js';
 import { md } from '../utils/md.js';
 import { Url } from '../utils/url.js';
@@ -10,7 +11,6 @@ import { AuthorizationService } from './authorization.js';
 import { ItemsService } from './items.js';
 import { MailService } from './mail/index.js';
 import { UsersService } from './users.js';
-import { useLogger } from '../logger.js';
 const env = useEnv();
 const logger = useLogger();
 export class SharesService extends ItemsService {

package/dist/services/tfa.d.ts

@@ -1,5 +1,6 @@
+import type { PrimaryKey } from '@directus/types';
 import type { Knex } from 'knex';
-import type { AbstractServiceOptions, PrimaryKey } from '../types/index.js';
+import type { AbstractServiceOptions } from '../types/index.js';
 import { ItemsService } from './items.js';
 export declare class TFAService {
     knex: Knex;

package/dist/services/tfa.js

@@ -1,6 +1,6 @@
+import { InvalidPayloadError } from '@directus/errors';
 import { authenticator } from 'otplib';
 import getDatabase from '../database/index.js';
-import { InvalidPayloadError } from '@directus/errors';
 import { ItemsService } from './items.js';
 export class TFAService {
     knex;

package/dist/services/users.d.ts

@@ -1,5 +1,5 @@
-import type { Query } from '@directus/types';
-import type { AbstractServiceOptions, Item, MutationOptions, PrimaryKey } from '../types/index.js';
+import type { Item, PrimaryKey, Query } from '@directus/types';
+import type { AbstractServiceOptions, MutationOptions } from '../types/index.js';
 import { ItemsService } from './items.js';
 export declare class UsersService extends ItemsService {
     constructor(options: AbstractServiceOptions);

package/dist/services/users.js

@@ -7,14 +7,15 @@ import jwt from 'jsonwebtoken';
 import { cloneDeep, isEmpty } from 'lodash-es';
 import { performance } from 'perf_hooks';
 import getDatabase from '../database/index.js';
+import { useLogger } from '../logger.js';
 import isUrlAllowed from '../utils/is-url-allowed.js';
 import { verifyJWT } from '../utils/jwt.js';
 import { stall } from '../utils/stall.js';
+import { transaction } from '../utils/transaction.js';
 import { Url } from '../utils/url.js';
 import { ItemsService } from './items.js';
 import { MailService } from './mail/index.js';
 import { SettingsService } from './settings.js';
-import { useLogger } from '../logger.js';
 const env = useEnv();
 const logger = useLogger();
 export class UsersService extends ItemsService {
@@ -195,7 +196,7 @@ export class UsersService extends ItemsService {
             opts.mutationTracker = this.createMutationTracker();
         const primaryKeyField = this.schema.collections[this.collection].primary;
         const keys = [];
-        await this.knex.transaction(async (trx) => {
+        await transaction(this.knex, async (trx) => {
             const service = new UsersService({
                 accountability: this.accountability,
                 knex: trx,

package/dist/services/utils.d.ts

@@ -1,6 +1,6 @@
-import type { Accountability, SchemaOverview } from '@directus/types';
+import type { Accountability, PrimaryKey, SchemaOverview } from '@directus/types';
 import type { Knex } from 'knex';
-import type { AbstractServiceOptions, PrimaryKey } from '../types/index.js';
+import type { AbstractServiceOptions } from '../types/index.js';
 export declare class UtilsService {
     knex: Knex;
     accountability: Accountability | null;
@@ -10,5 +10,7 @@ export declare class UtilsService {
         item: PrimaryKey;
         to: PrimaryKey;
     }): Promise<void>;
-    clearCache(): Promise<void>;
+    clearCache({ system }: {
+        system: boolean;
+    }): Promise<void>;
 }

package/dist/services/utils.js

@@ -1,8 +1,8 @@
-import { flushCaches, getCache } from '../cache.js';
-import getDatabase from '../database/index.js';
+import { ForbiddenError, InvalidPayloadError } from '@directus/errors';
 import { systemCollectionRows } from '@directus/system-data';
+import { clearSystemCache, getCache } from '../cache.js';
+import getDatabase from '../database/index.js';
 import emitter from '../emitter.js';
-import { ForbiddenError, InvalidPayloadError } from '@directus/errors';
 import { shouldClearCache } from '../utils/should-clear-cache.js';
 export class UtilsService {
     knex;
@@ -112,10 +112,14 @@ export class UtilsService {
             accountability: this.accountability,
         });
     }
-    async clearCache() {
+    async clearCache({ system }) {
         if (this.accountability?.admin !== true) {
             throw new ForbiddenError();
         }
-        return flushCaches(true);
+        const { cache } = getCache();
+        if (system) {
+            await clearSystemCache({ forced: true });
+        }
+        return cache?.clear();
     }
 }

package/dist/services/versions.d.ts

@@ -17,5 +17,5 @@ export declare class VersionsService extends ItemsService {
     createMany(data: Partial<Item>[], opts?: MutationOptions): Promise<PrimaryKey[]>;
     updateMany(keys: PrimaryKey[], data: Partial<Item>, opts?: MutationOptions): Promise<PrimaryKey[]>;
     save(key: PrimaryKey, data: Partial<Item>): Promise<Partial<Item>>;
-    promote(version: PrimaryKey, mainHash: string, fields?: string[]): Promise<import("../types/items.js").PrimaryKey>;
+    promote(version: PrimaryKey, mainHash: string, fields?: string[]): Promise<PrimaryKey>;
 }

package/dist/services/webhooks.d.ts

@@ -1,6 +1,7 @@
 import { type DirectusError } from '@directus/errors';
 import type { Bus } from '@directus/memory';
-import type { AbstractServiceOptions, MutationOptions, PrimaryKey, Webhook } from '../types/index.js';
+import type { PrimaryKey } from '@directus/types';
+import type { AbstractServiceOptions, MutationOptions, Webhook } from '../types/index.js';
 import { ItemsService } from './items.js';
 export declare class WebhooksService extends ItemsService<Webhook> {
     messenger: Bus;

package/dist/types/items.d.ts

@@ -1,13 +1,6 @@
 import type { DirectusError } from '@directus/errors';
-import type { EventContext } from '@directus/types';
+import type { EventContext, PrimaryKey } from '@directus/types';
 import type { MutationTracker } from '../services/items.js';
-export type Item = Record<string, any>;
-export type PrimaryKey = string | number;
-export type Alterations<T extends Item = Item, K extends keyof T | undefined = undefined> = {
-    create: Partial<T>[];
-    update: (K extends keyof T ? Partial<T> & Pick<T, K> : Partial<T>)[];
-    delete: (K extends keyof T ? T[K] : PrimaryKey)[];
-};
 export type MutationOptions = {
     /**
      * Callback function that's fired whenever a revision is made in the mutation

package/dist/types/services.d.ts

@@ -1,6 +1,5 @@
-import type { Accountability, Query, SchemaOverview } from '@directus/types';
+import type { Accountability, Item, PrimaryKey, Query, SchemaOverview } from '@directus/types';
 import type { Knex } from 'knex';
-import type { Item, PrimaryKey } from './items.js';
 export type AbstractServiceOptions = {
     knex?: Knex | undefined;
     accountability?: Accountability | null | undefined;

package/dist/utils/apply-diff.js

@@ -9,6 +9,7 @@ import { CollectionsService } from '../services/collections.js';
 import { FieldsService } from '../services/fields.js';
 import { RelationsService } from '../services/relations.js';
 import { DiffKind } from '../types/index.js';
+import { transaction } from '../utils/transaction.js';
 import { getSchema } from './get-schema.js';
 const logger = useLogger();
 export async function applyDiff(currentSnapshot, snapshotDiff, options) {
@@ -22,7 +23,7 @@ export async function applyDiff(currentSnapshot, snapshotDiff, options) {
         bypassLimits: true,
     };
     const runPostColumnChange = await helpers.schema.preColumnChange();
-    await database.transaction(async (trx) => {
+    await transaction(database, async (trx) => {
         const collectionsService = new CollectionsService({ knex: trx, schema });
         const getNestedCollectionsToCreate = (currentLevelCollection) => snapshotDiff.collections.filter(({ diff }) => diff[0].rhs?.meta?.group === currentLevelCollection);
         const getNestedCollectionsToDelete = (currentLevelCollection) => snapshotDiff.collections.filter(({ diff }) => diff[0].lhs?.meta?.group === currentLevelCollection);

package/dist/utils/get-schema.js

@@ -34,24 +34,33 @@ export async function getSchema(options, attempt = 0) {
     const lockKey = 'schemaCache--preparing';
     const messageKey = 'schemaCache--done';
     const processId = await lock.increment(lockKey);
+    if (processId >= env['CACHE_SCHEMA_MAX_ITERATIONS']) {
+        await lock.delete(lockKey);
+    }
     const currentProcessShouldHandleOperation = processId === 1;
     if (currentProcessShouldHandleOperation === false) {
         logger.trace('Schema cache is prepared in another process, waiting for result.');
-        return new Promise((resolve) => {
+        return new Promise((resolve, reject) => {
             const TIMEOUT = 10000;
-            let timeout;
-            const callback = async () => {
-                if (timeout)
-                    clearTimeout(timeout);
-                const schema = await getSchema(options, attempt + 1);
-                resolve(schema);
-                bus.unsubscribe(messageKey, callback);
-            };
-            bus.subscribe(messageKey, callback);
-            timeout = setTimeout(async () => {
+            const timeout = setTimeout(() => {
                 logger.trace('Did not receive schema callback message in time. Pulling schema...');
-                callback();
+                callback().catch(reject);
             }, TIMEOUT);
+            bus.subscribe(messageKey, callback);
+            async function callback() {
+                try {
+                    if (timeout)
+                        clearTimeout(timeout);
+                    const schema = await getSchema(options, attempt + 1);
+                    resolve(schema);
+                }
+                catch (error) {
+                    reject(error);
+                }
+                finally {
+                    bus.unsubscribe(messageKey, callback);
+                }
+            }
         });
     }
     try {

package/dist/utils/merge-version-data.js

@@ -1,5 +1,5 @@
-import Joi from 'joi';
 import { isObject } from '@directus/utils';
+import Joi from 'joi';
 import { cloneDeep } from 'lodash-es';
 const alterationSchema = Joi.object({
     create: Joi.array().items(Joi.object().unknown()),

package/dist/utils/transaction.d.ts

@@ -0,0 +1,9 @@
+import type { Knex } from 'knex';
+/**
+ * Execute the given handler within the current transaction or a newly created one
+ * if the current knex state isn't a transaction yet.
+ *
+ * Can be used to ensure the handler is run within a transaction,
+ * while preventing nested transactions.
+ */
+export declare const transaction: <T = unknown>(knex: Knex, handler: (knex: Knex) => Promise<T>) => Promise<T>;

package/dist/utils/transaction.js

@@ -0,0 +1,15 @@
+/**
+ * Execute the given handler within the current transaction or a newly created one
+ * if the current knex state isn't a transaction yet.
+ *
+ * Can be used to ensure the handler is run within a transaction,
+ * while preventing nested transactions.
+ */
+export const transaction = (knex, handler) => {
+    if (knex.isTransaction) {
+        return handler(knex);
+    }
+    else {
+        return knex.transaction((trx) => handler(trx));
+    }
+};

package/dist/utils/validate-keys.d.ts

@@ -1,5 +1,4 @@
-import type { SchemaOverview } from '@directus/types';
-import type { PrimaryKey } from '../types/index.js';
+import type { PrimaryKey, SchemaOverview } from '@directus/types';
 /**
  * Validate keys based on its type
  */

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

@@ -39,5 +39,5 @@ export declare function getFieldsPayload(subscription: PSubscription, accountabi
  * @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 | (string | number)[] | import("../../types/items.js").Item[]>;
+export declare function getItemsPayload(subscription: PSubscription, accountability: Accountability | null, schema: SchemaOverview, event?: WebSocketEvent): Promise<string | number | import("@directus/types").Item | (string | number)[] | import("@directus/types").Item[]>;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@directus/api",
-  "version": "19.0.0",
+  "version": "19.0.2",
   "description": "Directus is a real-time API and App dashboard for managing SQL database content",
   "keywords": [
     "directus",
@@ -59,7 +59,7 @@
   ],
   "dependencies": {
     "@authenio/samlify-node-xmllint": "2.0.0",
-    "@aws-sdk/client-ses": "3.533.0",
+    "@aws-sdk/client-ses": "3.552.0",
     "@godaddy/terminus": "4.12.1",
     "@rollup/plugin-alias": "5.1.0",
     "@rollup/plugin-node-resolve": "15.2.3",
@@ -67,7 +67,7 @@
     "@types/cookie": "0.6.0",
     "argon2": "0.40.1",
     "async": "3.2.5",
-    "axios": "1.6.7",
+    "axios": "1.6.8",
     "busboy": "1.6.0",
     "bytes": "3.1.2",
     "camelcase": "8.0.0",
@@ -116,12 +116,12 @@
     "minimatch": "9.0.3",
     "mnemonist": "0.39.8",
     "ms": "2.1.3",
-    "nanoid": "5.0.6",
+    "nanoid": "5.0.7",
     "node-machine-id": "1.1.12",
     "node-schedule": "2.1.1",
     "nodemailer": "6.9.13",
     "object-hash": "3.0.0",
-    "openapi3-ts": "4.2.2",
+    "openapi3-ts": "4.3.1",
     "openid-client": "5.6.5",
     "ora": "8.0.1",
     "otplib": "12.0.1",
@@ -146,29 +146,29 @@
     "ws": "8.16.0",
     "zod": "3.22.4",
     "zod-validation-error": "3.0.3",
-    "@directus/app": "12.0.0",
-    "@directus/env": "1.1.1",
-    "@directus/errors": "0.2.4",
+    "@directus/env": "1.1.2",
+    "@directus/app": "12.0.2",
+    "@directus/extensions": "1.0.3",
     "@directus/constants": "11.0.3",
-    "@directus/extensions-registry": "1.0.2",
-    "@directus/extensions-sdk": "11.0.2",
-    "@directus/extensions": "1.0.2",
+    "@directus/extensions-registry": "1.0.3",
+    "@directus/errors": "0.2.4",
+    "@directus/extensions-sdk": "11.0.3",
     "@directus/format-title": "10.1.1",
-    "@directus/memory": "1.0.6",
     "@directus/pressure": "1.0.18",
     "@directus/schema": "11.0.1",
+    "@directus/memory": "1.0.6",
     "@directus/specs": "10.2.8",
-    "@directus/storage": "10.0.11",
-    "@directus/storage-driver-cloudinary": "10.0.19",
     "@directus/storage-driver-azure": "10.0.19",
     "@directus/storage-driver-gcs": "10.0.19",
+    "@directus/storage-driver-cloudinary": "10.0.19",
     "@directus/storage-driver-local": "10.0.18",
+    "@directus/storage": "10.0.11",
     "@directus/storage-driver-s3": "10.0.20",
     "@directus/storage-driver-supabase": "1.0.11",
-    "@directus/utils": "11.0.7",
     "@directus/system-data": "1.0.2",
-    "@directus/validation": "0.0.14",
-    "directus": "10.10.5"
+    "directus": "10.10.7",
+    "@directus/utils": "11.0.7",
+    "@directus/validation": "0.0.14"
   },
   "devDependencies": {
     "@ngneat/falso": "7.2.0",
@@ -211,8 +211,8 @@
     "typescript": "5.3.3",
     "vitest": "1.3.1",
     "@directus/random": "0.2.7",
-    "@directus/tsconfig": "1.0.1",
-    "@directus/types": "11.0.8"
+    "@directus/types": "11.1.0",
+    "@directus/tsconfig": "1.0.1"
   },
   "optionalDependencies": {
     "@keyv/redis": "2.8.4",