@directus/api 29.0.0 → 29.1.1

package/dist/auth/drivers/openid.js

@@ -32,8 +32,9 @@ export class OpenIDAuthDriver extends LocalAuthDriver {
         super(options, config);
         const env = useEnv();
         const logger = useLogger();
-        const { issuerUrl, clientId, clientSecret, provider, issuerDiscoveryMustSucceed } = config;
-        if (!issuerUrl || !clientId || !clientSecret || !provider) {
+        const { issuerUrl, clientId, clientSecret, clientPrivateKeys, clientTokenEndpointAuthMethod, provider, issuerDiscoveryMustSucceed, } = config;
+        const isPrivateKeyJwtAuthMethod = clientTokenEndpointAuthMethod === 'private_key_jwt';
+        if (!issuerUrl || !clientId || !(clientSecret || (isPrivateKeyJwtAuthMethod && clientPrivateKeys)) || !provider) {
             logger.error('Invalid provider config');
             throw new InvalidProviderConfigError({ provider });
         }
@@ -66,7 +67,8 @@ export class OpenIDAuthDriver extends LocalAuthDriver {
         if (this.client)
             return this.client;
         const logger = useLogger();
-        const { issuerUrl, clientId, clientSecret, provider } = this.config;
+        const { issuerUrl, clientId, clientSecret, clientPrivateKeys, clientTokenEndpointAuthMethod, provider } = this.config;
+        const isPrivateKeyJwtAuthMethod = clientTokenEndpointAuthMethod === 'private_key_jwt';
         // extract client http overrides/options
         const clientHttpOptions = getConfigFromEnv(`AUTH_${provider.toUpperCase()}_CLIENT_HTTP_`);
         if (clientHttpOptions) {
@@ -87,17 +89,21 @@ export class OpenIDAuthDriver extends LocalAuthDriver {
         }
         // extract client overrides/options excluding CLIENT_ID and CLIENT_SECRET as they are passed directly
         const clientOptionsOverrides = getConfigFromEnv(`AUTH_${provider.toUpperCase()}_CLIENT_`, {
-            omitKey: [`AUTH_${provider.toUpperCase()}_CLIENT_ID`, `AUTH_${provider.toUpperCase()}_CLIENT_SECRET`],
+            omitKey: [
+                `AUTH_${provider.toUpperCase()}_CLIENT_ID`,
+                `AUTH_${provider.toUpperCase()}_CLIENT_SECRET`,
+                `AUTH_${provider.toUpperCase()}_CLIENT_PRIVATE_KEYS`,
+            ],
             omitPrefix: [`AUTH_${provider.toUpperCase()}_CLIENT_HTTP_`],
             type: 'underscore',
         });
         const client = new issuer.Client({
             client_id: clientId,
-            client_secret: clientSecret,
+            ...(!isPrivateKeyJwtAuthMethod && { client_secret: clientSecret }),
             redirect_uris: [this.redirectUrl],
             response_types: ['code'],
             ...clientOptionsOverrides,
-        });
+        }, isPrivateKeyJwtAuthMethod ? { keys: clientPrivateKeys } : undefined);
         if (clientHttpOptions) {
             client[custom.http_options] = (_, options) => {
                 return {

package/dist/cli/commands/init/index.js

@@ -60,7 +60,7 @@ export default async function init() {
             default: 'admin@example.com',
             validate: (input) => {
                 const emailSchema = Joi.string().email().required();
-                const { error } = emailSchema.validate(input);
+                const { error } = emailSchema.validate(input.trim());
                 if (error)
                     throw new Error('The email entered is not a valid email address!');
                 return true;
@@ -87,7 +87,7 @@ export default async function init() {
     await db('directus_users').insert({
         ...defaultAdminUser,
         id: randomUUID(),
-        email: firstUser.email,
+        email: firstUser.email.trim(),
         password: firstUser.password,
         role,
     });

package/dist/cli/commands/init/questions.d.ts

@@ -1,4 +1,4 @@
-import type { Driver } from '../../../types/index.js';
+import type { Driver } from '@directus/types';
 export declare const databaseQuestions: {
     sqlite3: (({ filepath }: {
         filepath: string;

package/dist/cli/commands/schema/apply.js

@@ -1,4 +1,5 @@
 import { parseJSON } from '@directus/utils';
+import { DiffKind } from '@directus/types';
 import chalk from 'chalk';
 import { promises as fs } from 'fs';
 import inquirer from 'inquirer';
@@ -6,7 +7,6 @@ import { load as loadYaml } from 'js-yaml';
 import path from 'path';
 import getDatabase, { isInstalled, validateDatabaseConnection } from '../../../database/index.js';
 import { useLogger } from '../../../logger/index.js';
-import { DiffKind } from '../../../types/index.js';
 import { isNestedMetaUpdate } from '../../../utils/apply-diff.js';
 import { applySnapshot } from '../../../utils/apply-snapshot.js';
 import { getSnapshotDiff } from '../../../utils/get-snapshot-diff.js';

package/dist/cli/index.js

@@ -17,6 +17,7 @@ import usersPasswd from './commands/users/passwd.js';
 import { loadExtensions } from './load-extensions.js';
 export async function createCli() {
     const program = new Command();
+    program.allowExcessArguments();
     await loadExtensions();
     await emitter.emitInit('cli.before', { program });
     program.name('directus').usage('[command] [options]');

package/dist/cli/utils/create-db-connection.d.ts

@@ -1,5 +1,5 @@
 import type { Knex } from 'knex';
-import type { Driver } from '../../types/index.js';
+import type { Driver } from '@directus/types';
 export type Credentials = {
     filename?: string;
     host?: string;

package/dist/cli/utils/create-env/index.d.ts

@@ -1,3 +1,3 @@
-import type { Driver } from '../../../types/index.js';
+import type { Driver } from '@directus/types';
 import type { Credentials } from '../create-db-connection.js';
 export default function createEnv(client: Driver, credentials: Credentials, directory: string): Promise<void>;

package/dist/cli/utils/drivers.d.ts

@@ -1,3 +1,3 @@
-import type { Driver } from '../../types/index.js';
+import type { Driver } from '@directus/types';
 export declare const drivers: Record<Driver, string>;
 export declare function getDriverForClient(client: string): Driver | null;

package/dist/constants.d.ts

@@ -1,5 +1,5 @@
 import type { CookieOptions } from 'express';
-import type { TransformationParams } from './types/index.js';
+import type { TransformationParams } from '@directus/types';
 export declare const SYSTEM_ASSET_ALLOW_LIST: TransformationParams[];
 export declare const ASSET_TRANSFORM_QUERY_KEYS: readonly ["key", "transforms", "width", "height", "format", "fit", "quality", "withoutEnlargement", "focal_point_x", "focal_point_y"];
 export declare const FILTER_VARIABLES: string[];

package/dist/controllers/assets.js

@@ -1,5 +1,6 @@
 import { useEnv } from '@directus/env';
 import { InvalidQueryError, RangeNotSatisfiableError } from '@directus/errors';
+import { TransformationMethods } from '@directus/types';
 import { parseJSON } from '@directus/utils';
 import contentDisposition from 'content-disposition';
 import { Router } from 'express';
@@ -10,7 +11,6 @@ import { useLogger } from '../logger/index.js';
 import useCollection from '../middleware/use-collection.js';
 import { AssetsService } from '../services/assets.js';
 import { PayloadService } from '../services/payload.js';
-import { TransformationMethods } from '../types/assets.js';
 import asyncHandler from '../utils/async-handler.js';
 import { getCacheControlHeader } from '../utils/get-cache-headers.js';
 import { getConfigFromEnv } from '../utils/get-config-from-env.js';

package/dist/controllers/extensions.js

@@ -1,6 +1,6 @@
 import { useEnv } from '@directus/env';
 import { ErrorCode, ForbiddenError, isDirectusError, RouteNotFoundError } from '@directus/errors';
-import { EXTENSION_TYPES } from '@directus/extensions';
+import { EXTENSION_TYPES } from '@directus/constants';
 import { account, describe, list, } from '@directus/extensions-registry';
 import { isIn } from '@directus/utils';
 import express from 'express';

package/dist/database/helpers/index.d.ts

@@ -9,11 +9,11 @@ import * as schemaHelpers from './schema/index.js';
 import * as sequenceHelpers from './sequence/index.js';
 export declare function getHelpers(database: Knex): {
     date: dateHelpers.postgres | dateHelpers.oracle | dateHelpers.mysql | dateHelpers.mssql | dateHelpers.sqlite;
-    st: geometryHelpers.postgres | geometryHelpers.mssql | geometryHelpers.mysql | geometryHelpers.sqlite | geometryHelpers.oracle | geometryHelpers.redshift;
-    schema: schemaHelpers.cockroachdb | schemaHelpers.mssql | schemaHelpers.mysql | schemaHelpers.postgres | schemaHelpers.sqlite | schemaHelpers.oracle | schemaHelpers.redshift;
+    st: geometryHelpers.mysql | geometryHelpers.postgres | geometryHelpers.sqlite | geometryHelpers.oracle | geometryHelpers.mssql | geometryHelpers.redshift;
+    schema: schemaHelpers.mysql | schemaHelpers.postgres | schemaHelpers.cockroachdb | schemaHelpers.sqlite | schemaHelpers.oracle | schemaHelpers.mssql | schemaHelpers.redshift;
     sequence: sequenceHelpers.mysql | sequenceHelpers.postgres;
-    number: numberHelpers.cockroachdb | numberHelpers.mssql | numberHelpers.postgres | numberHelpers.sqlite | numberHelpers.oracle;
+    number: numberHelpers.cockroachdb | numberHelpers.postgres | numberHelpers.sqlite | numberHelpers.oracle | numberHelpers.mssql;
     capabilities: capabilitiesHelpers.postgres | capabilitiesHelpers.oracle | capabilitiesHelpers.mysql;
 };
-export declare function getFunctions(database: Knex, schema: SchemaOverview): fnHelpers.postgres | fnHelpers.mssql | fnHelpers.mysql | fnHelpers.sqlite | fnHelpers.oracle;
+export declare function getFunctions(database: Knex, schema: SchemaOverview): fnHelpers.mysql | fnHelpers.postgres | fnHelpers.sqlite | fnHelpers.oracle | fnHelpers.mssql;
 export type Helpers = ReturnType<typeof getHelpers>;

package/dist/database/helpers/schema/types.d.ts

@@ -1,8 +1,7 @@
 import type { KNEX_TYPES } from '@directus/constants';
 import type { Column } from '@directus/schema';
-import type { Field, RawField, Relation, Type } from '@directus/types';
+import type { DatabaseClient, Field, RawField, Relation, Type } from '@directus/types';
 import type { Knex } from 'knex';
-import type { DatabaseClient } from '../../../types/index.js';
 import { DatabaseHelper } from '../types.js';
 export type Options = {
     nullable?: boolean;

package/dist/database/index.d.ts

@@ -1,6 +1,6 @@
 import type { SchemaInspector } from '@directus/schema';
+import type { DatabaseClient } from '@directus/types';
 import type { Knex } from 'knex';
-import type { DatabaseClient } from '../types/index.js';
 export default getDatabase;
 export declare function getDatabase(): Knex;
 export declare function getSchemaInspector(database?: Knex): SchemaInspector;

package/dist/database/migrations/20210225A-add-relations-sort-field.js

@@ -10,7 +10,7 @@ export async function up(knex) {
         .from('directus_fields')
         .whereIn('interface', ['one-to-many', 'm2a-builder', 'many-to-many']);
     for (const field of fieldsWithSort) {
-        const options = typeof field.options === 'string' ? parseJSON(field.options) : field.options ?? {};
+        const options = typeof field.options === 'string' ? parseJSON(field.options) : (field.options ?? {});
         if ('sortField' in options) {
             await knex('directus_relations')
                 .update({

package/dist/database/migrations/20240924B-populate-versioning-deltas.js

@@ -16,7 +16,7 @@ export async function up(knex) {
                     .from('directus_revisions')
                     .where('version', '=', missingDeltaVersion.id)
                     .orderBy('id');
-                const deltas = revisions.map((revision) => typeof revision.delta === 'string' ? parseJSON(revision.delta) : revision.delta ?? {});
+                const deltas = revisions.map((revision) => typeof revision.delta === 'string' ? parseJSON(revision.delta) : (revision.delta ?? {}));
                 const consolidatedDelta = assign({}, ...deltas);
                 await trx('directus_versions')
                     .update({

package/dist/database/run-ast/lib/apply-query/filter/get-filter-type.d.ts

@@ -1,8 +1,8 @@
 import type { FieldOverview } from '@directus/types';
 export declare function getFilterType(fields: Record<string, FieldOverview>, key: string, collection?: string): {
-    type: "string" | "boolean" | "json" | "binary" | "time" | "text" | "integer" | "float" | "alias" | "uuid" | "dateTime" | "timestamp" | "bigInteger" | "date" | "decimal" | "hash" | "csv" | "geometry" | "geometry.Point" | "geometry.LineString" | "geometry.Polygon" | "geometry.MultiPoint" | "geometry.MultiLineString" | "geometry.MultiPolygon" | "unknown";
+    type: "string" | "boolean" | "json" | "text" | "integer" | "float" | "alias" | "uuid" | "binary" | "time" | "dateTime" | "timestamp" | "bigInteger" | "date" | "decimal" | "hash" | "csv" | "geometry" | "geometry.Point" | "geometry.LineString" | "geometry.Polygon" | "geometry.MultiPoint" | "geometry.MultiLineString" | "geometry.MultiPolygon" | "unknown";
     special?: never;
 } | {
-    type: "string" | "boolean" | "json" | "binary" | "time" | "text" | "integer" | "float" | "alias" | "uuid" | "dateTime" | "timestamp" | "bigInteger" | "date" | "decimal" | "hash" | "csv" | "geometry" | "geometry.Point" | "geometry.LineString" | "geometry.Polygon" | "geometry.MultiPoint" | "geometry.MultiLineString" | "geometry.MultiPolygon" | "unknown";
+    type: "string" | "boolean" | "json" | "text" | "integer" | "float" | "alias" | "uuid" | "binary" | "time" | "dateTime" | "timestamp" | "bigInteger" | "date" | "decimal" | "hash" | "csv" | "geometry" | "geometry.Point" | "geometry.LineString" | "geometry.Polygon" | "geometry.MultiPoint" | "geometry.MultiLineString" | "geometry.MultiPolygon" | "unknown";
     special: string[];
 };

package/dist/extensions/lib/get-extensions-settings.d.ts

@@ -1,4 +1,4 @@
-import type { Extension, ExtensionSettings } from '@directus/extensions';
+import type { Extension, ExtensionSettings } from '@directus/types';
 /**
  * Loads stored settings for all extensions. Creates empty new rows in extensions tables for
  * extensions that don't have settings yet, and remove any settings for extensions that are no

package/dist/extensions/lib/sandbox/generate-api-extensions-sandbox-entrypoint.d.ts

@@ -1,4 +1,4 @@
-import type { ApiExtensionType, HybridExtensionType } from '@directus/extensions';
+import type { ApiExtensionType, HybridExtensionType } from '@directus/types';
 import type { Router } from 'express';
 /**
  * Generate the JS to run in the isolate to create the extension's entrypoint to the host

package/dist/extensions/manager.d.ts

@@ -1,6 +1,5 @@
-import type { Extension } from '@directus/extensions';
+import type { Extension, ExtensionManagerOptions } from '@directus/types';
 import { Router } from 'express';
-import type { ExtensionManagerOptions } from './types.js';
 import type { ReadStream } from 'node:fs';
 export declare class ExtensionManager {
     private options;

package/dist/extensions/manager.js

@@ -1,5 +1,6 @@
 import { useEnv } from '@directus/env';
-import { APP_SHARED_DEPS, HYBRID_EXTENSION_TYPES } from '@directus/extensions';
+import { APP_SHARED_DEPS } from '@directus/extensions';
+import { HYBRID_EXTENSION_TYPES } from '@directus/constants';
 import { generateExtensionsEntrypoint } from '@directus/extensions/node';
 import { isTypeIn, toBoolean } from '@directus/utils';
 import { pathToRelativeUrl, processId } from '@directus/utils/node';
@@ -382,7 +383,7 @@ export class ExtensionManager {
         const entrypoint = generateExtensionsEntrypoint({ module: this.moduleExtensions, registry: this.registryExtensions, local: this.localExtensions }, this.extensionsSettings);
         try {
             /** Opt In for now. Should be @deprecated later to always use rolldown! */
-            const rollDirection = env['EXTENSIONS_ROLLDOWN'] ?? false ? rolldown : rollup;
+            const rollDirection = (env['EXTENSIONS_ROLLDOWN'] ?? false) ? rolldown : rollup;
             const bundle = await rollDirection({
                 input: 'entry',
                 external: Object.values(sharedDepsMapping),

package/dist/flows.d.ts

@@ -1,5 +1,4 @@
-import type { OperationHandler } from '@directus/extensions';
-import type { Accountability, SchemaOverview } from '@directus/types';
+import type { Accountability, SchemaOverview, OperationHandler } from '@directus/types';
 export declare function getFlowManager(): FlowManager;
 declare class FlowManager {
     private isLoaded;

package/dist/operations/throw-error/index.d.ts

@@ -0,0 +1,7 @@
+type Options = {
+    code: string;
+    status: string;
+    message: string;
+};
+declare const _default: import("@directus/extensions").OperationApiConfig<Options>;
+export default _default;

package/dist/operations/throw-error/index.js

@@ -0,0 +1,11 @@
+import { createError, InternalServerError } from '@directus/errors';
+import { defineOperationApi } from '@directus/extensions';
+const FALLBACK_ERROR = new InternalServerError();
+export default defineOperationApi({
+    id: 'throw-error',
+    handler: ({ code, status, message }) => {
+        const statusCode = parseInt(status);
+        const error = createError(code ?? FALLBACK_ERROR.code, message ?? FALLBACK_ERROR.message, isNaN(statusCode) ? FALLBACK_ERROR.status : statusCode);
+        throw new error();
+    },
+});

package/dist/permissions/utils/fetch-share-info.d.ts

@@ -1,4 +1,4 @@
-import type { AbstractServiceOptions } from '../../types/services.js';
+import type { AbstractServiceOptions } from '@directus/types';
 export interface ShareInfo {
     collection: string;
     item: string;

package/dist/services/access.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 AccessService extends ItemsService {
     constructor(options: AbstractServiceOptions);

package/dist/services/access.js

@@ -1,5 +1,5 @@
+import { UserIntegrityCheckFlag } from '@directus/types';
 import { clearSystemCache } from '../cache.js';
-import { UserIntegrityCheckFlag } from '../utils/validate-user-count-integrity.js';
 import { ItemsService } from './items.js';
 export class AccessService extends ItemsService {
     constructor(options) {

package/dist/services/activity.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 ActivityService extends ItemsService {
     constructor(options: AbstractServiceOptions);

package/dist/services/assets.d.ts

@@ -1,8 +1,6 @@
-import type { Range, Stat } from '@directus/storage';
-import type { Accountability, SchemaOverview } from '@directus/types';
+import type { AbstractServiceOptions, Accountability, Range, Stat, SchemaOverview, TransformationSet } from '@directus/types';
 import type { Knex } from 'knex';
 import type { Readable } from 'node:stream';
-import type { AbstractServiceOptions, TransformationSet } from '../types/index.js';
 import { FilesService } from './files.js';
 export declare class AssetsService {
     knex: Knex;

package/dist/services/authentication.d.ts

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

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/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/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>;