directus 9.22.4 → 9.23.3

package/dist/services/graphql/utils/add-path-to-validation-error.js

@@ -3,8 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addPathToValidationError = void 0;
 const graphql_1 = require("graphql");
 function addPathToValidationError(validationError) {
-    var _a, _b, _c;
-    const token = (_c = (_b = (_a = validationError.nodes) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.loc) === null || _c === void 0 ? void 0 : _c.startToken;
+    const token = validationError.nodes?.[0]?.loc?.startToken;
     if (!token)
         return validationError;
     let prev = token;

package/dist/services/graphql/utils/process-error.d.ts

@@ -1,4 +1,4 @@
-import { GraphQLError, GraphQLFormattedError } from 'graphql';
-import { Accountability } from '@directus/shared/types';
+import type { Accountability } from '@directus/shared/types';
+import type { GraphQLError, GraphQLFormattedError } from 'graphql';
 declare const processError: (accountability: Accountability | null, error: Readonly<GraphQLError>) => GraphQLFormattedError;
 export default processError;

package/dist/services/graphql/utils/process-error.js

@@ -3,24 +3,44 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const exceptions_1 = require("@directus/shared/exceptions");
 const logger_1 = __importDefault(require("../../../logger"));
 const processError = (accountability, error) => {
     logger_1.default.error(error);
-    if ((accountability === null || accountability === void 0 ? void 0 : accountability.admin) === true) {
+    const { originalError } = error;
+    if (originalError instanceof exceptions_1.BaseException) {
         return {
-            ...error,
+            message: originalError.message,
             extensions: {
-                code: 'INTERNAL_SERVER_ERROR',
+                code: originalError.code,
+                ...originalError.extensions,
             },
         };
     }
     else {
-        return {
-            message: 'An unexpected error occurred.',
-            extensions: {
-                code: 'INTERNAL_SERVER_ERROR',
-            },
-        };
+        if (accountability?.admin === true) {
+            const graphqlFormattedError = {
+                message: error.message,
+                extensions: {
+                    code: 'INTERNAL_SERVER_ERROR',
+                },
+            };
+            if (error.locations) {
+                graphqlFormattedError.locations = error.locations;
+            }
+            if (error.path) {
+                graphqlFormattedError.path = error.path;
+            }
+            return graphqlFormattedError;
+        }
+        else {
+            return {
+                message: 'An unexpected error occurred.',
+                extensions: {
+                    code: 'INTERNAL_SERVER_ERROR',
+                },
+            };
+        }
     }
 };
 exports.default = processError;

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

@@ -1,8 +1,9 @@
 /// <reference types="node" />
-import { Accountability, Query, SchemaOverview } from '@directus/shared/types';
-import { Knex } from 'knex';
-import { AbstractServiceOptions, File } from '../types';
+import type { Accountability, Query, SchemaOverview } from '@directus/shared/types';
+import type { Knex } from 'knex';
 import type { Readable } from 'node:stream';
+import type { AbstractServiceOptions, File } from '../types';
+type ExportFormat = 'csv' | 'json' | 'xml' | 'yaml';
 export declare class ImportService {
     knex: Knex;
     accountability: Accountability | null;
@@ -22,14 +23,15 @@ export declare class ExportService {
      * until all the data is retrieved. Uploads the result as a new file using the regular
      * FilesService upload method.
      */
-    exportToFile(collection: string, query: Partial<Query>, format: 'xml' | 'csv' | 'json', options?: {
+    exportToFile(collection: string, query: Partial<Query>, format: ExportFormat, options?: {
         file?: Partial<File>;
     }): Promise<void>;
     /**
      * Transform a given input object / array to the given type
      */
-    transform(input: Record<string, any>[], format: 'xml' | 'csv' | 'json', options?: {
+    transform(input: Record<string, any>[], format: ExportFormat, options?: {
         includeHeader?: boolean;
         includeFooter?: boolean;
     }): string;
 }
+export {};

package/dist/services/import-export.js

@@ -9,6 +9,7 @@ const async_1 = require("async");
 const csv_parser_1 = __importDefault(require("csv-parser"));
 const destroy_1 = __importDefault(require("destroy"));
 const fs_extra_1 = require("fs-extra");
+const js_yaml_1 = require("js-yaml");
 const js2xmlparser_1 = require("js2xmlparser");
 const json2csv_1 = require("json2csv");
 const lodash_1 = require("lodash");
@@ -16,6 +17,7 @@ const StreamArray_1 = __importDefault(require("stream-json/streamers/StreamArray
 const strip_bom_stream_1 = __importDefault(require("strip-bom-stream"));
 const tmp_promise_1 = require("tmp-promise");
 const database_1 = __importDefault(require("../database"));
+const emitter_1 = __importDefault(require("../emitter"));
 const env_1 = __importDefault(require("../env"));
 const exceptions_1 = require("../exceptions");
 const logger_1 = __importDefault(require("../logger"));
@@ -24,18 +26,20 @@ const files_1 = require("./files");
 const items_1 = require("./items");
 const notifications_1 = require("./notifications");
 class ImportService {
+    knex;
+    accountability;
+    schema;
     constructor(options) {
         this.knex = options.knex || (0, database_1.default)();
         this.accountability = options.accountability || null;
         this.schema = options.schema;
     }
     async import(collection, mimetype, stream) {
-        var _a, _b, _c, _d, _e, _f;
-        if (((_a = this.accountability) === null || _a === void 0 ? void 0 : _a.admin) !== true && collection.startsWith('directus_'))
+        if (this.accountability?.admin !== true && collection.startsWith('directus_'))
             throw new exceptions_1.ForbiddenException();
-        const createPermissions = (_c = (_b = this.accountability) === null || _b === void 0 ? void 0 : _b.permissions) === null || _c === void 0 ? void 0 : _c.find((permission) => permission.collection === collection && permission.action === 'create');
-        const updatePermissions = (_e = (_d = this.accountability) === null || _d === void 0 ? void 0 : _d.permissions) === null || _e === void 0 ? void 0 : _e.find((permission) => permission.collection === collection && permission.action === 'update');
-        if (((_f = this.accountability) === null || _f === void 0 ? void 0 : _f.admin) !== true && (!createPermissions || !updatePermissions)) {
+        const createPermissions = this.accountability?.permissions?.find((permission) => permission.collection === collection && permission.action === 'create');
+        const updatePermissions = this.accountability?.permissions?.find((permission) => permission.collection === collection && permission.action === 'update');
+        if (this.accountability?.admin !== true && (!createPermissions || !updatePermissions)) {
             throw new exceptions_1.ForbiddenException();
         }
         switch (mimetype) {
@@ -50,6 +54,7 @@ class ImportService {
     }
     importJSON(collection, stream) {
         const extractJSON = StreamArray_1.default.withParser();
+        const nestedActionEvents = [];
         return this.knex.transaction((trx) => {
             const service = new items_1.ItemsService(collection, {
                 knex: trx,
@@ -57,7 +62,7 @@ class ImportService {
                 accountability: this.accountability,
             });
             const saveQueue = (0, async_1.queue)(async (value) => {
-                return await service.upsertOne(value);
+                return await service.upsertOne(value, { bypassEmitAction: (params) => nestedActionEvents.push(params) });
             });
             return new Promise((resolve, reject) => {
                 stream.pipe(extractJSON);
@@ -74,6 +79,9 @@ class ImportService {
                 });
                 extractJSON.on('end', () => {
                     saveQueue.drain(() => {
+                        for (const nestedActionEvent of nestedActionEvents) {
+                            emitter_1.default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
+                        }
                         return resolve();
                     });
                 });
@@ -81,6 +89,7 @@ class ImportService {
         });
     }
     importCSV(collection, stream) {
+        const nestedActionEvents = [];
         return this.knex.transaction((trx) => {
             const service = new items_1.ItemsService(collection, {
                 knex: trx,
@@ -88,7 +97,7 @@ class ImportService {
                 accountability: this.accountability,
             });
             const saveQueue = (0, async_1.queue)(async (value) => {
-                return await service.upsertOne(value);
+                return await service.upsertOne(value, { bypassEmitAction: (action) => nestedActionEvents.push(action) });
             });
             return new Promise((resolve, reject) => {
                 stream
@@ -122,6 +131,9 @@ class ImportService {
                 })
                     .on('end', () => {
                     saveQueue.drain(() => {
+                        for (const nestedActionEvent of nestedActionEvents) {
+                            emitter_1.default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
+                        }
                         return resolve();
                     });
                 });
@@ -134,6 +146,9 @@ class ImportService {
 }
 exports.ImportService = ImportService;
 class ExportService {
+    knex;
+    accountability;
+    schema;
     constructor(options) {
         this.knex = options.knex || (0, database_1.default)();
         this.accountability = options.accountability || null;
@@ -145,17 +160,16 @@ class ExportService {
      * FilesService upload method.
      */
     async exportToFile(collection, query, format, options) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         try {
             const mimeTypes = {
-                xml: 'text/xml',
                 csv: 'text/csv',
                 json: 'application/json',
+                xml: 'text/xml',
+                yaml: 'text/yaml',
             };
             const database = (0, database_1.default)();
             const { path, cleanup } = await (0, tmp_promise_1.file)();
             await database.transaction(async (trx) => {
-                var _a;
                 const service = new items_1.ItemsService(collection, {
                     accountability: this.accountability,
                     schema: this.schema,
@@ -168,9 +182,9 @@ class ExportService {
                         count: ['*'],
                     },
                 })
-                    .then((result) => { var _a, _b; return Number((_b = (_a = result === null || result === void 0 ? void 0 : result[0]) === null || _a === void 0 ? void 0 : _a.count) !== null && _b !== void 0 ? _b : 0); });
+                    .then((result) => Number(result?.[0]?.count ?? 0));
                 const count = query.limit ? Math.min(totalCount, query.limit) : totalCount;
-                const requestedLimit = (_a = query.limit) !== null && _a !== void 0 ? _a : -1;
+                const requestedLimit = query.limit ?? -1;
                 const batchesRequired = Math.ceil(count / env_1.default.EXPORT_BATCH_SIZE);
                 let readCount = 0;
                 for (let batch = 0; batch < batchesRequired; batch++) {
@@ -200,14 +214,14 @@ class ExportService {
             const title = `export-${collection}-${(0, get_date_formatted_1.getDateFormatted)()}`;
             const filename = `${title}.${format}`;
             const fileWithDefaults = {
-                ...((_a = options === null || options === void 0 ? void 0 : options.file) !== null && _a !== void 0 ? _a : {}),
-                title: (_c = (_b = options === null || options === void 0 ? void 0 : options.file) === null || _b === void 0 ? void 0 : _b.title) !== null && _c !== void 0 ? _c : title,
-                filename_download: (_e = (_d = options === null || options === void 0 ? void 0 : options.file) === null || _d === void 0 ? void 0 : _d.filename_download) !== null && _e !== void 0 ? _e : filename,
-                storage: (_g = (_f = options === null || options === void 0 ? void 0 : options.file) === null || _f === void 0 ? void 0 : _f.storage) !== null && _g !== void 0 ? _g : storage,
+                ...(options?.file ?? {}),
+                title: options?.file?.title ?? title,
+                filename_download: options?.file?.filename_download ?? filename,
+                storage: options?.file?.storage ?? storage,
                 type: mimeTypes[format],
             };
             const savedFile = await filesService.uploadOne((0, fs_extra_1.createReadStream)(path), fileWithDefaults);
-            if ((_h = this.accountability) === null || _h === void 0 ? void 0 : _h.user) {
+            if (this.accountability?.user) {
                 const notificationsService = new notifications_1.NotificationsService({
                     accountability: this.accountability,
                     schema: this.schema,
@@ -224,7 +238,7 @@ class ExportService {
         }
         catch (err) {
             logger_1.default.error(err, `Couldn't export ${collection}: ${err.message}`);
-            if ((_j = this.accountability) === null || _j === void 0 ? void 0 : _j.user) {
+            if (this.accountability?.user) {
                 const notificationsService = new notifications_1.NotificationsService({
                     accountability: this.accountability,
                     schema: this.schema,
@@ -244,9 +258,9 @@ class ExportService {
     transform(input, format, options) {
         if (format === 'json') {
             let string = JSON.stringify(input || null, null, '\t');
-            if ((options === null || options === void 0 ? void 0 : options.includeHeader) === false)
+            if (options?.includeHeader === false)
                 string = string.split('\n').slice(1).join('\n');
-            if ((options === null || options === void 0 ? void 0 : options.includeFooter) === false) {
+            if (options?.includeFooter === false) {
                 const lines = string.split('\n');
                 string = lines.slice(0, lines.length - 1).join('\n');
                 string += ',\n';
@@ -255,9 +269,9 @@ class ExportService {
         }
         if (format === 'xml') {
             let string = (0, js2xmlparser_1.parse)('data', input);
-            if ((options === null || options === void 0 ? void 0 : options.includeHeader) === false)
+            if (options?.includeHeader === false)
                 string = string.split('\n').slice(2).join('\n');
-            if ((options === null || options === void 0 ? void 0 : options.includeFooter) === false) {
+            if (options?.includeFooter === false) {
                 const lines = string.split('\n');
                 string = lines.slice(0, lines.length - 1).join('\n');
                 string += '\n';
@@ -269,14 +283,17 @@ class ExportService {
                 return '';
             const parser = new json2csv_1.Parser({
                 transforms: [json2csv_1.transforms.flatten({ separator: '.' })],
-                header: (options === null || options === void 0 ? void 0 : options.includeHeader) !== false,
+                header: options?.includeHeader !== false,
             });
             let string = parser.parse(input);
-            if ((options === null || options === void 0 ? void 0 : options.includeHeader) === false) {
+            if (options?.includeHeader === false) {
                 string = '\n' + string;
             }
             return string;
         }
+        if (format === 'yaml') {
+            return (0, js_yaml_1.dump)(input);
+        }
         throw new exceptions_1.ServiceUnavailableException(`Illegal export type used: "${format}"`, { service: 'export' });
     }
 }

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

@@ -0,0 +1 @@
+export {};

package/dist/services/index.d.ts

@@ -22,6 +22,7 @@ export * from './presets';
 export * from './relations';
 export * from './revisions';
 export * from './roles';
+export * from './schema';
 export * from './server';
 export * from './settings';
 export * from './specifications';

package/dist/services/index.js

@@ -39,6 +39,7 @@ __exportStar(require("./presets"), exports);
 __exportStar(require("./relations"), exports);
 __exportStar(require("./revisions"), exports);
 __exportStar(require("./roles"), exports);
+__exportStar(require("./schema"), exports);
 __exportStar(require("./server"), exports);
 __exportStar(require("./settings"), exports);
 __exportStar(require("./specifications"), exports);

package/dist/services/items.d.ts

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