@directus/api 28.0.3 → 29.1.0

package/dist/services/collections.d.ts

@@ -1,16 +1,9 @@
-import type { SchemaInspector, Table } from '@directus/schema';
-import { type BaseCollectionMeta } from '@directus/system-data';
-import type { Accountability, RawField, SchemaOverview } from '@directus/types';
+import type { SchemaInspector } from '@directus/schema';
+import type { AbstractServiceOptions, Accountability, MutationOptions, SchemaOverview, RawCollection } from '@directus/types';
 import type Keyv from 'keyv';
 import type { Knex } from 'knex';
 import type { Helpers } from '../database/helpers/index.js';
-import type { AbstractServiceOptions, Collection, MutationOptions } from '../types/index.js';
-export type RawCollection = {
-    collection: string;
-    fields?: RawField[];
-    schema?: Partial<Table> | null;
-    meta?: Partial<BaseCollectionMeta> | null;
-};
+import type { Collection } from '../types/index.js';
 export declare class CollectionsService {
     knex: Knex;
     helpers: Helpers;

package/dist/services/comments.d.ts

@@ -1,5 +1,4 @@
-import type { Comment, PrimaryKey } from '@directus/types';
-import type { AbstractServiceOptions, MutationOptions } from '../types/index.js';
+import type { AbstractServiceOptions, Comment, MutationOptions, PrimaryKey } from '@directus/types';
 import { ItemsService } from './items.js';
 import { NotificationsService } from './notifications.js';
 import { UsersService } from './users.js';

package/dist/services/dashboards.d.ts

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

package/dist/services/extensions.d.ts

@@ -1,8 +1,6 @@
-import type { ApiOutput, ExtensionSettings } from '@directus/extensions';
-import type { Accountability, DeepPartial, SchemaOverview } from '@directus/types';
+import type { ApiOutput, ExtensionSettings, ExtensionManager } from '@directus/types';
+import type { AbstractServiceOptions, Accountability, DeepPartial, SchemaOverview } from '@directus/types';
 import type { Knex } from 'knex';
-import type { ExtensionManager } from '../extensions/manager.js';
-import type { AbstractServiceOptions } from '../types/index.js';
 import { ItemsService } from './items.js';
 export declare class ExtensionReadError extends Error {
     originalError: unknown;

package/dist/services/fields.d.ts

@@ -1,9 +1,8 @@
 import type { Column, SchemaInspector } from '@directus/schema';
-import type { Accountability, Field, RawField, SchemaOverview, Type } from '@directus/types';
+import type { AbstractServiceOptions, Accountability, Field, MutationOptions, RawField, SchemaOverview, Type } from '@directus/types';
 import type Keyv from 'keyv';
 import type { Knex } from 'knex';
 import type { Helpers } from '../database/helpers/index.js';
-import type { AbstractServiceOptions, MutationOptions } from '../types/index.js';
 import { ItemsService } from './items.js';
 import { PayloadService } from './payload.js';
 export declare class FieldsService {

package/dist/services/fields.js

@@ -148,7 +148,7 @@ export class FieldsService {
             return data;
         });
         const knownCollections = Object.keys(this.schema.collections);
-        const result = [...columnsWithSystem, ...aliasFieldsAsField].filter((field) => knownCollections.includes(field.collection));
+        let result = [...columnsWithSystem, ...aliasFieldsAsField].filter((field) => knownCollections.includes(field.collection));
         // Filter the result so we only return the fields you have read access to
         if (this.accountability && this.accountability.admin !== true) {
             const policies = await fetchPolicies(this.accountability, { knex: this.knex, schema: this.schema });
@@ -176,7 +176,7 @@ export class FieldsService {
             if (collection && collection in allowedFieldsInCollection === false) {
                 throw new ForbiddenError();
             }
-            return result.filter((field) => {
+            result = result.filter((field) => {
                 if (field.collection in allowedFieldsInCollection === false)
                     return false;
                 const allowedFields = allowedFieldsInCollection[field.collection];
@@ -187,12 +187,6 @@ export class FieldsService {
         }
         // Update specific database type overrides
         for (const field of result) {
-            if (field.meta?.special?.includes('cast-timestamp')) {
-                field.type = 'timestamp';
-            }
-            else if (field.meta?.special?.includes('cast-datetime')) {
-                field.type = 'dateTime';
-            }
             field.type = this.helpers.schema.processFieldType(field);
         }
         return result;

package/dist/services/files.d.ts

@@ -1,7 +1,6 @@
-import type { BusboyFileStream, File, PrimaryKey, Query } from '@directus/types';
+import type { AbstractServiceOptions, BusboyFileStream, File, MutationOptions, PrimaryKey, Query, QueryOptions } from '@directus/types';
 import type { Readable } from 'node:stream';
-import type { AbstractServiceOptions, MutationOptions } from '../types/index.js';
-import { ItemsService, type QueryOptions } from './items.js';
+import { ItemsService } from './items.js';
 export declare class FilesService extends ItemsService<File> {
     constructor(options: AbstractServiceOptions);
     /**

package/dist/services/flows.d.ts

@@ -1,5 +1,4 @@
-import type { FlowRaw, Item, PrimaryKey } from '@directus/types';
-import type { AbstractServiceOptions, MutationOptions } from '../types/index.js';
+import type { AbstractServiceOptions, FlowRaw, Item, MutationOptions, PrimaryKey } from '@directus/types';
 import { ItemsService } from './items.js';
 export declare class FlowsService extends ItemsService<FlowRaw> {
     constructor(options: AbstractServiceOptions);

package/dist/services/folders.d.ts

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

package/dist/services/graphql/errors/format.d.ts

@@ -1,4 +1,4 @@
-import { type DirectusError } from '@directus/errors';
+import type { DirectusError } from '@directus/errors';
 import { GraphQLError } from 'graphql';
 /**
  * Convert Directus-Exception into a GraphQL format, so it can be returned by GraphQL properly.

package/dist/services/graphql/errors/format.js

@@ -1,4 +1,3 @@
-import {} from '@directus/errors';
 import { GraphQLError } from 'graphql';
 import { set } from 'lodash-es';
 /**

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

@@ -1,8 +1,6 @@
-import type { Accountability, Item, Query, SchemaOverview } from '@directus/types';
+import type { AbstractServiceOptions, Accountability, GraphQLParams, GQLScope, Item, Query, SchemaOverview } from '@directus/types';
 import type { FormattedExecutionResult, GraphQLSchema } from 'graphql';
 import type { Knex } from 'knex';
-import type { AbstractServiceOptions, GraphQLParams } from '../../types/index.js';
-export type GQLScope = 'items' | 'system';
 export declare class GraphQLService {
     accountability: Accountability | null;
     knex: Knex;

package/dist/services/graphql/resolvers/system-admin.d.ts

@@ -1,5 +1,5 @@
+import type { GraphQLParams } from '@directus/types';
 import { SchemaComposer } from 'graphql-compose';
-import type { GraphQLParams } from '../../../types/index.js';
 import { GraphQLService } from '../index.js';
 import type { Schema } from '../schema/index.js';
 export declare function resolveSystemAdmin(gql: GraphQLService, schema: Schema, schemaComposer: SchemaComposer<GraphQLParams['contextValue']>): void;

package/dist/services/graphql/resolvers/system-global.d.ts

@@ -1,5 +1,5 @@
+import type { GraphQLParams } from '@directus/types';
 import { SchemaComposer } from 'graphql-compose';
-import type { GraphQLParams } from '../../../types/index.js';
 import { GraphQLService } from '../index.js';
 /**
  * Globally available mutations

package/dist/services/graphql/resolvers/system.d.ts

@@ -1,5 +1,5 @@
+import type { GraphQLParams } from '@directus/types';
 import { SchemaComposer } from 'graphql-compose';
-import type { GraphQLParams } from '../../../types/index.js';
 import { GraphQLService } from '../index.js';
 import { type CollectionTypes, type Schema } from '../schema/index.js';
 export declare function injectSystemResolvers(gql: GraphQLService, schemaComposer: SchemaComposer<GraphQLParams['contextValue']>, { CreateCollectionTypes, ReadCollectionTypes, UpdateCollectionTypes }: CollectionTypes, schema: Schema): SchemaComposer<any>;

package/dist/services/graphql/schema/get-types.d.ts

@@ -1,6 +1,6 @@
 import type { SchemaComposer } from 'graphql-compose';
 import { ObjectTypeComposer } from 'graphql-compose';
-import { type GQLScope } from '../index.js';
+import type { GQLScope } from '@directus/types';
 import { type InconsistentFields, type Schema } from './index.js';
 /**
  * Construct an object of types for every collection, using the permitted fields per action type

package/dist/services/graphql/schema/get-types.js

@@ -3,7 +3,6 @@ import { GraphQLJSON, ObjectTypeComposer } from 'graphql-compose';
 import { mapKeys, pick } from 'lodash-es';
 import { GENERATE_SPECIAL } from '../../../constants.js';
 import { getGraphQLType } from '../../../utils/get-graphql-type.js';
-import {} from '../index.js';
 import { SYSTEM_DENY_LIST } from './index.js';
 /**
  * Construct an object of types for every collection, using the permitted fields per action type

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

@@ -1,8 +1,7 @@
-import type { Accountability, File, Query, SchemaOverview } from '@directus/types';
+import type { AbstractServiceOptions, Accountability, ExportFormat, File, Query, SchemaOverview } from '@directus/types';
 import type { Knex } from 'knex';
 import type { Readable } from 'node:stream';
-import type { AbstractServiceOptions, FunctionFieldNode, FieldNode, NestedCollectionNode } from '../types/index.js';
-type ExportFormat = 'csv' | 'json' | 'xml' | 'yaml';
+import type { FunctionFieldNode, FieldNode, NestedCollectionNode } from '../types/index.js';
 export declare class ImportService {
     knex: Knex;
     accountability: Accountability | null;
@@ -35,4 +34,3 @@ export declare class ExportService {
     }): string;
 }
 export declare function getHeadingsForCsvExport(nodes: (NestedCollectionNode | FieldNode | FunctionFieldNode)[] | undefined, prefix?: string): string[];
-export {};

package/dist/services/import-export.js

@@ -25,6 +25,7 @@ import { FilesService } from './files.js';
 import { NotificationsService } from './notifications.js';
 import { UsersService } from './users.js';
 import { parseFields } from '../database/get-ast-from-query/lib/parse-fields.js';
+import { set } from 'lodash-es';
 const env = useEnv();
 const logger = useLogger();
 export class ImportService {
@@ -166,13 +167,14 @@ export class ImportService {
                     fileReadStream
                         .pipe(Papa.parse(Papa.NODE_STREAM_INPUT, PapaOptions))
                         .on('data', (obj) => {
+                        const result = {};
                         // Filter out all undefined fields
                         for (const field in obj) {
-                            if (obj[field] === undefined) {
-                                delete obj[field];
+                            if (obj[field] !== undefined) {
+                                set(result, field, obj[field]);
                             }
                         }
-                        saveQueue.push(obj);
+                        saveQueue.push(result);
                     })
                         .on('error', (error) => {
                         cleanup();

package/dist/services/items.d.ts

@@ -1,17 +1,7 @@
-import type { Accountability, Item as AnyItem, PermissionsAction, PrimaryKey, Query, SchemaOverview } from '@directus/types';
+import type { AbstractService, AbstractServiceOptions, Accountability, Item as AnyItem, MutationTracker, MutationOptions, PrimaryKey, Query, QueryOptions, SchemaOverview } from '@directus/types';
 import type Keyv from 'keyv';
 import type { Knex } from 'knex';
-import type { AbstractService, AbstractServiceOptions, MutationOptions } from '../types/index.js';
-export type QueryOptions = {
-    stripNonRequested?: boolean;
-    permissionsAction?: PermissionsAction;
-    emitEvents?: boolean;
-};
-export type MutationTracker = {
-    trackMutations: (count: number) => void;
-    getCount: () => number;
-};
-export declare class ItemsService<Item extends AnyItem = AnyItem, Collection extends string = string> implements AbstractService {
+export declare class ItemsService<Item extends AnyItem = AnyItem, Collection extends string = string> implements AbstractService<Item> {
     collection: Collection;
     knex: Knex;
     accountability: Accountability | null;

package/dist/services/items.js

@@ -2,6 +2,7 @@ import { Action } from '@directus/constants';
 import { useEnv } from '@directus/env';
 import { ErrorCode, ForbiddenError, InvalidPayloadError, isDirectusError } from '@directus/errors';
 import { isSystemCollection } from '@directus/system-data';
+import { UserIntegrityCheckFlag } from '@directus/types';
 import { assign, clone, cloneDeep, omit, pick, without } from 'lodash-es';
 import { getCache } from '../cache.js';
 import { translateDatabaseError } from '../database/errors/translate.js';
@@ -16,7 +17,7 @@ import { validateAccess } from '../permissions/modules/validate-access/validate-
 import { shouldClearCache } from '../utils/should-clear-cache.js';
 import { transaction } from '../utils/transaction.js';
 import { validateKeys } from '../utils/validate-keys.js';
-import { UserIntegrityCheckFlag, validateUserCountIntegrity } from '../utils/validate-user-count-integrity.js';
+import { validateUserCountIntegrity } from '../utils/validate-user-count-integrity.js';
 import { PayloadService } from './payload.js';
 const env = useEnv();
 export class ItemsService {

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

@@ -1,9 +1,7 @@
-import type { Accountability, SchemaOverview } from '@directus/types';
+import type { AbstractServiceOptions, Accountability, SchemaOverview } from '@directus/types';
 import type { Knex } from 'knex';
 import type { SendMailOptions, Transporter } from 'nodemailer';
-import type { AbstractServiceOptions } from '../../types/index.js';
-export type EmailOptions = Omit<SendMailOptions, 'from'> & {
-    from?: string;
+export type EmailOptions = SendMailOptions & {
     template?: {
         name: string;
         data: Record<string, any>;

package/dist/services/mail/index.js

@@ -1,14 +1,15 @@
 import { useEnv } from '@directus/env';
 import { InvalidPayloadError } from '@directus/errors';
+import { isObject } from '@directus/utils';
 import fse from 'fs-extra';
 import { Liquid } from 'liquidjs';
 import path from 'path';
 import { fileURLToPath } from 'url';
 import getDatabase from '../../database/index.js';
+import emitter from '../../emitter.js';
 import { useLogger } from '../../logger/index.js';
 import getMailer from '../../mailer.js';
 import { Url } from '../../utils/url.js';
-import emitter from '../../emitter.js';
 const env = useEnv();
 const logger = useLogger();
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
@@ -42,10 +43,15 @@ export class MailService {
         const { template, ...emailOptions } = payload;
         let { html } = options;
         const defaultTemplateData = await this.getDefaultTemplateData();
-        const from = {
-            name: defaultTemplateData.projectName,
-            address: options.from || env['EMAIL_FROM'],
-        };
+        if (isObject(emailOptions.from) && (!emailOptions.from.name || !emailOptions.from.address)) {
+            throw new InvalidPayloadError({ reason: 'A name and address property are required in the "from" object' });
+        }
+        const from = isObject(emailOptions.from)
+            ? emailOptions.from
+            : {
+                name: defaultTemplateData.projectName,
+                address: emailOptions.from || env['EMAIL_FROM'],
+            };
         if (template) {
             let templateData = template.data;
             templateData = {

package/dist/services/meta.d.ts

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

package/dist/services/notifications.d.ts

@@ -1,5 +1,4 @@
-import type { Notification, PrimaryKey } from '@directus/types';
-import type { AbstractServiceOptions, MutationOptions } from '../types/index.js';
+import type { AbstractServiceOptions, MutationOptions, Notification, PrimaryKey } from '@directus/types';
 import { ItemsService } from './items.js';
 export declare class NotificationsService extends ItemsService {
     constructor(options: AbstractServiceOptions);

package/dist/services/operations.d.ts

@@ -1,5 +1,4 @@
-import type { Item, OperationRaw, PrimaryKey } from '@directus/types';
-import type { AbstractServiceOptions, MutationOptions } from '../types/index.js';
+import type { AbstractServiceOptions, Item, MutationOptions, OperationRaw, PrimaryKey } from '@directus/types';
 import { ItemsService } from './items.js';
 export declare class OperationsService extends ItemsService<OperationRaw> {
     constructor(options: AbstractServiceOptions);

package/dist/services/panels.d.ts

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

package/dist/services/payload.d.ts

@@ -1,12 +1,9 @@
-import type { Accountability, Aggregate, FieldOverview, Item, PrimaryKey, SchemaOverview } from '@directus/types';
+import type { AbstractServiceOptions, Accountability, Aggregate, FieldOverview, Item, MutationOptions, PayloadAction, PayloadServiceProcessRelationResult, PrimaryKey, SchemaOverview } from '@directus/types';
 import type { Knex } from 'knex';
 import type { Helpers } from '../database/helpers/index.js';
-import type { AbstractServiceOptions, ActionEventParams, MutationOptions } from '../types/index.js';
-import { UserIntegrityCheckFlag } from '../utils/validate-user-count-integrity.js';
-type Action = 'create' | 'read' | 'update';
 type Transformers = {
     [type: string]: (context: {
-        action: Action;
+        action: PayloadAction;
         value: any;
         payload: Partial<Item>;
         accountability: Accountability | null;
@@ -14,11 +11,6 @@ type Transformers = {
         helpers: Helpers;
     }) => Promise<any>;
 };
-type PayloadServiceProcessRelationResult = {
-    revisions: PrimaryKey[];
-    nestedActionEvents: ActionEventParams[];
-    userIntegrityCheckFlags: UserIntegrityCheckFlag;
-};
 /**
  * Process a given payload for a collection to ensure the special fields (hash, uuid, date etc) are
  * handled correctly.
@@ -32,24 +24,24 @@ export declare class PayloadService {
     nested: string[];
     constructor(collection: string, options: AbstractServiceOptions);
     transformers: Transformers;
-    processValues(action: Action, payloads: Partial<Item>[]): Promise<Partial<Item>[]>;
-    processValues(action: Action, payload: Partial<Item>): Promise<Partial<Item>>;
-    processValues(action: Action, payloads: Partial<Item>[], aliasMap: Record<string, string>, aggregate: Aggregate): Promise<Partial<Item>[]>;
-    processValues(action: Action, payload: Partial<Item>, aliasMap: Record<string, string>, aggregate: Aggregate): Promise<Partial<Item>>;
+    processValues(action: PayloadAction, payloads: Partial<Item>[]): Promise<Partial<Item>[]>;
+    processValues(action: PayloadAction, payload: Partial<Item>): Promise<Partial<Item>>;
+    processValues(action: PayloadAction, payloads: Partial<Item>[], aliasMap: Record<string, string>, aggregate: Aggregate): Promise<Partial<Item>[]>;
+    processValues(action: PayloadAction, payload: Partial<Item>, aliasMap: Record<string, string>, aggregate: Aggregate): Promise<Partial<Item>>;
     processAggregates(payload: Partial<Item>[], aggregate?: Aggregate): void;
-    processField(field: SchemaOverview['collections'][string]['fields'][string], payload: Partial<Item>, action: Action, accountability: Accountability | null): Promise<any>;
+    processField(field: SchemaOverview['collections'][string]['fields'][string], payload: Partial<Item>, action: PayloadAction, accountability: Accountability | null): Promise<any>;
     /**
      * Native geometries are stored in custom binary format. We need to insert them with
      * the function st_geomfromtext. For this to work, that function call must not be
      * escaped. It's therefore placed as a Knex.Raw object in the payload. Thus the need
      * to check if the value is a raw instance before stringifying it in the next step.
      */
-    processGeometries<T extends Partial<Record<string, any>>[]>(fieldEntries: [string, FieldOverview][], payloads: T, action: Action): T;
+    processGeometries<T extends Partial<Record<string, any>>[]>(fieldEntries: [string, FieldOverview][], payloads: T, action: PayloadAction): T;
     /**
      * Knex returns `datetime` and `date` columns as Date.. This is wrong for date / datetime, as those
      * shouldn't return with time / timezone info respectively
      */
-    processDates(fieldEntries: [string, FieldOverview][], payloads: Partial<Record<string, any>>[], action: Action, aliasMap?: Record<string, string>, aggregate?: Aggregate): Partial<Record<string, any>>[];
+    processDates(fieldEntries: [string, FieldOverview][], payloads: Partial<Record<string, any>>[], action: PayloadAction, aliasMap?: Record<string, string>, aggregate?: Aggregate): Partial<Record<string, any>>[];
     /**
      * Recursively save/update all nested related Any-to-One items
      */

package/dist/services/payload.js

@@ -1,4 +1,5 @@
 import { ForbiddenError, InvalidPayloadError } from '@directus/errors';
+import { UserIntegrityCheckFlag } from '@directus/types';
 import { parseJSON, toArray } from '@directus/utils';
 import { format, isValid, parseISO } from 'date-fns';
 import { unflatten } from 'flat';
@@ -9,7 +10,6 @@ import { parse as wktToGeoJSON } from 'wellknown';
 import { getHelpers } from '../database/helpers/index.js';
 import getDatabase from '../database/index.js';
 import { generateHash } from '../utils/generate-hash.js';
-import { UserIntegrityCheckFlag } from '../utils/validate-user-count-integrity.js';
 /**
  * Process a given payload for a collection to ensure the special fields (hash, uuid, date etc) are
  * handled correctly.

package/dist/services/permissions.d.ts

@@ -1,6 +1,4 @@
-import type { Item, ItemPermissions, PrimaryKey, Query } from '@directus/types';
-import type { AbstractServiceOptions, MutationOptions } from '../types/index.js';
-import type { QueryOptions } from './items.js';
+import type { AbstractServiceOptions, Item, ItemPermissions, MutationOptions, PrimaryKey, Query, QueryOptions } from '@directus/types';
 import { ItemsService } from './items.js';
 export declare class PermissionsService extends ItemsService {
     constructor(options: AbstractServiceOptions);

package/dist/services/policies.d.ts

@@ -1,5 +1,4 @@
-import type { Policy, PrimaryKey } from '@directus/types';
-import type { AbstractServiceOptions, MutationOptions } from '../types/index.js';
+import type { AbstractServiceOptions, MutationOptions, Policy, PrimaryKey } from '@directus/types';
 import { ItemsService } from './items.js';
 export declare class PoliciesService extends ItemsService<Policy> {
     constructor(options: AbstractServiceOptions);

package/dist/services/policies.js

@@ -1,8 +1,8 @@
 import { InvalidPayloadError } from '@directus/errors';
+import { UserIntegrityCheckFlag } from '@directus/types';
 import { getMatch } from 'ip-matching';
 import { clearSystemCache } from '../cache.js';
 import { clearCache as clearPermissionsCache } from '../permissions/cache.js';
-import { UserIntegrityCheckFlag } from '../utils/validate-user-count-integrity.js';
 import { ItemsService } from './items.js';
 export class PoliciesService extends ItemsService {
     constructor(options) {

package/dist/services/presets.d.ts

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

package/dist/services/relations.d.ts

@@ -1,10 +1,9 @@
 import type { ForeignKey, SchemaInspector } from '@directus/schema';
-import type { Accountability, Relation, RelationMeta, SchemaOverview } from '@directus/types';
+import type { AbstractServiceOptions, Accountability, MutationOptions, QueryOptions, Relation, RelationMeta, SchemaOverview } from '@directus/types';
 import type Keyv from 'keyv';
 import type { Knex } from 'knex';
 import type { Helpers } from '../database/helpers/index.js';
-import type { AbstractServiceOptions, MutationOptions } from '../types/index.js';
-import { ItemsService, type QueryOptions } from './items.js';
+import { ItemsService } from './items.js';
 export declare class RelationsService {
     knex: Knex;
     schemaInspector: SchemaInspector;

package/dist/services/revisions.d.ts

@@ -1,5 +1,4 @@
-import type { Item, PrimaryKey } from '@directus/types';
-import type { AbstractServiceOptions, MutationOptions } from '../types/index.js';
+import type { AbstractServiceOptions, Item, MutationOptions, PrimaryKey } from '@directus/types';
 import { ItemsService } from './items.js';
 export declare class RevisionsService extends ItemsService {
     constructor(options: AbstractServiceOptions);

package/dist/services/roles.d.ts

@@ -1,5 +1,4 @@
-import type { Item, PrimaryKey } from '@directus/types';
-import type { AbstractServiceOptions, MutationOptions } from '../types/index.js';
+import type { AbstractServiceOptions, Item, MutationOptions, PrimaryKey } from '@directus/types';
 import { ItemsService } from './items.js';
 export declare class RolesService extends ItemsService {
     constructor(options: AbstractServiceOptions);

package/dist/services/roles.js

@@ -1,8 +1,8 @@
 import { InvalidPayloadError } from '@directus/errors';
+import { UserIntegrityCheckFlag } from '@directus/types';
 import { clearSystemCache } from '../cache.js';
 import { fetchRolesTree } from '../permissions/lib/fetch-roles-tree.js';
 import { transaction } from '../utils/transaction.js';
-import { UserIntegrityCheckFlag } from '../utils/validate-user-count-integrity.js';
 import { ItemsService } from './items.js';
 import { AccessService } from './access.js';
 import { PresetsService } from './presets.js';

package/dist/services/schema.d.ts

@@ -1,6 +1,5 @@
-import type { Accountability } from '@directus/types';
+import type { AbstractServiceOptions, Accountability, Snapshot, SnapshotDiff, SnapshotDiffWithHash, SnapshotWithHash } from '@directus/types';
 import type { Knex } from 'knex';
-import type { AbstractServiceOptions, Snapshot, SnapshotDiff, SnapshotDiffWithHash, SnapshotWithHash } from '../types/index.js';
 export declare class SchemaService {
     knex: Knex;
     accountability: Accountability | null;

package/dist/services/server.d.ts

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

package/dist/services/settings.d.ts

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

package/dist/services/shares.d.ts

@@ -1,5 +1,4 @@
-import type { Item, PrimaryKey } from '@directus/types';
-import type { AbstractServiceOptions, LoginResult, MutationOptions } from '../types/index.js';
+import type { AbstractServiceOptions, Item, LoginResult, MutationOptions, PrimaryKey } from '@directus/types';
 import { ItemsService } from './items.js';
 export declare class SharesService extends ItemsService {
     constructor(options: AbstractServiceOptions);

package/dist/services/specifications.d.ts

@@ -1,7 +1,6 @@
-import type { Accountability, SchemaOverview } from '@directus/types';
+import type { AbstractServiceOptions, Accountability, SchemaOverview } from '@directus/types';
 import type { Knex } from 'knex';
 import type { OpenAPIObject } from 'openapi3-ts/oas30';
-import type { AbstractServiceOptions } from '../types/index.js';
 import { GraphQLService } from './graphql/index.js';
 export declare class SpecificationService {
     accountability: Accountability | null;

package/dist/services/tfa.d.ts

@@ -1,6 +1,5 @@
-import type { PrimaryKey } from '@directus/types';
+import type { AbstractServiceOptions, PrimaryKey } from '@directus/types';
 import type { Knex } from 'knex';
-import type { AbstractServiceOptions } from '../types/index.js';
 import { ItemsService } from './items.js';
 export declare class TFAService {
     knex: Knex;

package/dist/services/translations.d.ts

@@ -1,6 +1,4 @@
-import type { Item, PrimaryKey } from '@directus/types';
-import type { MutationOptions } from '../types/items.js';
-import type { AbstractServiceOptions } from '../types/services.js';
+import type { AbstractServiceOptions, Item, MutationOptions, PrimaryKey } from '@directus/types';
 import { ItemsService } from './items.js';
 export declare class TranslationsService extends ItemsService {
     constructor(options: AbstractServiceOptions);

package/dist/services/users.d.ts

@@ -1,5 +1,4 @@
-import type { Item, PrimaryKey, RegisterUserInput } from '@directus/types';
-import type { AbstractServiceOptions, MutationOptions } from '../types/index.js';
+import type { AbstractServiceOptions, Item, MutationOptions, PrimaryKey, RegisterUserInput } from '@directus/types';
 import { ItemsService } from './items.js';
 export declare class UsersService extends ItemsService {
     constructor(options: AbstractServiceOptions);

package/dist/services/users.js

@@ -1,5 +1,6 @@
 import { useEnv } from '@directus/env';
 import { ForbiddenError, InvalidPayloadError, RecordNotUniqueError } from '@directus/errors';
+import { UserIntegrityCheckFlag } from '@directus/types';
 import { getSimpleHash, toArray, validatePayload } from '@directus/utils';
 import { FailedValidationError, joiValidationErrorItemToErrorExtensions } from '@directus/validation';
 import Joi from 'joi';
@@ -16,7 +17,6 @@ import isUrlAllowed from '../utils/is-url-allowed.js';
 import { verifyJWT } from '../utils/jwt.js';
 import { stall } from '../utils/stall.js';
 import { Url } from '../utils/url.js';
-import { UserIntegrityCheckFlag } from '../utils/validate-user-count-integrity.js';
 import { ItemsService } from './items.js';
 import { MailService } from './mail/index.js';
 import { SettingsService } from './settings.js';

package/dist/services/utils.d.ts

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

package/dist/services/versions.d.ts

@@ -1,5 +1,4 @@
-import type { Item, PrimaryKey, Query } from '@directus/types';
-import type { AbstractServiceOptions, MutationOptions } from '../types/index.js';
+import type { AbstractServiceOptions, Item, MutationOptions, PrimaryKey, Query } from '@directus/types';
 import { ItemsService } from './items.js';
 export declare class VersionsService extends ItemsService {
     constructor(options: AbstractServiceOptions);