directus 9.13.0 → 9.14.2

package/dist/app.js

@@ -173,13 +173,18 @@ async function createApp() {
         // Set the App's base path according to the APIs public URL
         const html = await fs_extra_1.default.readFile(adminPath, 'utf8');
         const htmlWithBase = html.replace(/<base \/>/, `<base href="${adminUrl.toString({ rootRelative: true })}/" />`);
-        const noCacheIndexHtmlHandler = (_req, res) => {
+        const sendHtml = (_req, res) => {
             res.setHeader('Cache-Control', 'no-cache');
+            res.setHeader('Vary', 'Origin, Cache-Control');
             res.send(htmlWithBase);
         };
-        app.get('/admin', noCacheIndexHtmlHandler);
-        app.use('/admin', express_1.default.static(path_1.default.join(adminPath, '..')));
-        app.use('/admin/*', noCacheIndexHtmlHandler);
+        const setStaticHeaders = (res) => {
+            res.setHeader('Cache-Control', 'max-age=31536000, immutable');
+            res.setHeader('Vary', 'Origin, Cache-Control');
+        };
+        app.get('/admin', sendHtml);
+        app.use('/admin', express_1.default.static(path_1.default.join(adminPath, '..'), { setHeaders: setStaticHeaders }));
+        app.use('/admin/*', sendHtml);
     }
     // use the rate limiter - all routes for now
     if (env_1.default.RATE_LIMITER_ENABLED === true) {

package/dist/auth/drivers/openid.js

@@ -51,7 +51,10 @@ class OpenIDAuthDriver extends local_1.LocalAuthDriver {
                     ...clientOptionsOverrides,
                 }));
             })
