directus 9.4.2 → 9.5.2

package/dist/services/collections.js

@@ -66,24 +66,7 @@ class CollectionsService {
         // permission problems. This might not work reliably in MySQL, as it doesn't support DDL in
         // transactions.
         await this.knex.transaction(async (trx) => {
-            if (payload.meta) {
-                const collectionItemsService = new items_1.ItemsService('directus_collections', {
-                    knex: trx,
-                    accountability: this.accountability,
-                    schema: this.schema,
-                });
-                await collectionItemsService.createOne({
-                    ...payload.meta,
-                    collection: payload.collection,
-                });
-            }
             if (payload.schema) {
-                const fieldsService = new fields_1.FieldsService({ knex: trx, schema: this.schema });
-                const fieldItemsService = new items_1.ItemsService('directus_fields', {
-                    knex: trx,
-                    accountability: this.accountability,
-                    schema: this.schema,
-                });
                 // Directus heavily relies on the primary key of a collection, so we have to make sure that
                 // every collection that is created has a primary key. If no primary key field is created
                 // while making the collection, we default to an auto incremented id named `id`
@@ -114,6 +97,7 @@ class CollectionsService {
                     }
                     return field;
                 });
+                const fieldsService = new fields_1.FieldsService({ knex: trx, schema: this.schema });
                 await trx.schema.createTable(payload.collection, (table) => {
                     for (const field of payload.fields) {
                         if (field.type && constants_1.ALIAS_TYPES.includes(field.type) === false) {
@@ -121,9 +105,25 @@ class CollectionsService {
                         }
                     }
                 });
+                const fieldItemsService = new items_1.ItemsService('directus_fields', {
+                    knex: trx,
+                    accountability: this.accountability,
+                    schema: this.schema,
+                });
                 const fieldPayloads = payload.fields.filter((field) => field.meta).map((field) => field.meta);
                 await fieldItemsService.createMany(fieldPayloads);
             }
+            if (payload.meta) {
+                const collectionItemsService = new items_1.ItemsService('directus_collections', {
+                    knex: trx,
+                    accountability: this.accountability,
+                    schema: this.schema,
+                });
+                await collectionItemsService.createOne({
+                    ...payload.meta,
+                    collection: payload.collection,
+                });
+            }
             return payload.collection;
         });
         if (this.cache && env_1.default.CACHE_AUTO_PURGE && (opts === null || opts === void 0 ? void 0 : opts.autoPurgeCache) !== false) {
@@ -316,6 +316,9 @@ class CollectionsService {
         }
         await this.knex.transaction(async (trx) => {
             var _a;
+            if (collectionToBeDeleted.schema) {
+                await trx.schema.dropTable(collectionKey);
+            }
             // Make sure this collection isn't used as a group in any other collections
             await trx('directus_collections').update({ group: null }).where({ group: collectionKey });
             if (collectionToBeDeleted.meta) {
@@ -371,7 +374,6 @@ class CollectionsService {
                         .update({ one_allowed_collections: newAllowedCollections })
                         .where({ id: relation.meta.id });
                 }
-                await trx.schema.dropTable(collectionKey);
             }
         });
         if (this.cache && env_1.default.CACHE_AUTO_PURGE && (opts === null || opts === void 0 ? void 0 : opts.autoPurgeCache) !== false) {

package/dist/services/fields.d.ts

@@ -3,9 +3,8 @@ import { Knex } from 'knex';
 import { Column } from 'knex-schema-inspector/dist/types/column';
 import { ItemsService } from '../services/items';
 import { PayloadService } from '../services/payload';
-import { AbstractServiceOptions, SchemaOverview } from '../types';
-import { Accountability } from '@directus/shared/types';
-import { Field, RawField, Type } from '@directus/shared/types';
+import { AbstractServiceOptions } from '../types';
+import { Field, RawField, Type, Accountability, SchemaOverview } from '@directus/shared/types';
 import { Helpers } from '../database/helpers';
 import Keyv from 'keyv';
 export declare class FieldsService {

package/dist/services/fields.js

@@ -325,6 +325,13 @@ class FieldsService {
         });
         await this.knex.transaction(async (trx) => {
             var _a, _b;
+            if (this.schema.collections[collection] &&
+                field in this.schema.collections[collection].fields &&
+                this.schema.collections[collection].fields[field].alias === false) {
+                await trx.schema.table(collection, (table) => {
+                    table.dropColumn(field);
+                });
+            }
             const relations = this.schema.relations.filter((relation) => {
                 var _a;
                 return ((relation.collection === collection && relation.field === field) ||
@@ -384,13 +391,6 @@ class FieldsService {
                     .where({ group: metaRow.field, collection: metaRow.collection });
             }
             await trx('directus_fields').delete().where({ collection, field });
-            if (this.schema.collections[collection] &&
-                field in this.schema.collections[collection].fields &&
-                this.schema.collections[collection].fields[field].alias === false) {
-                await trx.schema.table(collection, (table) => {
-                    table.dropColumn(field);
-                });
-            }
         });
         if (this.cache && env_1.default.CACHE_AUTO_PURGE) {
             await this.cache.clear();
@@ -452,11 +452,15 @@ class FieldsService {
                 column.defaultTo(field.schema.default_value);
             }
         }
-        if (((_g = field.schema) === null || _g === void 0 ? void 0 : _g.is_nullable) !== undefined && field.schema.is_nullable === false) {
-            column.notNullable();
+        if (((_g = field.schema) === null || _g === void 0 ? void 0 : _g.is_nullable) === false) {
+            if (!alter || alter.is_nullable === true) {
+                column.notNullable();
+            }
         }
         else {
-            column.nullable();
+            if (!alter || alter.is_nullable === false) {
+                column.nullable();
+            }
         }
         if ((_h = field.schema) === null || _h === void 0 ? void 0 : _h.is_primary_key) {
             column.primary().notNullable();

package/dist/services/graphql.d.ts

@@ -1,9 +1,10 @@
 import { ArgumentNode, FormattedExecutionResult, FragmentDefinitionNode, GraphQLError, GraphQLResolveInfo, GraphQLScalarType, GraphQLSchema, ObjectFieldNode, SelectionNode } from 'graphql';
+import { SchemaOverview } from '@directus/shared/types';
 import { ObjectTypeComposer, SchemaComposer } from 'graphql-compose';
 import { Knex } from 'knex';
 import { BaseException } from '@directus/shared/exceptions';
 import { Accountability, Query } from '@directus/shared/types';
-import { AbstractServiceOptions, GraphQLParams, Item, SchemaOverview } from '../types';
+import { AbstractServiceOptions, GraphQLParams, Item } from '../types';
 import { ItemsService } from './items';
 export declare const GraphQLGeoJSON: GraphQLScalarType;
 export declare const GraphQLDate: GraphQLScalarType;

package/dist/services/graphql.js

@@ -1397,10 +1397,10 @@ class GraphQLService {
                 resolve: async () => {
                     const extensionManager = (0, extensions_1.getExtensionManager)();
                     return {
-                        interfaces: extensionManager.listExtensions('interface'),
-                        displays: extensionManager.listExtensions('display'),
-                        layouts: extensionManager.listExtensions('layout'),
-                        modules: extensionManager.listExtensions('module'),
+                        interfaces: extensionManager.getExtensionsList('interface'),
+                        displays: extensionManager.getExtensionsList('display'),
+                        layouts: extensionManager.getExtensionsList('layout'),
+                        modules: extensionManager.getExtensionsList('module'),
                     };
                 },
             },

package/dist/services/import.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { Knex } from 'knex';
-import { AbstractServiceOptions, SchemaOverview } from '../types';
-import { Accountability } from '@directus/shared/types';
+import { AbstractServiceOptions } from '../types';
+import { Accountability, SchemaOverview } from '@directus/shared/types';
 export declare class ImportService {
     knex: Knex;
     accountability: Accountability | null;

package/dist/services/import.js

@@ -31,9 +31,10 @@ class ImportService {
             case 'application/json':
                 return await this.importJSON(collection, stream);
             case 'text/csv':
+            case 'application/vnd.ms-excel':
                 return await this.importCSV(collection, stream);
             default:
-                throw new exceptions_1.InvalidPayloadException(`Can't import files of type "${mimetype}"`);
+                throw new exceptions_1.UnsupportedMediaTypeException(`Can't import files of type "${mimetype}"`);
         }
     }
     importJSON(collection, stream) {

package/dist/services/items.d.ts

@@ -1,7 +1,7 @@
 import { Knex } from 'knex';
 import Keyv from 'keyv';
-import { Accountability, Query, PermissionsAction } from '@directus/shared/types';
-import { AbstractService, AbstractServiceOptions, Item as AnyItem, PrimaryKey, SchemaOverview, MutationOptions } from '../types';
+import { Accountability, Query, PermissionsAction, SchemaOverview } from '@directus/shared/types';
+import { AbstractService, AbstractServiceOptions, Item as AnyItem, PrimaryKey, MutationOptions } from '../types';
 export declare type QueryOptions = {
     stripNonRequested?: boolean;
     permissionsAction?: PermissionsAction;

package/dist/services/items.js

@@ -70,7 +70,9 @@ class ItemsService {
             // Run all hooks that are attached to this event so the end user has the chance to augment the
             // item that is about to be saved
             const payloadAfterHooks = (opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false
-                ? await emitter_1.default.emitFilter(`${this.eventScope}.create`, payload, {
+                ? await emitter_1.default.emitFilter(this.eventScope === 'items'
+                    ? ['items.create', `${this.collection}.items.create`]
+                    : `${this.eventScope}.create`, payload, {
                     collection: this.collection,
                 }, {
                     database: trx,
@@ -85,7 +87,7 @@ class ItemsService {
             const { payload: payloadWithA2O, revisions: revisionsA2O } = await payloadService.processA2O(payloadWithM2O);
             const payloadWithoutAliases = (0, lodash_1.pick)(payloadWithA2O, (0, lodash_1.without)(fields, ...aliases));
             const payloadWithTypeCasting = await payloadService.processValues('create', payloadWithoutAliases);
-            // In case of manual string / UUID primary keys, they PK already exists in the object we're saving.
+            // In case of manual string / UUID primary keys, the PK already exists in the object we're saving.
             let primaryKey = payloadWithTypeCasting[primaryKeyField];
             try {
                 const result = await trx.insert(payloadWithoutAliases).into(this.collection).returning(primaryKeyField);
@@ -146,14 +148,14 @@ class ItemsService {
             return primaryKey;
         });
         if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false) {
-            emitter_1.default.emitAction(`${this.eventScope}.create`, {
+            emitter_1.default.emitAction(this.eventScope === 'items' ? ['items.create', `${this.collection}.items.create`] : `${this.eventScope}.create`, {
                 payload,
                 key: primaryKey,
                 collection: this.collection,
             }, {
                 // This hook is called async. If we would pass the transaction here, the hook can be
                 // called after the transaction is done #5460
-                database: (0, database_1.default)(),
+                database: this.knex || (0, database_1.default)(),
                 schema: this.schema,
                 accountability: this.accountability,
             });
@@ -189,11 +191,6 @@ class ItemsService {
      * Get items by query
      */
     async readByQuery(query, opts) {
-        const authorizationService = new authorization_1.AuthorizationService({
-            accountability: this.accountability,
-            knex: this.knex,
-            schema: this.schema,
-        });
         let ast = await (0, get_ast_from_query_1.default)(this.collection, query, this.schema, {
             accountability: this.accountability,
             // By setting the permissions action, you can read items using the permissions for another
@@ -203,6 +200,11 @@ class ItemsService {
             knex: this.knex,
         });
         if (this.accountability && this.accountability.admin !== true) {
+            const authorizationService = new authorization_1.AuthorizationService({
+                accountability: this.accountability,
+                knex: this.knex,
+                schema: this.schema,
+            });
             ast = await authorizationService.processAST(ast, opts === null || opts === void 0 ? void 0 : opts.permissionsAction);
         }
         const records = await (0, run_ast_1.default)(ast, this.schema, {
@@ -213,7 +215,7 @@ class ItemsService {
         if (records === null) {
             throw new exceptions_1.ForbiddenException();
         }
-        const filteredRecords = await emitter_1.default.emitFilter(`${this.eventScope}.read`, records, {
+        const filteredRecords = await emitter_1.default.emitFilter(this.eventScope === 'items' ? ['items.read', `${this.collection}.items.read`] : `${this.eventScope}.read`, records, {
             query,
             collection: this.collection,
         }, {
@@ -221,12 +223,12 @@ class ItemsService {
             schema: this.schema,
             accountability: this.accountability,
         });
-        emitter_1.default.emitAction(`${this.eventScope}.read`, {
+        emitter_1.default.emitAction(this.eventScope === 'items' ? ['items.read', `${this.collection}.items.read`] : `${this.eventScope}.read`, {
             payload: filteredRecords,
             query,
             collection: this.collection,
         }, {
-            database: (0, database_1.default)(),
+            database: this.knex || (0, database_1.default)(),
             schema: this.schema,
             accountability: this.accountability,
         });
@@ -288,7 +290,9 @@ class ItemsService {
         // Run all hooks that are attached to this event so the end user has the chance to augment the
         // item that is about to be saved
         const payloadAfterHooks = (opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false
-            ? await emitter_1.default.emitFilter(`${this.eventScope}.update`, payload, {
+            ? await emitter_1.default.emitFilter(this.eventScope === 'items'
+                ? ['items.update', `${this.collection}.items.update`]
+                : `${this.eventScope}.update`, payload, {
                 keys,
                 collection: this.collection,
             }, {
@@ -379,14 +383,14 @@ class ItemsService {
             await this.cache.clear();
         }
         if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false) {
-            emitter_1.default.emitAction(`${this.eventScope}.update`, {
+            emitter_1.default.emitAction(this.eventScope === 'items' ? ['items.update', `${this.collection}.items.update`] : `${this.eventScope}.update`, {
                 payload,
                 keys,
                 collection: this.collection,
             }, {
                 // This hook is called async. If we would pass the transaction here, the hook can be
                 // called after the transaction is done #5460
-                database: (0, database_1.default)(),
+                database: this.knex || (0, database_1.default)(),
                 schema: this.schema,
                 accountability: this.accountability,
             });
@@ -461,7 +465,7 @@ class ItemsService {
             await authorizationService.checkAccess('delete', this.collection, keys);
         }
         if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false) {
-            await emitter_1.default.emitFilter(`${this.eventScope}.delete`, keys, {
+            await emitter_1.default.emitFilter(this.eventScope === 'items' ? ['items.delete', `${this.collection}.items.delete`] : `${this.eventScope}.delete`, keys, {
                 collection: this.collection,
             }, {
                 database: this.knex,
@@ -490,13 +494,13 @@ class ItemsService {
             await this.cache.clear();
         }
         if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false) {
-            emitter_1.default.emitAction(`${this.eventScope}.delete`, {
+            emitter_1.default.emitAction(this.eventScope === 'items' ? ['items.delete', `${this.collection}.items.delete`] : `${this.eventScope}.delete`, {
                 payload: keys,
                 collection: this.collection,
             }, {
                 // This hook is called async. If we would pass the transaction here, the hook can be
                 // called after the transaction is done #5460
-                database: (0, database_1.default)(),
+                database: this.knex || (0, database_1.default)(),
                 schema: this.schema,
                 accountability: this.accountability,
             });

package/dist/services/mail/index.d.ts

@@ -1,6 +1,6 @@
 import { Knex } from 'knex';
-import { AbstractServiceOptions, SchemaOverview } from '../../types';
-import { Accountability } from '@directus/shared/types';
+import { AbstractServiceOptions } from '../../types';
+import { Accountability, SchemaOverview } from '@directus/shared/types';
 import { Transporter, SendMailOptions } from 'nodemailer';
 export declare type EmailOptions = SendMailOptions & {
     template?: {

package/dist/services/meta.d.ts

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

package/dist/services/payload.d.ts

@@ -1,6 +1,6 @@
 import { Knex } from 'knex';
-import { AbstractServiceOptions, Item, PrimaryKey, SchemaOverview } from '../types';
-import { Accountability } from '@directus/shared/types';
+import { AbstractServiceOptions, Item, PrimaryKey } from '../types';
+import { Accountability, SchemaOverview } from '@directus/shared/types';
 import { Helpers } from '../database/helpers';
 declare type Action = 'create' | 'read' | 'update';
 declare type Transformers = {

package/dist/services/payload.js

@@ -100,12 +100,16 @@ class PayloadService {
                 return value;
             },
             async csv({ action, value }) {
-                if (!value)
+                if (Array.isArray(value) === false && typeof value !== 'string')
                     return;
-                if (action === 'read' && Array.isArray(value) === false)
+                if (action === 'read' && Array.isArray(value) === false) {
+                    if (value === '')
+                        return [];
                     return value.split(',');
-                if (Array.isArray(value))
+                }
+                if (Array.isArray(value)) {
                     return value.join(',');
+                }
                 return value;
             },
         };

package/dist/services/relations.d.ts

@@ -1,10 +1,10 @@
 import { Knex } from 'knex';
-import { AbstractServiceOptions, SchemaOverview, Relation, RelationMeta } from '../types';
-import { Accountability } from '@directus/shared/types';
+import { SchemaOverview, Relation, RelationMeta, Accountability } from '@directus/shared/types';
 import { ItemsService, QueryOptions } from './items';
 import { PermissionsService } from './permissions';
 import SchemaInspector from '@directus/schema';
 import Keyv from 'keyv';
+import { AbstractServiceOptions } from '../types';
 export declare class RelationsService {
     knex: Knex;
     permissionsService: PermissionsService;

package/dist/services/relations.js

@@ -135,6 +135,10 @@ class RelationsService {
         if (relation.field in this.schema.collections[relation.collection].fields === false) {
             throw new exceptions_1.InvalidPayloadException(`Field "${relation.field}" doesn't exist in collection "${relation.collection}"`);
         }
+        // A primary key should not be a foreign key
+        if (this.schema.collections[relation.collection].primary === relation.field) {
+            throw new exceptions_1.InvalidPayloadException(`Field "${relation.field}" in collection "${relation.collection}" is a primary key`);
+        }
         if (relation.related_collection && relation.related_collection in this.schema.collections === false) {
             throw new exceptions_1.InvalidPayloadException(`Collection "${relation.related_collection}" doesn't exist`);
         }

package/dist/services/server.d.ts

@@ -1,6 +1,6 @@
 import { Knex } from 'knex';
-import { AbstractServiceOptions, SchemaOverview } from '../types';
-import { Accountability } from '@directus/shared/types';
+import { AbstractServiceOptions } from '../types';
+import { Accountability, SchemaOverview } from '@directus/shared/types';
 import { SettingsService } from './settings';
 export declare class ServerService {
     knex: Knex;

package/dist/services/specifications.d.ts

@@ -1,7 +1,7 @@
 import { Knex } from 'knex';
 import { OpenAPIObject } from 'openapi3-ts';
-import { AbstractServiceOptions, SchemaOverview } from '../types';
-import { Accountability } from '@directus/shared/types';
+import { AbstractServiceOptions } from '../types';
+import { Accountability, SchemaOverview } from '@directus/shared/types';
 import { CollectionsService } from './collections';
 import { FieldsService } from './fields';
 import { GraphQLService } from './graphql';

package/dist/services/users.d.ts

@@ -1,7 +1,6 @@
 import { Knex } from 'knex';
-import { AbstractServiceOptions, Item, PrimaryKey, SchemaOverview, MutationOptions } from '../types';
-import { Query } from '@directus/shared/types';
-import { Accountability } from '@directus/shared/types';
+import { AbstractServiceOptions, Item, PrimaryKey, MutationOptions } from '../types';
+import { Query, SchemaOverview, Accountability } from '@directus/shared/types';
 import { ItemsService } from './items';
 export declare class UsersService extends ItemsService {
     knex: Knex;

package/dist/services/utils.d.ts

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

package/dist/types/ast.d.ts

@@ -1,5 +1,4 @@
-import { Query } from '@directus/shared/types';
-import { Relation } from './relation';
+import { Query, Relation } from '@directus/shared/types';
 export declare 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 { SchemaOverview } from './schema';
 export interface AuthDriverOptions {
     knex: Knex;
     schema: SchemaOverview;
@@ -22,10 +22,8 @@ export declare type AuthData = Record<string, any> | null;
 export interface Session {
     token: string;
     expires: Date;
-    data: string | Record<string, unknown> | null;
     share: string;
 }
-export declare type SessionData = Record<string, any> | null;
 export declare type DirectusTokenPayload = {
     id?: string;
     role: string | null;

package/dist/types/index.d.ts

@@ -3,15 +3,12 @@ export * from './assets';
 export * from './ast';
 export * from './auth';
 export * from './collection';
-export * from './extensions';
 export * from './files';
 export * from './graphql';
 export * from './items';
 export * from './meta';
 export * from './migration';
-export * from './relation';
 export * from './revision';
-export * from './schema';
 export * from './services';
 export * from './snapshot';
 export * from './webhooks';

package/dist/types/index.js

@@ -15,15 +15,12 @@ __exportStar(require("./assets"), exports);
 __exportStar(require("./ast"), exports);
 __exportStar(require("./auth"), exports);
 __exportStar(require("./collection"), exports);
-__exportStar(require("./extensions"), exports);
 __exportStar(require("./files"), exports);
 __exportStar(require("./graphql"), exports);
 __exportStar(require("./items"), exports);
 __exportStar(require("./meta"), exports);
 __exportStar(require("./migration"), exports);
-__exportStar(require("./relation"), exports);
 __exportStar(require("./revision"), exports);
-__exportStar(require("./schema"), exports);
 __exportStar(require("./services"), exports);
 __exportStar(require("./snapshot"), exports);
 __exportStar(require("./webhooks"), exports);

package/dist/types/services.d.ts

@@ -1,8 +1,6 @@
 import { Knex } from 'knex';
-import { SchemaOverview } from '../types';
-import { Accountability } from '@directus/shared/types';
+import { Accountability, Query, SchemaOverview } from '@directus/shared/types';
 import { Item, PrimaryKey } from './items';
-import { Query } from '@directus/shared/types';
 export declare type AbstractServiceOptions = {
     knex?: Knex;
     accountability?: Accountability | null;

package/dist/types/snapshot.d.ts

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

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

@@ -1,6 +1,5 @@
 import { Knex } from 'knex';
-import { SchemaOverview } from '../types';
-import { Aggregate, Filter, Query } from '@directus/shared/types';
+import { Aggregate, Filter, Query, SchemaOverview } from '@directus/shared/types';
 /**
  * Apply the Query to a given Knex query builder instance
  */

package/dist/utils/apply-query.js

@@ -177,7 +177,7 @@ function applyFilter(knex, schema, rootQuery, rootFilter, collection, subQuery =
                 if (relationType === 'o2m' && (subQuery === true || parentAlias !== undefined)) {
                     dbQuery.leftJoin({ [alias]: relation.collection }, `${parentAlias || parentCollection}.${schema.collections[relation.related_collection].primary}`, `${alias}.${relation.field}`);
                 }
-                if (relationType === 'm2o' || subQuery === true) {
+                if (relationType === 'm2o' || subQuery === true || (relationType === 'o2m' && parentAlias !== undefined)) {
                     let parent;
                     if (relationType === 'm2o') {
                         parent = relation.related_collection;

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

@@ -1,5 +1,6 @@
-import { Snapshot, SnapshotDiff, SchemaOverview } from '../types';
+import { Snapshot, SnapshotDiff } from '../types';
 import { Knex } from 'knex';
+import { SchemaOverview } from '@directus/shared/types';
 export declare function applySnapshot(snapshot: Snapshot, options?: {
     database?: Knex;
     schema?: SchemaOverview;

package/dist/utils/get-ast-from-query.d.ts

@@ -2,9 +2,8 @@
  * Generate an AST based on a given collection and query
  */
 import { Knex } from 'knex';
-import { Accountability } from '@directus/shared/types';
-import { AST, SchemaOverview } from '../types';
-import { Query, PermissionsAction } from '@directus/shared/types';
+import { AST } from '../types';
+import { Query, PermissionsAction, Accountability, SchemaOverview } from '@directus/shared/types';
 declare type GetASTOptions = {
     accountability?: Accountability | null;
     action?: PermissionsAction;

package/dist/utils/get-local-type.js

@@ -107,7 +107,7 @@ function getLocalType(column, field) {
             return 'hash';
         if (special.includes('csv'))
             return 'csv';
-        if (special.includes('uuid'))
+        if (special.includes('uuid') || special.includes('file'))
             return 'uuid';
         if (type === null || type === void 0 ? void 0 : type.startsWith('geometry')) {
             return special[0] || 'geometry';

package/dist/utils/get-permissions.d.ts

@@ -1,3 +1,2 @@
-import { Permission, Accountability } from '@directus/shared/types';
-import { SchemaOverview } from '../types';
+import { Permission, Accountability, SchemaOverview } from '@directus/shared/types';
 export declare function getPermissions(accountability: Accountability, schema: SchemaOverview): Promise<Permission[]>;

package/dist/utils/get-permissions.js

@@ -145,7 +145,7 @@ function processPermissions(accountability, permissions, filterContext) {
     return permissions.map((permission) => {
         permission.permissions = (0, utils_1.parseFilter)(permission.permissions, accountability, filterContext);
         permission.validation = (0, utils_1.parseFilter)(permission.validation, accountability, filterContext);
-        permission.presets = (0, utils_1.parseFilter)(permission.presets, accountability, filterContext);
+        permission.presets = (0, utils_1.parsePreset)(permission.presets, accountability, filterContext);
         return permission;
     });
 }

package/dist/utils/get-relation-type.d.ts

@@ -1,4 +1,4 @@
-import { Relation } from '../types';
+import { Relation } from '@directus/shared/types';
 export declare function getRelationType(getRelationOptions: {
     relation: Relation;
     collection: string | null;

package/dist/utils/get-schema.d.ts

@@ -1,6 +1,5 @@
 import { Knex } from 'knex';
-import { SchemaOverview } from '../types';
-import { Accountability } from '@directus/shared/types';
+import { Accountability, SchemaOverview } from '@directus/shared/types';
 export declare function getSchema(options?: {
     accountability?: Accountability;
     database?: Knex;

package/dist/utils/get-snapshot.d.ts

@@ -1,5 +1,6 @@
-import { SchemaOverview, Snapshot } from '../types';
+import { Snapshot } from '../types';
 import { Knex } from 'knex';
+import { SchemaOverview } from '@directus/shared/types';
 export declare function getSnapshot(options?: {
     database?: Knex;
     schema?: SchemaOverview;