directus 9.23.1 → 9.23.3

package/dist/services/graphql/utils/add-path-to-validation-error.js

@@ -3,8 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addPathToValidationError = void 0;
 const graphql_1 = require("graphql");
 function addPathToValidationError(validationError) {
-    var _a, _b, _c;
-    const token = (_c = (_b = (_a = validationError.nodes) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.loc) === null || _c === void 0 ? void 0 : _c.startToken;
+    const token = validationError.nodes?.[0]?.loc?.startToken;
     if (!token)
         return validationError;
     let prev = token;

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

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

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

@@ -3,8 +3,8 @@ 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 exceptions_1 = require("@directus/shared/exceptions");
+const logger_1 = __importDefault(require("../../../logger"));
 const processError = (accountability, error) => {
     logger_1.default.error(error);
     const { originalError } = error;
@@ -18,13 +18,20 @@ const processError = (accountability, error) => {
         };
     }
     else {
-        if ((accountability === null || accountability === void 0 ? void 0 : accountability.admin) === true) {
-            return {
-                ...error,
+        if (accountability?.admin === true) {
+            const graphqlFormattedError = {
+                message: error.message,
                 extensions: {
                     code: 'INTERNAL_SERVER_ERROR',
                 },
             };
+            if (error.locations) {
+                graphqlFormattedError.locations = error.locations;
+            }
+            if (error.path) {
+                graphqlFormattedError.path = error.path;
+            }
+            return graphqlFormattedError;
         }
         else {
             return {

package/dist/services/import-export.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="node" />
-import { Accountability, Query, SchemaOverview } from '@directus/shared/types';
-import { Knex } from 'knex';
-import { AbstractServiceOptions, File } from '../types';
+import type { Accountability, Query, SchemaOverview } from '@directus/shared/types';
+import type { Knex } from 'knex';
 import type { Readable } from 'node:stream';
+import type { AbstractServiceOptions, File } from '../types';
 type ExportFormat = 'csv' | 'json' | 'xml' | 'yaml';
 export declare class ImportService {
     knex: Knex;

package/dist/services/import-export.js

@@ -17,6 +17,7 @@ const StreamArray_1 = __importDefault(require("stream-json/streamers/StreamArray
 const strip_bom_stream_1 = __importDefault(require("strip-bom-stream"));
 const tmp_promise_1 = require("tmp-promise");
 const database_1 = __importDefault(require("../database"));
+const emitter_1 = __importDefault(require("../emitter"));
 const env_1 = __importDefault(require("../env"));
 const exceptions_1 = require("../exceptions");
 const logger_1 = __importDefault(require("../logger"));
@@ -24,20 +25,21 @@ const get_date_formatted_1 = require("../utils/get-date-formatted");
 const files_1 = require("./files");
 const items_1 = require("./items");
 const notifications_1 = require("./notifications");
-const emitter_1 = __importDefault(require("../emitter"));
 class ImportService {
+    knex;
+    accountability;
+    schema;
     constructor(options) {
         this.knex = options.knex || (0, database_1.default)();
         this.accountability = options.accountability || null;
         this.schema = options.schema;
     }
     async import(collection, mimetype, stream) {
-        var _a, _b, _c, _d, _e, _f;
-        if (((_a = this.accountability) === null || _a === void 0 ? void 0 : _a.admin) !== true && collection.startsWith('directus_'))
+        if (this.accountability?.admin !== true && collection.startsWith('directus_'))
             throw new exceptions_1.ForbiddenException();
-        const createPermissions = (_c = (_b = this.accountability) === null || _b === void 0 ? void 0 : _b.permissions) === null || _c === void 0 ? void 0 : _c.find((permission) => permission.collection === collection && permission.action === 'create');
-        const updatePermissions = (_e = (_d = this.accountability) === null || _d === void 0 ? void 0 : _d.permissions) === null || _e === void 0 ? void 0 : _e.find((permission) => permission.collection === collection && permission.action === 'update');
-        if (((_f = this.accountability) === null || _f === void 0 ? void 0 : _f.admin) !== true && (!createPermissions || !updatePermissions)) {
+        const createPermissions = this.accountability?.permissions?.find((permission) => permission.collection === collection && permission.action === 'create');
+        const updatePermissions = this.accountability?.permissions?.find((permission) => permission.collection === collection && permission.action === 'update');
+        if (this.accountability?.admin !== true && (!createPermissions || !updatePermissions)) {
             throw new exceptions_1.ForbiddenException();
         }
         switch (mimetype) {
@@ -144,6 +146,9 @@ class ImportService {
 }
 exports.ImportService = ImportService;
 class ExportService {
+    knex;
+    accountability;
+    schema;
     constructor(options) {
         this.knex = options.knex || (0, database_1.default)();
         this.accountability = options.accountability || null;
@@ -155,7 +160,6 @@ class ExportService {
      * FilesService upload method.
      */
     async exportToFile(collection, query, format, options) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         try {
             const mimeTypes = {
                 csv: 'text/csv',
@@ -166,7 +170,6 @@ class ExportService {
             const database = (0, database_1.default)();
             const { path, cleanup } = await (0, tmp_promise_1.file)();
             await database.transaction(async (trx) => {
-                var _a;
                 const service = new items_1.ItemsService(collection, {
                     accountability: this.accountability,
                     schema: this.schema,
@@ -179,9 +182,9 @@ class ExportService {
                         count: ['*'],
                     },
                 })
-                    .then((result) => { var _a, _b; return Number((_b = (_a = result === null || result === void 0 ? void 0 : result[0]) === null || _a === void 0 ? void 0 : _a.count) !== null && _b !== void 0 ? _b : 0); });
+                    .then((result) => Number(result?.[0]?.count ?? 0));
                 const count = query.limit ? Math.min(totalCount, query.limit) : totalCount;
-                const requestedLimit = (_a = query.limit) !== null && _a !== void 0 ? _a : -1;
+                const requestedLimit = query.limit ?? -1;
                 const batchesRequired = Math.ceil(count / env_1.default.EXPORT_BATCH_SIZE);
                 let readCount = 0;
                 for (let batch = 0; batch < batchesRequired; batch++) {
@@ -211,14 +214,14 @@ class ExportService {
             const title = `export-${collection}-${(0, get_date_formatted_1.getDateFormatted)()}`;
             const filename = `${title}.${format}`;
             const fileWithDefaults = {
-                ...((_a = options === null || options === void 0 ? void 0 : options.file) !== null && _a !== void 0 ? _a : {}),
-                title: (_c = (_b = options === null || options === void 0 ? void 0 : options.file) === null || _b === void 0 ? void 0 : _b.title) !== null && _c !== void 0 ? _c : title,
-                filename_download: (_e = (_d = options === null || options === void 0 ? void 0 : options.file) === null || _d === void 0 ? void 0 : _d.filename_download) !== null && _e !== void 0 ? _e : filename,
-                storage: (_g = (_f = options === null || options === void 0 ? void 0 : options.file) === null || _f === void 0 ? void 0 : _f.storage) !== null && _g !== void 0 ? _g : storage,
+                ...(options?.file ?? {}),
+                title: options?.file?.title ?? title,
+                filename_download: options?.file?.filename_download ?? filename,
+                storage: options?.file?.storage ?? storage,
                 type: mimeTypes[format],
             };
             const savedFile = await filesService.uploadOne((0, fs_extra_1.createReadStream)(path), fileWithDefaults);
-            if ((_h = this.accountability) === null || _h === void 0 ? void 0 : _h.user) {
+            if (this.accountability?.user) {
                 const notificationsService = new notifications_1.NotificationsService({
                     accountability: this.accountability,
                     schema: this.schema,
@@ -235,7 +238,7 @@ class ExportService {
         }
         catch (err) {
             logger_1.default.error(err, `Couldn't export ${collection}: ${err.message}`);
-            if ((_j = this.accountability) === null || _j === void 0 ? void 0 : _j.user) {
+            if (this.accountability?.user) {
                 const notificationsService = new notifications_1.NotificationsService({
                     accountability: this.accountability,
                     schema: this.schema,
@@ -255,9 +258,9 @@ class ExportService {
     transform(input, format, options) {
         if (format === 'json') {
             let string = JSON.stringify(input || null, null, '\t');
-            if ((options === null || options === void 0 ? void 0 : options.includeHeader) === false)
+            if (options?.includeHeader === false)
                 string = string.split('\n').slice(1).join('\n');
-            if ((options === null || options === void 0 ? void 0 : options.includeFooter) === false) {
+            if (options?.includeFooter === false) {
                 const lines = string.split('\n');
                 string = lines.slice(0, lines.length - 1).join('\n');
                 string += ',\n';
@@ -266,9 +269,9 @@ class ExportService {
         }
         if (format === 'xml') {
             let string = (0, js2xmlparser_1.parse)('data', input);
-            if ((options === null || options === void 0 ? void 0 : options.includeHeader) === false)
+            if (options?.includeHeader === false)
                 string = string.split('\n').slice(2).join('\n');
-            if ((options === null || options === void 0 ? void 0 : options.includeFooter) === false) {
+            if (options?.includeFooter === false) {
                 const lines = string.split('\n');
                 string = lines.slice(0, lines.length - 1).join('\n');
                 string += '\n';
@@ -280,10 +283,10 @@ class ExportService {
                 return '';
             const parser = new json2csv_1.Parser({
                 transforms: [json2csv_1.transforms.flatten({ separator: '.' })],
-                header: (options === null || options === void 0 ? void 0 : options.includeHeader) !== false,
+                header: options?.includeHeader !== false,
             });
             let string = parser.parse(input);
-            if ((options === null || options === void 0 ? void 0 : options.includeHeader) === false) {
+            if (options?.includeHeader === false) {
                 string = '\n' + string;
             }
             return string;

package/dist/services/items.d.ts

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

package/dist/services/items.js

@@ -20,6 +20,12 @@ const authorization_1 = require("./authorization");
 const index_1 = require("./index");
 const payload_1 = require("./payload");
 class ItemsService {
+    collection;
+    knex;
+    accountability;
+    eventScope;
+    schema;
+    cache;
     constructor(collection, options) {
         this.collection = collection;
         this.knex = options.knex || (0, database_1.default)();
@@ -72,7 +78,7 @@ 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
+            const payloadAfterHooks = opts?.emitEvents !== false
                 ? await emitter_1.default.emitFilter(this.eventScope === 'items'
                     ? ['items.create', `${this.collection}.items.create`]
                     : `${this.eventScope}.create`, payload, {
@@ -86,7 +92,7 @@ class ItemsService {
             const payloadWithPresets = this.accountability
                 ? await authorizationService.validatePayload('create', this.collection, payloadAfterHooks)
                 : payloadAfterHooks;
-            if (opts === null || opts === void 0 ? void 0 : opts.preMutationException) {
+            if (opts?.preMutationException) {
                 throw opts.preMutationException;
             }
             const { payload: payloadWithM2O, revisions: revisionsM2O, nestedActionEvents: nestedActionEventsM2O, } = await payloadService.processM2O(payloadWithPresets, opts);
@@ -103,10 +109,10 @@ class ItemsService {
                     .then((result) => result[0]);
                 const returnedKey = typeof result === 'object' ? result[primaryKeyField] : result;
                 if (this.schema.collections[this.collection].fields[primaryKeyField].type === 'uuid') {
-                    primaryKey = (0, helpers_1.getHelpers)(trx).schema.formatUUID(primaryKey !== null && primaryKey !== void 0 ? primaryKey : returnedKey);
+                    primaryKey = (0, helpers_1.getHelpers)(trx).schema.formatUUID(primaryKey ?? returnedKey);
                 }
                 else {
-                    primaryKey = primaryKey !== null && primaryKey !== void 0 ? primaryKey : returnedKey;
+                    primaryKey = primaryKey ?? returnedKey;
                 }
             }
             catch (err) {
@@ -148,26 +154,27 @@ class ItemsService {
                         knex: trx,
                         schema: this.schema,
                     });
+                    const revisionDelta = await payloadService.prepareDelta(payloadAfterHooks);
                     const revision = await revisionsService.createOne({
                         activity: activity,
                         collection: this.collection,
                         item: primaryKey,
-                        data: await payloadService.prepareDelta(payload),
-                        delta: await payloadService.prepareDelta(payload),
+                        data: revisionDelta,
+                        delta: revisionDelta,
                     });
                     // Make sure to set the parent field of the child-revision rows
                     const childrenRevisions = [...revisionsM2O, ...revisionsA2O, ...revisionsO2M];
                     if (childrenRevisions.length > 0) {
                         await revisionsService.updateMany(childrenRevisions, { parent: revision });
                     }
-                    if (opts === null || opts === void 0 ? void 0 : opts.onRevisionCreate) {
+                    if (opts?.onRevisionCreate) {
                         opts.onRevisionCreate(revision);
                     }
                 }
             }
             return primaryKey;
         });
-        if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false) {
+        if (opts?.emitEvents !== false) {
             const actionEvent = {
                 event: this.eventScope === 'items'
                     ? ['items.create', `${this.collection}.items.create`]
@@ -183,14 +190,14 @@ class ItemsService {
                     accountability: this.accountability,
                 },
             };
-            if (opts === null || opts === void 0 ? void 0 : opts.bypassEmitAction) {
+            if (opts?.bypassEmitAction) {
                 opts.bypassEmitAction(actionEvent);
             }
             else {
                 emitter_1.default.emitAction(actionEvent.event, actionEvent.meta, actionEvent.context);
             }
             for (const nestedActionEvent of nestedActionEvents) {
-                if (opts === null || opts === void 0 ? void 0 : opts.bypassEmitAction) {
+                if (opts?.bypassEmitAction) {
                     opts.bypassEmitAction(nestedActionEvent);
                 }
                 else {
@@ -198,7 +205,7 @@ class ItemsService {
                 }
             }
         }
-        if (this.cache && env_1.default.CACHE_AUTO_PURGE && (opts === null || opts === void 0 ? void 0 : opts.autoPurgeCache) !== false) {
+        if (this.cache && env_1.default.CACHE_AUTO_PURGE && opts?.autoPurgeCache !== false) {
             await this.cache.clear();
         }
         return primaryKey;
@@ -225,9 +232,9 @@ class ItemsService {
             }
             return { primaryKeys, nestedActionEvents };
         });
-        if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false) {
+        if (opts?.emitEvents !== false) {
             for (const nestedActionEvent of nestedActionEvents) {
-                if (opts === null || opts === void 0 ? void 0 : opts.bypassEmitAction) {
+                if (opts?.bypassEmitAction) {
                     opts.bypassEmitAction(nestedActionEvent);
                 }
                 else {
@@ -235,7 +242,7 @@ class ItemsService {
                 }
             }
         }
-        if (this.cache && env_1.default.CACHE_AUTO_PURGE && (opts === null || opts === void 0 ? void 0 : opts.autoPurgeCache) !== false) {
+        if (this.cache && env_1.default.CACHE_AUTO_PURGE && opts?.autoPurgeCache !== false) {
             await this.cache.clear();
         }
         return primaryKeys;
@@ -244,7 +251,7 @@ class ItemsService {
      * Get items by query
      */
     async readByQuery(query, opts) {
-        const updatedQuery = (opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false
+        const updatedQuery = opts?.emitEvents !== false
             ? await emitter_1.default.emitFilter(this.eventScope === 'items'
                 ? ['items.query', `${this.collection}.items.query`]
                 : `${this.eventScope}.query`, query, {
@@ -260,7 +267,7 @@ class ItemsService {
             // 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
             // access to (a) certain item(s)
-            action: (opts === null || opts === void 0 ? void 0 : opts.permissionsAction) || 'read',
+            action: opts?.permissionsAction || 'read',
             knex: this.knex,
         });
         if (this.accountability && this.accountability.admin !== true) {
@@ -269,17 +276,17 @@ class ItemsService {
                 knex: this.knex,
                 schema: this.schema,
             });
-            ast = await authorizationService.processAST(ast, opts === null || opts === void 0 ? void 0 : opts.permissionsAction);
+            ast = await authorizationService.processAST(ast, opts?.permissionsAction);
         }
         const records = await (0, run_ast_1.default)(ast, this.schema, {
             knex: this.knex,
             // GraphQL requires relational keys to be returned regardless
-            stripNonRequested: (opts === null || opts === void 0 ? void 0 : opts.stripNonRequested) !== undefined ? opts.stripNonRequested : true,
+            stripNonRequested: opts?.stripNonRequested !== undefined ? opts.stripNonRequested : true,
         });
         if (records === null) {
             throw new exceptions_1.ForbiddenException();
         }
-        const filteredRecords = (opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false
+        const filteredRecords = opts?.emitEvents !== false
             ? await emitter_1.default.emitFilter(this.eventScope === 'items' ? ['items.read', `${this.collection}.items.read`] : `${this.eventScope}.read`, records, {
                 query: updatedQuery,
                 collection: this.collection,
@@ -289,7 +296,7 @@ class ItemsService {
                 accountability: this.accountability,
             })
             : records;
-        if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false) {
+        if (opts?.emitEvents !== false) {
             emitter_1.default.emitAction(this.eventScope === 'items' ? ['items.read', `${this.collection}.items.read`] : `${this.eventScope}.read`, {
                 payload: filteredRecords,
                 query: updatedQuery,
@@ -320,10 +327,9 @@ class ItemsService {
      * Get multiple items by primary keys
      */
     async readMany(keys, query = {}, opts) {
-        var _a;
         const primaryKeyField = this.schema.collections[this.collection].primary;
         (0, validate_keys_1.validateKeys)(this.schema, this.collection, primaryKeyField, keys);
-        const filterWithKey = { _and: [{ [primaryKeyField]: { _in: keys } }, (_a = query.filter) !== null && _a !== void 0 ? _a : {}] };
+        const filterWithKey = { _and: [{ [primaryKeyField]: { _in: keys } }, query.filter ?? {}] };
         const queryWithKey = (0, lodash_1.assign)({}, query, { filter: filterWithKey });
         // Set query limit as the number of keys
         if (Array.isArray(keys) && keys.length > 0 && !queryWithKey.limit) {
@@ -375,7 +381,7 @@ class ItemsService {
             });
         }
         finally {
-            if (this.cache && env_1.default.CACHE_AUTO_PURGE && (opts === null || opts === void 0 ? void 0 : opts.autoPurgeCache) !== false) {
+            if (this.cache && env_1.default.CACHE_AUTO_PURGE && opts?.autoPurgeCache !== false) {
                 await this.cache.clear();
             }
         }
@@ -400,7 +406,7 @@ 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
+        const payloadAfterHooks = opts?.emitEvents !== false
             ? await emitter_1.default.emitFilter(this.eventScope === 'items'
                 ? ['items.update', `${this.collection}.items.update`]
                 : `${this.eventScope}.update`, payload, {
@@ -420,7 +426,7 @@ class ItemsService {
         const payloadWithPresets = this.accountability
             ? await authorizationService.validatePayload('update', this.collection, payloadAfterHooks)
             : payloadAfterHooks;
-        if (opts === null || opts === void 0 ? void 0 : opts.preMutationException) {
+        if (opts?.preMutationException) {
             throw opts.preMutationException;
         }
         await this.knex.transaction(async (trx) => {
@@ -484,7 +490,7 @@ class ItemsService {
                     const revisionIDs = await revisionsService.createMany(revisions);
                     for (let i = 0; i < revisionIDs.length; i++) {
                         const revisionID = revisionIDs[i];
-                        if (opts === null || opts === void 0 ? void 0 : opts.onRevisionCreate) {
+                        if (opts?.onRevisionCreate) {
                             opts.onRevisionCreate(revisionID);
                         }
                         if (i === 0) {
@@ -500,10 +506,10 @@ class ItemsService {
                 }
             }
         });
-        if (this.cache && env_1.default.CACHE_AUTO_PURGE && (opts === null || opts === void 0 ? void 0 : opts.autoPurgeCache) !== false) {
+        if (this.cache && env_1.default.CACHE_AUTO_PURGE && opts?.autoPurgeCache !== false) {
             await this.cache.clear();
         }
-        if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false) {
+        if (opts?.emitEvents !== false) {
             const actionEvent = {
                 event: this.eventScope === 'items'
                     ? ['items.update', `${this.collection}.items.update`]
@@ -519,14 +525,14 @@ class ItemsService {
                     accountability: this.accountability,
                 },
             };
-            if (opts === null || opts === void 0 ? void 0 : opts.bypassEmitAction) {
+            if (opts?.bypassEmitAction) {
                 opts.bypassEmitAction(actionEvent);
             }
             else {
                 emitter_1.default.emitAction(actionEvent.event, actionEvent.meta, actionEvent.context);
             }
             for (const nestedActionEvent of nestedActionEvents) {
-                if (opts === null || opts === void 0 ? void 0 : opts.bypassEmitAction) {
+                if (opts?.bypassEmitAction) {
                     opts.bypassEmitAction(nestedActionEvent);
                 }
                 else {
@@ -575,7 +581,7 @@ class ItemsService {
             }
             return primaryKeys;
         });
-        if (this.cache && env_1.default.CACHE_AUTO_PURGE && (opts === null || opts === void 0 ? void 0 : opts.autoPurgeCache) !== false) {
+        if (this.cache && env_1.default.CACHE_AUTO_PURGE && opts?.autoPurgeCache !== false) {
             await this.cache.clear();
         }
         return primaryKeys;
@@ -612,10 +618,10 @@ class ItemsService {
             });
             await authorizationService.checkAccess('delete', this.collection, keys);
         }
-        if (opts === null || opts === void 0 ? void 0 : opts.preMutationException) {
+        if (opts?.preMutationException) {
             throw opts.preMutationException;
         }
-        if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false) {
+        if (opts?.emitEvents !== false) {
             await emitter_1.default.emitFilter(this.eventScope === 'items' ? ['items.delete', `${this.collection}.items.delete`] : `${this.eventScope}.delete`, keys, {
                 collection: this.collection,
             }, {
@@ -642,10 +648,10 @@ class ItemsService {
                 })));
             }
         });
-        if (this.cache && env_1.default.CACHE_AUTO_PURGE && (opts === null || opts === void 0 ? void 0 : opts.autoPurgeCache) !== false) {
+        if (this.cache && env_1.default.CACHE_AUTO_PURGE && opts?.autoPurgeCache !== false) {
             await this.cache.clear();
         }
-        if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false) {
+        if (opts?.emitEvents !== false) {
             const actionEvent = {
                 event: this.eventScope === 'items'
                     ? ['items.delete', `${this.collection}.items.delete`]
@@ -661,7 +667,7 @@ class ItemsService {
                     accountability: this.accountability,
                 },
             };
-            if (opts === null || opts === void 0 ? void 0 : opts.bypassEmitAction) {
+            if (opts?.bypassEmitAction) {
                 opts.bypassEmitAction(actionEvent);
             }
             else {

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

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

package/dist/services/mail/index.js

@@ -18,10 +18,14 @@ const liquidEngine = new liquidjs_1.Liquid({
     extname: '.liquid',
 });
 class MailService {
+    schema;
+    accountability;
+    knex;
+    mailer;
     constructor(opts) {
         this.schema = opts.schema;
         this.accountability = opts.accountability || null;
-        this.knex = (opts === null || opts === void 0 ? void 0 : opts.knex) || (0, database_1.default)();
+        this.knex = opts?.knex || (0, database_1.default)();
         this.mailer = (0, mailer_1.default)();
         if (env_1.default.EMAIL_VERIFY_SETUP) {
             this.mailer.verify((error) => {
@@ -72,10 +76,10 @@ class MailService {
             .from('directus_settings')
             .first();
         return {
-            projectName: (projectInfo === null || projectInfo === void 0 ? void 0 : projectInfo.project_name) || 'Directus',
-            projectColor: (projectInfo === null || projectInfo === void 0 ? void 0 : projectInfo.project_color) || '#546e7a',
-            projectLogo: getProjectLogoURL(projectInfo === null || projectInfo === void 0 ? void 0 : projectInfo.project_logo),
-            projectUrl: (projectInfo === null || projectInfo === void 0 ? void 0 : projectInfo.project_url) || '',
+            projectName: projectInfo?.project_name || 'Directus',
+            projectColor: projectInfo?.project_color || '#546e7a',
+            projectLogo: getProjectLogoURL(projectInfo?.project_logo),
+            projectUrl: projectInfo?.project_url || '',
         };
         function getProjectLogoURL(logoID) {
             const projectLogoUrl = new url_1.Url(env_1.default.PUBLIC_URL);

package/dist/services/meta.d.ts

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

package/dist/services/meta.js

@@ -8,6 +8,9 @@ const database_1 = __importDefault(require("../database"));
 const exceptions_1 = require("../exceptions");
 const apply_query_1 = require("../utils/apply-query");
 class MetaService {
+    knex;
+    accountability;
+    schema;
     constructor(options) {
         this.knex = options.knex || (0, database_1.default)();
         this.accountability = options.accountability || null;
@@ -31,31 +34,29 @@ class MetaService {
         }, {});
     }
     async totalCount(collection) {
-        var _a, _b, _c, _d, _e;
         const dbQuery = this.knex(collection).count('*', { as: 'count' }).first();
-        if (((_a = this.accountability) === null || _a === void 0 ? void 0 : _a.admin) !== true) {
-            const permissionsRecord = (_c = (_b = this.accountability) === null || _b === void 0 ? void 0 : _b.permissions) === null || _c === void 0 ? void 0 : _c.find((permission) => {
+        if (this.accountability?.admin !== true) {
+            const permissionsRecord = this.accountability?.permissions?.find((permission) => {
                 return permission.action === 'read' && permission.collection === collection;
             });
             if (!permissionsRecord)
                 throw new exceptions_1.ForbiddenException();
-            const permissions = (_d = permissionsRecord.permissions) !== null && _d !== void 0 ? _d : {};
+            const permissions = permissionsRecord.permissions ?? {};
             (0, apply_query_1.applyFilter)(this.knex, this.schema, dbQuery, permissions, collection, {});
         }
         const result = await dbQuery;
-        return Number((_e = result === null || result === void 0 ? void 0 : result.count) !== null && _e !== void 0 ? _e : 0);
+        return Number(result?.count ?? 0);
     }
     async filterCount(collection, query) {
-        var _a, _b, _c, _d;
         const dbQuery = this.knex(collection).count('*', { as: 'count' });
         let filter = query.filter || {};
-        if (((_a = this.accountability) === null || _a === void 0 ? void 0 : _a.admin) !== true) {
-            const permissionsRecord = (_c = (_b = this.accountability) === null || _b === void 0 ? void 0 : _b.permissions) === null || _c === void 0 ? void 0 : _c.find((permission) => {
+        if (this.accountability?.admin !== true) {
+            const permissionsRecord = this.accountability?.permissions?.find((permission) => {
                 return permission.action === 'read' && permission.collection === collection;
             });
             if (!permissionsRecord)
                 throw new exceptions_1.ForbiddenException();
-            const permissions = (_d = permissionsRecord.permissions) !== null && _d !== void 0 ? _d : {};
+            const permissions = permissionsRecord.permissions ?? {};
             if (Object.keys(filter).length > 0) {
                 filter = { _and: [permissions, filter] };
             }

package/dist/services/notifications.d.ts

@@ -1,8 +1,8 @@
-import { AbstractServiceOptions, PrimaryKey, MutationOptions } from '../types';
+import type { Notification } from '@directus/shared/types';
+import type { AbstractServiceOptions, MutationOptions, PrimaryKey } from '../types';
 import { ItemsService } from './items';
-import { Notification } from '@directus/shared/types';
-import { UsersService } from './users';
 import { MailService } from './mail';
+import { UsersService } from './users';
 export declare class NotificationsService extends ItemsService {
     usersService: UsersService;
     mailService: MailService;