directus 9.6.0 → 9.8.0

package/dist/services/collections.js

@@ -55,105 +55,113 @@ class CollectionsService {
         if (payload.collection.startsWith('directus_')) {
             throw new exceptions_1.InvalidPayloadException(`Collections can't start with "directus_"`);
         }
-        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 : []),
-            ...Object.keys(this.schema.collections),
-        ];
-        if (existingCollections.includes(payload.collection)) {
-            throw new exceptions_1.InvalidPayloadException(`Collection "${payload.collection}" already exists.`);
-        }
-        // Create the collection/fields in a transaction so it'll be reverted in case of errors or
-        // 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.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`
-                if (!payload.fields)
-                    payload.fields = [
-                        {
-                            field: 'id',
-                            type: 'integer',
-                            meta: {
-                                hidden: true,
-                                interface: 'numeric',
-                                readonly: true,
-                            },
-                            schema: {
-                                is_primary_key: true,
-                                has_auto_increment: true,
+        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 : []),
+                ...Object.keys(this.schema.collections),
+            ];
+            if (existingCollections.includes(payload.collection)) {
+                throw new exceptions_1.InvalidPayloadException(`Collection "${payload.collection}" already exists.`);
+            }
+            // Create the collection/fields in a transaction so it'll be reverted in case of errors or
+            // 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.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`
+                    if (!payload.fields)
+                        payload.fields = [
+                            {
+                                field: 'id',
+                                type: 'integer',
+                                meta: {
+                                    hidden: true,
+                                    interface: 'numeric',
+                                    readonly: true,
+                                },
+                                schema: {
+                                    is_primary_key: true,
+                                    has_auto_increment: true,
+                                },
                             },
-                        },
-                    ];
-                // Ensure that every field meta has the field/collection fields filled correctly
-                payload.fields = payload.fields.map((field) => {
-                    if (field.meta) {
-                        field.meta = {
-                            ...field.meta,
-                            field: field.field,
-                            collection: payload.collection,
-                        };
-                    }
-                    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) {
-                            fieldsService.addColumnToTable(table, field);
+                        ];
+                    // Ensure that every field meta has the field/collection fields filled correctly
+                    payload.fields = payload.fields.map((field) => {
+                        if (field.meta) {
+                            field.meta = {
+                                ...field.meta,
+                                field: field.field,
+                                collection: payload.collection,
+                            };
                         }
-                    }
-                });
-                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 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) {
+                                fieldsService.addColumnToTable(table, field);
+                            }
+                        }
+                    });
+                    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;
+            });
             return payload.collection;
-        });
-        if (this.cache && env_1.default.CACHE_AUTO_PURGE && (opts === null || opts === void 0 ? void 0 : opts.autoPurgeCache) !== false) {
-            await this.cache.clear();
         }
