directus 9.14.3 → 9.15.1

package/dist/database/migrations/20220402A-remove-default-value-panel-icon.js

@@ -4,7 +4,7 @@ exports.down = exports.up = void 0;
 const helpers_1 = require("../helpers");
 async function up(knex) {
     const helper = (0, helpers_1.getHelpers)(knex).schema;
-    await helper.changeToString('directus_panels', 'icon', {
+    await helper.changeToType('directus_panels', 'icon', 'string', {
         nullable: true,
         default: null,
         length: 30,
@@ -13,7 +13,7 @@ async function up(knex) {
 exports.up = up;
 async function down(knex) {
     const helper = (0, helpers_1.getHelpers)(knex).schema;
-    await helper.changeToString('directus_panels', 'icon', {
+    await helper.changeToType('directus_panels', 'icon', 'string', {
         nullable: true,
         default: 'insert_chart',
         length: 30,

package/dist/database/migrations/20220801A-update-notifications-timestamp-column.d.ts

@@ -0,0 +1,3 @@
+import { Knex } from 'knex';
+export declare function up(knex: Knex): Promise<void>;
+export declare function down(knex: Knex): Promise<void>;

package/dist/database/migrations/20220801A-update-notifications-timestamp-column.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.down = exports.up = void 0;
+const helpers_1 = require("../helpers");
+async function up(knex) {
+    const helper = (0, helpers_1.getHelpers)(knex).schema;
+    await helper.changeToType('directus_notifications', 'timestamp', 'timestamp', {
+        nullable: true,
+        default: knex.fn.now(),
+    });
+}
+exports.up = up;
+async function down(knex) {
+    const helper = (0, helpers_1.getHelpers)(knex).schema;
+    await helper.changeToType('directus_notifications', 'timestamp', 'timestamp', {
+        nullable: false,
+    });
+}
+exports.down = down;

package/dist/database/migrations/20220802A-add-custom-aspect-ratios.d.ts

@@ -0,0 +1,3 @@
+import { Knex } from 'knex';
+export declare function up(knex: Knex): Promise<void>;
+export declare function down(knex: Knex): Promise<void>;

package/dist/database/migrations/20220802A-add-custom-aspect-ratios.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.down = exports.up = void 0;
+async function up(knex) {
+    await knex.schema.alterTable('directus_settings', (table) => {
+        table.json('custom_aspect_ratios');
+    });
+}
+exports.up = up;
+async function down(knex) {
+    await knex.schema.alterTable('directus_settings', (table) => {
+        table.dropColumn('custom_aspect_ratios');
+    });
+}
+exports.down = down;

package/dist/database/system-data/fields/settings.yaml

@@ -392,3 +392,36 @@ fields:
   - field: translation_strings
     special: cast-json
     hidden: true
+
+  - field: image_editor
+    interface: presentation-divider
+    options:
+      icon: image
+      title: $t:fields.directus_settings.image_editor
+    special:
+      - alias
+      - no-data
+    width: full
+
+  - field: custom_aspect_ratios
+    interface: list
+    special: cast-json
+    options:
+      template: '{{text}}'
+      fields:
+        - field: text
+          name: $t:text
+          type: string
+          meta:
+            interface: text-input
+            width: half
+            options:
+              placeholder: $t:text
+        - field: value
+          name: $t:value
+          type: float
+          meta:
+            interface: input
+            width: half
+            options:
+              placeholder: $t:value

package/dist/extensions.d.ts

@@ -1,5 +1,5 @@
 import { Router } from 'express';
-import { AppExtensionType, ExtensionType } from '@directus/shared/types';
+import { AppExtensionType, ExtensionType, HybridExtensionType } from '@directus/shared/types';
 export declare function getExtensionManager(): ExtensionManager;
 declare type Options = {
     schedule: boolean;
@@ -19,7 +19,7 @@ declare class ExtensionManager {
     initialize(options?: Partial<Options>): Promise<void>;
     reload(): void;
     getExtensionsList(type?: ExtensionType): string[];
-    getAppExtensions(type: AppExtensionType): string | undefined;
+    getAppExtensions(type: AppExtensionType | HybridExtensionType): string | undefined;
     getEndpointRouter(): Router;
     private load;
     private unload;

package/dist/extensions.js

@@ -132,7 +132,7 @@ class ExtensionManager {
     }
     async load() {
         try {
-            await (0, node_1.ensureExtensionDirs)(env_1.default.EXTENSIONS_PATH, env_1.default.SERVE_APP ? constants_1.EXTENSION_TYPES : constants_1.API_EXTENSION_TYPES);
+            await (0, node_1.ensureExtensionDirs)(env_1.default.EXTENSIONS_PATH, env_1.default.SERVE_APP ? constants_1.EXTENSION_TYPES : constants_1.API_OR_HYBRID_EXTENSION_TYPES);
             this.extensions = await this.getExtensions();
         }
         catch (err) {
@@ -160,9 +160,9 @@ class ExtensionManager {
     initializeWatcher() {
         if (this.options.watch && !this.watcher) {
             logger_1.default.info('Watching extensions for changes...');
-            const localExtensionPaths = (env_1.default.SERVE_APP ? constants_1.EXTENSION_TYPES : constants_1.API_EXTENSION_TYPES).flatMap((type) => {
+            const localExtensionPaths = (env_1.default.SERVE_APP ? constants_1.EXTENSION_TYPES : constants_1.API_OR_HYBRID_EXTENSION_TYPES).flatMap((type) => {
                 const typeDir = path_1.default.posix.join(path_1.default.relative('.', env_1.default.EXTENSIONS_PATH).split(path_1.default.sep).join(path_1.default.posix.sep), (0, utils_1.pluralize)(type));
-                return (0, utils_1.isHybridExtension)(type)
+                return (0, utils_1.isIn)(type, constants_1.HYBRID_EXTENSION_TYPES)
                     ? [path_1.default.posix.join(typeDir, '*', 'app.js'), path_1.default.posix.join(typeDir, '*', 'api.js')]
                     : path_1.default.posix.join(typeDir, '*', 'index.js');
             });
@@ -179,9 +179,9 @@ class ExtensionManager {
         if (this.watcher) {
             const toPackageExtensionPaths = (extensions) => extensions
                 .filter((extension) => !extension.local)
-                .flatMap((extension) => extension.type === constants_1.PACK_EXTENSION_TYPE
+                .flatMap((extension) => (0, utils_1.isTypeIn)(extension, constants_1.PACKAGE_EXTENSION_TYPES)
                 ? path_1.default.resolve(extension.path, 'package.json')
-                : (0, utils_1.isExtensionObject)(extension, constants_1.HYBRID_EXTENSION_TYPES)
+                : (0, utils_1.isTypeIn)(extension, constants_1.HYBRID_EXTENSION_TYPES)
                     ? [
                         path_1.default.resolve(extension.path, extension.entrypoint.app),
                         path_1.default.resolve(extension.path, extension.entrypoint.api),
@@ -194,8 +194,8 @@ class ExtensionManager {
         }
     }
     async getExtensions() {
-        const packageExtensions = await (0, node_1.getPackageExtensions)('.', env_1.default.SERVE_APP ? constants_1.EXTENSION_PACKAGE_TYPES : constants_1.API_EXTENSION_PACKAGE_TYPES);
-        const localExtensions = await (0, node_1.getLocalExtensions)(env_1.default.EXTENSIONS_PATH, env_1.default.SERVE_APP ? constants_1.EXTENSION_TYPES : constants_1.API_EXTENSION_TYPES);
+        const packageExtensions = await (0, node_1.getPackageExtensions)('.', env_1.default.SERVE_APP ? constants_1.EXTENSION_PACKAGE_TYPES : constants_1.API_OR_HYBRID_EXTENSION_PACKAGE_TYPES);
+        const localExtensions = await (0, node_1.getLocalExtensions)(env_1.default.EXTENSIONS_PATH, env_1.default.SERVE_APP ? constants_1.EXTENSION_TYPES : constants_1.API_OR_HYBRID_EXTENSION_TYPES);
         return [...packageExtensions, ...localExtensions];
     }
     async generateExtensionBundles() {
@@ -205,7 +205,7 @@ class ExtensionManager {
             replacement: path,
         }));
         const bundles = {};
-        for (const extensionType of constants_1.APP_EXTENSION_TYPES) {
+        for (const extensionType of constants_1.APP_OR_HYBRID_EXTENSION_TYPES) {
             const entry = (0, node_1.generateExtensionsEntry)(extensionType, this.extensions);
             try {
                 const bundle = await (0, rollup_1.rollup)({
@@ -226,7 +226,8 @@ class ExtensionManager {
         return bundles;
     }
     async getSharedDepsMapping(deps) {
-        const appDir = await fs_extra_1.default.readdir(path_1.default.join((0, node_1.resolvePackage)('@directus/app'), 'dist', 'assets'));
+        var _a;
+        const appDir = await fs_extra_1.default.readdir(path_1.default.join((0, node_1.resolvePackage)('@directus/app', (_a = require.main) === null || _a === void 0 ? void 0 : _a.filename), 'dist', 'assets'));
         const depsMapping = {};
         for (const dep of deps) {
             const depRegex = new RegExp(`${(0, lodash_1.escapeRegExp)(dep.replace(/\//g, '_'))}\\.[0-9a-f]{8}\\.entry\\.js`);

package/dist/logger.js

@@ -67,7 +67,6 @@ const httpLoggerEnvConfig = (0, get_config_from_env_1.getConfigFromEnv)('LOGGER_
 exports.expressLogger = (0, pino_http_1.default)({
     logger,
     ...httpLoggerEnvConfig,
-}, {
     serializers: {
         req(request) {
             const output = pino_http_1.stdSerializers.req(request);

package/dist/middleware/cache.js

@@ -10,7 +10,7 @@ const get_cache_headers_1 = require("../utils/get-cache-headers");
 const get_cache_key_1 = require("../utils/get-cache-key");
 const logger_1 = __importDefault(require("../logger"));
 const checkCacheMiddleware = (0, async_handler_1.default)(async (req, res, next) => {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     const { cache } = (0, cache_1.getCache)();
     if (req.method.toLowerCase() !== 'get' && ((_a = req.path) === null || _a === void 0 ? void 0 : _a.startsWith('/graphql')) === false)
         return next();
@@ -26,7 +26,7 @@ const checkCacheMiddleware = (0, async_handler_1.default)(async (req, res, next)
     const key = (0, get_cache_key_1.getCacheKey)(req);
     let cachedData;
     try {
-        cachedData = await cache.get(key);
+        cachedData = await (0, cache_1.getCacheValue)(cache, key);
     }
     catch (err) {
         logger_1.default.warn(err, `[cache] Couldn't read key ${key}. ${err.message}`);
@@ -37,7 +37,7 @@ const checkCacheMiddleware = (0, async_handler_1.default)(async (req, res, next)
     if (cachedData) {
         let cacheExpiryDate;
         try {
-            cacheExpiryDate = (await cache.get(`${key}__expires_at`));
+            cacheExpiryDate = (_d = (await (0, cache_1.getCacheValue)(cache, `${key}__expires_at`))) === null || _d === void 0 ? void 0 : _d.exp;
         }
         catch (err) {
             logger_1.default.warn(err, `[cache] Couldn't read key ${`${key}__expires_at`}. ${err.message}`);

package/dist/middleware/respond.js

@@ -32,8 +32,8 @@ exports.respond = (0, async_handler_1.default)(async (req, res) => {
         exceedsMaxSize === false) {
         const key = (0, get_cache_key_1.getCacheKey)(req);
         try {
-            await cache.set(key, res.locals.payload, (0, ms_1.default)(env_1.default.CACHE_TTL));
-            await cache.set(`${key}__expires_at`, Date.now() + (0, ms_1.default)(env_1.default.CACHE_TTL));
+            await (0, cache_1.setCacheValue)(cache, key, res.locals.payload, (0, ms_1.default)(env_1.default.CACHE_TTL));
+            await (0, cache_1.setCacheValue)(cache, `${key}__expires_at`, { exp: Date.now() + (0, ms_1.default)(env_1.default.CACHE_TTL) });
         }
         catch (err) {
             logger_1.default.warn(err, `[cache] Couldn't set key ${key}. ${err}`);

package/dist/operations/item-create/index.js

@@ -32,7 +32,7 @@ exports.default = (0, utils_1.defineOperationApi)({
             result = null;
         }
         else {
-            result = await itemsService.createMany((0, utils_1.toArray)(payloadObject), { emitEvents });
+            result = await itemsService.createMany((0, utils_1.toArray)(payloadObject), { emitEvents: !!emitEvents });
         }
         return result;
     },

package/dist/operations/item-delete/index.js

@@ -35,10 +35,10 @@ exports.default = (0, utils_1.defineOperationApi)({
         else {
             const keys = (0, utils_1.toArray)(key);
             if (keys.length === 1) {
-                result = await itemsService.deleteOne(keys[0], { emitEvents });
+                result = await itemsService.deleteOne(keys[0], { emitEvents: !!emitEvents });
             }
             else {
-                result = await itemsService.deleteMany(keys, { emitEvents });
+                result = await itemsService.deleteMany(keys, { emitEvents: !!emitEvents });
             }
         }
         return result;

package/dist/operations/item-read/index.js

@@ -35,10 +35,10 @@ exports.default = (0, utils_1.defineOperationApi)({
         else {
             const keys = (0, utils_1.toArray)(key);
             if (keys.length === 1) {
-                result = await itemsService.readOne(keys[0], sanitizedQueryObject, { emitEvents });
+                result = await itemsService.readOne(keys[0], sanitizedQueryObject, { emitEvents: !!emitEvents });
             }
             else {
-                result = await itemsService.readMany(keys, sanitizedQueryObject, { emitEvents });
+                result = await itemsService.readMany(keys, sanitizedQueryObject, { emitEvents: !!emitEvents });
             }
         }
         return result;

package/dist/operations/item-update/index.js

@@ -35,15 +35,15 @@ exports.default = (0, utils_1.defineOperationApi)({
         }
         let result;
         if (!key || (Array.isArray(key) && key.length === 0)) {
-            result = await itemsService.updateByQuery(sanitizedQueryObject, payloadObject, { emitEvents });
+            result = await itemsService.updateByQuery(sanitizedQueryObject, payloadObject, { emitEvents: !!emitEvents });
         }
         else {
             const keys = (0, utils_1.toArray)(key);
             if (keys.length === 1) {
-                result = await itemsService.updateOne(keys[0], payloadObject, { emitEvents });
+                result = await itemsService.updateOne(keys[0], payloadObject, { emitEvents: !!emitEvents });
             }
             else {
-                result = await itemsService.updateMany(keys, payloadObject, { emitEvents });
+                result = await itemsService.updateMany(keys, payloadObject, { emitEvents: !!emitEvents });
             }
         }
         return result;

package/dist/services/assets.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="node" />
 import { Range, StatResponse } from '@directus/drive';
+import { Accountability } from '@directus/shared/types';
 import { Knex } from 'knex';
 import { AbstractServiceOptions, TransformationParams, TransformationPreset } from '../types';
-import { Accountability } from '@directus/shared/types';
 import { AuthorizationService } from './authorization';
 export declare class AssetsService {
     knex: Knex;

package/dist/services/assets.js

@@ -32,13 +32,14 @@ const mime_types_1 = require("mime-types");
 const object_hash_1 = __importDefault(require("object-hash"));
 const path_1 = __importDefault(require("path"));
 const sharp_1 = __importDefault(require("sharp"));
+const uuid_validate_1 = __importDefault(require("uuid-validate"));
 const database_1 = __importDefault(require("../database"));
 const env_1 = __importDefault(require("../env"));
 const exceptions_1 = require("../exceptions");
+const logger_1 = __importDefault(require("../logger"));
 const storage_1 = __importDefault(require("../storage"));
-const authorization_1 = require("./authorization");
 const TransformationUtils = __importStar(require("../utils/transformations"));
-const uuid_validate_1 = __importDefault(require("uuid-validate"));
+const authorization_1 = require("./authorization");
 sharp_1.default.concurrency(1);
 // Note: don't put this in the service. The service can be initialized in multiple places, but they
 // should all share the same semaphore instance.
@@ -140,6 +141,10 @@ class AssetsService {
                     sequentialRead: true,
                 }).rotate();
                 transforms.forEach(([method, ...args]) => transformer[method].apply(transformer, args));
+                readStream.on('error', (e) => {
+                    logger_1.default.error(e, `Couldn't transform file ${file.id}`);
+                    readStream.unpipe(transformer);
+                });
                 await storage_1.default.disk(file.storage).put(assetFilename, readStream.pipe(transformer), type);
                 return {
                     stream: storage_1.default.disk(file.storage).getStream(assetFilename, range),

package/dist/services/authorization.js

@@ -13,6 +13,7 @@ const strip_function_1 = require("../utils/strip-function");
 const items_1 = require("./items");
 const payload_1 = require("./payload");
 const get_relation_info_1 = require("../utils/get-relation-info");
+const constants_1 = require("../constants");
 class AuthorizationService {
     constructor(options) {
         this.knex = options.knex || (0, database_1.default)();
@@ -379,7 +380,7 @@ class AuthorizationService {
         const requiredColumns = [];
         for (const field of Object.values(this.schema.collections[collection].fields)) {
             const specials = (_g = field === null || field === void 0 ? void 0 : field.special) !== null && _g !== void 0 ? _g : [];
-            const hasGenerateSpecial = ['uuid', 'date-created', 'role-created', 'user-created'].some((name) => specials.includes(name));
+            const hasGenerateSpecial = constants_1.GENERATE_SPECIAL.some((name) => specials.includes(name));
             const nullable = field.nullable || hasGenerateSpecial || field.generated;
             if (!nullable) {
                 requiredColumns.push(field);

package/dist/services/graphql/index.js

@@ -50,6 +50,7 @@ const geojson_1 = require("./types/geojson");
 const string_or_float_1 = require("./types/string-or-float");
 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 validationRules = Array.from(graphql_1.specifiedRules);
 if (env_1.default.GRAPHQL_INTROSPECTION === false) {
     validationRules.push(graphql_1.NoSchemaIntrospectionCustomRule);
@@ -277,7 +278,9 @@ class GraphQLService {
                         // GraphQL doesn't differentiate between not-null and has-to-be-submitted. We
                         // can't non-null in update, as that would require every not-nullable field to be
                         // submitted on updates
-                        if (field.nullable === false && action !== 'update') {
+                        if (field.nullable === false &&
+                            !constants_1.GENERATE_SPECIAL.some((flag) => field.special.includes(flag)) &&
+                            action !== 'update') {
                             type = (0, graphql_1.GraphQLNonNull)(type);
                         }
                         if (collection.primary === field.field) {
@@ -562,6 +565,23 @@ class GraphQLService {
                     },
                 },
             });
+            const HashFilterOperators = schemaComposer.createInputTC({
+                name: 'hash_filter_operators',
+                fields: {
+                    _null: {
+                        type: graphql_1.GraphQLBoolean,
+                    },
+                    _nnull: {
+                        type: graphql_1.GraphQLBoolean,
+                    },
+                    _empty: {
+                        type: graphql_1.GraphQLBoolean,
+                    },
+                    _nempty: {
+                        type: graphql_1.GraphQLBoolean,
+                    },
+                },
+            });
             const CountFunctionFilterOperators = schemaComposer.createInputTC({
                 name: 'count_function_filter_operators',
                 fields: {
@@ -635,6 +655,9 @@ class GraphQLService {
                             case geojson_1.GraphQLGeoJSON:
                                 filterOperatorType = GeometryFilterOperators;
                                 break;
+                            case hash_1.GraphQLHash:
+                                filterOperatorType = HashFilterOperators;
+                                break;
                             default:
                                 filterOperatorType = StringFilterOperators;
                         }
@@ -1023,7 +1046,7 @@ class GraphQLService {
      * Directus' query structure which is then executed by the services.
      */
     async resolveQuery(info) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         let collection = info.fieldName;
         if (this.scope === 'system')
             collection = `directus_${collection}`;
@@ -1057,13 +1080,15 @@ class GraphQLService {
             query.limit = 1;
         }
         // Transform count(a.b.c) into a.b.count(c)
-        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 + ')';
+        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 + ')';
+                    }
                 }
             }
         }
@@ -1073,7 +1098,7 @@ class GraphQLService {
         }
         if (query.group) {
             // for every entry in result add a group field based on query.group;
-            const aggregateKeys = Object.keys((_c = query.aggregate) !== null && _c !== void 0 ? _c : {});
+            const aggregateKeys = Object.keys((_d = query.aggregate) !== null && _d !== void 0 ? _d : {});
             result.map((field) => {
                 field.group = (0, lodash_1.omit)(field, aggregateKeys);
             });
@@ -1313,7 +1338,8 @@ class GraphQLService {
                         result[currentKey] = Object.values(value)[0];
                     }
                     else {
-                        result[currentKey] = (value === null || value === void 0 ? void 0 : value.constructor) === Object ? replaceFuncDeep(value) : value;
+                        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;
                     }
                 });
             }

package/dist/services/graphql/types/hash.d.ts

@@ -0,0 +1,2 @@
+import { GraphQLScalarType } from 'graphql';
+export declare const GraphQLHash: GraphQLScalarType;

package/dist/services/graphql/types/hash.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GraphQLHash = void 0;
+const graphql_1 = require("graphql");
+exports.GraphQLHash = new graphql_1.GraphQLScalarType({
+    ...graphql_1.GraphQLString,
+    name: 'Hash',
+    description: 'Hashed string values',
+});

package/dist/services/specifications.js

@@ -77,12 +77,7 @@ class OASSpecsService {
             integer: {
                 type: 'integer',
             },
-            json: {
-                type: 'array',
-                items: {
-                    type: 'string',
-                },
-            },
+            json: {},
             string: {
                 type: 'string',
             },

package/dist/utils/apply-query.js

@@ -13,6 +13,7 @@ const get_column_1 = require("./get-column");
 const get_column_path_1 = require("./get-column-path");
 const get_relation_info_1 = require("./get-relation-info");
 const utils_1 = require("@directus/shared/utils");
+const strip_function_1 = require("./strip-function");
 const generateAlias = (0, nanoid_1.customAlphabet)('abcdefghijklmnopqrstuvwxyz', 5);
 /**
  * Apply the Query to a given Knex query builder instance
@@ -211,9 +212,11 @@ function applyFilter(knex, schema, rootQuery, rootFilter, collection, subQuery =
                     const { columnPath, targetCollection } = (0, get_column_path_1.getColumnPath)({ path: filterPath, collection, relations, aliasMap });
                     if (!columnPath)
                         continue;
+                    validateFilterOperator(schema.collections[targetCollection].fields[(0, strip_function_1.stripFunction)(filterPath[filterPath.length - 1])].type, filterOperator);
                     applyFilterToQuery(columnPath, filterOperator, filterValue, logical, targetCollection);
                 }
                 else {
+                    validateFilterOperator(schema.collections[collection].fields[(0, strip_function_1.stripFunction)(filterPath[0])].type, filterOperator);
                     applyFilterToQuery(`${collection}.${filterPath[0]}`, filterOperator, filterValue, logical);
                 }
             }
@@ -245,6 +248,14 @@ function applyFilter(knex, schema, rootQuery, rootFilter, collection, subQuery =
                 }
             }
         }
+        function validateFilterOperator(type, filterOperator) {
+            if (filterOperator.startsWith('_')) {
+                filterOperator = filterOperator.slice(1);
+            }
+            if (!(0, utils_1.getFilterOperatorsForType)(type).includes(filterOperator)) {
+                throw new invalid_query_1.InvalidQueryException(`"${type}" field type does not contain the "_${filterOperator}" filter operator`);
+            }
+        }
         function applyFilterToQuery(key, operator, compareValue, logical = 'and', originalCollectionName) {
             const [table, column] = key.split('.');
             // Is processed through Knex.Raw, so should be safe to string-inject into these where queries

package/dist/utils/compress.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="node" />
+export declare function compress(raw: Record<string, any> | Record<string, any>[]): Promise<Buffer>;
+export declare function decompress(compressed: Buffer): Promise<any>;

package/dist/utils/compress.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.decompress = exports.compress = void 0;
+const snappy_1 = require("snappy");
+const utils_1 = require("@directus/shared/utils");
+async function compress(raw) {
+    if (!raw)
+        return raw;
+    return await (0, snappy_1.compress)((0, utils_1.compress)(raw));
+}
+exports.compress = compress;
+async function decompress(compressed) {
+    if (!compressed)
+        return compressed;
+    return (0, utils_1.decompress)((await (0, snappy_1.uncompress)(compressed, { asBuffer: false })));
+}
+exports.decompress = decompress;

package/dist/utils/get-ast-from-query.js

@@ -70,7 +70,7 @@ async function getASTFromQuery(collection, query, schema, options) {
         if (!fields)
             return [];
         fields = await convertWildcards(parentCollection, fields);
-        if (!fields)
+        if (!fields || !Array.isArray(fields))
             return [];
         const children = [];
         const relationalStructure = {};

package/dist/utils/get-graphql-type.js

@@ -5,6 +5,7 @@ const graphql_1 = require("graphql");
 const graphql_compose_1 = require("graphql-compose");
 const date_1 = require("../services/graphql/types/date");
 const geojson_1 = require("../services/graphql/types/geojson");
+const hash_1 = require("../services/graphql/types/hash");
 function getGraphQLType(localType) {
     switch (localType) {
         case 'boolean':
@@ -26,6 +27,8 @@ function getGraphQLType(localType) {
         case 'dateTime':
         case 'date':
             return date_1.GraphQLDate;
+        case 'hash':
+            return hash_1.GraphQLHash;
         default:
             return graphql_1.GraphQLString;
     }

package/dist/utils/get-permissions.js

@@ -17,12 +17,12 @@ const merge_permissions_1 = require("../utils/merge-permissions");
 const merge_permissions_for_share_1 = require("./merge-permissions-for-share");
 async function getPermissions(accountability, schema) {
     const database = (0, database_1.default)();
-    const { systemCache, cache } = (0, cache_1.getCache)();
+    const { cache } = (0, cache_1.getCache)();
     let permissions = [];
     const { user, role, app, admin, share_scope } = accountability;
     const cacheKey = `permissions-${(0, object_hash_1.default)({ user, role, app, admin, share_scope })}`;
     if (env_1.default.CACHE_PERMISSIONS !== false) {
-        const cachedPermissions = await systemCache.get(cacheKey);
+        const cachedPermissions = await (0, cache_1.getSystemCache)(cacheKey);
         if (cachedPermissions) {
             if (!cachedPermissions.containDynamicData) {
                 return processPermissions(accountability, cachedPermissions.permissions, {});

package/dist/utils/get-schema.js

@@ -20,12 +20,11 @@ const get_local_type_1 = __importDefault(require("./get-local-type"));
 async function getSchema(options) {
     const database = (options === null || options === void 0 ? void 0 : options.database) || (0, database_1.default)();
     const schemaInspector = (0, schema_1.default)(database);
-    const { systemCache } = (0, cache_1.getCache)();
     let result;
     if (env_1.default.CACHE_SCHEMA !== false) {
         let cachedSchema;
         try {
-            cachedSchema = (await systemCache.get('schema'));
+            cachedSchema = (await (0, cache_1.getSystemCache)('schema'));
         }
         catch (err) {
             logger_1.default.warn(err, `[schema-cache] Couldn't retrieve cache. ${err}`);