directus 9.12.2 → 9.14.1

package/dist/exceptions/database/translate.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/exceptions/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/extensions.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/flows.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -25,6 +29,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFlowManager = void 0;
 const sharedExceptions = __importStar(require("@directus/shared/exceptions"));
 const types_1 = require("@directus/shared/types");
+const utils_1 = require("@directus/shared/utils");
+const fast_redact_1 = __importDefault(require("fast-redact"));
+const lodash_1 = require("lodash");
 const micromustache_1 = require("micromustache");
 const node_cron_1 = require("node-cron");
 const database_1 = __importDefault(require("./database"));
@@ -32,16 +39,13 @@ const emitter_1 = __importDefault(require("./emitter"));
 const env_1 = __importDefault(require("./env"));
 const exceptions = __importStar(require("./exceptions"));
 const logger_1 = __importDefault(require("./logger"));
+const messenger_1 = require("./messenger");
 const services = __importStar(require("./services"));
 const services_1 = require("./services");
-const construct_flow_tree_1 = require("./utils/construct-flow-tree");
-const get_schema_1 = require("./utils/get-schema");
 const activity_1 = require("./services/activity");
 const revisions_1 = require("./services/revisions");
-const lodash_1 = require("lodash");
-const messenger_1 = require("./messenger");
-const fast_redact_1 = __importDefault(require("fast-redact"));
-const operation_options_1 = require("./utils/operation-options");
+const construct_flow_tree_1 = require("./utils/construct-flow-tree");
+const get_schema_1 = require("./utils/get-schema");
 const job_queue_1 = require("./utils/job-queue");
 let flowManager;
 const redactLogs = (0, fast_redact_1.default)({
@@ -152,7 +156,7 @@ class FlowManager {
                 else if (flow.options.type === 'action') {
                     const handler = (meta, context) => this.executeFlow(flow, meta, {
                         accountability: context.accountability,
-                        database: context.database,
+                        database: (0, database_1.default)(),
                         getSchema: context.schema ? () => context.schema : get_schema_1.getSchema,
                     });
                     events.forEach((event) => emitter_1.default.onAction(event, handler));
@@ -198,9 +202,9 @@ class FlowManager {
             }
             else if (flow.trigger === 'manual') {
                 const handler = (data, context) => {
-                    var _a, _b, _c;
+                    var _a, _b;
                     const enabledCollections = (_b = (_a = flow.options) === null || _a === void 0 ? void 0 : _a.collections) !== null && _b !== void 0 ? _b : [];
-                    const targetCollection = (_c = data) === null || _c === void 0 ? void 0 : _c.body.collection;
+                    const targetCollection = data === null || data === void 0 ? void 0 : data.body.collection;
                     if (!targetCollection) {
                         logger_1.default.warn(`Manual trigger requires "collection" to be specified in the payload`);
                         throw new exceptions.ForbiddenException();
@@ -310,7 +314,7 @@ class FlowManager {
             return { successor: null, status: 'unknown', data: null, options: null };
         }
         const handler = this.operations[operation.type];
-        const options = (0, operation_options_1.applyOperationOptions)(operation.options, keyedData);
+        const options = (0, utils_1.applyOptionsData)(operation.options, keyedData);
         try {
             const result = await handler(options, {
                 services,

package/dist/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/logger.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/messenger.js

@@ -4,10 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getMessenger = exports.MessengerRedis = exports.MessengerMemory = void 0;
+const utils_1 = require("@directus/shared/utils");
 const ioredis_1 = __importDefault(require("ioredis"));
 const env_1 = __importDefault(require("./env"));
 const get_config_from_env_1 = require("./utils/get-config-from-env");
-const parse_json_1 = require("./utils/parse-json");
 class MessengerMemory {
     constructor() {
         this.handlers = {};
@@ -38,7 +38,7 @@ class MessengerRedis {
     subscribe(channel, callback) {
         this.sub.subscribe(`${this.namespace}:${channel}`);
         this.sub.on('message', (messageChannel, payloadString) => {
-            const payload = (0, parse_json_1.parseJSON)(payloadString);
+            const payload = (0, utils_1.parseJSON)(payloadString);
             if (messageChannel === `${this.namespace}:${channel}`) {
                 callback(payload);
             }

package/dist/middleware/graphql.js

@@ -4,10 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseGraphQL = void 0;
+const utils_1 = require("@directus/shared/utils");
 const graphql_1 = require("graphql");
 const exceptions_1 = require("../exceptions");
 const async_handler_1 = __importDefault(require("../utils/async-handler"));
-const parse_json_1 = require("../utils/parse-json");
 exports.parseGraphQL = (0, async_handler_1.default)(async (req, res, next) => {
     if (req.method !== 'GET' && req.method !== 'POST') {
         throw new exceptions_1.MethodNotAllowedException('GraphQL only supports GET and POST requests.', { allow: ['GET', 'POST'] });
@@ -20,7 +20,7 @@ exports.parseGraphQL = (0, async_handler_1.default)(async (req, res, next) => {
         query = req.query.query || null;
         if (req.query.variables) {
             try {
-                variables = (0, parse_json_1.parseJSON)(req.query.variables);
+                variables = (0, utils_1.parseJSON)(req.query.variables);
             }
             catch {
                 throw new exceptions_1.InvalidQueryException(`Variables are invalid JSON.`);

package/dist/middleware/respond.js

@@ -13,14 +13,23 @@ const get_cache_headers_1 = require("../utils/get-cache-headers");
 const logger_1 = __importDefault(require("../logger"));
 const services_1 = require("../services");
 const get_date_formatted_1 = require("../utils/get-date-formatted");
+const get_string_byte_size_1 = require("../utils/get-string-byte-size");
+const bytes_1 = require("bytes");
 exports.respond = (0, async_handler_1.default)(async (req, res) => {
     var _a, _b, _c;
     const { cache } = (0, cache_1.getCache)();
+    let exceedsMaxSize = false;
+    if (env_1.default.CACHE_VALUE_MAX_SIZE !== false) {
+        const valueSize = res.locals.payload ? (0, get_string_byte_size_1.stringByteSize)(JSON.stringify(res.locals.payload)) : 0;
+        const maxSize = (0, bytes_1.parse)(env_1.default.CACHE_VALUE_MAX_SIZE);
+        exceedsMaxSize = valueSize > maxSize;
+    }
     if (req.method.toLowerCase() === 'get' &&
         env_1.default.CACHE_ENABLED === true &&
         cache &&
         !req.sanitizedQuery.export &&
-        res.locals.cache !== false) {
+        res.locals.cache !== false &&
+        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));

package/dist/middleware/validate-batch.js

@@ -27,8 +27,10 @@ const validateBatch = (scope) => (0, async_handler_1.default)(async (req, res, n
     if (scope !== 'read') {
         batchSchema = batchSchema.xor('query', 'keys');
     }
-    // In updates, we add a required `data` that holds the update payload
+    // In updates, we add a required `data` that holds the update payload if an array isn't used
     if (scope === 'update') {
+        if (Array.isArray(req.body))
+            return next();
         batchSchema = batchSchema.keys({
             data: joi_1.default.object().unknown().required(),
         });

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

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("@directus/shared/utils");
 const services_1 = require("../../services");
-const operation_options_1 = require("../../utils/operation-options");
 const get_accountability_for_role_1 = require("../../utils/get-accountability-for-role");
 exports.default = (0, utils_1.defineOperationApi)({
     id: 'item-create',
@@ -27,7 +26,7 @@ exports.default = (0, utils_1.defineOperationApi)({
             accountability: customAccountability,
             knex: database,
         });
-        const payloadObject = (_a = (0, operation_options_1.optionToObject)(payload)) !== null && _a !== void 0 ? _a : null;
+        const payloadObject = (_a = (0, utils_1.optionToObject)(payload)) !== null && _a !== void 0 ? _a : null;
         let result;
         if (!payloadObject) {
             result = null;

package/dist/operations/item-delete/index.d.ts

@@ -3,6 +3,7 @@ declare type Options = {
     collection: string;
     key?: PrimaryKey | PrimaryKey[] | null;
     query?: Record<string, any> | string | null;
+    emitEvents: boolean;
     permissions: string;
 };
 declare const _default: import("@directus/shared/types").OperationApiConfig<Options>;

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

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("@directus/shared/utils");
 const services_1 = require("../../services");
-const operation_options_1 = require("../../utils/operation-options");
 const get_accountability_for_role_1 = require("../../utils/get-accountability-for-role");
+const sanitize_query_1 = require("../../utils/sanitize-query");
 exports.default = (0, utils_1.defineOperationApi)({
     id: 'item-delete',
-    handler: async ({ collection, key, query, permissions }, { accountability, database, getSchema }) => {
+    handler: async ({ collection, key, query, emitEvents, permissions }, { accountability, database, getSchema }) => {
         const schema = await getSchema({ database });
         let customAccountability;
         if (!permissions || permissions === '$trigger') {
@@ -26,18 +26,19 @@ exports.default = (0, utils_1.defineOperationApi)({
             accountability: customAccountability,
             knex: database,
         });
-        const queryObject = query ? (0, operation_options_1.optionToObject)(query) : {};
+        const queryObject = query ? (0, utils_1.optionToObject)(query) : {};
+        const sanitizedQueryObject = (0, sanitize_query_1.sanitizeQuery)(queryObject, customAccountability);
         let result;
-        if (!key) {
-            result = await itemsService.deleteByQuery(queryObject);
+        if (!key || (Array.isArray(key) && key.length === 0)) {
+            result = await itemsService.deleteByQuery(sanitizedQueryObject);
         }
         else {
             const keys = (0, utils_1.toArray)(key);
             if (keys.length === 1) {
-                result = await itemsService.deleteOne(keys[0]);
+                result = await itemsService.deleteOne(keys[0], { emitEvents });
             }
             else {
-                result = await itemsService.deleteMany(keys);
+                result = await itemsService.deleteMany(keys, { emitEvents });
             }
         }
         return result;

package/dist/operations/item-read/index.d.ts

@@ -3,6 +3,7 @@ declare type Options = {
     collection: string;
     key?: PrimaryKey | PrimaryKey[] | null;
     query?: Record<string, any> | string | null;
+    emitEvents: boolean;
     permissions: string;
 };
 declare const _default: import("@directus/shared/types").OperationApiConfig<Options>;

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

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("@directus/shared/utils");
 const services_1 = require("../../services");
-const operation_options_1 = require("../../utils/operation-options");
 const get_accountability_for_role_1 = require("../../utils/get-accountability-for-role");
+const sanitize_query_1 = require("../../utils/sanitize-query");
 exports.default = (0, utils_1.defineOperationApi)({
     id: 'item-read',
-    handler: async ({ collection, key, query, permissions }, { accountability, database, getSchema }) => {
+    handler: async ({ collection, key, query, emitEvents, permissions }, { accountability, database, getSchema }) => {
         const schema = await getSchema({ database });
         let customAccountability;
         if (!permissions || permissions === '$trigger') {
@@ -26,18 +26,19 @@ exports.default = (0, utils_1.defineOperationApi)({
             accountability: customAccountability,
             knex: database,
         });
-        const queryObject = query ? (0, operation_options_1.optionToObject)(query) : {};
+        const queryObject = query ? (0, utils_1.optionToObject)(query) : {};
+        const sanitizedQueryObject = (0, sanitize_query_1.sanitizeQuery)(queryObject, customAccountability);
         let result;
-        if (!key) {
-            result = await itemsService.readByQuery(queryObject);
+        if (!key || (Array.isArray(key) && key.length === 0)) {
+            result = await itemsService.readByQuery(sanitizedQueryObject);
         }
         else {
             const keys = (0, utils_1.toArray)(key);
             if (keys.length === 1) {
-                result = await itemsService.readOne(keys[0], queryObject);
+                result = await itemsService.readOne(keys[0], sanitizedQueryObject, { emitEvents });
             }
             else {
-                result = await itemsService.readMany(keys, queryObject);
+                result = await itemsService.readMany(keys, sanitizedQueryObject, { emitEvents });
             }
         }
         return result;

package/dist/operations/item-update/index.d.ts

@@ -4,6 +4,7 @@ declare type Options = {
     key?: PrimaryKey | PrimaryKey[] | null;
     payload?: Record<string, any> | string | null;
     query?: Record<string, any> | string | null;
+    emitEvents: boolean;
     permissions: string;
 };
 declare const _default: import("@directus/shared/types").OperationApiConfig<Options>;

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

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("@directus/shared/utils");
 const services_1 = require("../../services");
-const operation_options_1 = require("../../utils/operation-options");
 const get_accountability_for_role_1 = require("../../utils/get-accountability-for-role");
+const sanitize_query_1 = require("../../utils/sanitize-query");
 exports.default = (0, utils_1.defineOperationApi)({
     id: 'item-update',
-    handler: async ({ collection, key, payload, query, permissions }, { accountability, database, getSchema }) => {
+    handler: async ({ collection, key, payload, query, emitEvents, permissions }, { accountability, database, getSchema }) => {
         var _a;
         const schema = await getSchema({ database });
         let customAccountability;
@@ -27,22 +27,23 @@ exports.default = (0, utils_1.defineOperationApi)({
             accountability: customAccountability,
             knex: database,
         });
-        const payloadObject = (_a = (0, operation_options_1.optionToObject)(payload)) !== null && _a !== void 0 ? _a : null;
-        const queryObject = query ? (0, operation_options_1.optionToObject)(query) : {};
+        const payloadObject = (_a = (0, utils_1.optionToObject)(payload)) !== null && _a !== void 0 ? _a : null;
+        const queryObject = query ? (0, utils_1.optionToObject)(query) : {};
+        const sanitizedQueryObject = (0, sanitize_query_1.sanitizeQuery)(queryObject, customAccountability);
         if (!payloadObject) {
             return null;
         }
         let result;
-        if (!key) {
-            result = await itemsService.updateByQuery(queryObject, payloadObject);
+        if (!key || (Array.isArray(key) && key.length === 0)) {
+            result = await itemsService.updateByQuery(sanitizedQueryObject, payloadObject, { emitEvents });
         }
         else {
             const keys = (0, utils_1.toArray)(key);
             if (keys.length === 1) {
-                result = await itemsService.updateOne(keys[0], payloadObject);
+                result = await itemsService.updateOne(keys[0], payloadObject, { emitEvents });
             }
             else {
-                result = await itemsService.updateMany(keys, payloadObject);
+                result = await itemsService.updateMany(keys, payloadObject, { emitEvents });
             }
         }
         return result;

package/dist/operations/log/index.js

@@ -5,10 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("@directus/shared/utils");
 const logger_1 = __importDefault(require("../../logger"));
-const operation_options_1 = require("../../utils/operation-options");
 exports.default = (0, utils_1.defineOperationApi)({
     id: 'log',
     handler: ({ message }) => {
-        logger_1.default.info((0, operation_options_1.optionToString)(message));
+        logger_1.default.info((0, utils_1.optionToString)(message));
     },
 });

package/dist/operations/notification/index.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("@directus/shared/utils");
 const services_1 = require("../../services");
-const operation_options_1 = require("../../utils/operation-options");
 const get_accountability_for_role_1 = require("../../utils/get-accountability-for-role");
 exports.default = (0, utils_1.defineOperationApi)({
     id: 'notification',
@@ -27,7 +26,7 @@ exports.default = (0, utils_1.defineOperationApi)({
             accountability: customAccountability,
             knex: database,
         });
-        const messageString = message ? (0, operation_options_1.optionToString)(message) : null;
+        const messageString = message ? (0, utils_1.optionToString)(message) : null;
         const result = await notificationsService.createOne({
             recipient,
             sender: (_a = customAccountability === null || customAccountability === void 0 ? void 0 : customAccountability.user) !== null && _a !== void 0 ? _a : null,

package/dist/operations/transform/index.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("@directus/shared/utils");
-const parse_json_1 = require("../../utils/parse-json");
 exports.default = (0, utils_1.defineOperationApi)({
     id: 'transform',
     handler: ({ json }) => {
-        return (0, parse_json_1.parseJSON)(json);
+        return (0, utils_1.parseJSON)(json);
     },
 });

package/dist/operations/trigger/index.js

@@ -2,13 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("@directus/shared/utils");
 const flows_1 = require("../../flows");
-const operation_options_1 = require("../../utils/operation-options");
 exports.default = (0, utils_1.defineOperationApi)({
     id: 'trigger',
     handler: async ({ flow, payload }, context) => {
         var _a;
         const flowManager = (0, flows_1.getFlowManager)();
-        const payloadObject = (_a = (0, operation_options_1.optionToObject)(payload)) !== null && _a !== void 0 ? _a : null;
+        const payloadObject = (_a = (0, utils_1.optionToObject)(payload)) !== null && _a !== void 0 ? _a : null;
         let result;
         if (Array.isArray(payloadObject)) {
             result = await Promise.all(payloadObject.map((payload) => flowManager.runOperationFlow(flow, payload, context)));

package/dist/server.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/services/assets.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/services/collections.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/services/fields.d.ts

@@ -1,12 +1,12 @@
 import SchemaInspector from '@directus/schema';
+import { Accountability, Field, RawField, SchemaOverview, Type } from '@directus/shared/types';
+import Keyv from 'keyv';
 import { Knex } from 'knex';
 import { Column } from 'knex-schema-inspector/dist/types/column';
+import { Helpers } from '../database/helpers';
 import { ItemsService } from '../services/items';
 import { PayloadService } from '../services/payload';
 import { AbstractServiceOptions } from '../types';
-import { Field, RawField, Type, Accountability, SchemaOverview } from '@directus/shared/types';
-import { Helpers } from '../database/helpers';
-import Keyv from 'keyv';
 export declare class FieldsService {
     knex: Knex;
     helpers: Helpers;

package/dist/services/fields.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -24,9 +28,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FieldsService = void 0;
 const schema_1 = __importDefault(require("@directus/schema"));
+const constants_1 = require("@directus/shared/constants");
+const utils_1 = require("@directus/shared/utils");
+const lodash_1 = require("lodash");
 const cache_1 = require("../cache");
-const constants_1 = require("../constants");
+const constants_2 = require("../constants");
 const database_1 = __importStar(require("../database"));
+const helpers_1 = require("../database/helpers");
 const fields_1 = require("../database/system-data/fields/");
 const emitter_1 = __importDefault(require("../emitter"));
 const env_1 = __importDefault(require("../env"));
@@ -36,11 +44,8 @@ const items_1 = require("../services/items");
 const payload_1 = require("../services/payload");
 const get_default_value_1 = __importDefault(require("../utils/get-default-value"));
 const get_local_type_1 = __importDefault(require("../utils/get-local-type"));
-const utils_1 = require("@directus/shared/utils");
-const lodash_1 = require("lodash");
 const relations_1 = require("./relations");
-const helpers_1 = require("../database/helpers");
-const constants_2 = require("@directus/shared/constants");
+const constants_3 = require("@directus/shared/constants");
 class FieldsService {
     constructor(options) {
         this.knex = options.knex || (0, database_1.default)();
@@ -112,7 +117,7 @@ class FieldsService {
         }
         aliasFields = aliasFields.filter((field) => {
             const specials = (0, utils_1.toArray)(field.special);
-            for (const type of constants_1.ALIAS_TYPES) {
+            for (const type of constants_2.ALIAS_TYPES) {
                 if (specials.includes(type))
                     return true;
             }
@@ -190,7 +195,6 @@ class FieldsService {
                 fields_1.systemFieldRows.find((fieldMeta) => fieldMeta.collection === collection && fieldMeta.field === field);
         try {
             column = await this.schemaInspector.columnInfo(collection, field);
-            column.default_value = (0, get_default_value_1.default)(column);
         }
         catch {
             // Do nothing
@@ -198,12 +202,18 @@ class FieldsService {
         if (!column && !fieldInfo)
             throw new exceptions_1.ForbiddenException();
         const type = (0, get_local_type_1.default)(column, fieldInfo);
+        const columnWithCastDefaultValue = column
+            ? {
+                ...column,
+                default_value: (0, get_default_value_1.default)(column),
+            }
+            : null;
         const data = {
             collection,
             field,
             type,
             meta: fieldInfo || null,
-            schema: type === 'alias' ? null : column,
+            schema: type === 'alias' ? null : columnWithCastDefaultValue,
         };
         return data;
     }
@@ -237,7 +247,7 @@ class FieldsService {
                     schema: this.schema,
                     accountability: this.accountability,
                 });
-                if (hookAdjustedField.type && constants_1.ALIAS_TYPES.includes(hookAdjustedField.type) === false) {
+                if (hookAdjustedField.type && constants_2.ALIAS_TYPES.includes(hookAdjustedField.type) === false) {
                     if (table) {
                         this.addColumnToTable(table, hookAdjustedField);
                     }
@@ -472,10 +482,12 @@ class FieldsService {
         else if (field.type.startsWith('geometry')) {
             column = this.helpers.st.createColumn(table, field);
         }
-        else {
-            // @ts-ignore
+        else if (constants_3.KNEX_TYPES.includes(field.type)) {
             column = table[field.type](field.field);
         }
+        else {
+            throw new exceptions_1.InvalidPayloadException(`Illegal type passed: "${field.type}"`);
+        }
         if (((_f = field.schema) === null || _f === void 0 ? void 0 : _f.default_value) !== undefined) {
             if (typeof field.schema.default_value === 'string' &&
                 (field.schema.default_value.toLowerCase() === 'now()' || field.schema.default_value === 'CURRENT_TIMESTAMP')) {
@@ -484,13 +496,9 @@ class FieldsService {
             else if (typeof field.schema.default_value === 'string' &&
                 field.schema.default_value.includes('CURRENT_TIMESTAMP(') &&
                 field.schema.default_value.includes(')')) {
-                const precision = field.schema.default_value.match(constants_2.REGEX_BETWEEN_PARENS)[1];
+                const precision = field.schema.default_value.match(constants_1.REGEX_BETWEEN_PARENS)[1];
                 column.defaultTo(this.knex.fn.now(Number(precision)));
             }
-            else if (typeof field.schema.default_value === 'string' &&
-                ['"null"', 'null'].includes(field.schema.default_value.toLowerCase())) {
-                column.defaultTo(null);
-            }
             else {
                 column.defaultTo(field.schema.default_value);
             }