directus 9.22.4 → 9.23.3

package/dist/env.js

@@ -28,6 +28,7 @@ const allowedEnvironmentVars = [
     'SERVE_APP',
     'GRAPHQL_INTROSPECTION',
     'LOGGER_.+',
+    'ROBOTS_TXT',
     // server
     'SERVER_.+',
     // database
@@ -61,6 +62,7 @@ const allowedEnvironmentVars = [
     'CORS_CREDENTIALS',
     'CORS_MAX_AGE',
     // rate limiting
+    'RATE_LIMITER_GLOBAL_.+',
     'RATE_LIMITER_.+',
     // cache
     'CACHE_ENABLED',
@@ -79,6 +81,7 @@ const allowedEnvironmentVars = [
     'CACHE_REDIS_PASSWORD',
     'CACHE_MEMCACHE',
     'CACHE_VALUE_MAX_SIZE',
+    'CACHE_SKIP_ALLOWED',
     'CACHE_HEALTHCHECK_THRESHOLD',
     // storage
     'STORAGE_LOCATIONS',
@@ -105,6 +108,7 @@ const allowedEnvironmentVars = [
     'ASSETS_TRANSFORM_MAX_CONCURRENT',
     'ASSETS_TRANSFORM_IMAGE_MAX_DIMENSION',
     'ASSETS_TRANSFORM_MAX_OPERATIONS',
+    'ASSETS_TRANSFORM_TIMEOUT',
     'ASSETS_CONTENT_SECURITY_POLICY',
     'ASSETS_INVALID_IMAGE_SENSITIVITY_LEVEL',
     // auth
@@ -143,8 +147,10 @@ const allowedEnvironmentVars = [
     'AUTH_.+_IDP.+',
     'AUTH_.+_SP.+',
     // extensions
+    'PACKAGE_FILE_LOCATION',
     'EXTENSIONS_PATH',
     'EXTENSIONS_AUTO_RELOAD',
+    'EXTENSIONS_CACHE_TTL',
     // messenger
     'MESSENGER_STORE',
     'MESSENGER_NAMESPACE',
@@ -193,14 +199,19 @@ const defaults = {
     PUBLIC_URL: '/',
     MAX_PAYLOAD_SIZE: '1mb',
     MAX_RELATIONAL_DEPTH: 10,
+    ROBOTS_TXT: 'User-agent: *\nDisallow: /',
     DB_EXCLUDE_TABLES: 'spatial_ref_sys,sysdiagrams',
     STORAGE_LOCATIONS: 'local',
     STORAGE_LOCAL_DRIVER: 'local',
     STORAGE_LOCAL_ROOT: './uploads',
     RATE_LIMITER_ENABLED: false,
-    RATE_LIMITER_POINTS: 25,
+    RATE_LIMITER_POINTS: 50,
     RATE_LIMITER_DURATION: 1,
     RATE_LIMITER_STORE: 'memory',
+    RATE_LIMITER_GLOBAL_ENABLED: false,
+    RATE_LIMITER_GLOBAL_POINTS: 1000,
+    RATE_LIMITER_GLOBAL_DURATION: 1,
+    RATE_LIMITER_GLOBAL_STORE: 'memory',
     ACCESS_TOKEN_TTL: '15m',
     REFRESH_TOKEN_TTL: '7d',
     REFRESH_TOKEN_COOKIE_SECURE: false,
@@ -224,24 +235,27 @@ const defaults = {
     CACHE_SCHEMA: true,
     CACHE_PERMISSIONS: true,
     CACHE_VALUE_MAX_SIZE: false,
+    CACHE_SKIP_ALLOWED: false,
     AUTH_PROVIDERS: '',
     AUTH_DISABLE_DEFAULT: false,
+    PACKAGE_FILE_LOCATION: '.',
     EXTENSIONS_PATH: './extensions',
     EXTENSIONS_AUTO_RELOAD: false,
-    EMAIL_FROM: 'no-reply@directus.io',
+    EMAIL_FROM: 'no-reply@example.com',
     EMAIL_VERIFY_SETUP: true,
     EMAIL_TRANSPORT: 'sendmail',
     EMAIL_SENDMAIL_NEW_LINE: 'unix',
     EMAIL_SENDMAIL_PATH: '/usr/sbin/sendmail',
     TELEMETRY: true,
     ASSETS_CACHE_TTL: '30d',
-    ASSETS_TRANSFORM_MAX_CONCURRENT: 1,
+    ASSETS_TRANSFORM_MAX_CONCURRENT: 25,
     ASSETS_TRANSFORM_IMAGE_MAX_DIMENSION: 6000,
     ASSETS_TRANSFORM_MAX_OPERATIONS: 5,
+    ASSETS_TRANSFORM_TIMEOUT: '7500ms',
     ASSETS_INVALID_IMAGE_SENSITIVITY_LEVEL: 'warning',
     IP_TRUST_PROXY: true,
     IP_CUSTOM_HEADER: false,
-    IMPORT_IP_DENY_LIST: '0.0.0.0',
+    IMPORT_IP_DENY_LIST: ['0.0.0.0', '169.254.169.254'],
     SERVE_APP: true,
     RELATIONAL_BATCH_SIZE: 25000,
     EXPORT_BATCH_SIZE: 5000,
@@ -261,6 +275,7 @@ const typeMap = {
     DB_DATABASE: 'string',
     DB_PORT: 'number',
     DB_EXCLUDE_TABLES: 'array',
+    CACHE_SKIP_ALLOWED: 'boolean',
     IMPORT_IP_DENY_LIST: 'array',
     FILE_METADATA_ALLOW_LIST: 'array',
     GRAPHQL_INTROSPECTION: 'boolean',

package/dist/exceptions/database/dialects/mssql.d.ts

@@ -1,2 +1,2 @@
-import { MSSQLError } from './types';
+import type { MSSQLError } from './types';
 export declare function extractError(error: MSSQLError): Promise<MSSQLError | Error>;

package/dist/exceptions/database/dialects/mssql.js

@@ -48,15 +48,14 @@ async function uniqueViolation(error) {
      * While it's not ideal, the best next thing we can do is extract the column name from
      * information_schema when this happens
      */
-    var _a, _b, _c;
     const betweenQuotes = /'([^']+)'/g;
     const betweenParens = /\(([^)]+)\)/g;
     const quoteMatches = error.message.match(betweenQuotes);
     const parenMatches = error.message.match(betweenParens);
     if (!quoteMatches || !parenMatches)
         return error;
-    const keyName = (_a = quoteMatches[1]) === null || _a === void 0 ? void 0 : _a.slice(1, -1);
-    let collection = (_b = quoteMatches[0]) === null || _b === void 0 ? void 0 : _b.slice(1, -1);
+    const keyName = quoteMatches[1]?.slice(1, -1);
+    let collection = quoteMatches[0]?.slice(1, -1);
     let field = null;
     if (keyName) {
         const database = (0, database_1.default)();
@@ -75,10 +74,10 @@ async function uniqueViolation(error) {
         })
             .where('sys.indexes.name', '=', keyName)
             .first();
-        collection = constraintUsage === null || constraintUsage === void 0 ? void 0 : constraintUsage.collection;
-        field = constraintUsage === null || constraintUsage === void 0 ? void 0 : constraintUsage.field;
+        collection = constraintUsage?.collection;
+        field = constraintUsage?.field;
     }
-    const invalid = (_c = parenMatches[parenMatches.length - 1]) === null || _c === void 0 ? void 0 : _c.slice(1, -1);
+    const invalid = parenMatches[parenMatches.length - 1]?.slice(1, -1);
     return new record_not_unique_1.RecordNotUniqueException(field, {
         collection,
         field,

package/dist/exceptions/database/dialects/mysql.d.ts

@@ -1,2 +1,2 @@
-import { MySQLError } from './types';
+import type { MySQLError } from './types';
 export declare function extractError(error: MySQLError): MySQLError | Error;

package/dist/exceptions/database/dialects/mysql.js

@@ -38,7 +38,6 @@ function extractError(error) {
 }
 exports.extractError = extractError;
 function uniqueViolation(error) {
-    var _a, _b, _c, _d, _e;
     const betweenQuotes = /'([^']+)'/g;
     const matches = error.sqlMessage.match(betweenQuotes);
     if (!matches)
@@ -50,13 +49,13 @@ function uniqueViolation(error) {
      */
     /** MySQL 8+ style error message */
     if (matches[1].includes('.')) {
-        const collection = (_a = matches[1]) === null || _a === void 0 ? void 0 : _a.slice(1, -1).split('.')[0];
+        const collection = matches[1]?.slice(1, -1).split('.')[0];
         let field = null;
-        const indexName = (_b = matches[1]) === null || _b === void 0 ? void 0 : _b.slice(1, -1).split('.')[1];
-        if ((indexName === null || indexName === void 0 ? void 0 : indexName.startsWith(`${collection}_`)) && indexName.endsWith('_unique')) {
-            field = indexName === null || indexName === void 0 ? void 0 : indexName.slice(collection.length + 1, -7);
+        const indexName = matches[1]?.slice(1, -1).split('.')[1];
+        if (indexName?.startsWith(`${collection}_`) && indexName.endsWith('_unique')) {
+            field = indexName?.slice(collection.length + 1, -7);
         }
-        const invalid = (_c = matches[0]) === null || _c === void 0 ? void 0 : _c.slice(1, -1);
+        const invalid = matches[0]?.slice(1, -1);
         return new record_not_unique_1.RecordNotUniqueException(field, {
             collection,
             field,
@@ -65,13 +64,13 @@ function uniqueViolation(error) {
     }
     else {
         /** MySQL 5.7 style error message */
-        const indexName = (_d = matches[1]) === null || _d === void 0 ? void 0 : _d.slice(1, -1);
+        const indexName = matches[1]?.slice(1, -1);
         const collection = indexName.split('_')[0];
         let field = null;
-        if ((indexName === null || indexName === void 0 ? void 0 : indexName.startsWith(`${collection}_`)) && indexName.endsWith('_unique')) {
-            field = indexName === null || indexName === void 0 ? void 0 : indexName.slice(collection.length + 1, -7);
+        if (indexName?.startsWith(`${collection}_`) && indexName.endsWith('_unique')) {
+            field = indexName?.slice(collection.length + 1, -7);
         }
-        const invalid = (_e = matches[0]) === null || _e === void 0 ? void 0 : _e.slice(1, -1);
+        const invalid = matches[0]?.slice(1, -1);
         return new record_not_unique_1.RecordNotUniqueException(field, {
             collection,
             field,
@@ -80,61 +79,57 @@ function uniqueViolation(error) {
     }
 }
 function numericValueOutOfRange(error) {
-    var _a, _b;
     const betweenTicks = /`([^`]+)`/g;
     const betweenQuotes = /'([^']+)'/g;
     const tickMatches = error.sql.match(betweenTicks);
     const quoteMatches = error.sqlMessage.match(betweenQuotes);
     if (!tickMatches || !quoteMatches)
         return error;
-    const collection = (_a = tickMatches[0]) === null || _a === void 0 ? void 0 : _a.slice(1, -1);
-    const field = (_b = quoteMatches[0]) === null || _b === void 0 ? void 0 : _b.slice(1, -1);
+    const collection = tickMatches[0]?.slice(1, -1);
+    const field = quoteMatches[0]?.slice(1, -1);
     return new value_out_of_range_1.ValueOutOfRangeException(field, {
         collection,
         field,
     });
 }
 function valueLimitViolation(error) {
-    var _a, _b;
     const betweenTicks = /`([^`]+)`/g;
     const betweenQuotes = /'([^']+)'/g;
     const tickMatches = error.sql.match(betweenTicks);
     const quoteMatches = error.sqlMessage.match(betweenQuotes);
     if (!tickMatches || !quoteMatches)
         return error;
-    const collection = (_a = tickMatches[0]) === null || _a === void 0 ? void 0 : _a.slice(1, -1);
-    const field = (_b = quoteMatches[0]) === null || _b === void 0 ? void 0 : _b.slice(1, -1);
+    const collection = tickMatches[0]?.slice(1, -1);
+    const field = quoteMatches[0]?.slice(1, -1);
     return new value_too_long_1.ValueTooLongException(field, {
         collection,
         field,
     });
 }
 function notNullViolation(error) {
-    var _a, _b;
     const betweenTicks = /`([^`]+)`/g;
     const betweenQuotes = /'([^']+)'/g;
     const tickMatches = error.sql.match(betweenTicks);
     const quoteMatches = error.sqlMessage.match(betweenQuotes);
     if (!tickMatches || !quoteMatches)
         return error;
-    const collection = (_a = tickMatches[0]) === null || _a === void 0 ? void 0 : _a.slice(1, -1);
-    const field = (_b = quoteMatches[0]) === null || _b === void 0 ? void 0 : _b.slice(1, -1);
+    const collection = tickMatches[0]?.slice(1, -1);
+    const field = quoteMatches[0]?.slice(1, -1);
     return new not_null_violation_1.NotNullViolationException(field, {
         collection,
         field,
     });
 }
 function foreignKeyViolation(error) {
-    var _a, _b, _c;
     const betweenTicks = /`([^`]+)`/g;
     const betweenParens = /\(([^)]+)\)/g;
     const tickMatches = error.sqlMessage.match(betweenTicks);
     const parenMatches = error.sql.match(betweenParens);
     if (!tickMatches || !parenMatches)
         return error;
-    const collection = (_a = tickMatches[1]) === null || _a === void 0 ? void 0 : _a.slice(1, -1);
-    const field = (_b = tickMatches[3]) === null || _b === void 0 ? void 0 : _b.slice(1, -1);
-    const invalid = (_c = parenMatches[1]) === null || _c === void 0 ? void 0 : _c.slice(1, -1);
+    const collection = tickMatches[1]?.slice(1, -1);
+    const field = tickMatches[3]?.slice(1, -1);
+    const invalid = parenMatches[1]?.slice(1, -1);
     return new invalid_foreign_key_1.InvalidForeignKeyException(field, {
         collection,
         field,
@@ -142,13 +137,12 @@ function foreignKeyViolation(error) {
     });
 }
 function containsNullValues(error) {
-    var _a;
     const betweenTicks = /`([^`]+)`/g;
     // Normally, we shouldn't read from the executed SQL. In this case, we're altering a single
     // column, so we shouldn't have the problem where multiple columns are altered at the same time
     const tickMatches = error.sql.match(betweenTicks);
     if (!tickMatches)
         return error;
-    const field = (_a = tickMatches[1]) === null || _a === void 0 ? void 0 : _a.slice(1, -1);
+    const field = tickMatches[1]?.slice(1, -1);
     return new contains_null_values_1.ContainsNullValuesException(field);
 }

package/dist/exceptions/database/dialects/oracle.d.ts

@@ -1,2 +1,2 @@
-import { OracleError } from './types';
+import type { OracleError } from './types';
 export declare function extractError(error: OracleError): OracleError | Error;

package/dist/exceptions/database/dialects/postgres.d.ts

@@ -1,2 +1,2 @@
-import { PostgresError } from './types';
+import type { PostgresError } from './types';
 export declare function extractError(error: PostgresError): PostgresError | Error;

package/dist/exceptions/database/dialects/sqlite.d.ts

@@ -1,2 +1,2 @@
-import { SQLiteError } from './types';
+import type { SQLiteError } from './types';
 export declare function extractError(error: SQLiteError): SQLiteError | Error;

package/dist/exceptions/database/translate.d.ts

@@ -1,4 +1,4 @@
-import { SQLError } from './dialects/types';
+import type { SQLError } from './dialects/types';
 /**
  * Translates an error thrown by any of the databases into a pre-defined Exception. Currently
  * supports:

package/dist/exceptions/database/value-out-of-range.js

@@ -5,7 +5,7 @@ const exceptions_1 = require("@directus/shared/exceptions");
 class ValueOutOfRangeException extends exceptions_1.BaseException {
     constructor(field, exceptions) {
         if (field) {
-            super(`Numeric value in field "${field !== null && field !== void 0 ? field : ''}" is out of range.`, 400, 'VALUE_OUT_OF_RANGE', exceptions);
+            super(`Numeric value in field "${field ?? ''}" is out of range.`, 400, 'VALUE_OUT_OF_RANGE', exceptions);
         }
         else {
             super(`Numeric value is out of range.`, 400, 'VALUE_OUT_OF_RANGE', exceptions);

package/dist/exceptions/range-not-satisfiable.js

@@ -4,9 +4,8 @@ exports.RangeNotSatisfiableException = void 0;
 const exceptions_1 = require("@directus/shared/exceptions");
 class RangeNotSatisfiableException extends exceptions_1.BaseException {
     constructor(range) {
-        var _a, _b;
-        const rangeString = range && ((range === null || range === void 0 ? void 0 : range.start) !== undefined || (range === null || range === void 0 ? void 0 : range.end) !== undefined)
-            ? `"${(_a = range.start) !== null && _a !== void 0 ? _a : ''}-${(_b = range.end) !== null && _b !== void 0 ? _b : ''}" `
+        const rangeString = range && (range?.start !== undefined || range?.end !== undefined)
+            ? `"${range.start ?? ''}-${range.end ?? ''}" `
             : '';
         super(`Range ${rangeString}is invalid or the file's size doesn't match the requested range.`, 416, 'RANGE_NOT_SATISFIABLE');
     }

package/dist/extensions.d.ts

@@ -1,4 +1,4 @@
-import { Extension, ExtensionInfo, ExtensionType } from '@directus/shared/types';
+import type { Extension, ExtensionInfo, ExtensionType } from '@directus/shared/types';
 import { Router } from 'express';
 export declare function getExtensionManager(): ExtensionManager;
 type Options = {

package/dist/extensions.js

@@ -29,28 +29,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getExtensionManager = void 0;
 const constants_1 = require("@directus/shared/constants");
 const sharedExceptions = __importStar(require("@directus/shared/exceptions"));
-const node_1 = require("@directus/shared/utils/node");
-const express_1 = __importStar(require("express"));
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const path_1 = __importDefault(require("path"));
-const database_1 = __importDefault(require("./database"));
-const emitter_1 = __importStar(require("./emitter"));
-const env_1 = __importDefault(require("./env"));
-const exceptions = __importStar(require("./exceptions"));
-const logger_1 = __importDefault(require("./logger"));
-const dynamic_import_1 = require("./utils/dynamic-import");
-const get_schema_1 = require("./utils/get-schema");
 const utils_1 = require("@directus/shared/utils");
+const node_1 = require("@directus/shared/utils/node");
 const plugin_alias_1 = __importDefault(require("@rollup/plugin-alias"));
 const plugin_virtual_1 = __importDefault(require("@rollup/plugin-virtual"));
 const chokidar_1 = __importDefault(require("chokidar"));
+const express_1 = __importStar(require("express"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
 const globby_1 = __importDefault(require("globby"));
 const lodash_1 = require("lodash");
 const node_cron_1 = require("node-cron");
+const path_1 = __importDefault(require("path"));
 const rollup_1 = require("rollup");
+const database_1 = __importDefault(require("./database"));
+const emitter_1 = __importStar(require("./emitter"));
+const env_1 = __importDefault(require("./env"));
+const exceptions = __importStar(require("./exceptions"));
 const flows_1 = require("./flows");
+const logger_1 = __importDefault(require("./logger"));
 const services = __importStar(require("./services"));
+const dynamic_import_1 = require("./utils/dynamic-import");
 const get_module_default_1 = __importDefault(require("./utils/get-module-default"));
+const get_schema_1 = require("./utils/get-schema");
 const job_queue_1 = require("./utils/job-queue");
 const url_1 = require("./utils/url");
 let extensionManager;
@@ -67,15 +67,19 @@ const defaultOptions = {
     watch: env_1.default.EXTENSIONS_AUTO_RELOAD && env_1.default.NODE_ENV !== 'development',
 };
 class ExtensionManager {
+    isLoaded = false;
+    options;
+    extensions = [];
+    appExtensions = null;
+    apiExtensions = [];
+    apiEmitter;
+    hookEvents = [];
+    endpointRouter;
+    hookEmbedsHead = [];
+    hookEmbedsBody = [];
+    reloadQueue;
+    watcher = null;
     constructor() {
-        this.isLoaded = false;
-        this.extensions = [];
-        this.appExtensions = null;
-        this.apiExtensions = [];
-        this.hookEvents = [];
-        this.hookEmbedsHead = [];
-        this.hookEmbedsBody = [];
-        this.watcher = null;
         this.options = defaultOptions;
         this.apiEmitter = new emitter_1.Emitter();
         this.endpointRouter = (0, express_1.Router)();
@@ -140,17 +144,23 @@ class ExtensionManager {
                 name: extension.name,
                 type: extension.type,
                 local: extension.local,
-                host: extension.host,
-                version: extension.version,
+                entries: [],
             };
+            if (extension.host)
+                extensionInfo.host = extension.host;
+            if (extension.version)
+                extensionInfo.version = extension.version;
             if (extension.type === 'bundle') {
-                return {
-                    ...extensionInfo,
+                const bundleExtensionInfo = {
+                    name: extensionInfo.name,
+                    type: 'bundle',
+                    local: extensionInfo.local,
                     entries: extension.entries.map((entry) => ({
                         name: entry.name,
                         type: entry.type,
                     })),
                 };
+                return bundleExtensionInfo;
             }
             else {
                 return extensionInfo;
@@ -246,7 +256,7 @@ class ExtensionManager {
         }
     }
     async getExtensions() {
-        const packageExtensions = await (0, node_1.getPackageExtensions)('.');
+        const packageExtensions = await (0, node_1.getPackageExtensions)(env_1.default.PACKAGE_FILE_LOCATION);
         const localPackageExtensions = await (0, node_1.resolvePackageExtensions)(env_1.default.EXTENSIONS_PATH);
         const localExtensions = await (0, node_1.getLocalExtensions)(env_1.default.EXTENSIONS_PATH);
         return [...packageExtensions, ...localPackageExtensions, ...localExtensions].filter((extension) => env_1.default.SERVE_APP || constants_1.APP_EXTENSION_TYPES.includes(extension.type) === false);

package/dist/flows.js

@@ -47,6 +47,7 @@ const revisions_1 = require("./services/revisions");
 const construct_flow_tree_1 = require("./utils/construct-flow-tree");
 const get_schema_1 = require("./utils/get-schema");
 const job_queue_1 = require("./utils/job-queue");
+const map_values_deep_1 = require("./utils/map-values-deep");
 let flowManager;
 const redactLogs = (0, fast_redact_1.default)({
     censor: '--redacted--',
@@ -66,12 +67,13 @@ const ACCOUNTABILITY_KEY = '$accountability';
 const LAST_KEY = '$last';
 const ENV_KEY = '$env';
 class FlowManager {
+    isLoaded = false;
+    operations = {};
+    triggerHandlers = [];
+    operationFlowHandlers = {};
+    webhookFlowHandlers = {};
+    reloadQueue;
     constructor() {
-        this.isLoaded = false;
-        this.operations = {};
-        this.triggerHandlers = [];
-        this.operationFlowHandlers = {};
-        this.webhookFlowHandlers = {};
         this.reloadQueue = new job_queue_1.JobQueue();
         const messenger = (0, messenger_1.getMessenger)();
         messenger.subscribe('flows', (event) => {
@@ -120,7 +122,6 @@ class FlowManager {
         return handler(data, context);
     }
     async load() {
-        var _a, _b, _c, _d;
         const flowsService = new services_1.FlowsService({ knex: (0, database_1.default)(), schema: await (0, get_schema_1.getSchema)() });
         const flows = await flowsService.readByQuery({
             filter: { status: { _eq: 'active' } },
@@ -130,23 +131,25 @@ class FlowManager {
         const flowTrees = flows.map((flow) => (0, construct_flow_tree_1.constructFlowTree)(flow));
         for (const flow of flowTrees) {
             if (flow.trigger === 'event') {
-                const events = ((_a = flow.options) === null || _a === void 0 ? void 0 : _a.scope)
-                    ? (0, utils_1.toArray)(flow.options.scope)
+                let events = [];
+                if (flow.options?.scope) {
+                    events = (0, utils_1.toArray)(flow.options.scope)
                         .map((scope) => {
-                        var _a, _b, _c;
                         if (['items.create', 'items.update', 'items.delete'].includes(scope)) {
-                            return ((_c = (_b = (_a = flow.options) === null || _a === void 0 ? void 0 : _a.collections) === null || _b === void 0 ? void 0 : _b.map((collection) => {
+                            if (!flow.options?.collections)
+                                return [];
+                            return (0, utils_1.toArray)(flow.options.collections).map((collection) => {
                                 if (collection.startsWith('directus_')) {
                                     const action = scope.split('.')[1];
                                     return collection.substring(9) + '.' + action;
                                 }
                                 return `${collection}.${scope}`;
-                            })) !== null && _c !== void 0 ? _c : []);
+                            });
                         }
                         return scope;
                     })
-                        .flat()
-                    : [];
+                        .flat();
+                }
                 if (flow.options.type === 'filter') {
                     const handler = (payload, meta, context) => this.executeFlow(flow, { payload, ...meta }, {
                         accountability: context.accountability,
@@ -201,16 +204,15 @@ class FlowManager {
                         return this.executeFlow(flow, data, context);
                     }
                 };
-                const method = (_c = (_b = flow.options) === null || _b === void 0 ? void 0 : _b.method) !== null && _c !== void 0 ? _c : 'GET';
+                const method = flow.options?.method ?? 'GET';
                 // Default return to $last for webhooks
-                flow.options.return = (_d = flow.options.return) !== null && _d !== void 0 ? _d : '$last';
+                flow.options.return = flow.options.return ?? '$last';
                 this.webhookFlowHandlers[`${method}-${flow.id}`] = handler;
             }
             else if (flow.trigger === 'manual') {
                 const handler = (data, context) => {
-                    var _a, _b;
-                    const enabledCollections = (_b = (_a = flow.options) === null || _a === void 0 ? void 0 : _a.collections) !== null && _b !== void 0 ? _b : [];
-                    const targetCollection = data === null || data === void 0 ? void 0 : data.body.collection;
+                    const enabledCollections = flow.options?.collections ?? [];
+                    const targetCollection = data?.body.collection;
                     if (!targetCollection) {
                         logger_1.default.warn(`Manual trigger requires "collection" to be specified in the payload`);
                         throw new exceptions.ForbiddenException();
@@ -259,13 +261,12 @@ class FlowManager {
         this.isLoaded = false;
     }
     async executeFlow(flow, data = null, context = {}) {
-        var _a, _b, _c, _d, _e, _f, _g;
-        const database = (_a = context.database) !== null && _a !== void 0 ? _a : (0, database_1.default)();
-        const schema = (_b = context.schema) !== null && _b !== void 0 ? _b : (await (0, get_schema_1.getSchema)({ database }));
+        const database = context.database ?? (0, database_1.default)();
+        const schema = context.schema ?? (await (0, get_schema_1.getSchema)({ database }));
         const keyedData = {
             [TRIGGER_KEY]: data,
             [LAST_KEY]: data,
-            [ACCOUNTABILITY_KEY]: (_c = context === null || context === void 0 ? void 0 : context.accountability) !== null && _c !== void 0 ? _c : null,
+            [ACCOUNTABILITY_KEY]: context?.accountability ?? null,
             [ENV_KEY]: (0, lodash_1.pick)(env_1.default, env_1.default.FLOWS_ENV_ALLOW_LIST ? (0, utils_1.toArray)(env_1.default.FLOWS_ENV_ALLOW_LIST) : []),
         };
         let nextOperation = flow.operation;
@@ -284,14 +285,14 @@ class FlowManager {
                 knex: database,
                 schema: schema,
             });
-            const accountability = context === null || context === void 0 ? void 0 : context.accountability;
+            const accountability = context?.accountability;
             const activity = await activityService.createOne({
                 action: types_1.Action.RUN,
-                user: (_d = accountability === null || accountability === void 0 ? void 0 : accountability.user) !== null && _d !== void 0 ? _d : null,
+                user: accountability?.user ?? null,
                 collection: 'directus_flows',
-                ip: (_e = accountability === null || accountability === void 0 ? void 0 : accountability.ip) !== null && _e !== void 0 ? _e : null,
-                user_agent: (_f = accountability === null || accountability === void 0 ? void 0 : accountability.userAgent) !== null && _f !== void 0 ? _f : null,
-                origin: (_g = accountability === null || accountability === void 0 ? void 0 : accountability.origin) !== null && _g !== void 0 ? _g : null,
+                ip: accountability?.ip ?? null,
+                user_agent: accountability?.userAgent ?? null,
+                origin: accountability?.origin ?? null,
                 item: flow.id,
             });
             if (flow.accountability === 'all') {
@@ -329,7 +330,7 @@ class FlowManager {
         const handler = this.operations[operation.type];
         const options = (0, utils_1.applyOptionsData)(operation.options, keyedData);
         try {
-            const result = await handler(options, {
+            let result = await handler(options, {
                 services,
                 exceptions: { ...exceptions, ...sharedExceptions },
                 env: env_1.default,
@@ -340,10 +341,35 @@ class FlowManager {
                 accountability: null,
                 ...context,
             });
-            return { successor: operation.resolve, status: 'resolve', data: result !== null && result !== void 0 ? result : null, options };
+            // Validate that the operations result is serializable and thus catching the error inside the flow execution
+            JSON.stringify(result ?? null);
+            // JSON structures don't allow for undefined values, so we need to replace them with null
+            // Otherwise the applyOptionsData function will not work correctly on the next operation
+            if (typeof result === 'object' && result !== null) {
+                result = (0, map_values_deep_1.mapValuesDeep)(result, (_, value) => (value === undefined ? null : value));
+            }
+            return { successor: operation.resolve, status: 'resolve', data: result ?? null, options };
         }
         catch (error) {
-            return { successor: operation.reject, status: 'reject', data: error !== null && error !== void 0 ? error : null, options };
+            let data;
+            if (error instanceof Error) {
+                // If the error is instance of Error, use the message of it as the error data
+                data = { message: error.message };
+            }
+            else if (typeof error === 'string') {
+                // If the error is a JSON string, parse it and use that as the error data
+                data = (0, utils_1.isValidJSON)(error) ? (0, utils_1.parseJSON)(error) : error;
+            }
+            else {
+                // If error is plain object, use this as the error data and otherwise fallback to null
+                data = error ?? null;
+            }
+            return {
+                successor: operation.reject,
+                status: 'reject',
+                data,
+                options,
+            };
         }
     }
 }

package/dist/logger.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="qs" />
-import { RequestHandler } from 'express';
 import { LoggerOptions } from 'pino';
+import type { RequestHandler } from 'express';
 declare const logger: import("pino").Logger<LoggerOptions & Record<string, any>>;
 export declare const expressLogger: RequestHandler<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
 export default logger;