directus 9.22.4 → 9.23.3

package/dist/services/authentication.js

@@ -7,7 +7,6 @@ exports.AuthenticationService = void 0;
 const types_1 = require("@directus/shared/types");
 const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
 const lodash_1 = require("lodash");
-const ms_1 = __importDefault(require("ms"));
 const perf_hooks_1 = require("perf_hooks");
 const auth_1 = require("../auth");
 const constants_1 = require("../constants");
@@ -16,12 +15,17 @@ const emitter_1 = __importDefault(require("../emitter"));
 const env_1 = __importDefault(require("../env"));
 const exceptions_1 = require("../exceptions");
 const rate_limiter_1 = require("../rate-limiter");
+const get_milliseconds_1 = require("../utils/get-milliseconds");
 const stall_1 = require("../utils/stall");
 const activity_1 = require("./activity");
 const settings_1 = require("./settings");
 const tfa_1 = require("./tfa");
-const loginAttemptsLimiter = (0, rate_limiter_1.createRateLimiter)({ duration: 0 });
+const loginAttemptsLimiter = (0, rate_limiter_1.createRateLimiter)('RATE_LIMITER', { duration: 0 });
 class AuthenticationService {
+    knex;
+    accountability;
+    activityService;
+    schema;
     constructor(options) {
         this.knex = options.knex || (0, database_1.default)();
         this.accountability = options.accountability || null;
@@ -35,7 +39,6 @@ class AuthenticationService {
      * to handle password existence checks elsewhere
      */
     async login(providerName = constants_1.DEFAULT_AUTH_PROVIDER, payload, otp) {
-        var _a, _b, _c;
         const { nanoid } = await import('nanoid');
         const STALL_TIME = env_1.default.LOGIN_STALL_TIME;
         const timeStart = perf_hooks_1.performance.now();
@@ -56,7 +59,7 @@ class AuthenticationService {
             .first();
         const updatedPayload = await emitter_1.default.emitFilter('auth.login', payload, {
             status: 'pending',
-            user: user === null || user === void 0 ? void 0 : user.id,
+            user: user?.id,
             provider: providerName,
         }, {
             database: this.knex,
@@ -67,7 +70,7 @@ class AuthenticationService {
             emitter_1.default.emitAction('auth.login', {
                 payload: updatedPayload,
                 status,
-                user: user === null || user === void 0 ? void 0 : user.id,
+                user: user?.id,
                 provider: providerName,
             }, {
                 database: this.knex,
@@ -75,9 +78,9 @@ class AuthenticationService {
                 accountability: this.accountability,
             });
         };
-        if ((user === null || user === void 0 ? void 0 : user.status) !== 'active') {
+        if (user?.status !== 'active') {
             emitStatus('fail');
-            if ((user === null || user === void 0 ? void 0 : user.status) === 'suspended') {
+            if (user?.status === 'suspended') {
                 await (0, stall_1.stall)(STALL_TIME, timeStart);
                 throw new exceptions_1.UserSuspendedException();
             }
@@ -139,7 +142,7 @@ class AuthenticationService {
         };
         const customClaims = await emitter_1.default.emitFilter('auth.jwt', tokenPayload, {
             status: 'pending',
-            user: user === null || user === void 0 ? void 0 : user.id,
+            user: user?.id,
             provider: providerName,
             type: 'login',
         }, {
@@ -152,14 +155,14 @@ class AuthenticationService {
             issuer: 'directus',
         });
         const refreshToken = nanoid(64);
-        const refreshTokenExpiration = new Date(Date.now() + (0, ms_1.default)(env_1.default.REFRESH_TOKEN_TTL));
+        const refreshTokenExpiration = new Date(Date.now() + (0, get_milliseconds_1.getMilliseconds)(env_1.default.REFRESH_TOKEN_TTL, 0));
         await this.knex('directus_sessions').insert({
             token: refreshToken,
             user: user.id,
             expires: refreshTokenExpiration,
-            ip: (_a = this.accountability) === null || _a === void 0 ? void 0 : _a.ip,
-            user_agent: (_b = this.accountability) === null || _b === void 0 ? void 0 : _b.userAgent,
-            origin: (_c = this.accountability) === null || _c === void 0 ? void 0 : _c.origin,
+            ip: this.accountability?.ip,
+            user_agent: this.accountability?.userAgent,
+            origin: this.accountability?.origin,
         });
         await this.knex('directus_sessions').delete().where('expires', '<', new Date());
         if (this.accountability) {
@@ -182,7 +185,7 @@ class AuthenticationService {
         return {
             accessToken,
             refreshToken,
-            expires: (0, ms_1.default)(env_1.default.ACCESS_TOKEN_TTL),
+            expires: (0, get_milliseconds_1.getMilliseconds)(env_1.default.ACCESS_TOKEN_TTL),
             id: user.id,
         };
     }
@@ -282,7 +285,7 @@ class AuthenticationService {
             issuer: 'directus',
         });
         const newRefreshToken = nanoid(64);
-        const refreshTokenExpiration = new Date(Date.now() + (0, ms_1.default)(env_1.default.REFRESH_TOKEN_TTL));
+        const refreshTokenExpiration = new Date(Date.now() + (0, get_milliseconds_1.getMilliseconds)(env_1.default.REFRESH_TOKEN_TTL, 0));
         await this.knex('directus_sessions')
             .update({
             token: newRefreshToken,
@@ -295,7 +298,7 @@ class AuthenticationService {
         return {
             accessToken,
             refreshToken: newRefreshToken,
-            expires: (0, ms_1.default)(env_1.default.ACCESS_TOKEN_TTL),
+            expires: (0, get_milliseconds_1.getMilliseconds)(env_1.default.ACCESS_TOKEN_TTL),
             id: record.user_id,
         };
     }

package/dist/services/authorization.d.ts

@@ -1,6 +1,6 @@
-import { Accountability, PermissionsAction, SchemaOverview } from '@directus/shared/types';
-import { Knex } from 'knex';
-import { AbstractServiceOptions, AST, Item, PrimaryKey } from '../types';
+import type { Accountability, PermissionsAction, SchemaOverview } from '@directus/shared/types';
+import type { Knex } from 'knex';
+import type { AbstractServiceOptions, AST, Item, PrimaryKey } from '../types';
 import { PayloadService } from './payload';
 export declare class AuthorizationService {
     knex: Knex;

package/dist/services/authorization.js

@@ -7,14 +7,18 @@ exports.AuthorizationService = void 0;
 const exceptions_1 = require("@directus/shared/exceptions");
 const utils_1 = require("@directus/shared/utils");
 const lodash_1 = require("lodash");
+const constants_1 = require("../constants");
 const database_1 = __importDefault(require("../database"));
 const exceptions_2 = require("../exceptions");
+const get_relation_info_1 = require("../utils/get-relation-info");
 const strip_function_1 = require("../utils/strip-function");
 const items_1 = require("./items");
 const payload_1 = require("./payload");
-const get_relation_info_1 = require("../utils/get-relation-info");
-const constants_1 = require("../constants");
 class AuthorizationService {
+    knex;
+    accountability;
+    payloadService;
+    schema;
     constructor(options) {
         this.knex = options.knex || (0, database_1.default)();
         this.accountability = options.accountability || null;
@@ -25,12 +29,11 @@ class AuthorizationService {
         });
     }
     async processAST(ast, action = 'read') {
-        var _a, _b, _c;
         const collectionsRequested = getCollectionsFromAST(ast);
-        const permissionsForCollections = (_c = (0, lodash_1.uniqWith)((_b = (_a = this.accountability) === null || _a === void 0 ? void 0 : _a.permissions) === null || _b === void 0 ? void 0 : _b.filter((permission) => {
+        const permissionsForCollections = (0, lodash_1.uniqWith)(this.accountability?.permissions?.filter((permission) => {
             return (permission.action === action &&
                 collectionsRequested.map(({ collection }) => collection).includes(permission.collection));
-        }), (curr, prev) => curr.collection === prev.collection && curr.action === prev.action && curr.role === prev.role)) !== null && _c !== void 0 ? _c : [];
+        }), (curr, prev) => curr.collection === prev.collection && curr.action === prev.action && curr.role === prev.role) ?? [];
         // If the permissions don't match the collections, you don't have permission to read all of them
         const uniqueCollectionsRequestedCount = (0, lodash_1.uniq)(collectionsRequested.map(({ collection }) => collection)).length;
         if (uniqueCollectionsRequestedCount !== permissionsForCollections.length) {
@@ -75,15 +78,14 @@ class AuthorizationService {
             return collections;
         }
         function validateFields(ast) {
-            var _a, _b, _c;
             if (ast.type !== 'field' && ast.type !== 'functionField') {
                 if (ast.type === 'a2o') {
                     for (const [collection, children] of Object.entries(ast.children)) {
-                        checkFields(collection, children, (_b = (_a = ast.query) === null || _a === void 0 ? void 0 : _a[collection]) === null || _b === void 0 ? void 0 : _b.aggregate);
+                        checkFields(collection, children, ast.query?.[collection]?.aggregate);
                     }
                 }
                 else {
-                    checkFields(ast.name, ast.children, (_c = ast.query) === null || _c === void 0 ? void 0 : _c.aggregate);
+                    checkFields(ast.name, ast.children, ast.query?.aggregate);
                 }
             }
             function checkFields(collection, children, aggregate) {
@@ -117,12 +119,11 @@ class AuthorizationService {
             }
         }
         function validateFilterPermissions(ast, schema, action, accountability) {
-            var _a, _b, _c, _d, _e;
             let requiredFieldPermissions = {};
             if (ast.type !== 'field' && ast.type !== 'functionField') {
                 if (ast.type === 'a2o') {
                     for (const collection of Object.keys(ast.children)) {
-                        requiredFieldPermissions = mergeRequiredFieldPermissions(requiredFieldPermissions, extractRequiredFieldPermissions(collection, (_c = (_b = (_a = ast.query) === null || _a === void 0 ? void 0 : _a[collection]) === null || _b === void 0 ? void 0 : _b.filter) !== null && _c !== void 0 ? _c : {}));
+                        requiredFieldPermissions = mergeRequiredFieldPermissions(requiredFieldPermissions, extractRequiredFieldPermissions(collection, ast.query?.[collection]?.filter ?? {}));
                         for (const child of ast.children[collection]) {
                             const childPermissions = validateFilterPermissions(child, schema, action, accountability);
                             if (Object.keys(childPermissions).length > 0) {
@@ -136,7 +137,7 @@ class AuthorizationService {
                     }
                 }
                 else {
-                    requiredFieldPermissions = mergeRequiredFieldPermissions(requiredFieldPermissions, extractRequiredFieldPermissions(ast.name, (_e = (_d = ast.query) === null || _d === void 0 ? void 0 : _d.filter) !== null && _e !== void 0 ? _e : {}));
+                    requiredFieldPermissions = mergeRequiredFieldPermissions(requiredFieldPermissions, extractRequiredFieldPermissions(ast.name, ast.query?.filter ?? {}));
                     for (const child of ast.children) {
                         const childPermissions = validateFilterPermissions(child, schema, action, accountability);
                         if (Object.keys(childPermissions).length > 0) {
@@ -174,7 +175,7 @@ class AuthorizationService {
                         (result[collection] || (result[collection] = new Set())).add(filterKey);
                         // add virtual relation to the required permissions
                         const { relation } = (0, get_relation_info_1.getRelationInfo)([], collection, filterKey);
-                        if ((relation === null || relation === void 0 ? void 0 : relation.collection) && (relation === null || relation === void 0 ? void 0 : relation.field)) {
+                        if (relation?.collection && relation?.field) {
                             (result[relation.collection] || (result[relation.collection] = new Set())).add(relation.field);
                         }
                     }
@@ -189,9 +190,8 @@ class AuthorizationService {
                         }
                         else {
                             const relation = schema.relations.find((relation) => {
-                                var _a;
                                 return ((relation.collection === parentCollection && relation.field === parentField) ||
-                                    (relation.related_collection === parentCollection && ((_a = relation.meta) === null || _a === void 0 ? void 0 : _a.one_field) === parentField));
+                                    (relation.related_collection === parentCollection && relation.meta?.one_field === parentField));
                             });
                             // Filter key not found in parent collection
                             if (!relation)
@@ -212,9 +212,8 @@ class AuthorizationService {
                         }
                         else {
                             const relation = schema.relations.find((relation) => {
-                                var _a;
                                 return ((relation.collection === parentCollection && relation.field === parentField) ||
-                                    (relation.related_collection === parentCollection && ((_a = relation.meta) === null || _a === void 0 ? void 0 : _a.one_field) === parentField));
+                                    (relation.related_collection === parentCollection && relation.meta?.one_field === parentField));
                             });
                             // Filter key not found in parent collection
                             if (!relation)
@@ -260,19 +259,18 @@ class AuthorizationService {
                 return current;
             }
             function checkFieldPermissions(rootCollection, schema, action, requiredPermissions, aliasMap) {
-                var _a, _b;
-                if ((accountability === null || accountability === void 0 ? void 0 : accountability.admin) === true)
+                if (accountability?.admin === true)
                     return;
                 for (const collection of Object.keys(requiredPermissions)) {
-                    const permission = (_a = accountability === null || accountability === void 0 ? void 0 : accountability.permissions) === null || _a === void 0 ? void 0 : _a.find((permission) => permission.collection === collection && permission.action === 'read');
+                    const permission = accountability?.permissions?.find((permission) => permission.collection === collection && permission.action === 'read');
                     let allowedFields;
                     // Allow the filtering of top level ID for actions such as update and delete
                     if (action !== 'read' && collection === rootCollection) {
-                        const actionPermission = (_b = accountability === null || accountability === void 0 ? void 0 : accountability.permissions) === null || _b === void 0 ? void 0 : _b.find((permission) => permission.collection === collection && permission.action === action);
+                        const actionPermission = accountability?.permissions?.find((permission) => permission.collection === collection && permission.action === action);
                         if (!actionPermission || !actionPermission.fields) {
                             throw new exceptions_2.ForbiddenException();
                         }
-                        allowedFields = (permission === null || permission === void 0 ? void 0 : permission.fields)
+                        allowedFields = permission?.fields
                             ? [...permission.fields, schema.collections[collection].primary]
                             : [schema.collections[collection].primary];
                     }
@@ -292,7 +290,7 @@ class AuthorizationService {
                             continue;
                         const fieldName = (0, strip_function_1.stripFunction)(field);
                         let originalFieldName = fieldName;
-                        if (collection === rootCollection && (aliasMap === null || aliasMap === void 0 ? void 0 : aliasMap[fieldName])) {
+                        if (collection === rootCollection && aliasMap?.[fieldName]) {
                             originalFieldName = aliasMap[fieldName];
                         }
                         if (!allowedFields.includes(originalFieldName)) {
@@ -345,13 +343,12 @@ class AuthorizationService {
      * Checks if the provided payload matches the configured permissions, and adds the presets to the payload.
      */
     validatePayload(action, collection, data) {
-        var _a, _b, _c, _d, _e, _f, _g;
         const payload = (0, lodash_1.cloneDeep)(data);
         let permission;
-        if (((_a = this.accountability) === null || _a === void 0 ? void 0 : _a.admin) === true) {
+        if (this.accountability?.admin === true) {
             permission = {
                 id: 0,
-                role: (_b = this.accountability) === null || _b === void 0 ? void 0 : _b.role,
+                role: this.accountability?.role,
                 collection,
                 action,
                 permissions: {},
@@ -361,7 +358,7 @@ class AuthorizationService {
             };
         }
         else {
-            permission = (_d = (_c = this.accountability) === null || _c === void 0 ? void 0 : _c.permissions) === null || _d === void 0 ? void 0 : _d.find((permission) => {
+            permission = this.accountability?.permissions?.find((permission) => {
                 return permission.collection === collection && permission.action === action;
             });
             if (!permission)
@@ -376,16 +373,16 @@ class AuthorizationService {
                 }
             }
         }
-        const preset = (_e = permission.presets) !== null && _e !== void 0 ? _e : {};
+        const preset = permission.presets ?? {};
         const payloadWithPresets = (0, lodash_1.merge)({}, preset, payload);
         const fieldValidationRules = Object.values(this.schema.collections[collection].fields)
             .map((field) => field.validation)
             .filter((v) => v);
-        const hasValidationRules = (0, lodash_1.isNil)(permission.validation) === false && Object.keys((_f = permission.validation) !== null && _f !== void 0 ? _f : {}).length > 0;
+        const hasValidationRules = (0, lodash_1.isNil)(permission.validation) === false && Object.keys(permission.validation ?? {}).length > 0;
         const hasFieldValidationRules = fieldValidationRules && fieldValidationRules.length > 0;
         const requiredColumns = [];
         for (const field of Object.values(this.schema.collections[collection].fields)) {
-            const specials = (_g = field === null || field === void 0 ? void 0 : field.special) !== null && _g !== void 0 ? _g : [];
+            const specials = field?.special ?? [];
             const hasGenerateSpecial = constants_1.GENERATE_SPECIAL.some((name) => specials.includes(name));
             const nullable = field.nullable || hasGenerateSpecial || field.generated;
             if (!nullable) {
@@ -427,8 +424,7 @@ class AuthorizationService {
         return payloadWithPresets;
     }
     async checkAccess(action, collection, pk) {
-        var _a;
-        if (((_a = this.accountability) === null || _a === void 0 ? void 0 : _a.admin) === true)
+        if (this.accountability?.admin === true)
             return;
         const itemsService = new items_1.ItemsService(collection, {
             accountability: this.accountability,

package/dist/services/collections.d.ts

@@ -1,10 +1,10 @@
 import SchemaInspector from '@directus/schema';
-import { Knex } from 'knex';
-import Keyv from 'keyv';
-import { AbstractServiceOptions, Collection, CollectionMeta, MutationOptions } from '../types';
-import { Accountability, RawField, SchemaOverview } from '@directus/shared/types';
-import { Table } from 'knex-schema-inspector/dist/types/table';
+import type { Accountability, RawField, SchemaOverview } from '@directus/shared/types';
+import type Keyv from 'keyv';
+import type { Knex } from 'knex';
+import type { Table } from 'knex-schema-inspector/dist/types/table';
 import { Helpers } from '../database/helpers';
+import type { AbstractServiceOptions, Collection, CollectionMeta, MutationOptions } from '../types';
 export type RawCollection = {
     collection: string;
     fields?: RawField[];

package/dist/services/collections.js

@@ -28,20 +28,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CollectionsService = void 0;
 const schema_1 = __importDefault(require("@directus/schema"));
+const utils_1 = require("@directus/shared/utils");
+const lodash_1 = require("lodash");
 const cache_1 = require("../cache");
 const constants_1 = require("../constants");
 const database_1 = __importStar(require("../database"));
+const helpers_1 = require("../database/helpers");
 const collections_1 = require("../database/system-data/collections");
+const emitter_1 = __importDefault(require("../emitter"));
 const env_1 = __importDefault(require("../env"));
 const exceptions_1 = require("../exceptions");
 const fields_1 = require("../services/fields");
 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 {
+    knex;
+    helpers;
+    accountability;
+    schemaInspector;
+    schema;
+    cache;
+    systemCache;
     constructor(options) {
         this.knex = options.knex || (0, database_1.default)();
         this.helpers = (0, helpers_1.getHelpers)(this.knex);
@@ -56,7 +63,6 @@ class CollectionsService {
      * Create a single new collection
      */
     async createOne(payload, opts) {
-        var _a, _b;
         if (this.accountability && this.accountability.admin !== true) {
             throw new exceptions_1.ForbiddenException();
         }
@@ -68,7 +74,8 @@ class CollectionsService {
         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 : []),
+                ...((await this.knex.select('collection').from('directus_collections'))?.map(({ collection }) => collection) ??
+                    []),
                 ...Object.keys(this.schema.collections),
             ];
             if (existingCollections.includes(payload.collection)) {
@@ -129,7 +136,7 @@ class CollectionsService {
                     });
                     const fieldPayloads = payload.fields.filter((field) => field.meta).map((field) => field.meta);
                     await fieldItemsService.createMany(fieldPayloads, {
-                        bypassEmitAction: (params) => (opts === null || opts === void 0 ? void 0 : opts.bypassEmitAction) ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
+                        bypassEmitAction: (params) => opts?.bypassEmitAction ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
                     });
                 }
                 if (payload.meta) {
@@ -142,7 +149,7 @@ class CollectionsService {
                         ...payload.meta,
                         collection: payload.collection,
                     }, {
-                        bypassEmitAction: (params) => (opts === null || opts === void 0 ? void 0 : opts.bypassEmitAction) ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
+                        bypassEmitAction: (params) => opts?.bypassEmitAction ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
                     });
                 }
                 return payload.collection;
@@ -150,13 +157,13 @@ class CollectionsService {
             return payload.collection;
         }
         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();
             }
-            if ((opts === null || opts === void 0 ? void 0 : opts.autoPurgeSystemCache) !== false) {
-                await (0, cache_1.clearSystemCache)();
+            if (opts?.autoPurgeSystemCache !== false) {
+                await (0, cache_1.clearSystemCache)({ autoPurgeCache: opts?.autoPurgeCache });
             }
-            if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false && nestedActionEvents.length > 0) {
+            if (opts?.emitEvents !== false && nestedActionEvents.length > 0) {
                 const updatedSchema = await (0, get_schema_1.getSchema)();
                 for (const nestedActionEvent of nestedActionEvents) {
                     nestedActionEvent.context.schema = updatedSchema;
@@ -191,13 +198,13 @@ class CollectionsService {
             return collections;
         }
         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();
             }
-            if ((opts === null || opts === void 0 ? void 0 : opts.autoPurgeSystemCache) !== false) {
-                await (0, cache_1.clearSystemCache)();
+            if (opts?.autoPurgeSystemCache !== false) {
+                await (0, cache_1.clearSystemCache)({ autoPurgeCache: opts?.autoPurgeCache });
             }
-            if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false && nestedActionEvents.length > 0) {
+            if (opts?.emitEvents !== false && nestedActionEvents.length > 0) {
                 const updatedSchema = await (0, get_schema_1.getSchema)();
                 for (const nestedActionEvent of nestedActionEvents) {
                     nestedActionEvent.context.schema = updatedSchema;
@@ -210,7 +217,6 @@ class CollectionsService {
      * Read all collections. Currently doesn't support any query.
      */
     async readByQuery() {
-        var _a;
         const collectionItemsService = new items_1.ItemsService('directus_collections', {
             knex: this.knex,
             schema: this.schema,
@@ -250,7 +256,7 @@ class CollectionsService {
             const collection = {
                 collection: collectionMeta.collection,
                 meta: collectionMeta,
-                schema: (_a = tablesInDatabase.find((table) => table.name === collectionMeta.collection)) !== null && _a !== void 0 ? _a : null,
+                schema: tablesInDatabase.find((table) => table.name === collectionMeta.collection) ?? null,
             };
             collections.push(collection);
         }
@@ -324,25 +330,25 @@ class CollectionsService {
             if (exists) {
                 await collectionItemsService.updateOne(collectionKey, payload.meta, {
                     ...opts,
-                    bypassEmitAction: (params) => (opts === null || opts === void 0 ? void 0 : opts.bypassEmitAction) ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
+                    bypassEmitAction: (params) => opts?.bypassEmitAction ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
                 });
             }
             else {
                 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),
+                    bypassEmitAction: (params) => opts?.bypassEmitAction ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
                 });
             }
             return collectionKey;
         }
         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();
             }
-            if ((opts === null || opts === void 0 ? void 0 : opts.autoPurgeSystemCache) !== false) {
-                await (0, cache_1.clearSystemCache)();
+            if (opts?.autoPurgeSystemCache !== false) {
+                await (0, cache_1.clearSystemCache)({ autoPurgeCache: opts?.autoPurgeCache });
             }
-            if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false && nestedActionEvents.length > 0) {
+            if (opts?.emitEvents !== false && nestedActionEvents.length > 0) {
                 const updatedSchema = await (0, get_schema_1.getSchema)();
                 for (const nestedActionEvent of nestedActionEvents) {
                     nestedActionEvent.context.schema = updatedSchema;
@@ -377,20 +383,20 @@ 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),
+                        bypassEmitAction: (params) => opts?.bypassEmitAction ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
                     });
                     collectionKeys.push(payload[collectionKey]);
                 }
             });
         }
         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();
             }
-            if ((opts === null || opts === void 0 ? void 0 : opts.autoPurgeSystemCache) !== false) {
-                await (0, cache_1.clearSystemCache)();
+            if (opts?.autoPurgeSystemCache !== false) {
+                await (0, cache_1.clearSystemCache)({ autoPurgeCache: opts?.autoPurgeCache });
             }
-            if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false && nestedActionEvents.length > 0) {
+            if (opts?.emitEvents !== false && nestedActionEvents.length > 0) {
                 const updatedSchema = await (0, get_schema_1.getSchema)();
                 for (const nestedActionEvent of nestedActionEvents) {
                     nestedActionEvent.context.schema = updatedSchema;
@@ -426,13 +432,13 @@ class CollectionsService {
             return collectionKeys;
         }
         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();
             }
-            if ((opts === null || opts === void 0 ? void 0 : opts.autoPurgeSystemCache) !== false) {
-                await (0, cache_1.clearSystemCache)();
+            if (opts?.autoPurgeSystemCache !== false) {
+                await (0, cache_1.clearSystemCache)({ autoPurgeCache: opts?.autoPurgeCache });
             }
-            if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false && nestedActionEvents.length > 0) {
+            if (opts?.emitEvents !== false && nestedActionEvents.length > 0) {
                 const updatedSchema = await (0, get_schema_1.getSchema)();
                 for (const nestedActionEvent of nestedActionEvents) {
                     nestedActionEvent.context.schema = updatedSchema;
@@ -457,7 +463,6 @@ class CollectionsService {
                 throw new exceptions_1.ForbiddenException();
             }
             await this.knex.transaction(async (trx) => {
-                var _a;
                 if (collectionToBeDeleted.schema) {
                     await trx.schema.dropTable(collectionKey);
                 }
@@ -470,7 +475,7 @@ class CollectionsService {
                         schema: this.schema,
                     });
                     await collectionItemsService.deleteOne(collectionKey, {
-                        bypassEmitAction: (params) => (opts === null || opts === void 0 ? void 0 : opts.bypassEmitAction) ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
+                        bypassEmitAction: (params) => opts?.bypassEmitAction ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
                     });
                 }
                 if (collectionToBeDeleted.schema) {
@@ -498,11 +503,11 @@ 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)) {
+                        if (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),
+                                bypassEmitAction: (params) => opts?.bypassEmitAction ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
                             });
                         }
                         // Delete related m2o fields that point to current collection
@@ -510,13 +515,12 @@ class CollectionsService {
                             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),
+                                bypassEmitAction: (params) => opts?.bypassEmitAction ? opts.bypassEmitAction(params) : nestedActionEvents.push(params),
                             });
                         }
                     }
                     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);
+                        return relation.meta?.one_allowed_collections?.includes(collectionKey);
                     });
                     for (const relation of a2oRelationsThatIncludeThisCollection) {
                         const newAllowedCollections = relation
@@ -531,13 +535,13 @@ class CollectionsService {
             return collectionKey;
         }
         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();
             }
-            if ((opts === null || opts === void 0 ? void 0 : opts.autoPurgeSystemCache) !== false) {
-                await (0, cache_1.clearSystemCache)();
+            if (opts?.autoPurgeSystemCache !== false) {
+                await (0, cache_1.clearSystemCache)({ autoPurgeCache: opts?.autoPurgeCache });
             }
-            if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false && nestedActionEvents.length > 0) {
+            if (opts?.emitEvents !== false && nestedActionEvents.length > 0) {
                 const updatedSchema = await (0, get_schema_1.getSchema)();
                 for (const nestedActionEvent of nestedActionEvents) {
                     nestedActionEvent.context.schema = updatedSchema;
@@ -572,13 +576,13 @@ class CollectionsService {
             return collectionKeys;
         }
         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();
             }
-            if ((opts === null || opts === void 0 ? void 0 : opts.autoPurgeSystemCache) !== false) {
-                await (0, cache_1.clearSystemCache)();
+            if (opts?.autoPurgeSystemCache !== false) {
+                await (0, cache_1.clearSystemCache)({ autoPurgeCache: opts?.autoPurgeCache });
             }
-            if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false && nestedActionEvents.length > 0) {
+            if (opts?.emitEvents !== false && nestedActionEvents.length > 0) {
                 const updatedSchema = await (0, get_schema_1.getSchema)();
                 for (const nestedActionEvent of nestedActionEvents) {
                     nestedActionEvent.context.schema = updatedSchema;

package/dist/services/dashboards.d.ts

@@ -1,4 +1,4 @@
-import { AbstractServiceOptions } from '../types';
+import type { AbstractServiceOptions } from '../types';
 import { ItemsService } from './items';
 export declare class DashboardsService extends ItemsService {
     constructor(options: AbstractServiceOptions);

package/dist/services/fields.d.ts

@@ -1,12 +1,12 @@
 import SchemaInspector from '@directus/schema';
-import { Accountability, Field, RawField, SchemaOverview, Type } from '@directus/shared/types';
-import Keyv from 'keyv';
-import { Knex } from 'knex';
-import { Column } from 'knex-schema-inspector/dist/types/column';
+import type { Accountability, Field, RawField, SchemaOverview, Type } from '@directus/shared/types';
+import type Keyv from 'keyv';
+import type { Knex } from 'knex';
+import type { 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, MutationOptions } from '../types';
+import type { AbstractServiceOptions, MutationOptions } from '../types';
 export declare class FieldsService {
     knex: Knex;
     helpers: Helpers;