directus 9.12.0 → 9.13.0

package/dist/database/migrations/20210805B-change-image-metadata-structure.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.down = exports.up = void 0;
-const parse_json_1 = require("../../utils/parse-json");
+const utils_1 = require("@directus/shared/utils");
 // Change image metadata structure to match the output from 'exifr'
 async function up(knex) {
     const files = await knex
@@ -11,7 +11,7 @@ async function up(knex) {
     for (const { id, metadata } of files) {
         let prevMetadata;
         try {
-            prevMetadata = (0, parse_json_1.parseJSON)(metadata);
+            prevMetadata = (0, utils_1.parseJSON)(metadata);
         }
         catch {
             continue;
@@ -55,7 +55,7 @@ async function down(knex) {
         .whereNotNull('metadata')
         .whereNot('metadata', '{}');
     for (const { id, metadata } of files) {
-        const prevMetadata = (0, parse_json_1.parseJSON)(metadata);
+        const prevMetadata = (0, utils_1.parseJSON)(metadata);
         // Update only required if metadata has keys other than 'icc' and 'iptc'
         if (Object.keys(prevMetadata).filter((key) => key !== 'icc' && key !== 'iptc').length > 0) {
             // Put all data under 'exif' and rename/move keys afterwards

package/dist/database/migrations/20211007A-update-presets.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.down = exports.up = void 0;
+const utils_1 = require("@directus/shared/utils");
 const nanoid_1 = require("nanoid");
-const parse_json_1 = require("../../utils/parse-json");
 async function up(knex) {
     var _a;
     await knex.schema.alterTable('directus_presets', (table) => {
@@ -13,7 +13,7 @@ async function up(knex) {
         .from('directus_presets');
     for (const preset of presets) {
         if (preset.filters) {
-            const oldFilters = (_a = (typeof preset.filters === 'string' ? (0, parse_json_1.parseJSON)(preset.filters) : preset.filters)) !== null && _a !== void 0 ? _a : [];
+            const oldFilters = (_a = (typeof preset.filters === 'string' ? (0, utils_1.parseJSON)(preset.filters) : preset.filters)) !== null && _a !== void 0 ? _a : [];
             if (oldFilters.length === 0)
                 continue;
             const newFilter = {
@@ -35,7 +35,7 @@ async function up(knex) {
             }
         }
         if (preset.layout_query) {
-            const layoutQuery = typeof preset.layout_query === 'string' ? (0, parse_json_1.parseJSON)(preset.layout_query) : preset.layout_query;
+            const layoutQuery = typeof preset.layout_query === 'string' ? (0, utils_1.parseJSON)(preset.layout_query) : preset.layout_query;
             for (const [layout, query] of Object.entries(layoutQuery)) {
                 if (query.sort) {
                     query.sort = [query.sort];
@@ -62,7 +62,7 @@ async function down(knex) {
         .from('directus_presets');
     for (const preset of presets) {
         if (preset.filter) {
-            const newFilter = (_a = (typeof preset.filter === 'string' ? (0, parse_json_1.parseJSON)(preset.filter) : preset.filter)) !== null && _a !== void 0 ? _a : {};
+            const newFilter = (_a = (typeof preset.filter === 'string' ? (0, utils_1.parseJSON)(preset.filter) : preset.filter)) !== null && _a !== void 0 ? _a : {};
             if (Object.keys(newFilter).length === 0)
                 continue;
             const oldFilters = [];
@@ -86,7 +86,7 @@ async function down(knex) {
             }
         }
         if (preset.layout_query) {
-            const layoutQuery = typeof preset.layout_query === 'string' ? (0, parse_json_1.parseJSON)(preset.layout_query) : preset.layout_query;
+            const layoutQuery = typeof preset.layout_query === 'string' ? (0, utils_1.parseJSON)(preset.layout_query) : preset.layout_query;
             for (const [layout, query] of Object.entries(layoutQuery)) {
                 if (query.sort && Array.isArray(query.sort)) {
                     query.sort = (_l = (_k = query.sort) === null || _k === void 0 ? void 0 : _k[0]) !== null && _l !== void 0 ? _l : null;

package/dist/database/migrations/20220429A-add-flows.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.down = exports.up = void 0;
 const utils_1 = require("@directus/shared/utils");
 const uuid_1 = require("uuid");
-const parse_json_1 = require("../../utils/parse-json");
 async function up(knex) {
     await knex.schema.createTable('directus_flows', (table) => {
         table.uuid('id').primary().notNullable();
@@ -59,7 +58,7 @@ async function up(knex) {
             position_y: 1,
             options: JSON.stringify({
                 url: webhook.url,
-                headers: typeof webhook.headers === 'string' ? (0, parse_json_1.parseJSON)(webhook.headers) : webhook.headers,
+                headers: typeof webhook.headers === 'string' ? (0, utils_1.parseJSON)(webhook.headers) : webhook.headers,
                 data: webhook.data ? '{{$trigger}}' : null,
                 method: webhook.method,
             }),

package/dist/database/migrations/20220614A-rename-hook-trigger-to-event.d.ts

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

package/dist/database/migrations/20220614A-rename-hook-trigger-to-event.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.down = exports.up = void 0;
+async function up(knex) {
+    await knex('directus_flows').update({ trigger: 'event' }).where('trigger', '=', 'hook');
+}
+exports.up = up;
+async function down(knex) {
+    await knex('directus_flows').update({ trigger: 'hook' }).where('trigger', '=', 'event');
+}
+exports.down = down;

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

@@ -14,3 +14,4 @@ fields:
   - field: user_created
     special: user-created
   - field: note
+  - field: color

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

@@ -6,7 +6,7 @@ fields:
   - field: name
   - field: icon
   - field: color
-  - field: note
+  - field: description
   - field: status
   - field: trigger
   - field: accountability

package/dist/env.d.ts

@@ -1,6 +1,6 @@
 /**
  * @NOTE
- * For all possible keys, see: https://docs.directus.io/configuration/config-options/
+ * For all possible keys, see: https://docs.directus.io/self-hosted/config-options/
  */
 declare let env: Record<string, any>;
 export default env;

package/dist/env.js

@@ -1,7 +1,7 @@
 "use strict";
 /**
  * @NOTE
- * For all possible keys, see: https://docs.directus.io/configuration/config-options/
+ * For all possible keys, see: https://docs.directus.io/self-hosted/config-options/
  */
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
@@ -14,7 +14,7 @@ const lodash_1 = require("lodash");
 const path_1 = __importDefault(require("path"));
 const require_yaml_1 = require("./utils/require-yaml");
 const utils_1 = require("@directus/shared/utils");
-const parse_json_1 = require("./utils/parse-json");
+const utils_2 = require("@directus/shared/utils");
 // keeping this here for now to prevent a circular import to constants.ts
 const allowedEnvironmentVars = [
     // general
@@ -78,6 +78,7 @@ const allowedEnvironmentVars = [
     'CACHE_REDIS_PORT',
     'CACHE_REDIS_PASSWORD',
     'CACHE_MEMCACHE',
+    'CACHE_VALUE_MAX_SIZE',
     // storage
     'STORAGE_LOCATIONS',
     'STORAGE_.+_DRIVER',
@@ -140,6 +141,7 @@ const allowedEnvironmentVars = [
     // emails
     'EMAIL_FROM',
     'EMAIL_TRANSPORT',
+    'EMAIL_VERIFY_SETUP',
     'EMAIL_SENDMAIL_NEW_LINE',
     'EMAIL_SENDMAIL_PATH',
     'EMAIL_SMTP_HOST',
@@ -171,6 +173,7 @@ const defaults = {
     PORT: 8055,
     PUBLIC_URL: '/',
     MAX_PAYLOAD_SIZE: '100kb',
+    MAX_RELATIONAL_DEPTH: 10,
     DB_EXCLUDE_TABLES: 'spatial_ref_sys,sysdiagrams',
     STORAGE_LOCATIONS: 'local',
     STORAGE_LOCAL_DRIVER: 'local',
@@ -200,11 +203,13 @@ const defaults = {
     CACHE_CONTROL_S_MAXAGE: '0',
     CACHE_SCHEMA: true,
     CACHE_PERMISSIONS: true,
+    CACHE_VALUE_MAX_SIZE: false,
     AUTH_PROVIDERS: '',
     AUTH_DISABLE_DEFAULT: false,
     EXTENSIONS_PATH: './extensions',
     EXTENSIONS_AUTO_RELOAD: false,
     EMAIL_FROM: 'no-reply@directus.io',
+    EMAIL_VERIFY_SETUP: true,
     EMAIL_TRANSPORT: 'sendmail',
     EMAIL_SENDMAIL_NEW_LINE: 'unix',
     EMAIL_SENDMAIL_PATH: '/usr/sbin/sendmail',
@@ -407,7 +412,7 @@ function processValues(env) {
 }
 function tryJSON(value) {
     try {
-        return (0, parse_json_1.parseJSON)(value);
+        return (0, utils_2.parseJSON)(value);
     }
     catch {
         return value;

package/dist/exceptions/database/translate.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

package/dist/exceptions/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

package/dist/extensions.d.ts

@@ -13,10 +13,11 @@ declare class ExtensionManager {
     private apiExtensions;
     private apiEmitter;
     private endpointRouter;
+    private reloadQueue;
     private watcher;
     constructor();
     initialize(options?: Partial<Options>): Promise<void>;
-    reload(): Promise<void>;
+    reload(): void;
     getExtensionsList(type?: ExtensionType): string[];
     getAppExtensions(type: AppExtensionType): string | undefined;
     getEndpointRouter(): Router;

package/dist/extensions.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];
@@ -47,6 +51,7 @@ const chokidar_1 = __importDefault(require("chokidar"));
 const utils_1 = require("@directus/shared/utils");
 const flows_1 = require("./flows");
 const globby_1 = __importDefault(require("globby"));
+const job_queue_1 = require("./utils/job-queue");
 let extensionManager;
 function getExtensionManager() {
     if (extensionManager) {
@@ -70,6 +75,7 @@ class ExtensionManager {
         this.options = defaultOptions;
         this.apiEmitter = new emitter_1.Emitter();
         this.endpointRouter = (0, express_1.Router)();
+        this.reloadQueue = new job_queue_1.JobQueue();
     }
     async initialize(options = {}) {
         this.options = {
@@ -86,27 +92,29 @@ class ExtensionManager {
             }
         }
     }
-    async reload() {
-        if (this.isLoaded) {
-            logger_1.default.info('Reloading extensions');
-            const prevExtensions = (0, lodash_1.clone)(this.extensions);
-            await this.unload();
-            await this.load();
-            const added = this.extensions.filter((extension) => !prevExtensions.some((prevExtension) => extension.path === prevExtension.path));
-            const removed = prevExtensions.filter((prevExtension) => !this.extensions.some((extension) => prevExtension.path === extension.path));
-            this.updateWatchedExtensions(added, removed);
-            const addedExtensions = added.map((extension) => extension.name);
-            const removedExtensions = removed.map((extension) => extension.name);
-            if (addedExtensions.length > 0) {
-                logger_1.default.info(`Added extensions: ${addedExtensions.join(', ')}`);
+    reload() {
+        this.reloadQueue.enqueue(async () => {
+            if (this.isLoaded) {
+                logger_1.default.info('Reloading extensions');
+                const prevExtensions = (0, lodash_1.clone)(this.extensions);
+                await this.unload();
+                await this.load();
+                const added = this.extensions.filter((extension) => !prevExtensions.some((prevExtension) => extension.path === prevExtension.path));
+                const removed = prevExtensions.filter((prevExtension) => !this.extensions.some((extension) => prevExtension.path === extension.path));
+                this.updateWatchedExtensions(added, removed);
+                const addedExtensions = added.map((extension) => extension.name);
+                const removedExtensions = removed.map((extension) => extension.name);
+                if (addedExtensions.length > 0) {
+                    logger_1.default.info(`Added extensions: ${addedExtensions.join(', ')}`);
+                }
+                if (removedExtensions.length > 0) {
+                    logger_1.default.info(`Removed extensions: ${removedExtensions.join(', ')}`);
+                }
             }
-            if (removedExtensions.length > 0) {
-                logger_1.default.info(`Removed extensions: ${removedExtensions.join(', ')}`);
+            else {
+                logger_1.default.warn('Extensions have to be loaded before they can be reloaded');
             }
-        }
-        else {
-            logger_1.default.warn('Extensions have to be loaded before they can be reloaded');
-        }
+        });
     }
     getExtensionsList(type) {
         if (type === undefined) {
@@ -255,7 +263,7 @@ class ExtensionManager {
                 const endpointPath = path_1.default.resolve(endpoint.path, endpoint.entrypoint);
                 const endpointInstance = require(endpointPath);
                 const config = (0, get_module_default_1.default)(endpointInstance);
-                this.registerEndpoint(config, endpointPath, this.endpointRouter);
+                this.registerEndpoint(config, endpointPath, endpoint.name, this.endpointRouter);
             }
             catch (error) {
                 logger_1.default.warn(`Couldn't register endpoint "${endpoint.name}"`);
@@ -350,9 +358,9 @@ class ExtensionManager {
         });
         this.apiExtensions.hooks.push(hookHandler);
     }
-    registerEndpoint(config, path, router) {
+    registerEndpoint(config, path, name, router) {
         const register = typeof config === 'function' ? config : config.handler;
-        const routeName = typeof config === 'function' ? config.name : config.id;
+        const routeName = typeof config === 'function' ? name : config.id;
         const scopedRouter = express_1.default.Router();
         router.use(`/${routeName}`, scopedRouter);
         register(scopedRouter, {

package/dist/flows.d.ts

@@ -1,16 +1,21 @@
 import { OperationHandler } from '@directus/shared/types';
 export declare function getFlowManager(): FlowManager;
 declare class FlowManager {
+    private isLoaded;
     private operations;
     private triggerHandlers;
     private operationFlowHandlers;
     private webhookFlowHandlers;
+    private reloadQueue;
+    constructor();
     initialize(): Promise<void>;
     reload(): Promise<void>;
     addOperation(id: string, operation: OperationHandler): void;
     clearOperations(): void;
     runOperationFlow(id: string, data: unknown, context: Record<string, unknown>): Promise<unknown>;
     runWebhookFlow(id: string, data: unknown, context: Record<string, unknown>): Promise<unknown>;
+    private load;
+    private unload;
     private executeFlow;
     private executeOperation;
 }

package/dist/flows.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];
@@ -25,6 +29,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFlowManager = void 0;
 const sharedExceptions = __importStar(require("@directus/shared/exceptions"));
 const types_1 = require("@directus/shared/types");
+const utils_1 = require("@directus/shared/utils");
+const fast_redact_1 = __importDefault(require("fast-redact"));
+const lodash_1 = require("lodash");
 const micromustache_1 = require("micromustache");
 const node_cron_1 = require("node-cron");
 const database_1 = __importDefault(require("./database"));
@@ -32,16 +39,14 @@ const emitter_1 = __importDefault(require("./emitter"));
 const env_1 = __importDefault(require("./env"));
 const exceptions = __importStar(require("./exceptions"));
 const logger_1 = __importDefault(require("./logger"));
+const messenger_1 = require("./messenger");
 const services = __importStar(require("./services"));
 const services_1 = require("./services");
-const construct_flow_tree_1 = require("./utils/construct-flow-tree");
-const get_schema_1 = require("./utils/get-schema");
 const activity_1 = require("./services/activity");
 const revisions_1 = require("./services/revisions");
-const lodash_1 = require("lodash");
-const messenger_1 = require("./messenger");
-const fast_redact_1 = __importDefault(require("fast-redact"));
-const operation_options_1 = require("./utils/operation-options");
+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");
 let flowManager;
 const redactLogs = (0, fast_redact_1.default)({
     censor: '--redacted--',
@@ -61,12 +66,59 @@ const ACCOUNTABILITY_KEY = '$accountability';
 const LAST_KEY = '$last';
 class FlowManager {
     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) => {
+            if (event.type === 'reload') {
+                this.reloadQueue.enqueue(async () => {
+                    if (this.isLoaded) {
+                        await this.unload();
+                        await this.load();
+                    }
+                    else {
+                        logger_1.default.warn('Flows have to be loaded before they can be reloaded');
+                    }
+                });
+            }
+        });
     }
     async initialize() {
+        if (!this.isLoaded) {
+            await this.load();
+        }
+    }
+    async reload() {
+        const messenger = (0, messenger_1.getMessenger)();
+        messenger.publish('flows', { type: 'reload' });
+    }
+    addOperation(id, operation) {
+        this.operations[id] = operation;
+    }
+    clearOperations() {
+        this.operations = {};
+    }
+    async runOperationFlow(id, data, context) {
+        if (!(id in this.operationFlowHandlers)) {
+            logger_1.default.warn(`Couldn't find operation triggered flow with id "${id}"`);
+            return null;
+        }
+        const handler = this.operationFlowHandlers[id];
+        return handler(data, context);
+    }
+    async runWebhookFlow(id, data, context) {
+        if (!(id in this.webhookFlowHandlers)) {
+            logger_1.default.warn(`Couldn't find webhook or manual triggered flow with id "${id}"`);
+            throw new exceptions.ForbiddenException();
+        }
+        const handler = this.webhookFlowHandlers[id];
+        return handler(data, context);
+    }
+    async load() {
         var _a, _b, _c, _d, _e, _f, _g;
         const flowsService = new services_1.FlowsService({ knex: (0, database_1.default)(), schema: await (0, get_schema_1.getSchema)() });
         const flows = await flowsService.readByQuery({
@@ -104,7 +156,7 @@ class FlowManager {
                 else if (flow.options.type === 'action') {
                     const handler = (meta, context) => this.executeFlow(flow, meta, {
                         accountability: context.accountability,
-                        database: context.database,
+                        database: (0, database_1.default)(),
                         getSchema: context.schema ? () => context.schema : get_schema_1.getSchema,
                     });
                     events.forEach((event) => emitter_1.default.onAction(event, handler));
@@ -150,9 +202,9 @@ class FlowManager {
             }
             else if (flow.trigger === 'manual') {
                 const handler = (data, context) => {
-                    var _a, _b, _c;
+                    var _a, _b;
                     const enabledCollections = (_b = (_a = flow.options) === null || _a === void 0 ? void 0 : _a.collections) !== null && _b !== void 0 ? _b : [];
-                    const targetCollection = (_c = data) === null || _c === void 0 ? void 0 : _c.body.collection;
+                    const targetCollection = data === null || data === void 0 ? void 0 : data.body.collection;
                     if (!targetCollection) {
                         logger_1.default.warn(`Manual trigger requires "collection" to be specified in the payload`);
                         throw new exceptions.ForbiddenException();
@@ -177,13 +229,9 @@ class FlowManager {
                 this.webhookFlowHandlers[`POST-${flow.id}`] = handler;
             }
         }
-        (0, messenger_1.getMessenger)().subscribe('flows', (event) => {
-            if (event.type === 'reload') {
-                this.reload();
-            }
-        });
+        this.isLoaded = true;
     }
-    async reload() {
+    async unload() {
         for (const trigger of this.triggerHandlers) {
             trigger.events.forEach((event) => {
                 switch (event.type) {
@@ -202,29 +250,7 @@ class FlowManager {
         this.triggerHandlers = [];
         this.operationFlowHandlers = {};
         this.webhookFlowHandlers = {};
-        await this.initialize();
-    }
-    addOperation(id, operation) {
-        this.operations[id] = operation;
-    }
-    clearOperations() {
-        this.operations = {};
-    }
-    async runOperationFlow(id, data, context) {
-        if (!(id in this.operationFlowHandlers)) {
-            logger_1.default.warn(`Couldn't find operation triggered flow with id "${id}"`);
-            return null;
-        }
-        const handler = this.operationFlowHandlers[id];
-        return handler(data, context);
-    }
-    async runWebhookFlow(id, data, context) {
-        if (!(id in this.webhookFlowHandlers)) {
-            logger_1.default.warn(`Couldn't find webhook or manual triggered flow with id "${id}"`);
-            throw new exceptions.ForbiddenException();
-        }
-        const handler = this.webhookFlowHandlers[id];
-        return handler(data, context);
+        this.isLoaded = false;
     }
     async executeFlow(flow, data = null, context = {}) {
         var _a, _b, _c, _d, _e, _f;
@@ -288,7 +314,7 @@ class FlowManager {
             return { successor: null, status: 'unknown', data: null, options: null };
         }
         const handler = this.operations[operation.type];
-        const options = (0, operation_options_1.applyOperationOptions)(operation.options, keyedData);
+        const options = (0, utils_1.applyOptionsData)(operation.options, keyedData);
         try {
             const result = await handler(options, {
                 services,

package/dist/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

package/dist/logger.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

package/dist/messenger.js

@@ -4,10 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getMessenger = exports.MessengerRedis = exports.MessengerMemory = void 0;
+const utils_1 = require("@directus/shared/utils");
 const ioredis_1 = __importDefault(require("ioredis"));
 const env_1 = __importDefault(require("./env"));
 const get_config_from_env_1 = require("./utils/get-config-from-env");
-const parse_json_1 = require("./utils/parse-json");
 class MessengerMemory {
     constructor() {
         this.handlers = {};
@@ -38,7 +38,7 @@ class MessengerRedis {
     subscribe(channel, callback) {
         this.sub.subscribe(`${this.namespace}:${channel}`);
         this.sub.on('message', (messageChannel, payloadString) => {
-            const payload = (0, parse_json_1.parseJSON)(payloadString);
+            const payload = (0, utils_1.parseJSON)(payloadString);
             if (messageChannel === `${this.namespace}:${channel}`) {
                 callback(payload);
             }

package/dist/middleware/graphql.js

@@ -4,10 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseGraphQL = void 0;
+const utils_1 = require("@directus/shared/utils");
 const graphql_1 = require("graphql");
 const exceptions_1 = require("../exceptions");
 const async_handler_1 = __importDefault(require("../utils/async-handler"));
-const parse_json_1 = require("../utils/parse-json");
 exports.parseGraphQL = (0, async_handler_1.default)(async (req, res, next) => {
     if (req.method !== 'GET' && req.method !== 'POST') {
         throw new exceptions_1.MethodNotAllowedException('GraphQL only supports GET and POST requests.', { allow: ['GET', 'POST'] });
@@ -20,7 +20,7 @@ exports.parseGraphQL = (0, async_handler_1.default)(async (req, res, next) => {
         query = req.query.query || null;
         if (req.query.variables) {
             try {
-                variables = (0, parse_json_1.parseJSON)(req.query.variables);
+                variables = (0, utils_1.parseJSON)(req.query.variables);
             }
             catch {
                 throw new exceptions_1.InvalidQueryException(`Variables are invalid JSON.`);

package/dist/middleware/respond.js

@@ -13,14 +13,23 @@ const get_cache_headers_1 = require("../utils/get-cache-headers");
 const logger_1 = __importDefault(require("../logger"));
 const services_1 = require("../services");
 const get_date_formatted_1 = require("../utils/get-date-formatted");
+const get_string_byte_size_1 = require("../utils/get-string-byte-size");
+const bytes_1 = require("bytes");
 exports.respond = (0, async_handler_1.default)(async (req, res) => {
     var _a, _b, _c;
     const { cache } = (0, cache_1.getCache)();
+    let exceedsMaxSize = false;
+    if (env_1.default.CACHE_VALUE_MAX_SIZE !== false) {
+        const valueSize = res.locals.payload ? (0, get_string_byte_size_1.stringByteSize)(JSON.stringify(res.locals.payload)) : 0;
+        const maxSize = (0, bytes_1.parse)(env_1.default.CACHE_VALUE_MAX_SIZE);
+        exceedsMaxSize = valueSize > maxSize;
+    }
     if (req.method.toLowerCase() === 'get' &&
         env_1.default.CACHE_ENABLED === true &&
         cache &&
         !req.sanitizedQuery.export &&
-        res.locals.cache !== false) {
+        res.locals.cache !== false &&
+        exceedsMaxSize === false) {
         const key = (0, get_cache_key_1.getCacheKey)(req);
         try {
             await cache.set(key, res.locals.payload, (0, ms_1.default)(env_1.default.CACHE_TTL));

package/dist/middleware/validate-batch.js

@@ -27,8 +27,10 @@ const validateBatch = (scope) => (0, async_handler_1.default)(async (req, res, n
     if (scope !== 'read') {
         batchSchema = batchSchema.xor('query', 'keys');
     }
-    // In updates, we add a required `data` that holds the update payload
+    // In updates, we add a required `data` that holds the update payload if an array isn't used
     if (scope === 'update') {
+        if (Array.isArray(req.body))
+            return next();
         batchSchema = batchSchema.keys({
             data: joi_1.default.object().unknown().required(),
         });