directus 9.22.4 → 9.23.1

package/dist/services/files.js

@@ -1,56 +1,29 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FilesService = void 0;
 const utils_1 = require("@directus/shared/utils");
-const dns_1 = require("dns");
 const encodeurl_1 = __importDefault(require("encodeurl"));
 const exif_reader_1 = __importDefault(require("exif-reader"));
 const icc_1 = require("icc");
 const lodash_1 = require("lodash");
 const mime_types_1 = require("mime-types");
-const net_1 = __importDefault(require("net"));
 const promises_1 = require("node:stream/promises");
-const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 const sharp_1 = __importDefault(require("sharp"));
-const url_1 = __importStar(require("url"));
-const util_1 = require("util");
+const url_1 = __importDefault(require("url"));
 const emitter_1 = __importDefault(require("../emitter"));
 const env_1 = __importDefault(require("../env"));
 const exceptions_1 = require("../exceptions");
 const logger_1 = __importDefault(require("../logger"));
+const index_1 = require("../request/index");
 const storage_1 = require("../storage");
 const parse_image_metadata_1 = require("../utils/parse-image-metadata");
 const items_1 = require("./items");
 // @ts-ignore
 const format_title_1 = __importDefault(require("@directus/format-title"));
-const lookupDNS = (0, util_1.promisify)(dns_1.lookup);
 class FilesService extends items_1.ItemsService {
     constructor(options) {
         super('directus_files', options);
@@ -112,7 +85,7 @@ class FilesService extends items_1.ItemsService {
             schema: this.schema,
         });
         await sudoService.updateOne(primaryKey, payload, { emitEvents: false });
-        if (this.cache && env_1.default.CACHE_AUTO_PURGE) {
+        if (this.cache && env_1.default.CACHE_AUTO_PURGE && (opts === null || opts === void 0 ? void 0 : opts.autoPurgeCache) !== false) {
             await this.cache.clear();
         }
         if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false) {
@@ -135,8 +108,10 @@ class FilesService extends items_1.ItemsService {
         return new Promise((resolve, reject) => {
             (0, promises_1.pipeline)(stream, (0, sharp_1.default)().metadata(async (err, sharpMetadata) => {
                 var _a, _b, _c, _d;
-                if (err)
+                if (err) {
                     reject(err);
+                    return;
+                }
                 const metadata = {};
                 if (sharpMetadata.orientation && sharpMetadata.orientation >= 5) {
                     metadata.height = sharpMetadata.width;
@@ -149,26 +124,50 @@ class FilesService extends items_1.ItemsService {
                 // Backward-compatible layout as it used to be with 'exifr'
                 const fullMetadata = {};
                 if (sharpMetadata.exif) {
-                    const { image, thumbnail, interoperability, ...rest } = (0, exif_reader_1.default)(sharpMetadata.exif);
-                    if (image) {
-                        fullMetadata.ifd0 = image;
-                    }
-                    if (thumbnail) {
-                        fullMetadata.ifd1 = thumbnail;
+                    try {
+                        const { image, thumbnail, interoperability, ...rest } = (0, exif_reader_1.default)(sharpMetadata.exif);
+                        if (image) {
+                            fullMetadata.ifd0 = image;
+                        }
+                        if (thumbnail) {
+                            fullMetadata.ifd1 = thumbnail;
+                        }
+                        if (interoperability) {
+                            fullMetadata.interop = interoperability;
+                        }
+                        Object.assign(fullMetadata, rest);
                     }
-                    if (interoperability) {
-                        fullMetadata.interop = interoperability;
+                    catch (err) {
+                        logger_1.default.warn(`Couldn't extract EXIF metadata from file`);
+                        logger_1.default.warn(err);
                     }
-                    Object.assign(fullMetadata, rest);
                 }
                 if (sharpMetadata.icc) {
-                    fullMetadata.icc = (0, icc_1.parse)(sharpMetadata.icc);
+                    try {
+                        fullMetadata.icc = (0, icc_1.parse)(sharpMetadata.icc);
+                    }
+                    catch (err) {
+                        logger_1.default.warn(`Couldn't extract ICC profile data from file`);
+                        logger_1.default.warn(err);
+                    }
                 }
                 if (sharpMetadata.iptc) {
-                    fullMetadata.iptc = (0, parse_image_metadata_1.parseIptc)(sharpMetadata.iptc);
+                    try {
+                        fullMetadata.iptc = (0, parse_image_metadata_1.parseIptc)(sharpMetadata.iptc);
+                    }
+                    catch (err) {
+                        logger_1.default.warn(`Couldn't extract IPTC Photo Metadata from file`);
+                        logger_1.default.warn(err);
+                    }
                 }
                 if (sharpMetadata.xmp) {
-                    fullMetadata.xmp = (0, parse_image_metadata_1.parseXmp)(sharpMetadata.xmp);
+                    try {
+                        fullMetadata.xmp = (0, parse_image_metadata_1.parseXmp)(sharpMetadata.xmp);
+                    }
+                    catch (err) {
+                        logger_1.default.warn(`Couldn't extract XMP data from file`);
+                        logger_1.default.warn(err);
+                    }
                 }
                 if (((_a = fullMetadata === null || fullMetadata === void 0 ? void 0 : fullMetadata.iptc) === null || _a === void 0 ? void 0 : _a.Caption) && typeof fullMetadata.iptc.Caption === 'string') {
                     metadata.description = (_b = fullMetadata.iptc) === null || _b === void 0 ? void 0 : _b.Caption;
@@ -203,62 +202,19 @@ class FilesService extends items_1.ItemsService {
      */
     async importOne(importURL, body) {
         var _a, _b, _c;
-        const axios = (await import('axios')).default;
         const fileCreatePermissions = (_b = (_a = this.accountability) === null || _a === void 0 ? void 0 : _a.permissions) === null || _b === void 0 ? void 0 : _b.find((permission) => permission.collection === 'directus_files' && permission.action === 'create');
         if (this.accountability && ((_c = this.accountability) === null || _c === void 0 ? void 0 : _c.admin) !== true && !fileCreatePermissions) {
             throw new exceptions_1.ForbiddenException();
         }
-        let resolvedUrl;
-        try {
-            resolvedUrl = new url_1.URL(importURL);
-        }
-        catch (err) {
-            logger_1.default.warn(err, `Requested URL ${importURL} isn't a valid URL`);
-            throw new exceptions_1.ServiceUnavailableException(`Couldn't fetch file from url "${importURL}"`, {
-                service: 'external-file',
-            });
-        }
-        let ip = resolvedUrl.hostname;
-        if (net_1.default.isIP(ip) === 0) {
-            try {
-                ip = (await lookupDNS(ip)).address;
-            }
-            catch (err) {
-                logger_1.default.warn(err, `Couldn't lookup the DNS for url ${importURL}`);
-                throw new exceptions_1.ServiceUnavailableException(`Couldn't fetch file from url "${importURL}"`, {
-                    service: 'external-file',
-                });
-            }
-        }
-        if (env_1.default.IMPORT_IP_DENY_LIST.includes('0.0.0.0')) {
-            const networkInterfaces = os_1.default.networkInterfaces();
-            for (const networkInfo of Object.values(networkInterfaces)) {
-                if (!networkInfo)
-                    continue;
-                for (const info of networkInfo) {
-                    if (info.address === ip) {
-                        logger_1.default.warn(`Requested URL ${importURL} resolves to localhost.`);
-                        throw new exceptions_1.ServiceUnavailableException(`Couldn't fetch file from url "${importURL}"`, {
-                            service: 'external-file',
-                        });
-                    }
-                }
-            }
-        }
-        if (env_1.default.IMPORT_IP_DENY_LIST.includes(ip)) {
-            logger_1.default.warn(`Requested URL ${importURL} resolves to a denied IP address.`);
-            throw new exceptions_1.ServiceUnavailableException(`Couldn't fetch file from url "${importURL}"`, {
-                service: 'external-file',
-            });
-        }
         let fileResponse;
         try {
+            const axios = await (0, index_1.getAxios)();
             fileResponse = await axios.get((0, encodeurl_1.default)(importURL), {
                 responseType: 'stream',
             });
         }
         catch (err) {
-            logger_1.default.warn(err, `Couldn't fetch file from url "${importURL}"`);
+            logger_1.default.warn(err, `Couldn't fetch file from URL "${importURL}"`);
             throw new exceptions_1.ServiceUnavailableException(`Couldn't fetch file from url "${importURL}"`, {
                 service: 'external-file',
             });

package/dist/services/graphql/index.js

@@ -9,9 +9,7 @@ const utils_1 = require("@directus/shared/utils");
 const argon2_1 = __importDefault(require("argon2"));
 const graphql_1 = require("graphql");
 const graphql_compose_1 = require("graphql-compose");
-const process_error_1 = __importDefault(require("./utils/process-error"));
 const lodash_1 = require("lodash");
-const ms_1 = __importDefault(require("ms"));
 const cache_1 = require("../../cache");
 const constants_1 = require("../../constants");
 const database_1 = __importDefault(require("../../database"));
@@ -46,14 +44,16 @@ const tfa_1 = require("../tfa");
 const users_1 = require("../users");
 const utils_2 = require("../utils");
 const webhooks_1 = require("../webhooks");
+const process_error_1 = __importDefault(require("./utils/process-error"));
 const date_1 = require("./types/date");
 const geojson_1 = require("./types/geojson");
 const string_or_float_1 = require("./types/string-or-float");
 const void_1 = require("./types/void");
-const add_path_to_validation_error_1 = require("./utils/add-path-to-validation-error");
-const hash_1 = require("./types/hash");
-const bigint_1 = require("./types/bigint");
 const constants_2 = require("@directus/shared/constants");
+const get_milliseconds_1 = require("../../utils/get-milliseconds");
+const bigint_1 = require("./types/bigint");
+const hash_1 = require("./types/hash");
+const add_path_to_validation_error_1 = require("./utils/add-path-to-validation-error");
 const validationRules = Array.from(graphql_1.specifiedRules);
 if (env_1.default.GRAPHQL_INTROSPECTION === false) {
     validationRules.push(graphql_1.NoSchemaIntrospectionCustomRule);
@@ -842,6 +842,12 @@ class GraphQLService {
                         limit: {
                             type: graphql_1.GraphQLInt,
                         },
+                        offset: {
+                            type: graphql_1.GraphQLInt,
+                        },
+                        page: {
+                            type: graphql_1.GraphQLInt,
+                        },
                         search: {
                             type: graphql_1.GraphQLString,
                         },
@@ -1614,7 +1620,7 @@ class GraphQLService {
                         accountability: this.accountability,
                         schema: this.schema,
                     });
-                    return await service.serverInfo();
+                    return await service.health();
                 },
             },
         });
@@ -1656,7 +1662,7 @@ class GraphQLService {
                         res === null || res === void 0 ? void 0 : res.cookie(env_1.default.REFRESH_TOKEN_COOKIE_NAME, result.refreshToken, {
                             httpOnly: true,
                             domain: env_1.default.REFRESH_TOKEN_COOKIE_DOMAIN,
-                            maxAge: (0, ms_1.default)(env_1.default.REFRESH_TOKEN_TTL),
+                            maxAge: (0, get_milliseconds_1.getMilliseconds)(env_1.default.REFRESH_TOKEN_TTL),
                             secure: (_a = env_1.default.REFRESH_TOKEN_COOKIE_SECURE) !== null && _a !== void 0 ? _a : false,
                             sameSite: env_1.default.REFRESH_TOKEN_COOKIE_SAME_SITE || 'strict',
                         });
@@ -1695,7 +1701,7 @@ class GraphQLService {
                         res === null || res === void 0 ? void 0 : res.cookie(env_1.default.REFRESH_TOKEN_COOKIE_NAME, result.refreshToken, {
                             httpOnly: true,
                             domain: env_1.default.REFRESH_TOKEN_COOKIE_DOMAIN,
-                            maxAge: (0, ms_1.default)(env_1.default.REFRESH_TOKEN_TTL),
+                            maxAge: (0, get_milliseconds_1.getMilliseconds)(env_1.default.REFRESH_TOKEN_TTL),
                             secure: (_a = env_1.default.REFRESH_TOKEN_COOKIE_SECURE) !== null && _a !== void 0 ? _a : false,
                             sameSite: env_1.default.REFRESH_TOKEN_COOKIE_SAME_SITE || 'strict',
                         });

package/dist/services/graphql/utils/process-error.js

@@ -4,23 +4,36 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const logger_1 = __importDefault(require("../../../logger"));
+const exceptions_1 = require("@directus/shared/exceptions");
 const processError = (accountability, error) => {
     logger_1.default.error(error);
-    if ((accountability === null || accountability === void 0 ? void 0 : accountability.admin) === true) {
+    const { originalError } = error;
+    if (originalError instanceof exceptions_1.BaseException) {
         return {
-            ...error,
+            message: originalError.message,
             extensions: {
-                code: 'INTERNAL_SERVER_ERROR',
+                code: originalError.code,
+                ...originalError.extensions,
             },
         };
     }
     else {
-        return {
-            message: 'An unexpected error occurred.',
-            extensions: {
-                code: 'INTERNAL_SERVER_ERROR',
-            },
-        };
+        if ((accountability === null || accountability === void 0 ? void 0 : accountability.admin) === true) {
+            return {
+                ...error,
+                extensions: {
+                    code: 'INTERNAL_SERVER_ERROR',
+                },
+            };
+        }
+        else {
+            return {
+                message: 'An unexpected error occurred.',
+                extensions: {
+                    code: 'INTERNAL_SERVER_ERROR',
+                },
+            };
+        }
     }
 };
 exports.default = processError;

package/dist/services/import-export.d.ts

@@ -3,6 +3,7 @@ import { Accountability, Query, SchemaOverview } from '@directus/shared/types';
 import { Knex } from 'knex';
 import { AbstractServiceOptions, File } from '../types';
 import type { Readable } from 'node:stream';
+type ExportFormat = 'csv' | 'json' | 'xml' | 'yaml';
 export declare class ImportService {
     knex: Knex;
     accountability: Accountability | null;
@@ -22,14 +23,15 @@ export declare class ExportService {
      * until all the data is retrieved. Uploads the result as a new file using the regular
      * FilesService upload method.
      */
-    exportToFile(collection: string, query: Partial<Query>, format: 'xml' | 'csv' | 'json', options?: {
+    exportToFile(collection: string, query: Partial<Query>, format: ExportFormat, options?: {
         file?: Partial<File>;
     }): Promise<void>;
     /**
      * Transform a given input object / array to the given type
      */
-    transform(input: Record<string, any>[], format: 'xml' | 'csv' | 'json', options?: {
+    transform(input: Record<string, any>[], format: ExportFormat, options?: {
         includeHeader?: boolean;
         includeFooter?: boolean;
     }): string;
 }
+export {};

package/dist/services/import-export.js

@@ -9,6 +9,7 @@ const async_1 = require("async");
 const csv_parser_1 = __importDefault(require("csv-parser"));
 const destroy_1 = __importDefault(require("destroy"));
 const fs_extra_1 = require("fs-extra");
+const js_yaml_1 = require("js-yaml");
 const js2xmlparser_1 = require("js2xmlparser");
 const json2csv_1 = require("json2csv");
 const lodash_1 = require("lodash");
@@ -23,6 +24,7 @@ const get_date_formatted_1 = require("../utils/get-date-formatted");
 const files_1 = require("./files");
 const items_1 = require("./items");
 const notifications_1 = require("./notifications");
+const emitter_1 = __importDefault(require("../emitter"));
 class ImportService {
     constructor(options) {
         this.knex = options.knex || (0, database_1.default)();
@@ -50,6 +52,7 @@ class ImportService {
     }
     importJSON(collection, stream) {
         const extractJSON = StreamArray_1.default.withParser();
+        const nestedActionEvents = [];
         return this.knex.transaction((trx) => {
             const service = new items_1.ItemsService(collection, {
                 knex: trx,
@@ -57,7 +60,7 @@ class ImportService {
                 accountability: this.accountability,
             });
             const saveQueue = (0, async_1.queue)(async (value) => {
-                return await service.upsertOne(value);
+                return await service.upsertOne(value, { bypassEmitAction: (params) => nestedActionEvents.push(params) });
             });
             return new Promise((resolve, reject) => {
                 stream.pipe(extractJSON);
@@ -74,6 +77,9 @@ class ImportService {
                 });
                 extractJSON.on('end', () => {
                     saveQueue.drain(() => {
+                        for (const nestedActionEvent of nestedActionEvents) {
+                            emitter_1.default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
+                        }
                         return resolve();
                     });
                 });
@@ -81,6 +87,7 @@ class ImportService {
         });
     }
     importCSV(collection, stream) {
+        const nestedActionEvents = [];
         return this.knex.transaction((trx) => {
             const service = new items_1.ItemsService(collection, {
                 knex: trx,
@@ -88,7 +95,7 @@ class ImportService {
                 accountability: this.accountability,
             });
             const saveQueue = (0, async_1.queue)(async (value) => {
-                return await service.upsertOne(value);
+                return await service.upsertOne(value, { bypassEmitAction: (action) => nestedActionEvents.push(action) });
             });
             return new Promise((resolve, reject) => {
                 stream
@@ -122,6 +129,9 @@ class ImportService {
                 })
                     .on('end', () => {
                     saveQueue.drain(() => {
+                        for (const nestedActionEvent of nestedActionEvents) {
+                            emitter_1.default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
+                        }
                         return resolve();
                     });
                 });
@@ -148,9 +158,10 @@ class ExportService {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         try {
             const mimeTypes = {
-                xml: 'text/xml',
                 csv: 'text/csv',
                 json: 'application/json',
+                xml: 'text/xml',
+                yaml: 'text/yaml',
             };
             const database = (0, database_1.default)();
             const { path, cleanup } = await (0, tmp_promise_1.file)();
@@ -277,6 +288,9 @@ class ExportService {
             }
             return string;
         }
+        if (format === 'yaml') {
+            return (0, js_yaml_1.dump)(input);
+        }
         throw new exceptions_1.ServiceUnavailableException(`Illegal export type used: "${format}"`, { service: 'export' });
     }
 }

package/dist/services/import-export.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/services/index.d.ts

@@ -22,6 +22,7 @@ export * from './presets';
 export * from './relations';
 export * from './revisions';
 export * from './roles';
+export * from './schema';
 export * from './server';
 export * from './settings';
 export * from './specifications';

package/dist/services/index.js

@@ -39,6 +39,7 @@ __exportStar(require("./presets"), exports);
 __exportStar(require("./relations"), exports);
 __exportStar(require("./revisions"), exports);
 __exportStar(require("./roles"), exports);
+__exportStar(require("./schema"), exports);
 __exportStar(require("./server"), exports);
 __exportStar(require("./settings"), exports);
 __exportStar(require("./specifications"), exports);

package/dist/services/items.js

@@ -86,6 +86,9 @@ class ItemsService {
             const payloadWithPresets = this.accountability
                 ? await authorizationService.validatePayload('create', this.collection, payloadAfterHooks)
                 : payloadAfterHooks;
+            if (opts === null || opts === void 0 ? void 0 : opts.preMutationException) {
+                throw opts.preMutationException;
+            }
             const { payload: payloadWithM2O, revisions: revisionsM2O, nestedActionEvents: nestedActionEventsM2O, } = await payloadService.processM2O(payloadWithPresets, opts);
             const { payload: payloadWithA2O, revisions: revisionsA2O, nestedActionEvents: nestedActionEventsA2O, } = await payloadService.processA2O(payloadWithM2O, opts);
             const payloadWithoutAliases = (0, lodash_1.pick)(payloadWithA2O, (0, lodash_1.without)(fields, ...aliases));
@@ -180,14 +183,19 @@ class ItemsService {
                     accountability: this.accountability,
                 },
             };
-            if (!(opts === null || opts === void 0 ? void 0 : opts.bypassEmitAction)) {
-                emitter_1.default.emitAction(actionEvent.event, actionEvent.meta, actionEvent.context);
+            if (opts === null || opts === void 0 ? void 0 : opts.bypassEmitAction) {
+                opts.bypassEmitAction(actionEvent);
             }
             else {
-                opts.bypassEmitAction(actionEvent);
+                emitter_1.default.emitAction(actionEvent.event, actionEvent.meta, actionEvent.context);
             }
             for (const nestedActionEvent of nestedActionEvents) {
-                emitter_1.default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
+                if (opts === null || opts === void 0 ? void 0 : opts.bypassEmitAction) {
+                    opts.bypassEmitAction(nestedActionEvent);
+                }
+                else {
+                    emitter_1.default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
+                }
             }
         }
         if (this.cache && env_1.default.CACHE_AUTO_PURGE && (opts === null || opts === void 0 ? void 0 : opts.autoPurgeCache) !== false) {
@@ -211,7 +219,7 @@ class ItemsService {
                 const primaryKey = await service.createOne(payload, {
                     ...(opts || {}),
                     autoPurgeCache: false,
-                    bypassEmitAction: (params) => (opts === null || opts === void 0 ? void 0 : opts.bypassEmitAction) ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
+                    bypassEmitAction: (params) => nestedActionEvents.push(params),
                 });
                 primaryKeys.push(primaryKey);
             }
@@ -219,11 +227,11 @@ class ItemsService {
         });
         if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false) {
             for (const nestedActionEvent of nestedActionEvents) {
-                if (!(opts === null || opts === void 0 ? void 0 : opts.bypassEmitAction)) {
-                    emitter_1.default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
+                if (opts === null || opts === void 0 ? void 0 : opts.bypassEmitAction) {
+                    opts.bypassEmitAction(nestedActionEvent);
                 }
                 else {
-                    opts.bypassEmitAction(nestedActionEvent);
+                    emitter_1.default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
                 }
             }
         }
@@ -412,6 +420,9 @@ class ItemsService {
         const payloadWithPresets = this.accountability
             ? await authorizationService.validatePayload('update', this.collection, payloadAfterHooks)
             : payloadAfterHooks;
+        if (opts === null || opts === void 0 ? void 0 : opts.preMutationException) {
+            throw opts.preMutationException;
+        }
         await this.knex.transaction(async (trx) => {
             const payloadService = new payload_1.PayloadService(this.collection, {
                 accountability: this.accountability,
@@ -508,14 +519,19 @@ class ItemsService {
                     accountability: this.accountability,
                 },
             };
-            if (!(opts === null || opts === void 0 ? void 0 : opts.bypassEmitAction)) {
-                emitter_1.default.emitAction(actionEvent.event, actionEvent.meta, actionEvent.context);
+            if (opts === null || opts === void 0 ? void 0 : opts.bypassEmitAction) {
+                opts.bypassEmitAction(actionEvent);
             }
             else {
-                opts.bypassEmitAction(actionEvent);
+                emitter_1.default.emitAction(actionEvent.event, actionEvent.meta, actionEvent.context);
             }
             for (const nestedActionEvent of nestedActionEvents) {
-                emitter_1.default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
+                if (opts === null || opts === void 0 ? void 0 : opts.bypassEmitAction) {
+                    opts.bypassEmitAction(nestedActionEvent);
+                }
+                else {
+                    emitter_1.default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
+                }
             }
         }
         return keys;
@@ -596,6 +612,9 @@ class ItemsService {
             });
             await authorizationService.checkAccess('delete', this.collection, keys);
         }
+        if (opts === null || opts === void 0 ? void 0 : opts.preMutationException) {
+            throw opts.preMutationException;
+        }
         if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false) {
             await emitter_1.default.emitFilter(this.eventScope === 'items' ? ['items.delete', `${this.collection}.items.delete`] : `${this.eventScope}.delete`, keys, {
                 collection: this.collection,
@@ -642,11 +661,11 @@ class ItemsService {
                     accountability: this.accountability,
                 },
             };
-            if (!(opts === null || opts === void 0 ? void 0 : opts.bypassEmitAction)) {
-                emitter_1.default.emitAction(actionEvent.event, actionEvent.meta, actionEvent.context);
+            if (opts === null || opts === void 0 ? void 0 : opts.bypassEmitAction) {
+                opts.bypassEmitAction(actionEvent);
             }
             else {
-                opts.bypassEmitAction(actionEvent);
+                emitter_1.default.emitAction(actionEvent.event, actionEvent.meta, actionEvent.context);
             }
         }
         return keys;

package/dist/services/relations.js

@@ -155,6 +155,7 @@ class RelationsService {
             throw new exceptions_1.InvalidPayloadException(`Field "${relation.field}" in collection "${relation.collection}" already has an associated relationship`);
         }
         const runPostColumnChange = await this.helpers.schema.preColumnChange();
+        this.helpers.schema.preRelationChange(relation);
         const nestedActionEvents = [];
         try {
             const metaRow = {
@@ -225,6 +226,7 @@ class RelationsService {
             throw new exceptions_1.InvalidPayloadException(`Field "${field}" in collection "${collection}" doesn't have a relationship.`);
         }
         const runPostColumnChange = await this.helpers.schema.preColumnChange();
+        this.helpers.schema.preRelationChange(relation);
         const nestedActionEvents = [];
         try {
             await this.knex.transaction(async (trx) => {