directus 9.21.2 → 9.22.0

package/dist/services/authentication.js

@@ -8,7 +8,6 @@ const types_1 = require("@directus/shared/types");
 const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
 const lodash_1 = require("lodash");
 const ms_1 = __importDefault(require("ms"));
-const nanoid_1 = require("nanoid");
 const perf_hooks_1 = require("perf_hooks");
 const auth_1 = require("../auth");
 const constants_1 = require("../constants");
@@ -37,6 +36,7 @@ class AuthenticationService {
      */
     async login(providerName = constants_1.DEFAULT_AUTH_PROVIDER, payload, otp) {
         var _a, _b, _c;
+        const { nanoid } = await import('nanoid');
         const STALL_TIME = env_1.default.LOGIN_STALL_TIME;
         const timeStart = perf_hooks_1.performance.now();
         const provider = (0, auth_1.getAuthProvider)(providerName);
@@ -151,7 +151,7 @@ class AuthenticationService {
             expiresIn: env_1.default.ACCESS_TOKEN_TTL,
             issuer: 'directus',
         });
-        const refreshToken = (0, nanoid_1.nanoid)(64);
+        const refreshToken = nanoid(64);
         const refreshTokenExpiration = new Date(Date.now() + (0, ms_1.default)(env_1.default.REFRESH_TOKEN_TTL));
         await this.knex('directus_sessions').insert({
             token: refreshToken,
@@ -187,6 +187,7 @@ class AuthenticationService {
         };
     }
     async refresh(refreshToken) {
+        const { nanoid } = await import('nanoid');
         if (!refreshToken) {
             throw new exceptions_1.InvalidCredentialsException();
         }
@@ -280,7 +281,7 @@ class AuthenticationService {
             expiresIn: env_1.default.ACCESS_TOKEN_TTL,
             issuer: 'directus',
         });
-        const newRefreshToken = (0, nanoid_1.nanoid)(64);
+        const newRefreshToken = nanoid(64);
         const refreshTokenExpiration = new Date(Date.now() + (0, ms_1.default)(env_1.default.REFRESH_TOKEN_TTL));
         await this.knex('directus_sessions')
             .update({

package/dist/services/authorization.js

@@ -178,7 +178,7 @@ class AuthorizationService {
                             (result[relation.collection] || (result[relation.collection] = new Set())).add(relation.field);
                         }
                     }
-                    // m2a filter in the form of `item:collection`
+                    // a2o filter in the form of `item:collection`
                     else if (filterKey.includes(':')) {
                         const [field, collectionScope] = filterKey.split(':');
                         if (collection) {

package/dist/services/files.d.ts

@@ -1,19 +1,20 @@
 /// <reference types="node" />
-import { AbstractServiceOptions, File, PrimaryKey, MutationOptions, Metadata } from '../types';
+import type { Readable } from 'node:stream';
+import { AbstractServiceOptions, File, Metadata, MutationOptions, PrimaryKey } from '../types';
 import { ItemsService } from './items';
 export declare class FilesService extends ItemsService {
     constructor(options: AbstractServiceOptions);
     /**
      * Upload a single new file to the configured storage adapter
      */
-    uploadOne(stream: NodeJS.ReadableStream, data: Partial<File> & {
+    uploadOne(stream: Readable, data: Partial<File> & {
         filename_download: string;
         storage: string;
     }, primaryKey?: PrimaryKey, opts?: MutationOptions): Promise<PrimaryKey>;
     /**
      * Extract metadata from a buffer's content
      */
-    getMetadata(bufferContent: any, allowList?: any): Promise<Metadata>;
+    getMetadata(stream: Readable, allowList?: any): Promise<Metadata>;
     /**
      * Import a single file from an external URL
      */

package/dist/services/files.js

@@ -27,26 +27,29 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FilesService = void 0;
-const format_title_1 = __importDefault(require("@directus/format-title"));
-const axios_1 = __importDefault(require("axios"));
-const exifr_1 = __importDefault(require("exifr"));
+const utils_1 = require("@directus/shared/utils");
+const dns_1 = require("dns");
+const encodeurl_1 = __importDefault(require("encodeurl"));
+const exif_reader_1 = __importDefault(require("exif-reader"));
+const icc_1 = require("icc");
 const lodash_1 = require("lodash");
 const mime_types_1 = require("mime-types");
+const net_1 = __importDefault(require("net"));
+const promises_1 = require("node:stream/promises");
+const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 const sharp_1 = __importDefault(require("sharp"));
 const url_1 = __importStar(require("url"));
 const util_1 = require("util");
-const dns_1 = require("dns");
 const emitter_1 = __importDefault(require("../emitter"));
 const env_1 = __importDefault(require("../env"));
 const exceptions_1 = require("../exceptions");
 const logger_1 = __importDefault(require("../logger"));
-const storage_1 = __importDefault(require("../storage"));
-const utils_1 = require("@directus/shared/utils");
+const storage_1 = require("../storage");
+const parse_image_metadata_1 = require("../utils/parse-image-metadata");
 const items_1 = require("./items");
-const net_1 = __importDefault(require("net"));
-const os_1 = __importDefault(require("os"));
-const encodeurl_1 = __importDefault(require("encodeurl"));
+// @ts-ignore
+const format_title_1 = __importDefault(require("@directus/format-title"));
 const lookupDNS = (0, util_1.promisify)(dns_1.lookup);
 class FilesService extends items_1.ItemsService {
     constructor(options) {
@@ -57,6 +60,7 @@ class FilesService extends items_1.ItemsService {
      */
     async uploadOne(stream, data, primaryKey, opts) {
         var _a, _b, _c, _d, _e, _f;
+        const storage = await (0, storage_1.getStorage)();
         const payload = (0, lodash_1.clone)(data);
         if ('folder' in payload === false) {
             const settings = await this.knex.select('storage_default_folder').from('directus_settings').first();
@@ -68,9 +72,9 @@ class FilesService extends items_1.ItemsService {
             await this.updateOne(primaryKey, payload, { emitEvents: false });
             // If the file you're uploading already exists, we'll consider this upload a replace. In that case, we'll
             // delete the previously saved file and thumbnails to ensure they're generated fresh
-            const disk = storage_1.default.disk(payload.storage);
-            for await (const file of disk.flatList(String(primaryKey))) {
-                await disk.delete(file.path);
+            const disk = storage.location(payload.storage);
+            for await (const filepath of disk.list(String(primaryKey))) {
+                await disk.delete(filepath);
             }
         }
         else {
@@ -82,18 +86,18 @@ class FilesService extends items_1.ItemsService {
             payload.type = 'application/octet-stream';
         }
         try {
-            await storage_1.default.disk(data.storage).put(payload.filename_disk, stream, payload.type);
+            await storage.location(data.storage).write(payload.filename_disk, stream, payload.type);
         }
         catch (err) {
             logger_1.default.warn(`Couldn't save file ${payload.filename_disk}`);
             logger_1.default.warn(err);
             throw new exceptions_1.ServiceUnavailableException(`Couldn't save file ${payload.filename_disk}`, { service: 'files' });
         }
-        const { size } = await storage_1.default.disk(data.storage).getStat(payload.filename_disk);
+        const { size } = await storage.location(data.storage).stat(payload.filename_disk);
         payload.filesize = size;
         if (['image/jpeg', 'image/png', 'image/webp', 'image/gif', 'image/tiff'].includes(payload.type)) {
-            const buffer = await storage_1.default.disk(data.storage).getBuffer(payload.filename_disk);
-            const { height, width, description, title, tags, metadata } = await this.getMetadata(buffer.content);
+            const stream = await storage.location(data.storage).read(payload.filename_disk);
+            const { height, width, description, title, tags, metadata } = await this.getMetadata(stream);
             (_a = payload.height) !== null && _a !== void 0 ? _a : (payload.height = height);
             (_b = payload.width) !== null && _b !== void 0 ? _b : (payload.width = width);
             (_c = payload.description) !== null && _c !== void 0 ? _c : (payload.description = description);
@@ -127,60 +131,79 @@ class FilesService extends items_1.ItemsService {
     /**
      * Extract metadata from a buffer's content
      */
-    async getMetadata(bufferContent, allowList = env_1.default.FILE_METADATA_ALLOW_LIST) {
-        const metadata = {};
-        try {
-            const sharpMetadata = await (0, sharp_1.default)(bufferContent, {}).metadata();
-            if (sharpMetadata.orientation && sharpMetadata.orientation >= 5) {
-                metadata.height = sharpMetadata.width;
-                metadata.width = sharpMetadata.height;
-            }
-            else {
-                metadata.width = sharpMetadata.width;
-                metadata.height = sharpMetadata.height;
-            }
-        }
-        catch (err) {
-            logger_1.default.warn(`Couldn't extract sharp metadata from file`);
-            logger_1.default.warn(err);
-        }
-        try {
-            const exifrMetadata = await exifr_1.default.parse(bufferContent, {
-                icc: false,
-                iptc: true,
-                ifd1: true,
-                interop: true,
-                translateValues: true,
-                reviveValues: true,
-                mergeOutput: false,
-            });
-            if (allowList === '*' || (allowList === null || allowList === void 0 ? void 0 : allowList[0]) === '*') {
-                metadata.metadata = exifrMetadata;
-            }
-            else {
-                metadata.metadata = (0, lodash_1.pick)(exifrMetadata, allowList);
-            }
-            if (!metadata.description && (exifrMetadata === null || exifrMetadata === void 0 ? void 0 : exifrMetadata.Caption)) {
-                metadata.description = exifrMetadata.Caption;
-            }
-            if (exifrMetadata === null || exifrMetadata === void 0 ? void 0 : exifrMetadata.Headline) {
-                metadata.title = exifrMetadata.Headline;
-            }
-            if (exifrMetadata === null || exifrMetadata === void 0 ? void 0 : exifrMetadata.Keywords) {
-                metadata.tags = exifrMetadata.Keywords;
-            }
-        }
-        catch (err) {
-            logger_1.default.warn(`Couldn't extract EXIF metadata from file`);
-            logger_1.default.warn(err);
-        }
-        return metadata;
+    async getMetadata(stream, allowList = env_1.default.FILE_METADATA_ALLOW_LIST) {
+        return new Promise((resolve, reject) => {
+            (0, promises_1.pipeline)(stream, (0, sharp_1.default)().metadata(async (err, sharpMetadata) => {
+                var _a, _b, _c, _d;
+                if (err)
+                    reject(err);
+                const metadata = {};
+                if (sharpMetadata.orientation && sharpMetadata.orientation >= 5) {
+                    metadata.height = sharpMetadata.width;
+                    metadata.width = sharpMetadata.height;
+                }
+                else {
+                    metadata.width = sharpMetadata.width;
+                    metadata.height = sharpMetadata.height;
+                }
+                // Backward-compatible layout as it used to be with 'exifr'
+                const fullMetadata = {};
+                if (sharpMetadata.exif) {
+                    const { image, thumbnail, interoperability, ...rest } = (0, exif_reader_1.default)(sharpMetadata.exif);
+                    if (image) {
+                        fullMetadata.ifd0 = image;
+                    }
+                    if (thumbnail) {
+                        fullMetadata.ifd1 = thumbnail;
+                    }
+                    if (interoperability) {
+                        fullMetadata.interop = interoperability;
+                    }
+                    Object.assign(fullMetadata, rest);
+                }
+                if (sharpMetadata.icc) {
+                    fullMetadata.icc = (0, icc_1.parse)(sharpMetadata.icc);
+                }
+                if (sharpMetadata.iptc) {
+                    fullMetadata.iptc = (0, parse_image_metadata_1.parseIptc)(sharpMetadata.iptc);
+                }
+                if (sharpMetadata.xmp) {
+                    fullMetadata.xmp = (0, parse_image_metadata_1.parseXmp)(sharpMetadata.xmp);
+                }
+                if (((_a = fullMetadata === null || fullMetadata === void 0 ? void 0 : fullMetadata.iptc) === null || _a === void 0 ? void 0 : _a.Caption) && typeof fullMetadata.iptc.Caption === 'string') {
+                    metadata.description = (_b = fullMetadata.iptc) === null || _b === void 0 ? void 0 : _b.Caption;
+                }
+                if (((_c = fullMetadata === null || fullMetadata === void 0 ? void 0 : fullMetadata.iptc) === null || _c === void 0 ? void 0 : _c.Headline) && typeof fullMetadata.iptc.Headline === 'string') {
+                    metadata.title = fullMetadata.iptc.Headline;
+                }
+                if ((_d = fullMetadata === null || fullMetadata === void 0 ? void 0 : fullMetadata.iptc) === null || _d === void 0 ? void 0 : _d.Keywords) {
+                    metadata.tags = fullMetadata.iptc.Keywords;
+                }
+                if (allowList === '*' || (allowList === null || allowList === void 0 ? void 0 : allowList[0]) === '*') {
+                    metadata.metadata = fullMetadata;
+                }
+                else {
+                    metadata.metadata = (0, lodash_1.pick)(fullMetadata, allowList);
+                }
+                // Fix (incorrectly parsed?) values starting / ending with spaces,
+                // limited to one level and string values only
+                for (const section of Object.keys(metadata.metadata)) {
+                    for (const [key, value] of Object.entries(metadata.metadata[section])) {
+                        if (typeof value === 'string') {
+                            metadata.metadata[section][key] = value.trim();
+                        }
+                    }
+                }
+                resolve(metadata);
+            }));
+        });
     }
     /**
      * Import a single file from an external URL
      */
     async importOne(importURL, body) {
         var _a, _b, _c;
+        const axios = (await import('axios')).default;
         const fileCreatePermissions = (_b = (_a = this.accountability) === null || _a === void 0 ? void 0 : _a.permissions) === null || _b === void 0 ? void 0 : _b.find((permission) => permission.collection === 'directus_files' && permission.action === 'create');
         if (this.accountability && ((_c = this.accountability) === null || _c === void 0 ? void 0 : _c.admin) !== true && !fileCreatePermissions) {
             throw new exceptions_1.ForbiddenException();
@@ -230,7 +253,7 @@ class FilesService extends items_1.ItemsService {
         }
         let fileResponse;
         try {
-            fileResponse = await axios_1.default.get((0, encodeurl_1.default)(importURL), {
+            fileResponse = await axios.get((0, encodeurl_1.default)(importURL), {
                 responseType: 'stream',
             });
         }
@@ -273,16 +296,17 @@ class FilesService extends items_1.ItemsService {
      * Delete multiple files
      */
     async deleteMany(keys, opts) {
+        const storage = await (0, storage_1.getStorage)();
         const files = await super.readMany(keys, { fields: ['id', 'storage'], limit: -1 });
         if (!files) {
             throw new exceptions_1.ForbiddenException();
         }
         await super.deleteMany(keys);
         for (const file of files) {
-            const disk = storage_1.default.disk(file.storage);
+            const disk = storage.location(file.storage);
             // Delete file + thumbnails
-            for await (const { path } of disk.flatList(file.id)) {
-                await disk.delete(path);
+            for await (const filepath of disk.list(file.id)) {
+                await disk.delete(filepath);
             }
         }
         if (this.cache && env_1.default.CACHE_AUTO_PURGE && (opts === null || opts === void 0 ? void 0 : opts.autoPurgeCache) !== false) {

package/dist/services/flows.d.ts

@@ -5,9 +5,7 @@ export declare class FlowsService extends ItemsService<FlowRaw> {
     constructor(options: AbstractServiceOptions);
     createOne(data: Partial<Item>, opts?: MutationOptions): Promise<PrimaryKey>;
     createMany(data: Partial<Item>[], opts?: MutationOptions): Promise<PrimaryKey[]>;
-    updateOne(key: PrimaryKey, data: Partial<Item>, opts?: MutationOptions): Promise<PrimaryKey>;
     updateBatch(data: Partial<Item>[], opts?: MutationOptions): Promise<PrimaryKey[]>;
     updateMany(keys: PrimaryKey[], data: Partial<Item>, opts?: MutationOptions): Promise<PrimaryKey[]>;
-    deleteOne(key: PrimaryKey, opts?: MutationOptions): Promise<PrimaryKey>;
     deleteMany(keys: PrimaryKey[], opts?: MutationOptions): Promise<PrimaryKey[]>;
 }

package/dist/services/flows.js

@@ -19,12 +19,6 @@ class FlowsService extends items_1.ItemsService {
         await flowManager.reload();
         return result;
     }
-    async updateOne(key, data, opts) {
-        const flowManager = (0, flows_1.getFlowManager)();
-        const result = await super.updateOne(key, data, opts);
-        await flowManager.reload();
-        return result;
-    }
     async updateBatch(data, opts) {
         const flowManager = (0, flows_1.getFlowManager)();
         const result = await super.updateBatch(data, opts);
@@ -37,14 +31,6 @@ class FlowsService extends items_1.ItemsService {
         await flowManager.reload();
         return result;
     }
-    async deleteOne(key, opts) {
-        const flowManager = (0, flows_1.getFlowManager)();
-        // this is to prevent foreign key constraint error on directus_operations resolve/reject during cascade deletion
-        await this.knex('directus_operations').update({ resolve: null, reject: null }).where('flow', key);
-        const result = await super.deleteOne(key, opts);
-        await flowManager.reload();
-        return result;
-    }
     async deleteMany(keys, opts) {
         const flowManager = (0, flows_1.getFlowManager)();
         // this is to prevent foreign key constraint error on directus_operations resolve/reject during cascade deletion

package/dist/services/flows.test.d.ts

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

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

@@ -1,5 +1,5 @@
 import { BaseException } from '@directus/shared/exceptions';
-import { Accountability, Query, SchemaOverview } from '@directus/shared/types';
+import { Accountability, Filter, Query, SchemaOverview } from '@directus/shared/types';
 import { ArgumentNode, FormattedExecutionResult, FragmentDefinitionNode, GraphQLError, GraphQLResolveInfo, GraphQLSchema, SelectionNode } from 'graphql';
 import { ObjectTypeComposer, SchemaComposer } from 'graphql-compose';
 import { Knex } from 'knex';
@@ -54,6 +54,10 @@ export declare class GraphQLService {
      * Resolve the aggregation query based on the requested aggregated fields
      */
     getAggregateQuery(rawQuery: Query, selections: readonly SelectionNode[]): Query;
+    /**
+     * Replace functions from GraphQL format to Directus-Filter format
+     */
+    replaceFuncs(filter?: Filter | null): null | undefined | Filter;
     /**
      * Convert Directus-Exception into a GraphQL format, so it can be returned by GraphQL properly.
      */

package/dist/services/graphql/index.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GraphQLService = void 0;
 const types_1 = require("@directus/shared/types");
+const utils_1 = require("@directus/shared/utils");
 const argon2_1 = __importDefault(require("argon2"));
 const graphql_1 = require("graphql");
 const graphql_compose_1 = require("graphql-compose");
@@ -13,7 +14,6 @@ const lodash_1 = require("lodash");
 const ms_1 = __importDefault(require("ms"));
 const cache_1 = require("../../cache");
 const constants_1 = require("../../constants");
-const constants_2 = require("@directus/shared/constants");
 const database_1 = __importDefault(require("../../database"));
 const env_1 = __importDefault(require("../../env"));
 const exceptions_1 = require("../../exceptions");
@@ -44,7 +44,7 @@ const shares_1 = require("../shares");
 const specifications_1 = require("../specifications");
 const tfa_1 = require("../tfa");
 const users_1 = require("../users");
-const utils_1 = require("../utils");
+const utils_2 = require("../utils");
 const webhooks_1 = require("../webhooks");
 const date_1 = require("./types/date");
 const geojson_1 = require("./types/geojson");
@@ -53,6 +53,7 @@ const void_1 = require("./types/void");
 const add_path_to_validation_error_1 = require("./utils/add-path-to-validation-error");
 const hash_1 = require("./types/hash");
 const bigint_1 = require("./types/bigint");
+const constants_2 = require("@directus/shared/constants");
 const validationRules = Array.from(graphql_1.specifiedRules);
 if (env_1.default.GRAPHQL_INTROSPECTION === false) {
     validationRules.push(graphql_1.NoSchemaIntrospectionCustomRule);
@@ -1111,14 +1112,7 @@ class GraphQLService {
         // Transform count(a.b.c) into a.b.count(c)
         if ((_c = query.fields) === null || _c === void 0 ? void 0 : _c.length) {
             for (let fieldIndex = 0; fieldIndex < query.fields.length; fieldIndex++) {
-                if (query.fields[fieldIndex].includes('(') && query.fields[fieldIndex].includes(')')) {
-                    const functionName = query.fields[fieldIndex].split('(')[0];
-                    const columnNames = query.fields[fieldIndex].match(constants_2.REGEX_BETWEEN_PARENS)[1].split('.');
-                    if (columnNames.length > 1) {
-                        const column = columnNames.pop();
-                        query.fields[fieldIndex] = columnNames.join('.') + '.' + functionName + '(' + column + ')';
-                    }
-                }
+                query.fields[fieldIndex] = (0, utils_1.parseFilterFunctionPath)(query.fields[fieldIndex]);
             }
         }
         const result = await this.read(collection, query);
@@ -1347,28 +1341,10 @@ class GraphQLService {
             }
             return (0, lodash_1.uniq)(fields);
         };
-        const replaceFuncs = (filter) => {
-            if (!filter)
-                return filter;
-            return replaceFuncDeep(filter);
-            function replaceFuncDeep(filter) {
-                return (0, lodash_1.transform)(filter, (result, value, key) => {
-                    let currentKey = key;
-                    if (typeof key === 'string' && key.endsWith('_func')) {
-                        const functionName = Object.keys(value)[0];
-                        currentKey = `${functionName}(${currentKey.slice(0, -5)})`;
-                        result[currentKey] = Object.values(value)[0];
-                    }
-                    else {
-                        result[currentKey] =
-                            (value === null || value === void 0 ? void 0 : value.constructor) === Object || (value === null || value === void 0 ? void 0 : value.constructor) === Array ? replaceFuncDeep(value) : value;
-                    }
-                });
-            }
-        };
         query.alias = parseAliases(selections);
         query.fields = parseFields(selections);
-        query.filter = replaceFuncs(query.filter);
+        query.filter = this.replaceFuncs(query.filter);
+        query.deep = this.replaceFuncs(query.deep);
         (0, validate_query_1.validateQuery)(query);
         return query;
     }
@@ -1393,9 +1369,31 @@ class GraphQLService {
                     return selectionNode.name.value;
                 })) !== null && _b !== void 0 ? _b : [];
         }
+        query.filter = this.replaceFuncs(query.filter);
         (0, validate_query_1.validateQuery)(query);
         return query;
     }
+    /**
+     * Replace functions from GraphQL format to Directus-Filter format
+     */
+    replaceFuncs(filter) {
+        if (!filter)
+            return filter;
+        return replaceFuncDeep(filter);
+        function replaceFuncDeep(filter) {
+            return (0, lodash_1.transform)(filter, (result, value, key) => {
+                const isFunctionKey = typeof key === 'string' && key.endsWith('_func') && constants_2.FUNCTIONS.includes(Object.keys(value)[0]);
+                if (isFunctionKey) {
+                    const functionName = Object.keys(value)[0];
+                    const fieldName = key.slice(0, -5);
+                    result[`${functionName}(${fieldName})`] = Object.values(value)[0];
+                }
+                else {
+                    result[key] = (value === null || value === void 0 ? void 0 : value.constructor) === Object || (value === null || value === void 0 ? void 0 : value.constructor) === Array ? replaceFuncDeep(value) : value;
+                }
+            });
+        }
+    }
     /**
      * Convert Directus-Exception into a GraphQL format, so it can be returned by GraphQL properly.
      */
@@ -1870,7 +1868,7 @@ class GraphQLService {
                     to: new graphql_1.GraphQLNonNull(graphql_1.GraphQLID),
                 },
                 resolve: async (_, args) => {
-                    const service = new utils_1.UtilsService({
+                    const service = new utils_2.UtilsService({
                         accountability: this.accountability,
                         schema: this.schema,
                     });

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

@@ -2,14 +2,15 @@
 import { Accountability, Query, SchemaOverview } from '@directus/shared/types';
 import { Knex } from 'knex';
 import { AbstractServiceOptions, File } from '../types';
+import type { Readable } from 'node:stream';
 export declare class ImportService {
     knex: Knex;
     accountability: Accountability | null;
     schema: SchemaOverview;
     constructor(options: AbstractServiceOptions);
-    import(collection: string, mimetype: string, stream: NodeJS.ReadableStream): Promise<void>;
-    importJSON(collection: string, stream: NodeJS.ReadableStream): Promise<void>;
-    importCSV(collection: string, stream: NodeJS.ReadableStream): Promise<void>;
+    import(collection: string, mimetype: string, stream: Readable): Promise<void>;
+    importJSON(collection: string, stream: Readable): Promise<void>;
+    importCSV(collection: string, stream: Readable): Promise<void>;
 }
 export declare class ExportService {
     knex: Knex;

package/dist/services/items.js

@@ -8,6 +8,7 @@ const types_1 = require("@directus/shared/types");
 const lodash_1 = require("lodash");
 const cache_1 = require("../cache");
 const database_1 = __importDefault(require("../database"));
+const helpers_1 = require("../database/helpers");
 const run_ast_1 = __importDefault(require("../database/run-ast"));
 const emitter_1 = __importDefault(require("../emitter"));
 const env_1 = __importDefault(require("../env"));
@@ -98,7 +99,12 @@ class ItemsService {
                     .returning(primaryKeyField)
                     .then((result) => result[0]);
                 const returnedKey = typeof result === 'object' ? result[primaryKeyField] : result;
-                primaryKey = primaryKey !== null && primaryKey !== void 0 ? primaryKey : returnedKey;
+                if (this.schema.collections[this.collection].fields[primaryKeyField].type === 'uuid') {
+                    primaryKey = (0, helpers_1.getHelpers)(trx).schema.formatUUID(primaryKey !== null && primaryKey !== void 0 ? primaryKey : returnedKey);
+                }
+                else {
+                    primaryKey = primaryKey !== null && primaryKey !== void 0 ? primaryKey : returnedKey;
+                }
             }
             catch (err) {
                 throw await (0, translate_1.translateDatabaseError)(err);

package/dist/services/meta.js

@@ -40,7 +40,7 @@ class MetaService {
             if (!permissionsRecord)
                 throw new exceptions_1.ForbiddenException();
             const permissions = (_d = permissionsRecord.permissions) !== null && _d !== void 0 ? _d : {};
-            (0, apply_query_1.applyFilter)(this.knex, this.schema, dbQuery, permissions, collection);
+            (0, apply_query_1.applyFilter)(this.knex, this.schema, dbQuery, permissions, collection, {});
         }
         const result = await dbQuery;
         return Number((_e = result === null || result === void 0 ? void 0 : result.count) !== null && _e !== void 0 ? _e : 0);
@@ -64,7 +64,7 @@ class MetaService {
             }
         }
         if (Object.keys(filter).length > 0) {
-            (0, apply_query_1.applyFilter)(this.knex, this.schema, dbQuery, filter, collection);
+            (0, apply_query_1.applyFilter)(this.knex, this.schema, dbQuery, filter, collection, {});
         }
         if (query.search) {
             (0, apply_query_1.applySearch)(this.schema, dbQuery, query.search, collection);

package/dist/services/operations.d.ts

@@ -5,9 +5,7 @@ export declare class OperationsService extends ItemsService<OperationRaw> {
     constructor(options: AbstractServiceOptions);
     createOne(data: Partial<Item>, opts?: MutationOptions): Promise<PrimaryKey>;
     createMany(data: Partial<Item>[], opts?: MutationOptions): Promise<PrimaryKey[]>;
-    updateOne(key: PrimaryKey, data: Partial<Item>, opts?: MutationOptions): Promise<PrimaryKey>;
     updateBatch(data: Partial<Item>[], opts?: MutationOptions): Promise<PrimaryKey[]>;
     updateMany(keys: PrimaryKey[], data: Partial<Item>, opts?: MutationOptions): Promise<PrimaryKey[]>;
-    deleteOne(key: PrimaryKey, opts?: MutationOptions): Promise<PrimaryKey>;
     deleteMany(keys: PrimaryKey[], opts?: MutationOptions): Promise<PrimaryKey[]>;
 }

package/dist/services/operations.js

@@ -19,12 +19,6 @@ class OperationsService extends items_1.ItemsService {
         await flowManager.reload();
         return result;
     }
-    async updateOne(key, data, opts) {
-        const flowManager = (0, flows_1.getFlowManager)();
-        const result = await super.updateOne(key, data, opts);
-        await flowManager.reload();
-        return result;
-    }
     async updateBatch(data, opts) {
         const flowManager = (0, flows_1.getFlowManager)();
         const result = await super.updateBatch(data, opts);
@@ -37,12 +31,6 @@ class OperationsService extends items_1.ItemsService {
         await flowManager.reload();
         return result;
     }
-    async deleteOne(key, opts) {
-        const flowManager = (0, flows_1.getFlowManager)();
-        const result = await super.deleteOne(key, opts);
-        await flowManager.reload();
-        return result;
-    }
     async deleteMany(keys, opts) {
         const flowManager = (0, flows_1.getFlowManager)();
         const result = await super.deleteMany(keys, opts);

package/dist/services/operations.test.d.ts

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

package/dist/services/permissions.d.ts

@@ -10,13 +10,8 @@ export declare class PermissionsService extends ItemsService {
     readMany(keys: PrimaryKey[], query?: Query, opts?: QueryOptions): Promise<Partial<Item>[]>;
     createOne(data: Partial<Item>, opts?: MutationOptions): Promise<PrimaryKey>;
     createMany(data: Partial<Item>[], opts?: MutationOptions): Promise<PrimaryKey[]>;
-    updateByQuery(query: Query, data: Partial<Item>, opts?: MutationOptions): Promise<PrimaryKey[]>;
-    updateOne(key: PrimaryKey, data: Partial<Item>, opts?: MutationOptions): Promise<PrimaryKey>;
     updateBatch(data: Partial<Item>[], opts?: MutationOptions): Promise<PrimaryKey[]>;
     updateMany(keys: PrimaryKey[], data: Partial<Item>, opts?: MutationOptions): Promise<PrimaryKey[]>;
-    upsertOne(payload: Partial<Item>, opts?: MutationOptions): Promise<PrimaryKey>;
     upsertMany(payloads: Partial<Item>[], opts?: MutationOptions): Promise<PrimaryKey[]>;
-    deleteByQuery(query: Query, opts?: MutationOptions): Promise<PrimaryKey[]>;
-    deleteOne(key: PrimaryKey, opts?: MutationOptions): Promise<PrimaryKey>;
     deleteMany(keys: PrimaryKey[], opts?: MutationOptions): Promise<PrimaryKey[]>;
 }