-                .catch(reject);
+                .catch((e) => {
+                logger_1.default.error(e, '[OpenID] Failed to fetch provider config');
+                process.exit(1);
+            });
         });
     }
     generateCodeVerifier() {

package/dist/cli/commands/security/key.d.ts

@@ -0,0 +1 @@
+export default function generateKey(): Promise<void>;

package/dist/cli/commands/security/key.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const uuid_1 = require("uuid");
+async function generateKey() {
+    process.stdout.write((0, uuid_1.v4)());
+    process.exit(0);
+}
+exports.default = generateKey;

package/dist/cli/commands/security/secret.d.ts

@@ -0,0 +1 @@
+export default function generateSecret(): Promise<void>;

package/dist/cli/commands/security/secret.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const nanoid_1 = require("nanoid");
+async function generateSecret() {
+    process.stdout.write((0, nanoid_1.nanoid)(32));
+    process.exit(0);
+}
+exports.default = generateSecret;

package/dist/cli/index.js

@@ -13,6 +13,8 @@ const count_1 = __importDefault(require("./commands/count"));
 const install_1 = __importDefault(require("./commands/database/install"));
 const migrate_1 = __importDefault(require("./commands/database/migrate"));
 const init_1 = __importDefault(require("./commands/init"));
+const key_1 = __importDefault(require("./commands/security/key"));
+const secret_1 = __importDefault(require("./commands/security/secret"));
 const create_1 = __importDefault(require("./commands/roles/create"));
 const create_2 = __importDefault(require("./commands/users/create"));
 const passwd_1 = __importDefault(require("./commands/users/passwd"));
@@ -28,6 +30,10 @@ async function createCli() {
     program.version(pkg.version, '-v, --version');
     program.command('start').description('Start the Directus API').action(server_1.startServer);
     program.command('init').description('Create a new Directus Project').action(init_1.default);
+    // Security
+    const securityCommand = program.command('security');
+    securityCommand.command('key:generate').description('Generate the app key').action(key_1.default);
+    securityCommand.command('secret:generate').description('Generate the app secret').action(secret_1.default);
     const dbCommand = program.command('database');
     dbCommand.command('install').description('Install the database').action(install_1.default);
     dbCommand

package/dist/controllers/extensions.js

@@ -9,6 +9,9 @@ const exceptions_1 = require("../exceptions");
 const extensions_1 = require("../extensions");
 const respond_1 = require("../middleware/respond");
 const utils_1 = require("@directus/shared/utils");
+const ms_1 = __importDefault(require("ms"));
+const env_1 = __importDefault(require("../env"));
+const get_cache_headers_1 = require("../utils/get-cache-headers");
 const router = (0, express_1.Router)();
 router.get('/:type', (0, async_handler_1.default)(async (req, res, next) => {
     const type = (0, utils_1.depluralize)(req.params.type);
@@ -33,7 +36,12 @@ router.get('/:type/index.js', (0, async_handler_1.default)(async (req, res) => {
         throw new exceptions_1.RouteNotFoundException(req.path);
     }
     res.setHeader('Content-Type', 'application/javascript; charset=UTF-8');
-    res.setHeader('Cache-Control', 'no-store');
+    if (env_1.default.EXTENSIONS_CACHE_TTL) {
+        res.setHeader('Cache-Control', (0, get_cache_headers_1.getCacheControlHeader)(req, (0, ms_1.default)(env_1.default.EXTENSIONS_CACHE_TTL)));
+    }
+    else {
+        res.setHeader('Cache-Control', 'no-store');
+    }
     res.setHeader('Vary', 'Origin, Cache-Control');
     res.end(extensionSource);
 }));

package/dist/controllers/files.js

@@ -32,7 +32,7 @@ const multipartHandler = (req, res, next) => {
             'content-type': 'application/octet-stream',
         };
     }
-    const busboy = (0, busboy_1.default)({ headers });
+    const busboy = (0, busboy_1.default)({ headers, defParamCharset: 'utf8' });
     const savedFiles = [];
     const service = new services_1.FilesService({ accountability: req.accountability, schema: req.schema });
     const existingPrimaryKey = req.params.pk || undefined;

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

@@ -1,4 +1,4 @@
-import { FnHelper } from '../types';
+import { FnHelper, FnHelperOptions } from '../types';
 import { Knex } from 'knex';
 export declare class FnHelperMSSQL extends FnHelper {
     year(table: string, column: string): Knex.Raw;
@@ -9,5 +9,5 @@ export declare class FnHelperMSSQL extends FnHelper {
     hour(table: string, column: string): Knex.Raw;
     minute(table: string, column: string): Knex.Raw;
     second(table: string, column: string): Knex.Raw;
-    count(table: string, column: string): Knex.Raw<any>;
+    count(table: string, column: string, options?: FnHelperOptions): Knex.Raw<any>;
 }

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

@@ -27,14 +27,14 @@ class FnHelperMSSQL extends types_1.FnHelper {
     second(table, column) {
         return this.knex.raw('DATEPART(second, ??.??)', [table, column]);
     }
-    count(table, column) {
+    count(table, column, options) {
         var _a, _b, _c, _d, _e;
         const type = (_e = (_d = (_c = (_b = (_a = this.schema.collections) === null || _a === void 0 ? void 0 : _a[table]) === null || _b === void 0 ? void 0 : _b.fields) === null || _c === void 0 ? void 0 : _c[column]) === null || _d === void 0 ? void 0 : _d.type) !== null && _e !== void 0 ? _e : 'unknown';
         if (type === 'json') {
             return this.knex.raw(`(SELECT COUNT(*) FROM OPENJSON(??.??, '$'))`, [table, column]);
         }
         if (type === 'alias') {
-            return this._relationalCount(table, column);
+            return this._relationalCount(table, column, options);
         }
         throw new Error(`Couldn't extract type from ${table}.${column}`);
     }

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

@@ -1,4 +1,4 @@
-import { FnHelper } from '../types';
+import { FnHelper, FnHelperOptions } from '../types';
 import { Knex } from 'knex';
 export declare class FnHelperMySQL extends FnHelper {
     year(table: string, column: string): Knex.Raw;
@@ -9,5 +9,5 @@ export declare class FnHelperMySQL extends FnHelper {
     hour(table: string, column: string): Knex.Raw;
     minute(table: string, column: string): Knex.Raw;
     second(table: string, column: string): Knex.Raw;
-    count(table: string, column: string): Knex.Raw;
+    count(table: string, column: string, options?: FnHelperOptions): Knex.Raw;
 }

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

@@ -27,14 +27,14 @@ class FnHelperMySQL extends types_1.FnHelper {
     second(table, column) {
         return this.knex.raw('SECOND(??.??)', [table, column]);
     }
-    count(table, column) {
+    count(table, column, options) {
         var _a, _b, _c, _d, _e;
         const type = (_e = (_d = (_c = (_b = (_a = this.schema.collections) === null || _a === void 0 ? void 0 : _a[table]) === null || _b === void 0 ? void 0 : _b.fields) === null || _c === void 0 ? void 0 : _c[column]) === null || _d === void 0 ? void 0 : _d.type) !== null && _e !== void 0 ? _e : 'unknown';
         if (type === 'json') {
             return this.knex.raw('JSON_LENGTH(??.??)', [table, column]);
         }
         if (type === 'alias') {
-            return this._relationalCount(table, column);
+            return this._relationalCount(table, column, options);
         }
         throw new Error(`Couldn't extract type from ${table}.${column}`);
     }

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

@@ -9,5 +9,5 @@ export declare class FnHelperOracle extends FnHelper {
     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>;
+    count(table: string, column: string, options?: FnHelperOptions): Knex.Raw<any>;
 }

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

@@ -33,14 +33,14 @@ class FnHelperOracle extends types_1.FnHelper {
     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) {
+    count(table, column, options) {
         var _a, _b, _c, _d, _e;
         const type = (_e = (_d = (_c = (_b = (_a = this.schema.collections) === null || _a === void 0 ? void 0 : _a[table]) === null || _b === void 0 ? void 0 : _b.fields) === null || _c === void 0 ? void 0 : _c[column]) === null || _d === void 0 ? void 0 : _d.type) !== null && _e !== void 0 ? _e : 'unknown';
         if (type === 'json') {
             return this.knex.raw("json_value(??.??, '$.size()')", [table, column]);
         }
         if (type === 'alias') {
-            return this._relationalCount(table, column);
+            return this._relationalCount(table, column, options);
         }
         throw new Error(`Couldn't extract type from ${table}.${column}`);
     }

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

@@ -1,4 +1,4 @@
-import { FnHelper } from '../types';
+import { FnHelper, FnHelperOptions } from '../types';
 import { Knex } from 'knex';
 export declare class FnHelperPostgres extends FnHelper {
     year(table: string, column: string): Knex.Raw;
@@ -9,5 +9,5 @@ export declare class FnHelperPostgres extends FnHelper {
     hour(table: string, column: string): Knex.Raw;
     minute(table: string, column: string): Knex.Raw;
     second(table: string, column: string): Knex.Raw;
-    count(table: string, column: string): Knex.Raw;
+    count(table: string, column: string, options?: FnHelperOptions): Knex.Raw;
 }

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

@@ -27,7 +27,7 @@ class FnHelperPostgres extends types_1.FnHelper {
     second(table, column) {
         return this.knex.raw('EXTRACT(SECOND FROM ??.??)', [table, column]);
     }
-    count(table, column) {
+    count(table, column, options) {
         var _a, _b, _c, _d, _e;
         const type = (_e = (_d = (_c = (_b = (_a = this.schema.collections) === null || _a === void 0 ? void 0 : _a[table]) === null || _b === void 0 ? void 0 : _b.fields) === null || _c === void 0 ? void 0 : _c[column]) === null || _d === void 0 ? void 0 : _d.type) !== null && _e !== void 0 ? _e : 'unknown';
         if (type === 'json') {
@@ -38,7 +38,7 @@ class FnHelperPostgres extends types_1.FnHelper {
             ]);
         }
         if (type === 'alias') {
-            return this._relationalCount(table, column);
+            return this._relationalCount(table, column, options);
         }
         throw new Error(`Couldn't extract type from ${table}.${column}`);
     }

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

@@ -9,5 +9,5 @@ export declare class FnHelperSQLite extends FnHelper {
     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>;
+    count(table: string, column: string, options?: FnHelperOptions): Knex.Raw<any>;
 }

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

@@ -57,14 +57,14 @@ class FnHelperSQLite extends types_1.FnHelper {
             column,
         ]);
     }
-    count(table, column) {
+    count(table, column, options) {
         var _a, _b, _c, _d, _e;
         const type = (_e = (_d = (_c = (_b = (_a = this.schema.collections) === null || _a === void 0 ? void 0 : _a[table]) === null || _b === void 0 ? void 0 : _b.fields) === null || _c === void 0 ? void 0 : _c[column]) === null || _d === void 0 ? void 0 : _d.type) !== null && _e !== void 0 ? _e : 'unknown';
         if (type === 'json') {
             return this.knex.raw(`json_array_length(??.??, '$')`, [table, column]);
         }
         if (type === 'alias') {
-            return this._relationalCount(table, column);
+            return this._relationalCount(table, column, options);
         }
         throw new Error(`Couldn't extract type from ${table}.${column}`);
     }

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

@@ -1,8 +1,9 @@
-import { SchemaOverview } from '@directus/shared/types';
+import { Query, SchemaOverview } from '@directus/shared/types';
 import { Knex } from 'knex';
 import { DatabaseHelper } from '../types';
 export declare type FnHelperOptions = {
     type?: string;
+    query?: Query;
 };
 export declare abstract class FnHelper extends DatabaseHelper {
     protected knex: Knex;
@@ -17,5 +18,5 @@ export declare abstract class FnHelper extends DatabaseHelper {
     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;
+    protected _relationalCount(table: string, column: string, options?: FnHelperOptions): Knex.Raw;
 }

package/dist/database/helpers/fn/types.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FnHelper = void 0;
+const apply_query_1 = require("../../../utils/apply-query");
 const types_1 = require("../types");
 class FnHelper extends types_1.DatabaseHelper {
     constructor(knex, schema) {
@@ -9,19 +10,21 @@ class FnHelper extends types_1.DatabaseHelper {
         this.schema = schema;
         this.schema = schema;
     }
-    _relationalCount(table, column) {
+    _relationalCount(table, column, options) {
+        var _a;
         const relation = this.schema.relations.find((relation) => { var _a; return relation.related_collection === table && ((_a = relation === null || relation === void 0 ? void 0 : relation.meta) === null || _a === void 0 ? void 0 : _a.one_field) === column; });
         const currentPrimary = this.schema.collections[table].primary;
         if (!relation) {
             throw new Error(`Field ${table}.${column} isn't a nested relational collection`);
         }
-        return this.knex.raw('(' +
-            this.knex
-                .count('*')
-                .from(relation.collection)
-                .where(relation.field, '=', this.knex.raw(`??.??`, [table, currentPrimary]))
-                .toQuery() +
-            ')');
+        let countQuery = this.knex
+            .count('*')
+            .from(relation.collection)
+            .where(relation.field, '=', this.knex.raw(`??.??`, [table, currentPrimary]));
+        if ((_a = options === null || options === void 0 ? void 0 : options.query) === null || _a === void 0 ? void 0 : _a.filter) {
+            countQuery = (0, apply_query_1.applyFilter)(this.knex, this.schema, countQuery, options.query.filter, relation.collection, false);
+        }
+        return this.knex.raw('(' + countQuery.toQuery() + ')');
     }
 }
 exports.FnHelper = FnHelper;

package/dist/database/helpers/index.d.ts

@@ -6,8 +6,8 @@ import * as geometryHelpers from './geometry';
 import * as schemaHelpers from './schema';
 export declare function getHelpers(database: Knex): {
     date: dateHelpers.postgres | dateHelpers.oracle | dateHelpers.mysql | dateHelpers.mssql | dateHelpers.sqlite;
-    st: geometryHelpers.postgres | geometryHelpers.redshift | geometryHelpers.oracle | geometryHelpers.sqlite | geometryHelpers.mysql | geometryHelpers.mssql;
-    schema: schemaHelpers.postgres | schemaHelpers.cockroachdb | schemaHelpers.oracle;
+    st: geometryHelpers.sqlite | geometryHelpers.postgres | geometryHelpers.mysql | geometryHelpers.oracle | geometryHelpers.mssql | geometryHelpers.redshift;
+    schema: schemaHelpers.sqlite | schemaHelpers.postgres | schemaHelpers.cockroachdb | schemaHelpers.oracle;
 };
-export declare function getFunctions(database: Knex, schema: SchemaOverview): fnHelpers.postgres | fnHelpers.oracle | fnHelpers.sqlite | fnHelpers.mysql | fnHelpers.mssql;
+export declare function getFunctions(database: Knex, schema: SchemaOverview): fnHelpers.sqlite | fnHelpers.postgres | fnHelpers.mysql | fnHelpers.oracle | fnHelpers.mssql;
 export declare type Helpers = ReturnType<typeof getHelpers>;

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

@@ -0,0 +1,5 @@
+import { SchemaHelper } from '../types';
+export declare class SchemaHelperSQLite extends SchemaHelper {
+    preColumnDelete(): Promise<boolean>;
+    postColumnDelete(): Promise<void>;
+}

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

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SchemaHelperSQLite = void 0;
+const types_1 = require("../types");
+class SchemaHelperSQLite extends types_1.SchemaHelper {
+    async preColumnDelete() {
+        const foreignCheckStatus = (await this.knex.raw('PRAGMA foreign_keys'))[0].foreign_keys === 1;
+        if (foreignCheckStatus) {
+            await this.knex.raw('PRAGMA foreign_keys = OFF');
+        }
+        return foreignCheckStatus;
+    }
+    async postColumnDelete() {
+        await this.knex.raw('PRAGMA foreign_keys = ON');
+    }
+}
+exports.SchemaHelperSQLite = SchemaHelperSQLite;

package/dist/database/helpers/schema/index.d.ts

@@ -2,6 +2,6 @@ export { SchemaHelperDefault as postgres } from './dialects/default';
 export { SchemaHelperCockroachDb as cockroachdb } from './dialects/cockroachdb';
 export { SchemaHelperDefault as redshift } from './dialects/default';
 export { SchemaHelperOracle as oracle } from './dialects/oracle';
-export { SchemaHelperDefault as sqlite } from './dialects/default';
+export { SchemaHelperSQLite as sqlite } from './dialects/sqlite';
 export { SchemaHelperDefault as mysql } from './dialects/default';
 export { SchemaHelperDefault as mssql } from './dialects/default';

package/dist/database/helpers/schema/index.js

@@ -9,9 +9,9 @@ var default_2 = require("./dialects/default");
 Object.defineProperty(exports, "redshift", { enumerable: true, get: function () { return default_2.SchemaHelperDefault; } });
 var oracle_1 = require("./dialects/oracle");
 Object.defineProperty(exports, "oracle", { enumerable: true, get: function () { return oracle_1.SchemaHelperOracle; } });
+var sqlite_1 = require("./dialects/sqlite");
+Object.defineProperty(exports, "sqlite", { enumerable: true, get: function () { return sqlite_1.SchemaHelperSQLite; } });
 var default_3 = require("./dialects/default");
-Object.defineProperty(exports, "sqlite", { enumerable: true, get: function () { return default_3.SchemaHelperDefault; } });
+Object.defineProperty(exports, "mysql", { enumerable: true, get: function () { return default_3.SchemaHelperDefault; } });
 var default_4 = require("./dialects/default");
-Object.defineProperty(exports, "mysql", { enumerable: true, get: function () { return default_4.SchemaHelperDefault; } });
-var default_5 = require("./dialects/default");
-Object.defineProperty(exports, "mssql", { enumerable: true, get: function () { return default_5.SchemaHelperDefault; } });
+Object.defineProperty(exports, "mssql", { enumerable: true, get: function () { return default_4.SchemaHelperDefault; } });

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

@@ -21,5 +21,7 @@ export declare abstract class SchemaHelper extends DatabaseHelper {
         nullable?: boolean;
         default?: any;
     }>(table: string, column: string, options: Options, cb: (builder: Knex.CreateTableBuilder, column: string, options: Options) => Knex.ColumnBuilder): Promise<void>;
+    preColumnDelete(): Promise<boolean>;
+    postColumnDelete(): Promise<void>;
 }
 export {};

package/dist/database/helpers/schema/types.js

@@ -85,5 +85,11 @@ class SchemaHelper extends types_1.DatabaseHelper {
             await this.changeNullable(table, column, options.nullable);
         }
     }
+    async preColumnDelete() {
+        return false;
+    }
+    async postColumnDelete() {
+        return;
+    }
 }
 exports.SchemaHelper = SchemaHelper;

package/dist/database/run-ast.js

@@ -92,7 +92,7 @@ async function parseCurrentLevel(schema, collection, children, query) {
     const columnsToSelectInternal = [];
     const nestedCollectionNodes = [];
     for (const child of children) {
-        if (child.type === 'field') {
+        if (child.type === 'field' || child.type === 'functionField') {
             const fieldName = (0, strip_function_1.stripFunction)(child.name);
             if (columnsInCollection.includes(fieldName)) {
                 columnsToSelectInternal.push(child.fieldKey);
@@ -121,7 +121,7 @@ async function parseCurrentLevel(schema, collection, children, query) {
     const columnsToSelect = [...new Set(columnsToSelectInternal)];
     const fieldNodes = columnsToSelect.map((column) => {
         var _a;
-        return (_a = children.find((childNode) => childNode.type === 'field' && childNode.fieldKey === column)) !== null && _a !== void 0 ? _a : {
+        return (_a = children.find((childNode) => (childNode.type === 'field' || childNode.type === 'functionField') && childNode.fieldKey === column)) !== null && _a !== void 0 ? _a : {
             type: 'field',
             name: column,
             fieldKey: column,
@@ -138,7 +138,7 @@ function getColumnPreprocessor(knex, schema, table) {
             alias = fieldNode.fieldKey;
         }
         let field;
-        if (fieldNode.type === 'field') {
+        if (fieldNode.type === 'field' || fieldNode.type === 'functionField') {
             field = schema.collections[table].fields[(0, strip_function_1.stripFunction)(fieldNode.name)];
         }
         else {
@@ -147,6 +147,9 @@ function getColumnPreprocessor(knex, schema, table) {
         if ((_a = field === null || field === void 0 ? void 0 : field.type) === null || _a === void 0 ? void 0 : _a.startsWith('geometry')) {
             return helpers.st.asText(table, field.field);
         }
+        if (fieldNode.type === 'functionField') {
+            return (0, get_column_1.getColumn)(knex, table, fieldNode.name, alias, schema, fieldNode.query);
+        }
         return (0, get_column_1.getColumn)(knex, table, fieldNode.name, alias, schema);
     };
 }
@@ -299,7 +302,7 @@ function removeTemporaryFields(schema, rawItem, ast, primaryKeyField, parentItem
             if (!nestedCollectionNodes[relatedCollection])
                 nestedCollectionNodes[relatedCollection] = [];
             for (const child of ast.children[relatedCollection]) {
-                if (child.type === 'field') {
+                if (child.type === 'field' || child.type === 'functionField') {
                     fields[relatedCollection].push(child.name);
                 }
                 else {
@@ -325,7 +328,7 @@ function removeTemporaryFields(schema, rawItem, ast, primaryKeyField, parentItem
         const nestedCollectionNodes = [];
         for (const child of ast.children) {
             fields.push(child.fieldKey);
-            if (child.type !== 'field') {
+            if (child.type !== 'field' && child.type !== 'functionField') {
                 nestedCollectionNodes.push(child);
             }
         }

package/dist/emitter.js

@@ -21,12 +21,17 @@ class Emitter {
     }
     async emitFilter(event, payload, meta, context) {
         const events = Array.isArray(event) ? event : [event];
-        const listeners = events.flatMap((event) => this.filterEmitter.listeners(event));
+        const eventListeners = events.map((event) => ({
+            event,
+            listeners: this.filterEmitter.listeners(event),
+        }));
         let updatedPayload = payload;
-        for (const listener of listeners) {
-            const result = await listener(updatedPayload, meta, context);
-            if (result !== undefined) {
-                updatedPayload = result;
+        for (const { event, listeners } of eventListeners) {
+            for (const listener of listeners) {
+                const result = await listener(updatedPayload, { event, ...meta }, context);
+                if (result !== undefined) {
+                    updatedPayload = result;
+                }
             }
         }
         return updatedPayload;
@@ -34,7 +39,7 @@ class Emitter {
     emitAction(event, meta, context) {
         const events = Array.isArray(event) ? event : [event];
         for (const event of events) {
-            this.actionEmitter.emitAsync(event, meta, context).catch((err) => {
+            this.actionEmitter.emitAsync(event, { event, ...meta }, context).catch((err) => {
                 logger_1.default.warn(`An error was thrown while executing action "${event}"`);
                 logger_1.default.warn(err);
             });
@@ -42,7 +47,7 @@ class Emitter {
     }
     async emitInit(event, meta) {
         try {
-            await this.initEmitter.emitAsync(event, meta);
+            await this.initEmitter.emitAsync(event, { event, ...meta });
         }
         catch (err) {
             logger_1.default.warn(`An error was thrown while executing init "${event}"`);

package/dist/logger.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="qs" />
 import { RequestHandler } from 'express';
 import pino from 'pino';
 declare const logger: pino.Logger;

package/dist/middleware/authenticate.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="qs" />
 import { NextFunction, Request, Response } from 'express';
 /**
  * Verify the passed JWT and assign the user ID and role to `req`

package/dist/middleware/cache.js

@@ -10,15 +10,15 @@ const get_cache_headers_1 = require("../utils/get-cache-headers");
 const get_cache_key_1 = require("../utils/get-cache-key");
 const logger_1 = __importDefault(require("../logger"));
 const checkCacheMiddleware = (0, async_handler_1.default)(async (req, res, next) => {
-    var _a, _b;
+    var _a, _b, _c;
     const { cache } = (0, cache_1.getCache)();
-    if (req.method.toLowerCase() !== 'get')
+    if (req.method.toLowerCase() !== 'get' && ((_a = req.path) === null || _a === void 0 ? void 0 : _a.startsWith('/graphql')) === false)
         return next();
     if (env_1.default.CACHE_ENABLED !== true)
         return next();
     if (!cache)
         return next();
-    if (((_a = req.headers['cache-control']) === null || _a === void 0 ? void 0 : _a.includes('no-store')) || ((_b = req.headers['Cache-Control']) === null || _b === void 0 ? void 0 : _b.includes('no-store'))) {
+    if (((_b = req.headers['cache-control']) === null || _b === void 0 ? void 0 : _b.includes('no-store')) || ((_c = req.headers['Cache-Control']) === null || _c === void 0 ? void 0 : _c.includes('no-store'))) {
         if (env_1.default.CACHE_STATUS_HEADER)
             res.setHeader(`${env_1.default.CACHE_STATUS_HEADER}`, 'MISS');
         return next();

package/dist/middleware/graphql.js

@@ -47,14 +47,16 @@ exports.parseGraphQL = (0, async_handler_1.default)(async (req, res, next) => {
             graphqlErrors: [err],
         });
     }
+    const operationAST = (0, graphql_1.getOperationAST)(document, operationName);
     // You can only do `query` through GET
-    if (req.method === 'GET') {
-        const operationAST = (0, graphql_1.getOperationAST)(document, operationName);
-        if ((operationAST === null || operationAST === void 0 ? void 0 : operationAST.operation) !== 'query') {
-            throw new exceptions_1.MethodNotAllowedException(`Can only perform a ${operationAST === null || operationAST === void 0 ? void 0 : operationAST.operation} from a POST request.`, {
-                allow: ['POST'],
-            });
-        }
+    if (req.method === 'GET' && (operationAST === null || operationAST === void 0 ? void 0 : operationAST.operation) !== 'query') {
+        throw new exceptions_1.MethodNotAllowedException(`Can only perform a ${operationAST === null || operationAST === void 0 ? void 0 : operationAST.operation} from a POST request.`, {
+            allow: ['POST'],
+        });
+    }
+    // Prevent caching responses when mutations are made
+    if ((operationAST === null || operationAST === void 0 ? void 0 : operationAST.operation) === 'mutation') {
+        res.locals.cache = false;
     }
     res.locals.graphqlParams = { document, query, variables, operationName, contextValue: { req, res } };
     return next();

package/dist/middleware/respond.js

@@ -16,7 +16,7 @@ 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;
+    var _a, _b, _c, _d;
     const { cache } = (0, cache_1.getCache)();
     let exceedsMaxSize = false;
     if (env_1.default.CACHE_VALUE_MAX_SIZE !== false) {
@@ -24,7 +24,7 @@ exports.respond = (0, async_handler_1.default)(async (req, res) => {
         const maxSize = (0, bytes_1.parse)(env_1.default.CACHE_VALUE_MAX_SIZE);
         exceedsMaxSize = valueSize > maxSize;
     }
-    if (req.method.toLowerCase() === 'get' &&
+    if ((req.method.toLowerCase() === 'get' || ((_a = req.path) === null || _a === void 0 ? void 0 : _a.startsWith('/graphql'))) &&
         env_1.default.CACHE_ENABLED === true &&
         cache &&
         !req.sanitizedQuery.export &&
@@ -59,17 +59,17 @@ exports.respond = (0, async_handler_1.default)(async (req, res) => {
         if (req.sanitizedQuery.export === 'json') {
             res.attachment(`${filename}.json`);
             res.set('Content-Type', 'application/json');
-            return res.status(200).send(exportService.transform((_a = res.locals.payload) === null || _a === void 0 ? void 0 : _a.data, 'json'));
+            return res.status(200).send(exportService.transform((_b = res.locals.payload) === null || _b === void 0 ? void 0 : _b.data, 'json'));
         }
         if (req.sanitizedQuery.export === 'xml') {
             res.attachment(`${filename}.xml`);
             res.set('Content-Type', 'text/xml');
-            return res.status(200).send(exportService.transform((_b = res.locals.payload) === null || _b === void 0 ? void 0 : _b.data, 'xml'));
+            return res.status(200).send(exportService.transform((_c = res.locals.payload) === null || _c === void 0 ? void 0 : _c.data, 'xml'));
         }
         if (req.sanitizedQuery.export === 'csv') {
             res.attachment(`${filename}.csv`);
             res.set('Content-Type', 'text/csv');
-            return res.status(200).send(exportService.transform((_c = res.locals.payload) === null || _c === void 0 ? void 0 : _c.data, 'csv'));
+            return res.status(200).send(exportService.transform((_d = res.locals.payload) === null || _d === void 0 ? void 0 : _d.data, 'csv'));
         }
     }
     if (Buffer.isBuffer(res.locals.payload)) {

package/dist/operations/item-read/index.d.ts

@@ -3,6 +3,7 @@ declare type Options = {
     collection: string;
     key?: PrimaryKey | PrimaryKey[] | null;
     query?: Record<string, any> | string | null;
+    emitEvents: boolean;
     permissions: string;
 };
 declare const _default: import("@directus/shared/types").OperationApiConfig<Options>;