directus 9.23.1 → 9.23.4

package/dist/services/users.js

@@ -4,22 +4,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UsersService = void 0;
+const exceptions_1 = require("@directus/shared/exceptions");
+const utils_1 = require("@directus/shared/utils");
 const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
 const lodash_1 = require("lodash");
+const perf_hooks_1 = require("perf_hooks");
 const database_1 = __importDefault(require("../database"));
 const env_1 = __importDefault(require("../env"));
-const exceptions_1 = require("@directus/shared/exceptions");
 const exceptions_2 = require("../exceptions");
 const record_not_unique_1 = require("../exceptions/database/record-not-unique");
 const is_url_allowed_1 = __importDefault(require("../utils/is-url-allowed"));
-const utils_1 = require("@directus/shared/utils");
+const stall_1 = require("../utils/stall");
 const url_1 = require("../utils/url");
 const items_1 = require("./items");
 const mail_1 = require("./mail");
 const settings_1 = require("./settings");
-const stall_1 = require("../utils/stall");
-const perf_hooks_1 = require("perf_hooks");
-const utils_2 = require("@directus/shared/utils");
 class UsersService extends items_1.ItemsService {
     constructor(options) {
         super('directus_users', options);
@@ -96,7 +95,7 @@ class UsersService extends items_1.ItemsService {
             .andWhere({ 'directus_roles.admin_access': true })
             .leftJoin('directus_roles', 'directus_users.role', 'directus_roles.id')
             .first();
-        const otherAdminUsersCount = +((otherAdminUsers === null || otherAdminUsers === void 0 ? void 0 : otherAdminUsers.count) || 0);
+        const otherAdminUsersCount = +(otherAdminUsers?.count || 0);
         if (otherAdminUsersCount === 0) {
             throw new exceptions_2.UnprocessableEntityException(`You can't remove the last admin user from the role.`);
         }
@@ -113,7 +112,7 @@ class UsersService extends items_1.ItemsService {
             .andWhere({ 'directus_users.status': 'active' })
             .leftJoin('directus_roles', 'directus_users.role', 'directus_roles.id')
             .first();
-        const otherAdminUsersCount = +((otherAdminUsers === null || otherAdminUsers === void 0 ? void 0 : otherAdminUsers.count) || 0);
+        const otherAdminUsersCount = +(otherAdminUsers?.count || 0);
         if (otherAdminUsersCount === 0) {
             throw new exceptions_2.UnprocessableEntityException(`You can't change the active status of the last admin user.`);
         }
@@ -129,8 +128,8 @@ class UsersService extends items_1.ItemsService {
      * Create multiple new users
      */
     async createMany(data, opts) {
-        const emails = data.map((payload) => payload.email).filter((email) => email);
-        const passwords = data.map((payload) => payload.password).filter((password) => password);
+        const emails = data['map']((payload) => payload['email']).filter((email) => email);
+        const passwords = data['map']((payload) => payload['password']).filter((password) => password);
         try {
             if (emails.length) {
                 await this.checkUniqueEmails(emails);
@@ -179,46 +178,45 @@ class UsersService extends items_1.ItemsService {
      * Update many users by primary key
      */
     async updateMany(keys, data, opts) {
-        var _a, _b;
         try {
-            if (data.role) {
-                // data.role will be an object with id with GraphQL mutations
-                const roleId = (_b = (_a = data.role) === null || _a === void 0 ? void 0 : _a.id) !== null && _b !== void 0 ? _b : data.role;
+            if (data['role']) {
+                // data['role'] will be an object with id with GraphQL mutations
+                const roleId = data['role']?.id ?? data['role'];
                 const newRole = await this.knex.select('admin_access').from('directus_roles').where('id', roleId).first();
-                if (!(newRole === null || newRole === void 0 ? void 0 : newRole.admin_access)) {
+                if (!newRole?.admin_access) {
                     await this.checkRemainingAdminExistence(keys);
                 }
             }
-            if (data.status !== undefined && data.status !== 'active') {
+            if (data['status'] !== undefined && data['status'] !== 'active') {
                 await this.checkRemainingActiveAdmin(keys);
             }
-            if (data.email) {
+            if (data['email']) {
                 if (keys.length > 1) {
                     throw new record_not_unique_1.RecordNotUniqueException('email', {
                         collection: 'directus_users',
                         field: 'email',
-                        invalid: data.email,
+                        invalid: data['email'],
                     });
                 }
-                await this.checkUniqueEmails([data.email], keys[0]);
+                await this.checkUniqueEmails([data['email']], keys[0]);
             }
-            if (data.password) {
-                await this.checkPasswordPolicy([data.password]);
+            if (data['password']) {
+                await this.checkPasswordPolicy([data['password']]);
             }
-            if (data.tfa_secret !== undefined) {
+            if (data['tfa_secret'] !== undefined) {
                 throw new exceptions_2.InvalidPayloadException(`You can't change the "tfa_secret" value manually.`);
             }
-            if (data.provider !== undefined) {
+            if (data['provider'] !== undefined) {
                 if (this.accountability && this.accountability.admin !== true) {
                     throw new exceptions_2.InvalidPayloadException(`You can't change the "provider" value manually.`);
                 }
-                data.auth_data = null;
+                data['auth_data'] = null;
             }
-            if (data.external_identifier !== undefined) {
+            if (data['external_identifier'] !== undefined) {
                 if (this.accountability && this.accountability.admin !== true) {
                     throw new exceptions_2.InvalidPayloadException(`You can't change the "external_identifier" value manually.`);
                 }
-                data.auth_data = null;
+                data['auth_data'] = null;
             }
         }
         catch (err) {
@@ -265,7 +263,7 @@ class UsersService extends items_1.ItemsService {
     async inviteUser(email, role, url, subject) {
         const opts = {};
         try {
-            if (url && (0, is_url_allowed_1.default)(url, env_1.default.USER_INVITE_URL_ALLOW_LIST) === false) {
+            if (url && (0, is_url_allowed_1.default)(url, env_1.default['USER_INVITE_URL_ALLOW_LIST']) === false) {
                 throw new exceptions_2.InvalidPayloadException(`Url "${url}" can't be used to invite users.`);
             }
         }
@@ -279,9 +277,9 @@ class UsersService extends items_1.ItemsService {
         });
         for (const email of emails) {
             const payload = { email, scope: 'invite' };
-            const token = jsonwebtoken_1.default.sign(payload, env_1.default.SECRET, { expiresIn: '7d', issuer: 'directus' });
-            const subjectLine = subject !== null && subject !== void 0 ? subject : "You've been invited";
-            const inviteURL = url ? new url_1.Url(url) : new url_1.Url(env_1.default.PUBLIC_URL).addPath('admin', 'accept-invite');
+            const token = jsonwebtoken_1.default.sign(payload, env_1.default['SECRET'], { expiresIn: '7d', issuer: 'directus' });
+            const subjectLine = subject ?? "You've been invited";
+            const inviteURL = url ? new url_1.Url(url) : new url_1.Url(env_1.default['PUBLIC_URL']).addPath('admin', 'accept-invite');
             inviteURL.setQuery('token', token);
             // Create user first to verify uniqueness
             await this.createOne({ email, role, status: 'invited' }, opts);
@@ -299,11 +297,11 @@ class UsersService extends items_1.ItemsService {
         }
     }
     async acceptInvite(token, password) {
-        const { email, scope } = jsonwebtoken_1.default.verify(token, env_1.default.SECRET, { issuer: 'directus' });
+        const { email, scope } = jsonwebtoken_1.default.verify(token, env_1.default['SECRET'], { issuer: 'directus' });
         if (scope !== 'invite')
             throw new exceptions_2.ForbiddenException();
         const user = await this.knex.select('id', 'status').from('directus_users').where({ email }).first();
-        if ((user === null || user === void 0 ? void 0 : user.status) !== 'invited') {
+        if (user?.status !== 'invited') {
             throw new exceptions_2.InvalidPayloadException(`Email address ${email} hasn't been invited.`);
         }
         // Allow unauthenticated update
@@ -321,11 +319,11 @@ class UsersService extends items_1.ItemsService {
             .from('directus_users')
             .whereRaw('LOWER(??) = ?', ['email', email.toLowerCase()])
             .first();
-        if ((user === null || user === void 0 ? void 0 : user.status) !== 'active') {
+        if (user?.status !== 'active') {
             await (0, stall_1.stall)(STALL_TIME, timeStart);
             throw new exceptions_2.ForbiddenException();
         }
-        if (url && (0, is_url_allowed_1.default)(url, env_1.default.PASSWORD_RESET_URL_ALLOW_LIST) === false) {
+        if (url && (0, is_url_allowed_1.default)(url, env_1.default['PASSWORD_RESET_URL_ALLOW_LIST']) === false) {
             throw new exceptions_2.InvalidPayloadException(`Url "${url}" can't be used to reset passwords.`);
         }
         const mailService = new mail_1.MailService({
@@ -333,11 +331,11 @@ class UsersService extends items_1.ItemsService {
             knex: this.knex,
             accountability: this.accountability,
         });
-        const payload = { email, scope: 'password-reset', hash: (0, utils_2.getSimpleHash)('' + user.password) };
-        const token = jsonwebtoken_1.default.sign(payload, env_1.default.SECRET, { expiresIn: '1d', issuer: 'directus' });
+        const payload = { email, scope: 'password-reset', hash: (0, utils_1.getSimpleHash)('' + user.password) };
+        const token = jsonwebtoken_1.default.sign(payload, env_1.default['SECRET'], { expiresIn: '1d', issuer: 'directus' });
         const acceptURL = url
             ? new url_1.Url(url).setQuery('token', token).toString()
-            : new url_1.Url(env_1.default.PUBLIC_URL).addPath('admin', 'reset-password').setQuery('token', token);
+            : new url_1.Url(env_1.default['PUBLIC_URL']).addPath('admin', 'reset-password').setQuery('token', token);
         const subjectLine = subject ? subject : 'Password Reset Request';
         await mailService.send({
             to: email,
@@ -353,8 +351,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' });
+        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();
         const opts = {};
@@ -365,7 +362,7 @@ class UsersService extends items_1.ItemsService {
             opts.preMutationException = err;
         }
         const user = await this.knex.select('id', 'status', 'password').from('directus_users').where({ email }).first();
-        if ((user === null || user === void 0 ? void 0 : user.status) !== 'active' || hash !== (0, utils_2.getSimpleHash)('' + user.password)) {
+        if (user?.status !== 'active' || hash !== (0, utils_1.getSimpleHash)('' + user.password)) {
             throw new exceptions_2.ForbiddenException();
         }
         // Allow unauthenticated update
@@ -373,7 +370,7 @@ class UsersService extends items_1.ItemsService {
             knex: this.knex,
             schema: this.schema,
             accountability: {
-                ...((_a = this.accountability) !== null && _a !== void 0 ? _a : { role: null }),
+                ...(this.accountability ?? { role: null }),
                 admin: true, // We need to skip permissions checks for the update call below
             },
         });

package/dist/services/utils.d.ts

@@ -1,6 +1,6 @@
-import { Knex } from 'knex';
-import { AbstractServiceOptions, PrimaryKey } from '../types';
-import { Accountability, SchemaOverview } from '@directus/shared/types';
+import type { Accountability, SchemaOverview } from '@directus/shared/types';
+import type { Knex } from 'knex';
+import type { AbstractServiceOptions, PrimaryKey } from '../types';
 export declare class UtilsService {
     knex: Knex;
     accountability: Accountability | null;

package/dist/services/utils.js

@@ -6,30 +6,32 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UtilsService = void 0;
 const database_1 = __importDefault(require("../database"));
 const collections_1 = require("../database/system-data/collections");
-const exceptions_1 = require("../exceptions");
 const emitter_1 = __importDefault(require("../emitter"));
+const exceptions_1 = require("../exceptions");
 class UtilsService {
+    knex;
+    accountability;
+    schema;
     constructor(options) {
         this.knex = options.knex || (0, database_1.default)();
         this.accountability = options.accountability || null;
         this.schema = options.schema;
     }
     async sort(collection, { item, to }) {
-        var _a, _b, _c, _d;
         const sortFieldResponse = (await this.knex.select('sort_field').from('directus_collections').where({ collection }).first()) ||
             collections_1.systemCollectionRows;
-        const sortField = sortFieldResponse === null || sortFieldResponse === void 0 ? void 0 : sortFieldResponse.sort_field;
+        const sortField = sortFieldResponse?.sort_field;
         if (!sortField) {
             throw new exceptions_1.InvalidPayloadException(`Collection "${collection}" doesn't have a sort field.`);
         }
-        if (((_a = this.accountability) === null || _a === void 0 ? void 0 : _a.admin) !== true) {
-            const permissions = (_c = (_b = this.accountability) === null || _b === void 0 ? void 0 : _b.permissions) === null || _c === void 0 ? void 0 : _c.find((permission) => {
+        if (this.accountability?.admin !== true) {
+            const permissions = this.accountability?.permissions?.find((permission) => {
                 return permission.collection === collection && permission.action === 'update';
             });
             if (!permissions) {
                 throw new exceptions_1.ForbiddenException();
             }
-            const allowedFields = (_d = permissions.fields) !== null && _d !== void 0 ? _d : [];
+            const allowedFields = permissions.fields ?? [];
             if (allowedFields[0] !== '*' && allowedFields.includes(sortField) === false) {
                 throw new exceptions_1.ForbiddenException();
             }
@@ -37,7 +39,7 @@ class UtilsService {
         const primaryKeyField = this.schema.collections[collection].primary;
         // Make sure all rows have a sort value
         const countResponse = await this.knex.count('* as count').from(collection).whereNull(sortField).first();
-        if ((countResponse === null || countResponse === void 0 ? void 0 : countResponse.count) && +countResponse.count !== 0) {
+        if (countResponse?.count && +countResponse.count !== 0) {
             const lastSortValueResponse = await this.knex.max(sortField).from(collection).first();
             const rowsWithoutSortValue = await this.knex
                 .select(primaryKeyField, sortField)
@@ -59,7 +61,7 @@ class UtilsService {
             .groupBy(sortField)
             .from(collection)
             .havingRaw('count(??) > 1', [sortField]);
-        if ((duplicates === null || duplicates === void 0 ? void 0 : duplicates.length) > 0) {
+        if (duplicates?.length > 0) {
             const ids = await this.knex.select(primaryKeyField).from(collection).orderBy(sortField);
             // This might not scale that well, but I don't really know how to accurately set all rows
             // to a sequential value that works cross-DB vendor otherwise

package/dist/services/webhooks.d.ts

@@ -1,6 +1,6 @@
-import { AbstractServiceOptions, Item, PrimaryKey, Webhook, MutationOptions } from '../types';
-import { ItemsService } from './items';
 import { Messenger } from '../messenger';
+import type { AbstractServiceOptions, Item, MutationOptions, PrimaryKey, Webhook } from '../types';
+import { ItemsService } from './items';
 export declare class WebhooksService extends ItemsService<Webhook> {
     messenger: Messenger;
     constructor(options: AbstractServiceOptions);

package/dist/services/webhooks.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebhooksService = void 0;
-const items_1 = require("./items");
 const messenger_1 = require("../messenger");
+const items_1 = require("./items");
 class WebhooksService extends items_1.ItemsService {
+    messenger;
     constructor(options) {
         super('directus_webhooks', options);
         this.messenger = (0, messenger_1.getMessenger)();

package/dist/storage/register-locations.js

@@ -6,7 +6,7 @@ const env_1 = require("../env");
 const get_config_from_env_1 = require("../utils/get-config-from-env");
 const registerLocations = async (storage) => {
     const env = (0, env_1.getEnv)();
-    const locations = (0, utils_1.toArray)(env.STORAGE_LOCATIONS);
+    const locations = (0, utils_1.toArray)(env['STORAGE_LOCATIONS']);
     locations.forEach((location) => {
         location = location.trim();
         const driverConfig = (0, get_config_from_env_1.getConfigFromEnv)(`STORAGE_${location.toUpperCase()}_`);

package/dist/types/assets.d.ts

@@ -1,4 +1,4 @@
-import { ResizeOptions, Sharp } from 'sharp';
+import type { ResizeOptions, Sharp } from 'sharp';
 export declare const TransformationMethods: readonly ["toFormat", "jpeg", "png", "tiff", "webp", "resize", "extend", "extract", "trim", "rotate", "flip", "flop", "sharpen", "median", "blur", "flatten", "gamma", "negate", "normalise", "normalize", "clahe", "convolve", "threshold", "linear", "recomb", "modulate", "tint", "greyscale", "grayscale", "toColorspace", "toColourspace", "removeAlpha", "ensureAlpha", "extractChannel", "bandbool"];
 type AllowedSharpMethods = Pick<Sharp, (typeof TransformationMethods)[number]>;
 export type TransformationMap = {

package/dist/types/ast.d.ts

@@ -1,4 +1,4 @@
-import { Query, Relation } from '@directus/shared/types';
+import type { Query, Relation } from '@directus/shared/types';
 export type M2ONode = {
     type: 'm2o';
     name: string;

package/dist/types/auth.d.ts

@@ -1,5 +1,5 @@
-import { SchemaOverview } from '@directus/shared/types';
-import { Knex } from 'knex';
+import type { SchemaOverview } from '@directus/shared/types';
+import type { Knex } from 'knex';
 export interface AuthDriverOptions {
     knex: Knex;
     schema: SchemaOverview;

package/dist/types/collection.d.ts

@@ -1,5 +1,5 @@
-import { Table } from 'knex-schema-inspector/dist/types/table';
-import { Field } from '@directus/shared/types';
+import type { Field } from '@directus/shared/types';
+import type { Table } from 'knex-schema-inspector/dist/types/table';
 export type CollectionMeta = {
     collection: string;
     note: string | null;

package/dist/types/events.d.ts

@@ -1,5 +1,5 @@
-import { ActionHandler, FilterHandler, InitHandler } from '@directus/shared/types';
-import { ScheduledTask } from 'node-cron';
+import type { ActionHandler, FilterHandler, InitHandler } from '@directus/shared/types';
+import type { ScheduledTask } from 'node-cron';
 export type EventHandler = {
     type: 'filter';
     name: string;

package/dist/types/graphql.d.ts

@@ -1,5 +1,5 @@
-import { Request, Response } from 'express';
-import { DocumentNode } from 'graphql';
+import type { Request, Response } from 'express';
+import type { DocumentNode } from 'graphql';
 export interface GraphQLParams {
     query: string | null;
     variables: {

package/dist/types/items.d.ts

@@ -2,8 +2,8 @@
  * I know this looks a little silly, but it allows us to explicitly differentiate between when we're
  * expecting an item vs any other generic object.
  */
-import { BaseException } from '@directus/shared/exceptions';
-import { EventContext } from '@directus/shared/types';
+import type { BaseException } from '@directus/shared/exceptions';
+import type { EventContext } from '@directus/shared/types';
 export type Item = Record<string, any>;
 export type PrimaryKey = string | number;
 export type Alterations = {
@@ -31,7 +31,7 @@ export type MutationOptions = {
     /**
      * Allow disabling the emitting of hooks. Useful if a custom hook is fired (like files.upload)
      */
-    emitEvents?: boolean;
+    emitEvents?: boolean | undefined;
     /**
      * To bypass the emitting of action events if emitEvents is enabled
      * Can be used to queue up the nested events from item service's create, update and delete

package/dist/types/services.d.ts

@@ -1,14 +1,14 @@
-import { Knex } from 'knex';
-import { Accountability, Query, SchemaOverview } from '@directus/shared/types';
-import { Item, PrimaryKey } from './items';
+import type { Accountability, Query, SchemaOverview } from '@directus/shared/types';
+import type { Knex } from 'knex';
+import type { Item, PrimaryKey } from './items';
 export type AbstractServiceOptions = {
     knex?: Knex;
-    accountability?: Accountability | null;
+    accountability?: Accountability | null | undefined;
     schema: SchemaOverview;
 };
 export interface AbstractService {
     knex: Knex;
-    accountability: Accountability | null;
+    accountability: Accountability | null | undefined;
     createOne(data: Partial<Item>): Promise<PrimaryKey>;
     createMany(data: Partial<Item>[]): Promise<PrimaryKey[]>;
     readOne(key: PrimaryKey, query?: Query): Promise<Item>;

package/dist/types/snapshot.d.ts

@@ -1,7 +1,7 @@
-import { Collection } from './collection';
-import { Relation, RelationMeta, Field, FieldMeta } from '@directus/shared/types';
-import { Diff } from 'deep-diff';
-import { DatabaseClient } from './database';
+import type { Field, FieldMeta, Relation, RelationMeta } from '@directus/shared/types';
+import type { Diff } from 'deep-diff';
+import type { Collection } from './collection';
+import type { DatabaseClient } from './database';
 export type Snapshot = {
     version: number;
     directus: string;

package/dist/utils/apply-diff.d.ts

@@ -1,7 +1,7 @@
-import { SchemaOverview } from '@directus/shared/types';
-import { Knex } from 'knex';
-import { Snapshot, SnapshotDiff, SnapshotField } from '../types';
+import type { SchemaOverview } from '@directus/shared/types';
 import { Diff } from 'deep-diff';
+import type { Knex } from 'knex';
+import { Snapshot, SnapshotDiff, SnapshotField } from '../types';
 export declare function applyDiff(currentSnapshot: Snapshot, snapshotDiff: SnapshotDiff, options?: {
     database?: Knex;
     schema?: SchemaOverview;

package/dist/utils/apply-diff.js

@@ -4,19 +4,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isNestedMetaUpdate = exports.applyDiff = void 0;
-const services_1 = require("../services");
-const types_1 = require("../types");
-const get_schema_1 = require("./get-schema");
-const database_1 = __importDefault(require("../database"));
 const deep_diff_1 = require("deep-diff");
 const lodash_1 = require("lodash");
-const logger_1 = __importDefault(require("../logger"));
-const emitter_1 = __importDefault(require("../emitter"));
 const cache_1 = require("../cache");
+const database_1 = __importDefault(require("../database"));
+const emitter_1 = __importDefault(require("../emitter"));
+const logger_1 = __importDefault(require("../logger"));
+const services_1 = require("../services");
+const types_1 = require("../types");
+const get_schema_1 = require("./get-schema");
 async function applyDiff(currentSnapshot, snapshotDiff, options) {
-    var _a, _b;
-    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, bypassCache: true }));
+    const database = options?.database ?? (0, database_1.default)();
+    const schema = options?.schema ?? (await (0, get_schema_1.getSchema)({ database, bypassCache: true }));
     const nestedActionEvents = [];
     const mutationOptions = {
         autoPurgeSystemCache: false,
@@ -24,24 +23,23 @@ async function applyDiff(currentSnapshot, snapshotDiff, options) {
     };
     await database.transaction(async (trx) => {
         const collectionsService = new services_1.CollectionsService({ knex: trx, schema });
-        const getNestedCollectionsToCreate = (currentLevelCollection) => snapshotDiff.collections.filter(({ diff }) => { var _a, _b; return ((_b = (_a = diff[0].rhs) === null || _a === void 0 ? void 0 : _a.meta) === null || _b === void 0 ? void 0 : _b.group) === currentLevelCollection; });
-        const getNestedCollectionsToDelete = (currentLevelCollection) => snapshotDiff.collections.filter(({ diff }) => { var _a, _b; return ((_b = (_a = diff[0].lhs) === null || _a === void 0 ? void 0 : _a.meta) === null || _b === void 0 ? void 0 : _b.group) === currentLevelCollection; });
+        const getNestedCollectionsToCreate = (currentLevelCollection) => snapshotDiff.collections.filter(({ diff }) => diff[0].rhs?.meta?.group === currentLevelCollection);
+        const getNestedCollectionsToDelete = (currentLevelCollection) => snapshotDiff.collections.filter(({ diff }) => diff[0].lhs?.meta?.group === currentLevelCollection);
         const createCollections = async (collections) => {
             for (const { collection, diff } of collections) {
-                if ((diff === null || diff === void 0 ? void 0 : diff[0].kind) === types_1.DiffKind.NEW && diff[0].rhs) {
+                if (diff?.[0].kind === types_1.DiffKind.NEW && diff[0].rhs) {
                     // We'll nest the to-be-created fields in the same collection creation, to prevent
                     // creating a collection without a primary key
                     const fields = snapshotDiff.fields
                         .filter((fieldDiff) => fieldDiff.collection === collection)
                         .map((fieldDiff) => fieldDiff.diff[0].rhs)
                         .map((fieldDiff) => {
-                        var _a, _b, _c, _d, _e;
                         // Casts field type to UUID when applying non-PostgreSQL schema onto PostgreSQL database.
                         // This is needed because they snapshots UUID fields as char/varchar with length 36.
-                        if (['char', 'varchar'].includes(String((_a = fieldDiff.schema) === null || _a === void 0 ? void 0 : _a.data_type).toLowerCase()) &&
-                            ((_b = fieldDiff.schema) === null || _b === void 0 ? void 0 : _b.max_length) === 36 &&
-                            (((_c = fieldDiff.schema) === null || _c === void 0 ? void 0 : _c.is_primary_key) ||
-                                (((_d = fieldDiff.schema) === null || _d === void 0 ? void 0 : _d.foreign_key_table) && ((_e = fieldDiff.schema) === null || _e === void 0 ? void 0 : _e.foreign_key_column)))) {
+                        if (['char', 'varchar'].includes(String(fieldDiff.schema?.data_type).toLowerCase()) &&
+                            fieldDiff.schema?.max_length === 36 &&
+                            (fieldDiff.schema?.is_primary_key ||
+                                (fieldDiff.schema?.foreign_key_table && fieldDiff.schema?.foreign_key_column))) {
                             return (0, lodash_1.merge)(fieldDiff, { type: 'uuid', schema: { data_type: 'uuid', max_length: null } });
                         }
                         else {
@@ -66,7 +64,7 @@ async function applyDiff(currentSnapshot, snapshotDiff, options) {
         };
         const deleteCollections = async (collections) => {
             for (const { collection, diff } of collections) {
-                if ((diff === null || diff === void 0 ? void 0 : diff[0].kind) === types_1.DiffKind.DELETE) {
+                if (diff?.[0].kind === types_1.DiffKind.DELETE) {
                     const relations = schema.relations.filter((r) => r.related_collection === collection || r.collection === collection);
                     if (relations.length > 0) {
                         const relationsService = new services_1.RelationsService({ knex: trx, schema });
@@ -95,13 +93,12 @@ async function applyDiff(currentSnapshot, snapshotDiff, options) {
         };
         // Finds all collections that need to be created
         const filterCollectionsForCreation = ({ diff }) => {
-            var _a;
             // Check new collections only
             const isNewCollection = diff[0].kind === types_1.DiffKind.NEW;
             if (!isNewCollection)
                 return false;
             // Create now if no group
-            const groupName = (_a = diff[0].rhs.meta) === null || _a === void 0 ? void 0 : _a.group;
+            const groupName = diff[0].rhs.meta?.group;
             if (!groupName)
                 return true;
             // Check if parent collection already exists in schema
@@ -124,9 +121,9 @@ async function applyDiff(currentSnapshot, snapshotDiff, options) {
         // then continue with nested collections recursively
         await createCollections(snapshotDiff.collections.filter(filterCollectionsForCreation));
         // delete top level collections (no group) first, then continue with nested collections recursively
-        await deleteCollections(snapshotDiff.collections.filter(({ diff }) => { var _a; return diff[0].kind === types_1.DiffKind.DELETE && ((_a = diff[0].lhs.meta) === null || _a === void 0 ? void 0 : _a.group) === null; }));
+        await deleteCollections(snapshotDiff.collections.filter(({ diff }) => diff[0].kind === types_1.DiffKind.DELETE && diff[0].lhs.meta?.group === null));
         for (const { collection, diff } of snapshotDiff.collections) {
-            if ((diff === null || diff === void 0 ? void 0 : diff[0].kind) === types_1.DiffKind.EDIT || (diff === null || diff === void 0 ? void 0 : diff[0].kind) === types_1.DiffKind.ARRAY) {
+            if (diff?.[0].kind === types_1.DiffKind.EDIT || diff?.[0].kind === types_1.DiffKind.ARRAY) {
                 const currentCollection = currentSnapshot.collections.find((field) => {
                     return field.collection === collection;
                 });
@@ -150,7 +147,7 @@ async function applyDiff(currentSnapshot, snapshotDiff, options) {
             schema: await (0, get_schema_1.getSchema)({ database: trx, bypassCache: true }),
         });
         for (const { collection, field, diff } of snapshotDiff.fields) {
-            if ((diff === null || diff === void 0 ? void 0 : diff[0].kind) === types_1.DiffKind.NEW && !isNestedMetaUpdate(diff === null || diff === void 0 ? void 0 : diff[0])) {
+            if (diff?.[0].kind === types_1.DiffKind.NEW && !isNestedMetaUpdate(diff?.[0])) {
                 try {
                     await fieldsService.createField(collection, diff[0].rhs, undefined, mutationOptions);
                 }
@@ -159,7 +156,7 @@ async function applyDiff(currentSnapshot, snapshotDiff, options) {
                     throw err;
                 }
             }
-            if ((diff === null || diff === void 0 ? void 0 : diff[0].kind) === types_1.DiffKind.EDIT || (diff === null || diff === void 0 ? void 0 : diff[0].kind) === types_1.DiffKind.ARRAY || isNestedMetaUpdate(diff === null || diff === void 0 ? void 0 : diff[0])) {
+            if (diff?.[0].kind === types_1.DiffKind.EDIT || diff?.[0].kind === types_1.DiffKind.ARRAY || isNestedMetaUpdate(diff?.[0])) {
                 const currentField = currentSnapshot.fields.find((snapshotField) => {
                     return snapshotField.collection === collection && snapshotField.field === field;
                 });
@@ -177,7 +174,7 @@ async function applyDiff(currentSnapshot, snapshotDiff, options) {
                     }
                 }
             }
-            if ((diff === null || diff === void 0 ? void 0 : diff[0].kind) === types_1.DiffKind.DELETE && !isNestedMetaUpdate(diff === null || diff === void 0 ? void 0 : diff[0])) {
+            if (diff?.[0].kind === types_1.DiffKind.DELETE && !isNestedMetaUpdate(diff?.[0])) {
                 try {
                     await fieldsService.deleteField(collection, field, mutationOptions);
                 }
@@ -199,7 +196,7 @@ async function applyDiff(currentSnapshot, snapshotDiff, options) {
             for (const diffEdit of diff) {
                 (0, lodash_1.set)(structure, diffEdit.path, undefined);
             }
-            if ((diff === null || diff === void 0 ? void 0 : diff[0].kind) === types_1.DiffKind.NEW) {
+            if (diff?.[0].kind === types_1.DiffKind.NEW) {
                 try {
                     await relationsService.createOne(diff[0].rhs, mutationOptions);
                 }
@@ -208,7 +205,7 @@ async function applyDiff(currentSnapshot, snapshotDiff, options) {
                     throw err;
                 }
             }
-            if ((diff === null || diff === void 0 ? void 0 : diff[0].kind) === types_1.DiffKind.EDIT || (diff === null || diff === void 0 ? void 0 : diff[0].kind) === types_1.DiffKind.ARRAY) {
+            if (diff?.[0].kind === types_1.DiffKind.EDIT || diff?.[0].kind === types_1.DiffKind.ARRAY) {
                 const currentRelation = currentSnapshot.relations.find((relation) => {
                     return relation.collection === collection && relation.field === field;
                 });
@@ -226,7 +223,7 @@ async function applyDiff(currentSnapshot, snapshotDiff, options) {
                     }
                 }
             }
-            if ((diff === null || diff === void 0 ? void 0 : diff[0].kind) === types_1.DiffKind.DELETE) {
+            if (diff?.[0].kind === types_1.DiffKind.DELETE) {
                 try {
                     await relationsService.deleteOne(collection, field, mutationOptions);
                 }

package/dist/utils/apply-query.d.ts

@@ -1,5 +1,5 @@
-import { Aggregate, Filter, Query, SchemaOverview } from '@directus/shared/types';
-import { Knex } from 'knex';
+import type { Aggregate, Filter, Query, SchemaOverview } from '@directus/shared/types';
+import type { Knex } from 'knex';
 import { AliasMap } from './get-column-path';
 export declare const generateAlias: (size?: number | undefined) => string;
 /**
@@ -8,7 +8,7 @@ export declare const generateAlias: (size?: number | undefined) => string;
 export default function applyQuery(knex: Knex, collection: string, dbQuery: Knex.QueryBuilder, query: Query, schema: SchemaOverview, options?: {
     aliasMap?: AliasMap;
     isInnerQuery?: boolean;
-    hasMultiRelationalSort?: boolean;
+    hasMultiRelationalSort?: boolean | undefined;
 }): {
     query: Knex.QueryBuilder<any, any>;
     hasMultiRelationalFilter: boolean;