directus 9.15.1 → 9.17.0

package/dist/services/items.js

@@ -52,6 +52,7 @@ class ItemsService {
             .filter((field) => field.alias === true)
             .map((field) => field.field);
         const payload = (0, lodash_1.cloneDeep)(data);
+        const nestedActionEvents = [];
         // By wrapping the logic in a transaction, we make sure we automatically roll back all the
         // changes in the DB if any of the parts contained within throws an error. This also means
         // that any errors thrown in any nested relational changes will bubble up and cancel the whole
@@ -84,8 +85,8 @@ class ItemsService {
             const payloadWithPresets = this.accountability
                 ? await authorizationService.validatePayload('create', this.collection, payloadAfterHooks)
                 : payloadAfterHooks;
-            const { payload: payloadWithM2O, revisions: revisionsM2O } = await payloadService.processM2O(payloadWithPresets);
-            const { payload: payloadWithA2O, revisions: revisionsA2O } = await payloadService.processA2O(payloadWithM2O);
+            const { payload: payloadWithM2O, revisions: revisionsM2O, nestedActionEvents: nestedActionEventsM2O, } = await payloadService.processM2O(payloadWithPresets, opts);
+            const { payload: payloadWithA2O, revisions: revisionsA2O, nestedActionEvents: nestedActionEventsA2O, } = await payloadService.processA2O(payloadWithM2O, opts);
             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, the PK already exists in the object we're saving.
@@ -113,7 +114,10 @@ class ItemsService {
                 // to read from it
                 payload[primaryKeyField] = primaryKey;
             }
-            const { revisions: revisionsO2M } = await payloadService.processO2M(payload, primaryKey);
+            const { revisions: revisionsO2M, nestedActionEvents: nestedActionEventsO2M } = await payloadService.processO2M(payload, primaryKey, opts);
+            nestedActionEvents.push(...nestedActionEventsM2O);
+            nestedActionEvents.push(...nestedActionEventsA2O);
+            nestedActionEvents.push(...nestedActionEventsO2M);
             // If this is an authenticated action, and accountability tracking is enabled, save activity row
             if (this.accountability && this.schema.collections[this.collection].accountability !== null) {
                 const activityService = new index_1.ActivityService({
@@ -126,6 +130,7 @@ class ItemsService {
                     collection: this.collection,
                     ip: this.accountability.ip,
                     user_agent: this.accountability.userAgent,
+                    origin: this.accountability.origin,
                     item: primaryKey,
                 });
                 // If revisions are tracked, create revisions record
@@ -154,17 +159,30 @@ class ItemsService {
             return primaryKey;
         });
         if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false) {
-            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: this.knex || (0, database_1.default)(),
-                schema: this.schema,
-                accountability: this.accountability,
-            });
+            const actionEvent = {
+                event: this.eventScope === 'items'
+                    ? ['items.create', `${this.collection}.items.create`]
+                    : `${this.eventScope}.create`,
+                meta: {
+                    payload,
+                    key: primaryKey,
+                    collection: this.collection,
+                },
+                context: {
+                    database: (0, database_1.default)(),
+                    schema: this.schema,
+                    accountability: this.accountability,
+                },
+            };
+            if (!(opts === null || opts === void 0 ? void 0 : opts.bypassEmitAction)) {
+                emitter_1.default.emitAction(actionEvent.event, actionEvent.meta, actionEvent.context);
+            }
+            else {
+                opts.bypassEmitAction(actionEvent);
+            }
+            for (const nestedActionEvent of nestedActionEvents) {
+                emitter_1.default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
+            }
         }
         if (this.cache && env_1.default.CACHE_AUTO_PURGE && (opts === null || opts === void 0 ? void 0 : opts.autoPurgeCache) !== false) {
             await this.cache.clear();
@@ -197,7 +215,16 @@ class ItemsService {
      * Get items by query
      */
     async readByQuery(query, opts) {
-        let ast = await (0, get_ast_from_query_1.default)(this.collection, query, this.schema, {
+        const updatedQuery = (opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false
+            ? await emitter_1.default.emitFilter(`${this.eventScope}.query`, query, {
+                collection: this.collection,
+            }, {
+                database: this.knex,
+                schema: this.schema,
+                accountability: this.accountability,
+            })
+            : query;
+        let ast = await (0, get_ast_from_query_1.default)(this.collection, updatedQuery, this.schema, {
             accountability: this.accountability,
             // By setting the permissions action, you can read items using the permissions for another
             // operation's permissions. This is used to dynamically check if you have update/delete
@@ -223,7 +250,7 @@ class ItemsService {
         }
         const filteredRecords = (opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false
             ? await emitter_1.default.emitFilter(this.eventScope === 'items' ? ['items.read', `${this.collection}.items.read`] : `${this.eventScope}.read`, records, {
-                query,
+                query: updatedQuery,
                 collection: this.collection,
             }, {
                 database: this.knex,
@@ -234,7 +261,7 @@ class ItemsService {
         if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false) {
             emitter_1.default.emitAction(this.eventScope === 'items' ? ['items.read', `${this.collection}.items.read`] : `${this.eventScope}.read`, {
                 payload: filteredRecords,
-                query,
+                query: updatedQuery,
                 collection: this.collection,
             }, {
                 database: this.knex || (0, database_1.default)(),
@@ -323,6 +350,7 @@ class ItemsService {
             .filter((field) => field.alias === true)
             .map((field) => field.field);
         const payload = (0, lodash_1.cloneDeep)(data);
+        const nestedActionEvents = [];
         const authorizationService = new authorization_1.AuthorizationService({
             accountability: this.accountability,
             knex: this.knex,
@@ -356,8 +384,8 @@ class ItemsService {
                 knex: trx,
                 schema: this.schema,
             });
-            const { payload: payloadWithM2O, revisions: revisionsM2O } = await payloadService.processM2O(payloadWithPresets);
-            const { payload: payloadWithA2O, revisions: revisionsA2O } = await payloadService.processA2O(payloadWithM2O);
+            const { payload: payloadWithM2O, revisions: revisionsM2O, nestedActionEvents: nestedActionEventsM2O, } = await payloadService.processM2O(payloadWithPresets, opts);
+            const { payload: payloadWithA2O, revisions: revisionsA2O, nestedActionEvents: nestedActionEventsA2O, } = await payloadService.processA2O(payloadWithM2O, opts);
             const payloadWithoutAliasAndPK = (0, lodash_1.pick)(payloadWithA2O, (0, lodash_1.without)(fields, primaryKeyField, ...aliases));
             const payloadWithTypeCasting = await payloadService.processValues('update', payloadWithoutAliasAndPK);
             if (Object.keys(payloadWithTypeCasting).length > 0) {
@@ -369,9 +397,12 @@ class ItemsService {
                 }
             }
             const childrenRevisions = [...revisionsM2O, ...revisionsA2O];
+            nestedActionEvents.push(...nestedActionEventsM2O);
+            nestedActionEvents.push(...nestedActionEventsA2O);
             for (const key of keys) {
-                const { revisions } = await payloadService.processO2M(payload, key);
+                const { revisions, nestedActionEvents: nestedActionEventsO2M } = await payloadService.processO2M(payload, key, opts);
                 childrenRevisions.push(...revisions);
+                nestedActionEvents.push(...nestedActionEventsO2M);
             }
             // If this is an authenticated action, and accountability tracking is enabled, save activity row
             if (this.accountability && this.schema.collections[this.collection].accountability !== null) {
@@ -385,6 +416,7 @@ class ItemsService {
                     collection: this.collection,
                     ip: this.accountability.ip,
                     user_agent: this.accountability.userAgent,
+                    origin: this.accountability.origin,
                     item: key,
                 })));
                 if (this.schema.collections[this.collection].accountability === 'all') {
@@ -427,17 +459,30 @@ class ItemsService {
             await this.cache.clear();
         }
         if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false) {
-            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: this.knex || (0, database_1.default)(),
-                schema: this.schema,
-                accountability: this.accountability,
-            });
+            const actionEvent = {
+                event: this.eventScope === 'items'
+                    ? ['items.update', `${this.collection}.items.update`]
+                    : `${this.eventScope}.update`,
+                meta: {
+                    payload,
+                    keys,
+                    collection: this.collection,
+                },
+                context: {
+                    database: (0, database_1.default)(),
+                    schema: this.schema,
+                    accountability: this.accountability,
+                },
+            };
+            if (!(opts === null || opts === void 0 ? void 0 : opts.bypassEmitAction)) {
+                emitter_1.default.emitAction(actionEvent.event, actionEvent.meta, actionEvent.context);
+            }
+            else {
+                opts.bypassEmitAction(actionEvent);
+            }
+            for (const nestedActionEvent of nestedActionEvents) {
+                emitter_1.default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
+            }
         }
         return keys;
     }
@@ -539,6 +584,7 @@ class ItemsService {
                     collection: this.collection,
                     ip: this.accountability.ip,
                     user_agent: this.accountability.userAgent,
+                    origin: this.accountability.origin,
                     item: key,
                 })));
             }
@@ -547,17 +593,27 @@ class ItemsService {
             await this.cache.clear();
         }
         if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false) {
-            emitter_1.default.emitAction(this.eventScope === 'items' ? ['items.delete', `${this.collection}.items.delete`] : `${this.eventScope}.delete`, {
-                payload: keys,
-                keys: 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: this.knex || (0, database_1.default)(),
-                schema: this.schema,
-                accountability: this.accountability,
-            });
+            const actionEvent = {
+                event: this.eventScope === 'items'
+                    ? ['items.delete', `${this.collection}.items.delete`]
+                    : `${this.eventScope}.delete`,
+                meta: {
+                    payload: keys,
+                    keys: keys,
+                    collection: this.collection,
+                },
+                context: {
+                    database: (0, database_1.default)(),
+                    schema: this.schema,
+                    accountability: this.accountability,
+                },
+            };
+            if (!(opts === null || opts === void 0 ? void 0 : opts.bypassEmitAction)) {
+                emitter_1.default.emitAction(actionEvent.event, actionEvent.meta, actionEvent.context);
+            }
+            else {
+                opts.bypassEmitAction(actionEvent);
+            }
         }
         return keys;
     }

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

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