@directus/api 13.1.1 → 13.2.0

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

@@ -6,5 +6,5 @@ export type Options = {
     type: 'wysiwyg' | 'markdown' | 'template';
     subject: string;
 };
-declare const _default: import("@directus/types").OperationApiConfig<Options>;
+declare const _default: import("@directus/extensions").OperationApiConfig<Options>;
 export default _default;

package/dist/operations/mail/index.js

@@ -1,4 +1,4 @@
-import { defineOperationApi } from '@directus/utils';
+import { defineOperationApi } from '@directus/extensions';
 import { MailService } from '../../services/mail/index.js';
 import { md } from '../../utils/md.js';
 export default defineOperationApi({

package/dist/operations/notification/index.d.ts

@@ -6,5 +6,5 @@ type Options = {
     collection?: string;
     item?: string;
 };
-declare const _default: import("@directus/types").OperationApiConfig<Options>;
+declare const _default: import("@directus/extensions").OperationApiConfig<Options>;
 export default _default;

package/dist/operations/notification/index.js

@@ -1,4 +1,5 @@
-import { defineOperationApi, optionToString, toArray } from '@directus/utils';
+import { defineOperationApi } from '@directus/extensions';
+import { optionToString, toArray } from '@directus/utils';
 import { NotificationsService } from '../../services/notifications.js';
 import { getAccountabilityForRole } from '../../utils/get-accountability-for-role.js';
 export default defineOperationApi({

package/dist/operations/request/index.d.ts

@@ -7,5 +7,5 @@ type Options = {
         value: string;
     }[] | null;
 };
-declare const _default: import("@directus/types").OperationApiConfig<Options>;
+declare const _default: import("@directus/extensions").OperationApiConfig<Options>;
 export default _default;

package/dist/operations/request/index.js

@@ -1,7 +1,8 @@
-import { defineOperationApi, isValidJSON } from '@directus/utils';
+import { defineOperationApi } from '@directus/extensions';
+import { isValidJSON } from '@directus/utils';
+import { isAxiosError } from 'axios';
 import encodeUrl from 'encodeurl';
 import { getAxios } from '../../request/index.js';
-import { isAxiosError } from 'axios';
 export default defineOperationApi({
     id: 'request',
     handler: async ({ url, method, body, headers }) => {

package/dist/operations/sleep/index.d.ts

@@ -1,5 +1,5 @@
 type Options = {
     milliseconds: string | number;
 };
-declare const _default: import("@directus/types").OperationApiConfig<Options>;
+declare const _default: import("@directus/extensions").OperationApiConfig<Options>;
 export default _default;

package/dist/operations/sleep/index.js

@@ -1,4 +1,4 @@
-import { defineOperationApi } from '@directus/utils';
+import { defineOperationApi } from '@directus/extensions';
 export default defineOperationApi({
     id: 'sleep',
     handler: async ({ milliseconds }) => {

package/dist/operations/transform/index.d.ts

@@ -1,5 +1,5 @@
 type Options = {
     json: string | Record<string, any>;
 };
-declare const _default: import("@directus/types").OperationApiConfig<Options>;
+declare const _default: import("@directus/extensions").OperationApiConfig<Options>;
 export default _default;

package/dist/operations/transform/index.js

@@ -1,4 +1,5 @@
-import { defineOperationApi, optionToObject } from '@directus/utils';
+import { defineOperationApi } from '@directus/extensions';
+import { optionToObject } from '@directus/utils';
 export default defineOperationApi({
     id: 'transform',
     handler: ({ json }) => {

package/dist/operations/trigger/index.d.ts

@@ -4,5 +4,5 @@ type Options = {
     iterationMode?: 'serial' | 'batch' | 'parallel';
     batchSize?: number;
 };
-declare const _default: import("@directus/types").OperationApiConfig<Options>;
+declare const _default: import("@directus/extensions").OperationApiConfig<Options>;
 export default _default;

package/dist/operations/trigger/index.js

@@ -1,4 +1,5 @@
-import { defineOperationApi, optionToObject } from '@directus/utils';
+import { defineOperationApi } from '@directus/extensions';
+import { optionToObject } from '@directus/utils';
 import { omit } from 'lodash-es';
 import { getFlowManager } from '../../flows.js';
 export default defineOperationApi({

package/dist/services/activity.js

@@ -3,7 +3,7 @@ import { isDirectusError } from '@directus/errors';
 import { uniq } from 'lodash-es';
 import validateUUID from 'uuid-validate';
 import env from '../env.js';
-import { ErrorCode } from '../errors/index.js';
+import { ErrorCode } from '@directus/errors';
 import logger from '../logger.js';
 import { getPermissions } from '../utils/get-permissions.js';
 import { Url } from '../utils/url.js';

package/dist/services/assets.d.ts

@@ -10,7 +10,7 @@ export declare class AssetsService {
     accountability: Accountability | null;
     authorizationService: AuthorizationService;
     constructor(options: AbstractServiceOptions);
-    getAsset(id: string, transformation: TransformationSet, range?: Range): Promise<{
+    getAsset(id: string, transformation?: TransformationSet, range?: Range): Promise<{
         stream: Readable;
         file: any;
         stat: Stat;

package/dist/services/assets.js

@@ -7,7 +7,7 @@ import validateUUID from 'uuid-validate';
 import { SUPPORTED_IMAGE_TRANSFORM_FORMATS } from '../constants.js';
 import getDatabase from '../database/index.js';
 import env from '../env.js';
-import { ForbiddenError, IllegalAssetTransformationError, RangeNotSatisfiableError, ServiceUnavailableError, } from '../errors/index.js';
+import { ForbiddenError, IllegalAssetTransformationError, RangeNotSatisfiableError, ServiceUnavailableError, } from '@directus/errors';
 import logger from '../logger.js';
 import { getStorage } from '../storage/index.js';
 import { getMilliseconds } from '../utils/get-milliseconds.js';
@@ -78,7 +78,7 @@ export class AssetsService {
             }
         }
         const type = file.type;
-        const transforms = TransformationUtils.resolvePreset(transformation, file);
+        const transforms = transformation ? TransformationUtils.resolvePreset(transformation, file) : [];
         if (type && transforms.length > 0 && SUPPORTED_IMAGE_TRANSFORM_FORMATS.includes(type)) {
             const maybeNewFormat = TransformationUtils.maybeExtractFormat(transforms);
             const assetFilename = path.basename(file.filename_disk, path.extname(file.filename_disk)) +

package/dist/services/authentication.js

@@ -7,8 +7,8 @@ import { DEFAULT_AUTH_PROVIDER } from '../constants.js';
 import getDatabase from '../database/index.js';
 import emitter from '../emitter.js';
 import env from '../env.js';
-import { InvalidCredentialsError, InvalidProviderError, UserSuspendedError } from '../errors/index.js';
-import { InvalidOtpError } from '../errors/index.js';
+import { InvalidCredentialsError, InvalidProviderError, UserSuspendedError } from '@directus/errors';
+import { InvalidOtpError } from '@directus/errors';
 import { createRateLimiter } from '../rate-limiter.js';
 import { getMilliseconds } from '../utils/get-milliseconds.js';
 import { stall } from '../utils/stall.js';

package/dist/services/authorization.js

@@ -3,7 +3,7 @@ import { FailedValidationError, joiValidationErrorItemToErrorExtensions } from '
 import { cloneDeep, flatten, isArray, isNil, merge, reduce, uniq, uniqWith } from 'lodash-es';
 import { GENERATE_SPECIAL } from '../constants.js';
 import getDatabase from '../database/index.js';
-import { ForbiddenError } from '../errors/forbidden.js';
+import { ForbiddenError } from '@directus/errors';
 import { getRelationInfo } from '../utils/get-relation-info.js';
 import { stripFunction } from '../utils/strip-function.js';
 import { ItemsService } from './items.js';

package/dist/services/collections.js

@@ -8,9 +8,9 @@ import getDatabase, { getSchemaInspector } from '../database/index.js';
 import { systemCollectionRows } from '../database/system-data/collections/index.js';
 import emitter from '../emitter.js';
 import env from '../env.js';
-import { ForbiddenError, InvalidPayloadError } from '../errors/index.js';
-import { FieldsService } from '../services/fields.js';
-import { ItemsService } from '../services/items.js';
+import { ForbiddenError, InvalidPayloadError } from '@directus/errors';
+import { FieldsService } from './fields.js';
+import { ItemsService } from './items.js';
 import { getSchema } from '../utils/get-schema.js';
 import { shouldClearCache } from '../utils/should-clear-cache.js';
 export class CollectionsService {

package/dist/services/fields.d.ts

@@ -3,8 +3,8 @@ import type { Accountability, Field, RawField, SchemaOverview, Type } from '@dir
 import type Keyv from 'keyv';
 import type { Knex } from 'knex';
 import type { Helpers } from '../database/helpers/index.js';
-import { ItemsService } from '../services/items.js';
-import { PayloadService } from '../services/payload.js';
+import { ItemsService } from './items.js';
+import { PayloadService } from './payload.js';
 import type { AbstractServiceOptions, MutationOptions } from '../types/index.js';
 export declare class FieldsService {
     knex: Knex;

package/dist/services/fields.js

@@ -9,9 +9,9 @@ import { getHelpers } from '../database/helpers/index.js';
 import getDatabase, { getSchemaInspector } from '../database/index.js';
 import { systemFieldRows } from '../database/system-data/fields/index.js';
 import emitter from '../emitter.js';
-import { ForbiddenError, InvalidPayloadError } from '../errors/index.js';
-import { ItemsService } from '../services/items.js';
-import { PayloadService } from '../services/payload.js';
+import { ForbiddenError, InvalidPayloadError } from '@directus/errors';
+import { ItemsService } from './items.js';
+import { PayloadService } from './payload.js';
 import getDefaultValue from '../utils/get-default-value.js';
 import getLocalType from '../utils/get-local-type.js';
 import { getSchema } from '../utils/get-schema.js';
@@ -541,7 +541,7 @@ export class FieldsService {
             column = table[type](field.field, field.schema?.numeric_precision ?? 10, field.schema?.numeric_scale ?? 5);
         }
         else if (field.type === 'csv') {
-            column = table.string(field.field);
+            column = table.text(field.field);
         }
         else if (field.type === 'hash') {
             column = table.string(field.field, 255);

package/dist/services/files.d.ts

@@ -1,7 +1,9 @@
 /// <reference types="node" resolution-mode="require"/>
+import type { File } from '@directus/types';
 import type { Readable } from 'node:stream';
-import type { AbstractServiceOptions, File, Metadata, MutationOptions, PrimaryKey } from '../types/index.js';
+import type { AbstractServiceOptions, MutationOptions, PrimaryKey } from '../types/index.js';
 import { ItemsService } from './items.js';
+type Metadata = Partial<Pick<File, 'height' | 'width' | 'description' | 'title' | 'tags' | 'metadata'>>;
 export declare class FilesService extends ItemsService {
     constructor(options: AbstractServiceOptions);
     /**
@@ -32,3 +34,4 @@ export declare class FilesService extends ItemsService {
      */
     deleteMany(keys: PrimaryKey[]): Promise<PrimaryKey[]>;
 }
+export {};

package/dist/services/files.js

@@ -14,7 +14,7 @@ import url from 'url';
 import { SUPPORTED_IMAGE_METADATA_FORMATS } from '../constants.js';
 import emitter from '../emitter.js';
 import env from '../env.js';
-import { ForbiddenError, InvalidPayloadError, ServiceUnavailableError } from '../errors/index.js';
+import { ForbiddenError, InvalidPayloadError, ServiceUnavailableError } from '@directus/errors';
 import logger from '../logger.js';
 import { getAxios } from '../request/index.js';
 import { getStorage } from '../storage/index.js';
@@ -115,12 +115,12 @@ export class FilesService extends ItemsService {
                 }
                 const metadata = {};
                 if (sharpMetadata.orientation && sharpMetadata.orientation >= 5) {
-                    metadata.height = sharpMetadata.width;
-                    metadata.width = sharpMetadata.height;
+                    metadata.height = sharpMetadata.width ?? null;
+                    metadata.width = sharpMetadata.height ?? null;
                 }
                 else {
-                    metadata.width = sharpMetadata.width;
-                    metadata.height = sharpMetadata.height;
+                    metadata.width = sharpMetadata.width ?? null;
+                    metadata.height = sharpMetadata.height ?? null;
                 }
                 // Backward-compatible layout as it used to be with 'exifr'
                 const fullMetadata = {};

package/dist/services/graphql/index.js

@@ -9,8 +9,8 @@ import { clearSystemCache, getCache } from '../../cache.js';
 import { DEFAULT_AUTH_PROVIDER, GENERATE_SPECIAL } from '../../constants.js';
 import getDatabase from '../../database/index.js';
 import env from '../../env.js';
-import { ErrorCode, ForbiddenError, InvalidPayloadError } from '../../errors/index.js';
-import { getExtensionManager } from '../../extensions.js';
+import { ErrorCode, ForbiddenError, InvalidPayloadError } from '@directus/errors';
+import { getExtensionManager } from '../../extensions/index.js';
 import { generateHash } from '../../utils/generate-hash.js';
 import { getGraphQLType } from '../../utils/get-graphql-type.js';
 import { getMilliseconds } from '../../utils/get-milliseconds.js';

package/dist/services/graphql/subscription.js

@@ -2,7 +2,7 @@ import { EventEmitter, on } from 'events';
 import { getMessenger } from '../../messenger.js';
 import { getSchema } from '../../utils/get-schema.js';
 import { refreshAccountability } from '../../websocket/authenticate.js';
-import { getSinglePayload } from '../../websocket/utils/items.js';
+import { getPayload } from '../../websocket/utils/items.js';
 const messages = createPubSub(new EventEmitter());
 export function bindPubSub() {
     const messenger = getMessenger();
@@ -35,7 +35,7 @@ export function createSubscriptionGenerator(self, event) {
             if (eventData['action'] === 'create') {
                 try {
                     subscription.item = eventData['key'];
-                    const result = await getSinglePayload(subscription, accountability, schema, eventData);
+                    const result = await getPayload(subscription, accountability, schema, eventData);
                     yield {
                         [event]: {
                             key: eventData['key'],
@@ -52,7 +52,7 @@ export function createSubscriptionGenerator(self, event) {
                 for (const key of eventData['keys']) {
                     try {
                         subscription.item = key;
-                        const result = await getSinglePayload(subscription, accountability, schema, eventData);
+                        const result = await getPayload(subscription, accountability, schema, eventData);
                         yield {
                             [event]: {
                                 key,

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

@@ -0,0 +1,9 @@
+import type { Accountability, SchemaOverview } from '@directus/types';
+export type ImportWorkerData = {
+    collection: string;
+    mimeType: string;
+    filePath: string;
+    accountability: Accountability | undefined;
+    schema: SchemaOverview;
+};
+export default function ({ collection, mimeType, filePath, accountability, schema }: ImportWorkerData): Promise<void>;

package/dist/services/import-export/import-worker.js

@@ -0,0 +1,9 @@
+import { createReadStream } from 'node:fs';
+import { ImportService } from './index.js';
+export default async function ({ collection, mimeType, filePath, accountability, schema }) {
+    const service = new ImportService({
+        accountability: accountability,
+        schema: schema,
+    });
+    await service.import(collection, mimeType, createReadStream(filePath));
+}

package/dist/services/{import-export.d.ts → import-export/index.d.ts}

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

package/dist/services/{import-export.js → import-export/index.js}

@@ -1,28 +1,25 @@
 import { parseJSON, toArray } from '@directus/utils';
 import { queue } from 'async';
-import csv from 'csv-parser';
 import destroyStream from 'destroy';
 import { dump as toYAML } from 'js-yaml';
 import { parse as toXML } from 'js2xmlparser';
 import { Parser as CSVParser, transforms as CSVTransforms } from 'json2csv';
-import { set, transform } from 'lodash-es';
 import { createReadStream } from 'node:fs';
 import { appendFile } from 'node:fs/promises';
+import Papa from 'papaparse';
 import StreamArray from 'stream-json/streamers/StreamArray.js';
-import stripBomStream from 'strip-bom-stream';
-import { file as createTmpFile } from 'tmp-promise';
-import getDatabase from '../database/index.js';
-import emitter from '../emitter.js';
-import env from '../env.js';
-import { ForbiddenError, InvalidPayloadError, ServiceUnavailableError, UnsupportedMediaTypeError, } from '../errors/index.js';
-import logger from '../logger.js';
-import { getDateFormatted } from '../utils/get-date-formatted.js';
-import { userName } from '../utils/user-name.js';
-import { FilesService } from './files.js';
-import { ItemsService } from './items.js';
-import { NotificationsService } from './notifications.js';
-import { UsersService } from './users.js';
-import { Url } from '../utils/url.js';
+import getDatabase from '../../database/index.js';
+import emitter from '../../emitter.js';
+import env from '../../env.js';
+import { ForbiddenError, InvalidPayloadError, ServiceUnavailableError, UnsupportedMediaTypeError, } from '@directus/errors';
+import logger from '../../logger.js';
+import { getDateFormatted } from '../../utils/get-date-formatted.js';
+import { Url } from '../../utils/url.js';
+import { userName } from '../../utils/user-name.js';
+import { FilesService } from '../files.js';
+import { ItemsService } from '../items.js';
+import { NotificationsService } from '../notifications.js';
+import { UsersService } from '../users.js';
 export class ImportService {
     knex;
     accountability;
@@ -97,30 +94,34 @@ export class ImportService {
             const saveQueue = queue(async (value) => {
                 return await service.upsertOne(value, { bypassEmitAction: (action) => nestedActionEvents.push(action) });
             });
+            const transform = (value) => {
+                if (value.length === 0)
+                    return;
+                try {
+                    const parsedJson = parseJSON(value);
+                    if (typeof parsedJson === 'number') {
+                        return value;
+                    }
+                    return parsedJson;
+                }
+                catch {
+                    return value;
+                }
+            };
+            const PapaOptions = {
+                header: true,
+                transform,
+            };
             return new Promise((resolve, reject) => {
                 stream
-                    .pipe(stripBomStream())
-                    .pipe(csv())
-                    .on('data', (value) => {
-                    const obj = transform(value, (result, value, key) => {
-                        if (value.length === 0) {
-                            delete result[key];
+                    .pipe(Papa.parse(Papa.NODE_STREAM_INPUT, PapaOptions))
+                    .on('data', (obj) => {
+                    // Filter out all undefined fields
+                    for (const field in obj) {
+                        if (obj[field] === undefined) {
+                            delete obj[field];
                         }
-                        else {
-                            try {
-                                const parsedJson = parseJSON(value);
-                                if (typeof parsedJson === 'number') {
-                                    set(result, key, value);
-                                }
-                                else {
-                                    set(result, key, parsedJson);
-                                }
-                            }
-                            catch {
-                                set(result, key, value);
-                            }
-                        }
-                    });
+                    }
                     saveQueue.push(obj);
                 })
                     .on('error', (err) => {
@@ -128,6 +129,9 @@ export class ImportService {
                     reject(new InvalidPayloadError({ reason: err.message }));
                 })
                     .on('end', () => {
+                    // In case of empty CSV file
+                    if (!saveQueue.started)
+                        return resolve();
                     saveQueue.drain(() => {
                         for (const nestedActionEvent of nestedActionEvents) {
                             emitter.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
@@ -157,7 +161,11 @@ export class ExportService {
      * FilesService upload method.
      */
     async exportToFile(collection, query, format, options) {
+        const { createTmpFile } = await import('@directus/utils/node');
+        const tmpFile = await createTmpFile().catch(() => null);
         try {
+            if (!tmpFile)
+                throw new Error('Failed to create temporary file for export');
             const mimeTypes = {
                 csv: 'text/csv',
                 json: 'application/json',
@@ -165,7 +173,6 @@ export class ExportService {
                 yaml: 'text/yaml',
             };
             const database = getDatabase();
-            const { path, cleanup } = await createTmpFile();
             await database.transaction(async (trx) => {
                 const service = new ItemsService(collection, {
                     accountability: this.accountability,
@@ -185,7 +192,7 @@ export class ExportService {
                     },
                 })
                     .then((result) => Number(result?.[0]?.['count'] ?? 0));
-                const count = query.limit ? Math.min(totalCount, query.limit) : totalCount;
+                const count = query.limit && query.limit > -1 ? Math.min(totalCount, query.limit) : totalCount;
                 const requestedLimit = query.limit ?? -1;
                 const batchesRequired = Math.ceil(count / env['EXPORT_BATCH_SIZE']);
                 let readCount = 0;
@@ -202,7 +209,7 @@ export class ExportService {
                     });
                     readCount += result.length;
                     if (result.length) {
-                        await appendFile(path, this.transform(result, format, {
+                        await appendFile(tmpFile.path, this.transform(result, format, {
                             includeHeader: batch === 0,
                             includeFooter: batch + 1 === batchesRequired,
                         }));
@@ -223,7 +230,7 @@ export class ExportService {
                 storage: options?.file?.storage ?? storage,
                 type: mimeTypes[format],
             };
-            const savedFile = await filesService.uploadOne(createReadStream(path), fileWithDefaults);
+            const savedFile = await filesService.uploadOne(createReadStream(tmpFile.path), fileWithDefaults);
             if (this.accountability?.user) {
                 const notificationsService = new NotificationsService({
                     accountability: this.accountability,
@@ -250,7 +257,6 @@ Your export of ${collection} is ready. <a href="${href}">Click here to view.</a>
                     item: savedFile,
                 });
             }
-            await cleanup();
         }
         catch (err) {
             logger.error(err, `Couldn't export ${collection}: ${err.message}`);
@@ -267,6 +273,9 @@ Your export of ${collection} is ready. <a href="${href}">Click here to view.</a>
                 });
             }
         }
+        finally {
+            await tmpFile?.cleanup();
+        }
     }
     /**
      * Transform a given input object / array to the given type

package/dist/services/index.d.ts

@@ -9,7 +9,7 @@ export * from './files.js';
 export * from './flows.js';
 export * from './folders.js';
 export * from './graphql/index.js';
-export * from './import-export.js';
+export * from './import-export/index.js';
 export * from './items.js';
 export * from './mail/index.js';
 export * from './meta.js';

package/dist/services/index.js

@@ -9,7 +9,7 @@ export * from './files.js';
 export * from './flows.js';
 export * from './folders.js';
 export * from './graphql/index.js';
-export * from './import-export.js';
+export * from './import-export/index.js';
 export * from './items.js';
 export * from './mail/index.js';
 export * from './meta.js';

package/dist/services/items.js

@@ -6,9 +6,9 @@ import getDatabase from '../database/index.js';
 import runAST from '../database/run-ast.js';
 import emitter from '../emitter.js';
 import env from '../env.js';
-import { ForbiddenError } from '../errors/index.js';
+import { ForbiddenError } from '@directus/errors';
 import { translateDatabaseError } from '../database/errors/translate.js';
-import { InvalidPayloadError } from '../errors/index.js';
+import { InvalidPayloadError } from '@directus/errors';
 import getASTFromQuery from '../utils/get-ast-from-query.js';
 import { shouldClearCache } from '../utils/should-clear-cache.js';
 import { validateKeys } from '../utils/validate-keys.js';

package/dist/services/mail/index.js

@@ -4,7 +4,7 @@ import path from 'path';
 import { fileURLToPath } from 'url';
 import getDatabase from '../../database/index.js';
 import env from '../../env.js';
-import { InvalidPayloadError } from '../../errors/index.js';
+import { InvalidPayloadError } from '@directus/errors';
 import logger from '../../logger.js';
 import getMailer from '../../mailer.js';
 import { Url } from '../../utils/url.js';

package/dist/services/meta.js

@@ -1,5 +1,5 @@
 import getDatabase from '../database/index.js';
-import { ForbiddenError } from '../errors/index.js';
+import { ForbiddenError } from '@directus/errors';
 import { applyFilter, applySearch } from '../utils/apply-query.js';
 export class MetaService {
     knex;

package/dist/services/payload.js

@@ -7,7 +7,7 @@ import { v4 as uuid } from 'uuid';
 import { parse as wktToGeoJSON } from 'wellknown';
 import { getHelpers } from '../database/helpers/index.js';
 import getDatabase from '../database/index.js';
-import { ForbiddenError, InvalidPayloadError } from '../errors/index.js';
+import { ForbiddenError, InvalidPayloadError } from '@directus/errors';
 import { generateHash } from '../utils/generate-hash.js';
 import { ItemsService } from './items.js';
 /**

package/dist/services/permissions.d.ts

@@ -1,7 +1,7 @@
 import type { PermissionsAction, Query } from '@directus/types';
 import type Keyv from 'keyv';
-import type { QueryOptions } from '../services/items.js';
-import { ItemsService } from '../services/items.js';
+import type { QueryOptions } from './items.js';
+import { ItemsService } from './items.js';
 import type { AbstractServiceOptions, Item, MutationOptions, PrimaryKey } from '../types/index.js';
 export declare class PermissionsService extends ItemsService {
     systemCache: Keyv<any>;

package/dist/services/permissions.js

@@ -1,6 +1,6 @@
 import { clearSystemCache, getCache } from '../cache.js';
 import { appAccessMinimalPermissions } from '../database/system-data/app-access-permissions/index.js';
-import { ItemsService } from '../services/items.js';
+import { ItemsService } from './items.js';
 import { filterItems } from '../utils/filter-items.js';
 export class PermissionsService extends ItemsService {
     systemCache;

package/dist/services/relations.js

@@ -5,7 +5,7 @@ import { getHelpers } from '../database/helpers/index.js';
 import getDatabase, { getSchemaInspector } from '../database/index.js';
 import { systemRelationRows } from '../database/system-data/relations/index.js';
 import emitter from '../emitter.js';
-import { ForbiddenError, InvalidPayloadError } from '../errors/index.js';
+import { ForbiddenError, InvalidPayloadError } from '@directus/errors';
 import { getDefaultIndexName } from '../utils/get-default-index-name.js';
 import { getSchema } from '../utils/get-schema.js';
 import { ItemsService } from './items.js';

package/dist/services/revisions.js

@@ -1,4 +1,4 @@
-import { ForbiddenError, InvalidPayloadError } from '../errors/index.js';
+import { ForbiddenError, InvalidPayloadError } from '@directus/errors';
 import { ItemsService } from './items.js';
 export class RevisionsService extends ItemsService {
     constructor(options) {

package/dist/services/roles.js

@@ -1,4 +1,4 @@
-import { ForbiddenError, UnprocessableContentError } from '../errors/index.js';
+import { ForbiddenError, UnprocessableContentError } from '@directus/errors';
 import { ItemsService } from './items.js';
 import { PermissionsService } from './permissions.js';
 import { PresetsService } from './presets.js';

package/dist/services/schema.js

@@ -1,5 +1,5 @@
 import getDatabase from '../database/index.js';
-import { ForbiddenError } from '../errors/index.js';
+import { ForbiddenError } from '@directus/errors';
 import { applyDiff } from '../utils/apply-diff.js';
 import { getSnapshotDiff } from '../utils/get-snapshot-diff.js';
 import { getSnapshot } from '../utils/get-snapshot.js';