directus 9.12.1 → 9.12.2

package/dist/app.js

@@ -72,6 +72,7 @@ const extract_token_1 = __importDefault(require("./middleware/extract-token"));
 const rate_limiter_1 = __importDefault(require("./middleware/rate-limiter"));
 const sanitize_query_1 = __importDefault(require("./middleware/sanitize-query"));
 const schema_1 = __importDefault(require("./middleware/schema"));
+const constants_1 = require("./constants");
 const track_1 = require("./utils/track");
 const validate_env_1 = require("./utils/validate-env");
 const validate_storage_1 = require("./utils/validate-storage");
@@ -157,6 +158,11 @@ async function createApp() {
             next();
         }
     });
+    app.get('/robots.txt', (_, res) => {
+        res.set('Content-Type', 'text/plain');
+        res.status(200);
+        res.send(constants_1.ROBOTSTXT);
+    });
     if (env_1.default.SERVE_APP) {
         const adminPath = require.resolve('@directus/app');
         const adminUrl = new url_1.Url(env_1.default.PUBLIC_URL).addPath('admin');

package/dist/constants.d.ts

@@ -13,3 +13,4 @@ export declare const COOKIE_OPTIONS: {
     secure: any;
     sameSite: "lax" | "strict" | "none";
 };
+export declare const ROBOTSTXT: string;

package/dist/constants.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.COOKIE_OPTIONS = exports.UUID_REGEX = exports.COLUMN_TRANSFORMS = exports.DEFAULT_AUTH_PROVIDER = exports.ALIAS_TYPES = exports.FILTER_VARIABLES = exports.ASSET_TRANSFORM_QUERY_KEYS = exports.SYSTEM_ASSET_ALLOW_LIST = void 0;
+exports.ROBOTSTXT = exports.COOKIE_OPTIONS = exports.UUID_REGEX = exports.COLUMN_TRANSFORMS = exports.DEFAULT_AUTH_PROVIDER = exports.ALIAS_TYPES = exports.FILTER_VARIABLES = exports.ASSET_TRANSFORM_QUERY_KEYS = exports.SYSTEM_ASSET_ALLOW_LIST = void 0;
 const env_1 = __importDefault(require("./env"));
 const ms_1 = __importDefault(require("ms"));
 exports.SYSTEM_ASSET_ALLOW_LIST = [
@@ -55,3 +55,7 @@ exports.COOKIE_OPTIONS = {
     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',
 };
+exports.ROBOTSTXT = `
+User-agent: *
+Disallow: /
+`.trim();

package/dist/database/helpers/fn/dialects/oracle.d.ts

@@ -1,13 +1,13 @@
-import { FnHelper } from '../types';
+import { FnHelper, FnHelperOptions } from '../types';
 import { Knex } from 'knex';
 export declare class FnHelperOracle extends FnHelper {
-    year(table: string, column: string): Knex.Raw;
-    month(table: string, column: string): Knex.Raw;
-    week(table: string, column: string): Knex.Raw;
-    day(table: string, column: string): Knex.Raw;
-    weekday(table: string, column: string): Knex.Raw;
-    hour(table: string, column: string): Knex.Raw;
-    minute(table: string, column: string): Knex.Raw;
-    second(table: string, column: string): Knex.Raw;
+    year(table: string, column: string, options: FnHelperOptions): Knex.Raw;
+    month(table: string, column: string, options: FnHelperOptions): Knex.Raw;
+    week(table: string, column: string, options: FnHelperOptions): Knex.Raw;
+    day(table: string, column: string, options: FnHelperOptions): Knex.Raw;
+    weekday(table: string, column: string, options: FnHelperOptions): Knex.Raw;
+    hour(table: string, column: string, options: FnHelperOptions): Knex.Raw;
+    minute(table: string, column: string, options: FnHelperOptions): Knex.Raw;
+    second(table: string, column: string, options: FnHelperOptions): Knex.Raw;
     count(table: string, column: string): Knex.Raw<any>;
 }

package/dist/database/helpers/fn/dialects/oracle.js

@@ -2,30 +2,36 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FnHelperOracle = void 0;
 const types_1 = require("../types");
+const parseLocaltime = (columnType) => {
+    if (columnType === 'timestamp') {
+        return ` AT TIME ZONE 'UTC'`;
+    }
+    return '';
+};
 class FnHelperOracle extends types_1.FnHelper {
-    year(table, column) {
-        return this.knex.raw("TO_CHAR(??.??, 'IYYY')", [table, column]);
+    year(table, column, options) {
+        return this.knex.raw(`TO_CHAR(??.??${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)}, 'IYYY')`, [table, column]);
     }
-    month(table, column) {
-        return this.knex.raw("TO_CHAR(??.??, 'MM')", [table, column]);
+    month(table, column, options) {
+        return this.knex.raw(`TO_CHAR(??.??${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)}, 'MM')`, [table, column]);
     }
-    week(table, column) {
-        return this.knex.raw("TO_CHAR(??.??, 'IW')", [table, column]);
+    week(table, column, options) {
+        return this.knex.raw(`TO_CHAR(??.??${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)}, 'IW')`, [table, column]);
     }
-    day(table, column) {
-        return this.knex.raw("TO_CHAR(??.??, 'DD')", [table, column]);
+    day(table, column, options) {
+        return this.knex.raw(`TO_CHAR(??.??${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)}, 'DD')`, [table, column]);
     }
-    weekday(table, column) {
-        return this.knex.raw("TO_CHAR(??.??, 'D')", [table, column]);
+    weekday(table, column, options) {
+        return this.knex.raw(`TO_CHAR(??.??${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)}, 'D')`, [table, column]);
     }
-    hour(table, column) {
-        return this.knex.raw("TO_CHAR(??.??, 'HH24')", [table, column]);
+    hour(table, column, options) {
+        return this.knex.raw(`TO_CHAR(??.??${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)}, 'HH24')`, [table, column]);
     }
-    minute(table, column) {
-        return this.knex.raw("TO_CHAR(??.??, 'MI')", [table, column]);
+    minute(table, column, options) {
+        return this.knex.raw(`TO_CHAR(??.??${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)}, 'MI')`, [table, column]);
     }
-    second(table, column) {
-        return this.knex.raw("TO_CHAR(??.??, 'SS')", [table, column]);
+    second(table, column, options) {
+        return this.knex.raw(`TO_CHAR(??.??${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)}, 'SS')`, [table, column]);
     }
     count(table, column) {
         var _a, _b, _c, _d, _e;

package/dist/database/helpers/fn/dialects/sqlite.d.ts

@@ -1,13 +1,13 @@
-import { FnHelper } from '../types';
+import { FnHelper, FnHelperOptions } from '../types';
 import { Knex } from 'knex';
 export declare class FnHelperSQLite extends FnHelper {
-    year(table: string, column: string): Knex.Raw;
-    month(table: string, column: string): Knex.Raw;
-    week(table: string, column: string): Knex.Raw;
-    day(table: string, column: string): Knex.Raw;
-    weekday(table: string, column: string): Knex.Raw;
-    hour(table: string, column: string): Knex.Raw;
-    minute(table: string, column: string): Knex.Raw;
-    second(table: string, column: string): Knex.Raw;
+    year(table: string, column: string, options?: FnHelperOptions): Knex.Raw;
+    month(table: string, column: string, options?: FnHelperOptions): Knex.Raw;
+    week(table: string, column: string, options?: FnHelperOptions): Knex.Raw;
+    day(table: string, column: string, options?: FnHelperOptions): Knex.Raw;
+    weekday(table: string, column: string, options?: FnHelperOptions): Knex.Raw;
+    hour(table: string, column: string, options?: FnHelperOptions): Knex.Raw;
+    minute(table: string, column: string, options?: FnHelperOptions): Knex.Raw;
+    second(table: string, column: string, options?: FnHelperOptions): Knex.Raw;
     count(table: string, column: string): Knex.Raw<any>;
 }

package/dist/database/helpers/fn/dialects/sqlite.js

@@ -2,30 +2,60 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FnHelperSQLite = void 0;
 const types_1 = require("../types");
+const parseLocaltime = (columnType) => {
+    if (columnType === 'timestamp') {
+        return '';
+    }
+    return `, 'localtime'`;
+};
 class FnHelperSQLite extends types_1.FnHelper {
-    year(table, column) {
-        return this.knex.raw("CAST(strftime('%Y', ??.?? / 1000, 'unixepoch') AS INTEGER)", [table, column]);
+    year(table, column, options) {
+        return this.knex.raw(`CAST(strftime('%Y', ??.?? / 1000, 'unixepoch'${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)}) AS INTEGER)`, [
+            table,
+            column,
+        ]);
     }
-    month(table, column) {
-        return this.knex.raw("CAST(strftime('%m', ??.?? / 1000, 'unixepoch') AS INTEGER)", [table, column]);
+    month(table, column, options) {
+        return this.knex.raw(`CAST(strftime('%m', ??.?? / 1000, 'unixepoch'${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)}) AS INTEGER)`, [
+            table,
+            column,
+        ]);
     }
-    week(table, column) {
-        return this.knex.raw("CAST(strftime('%W', ??.?? / 1000, 'unixepoch') AS INTEGER)", [table, column]);
+    week(table, column, options) {
+        return this.knex.raw(`CAST(strftime('%W', ??.?? / 1000, 'unixepoch'${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)}) AS INTEGER)`, [
+            table,
+            column,
+        ]);
     }
-    day(table, column) {
-        return this.knex.raw("CAST(strftime('%d', ??.?? / 1000, 'unixepoch') AS INTEGER)", [table, column]);
+    day(table, column, options) {
+        return this.knex.raw(`CAST(strftime('%d', ??.?? / 1000, 'unixepoch'${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)}) AS INTEGER)`, [
+            table,
+            column,
+        ]);
     }
-    weekday(table, column) {
-        return this.knex.raw("CAST(strftime('%w', ??.?? / 1000, 'unixepoch') AS INTEGER)", [table, column]);
+    weekday(table, column, options) {
+        return this.knex.raw(`CAST(strftime('%w', ??.?? / 1000, 'unixepoch'${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)}) AS INTEGER)`, [
+            table,
+            column,
+        ]);
     }
-    hour(table, column) {
-        return this.knex.raw("CAST(strftime('%H', ??.?? / 1000, 'unixepoch') AS INTEGER)", [table, column]);
+    hour(table, column, options) {
+        return this.knex.raw(`CAST(strftime('%H', ??.?? / 1000, 'unixepoch'${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)}) AS INTEGER)`, [
+            table,
+            column,
+        ]);
     }
-    minute(table, column) {
-        return this.knex.raw("CAST(strftime('%M', ??.?? / 1000, 'unixepoch') AS INTEGER)", [table, column]);
+    minute(table, column, options) {
+        return this.knex.raw(`CAST(strftime('%M', ??.?? / 1000, 'unixepoch'${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)}) AS INTEGER)`, [
+            table,
+            column,
+        ]);
     }
-    second(table, column) {
-        return this.knex.raw("CAST(strftime('%S', ??.?? / 1000, 'unixepoch') AS INTEGER)", [table, column]);
+    second(table, column, options) {
+        return this.knex.raw(`CAST(strftime('%S', ??.?? / 1000, 'unixepoch'${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)}) AS INTEGER)`, [
+            table,
+            column,
+        ]);
     }
     count(table, column) {
         var _a, _b, _c, _d, _e;

package/dist/database/helpers/fn/types.d.ts

@@ -1,18 +1,21 @@
 import { SchemaOverview } from '@directus/shared/types';
 import { Knex } from 'knex';
 import { DatabaseHelper } from '../types';
+export declare type FnHelperOptions = {
+    type?: string;
+};
 export declare abstract class FnHelper extends DatabaseHelper {
     protected knex: Knex;
     protected schema: SchemaOverview;
     constructor(knex: Knex, schema: SchemaOverview);
-    abstract year(table: string, column: string): Knex.Raw;
-    abstract month(table: string, column: string): Knex.Raw;
-    abstract week(table: string, column: string): Knex.Raw;
-    abstract day(table: string, column: string): Knex.Raw;
-    abstract weekday(table: string, column: string): Knex.Raw;
-    abstract hour(table: string, column: string): Knex.Raw;
-    abstract minute(table: string, column: string): Knex.Raw;
-    abstract second(table: string, column: string): Knex.Raw;
-    abstract count(table: string, column: string): Knex.Raw;
+    abstract year(table: string, column: string, options?: FnHelperOptions): Knex.Raw;
+    abstract month(table: string, column: string, options?: FnHelperOptions): Knex.Raw;
+    abstract week(table: string, column: string, options?: FnHelperOptions): Knex.Raw;
+    abstract day(table: string, column: string, options?: FnHelperOptions): Knex.Raw;
+    abstract weekday(table: string, column: string, options?: FnHelperOptions): Knex.Raw;
+    abstract hour(table: string, column: string, options?: FnHelperOptions): Knex.Raw;
+    abstract minute(table: string, column: string, options?: FnHelperOptions): Knex.Raw;
+    abstract second(table: string, column: string, options?: FnHelperOptions): Knex.Raw;
+    abstract count(table: string, column: string, options?: FnHelperOptions): Knex.Raw;
     protected _relationalCount(table: string, column: string): Knex.Raw;
 }

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/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

@@ -47,6 +47,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 +71,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 +88,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) {

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

@@ -42,6 +42,7 @@ 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 job_queue_1 = require("./utils/job-queue");
 let flowManager;
 const redactLogs = (0, fast_redact_1.default)({
     censor: '--redacted--',
@@ -61,12 +62,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({
@@ -177,13 +225,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 +246,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;

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

@@ -3,7 +3,10 @@ declare type Options = {
     url: string;
     method: Method;
     body: Record<string, any> | string | null;
-    headers: Record<string, string>;
+    headers?: {
+        header: string;
+        value: string;
+    }[] | null;
 };
 declare const _default: import("@directus/shared/types").OperationApiConfig<Options>;
 export default _default;

package/dist/operations/request/index.js

@@ -8,7 +8,11 @@ const axios_1 = __importDefault(require("axios"));
 exports.default = (0, utils_1.defineOperationApi)({
     id: 'request',
     handler: async ({ url, method, body, headers }) => {
-        const result = await (0, axios_1.default)({ url, method, data: body, headers });
+        const customHeaders = headers === null || headers === void 0 ? void 0 : headers.reduce((acc, { header, value }) => {
+            acc[header] = value;
+            return acc;
+        }, {});
+        const result = await (0, axios_1.default)({ url, method, data: body, headers: customHeaders });
         return { status: result.status, statusText: result.statusText, headers: result.headers, data: result.data };
     },
 });

package/dist/services/flows.d.ts

@@ -1,9 +1,7 @@
 import { FlowRaw } from '@directus/shared/types';
-import { Messenger } from '../messenger';
 import { AbstractServiceOptions, Item, MutationOptions, PrimaryKey } from '../types';
 import { ItemsService } from './items';
 export declare class FlowsService extends ItemsService<FlowRaw> {
-    messenger: Messenger;
     constructor(options: AbstractServiceOptions);
     createOne(data: Partial<Item>, opts?: MutationOptions): Promise<PrimaryKey>;
     createMany(data: Partial<Item>[], opts?: MutationOptions): Promise<PrimaryKey[]>;

package/dist/services/flows.js

@@ -1,41 +1,46 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FlowsService = void 0;
-const messenger_1 = require("../messenger");
+const flows_1 = require("../flows");
 const items_1 = require("./items");
 class FlowsService extends items_1.ItemsService {
     constructor(options) {
         super('directus_flows', options);
-        this.messenger = (0, messenger_1.getMessenger)();
     }
     async createOne(data, opts) {
+        const flowManager = (0, flows_1.getFlowManager)();
         const result = await super.createOne(data, opts);
-        this.messenger.publish('flows', { type: 'reload' });
+        await flowManager.reload();
         return result;
     }
     async createMany(data, opts) {
+        const flowManager = (0, flows_1.getFlowManager)();
         const result = await super.createMany(data, opts);
-        this.messenger.publish('flows', { type: 'reload' });
+        await flowManager.reload();
         return result;
     }
     async updateOne(key, data, opts) {
+        const flowManager = (0, flows_1.getFlowManager)();
         const result = await super.updateOne(key, data, opts);
-        this.messenger.publish('flows', { type: 'reload' });
+        await flowManager.reload();
         return result;
     }
     async updateMany(keys, data, opts) {
+        const flowManager = (0, flows_1.getFlowManager)();
         const result = await super.updateMany(keys, data, opts);
-        this.messenger.publish('flows', { type: 'reload' });
+        await flowManager.reload();
         return result;
     }
     async deleteOne(key, opts) {
+        const flowManager = (0, flows_1.getFlowManager)();
         const result = await super.deleteOne(key, opts);
-        this.messenger.publish('flows', { type: 'reload' });
+        await flowManager.reload();
         return result;
     }
     async deleteMany(keys, opts) {
+        const flowManager = (0, flows_1.getFlowManager)();
         const result = await super.deleteMany(keys, opts);
-        this.messenger.publish('flows', { type: 'reload' });
+        await flowManager.reload();
         return result;
     }
 }

package/dist/services/operations.d.ts

@@ -1,9 +1,7 @@
 import { OperationRaw } from '@directus/shared/types';
-import { Messenger } from '../messenger';
 import { AbstractServiceOptions, Item, MutationOptions, PrimaryKey } from '../types';
 import { ItemsService } from './items';
 export declare class OperationsService extends ItemsService<OperationRaw> {
-    messenger: Messenger;
     constructor(options: AbstractServiceOptions);
     createOne(data: Partial<Item>, opts?: MutationOptions): Promise<PrimaryKey>;
     createMany(data: Partial<Item>[], opts?: MutationOptions): Promise<PrimaryKey[]>;

package/dist/services/operations.js

@@ -1,41 +1,46 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OperationsService = void 0;
-const messenger_1 = require("../messenger");
+const flows_1 = require("../flows");
 const items_1 = require("./items");
 class OperationsService extends items_1.ItemsService {
     constructor(options) {
         super('directus_operations', options);
-        this.messenger = (0, messenger_1.getMessenger)();
     }
     async createOne(data, opts) {
+        const flowManager = (0, flows_1.getFlowManager)();
         const result = await super.createOne(data, opts);
-        this.messenger.publish('flows', { type: 'reload' });
+        await flowManager.reload();
         return result;
     }
     async createMany(data, opts) {
+        const flowManager = (0, flows_1.getFlowManager)();
         const result = await super.createMany(data, opts);
-        this.messenger.publish('flows', { type: 'reload' });
+        await flowManager.reload();
         return result;
     }
     async updateOne(key, data, opts) {
+        const flowManager = (0, flows_1.getFlowManager)();
         const result = await super.updateOne(key, data, opts);
-        this.messenger.publish('flows', { type: 'reload' });
+        await flowManager.reload();
         return result;
     }
     async updateMany(keys, data, opts) {
+        const flowManager = (0, flows_1.getFlowManager)();
         const result = await super.updateMany(keys, data, opts);
-        this.messenger.publish('flows', { type: 'reload' });
+        await flowManager.reload();
         return result;
     }
     async deleteOne(key, opts) {
+        const flowManager = (0, flows_1.getFlowManager)();
         const result = await super.deleteOne(key, opts);
-        this.messenger.publish('flows', { type: 'reload' });
+        await flowManager.reload();
         return result;
     }
     async deleteMany(keys, opts) {
+        const flowManager = (0, flows_1.getFlowManager)();
         const result = await super.deleteMany(keys, opts);
-        this.messenger.publish('flows', { type: 'reload' });
+        await flowManager.reload();
         return result;
     }
 }

package/dist/services/users.js

@@ -305,6 +305,7 @@ class UsersService extends items_1.ItemsService {
         await (0, stall_1.stall)(STALL_TIME, timeStart);
     }
     async resetPassword(token, password) {
+        var _a;
         const { email, scope, hash } = jsonwebtoken_1.default.verify(token, env_1.default.SECRET, { issuer: 'directus' });
         if (scope !== 'password-reset' || !hash)
             throw new exceptions_2.ForbiddenException();
@@ -317,6 +318,10 @@ class UsersService extends items_1.ItemsService {
         const service = new UsersService({
             knex: this.knex,
             schema: this.schema,
+            accountability: {
+                ...((_a = this.accountability) !== null && _a !== void 0 ? _a : { role: null }),
+                admin: true, // We need to skip permissions checks for the update call below
+            },
         });
         await service.updateOne(user.id, { password, status: 'active' });
     }

package/dist/utils/apply-snapshot.js

@@ -11,10 +11,12 @@ const services_1 = require("../services");
 const get_schema_1 = require("./get-schema");
 const get_snapshot_1 = require("./get-snapshot");
 const get_snapshot_diff_1 = require("./get-snapshot-diff");
+const cache_1 = require("../cache");
 async function applySnapshot(snapshot, options) {
     var _a, _b, _c, _d;
     const database = (_a = options === null || options === void 0 ? void 0 : options.database) !== null && _a !== void 0 ? _a : (0, database_1.default)();
     const schema = (_b = options === null || options === void 0 ? void 0 : options.schema) !== null && _b !== void 0 ? _b : (await (0, get_schema_1.getSchema)({ database }));
+    const { systemCache } = (0, cache_1.getCache)();
     const current = (_c = options === null || options === void 0 ? void 0 : options.current) !== null && _c !== void 0 ? _c : (await (0, get_snapshot_1.getSnapshot)({ database, schema }));
     const snapshotDiff = (_d = options === null || options === void 0 ? void 0 : options.diff) !== null && _d !== void 0 ? _d : (0, get_snapshot_diff_1.getSnapshotDiff)(current, snapshot);
     await database.transaction(async (trx) => {
@@ -178,6 +180,7 @@ async function applySnapshot(snapshot, options) {
             }
         }
     });
+    await (systemCache === null || systemCache === void 0 ? void 0 : systemCache.clear());
 }
 exports.applySnapshot = applySnapshot;
 function isNestedMetaUpdate(diff) {

package/dist/utils/get-column.js

@@ -28,7 +28,7 @@ function getColumn(knex, table, column, alias = (0, apply_function_to_column_nam
             if (allowedFunctions.includes(functionName) === false) {
                 throw new exceptions_1.InvalidQueryException(`Invalid function specified "${functionName}"`);
             }
-            const result = fn[functionName](table, columnName);
+            const result = fn[functionName](table, columnName, { type });
             if (alias) {
                 return knex.raw(result + ' AS ??', [alias]);
             }

package/dist/utils/job-queue.d.ts

@@ -0,0 +1,9 @@
+declare type Job = () => Promise<void> | void;
+export declare class JobQueue {
+    private running;
+    private jobs;
+    constructor();
+    enqueue(job: Job): void;
+    private run;
+}
+export {};

package/dist/utils/job-queue.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.JobQueue = void 0;
+class JobQueue {
+    constructor() {
+        this.running = false;
+        this.jobs = [];
+    }
+    enqueue(job) {
+        this.jobs.push(job);
+        if (!this.running) {
+            this.run();
+        }
+    }
+    async run() {
+        this.running = true;
+        while (this.jobs.length > 0) {
+            const job = this.jobs.shift();
+            await job();
+        }
+        this.running = false;
+    }
+}
+exports.JobQueue = JobQueue;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "directus",
-	"version": "9.12.1",
+	"version": "9.12.2",
 	"license": "GPL-3.0-only",
 	"homepage": "https://github.com/directus/directus#readme",
 	"description": "Directus is a real-time API and App dashboard for managing SQL database content.",
@@ -77,16 +77,16 @@
 	],
 	"dependencies": {
 		"@aws-sdk/client-ses": "^3.40.0",
-		"@directus/app": "9.12.1",
-		"@directus/drive": "9.12.1",
-		"@directus/drive-azure": "9.12.1",
-		"@directus/drive-gcs": "9.12.1",
-		"@directus/drive-s3": "9.12.1",
-		"@directus/extensions-sdk": "9.12.1",
-		"@directus/format-title": "9.12.1",
-		"@directus/schema": "9.12.1",
-		"@directus/shared": "9.12.1",
-		"@directus/specs": "9.12.1",
+		"@directus/app": "9.12.2",
+		"@directus/drive": "9.12.2",
+		"@directus/drive-azure": "9.12.2",
+		"@directus/drive-gcs": "9.12.2",
+		"@directus/drive-s3": "9.12.2",
+		"@directus/extensions-sdk": "9.12.2",
+		"@directus/format-title": "9.12.2",
+		"@directus/schema": "9.12.2",
+		"@directus/shared": "9.12.2",
+		"@directus/specs": "9.12.2",
 		"@godaddy/terminus": "^4.9.0",
 		"@rollup/plugin-alias": "^3.1.9",
 		"@rollup/plugin-virtual": "^2.0.3",
@@ -173,7 +173,7 @@
 		"sqlite3": "^5.0.6",
 		"tedious": "^13.0.0"
 	},
-	"gitHead": "cd58611aa7114dd7ef13f0819f77f9858f34ad1e",
+	"gitHead": "bce19abf6f52adc933ebc4f557e6959aa69d083e",
 	"devDependencies": {
 		"@types/async": "3.2.10",
 		"@types/body-parser": "1.19.2",