-        await this.systemCache.clear();
-        return payload.collection;
+        finally {
+            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)();
+        }
     }
     /**
      * Create multiple new collections
      */
     async createMany(payloads, opts) {
-        const collections = await this.knex.transaction(async (trx) => {
-            const service = new CollectionsService({
-                schema: this.schema,
-                accountability: this.accountability,
-                knex: trx,
+        try {
+            const collections = await this.knex.transaction(async (trx) => {
+                const service = new CollectionsService({
+                    schema: this.schema,
+                    accountability: this.accountability,
+                    knex: trx,
+                });
+                const collectionNames = [];
+                for (const payload of payloads) {
+                    const name = await service.createOne(payload, { autoPurgeCache: false });
+                    collectionNames.push(name);
+                }
+                return collectionNames;
             });
-            const collectionNames = [];
-            for (const payload of payloads) {
-                const name = await service.createOne(payload, { autoPurgeCache: false });
-                collectionNames.push(name);
+            return collections;
+        }
+        finally {
+            if (this.cache && env_1.default.CACHE_AUTO_PURGE && (opts === null || opts === void 0 ? void 0 : opts.autoPurgeCache) !== false) {
+                await this.cache.clear();
             }
-            return collectionNames;
-        });
-        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)();
         }
-        await this.systemCache.clear();
-        return collections;
     }
     /**
      * Read all collections. Currently doesn't support any query.
@@ -252,31 +260,35 @@ class CollectionsService {
         if (this.accountability && this.accountability.admin !== true) {
             throw new exceptions_1.ForbiddenException();
         }
-        const collectionItemsService = new items_1.ItemsService('directus_collections', {
-            knex: this.knex,
-            accountability: this.accountability,
-            schema: this.schema,
-        });
-        const payload = data;
-        if (!payload.meta) {
+        try {
+            const collectionItemsService = new items_1.ItemsService('directus_collections', {
+                knex: this.knex,
+                accountability: this.accountability,
+                schema: this.schema,
+            });
+            const payload = data;
+            if (!payload.meta) {
+                return collectionKey;
+            }
+            const exists = !!(await this.knex
+                .select('collection')
+                .from('directus_collections')
+                .where({ collection: collectionKey })
+                .first());
+            if (exists) {
+                await collectionItemsService.updateOne(collectionKey, payload.meta, opts);
+            }
+            else {
+                await collectionItemsService.createOne({ ...payload.meta, collection: collectionKey }, opts);
+            }
             return collectionKey;
         }
-        const exists = !!(await this.knex
-            .select('collection')
-            .from('directus_collections')
-            .where({ collection: collectionKey })
-            .first());
-        if (exists) {
-            await collectionItemsService.updateOne(collectionKey, payload.meta, opts);
-        }
-        else {
-            await collectionItemsService.createOne({ ...payload.meta, collection: collectionKey }, opts);
-        }
-        if (this.cache && env_1.default.CACHE_AUTO_PURGE && (opts === null || opts === void 0 ? void 0 : opts.autoPurgeCache) !== false) {
-            await this.cache.clear();
+        finally {
+            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)();
         }
-        await this.systemCache.clear();
-        return collectionKey;
     }
     /**
      * Update multiple collections by name
@@ -285,21 +297,25 @@ class CollectionsService {
         if (this.accountability && this.accountability.admin !== true) {
             throw new exceptions_1.ForbiddenException();
         }
-        await this.knex.transaction(async (trx) => {
-            const service = new CollectionsService({
-                schema: this.schema,
-                accountability: this.accountability,
-                knex: trx,
+        try {
+            await this.knex.transaction(async (trx) => {
+                const service = new CollectionsService({
+                    schema: this.schema,
+                    accountability: this.accountability,
+                    knex: trx,
+                });
+                for (const collectionKey of collectionKeys) {
+                    await service.updateOne(collectionKey, data, { autoPurgeCache: false });
+                }
             });
-            for (const collectionKey of collectionKeys) {
-                await service.updateOne(collectionKey, data, { autoPurgeCache: false });
+            return collectionKeys;
+        }
+        finally {
+            if (this.cache && env_1.default.CACHE_AUTO_PURGE && (opts === null || opts === void 0 ? void 0 : opts.autoPurgeCache) !== false) {
+                await this.cache.clear();
             }
-        });
-        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)();
         }
-        await this.systemCache.clear();
-        return collectionKeys;
     }
     /**
      * Delete a single collection This will delete the table and all records within. It'll also
@@ -309,78 +325,82 @@ class CollectionsService {
         if (this.accountability && this.accountability.admin !== true) {
             throw new exceptions_1.ForbiddenException();
         }
-        const collections = await this.readByQuery();
-        const collectionToBeDeleted = collections.find((collection) => collection.collection === collectionKey);
-        if (!!collectionToBeDeleted === false) {
-            throw new exceptions_1.ForbiddenException();
-        }
-        await this.knex.transaction(async (trx) => {
-            var _a;
-            if (collectionToBeDeleted.schema) {
-                await trx.schema.dropTable(collectionKey);
+        try {
+            const collections = await this.readByQuery();
+            const collectionToBeDeleted = collections.find((collection) => collection.collection === collectionKey);
+            if (!!collectionToBeDeleted === false) {
+                throw new exceptions_1.ForbiddenException();
             }
-            // 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) {
-                const collectionItemsService = new items_1.ItemsService('directus_collections', {
-                    knex: trx,
-                    accountability: this.accountability,
-                    schema: this.schema,
-                });
-                await collectionItemsService.deleteOne(collectionKey);
-            }
-            if (collectionToBeDeleted.schema) {
-                const fieldsService = new fields_1.FieldsService({
-                    knex: trx,
-                    accountability: this.accountability,
-                    schema: this.schema,
-                });
-                await trx('directus_fields').delete().where('collection', '=', collectionKey);
-                await trx('directus_presets').delete().where('collection', '=', collectionKey);
-                const revisionsToDelete = await trx
-                    .select('id')
-                    .from('directus_revisions')
-                    .where({ collection: collectionKey });
-                if (revisionsToDelete.length > 0) {
-                    const keys = revisionsToDelete.map((record) => record.id);
-                    await trx('directus_revisions').update({ parent: null }).whereIn('parent', keys);
+            await this.knex.transaction(async (trx) => {
+                var _a;
+                if (collectionToBeDeleted.schema) {
+                    await trx.schema.dropTable(collectionKey);
                 }
-                await trx('directus_revisions').delete().where('collection', '=', collectionKey);
-                await trx('directus_activity').delete().where('collection', '=', collectionKey);
-                await trx('directus_permissions').delete().where('collection', '=', collectionKey);
-                await trx('directus_relations').delete().where({ many_collection: collectionKey });
-                const relations = this.schema.relations.filter((relation) => {
-                    return relation.collection === collectionKey || relation.related_collection === collectionKey;
-                });
-                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);
+                // 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) {
+                    const collectionItemsService = new items_1.ItemsService('directus_collections', {
+                        knex: trx,
+                        accountability: this.accountability,
+                        schema: this.schema,
+                    });
+                    await collectionItemsService.deleteOne(collectionKey);
+                }
+                if (collectionToBeDeleted.schema) {
+                    const fieldsService = new fields_1.FieldsService({
+                        knex: trx,
+                        accountability: this.accountability,
+                        schema: this.schema,
+                    });
+                    await trx('directus_fields').delete().where('collection', '=', collectionKey);
+                    await trx('directus_presets').delete().where('collection', '=', collectionKey);
+                    const revisionsToDelete = await trx
+                        .select('id')
+                        .from('directus_revisions')
+                        .where({ collection: collectionKey });
+                    if (revisionsToDelete.length > 0) {
+                        const keys = revisionsToDelete.map((record) => record.id);
+                        await trx('directus_revisions').update({ parent: null }).whereIn('parent', keys);
+                    }
+                    await trx('directus_revisions').delete().where('collection', '=', collectionKey);
+                    await trx('directus_activity').delete().where('collection', '=', collectionKey);
+                    await trx('directus_permissions').delete().where('collection', '=', collectionKey);
+                    await trx('directus_relations').delete().where({ many_collection: collectionKey });
+                    const relations = this.schema.relations.filter((relation) => {
+                        return relation.collection === collectionKey || relation.related_collection === collectionKey;
+                    });
+                    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);
+                        }
+                        // Delete related m2o fields that point to current collection
+                        if (relation.related_collection === collectionKey) {
+                            await fieldsService.deleteField(relation.collection, relation.field);
+                        }
                     }
-                    // Delete related m2o fields that point to current collection
-                    if (relation.related_collection === collectionKey) {
-                        await fieldsService.deleteField(relation.collection, relation.field);
+                    const a2oRelationsThatIncludeThisCollection = this.schema.relations.filter((relation) => {
+                        var _a, _b;
+                        return (_b = (_a = relation.meta) === null || _a === void 0 ? void 0 : _a.one_allowed_collections) === null || _b === void 0 ? void 0 : _b.includes(collectionKey);
+                    });
+                    for (const relation of a2oRelationsThatIncludeThisCollection) {
+                        const newAllowedCollections = relation
+                            .meta.one_allowed_collections.filter((collection) => collectionKey !== collection)
+                            .join(',');
+                        await trx('directus_relations')
+                            .update({ one_allowed_collections: newAllowedCollections })
+                            .where({ id: relation.meta.id });
                     }
                 }
-                const a2oRelationsThatIncludeThisCollection = this.schema.relations.filter((relation) => {
-                    var _a, _b;
-                    return (_b = (_a = relation.meta) === null || _a === void 0 ? void 0 : _a.one_allowed_collections) === null || _b === void 0 ? void 0 : _b.includes(collectionKey);
-                });
-                for (const relation of a2oRelationsThatIncludeThisCollection) {
-                    const newAllowedCollections = relation
-                        .meta.one_allowed_collections.filter((collection) => collectionKey !== collection)
-                        .join(',');
-                    await trx('directus_relations')
-                        .update({ one_allowed_collections: newAllowedCollections })
-                        .where({ id: relation.meta.id });
-                }
+            });
+            return collectionKey;
+        }
+        finally {
+            if (this.cache && env_1.default.CACHE_AUTO_PURGE && (opts === null || opts === void 0 ? void 0 : opts.autoPurgeCache) !== false) {
+                await this.cache.clear();
             }
-        });
-        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)();
         }
-        await this.systemCache.clear();
-        return collectionKey;
     }
     /**
      * Delete multiple collections by key
@@ -389,21 +409,25 @@ class CollectionsService {
         if (this.accountability && this.accountability.admin !== true) {
             throw new exceptions_1.ForbiddenException();
         }
-        await this.knex.transaction(async (trx) => {
-            const service = new CollectionsService({
-                schema: this.schema,
-                accountability: this.accountability,
-                knex: trx,
+        try {
+            await this.knex.transaction(async (trx) => {
+                const service = new CollectionsService({
+                    schema: this.schema,
+                    accountability: this.accountability,
+                    knex: trx,
+                });
+                for (const collectionKey of collectionKeys) {
+                    await service.deleteOne(collectionKey, { autoPurgeCache: false });
+                }
             });
-            for (const collectionKey of collectionKeys) {
-                await service.deleteOne(collectionKey, { autoPurgeCache: false });
+            return collectionKeys;
+        }
+        finally {
+            if (this.cache && env_1.default.CACHE_AUTO_PURGE && (opts === null || opts === void 0 ? void 0 : opts.autoPurgeCache) !== false) {
+                await this.cache.clear();
             }
-        });
-        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)();
         }
-        await this.systemCache.clear();
-        return collectionKeys;
     }
 }
 exports.CollectionsService = CollectionsService;