directus 9.20.4 → 9.21.0

package/dist/services/collections.js

@@ -39,6 +39,8 @@ const items_1 = require("../services/items");
 const utils_1 = require("@directus/shared/utils");
 const helpers_1 = require("../database/helpers");
 const lodash_1 = require("lodash");
+const get_schema_1 = require("../utils/get-schema");
+const emitter_1 = __importDefault(require("../emitter"));
 class CollectionsService {
     constructor(options) {
         this.knex = options.knex || (0, database_1.default)();
@@ -63,6 +65,7 @@ class CollectionsService {
         if (payload.collection.startsWith('directus_')) {
             throw new exceptions_1.InvalidPayloadException(`Collections can't start with "directus_"`);
         }
+        const nestedActionEvents = [];
         try {
             const existingCollections = [
                 ...((_b = (_a = (await this.knex.select('collection').from('directus_collections'))) === null || _a === void 0 ? void 0 : _a.map(({ collection }) => collection)) !== null && _b !== void 0 ? _b : []),
@@ -125,7 +128,9 @@ class CollectionsService {
                         schema: this.schema,
                     });
                     const fieldPayloads = payload.fields.filter((field) => field.meta).map((field) => field.meta);
-                    await fieldItemsService.createMany(fieldPayloads);
+                    await fieldItemsService.createMany(fieldPayloads, {
+                        bypassEmitAction: (params) => (opts === null || opts === void 0 ? void 0 : opts.bypassEmitAction) ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
+                    });
                 }
                 if (payload.meta) {
                     const collectionItemsService = new items_1.ItemsService('directus_collections', {
@@ -136,6 +141,8 @@ class CollectionsService {
                     await collectionItemsService.createOne({
                         ...payload.meta,
                         collection: payload.collection,
+                    }, {
+                        bypassEmitAction: (params) => (opts === null || opts === void 0 ? void 0 : opts.bypassEmitAction) ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
                     });
                 }
                 return payload.collection;
@@ -149,12 +156,20 @@ class CollectionsService {
             if ((opts === null || opts === void 0 ? void 0 : opts.autoPurgeSystemCache) !== false) {
                 await (0, cache_1.clearSystemCache)();
             }
+            if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false && nestedActionEvents.length > 0) {
+                const updatedSchema = await (0, get_schema_1.getSchema)({ accountability: this.accountability || undefined });
+                for (const nestedActionEvent of nestedActionEvents) {
+                    nestedActionEvent.context.schema = updatedSchema;
+                    emitter_1.default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
+                }
+            }
         }
     }
     /**
      * Create multiple new collections
      */
     async createMany(payloads, opts) {
+        const nestedActionEvents = [];
         try {
             const collections = await this.knex.transaction(async (trx) => {
                 const service = new CollectionsService({
@@ -164,7 +179,11 @@ class CollectionsService {
                 });
                 const collectionNames = [];
                 for (const payload of payloads) {
-                    const name = await service.createOne(payload, { autoPurgeCache: false, autoPurgeSystemCache: false });
+                    const name = await service.createOne(payload, {
+                        autoPurgeCache: false,
+                        autoPurgeSystemCache: false,
+                        bypassEmitAction: (params) => nestedActionEvents.push(params),
+                    });
                     collectionNames.push(name);
                 }
                 return collectionNames;
@@ -175,7 +194,16 @@ class CollectionsService {
             if (this.cache && env_1.default.CACHE_AUTO_PURGE && (opts === null || opts === void 0 ? void 0 : opts.autoPurgeCache) !== false) {
                 await this.cache.clear();
             }
-            await (0, cache_1.clearSystemCache)();
+            if ((opts === null || opts === void 0 ? void 0 : opts.autoPurgeSystemCache) !== false) {
+                await (0, cache_1.clearSystemCache)();
+            }
+            if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false && nestedActionEvents.length > 0) {
+                const updatedSchema = await (0, get_schema_1.getSchema)({ accountability: this.accountability || undefined });
+                for (const nestedActionEvent of nestedActionEvents) {
+                    nestedActionEvent.context.schema = updatedSchema;
+                    emitter_1.default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
+                }
+            }
         }
     }
     /**
@@ -277,6 +305,7 @@ class CollectionsService {
         if (this.accountability && this.accountability.admin !== true) {
             throw new exceptions_1.ForbiddenException();
         }
+        const nestedActionEvents = [];
         try {
             const collectionItemsService = new items_1.ItemsService('directus_collections', {
                 knex: this.knex,
@@ -293,10 +322,16 @@ class CollectionsService {
                 .where({ collection: collectionKey })
                 .first());
             if (exists) {
-                await collectionItemsService.updateOne(collectionKey, payload.meta, opts);
+                await collectionItemsService.updateOne(collectionKey, payload.meta, {
+                    ...opts,
+                    bypassEmitAction: (params) => (opts === null || opts === void 0 ? void 0 : opts.bypassEmitAction) ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
+                });
             }
             else {
-                await collectionItemsService.createOne({ ...payload.meta, collection: collectionKey }, opts);
+                await collectionItemsService.createOne({ ...payload.meta, collection: collectionKey }, {
+                    ...opts,
+                    bypassEmitAction: (params) => (opts === null || opts === void 0 ? void 0 : opts.bypassEmitAction) ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
+                });
             }
             return collectionKey;
         }
@@ -307,6 +342,13 @@ class CollectionsService {
             if ((opts === null || opts === void 0 ? void 0 : opts.autoPurgeSystemCache) !== false) {
                 await (0, cache_1.clearSystemCache)();
             }
+            if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false && nestedActionEvents.length > 0) {
+                const updatedSchema = await (0, get_schema_1.getSchema)({ accountability: this.accountability || undefined });
+                for (const nestedActionEvent of nestedActionEvents) {
+                    nestedActionEvent.context.schema = updatedSchema;
+                    emitter_1.default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
+                }
+            }
         }
     }
     /**
@@ -321,6 +363,7 @@ class CollectionsService {
         }
         const collectionKey = 'collection';
         const collectionKeys = [];
+        const nestedActionEvents = [];
         try {
             await this.knex.transaction(async (trx) => {
                 const collectionItemsService = new CollectionsService({
@@ -334,6 +377,7 @@ class CollectionsService {
                     await collectionItemsService.updateOne(payload[collectionKey], (0, lodash_1.omit)(payload, collectionKey), {
                         autoPurgeCache: false,
                         autoPurgeSystemCache: false,
+                        bypassEmitAction: (params) => (opts === null || opts === void 0 ? void 0 : opts.bypassEmitAction) ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
                     });
                     collectionKeys.push(payload[collectionKey]);
                 }
@@ -343,7 +387,16 @@ class CollectionsService {
             if (this.cache && env_1.default.CACHE_AUTO_PURGE && (opts === null || opts === void 0 ? void 0 : opts.autoPurgeCache) !== false) {
                 await this.cache.clear();
             }
-            await (0, cache_1.clearSystemCache)();
+            if ((opts === null || opts === void 0 ? void 0 : opts.autoPurgeSystemCache) !== false) {
+                await (0, cache_1.clearSystemCache)();
+            }
+            if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false && nestedActionEvents.length > 0) {
+                const updatedSchema = await (0, get_schema_1.getSchema)({ accountability: this.accountability || undefined });
+                for (const nestedActionEvent of nestedActionEvents) {
+                    nestedActionEvent.context.schema = updatedSchema;
+                    emitter_1.default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
+                }
+            }
         }
         return collectionKeys;
     }
@@ -354,6 +407,7 @@ class CollectionsService {
         if (this.accountability && this.accountability.admin !== true) {
             throw new exceptions_1.ForbiddenException();
         }
+        const nestedActionEvents = [];
         try {
             await this.knex.transaction(async (trx) => {
                 const service = new CollectionsService({
@@ -362,7 +416,11 @@ class CollectionsService {
                     knex: trx,
                 });
                 for (const collectionKey of collectionKeys) {
-                    await service.updateOne(collectionKey, data, { autoPurgeCache: false, autoPurgeSystemCache: false });
+                    await service.updateOne(collectionKey, data, {
+                        autoPurgeCache: false,
+                        autoPurgeSystemCache: false,
+                        bypassEmitAction: (params) => nestedActionEvents.push(params),
+                    });
                 }
             });
             return collectionKeys;
@@ -371,7 +429,16 @@ class CollectionsService {
             if (this.cache && env_1.default.CACHE_AUTO_PURGE && (opts === null || opts === void 0 ? void 0 : opts.autoPurgeCache) !== false) {
                 await this.cache.clear();
             }
-            await (0, cache_1.clearSystemCache)();
+            if ((opts === null || opts === void 0 ? void 0 : opts.autoPurgeSystemCache) !== false) {
+                await (0, cache_1.clearSystemCache)();
+            }
+            if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false && nestedActionEvents.length > 0) {
+                const updatedSchema = await (0, get_schema_1.getSchema)({ accountability: this.accountability || undefined });
+                for (const nestedActionEvent of nestedActionEvents) {
+                    nestedActionEvent.context.schema = updatedSchema;
+                    emitter_1.default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
+                }
+            }
         }
     }
     /**
@@ -382,6 +449,7 @@ class CollectionsService {
         if (this.accountability && this.accountability.admin !== true) {
             throw new exceptions_1.ForbiddenException();
         }
+        const nestedActionEvents = [];
         try {
             const collections = await this.readByQuery();
             const collectionToBeDeleted = collections.find((collection) => collection.collection === collectionKey);
@@ -401,7 +469,9 @@ class CollectionsService {
                         accountability: this.accountability,
                         schema: this.schema,
                     });
-                    await collectionItemsService.deleteOne(collectionKey);
+                    await collectionItemsService.deleteOne(collectionKey, {
+                        bypassEmitAction: (params) => (opts === null || opts === void 0 ? void 0 : opts.bypassEmitAction) ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
+                    });
                 }
                 if (collectionToBeDeleted.schema) {
                     const fieldsService = new fields_1.FieldsService({
@@ -429,11 +499,19 @@ class CollectionsService {
                     for (const relation of relations) {
                         // Delete related o2m fields that point to current collection
                         if (relation.related_collection && ((_a = relation.meta) === null || _a === void 0 ? void 0 : _a.one_field)) {
-                            await fieldsService.deleteField(relation.related_collection, relation.meta.one_field);
+                            await fieldsService.deleteField(relation.related_collection, relation.meta.one_field, {
+                                autoPurgeCache: false,
+                                autoPurgeSystemCache: false,
+                                bypassEmitAction: (params) => (opts === null || opts === void 0 ? void 0 : opts.bypassEmitAction) ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
+                            });
                         }
                         // Delete related m2o fields that point to current collection
                         if (relation.related_collection === collectionKey) {
-                            await fieldsService.deleteField(relation.collection, relation.field);
+                            await fieldsService.deleteField(relation.collection, relation.field, {
+                                autoPurgeCache: false,
+                                autoPurgeSystemCache: false,
+                                bypassEmitAction: (params) => (opts === null || opts === void 0 ? void 0 : opts.bypassEmitAction) ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
+                            });
                         }
                     }
                     const a2oRelationsThatIncludeThisCollection = this.schema.relations.filter((relation) => {
@@ -459,6 +537,13 @@ class CollectionsService {
             if ((opts === null || opts === void 0 ? void 0 : opts.autoPurgeSystemCache) !== false) {
                 await (0, cache_1.clearSystemCache)();
             }
+            if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false && nestedActionEvents.length > 0) {
+                const updatedSchema = await (0, get_schema_1.getSchema)({ accountability: this.accountability || undefined });
+                for (const nestedActionEvent of nestedActionEvents) {
+                    nestedActionEvent.context.schema = updatedSchema;
+                    emitter_1.default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
+                }
+            }
         }
     }
     /**
@@ -468,6 +553,7 @@ class CollectionsService {
         if (this.accountability && this.accountability.admin !== true) {
             throw new exceptions_1.ForbiddenException();
         }
+        const nestedActionEvents = [];
         try {
             await this.knex.transaction(async (trx) => {
                 const service = new CollectionsService({
@@ -476,7 +562,11 @@ class CollectionsService {
                     knex: trx,
                 });
                 for (const collectionKey of collectionKeys) {
-                    await service.deleteOne(collectionKey, { autoPurgeCache: false, autoPurgeSystemCache: false });
+                    await service.deleteOne(collectionKey, {
+                        autoPurgeCache: false,
+                        autoPurgeSystemCache: false,
+                        bypassEmitAction: (params) => nestedActionEvents.push(params),
+                    });
                 }
             });
             return collectionKeys;
@@ -485,7 +575,16 @@ class CollectionsService {
             if (this.cache && env_1.default.CACHE_AUTO_PURGE && (opts === null || opts === void 0 ? void 0 : opts.autoPurgeCache) !== false) {
                 await this.cache.clear();
             }
-            await (0, cache_1.clearSystemCache)();
+            if ((opts === null || opts === void 0 ? void 0 : opts.autoPurgeSystemCache) !== false) {
+                await (0, cache_1.clearSystemCache)();
+            }
+            if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false && nestedActionEvents.length > 0) {
+                const updatedSchema = await (0, get_schema_1.getSchema)({ accountability: this.accountability || undefined });
+                for (const nestedActionEvent of nestedActionEvents) {
+                    nestedActionEvent.context.schema = updatedSchema;
+                    emitter_1.default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
+                }
+            }
         }
     }
 }

package/dist/services/fields.d.ts

@@ -6,7 +6,7 @@ import { Column } from 'knex-schema-inspector/dist/types/column';
 import { Helpers } from '../database/helpers';
 import { ItemsService } from '../services/items';
 import { PayloadService } from '../services/payload';
-import { AbstractServiceOptions } from '../types';
+import { AbstractServiceOptions, MutationOptions } from '../types';
 export declare class FieldsService {
     knex: Knex;
     helpers: Helpers;
@@ -26,6 +26,6 @@ export declare class FieldsService {
         type: Type | null;
     }, table?: Knex.CreateTableBuilder): Promise<void>;
     updateField(collection: string, field: RawField): Promise<string>;
-    deleteField(collection: string, field: string): Promise<void>;
+    deleteField(collection: string, field: string, opts?: MutationOptions): Promise<void>;
     addColumnToTable(table: Knex.CreateTableBuilder, field: RawField | Field, alter?: Column | null): void;
 }

package/dist/services/fields.js

@@ -46,6 +46,7 @@ const get_default_value_1 = __importDefault(require("../utils/get-default-value"
 const get_local_type_1 = __importDefault(require("../utils/get-local-type"));
 const relations_1 = require("./relations");
 const constants_3 = require("@directus/shared/constants");
+const get_schema_1 = require("../utils/get-schema");
 class FieldsService {
     constructor(options) {
         this.knex = options.knex || (0, database_1.default)();
@@ -223,6 +224,7 @@ class FieldsService {
             throw new exceptions_1.ForbiddenException();
         }
         const runPostColumnChange = await this.helpers.schema.preColumnChange();
+        const nestedActionEvents = [];
         try {
             const exists = field.field in this.schema.collections[collection].fields ||
                 (0, lodash_1.isNil)(await this.knex.select('id').from('directus_fields').where({ collection, field: field.field }).first()) === false;
@@ -265,14 +267,18 @@ class FieldsService {
                         field: hookAdjustedField.field,
                     }, { emitEvents: false });
                 }
-                emitter_1.default.emitAction(`fields.create`, {
-                    payload: hookAdjustedField,
-                    key: hookAdjustedField.field,
-                    collection: collection,
-                }, {
-                    database: (0, database_1.default)(),
-                    schema: this.schema,
-                    accountability: this.accountability,
+                nestedActionEvents.push({
+                    event: 'fields.create',
+                    meta: {
+                        payload: hookAdjustedField,
+                        key: hookAdjustedField.field,
+                        collection: collection,
+                    },
+                    context: {
+                        database: (0, database_1.default)(),
+                        schema: this.schema,
+                        accountability: this.accountability,
+                    },
                 });
             });
         }
@@ -284,14 +290,20 @@ class FieldsService {
                 await this.cache.clear();
             }
             await (0, cache_1.clearSystemCache)();
+            const updatedSchema = await (0, get_schema_1.getSchema)({ accountability: this.accountability || undefined });
+            for (const nestedActionEvent of nestedActionEvents) {
+                nestedActionEvent.context.schema = updatedSchema;
+                emitter_1.default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
+            }
         }
     }
     async updateField(collection, field) {
-        var _a, _b;
+        var _a, _b, _c;
         if (this.accountability && this.accountability.admin !== true) {
             throw new exceptions_1.ForbiddenException();
         }
         const runPostColumnChange = await this.helpers.schema.preColumnChange();
+        const nestedActionEvents = [];
         try {
             const hookAdjustedField = await emitter_1.default.emitFilter(`fields.update`, field, {
                 keys: [field.field],
@@ -304,10 +316,10 @@ class FieldsService {
             const record = field.meta
                 ? await this.knex.select('id').from('directus_fields').where({ collection, field: field.field }).first()
                 : null;
-            if ((hookAdjustedField.type === 'alias' ||
-                ((_a = this.schema.collections[collection].fields[field.field]) === null || _a === void 0 ? void 0 : _a.type) === 'alias') &&
-                hookAdjustedField.type &&
-                hookAdjustedField.type !== ((_b = this.schema.collections[collection].fields[field.field]) === null || _b === void 0 ? void 0 : _b.type)) {
+            if (hookAdjustedField.type &&
+                (hookAdjustedField.type === 'alias' ||
+                    ((_a = this.schema.collections[collection].fields[field.field]) === null || _a === void 0 ? void 0 : _a.type) === 'alias') &&
+                hookAdjustedField.type !== ((_c = (_b = this.schema.collections[collection].fields[field.field]) === null || _b === void 0 ? void 0 : _b.type) !== null && _c !== void 0 ? _c : 'alias')) {
                 throw new exceptions_1.InvalidPayloadException('Alias type cannot be changed');
             }
             if (hookAdjustedField.schema) {
@@ -341,14 +353,18 @@ class FieldsService {
                     }, { emitEvents: false });
                 }
             }
-            emitter_1.default.emitAction(`fields.update`, {
-                payload: hookAdjustedField,
-                keys: [hookAdjustedField.field],
-                collection: collection,
-            }, {
-                database: (0, database_1.default)(),
-                schema: this.schema,
-                accountability: this.accountability,
+            nestedActionEvents.push({
+                event: 'fields.update',
+                meta: {
+                    payload: hookAdjustedField,
+                    keys: [hookAdjustedField.field],
+                    collection: collection,
+                },
+                context: {
+                    database: (0, database_1.default)(),
+                    schema: this.schema,
+                    accountability: this.accountability,
+                },
             });
             return field.field;
         }
@@ -360,13 +376,19 @@ class FieldsService {
                 await this.cache.clear();
             }
             await (0, cache_1.clearSystemCache)();
+            const updatedSchema = await (0, get_schema_1.getSchema)({ accountability: this.accountability || undefined });
+            for (const nestedActionEvent of nestedActionEvents) {
+                nestedActionEvent.context.schema = updatedSchema;
+                emitter_1.default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
+            }
         }
     }
-    async deleteField(collection, field) {
+    async deleteField(collection, field, opts) {
         if (this.accountability && this.accountability.admin !== true) {
             throw new exceptions_1.ForbiddenException();
         }
         const runPostColumnChange = await this.helpers.schema.preColumnChange();
+        const nestedActionEvents = [];
         try {
             await emitter_1.default.emitFilter('fields.delete', [field], {
                 collection: collection,
@@ -396,12 +418,19 @@ class FieldsService {
                     const isM2O = relation.collection === collection && relation.field === field;
                     // If the current field is a m2o, delete the related o2m if it exists and remove the relationship
                     if (isM2O) {
-                        await relationsService.deleteOne(collection, field);
+                        await relationsService.deleteOne(collection, field, {
+                            autoPurgeSystemCache: false,
+                            bypassEmitAction: (params) => (opts === null || opts === void 0 ? void 0 : opts.bypassEmitAction) ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
+                        });
                         if (relation.related_collection &&
                             ((_a = relation.meta) === null || _a === void 0 ? void 0 : _a.one_field) &&
                             relation.related_collection !== collection &&
                             relation.meta.one_field !== field) {
-                            await fieldsService.deleteField(relation.related_collection, relation.meta.one_field);
+                            await fieldsService.deleteField(relation.related_collection, relation.meta.one_field, {
+                                autoPurgeCache: false,
+                                autoPurgeSystemCache: false,
+                                bypassEmitAction: (params) => (opts === null || opts === void 0 ? void 0 : opts.bypassEmitAction) ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
+                            });
                         }
                     }
                     // If the current field is a o2m, just delete the one field config from the relation
@@ -448,27 +477,46 @@ class FieldsService {
                 }
                 await trx('directus_fields').delete().where({ collection, field });
             });
-            emitter_1.default.emitAction('fields.delete', {
-                payload: [field],
-                collection: collection,
-            }, {
-                database: this.knex,
-                schema: this.schema,
-                accountability: this.accountability,
-            });
+            const actionEvent = {
+                event: 'fields.delete',
+                meta: {
+                    payload: [field],
+                    collection: collection,
+                },
+                context: {
+                    database: this.knex,
+                    schema: this.schema,
+                    accountability: this.accountability,
+                },
+            };
+            if (opts === null || opts === void 0 ? void 0 : opts.bypassEmitAction) {
+                opts.bypassEmitAction(actionEvent);
+            }
+            else {
+                nestedActionEvents.push(actionEvent);
+            }
         }
         finally {
             if (runPostColumnChange) {
                 await this.helpers.schema.postColumnChange();
             }
-            if (this.cache && env_1.default.CACHE_AUTO_PURGE) {
+            if (this.cache && env_1.default.CACHE_AUTO_PURGE && (opts === null || opts === void 0 ? void 0 : opts.autoPurgeCache) !== false) {
                 await this.cache.clear();
             }
-            await (0, cache_1.clearSystemCache)();
+            if ((opts === null || opts === void 0 ? void 0 : opts.autoPurgeSystemCache) !== false) {
+                await (0, cache_1.clearSystemCache)();
+            }
+            if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false && nestedActionEvents.length > 0) {
+                const updatedSchema = await (0, get_schema_1.getSchema)({ accountability: this.accountability || undefined });
+                for (const nestedActionEvent of nestedActionEvents) {
+                    nestedActionEvent.context.schema = updatedSchema;
+                    emitter_1.default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
+                }
+            }
         }
     }
     addColumnToTable(table, field, alter = null) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         let column;
         // Don't attempt to add a DB column for alias / corrupt fields
         if (field.type === 'alias' || field.type === 'unknown')
@@ -487,7 +535,7 @@ class FieldsService {
         }
         else if (['float', 'decimal'].includes(field.type)) {
             const type = field.type;
-            column = table[type](field.field, ((_d = field.schema) === null || _d === void 0 ? void 0 : _d.numeric_precision) || 10, ((_e = field.schema) === null || _e === void 0 ? void 0 : _e.numeric_scale) || 5);
+            column = table[type](field.field, (_e = (_d = field.schema) === null || _d === void 0 ? void 0 : _d.numeric_precision) !== null && _e !== void 0 ? _e : 10, (_g = (_f = field.schema) === null || _f === void 0 ? void 0 : _f.numeric_scale) !== null && _g !== void 0 ? _g : 5);
         }
         else if (field.type === 'csv') {
             column = table.string(field.field);
@@ -510,7 +558,7 @@ class FieldsService {
         else {
             throw new exceptions_1.InvalidPayloadException(`Illegal type passed: "${field.type}"`);
         }
-        if (((_f = field.schema) === null || _f === void 0 ? void 0 : _f.default_value) !== undefined) {
+        if (((_h = field.schema) === null || _h === void 0 ? void 0 : _h.default_value) !== undefined) {
             if (typeof field.schema.default_value === 'string' &&
                 (field.schema.default_value.toLowerCase() === 'now()' || field.schema.default_value === 'CURRENT_TIMESTAMP')) {
                 column.defaultTo(this.knex.fn.now());
@@ -525,7 +573,7 @@ class FieldsService {
                 column.defaultTo(field.schema.default_value);
             }
         }
-        if (((_g = field.schema) === null || _g === void 0 ? void 0 : _g.is_nullable) === false) {
+        if (((_j = field.schema) === null || _j === void 0 ? void 0 : _j.is_nullable) === false) {
             if (!alter || alter.is_nullable === true) {
                 column.notNullable();
             }
@@ -535,15 +583,15 @@ class FieldsService {
                 column.nullable();
             }
         }
-        if ((_h = field.schema) === null || _h === void 0 ? void 0 : _h.is_primary_key) {
+        if ((_k = field.schema) === null || _k === void 0 ? void 0 : _k.is_primary_key) {
             column.primary().notNullable();
         }
-        else if (((_j = field.schema) === null || _j === void 0 ? void 0 : _j.is_unique) === true) {
+        else if (((_l = field.schema) === null || _l === void 0 ? void 0 : _l.is_unique) === true) {
             if (!alter || alter.is_unique === false) {
                 column.unique();
             }
         }
-        else if (((_k = field.schema) === null || _k === void 0 ? void 0 : _k.is_unique) === false) {
+        else if (((_m = field.schema) === null || _m === void 0 ? void 0 : _m.is_unique) === false) {
             if (alter && alter.is_unique === true) {
                 table.dropUnique([field.field]);
             }

package/dist/services/fields.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/services/graphql/index.js

@@ -8,6 +8,7 @@ const types_1 = require("@directus/shared/types");
 const argon2_1 = __importDefault(require("argon2"));
 const graphql_1 = require("graphql");
 const graphql_compose_1 = require("graphql-compose");
+const process_error_1 = __importDefault(require("./utils/process-error"));
 const lodash_1 = require("lodash");
 const ms_1 = __importDefault(require("ms"));
 const cache_1 = require("../../cache");
@@ -99,7 +100,7 @@ class GraphQLService {
         }
         const formattedResult = {
             ...result,
-            errors: (_a = result.errors) === null || _a === void 0 ? void 0 : _a.map(graphql_1.formatError),
+            errors: (_a = result.errors) === null || _a === void 0 ? void 0 : _a.map((error) => (0, process_error_1.default)(this.accountability, error)),
         };
         return formattedResult;
     }
@@ -1322,6 +1323,8 @@ class GraphQLService {
                         for (const subSelection of selection.selectionSet.selections) {
                             if (subSelection.kind !== 'Field')
                                 continue;
+                            if (subSelection.name.value.startsWith('__'))
+                                continue;
                             children.push(`${subSelection.name.value}(${rootField})`);
                         }
                     }

package/dist/services/graphql/utils/process-error.d.ts

@@ -0,0 +1,4 @@
+import { GraphQLError, GraphQLFormattedError } from 'graphql';
+import { Accountability } from '@directus/shared/types';
+declare const processError: (accountability: Accountability | null, error: Readonly<GraphQLError>) => GraphQLFormattedError;
+export default processError;

package/dist/services/graphql/utils/process-error.js

@@ -0,0 +1,26 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const logger_1 = __importDefault(require("../../../logger"));
+const processError = (accountability, error) => {
+    logger_1.default.error(error);
+    if ((accountability === null || accountability === void 0 ? void 0 : accountability.admin) === true) {
+        return {
+            ...error,
+            extensions: {
+                code: 'INTERNAL_SERVER_ERROR',
+            },
+        };
+    }
+    else {
+        return {
+            message: 'An unexpected error occurred.',
+            extensions: {
+                code: 'INTERNAL_SERVER_ERROR',
+            },
+        };
+    }
+};
+exports.default = processError;

package/dist/services/graphql/utils/process-error.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/services/items.d.ts

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