directus 9.4.3 → 9.5.0

package/dist/extensions.js

@@ -56,22 +56,27 @@ function getExtensionManager() {
     return extensionManager;
 }
 exports.getExtensionManager = getExtensionManager;
+const defaultOptions = {
+    schedule: true,
+    watch: env_1.default.EXTENSIONS_AUTO_RELOAD && env_1.default.NODE_ENV !== 'development',
+};
 class ExtensionManager {
     constructor() {
         this.isLoaded = false;
-        this.isScheduleHookEnabled = true;
         this.extensions = [];
         this.appExtensions = {};
         this.apiExtensions = { hooks: [], endpoints: [] };
         this.watcher = null;
+        this.options = defaultOptions;
         this.apiEmitter = new emitter_1.Emitter();
         this.endpointRouter = (0, express_1.Router)();
     }
-    async initialize({ schedule, watch } = { schedule: true, watch: true }) {
-        this.isScheduleHookEnabled = schedule;
-        if (watch) {
-            this.initializeWatcher();
-        }
+    async initialize(options = {}) {
+        this.options = {
+            ...defaultOptions,
+            ...options,
+        };
+        this.initializeWatcher();
         if (!this.isLoaded) {
             await this.load();
             this.updateWatchedExtensions(this.extensions);
@@ -143,9 +148,9 @@ class ExtensionManager {
         this.isLoaded = false;
     }
     initializeWatcher() {
-        if (env_1.default.EXTENSIONS_AUTO_RELOAD && env_1.default.NODE_ENV !== 'development' && !this.watcher) {
+        if (this.options.watch && !this.watcher) {
             logger_1.default.info('Watching extensions for changes...');
-            const localExtensionPaths = (env_1.default.SERVE_APP ? constants_1.EXTENSION_TYPES : constants_1.API_EXTENSION_TYPES).map((type) => path_1.default.resolve(env_1.default.EXTENSIONS_PATH, (0, utils_1.pluralize)(type)));
+            const localExtensionPaths = (env_1.default.SERVE_APP ? constants_1.EXTENSION_TYPES : constants_1.API_EXTENSION_TYPES).map((type) => path_1.default.posix.join(path_1.default.relative('.', env_1.default.EXTENSIONS_PATH).split(path_1.default.sep).join(path_1.default.posix.sep), (0, utils_1.pluralize)(type), '*', 'index.js'));
             this.watcher = chokidar_1.default.watch([path_1.default.resolve('.', 'package.json'), ...localExtensionPaths], {
                 ignoreInitial: true,
             });
@@ -182,15 +187,21 @@ class ExtensionManager {
         const bundles = {};
         for (const extensionType of constants_1.APP_EXTENSION_TYPES) {
             const entry = (0, node_1.generateExtensionsEntry)(extensionType, this.extensions);
-            const bundle = await (0, rollup_1.rollup)({
-                input: 'entry',
-                external: Object.values(sharedDepsMapping),
-                makeAbsoluteExternalsRelative: false,
-                plugins: [(0, plugin_virtual_1.default)({ entry }), (0, plugin_alias_1.default)({ entries: internalImports })],
-            });
-            const { output } = await bundle.generate({ format: 'es', compact: true });
-            bundles[extensionType] = output[0].code;
-            await bundle.close();
+            try {
+                const bundle = await (0, rollup_1.rollup)({
+                    input: 'entry',
+                    external: Object.values(sharedDepsMapping),
+                    makeAbsoluteExternalsRelative: false,
+                    plugins: [(0, plugin_virtual_1.default)({ entry }), (0, plugin_alias_1.default)({ entries: internalImports })],
+                });
+                const { output } = await bundle.generate({ format: 'es', compact: true });
+                bundles[extensionType] = output[0].code;
+                await bundle.close();
+            }
+            catch (error) {
+                logger_1.default.warn(`Couldn't bundle App extensions`);
+                logger_1.default.warn(error);
+            }
         }
         return bundles;
     }
@@ -238,38 +249,39 @@ class ExtensionManager {
         const hookPath = path_1.default.resolve(hook.path, hook.entrypoint || '');
         const hookInstance = require(hookPath);
         const register = (0, get_module_default_1.default)(hookInstance);
+        const hookHandler = {
+            path: hookPath,
+            events: [],
+        };
         const registerFunctions = {
             filter: (event, handler) => {
                 emitter_1.default.onFilter(event, handler);
-                this.apiExtensions.hooks.push({
+                hookHandler.events.push({
                     type: 'filter',
-                    path: hookPath,
-                    event,
+                    name: event,
                     handler,
                 });
             },
             action: (event, handler) => {
                 emitter_1.default.onAction(event, handler);
-                this.apiExtensions.hooks.push({
+                hookHandler.events.push({
                     type: 'action',
-                    path: hookPath,
-                    event,
+                    name: event,
                     handler,
                 });
             },
             init: (event, handler) => {
                 emitter_1.default.onInit(event, handler);
-                this.apiExtensions.hooks.push({
+                hookHandler.events.push({
                     type: 'init',
-                    path: hookPath,
-                    event,
+                    name: event,
                     handler,
                 });
             },
             schedule: (cron, handler) => {
                 if ((0, node_cron_1.validate)(cron)) {
                     const task = (0, node_cron_1.schedule)(cron, async () => {
-                        if (this.isScheduleHookEnabled) {
+                        if (this.options.schedule) {
                             try {
                                 await handler();
                             }
@@ -278,9 +290,8 @@ class ExtensionManager {
                             }
                         }
                     });
-                    this.apiExtensions.hooks.push({
+                    hookHandler.events.push({
                         type: 'schedule',
-                        path: hookPath,
                         task,
                     });
                 }
@@ -298,6 +309,7 @@ class ExtensionManager {
             logger: logger_1.default,
             getSchema: get_schema_1.getSchema,
         });
+        this.apiExtensions.hooks.push(hookHandler);
     }
     registerEndpoint(endpoint, router) {
         const endpointPath = path_1.default.resolve(endpoint.path, endpoint.entrypoint || '');
@@ -322,19 +334,21 @@ class ExtensionManager {
     }
     unregisterHooks() {
         for (const hook of this.apiExtensions.hooks) {
-            switch (hook.type) {
-                case 'filter':
-                    emitter_1.default.offFilter(hook.event, hook.handler);
-                    break;
-                case 'action':
-                    emitter_1.default.offAction(hook.event, hook.handler);
-                    break;
-                case 'init':
-                    emitter_1.default.offInit(hook.event, hook.handler);
-                    break;
-                case 'schedule':
-                    hook.task.stop();
-                    break;
+            for (const event of hook.events) {
+                switch (event.type) {
+                    case 'filter':
+                        emitter_1.default.offFilter(event.name, event.handler);
+                        break;
+                    case 'action':
+                        emitter_1.default.offAction(event.name, event.handler);
+                        break;
+                    case 'init':
+                        emitter_1.default.offInit(event.name, event.handler);
+                        break;
+                    case 'schedule':
+                        event.task.stop();
+                        break;
+                }
             }
             delete require.cache[require.resolve(hook.path)];
         }

package/dist/logger.js

@@ -25,6 +25,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.expressLogger = void 0;
 const pino_1 = __importDefault(require("pino"));
 const pino_http_1 = __importStar(require("pino-http"));
+const get_config_from_env_1 = require("./utils/get-config-from-env");
 const url_1 = require("url");
 const env_1 = __importDefault(require("./env"));
 const pinoOptions = {
@@ -38,9 +39,29 @@ if (env_1.default.LOG_STYLE !== 'raw') {
     pinoOptions.prettyPrint = true;
     pinoOptions.prettifier = require('pino-colada');
 }
-const logger = (0, pino_1.default)(pinoOptions);
+const loggerEnvConfig = (0, get_config_from_env_1.getConfigFromEnv)('LOGGER_', 'LOGGER_HTTP');
+// Expose custom log levels into formatter function
+if (loggerEnvConfig.levels) {
+    const customLogLevels = {};
+    for (const el of loggerEnvConfig.levels.split(',')) {
+        const key_val = el.split(':');
+        customLogLevels[key_val[0].trim()] = key_val[1].trim();
+    }
+    pinoOptions.formatters = {
+        level(label, number) {
+            return {
+                severity: customLogLevels[label] || 'info',
+                level: number,
+            };
+        },
+    };
+    delete loggerEnvConfig.levels;
+}
+const logger = (0, pino_1.default)(Object.assign(pinoOptions, loggerEnvConfig));
+const httpLoggerEnvConfig = (0, get_config_from_env_1.getConfigFromEnv)('LOGGER_HTTP', ['LOGGER_HTTP_LOGGER']);
 exports.expressLogger = (0, pino_http_1.default)({
     logger,
+    ...httpLoggerEnvConfig,
 }, {
     serializers: {
         req(request) {

package/dist/services/authentication.d.ts

@@ -1,7 +1,7 @@
 import { Knex } from 'knex';
 import { ActivityService } from './activity';
-import { AbstractServiceOptions, SchemaOverview, LoginResult } from '../types';
-import { Accountability } from '@directus/shared/types';
+import { AbstractServiceOptions, LoginResult } from '../types';
+import { Accountability, SchemaOverview } from '@directus/shared/types';
 export declare class AuthenticationService {
     knex: Knex;
     accountability: Accountability | null;

package/dist/services/authentication.js

@@ -204,7 +204,9 @@ class AuthenticationService {
             .from('directus_sessions AS s')
             .leftJoin('directus_users AS u', 's.user', 'u.id')
             .leftJoin('directus_shares AS d', 's.share', 'd.id')
-            .joinRaw('LEFT JOIN directus_roles AS r ON r.id IN (u.role, d.role)')
+            .leftJoin('directus_roles AS r', (join) => {
+            join.onIn('r.id', [this.knex.ref('u.role'), this.knex.ref('d.role')]);
+        })
             .where('s.token', refreshToken)
             .andWhere('s.expires', '>=', new Date())
             .andWhere((subQuery) => {

package/dist/services/authorization.d.ts

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

package/dist/services/collections.d.ts

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

package/dist/services/collections.js

@@ -114,12 +114,14 @@ class CollectionsService {
                     }
                     return field;
                 });
-                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);
+                await trx.transaction(async (schemaTrx) => {
+                    await schemaTrx.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 fieldPayloads = payload.fields.filter((field) => field.meta).map((field) => field.meta);
                 await fieldItemsService.createMany(fieldPayloads);
@@ -371,7 +373,9 @@ class CollectionsService {
                         .update({ one_allowed_collections: newAllowedCollections })
                         .where({ id: relation.meta.id });
                 }
-                await trx.schema.dropTable(collectionKey);
+                await trx.transaction(async (schemaTrx) => {
+                    await schemaTrx.schema.dropTable(collectionKey);
+                });
             }
         });
         if (this.cache && env_1.default.CACHE_AUTO_PURGE && (opts === null || opts === void 0 ? void 0 : opts.autoPurgeCache) !== false) {

package/dist/services/fields.d.ts

@@ -3,9 +3,8 @@ import { Knex } from 'knex';
 import { Column } from 'knex-schema-inspector/dist/types/column';
 import { ItemsService } from '../services/items';
 import { PayloadService } from '../services/payload';
-import { AbstractServiceOptions, SchemaOverview } from '../types';
-import { Accountability } from '@directus/shared/types';
-import { Field, RawField, Type } from '@directus/shared/types';
+import { AbstractServiceOptions } from '../types';
+import { Field, RawField, Type, Accountability, SchemaOverview } from '@directus/shared/types';
 import { Helpers } from '../database/helpers';
 import Keyv from 'keyv';
 export declare class FieldsService {

package/dist/services/fields.js

@@ -224,8 +224,10 @@ class FieldsService {
                     this.addColumnToTable(table, hookAdjustedField);
                 }
                 else {
-                    await trx.schema.alterTable(collection, (table) => {
-                        this.addColumnToTable(table, hookAdjustedField);
+                    await trx.transaction(async (schemaTrx) => {
+                        await schemaTrx.schema.alterTable(collection, (table) => {
+                            this.addColumnToTable(table, hookAdjustedField);
+                        });
                     });
                 }
             }
@@ -387,8 +389,10 @@ class FieldsService {
             if (this.schema.collections[collection] &&
                 field in this.schema.collections[collection].fields &&
                 this.schema.collections[collection].fields[field].alias === false) {
-                await trx.schema.table(collection, (table) => {
-                    table.dropColumn(field);
+                await trx.transaction(async (schemaTrx) => {
+                    await schemaTrx.schema.table(collection, (table) => {
+                        table.dropColumn(field);
+                    });
                 });
             }
         });

package/dist/services/graphql.d.ts

@@ -1,9 +1,10 @@
 import { ArgumentNode, FormattedExecutionResult, FragmentDefinitionNode, GraphQLError, GraphQLResolveInfo, GraphQLScalarType, GraphQLSchema, ObjectFieldNode, SelectionNode } from 'graphql';
+import { SchemaOverview } from '@directus/shared/types';
 import { ObjectTypeComposer, SchemaComposer } from 'graphql-compose';
 import { Knex } from 'knex';
 import { BaseException } from '@directus/shared/exceptions';
 import { Accountability, Query } from '@directus/shared/types';
-import { AbstractServiceOptions, GraphQLParams, Item, SchemaOverview } from '../types';
+import { AbstractServiceOptions, GraphQLParams, Item } from '../types';
 import { ItemsService } from './items';
 export declare const GraphQLGeoJSON: GraphQLScalarType;
 export declare const GraphQLDate: GraphQLScalarType;

package/dist/services/import.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { Knex } from 'knex';
-import { AbstractServiceOptions, SchemaOverview } from '../types';
-import { Accountability } from '@directus/shared/types';
+import { AbstractServiceOptions } from '../types';
+import { Accountability, SchemaOverview } from '@directus/shared/types';
 export declare class ImportService {
     knex: Knex;
     accountability: Accountability | null;

package/dist/services/import.js

@@ -31,9 +31,10 @@ class ImportService {
             case 'application/json':
                 return await this.importJSON(collection, stream);
             case 'text/csv':
+            case 'application/vnd.ms-excel':
                 return await this.importCSV(collection, stream);
             default:
-                throw new exceptions_1.InvalidPayloadException(`Can't import files of type "${mimetype}"`);
+                throw new exceptions_1.UnsupportedMediaTypeException(`Can't import files of type "${mimetype}"`);
         }
     }
     importJSON(collection, stream) {

package/dist/services/items.d.ts

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

package/dist/services/items.js

@@ -70,7 +70,9 @@ 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
-                ? await emitter_1.default.emitFilter(`${this.eventScope}.create`, payload, {
+                ? await emitter_1.default.emitFilter(this.eventScope === 'items'
+                    ? ['items.create', `${this.collection}.items.create`]
+                    : `${this.eventScope}.create`, payload, {
                     collection: this.collection,
                 }, {
                     database: trx,
@@ -85,7 +87,7 @@ class ItemsService {
             const { payload: payloadWithA2O, revisions: revisionsA2O } = await payloadService.processA2O(payloadWithM2O);
             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, they PK already exists in the object we're saving.
+            // In case of manual string / UUID primary keys, the PK already exists in the object we're saving.
             let primaryKey = payloadWithTypeCasting[primaryKeyField];
             try {
                 const result = await trx.insert(payloadWithoutAliases).into(this.collection).returning(primaryKeyField);
@@ -146,14 +148,14 @@ class ItemsService {
             return primaryKey;
         });
         if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false) {
-            emitter_1.default.emitAction(`${this.eventScope}.create`, {
+            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: (0, database_1.default)(),
+                database: this.knex || (0, database_1.default)(),
                 schema: this.schema,
                 accountability: this.accountability,
             });
@@ -189,11 +191,6 @@ class ItemsService {
      * Get items by query
      */
     async readByQuery(query, opts) {
-        const authorizationService = new authorization_1.AuthorizationService({
-            accountability: this.accountability,
-            knex: this.knex,
-            schema: this.schema,
-        });
         let ast = await (0, get_ast_from_query_1.default)(this.collection, query, this.schema, {
             accountability: this.accountability,
             // By setting the permissions action, you can read items using the permissions for another
@@ -203,6 +200,11 @@ class ItemsService {
             knex: this.knex,
         });
         if (this.accountability && this.accountability.admin !== true) {
+            const authorizationService = new authorization_1.AuthorizationService({
+                accountability: this.accountability,
+                knex: this.knex,
+                schema: this.schema,
+            });
             ast = await authorizationService.processAST(ast, opts === null || opts === void 0 ? void 0 : opts.permissionsAction);
         }
         const records = await (0, run_ast_1.default)(ast, this.schema, {
@@ -213,7 +215,7 @@ class ItemsService {
         if (records === null) {
             throw new exceptions_1.ForbiddenException();
         }
-        const filteredRecords = await emitter_1.default.emitFilter(`${this.eventScope}.read`, records, {
+        const filteredRecords = await emitter_1.default.emitFilter(this.eventScope === 'items' ? ['items.read', `${this.collection}.items.read`] : `${this.eventScope}.read`, records, {
             query,
             collection: this.collection,
         }, {
@@ -221,12 +223,12 @@ class ItemsService {
             schema: this.schema,
             accountability: this.accountability,
         });
-        emitter_1.default.emitAction(`${this.eventScope}.read`, {
+        emitter_1.default.emitAction(this.eventScope === 'items' ? ['items.read', `${this.collection}.items.read`] : `${this.eventScope}.read`, {
             payload: filteredRecords,
             query,
             collection: this.collection,
         }, {
-            database: (0, database_1.default)(),
+            database: this.knex || (0, database_1.default)(),
             schema: this.schema,
             accountability: this.accountability,
         });
@@ -288,7 +290,9 @@ 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
-            ? await emitter_1.default.emitFilter(`${this.eventScope}.update`, payload, {
+            ? await emitter_1.default.emitFilter(this.eventScope === 'items'
+                ? ['items.update', `${this.collection}.items.update`]
+                : `${this.eventScope}.update`, payload, {
                 keys,
                 collection: this.collection,
             }, {
@@ -379,14 +383,14 @@ class ItemsService {
             await this.cache.clear();
         }
         if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false) {
-            emitter_1.default.emitAction(`${this.eventScope}.update`, {
+            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: (0, database_1.default)(),
+                database: this.knex || (0, database_1.default)(),
                 schema: this.schema,
                 accountability: this.accountability,
             });
@@ -461,7 +465,7 @@ class ItemsService {
             await authorizationService.checkAccess('delete', this.collection, keys);
         }
         if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false) {
-            await emitter_1.default.emitFilter(`${this.eventScope}.delete`, keys, {
+            await emitter_1.default.emitFilter(this.eventScope === 'items' ? ['items.delete', `${this.collection}.items.delete`] : `${this.eventScope}.delete`, keys, {
                 collection: this.collection,
             }, {
                 database: this.knex,
@@ -490,13 +494,13 @@ class ItemsService {
             await this.cache.clear();
         }
         if ((opts === null || opts === void 0 ? void 0 : opts.emitEvents) !== false) {
-            emitter_1.default.emitAction(`${this.eventScope}.delete`, {
+            emitter_1.default.emitAction(this.eventScope === 'items' ? ['items.delete', `${this.collection}.items.delete`] : `${this.eventScope}.delete`, {
                 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: (0, database_1.default)(),
+                database: this.knex || (0, database_1.default)(),
                 schema: this.schema,
                 accountability: this.accountability,
             });

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

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

package/dist/services/meta.d.ts

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

package/dist/services/payload.d.ts

@@ -1,6 +1,6 @@
 import { Knex } from 'knex';
-import { AbstractServiceOptions, Item, PrimaryKey, SchemaOverview } from '../types';
-import { Accountability } from '@directus/shared/types';
+import { AbstractServiceOptions, Item, PrimaryKey } from '../types';
+import { Accountability, SchemaOverview } from '@directus/shared/types';
 import { Helpers } from '../database/helpers';
 declare type Action = 'create' | 'read' | 'update';
 declare type Transformers = {

package/dist/services/relations.d.ts

@@ -1,10 +1,10 @@
 import { Knex } from 'knex';
-import { AbstractServiceOptions, SchemaOverview, Relation, RelationMeta } from '../types';
-import { Accountability } from '@directus/shared/types';
+import { SchemaOverview, Relation, RelationMeta, Accountability } from '@directus/shared/types';
 import { ItemsService, QueryOptions } from './items';
 import { PermissionsService } from './permissions';
 import SchemaInspector from '@directus/schema';
 import Keyv from 'keyv';
+import { AbstractServiceOptions } from '../types';
 export declare class RelationsService {
     knex: Knex;
     permissionsService: PermissionsService;

package/dist/services/server.d.ts

@@ -1,6 +1,6 @@
 import { Knex } from 'knex';
-import { AbstractServiceOptions, SchemaOverview } from '../types';
-import { Accountability } from '@directus/shared/types';
+import { AbstractServiceOptions } from '../types';
+import { Accountability, SchemaOverview } from '@directus/shared/types';
 import { SettingsService } from './settings';
 export declare class ServerService {
     knex: Knex;

package/dist/services/specifications.d.ts

@@ -1,7 +1,7 @@
 import { Knex } from 'knex';
 import { OpenAPIObject } from 'openapi3-ts';
-import { AbstractServiceOptions, SchemaOverview } from '../types';
-import { Accountability } from '@directus/shared/types';
+import { AbstractServiceOptions } from '../types';
+import { Accountability, SchemaOverview } from '@directus/shared/types';
 import { CollectionsService } from './collections';
 import { FieldsService } from './fields';
 import { GraphQLService } from './graphql';

package/dist/services/users.d.ts

@@ -1,7 +1,6 @@
 import { Knex } from 'knex';
-import { AbstractServiceOptions, Item, PrimaryKey, SchemaOverview, MutationOptions } from '../types';
-import { Query } from '@directus/shared/types';
-import { Accountability } from '@directus/shared/types';
+import { AbstractServiceOptions, Item, PrimaryKey, MutationOptions } from '../types';
+import { Query, SchemaOverview, Accountability } from '@directus/shared/types';
 import { ItemsService } from './items';
 export declare class UsersService extends ItemsService {
     knex: Knex;

package/dist/services/utils.d.ts

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

package/dist/types/ast.d.ts

@@ -1,5 +1,4 @@
-import { Query } from '@directus/shared/types';
-import { Relation } from './relation';
+import { Query, Relation } from '@directus/shared/types';
 export declare type M2ONode = {
     type: 'm2o';
     name: string;

package/dist/types/auth.d.ts

@@ -1,5 +1,5 @@
+import { SchemaOverview } from '@directus/shared/types';
 import { Knex } from 'knex';
-import { SchemaOverview } from './schema';
 export interface AuthDriverOptions {
     knex: Knex;
     schema: SchemaOverview;
@@ -22,10 +22,8 @@ export declare type AuthData = Record<string, any> | null;
 export interface Session {
     token: string;
     expires: Date;
-    data: string | Record<string, unknown> | null;
     share: string;
 }
-export declare type SessionData = Record<string, any> | null;
 export declare type DirectusTokenPayload = {
     id?: string;
     role: string | null;