directus 9.23.3 → 9.24.0

package/dist/controllers/shares.js

@@ -30,15 +30,15 @@ router.post('/auth', (0, async_handler_1.default)(async (req, res, next) => {
         throw new exceptions_1.InvalidPayloadException(error.message);
     }
     const { accessToken, refreshToken, expires } = await service.login(req.body);
-    res.cookie(env_1.default.REFRESH_TOKEN_COOKIE_NAME, refreshToken, constants_1.COOKIE_OPTIONS);
-    res.locals.payload = { data: { access_token: accessToken, expires } };
+    res.cookie(env_1.default['REFRESH_TOKEN_COOKIE_NAME'], refreshToken, constants_1.COOKIE_OPTIONS);
+    res.locals['payload'] = { data: { access_token: accessToken, expires } };
     return next();
 }), respond_1.respond);
 const sharedInviteSchema = joi_1.default.object({
     share: joi_1.default.string().required(),
     emails: joi_1.default.array().items(joi_1.default.string()),
 }).unknown();
-router.post('/invite', (0, async_handler_1.default)(async (req, res, next) => {
+router.post('/invite', (0, async_handler_1.default)(async (req, _res, next) => {
     const service = new services_1.SharesService({
         schema: req.schema,
         accountability: req.accountability,
@@ -67,11 +67,11 @@ router.post('/', (0, async_handler_1.default)(async (req, res, next) => {
     try {
         if (Array.isArray(req.body)) {
             const items = await service.readMany(savedKeys, req.sanitizedQuery);
-            res.locals.payload = { data: items };
+            res.locals['payload'] = { data: items };
         }
         else {
             const item = await service.readOne(savedKeys[0], req.sanitizedQuery);
-            res.locals.payload = { data: item };
+            res.locals['payload'] = { data: item };
         }
     }
     catch (error) {
@@ -88,7 +88,7 @@ const readHandler = (0, async_handler_1.default)(async (req, res, next) => {
         schema: req.schema,
     });
     const records = await service.readByQuery(req.sanitizedQuery);
-    res.locals.payload = { data: records || null };
+    res.locals['payload'] = { data: records || null };
     return next();
 });
 router.get('/', (0, validate_batch_1.validateBatch)('read'), readHandler, respond_1.respond);
@@ -97,7 +97,7 @@ router.get(`/info/:pk(${constants_1.UUID_REGEX})`, (0, async_handler_1.default)(
     const service = new services_1.SharesService({
         schema: req.schema,
     });
-    const record = await service.readOne(req.params.pk, {
+    const record = await service.readOne(req.params['pk'], {
         fields: ['id', 'collection', 'item', 'password', 'max_uses', 'times_used', 'date_start', 'date_end'],
         filter: {
             _and: [
@@ -132,7 +132,7 @@ router.get(`/info/:pk(${constants_1.UUID_REGEX})`, (0, async_handler_1.default)(
             ],
         },
     });
-    res.locals.payload = { data: record || null };
+    res.locals['payload'] = { data: record || null };
     return next();
 }), respond_1.respond);
 router.get(`/:pk(${constants_1.UUID_REGEX})`, (0, async_handler_1.default)(async (req, res, next) => {
@@ -140,8 +140,8 @@ router.get(`/:pk(${constants_1.UUID_REGEX})`, (0, async_handler_1.default)(async
         accountability: req.accountability,
         schema: req.schema,
     });
-    const record = await service.readOne(req.params.pk, req.sanitizedQuery);
-    res.locals.payload = { data: record || null };
+    const record = await service.readOne(req.params['pk'], req.sanitizedQuery);
+    res.locals['payload'] = { data: record || null };
     return next();
 }), respond_1.respond);
 router.patch('/', (0, validate_batch_1.validateBatch)('update'), (0, async_handler_1.default)(async (req, res, next) => {
@@ -162,7 +162,7 @@ router.patch('/', (0, validate_batch_1.validateBatch)('update'), (0, async_handl
     }
     try {
         const result = await service.readMany(keys, req.sanitizedQuery);
-        res.locals.payload = { data: result };
+        res.locals['payload'] = { data: result };
     }
     catch (error) {
         if (error instanceof exceptions_1.ForbiddenException) {
@@ -177,10 +177,10 @@ router.patch(`/:pk(${constants_1.UUID_REGEX})`, (0, async_handler_1.default)(asy
         accountability: req.accountability,
         schema: req.schema,
     });
-    const primaryKey = await service.updateOne(req.params.pk, req.body);
+    const primaryKey = await service.updateOne(req.params['pk'], req.body);
     try {
         const item = await service.readOne(primaryKey, req.sanitizedQuery);
-        res.locals.payload = { data: item || null };
+        res.locals['payload'] = { data: item || null };
     }
     catch (error) {
         if (error instanceof exceptions_1.ForbiddenException) {
@@ -212,7 +212,7 @@ router.delete(`/:pk(${constants_1.UUID_REGEX})`, (0, async_handler_1.default)(as
         accountability: req.accountability,
         schema: req.schema,
     });
-    await service.deleteOne(req.params.pk);
+    await service.deleteOne(req.params['pk']);
     return next();
 }), respond_1.respond);
 exports.default = router;

package/dist/controllers/users.js

@@ -31,11 +31,11 @@ router.post('/', (0, async_handler_1.default)(async (req, res, next) => {
     try {
         if (Array.isArray(req.body)) {
             const items = await service.readMany(savedKeys, req.sanitizedQuery);
-            res.locals.payload = { data: items };
+            res.locals['payload'] = { data: items };
         }
         else {
             const item = await service.readOne(savedKeys[0], req.sanitizedQuery);
-            res.locals.payload = { data: item };
+            res.locals['payload'] = { data: item };
         }
     }
     catch (error) {
@@ -57,7 +57,7 @@ const readHandler = (0, async_handler_1.default)(async (req, res, next) => {
     });
     const item = await service.readByQuery(req.sanitizedQuery);
     const meta = await metaService.getMetaForQuery('directus_users', req.sanitizedQuery);
-    res.locals.payload = { data: item || null, meta };
+    res.locals['payload'] = { data: item || null, meta };
     return next();
 });
 router.get('/', (0, validate_batch_1.validateBatch)('read'), readHandler, respond_1.respond);
@@ -72,7 +72,7 @@ router.get('/me', (0, async_handler_1.default)(async (req, res, next) => {
                 app_access: false,
             },
         };
-        res.locals.payload = { data: user };
+        res.locals['payload'] = { data: user };
         return next();
     }
     if (!req.accountability?.user) {
@@ -84,11 +84,11 @@ router.get('/me', (0, async_handler_1.default)(async (req, res, next) => {
     });
     try {
         const item = await service.readOne(req.accountability.user, req.sanitizedQuery);
-        res.locals.payload = { data: item || null };
+        res.locals['payload'] = { data: item || null };
     }
     catch (error) {
         if (error instanceof exceptions_1.ForbiddenException) {
-            res.locals.payload = { data: { id: req.accountability.user } };
+            res.locals['payload'] = { data: { id: req.accountability.user } };
             return next();
         }
         throw error;
@@ -102,8 +102,8 @@ router.get('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
         accountability: req.accountability,
         schema: req.schema,
     });
-    const items = await service.readOne(req.params.pk, req.sanitizedQuery);
-    res.locals.payload = { data: items || null };
+    const items = await service.readOne(req.params['pk'], req.sanitizedQuery);
+    res.locals['payload'] = { data: items || null };
     return next();
 }), respond_1.respond);
 router.patch('/me', (0, async_handler_1.default)(async (req, res, next) => {
@@ -116,7 +116,7 @@ router.patch('/me', (0, async_handler_1.default)(async (req, res, next) => {
     });
     const primaryKey = await service.updateOne(req.accountability.user, req.body);
     const item = await service.readOne(primaryKey, req.sanitizedQuery);
-    res.locals.payload = { data: item || null };
+    res.locals['payload'] = { data: item || null };
     return next();
 }), respond_1.respond);
 router.patch('/me/track/page', (0, async_handler_1.default)(async (req, _res, next) => {
@@ -148,7 +148,7 @@ router.patch('/', (0, validate_batch_1.validateBatch)('update'), (0, async_handl
     }
     try {
         const result = await service.readMany(keys, req.sanitizedQuery);
-        res.locals.payload = { data: result };
+        res.locals['payload'] = { data: result };
     }
     catch (error) {
         if (error instanceof exceptions_1.ForbiddenException) {
@@ -163,10 +163,10 @@ router.patch('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
         accountability: req.accountability,
         schema: req.schema,
     });
-    const primaryKey = await service.updateOne(req.params.pk, req.body);
+    const primaryKey = await service.updateOne(req.params['pk'], req.body);
     try {
         const item = await service.readOne(primaryKey, req.sanitizedQuery);
-        res.locals.payload = { data: item || null };
+        res.locals['payload'] = { data: item || null };
     }
     catch (error) {
         if (error instanceof exceptions_1.ForbiddenException) {
@@ -198,7 +198,7 @@ router.delete('/:pk', (0, async_handler_1.default)(async (req, _res, next) => {
         accountability: req.accountability,
         schema: req.schema,
     });
-    await service.deleteOne(req.params.pk);
+    await service.deleteOne(req.params['pk']);
     return next();
 }), respond_1.respond);
 const inviteSchema = joi_1.default.object({
@@ -249,7 +249,7 @@ router.post('/me/tfa/generate/', (0, async_handler_1.default)(async (req, res, n
     });
     await authService.verifyPassword(req.accountability.user, req.body.password);
     const { url, secret } = await service.generateTFA(req.accountability.user);
-    res.locals.payload = { data: { secret, otpauth_url: url } };
+    res.locals['payload'] = { data: { secret, otpauth_url: url } };
     return next();
 }), respond_1.respond);
 router.post('/me/tfa/enable/', (0, async_handler_1.default)(async (req, _res, next) => {
@@ -345,14 +345,14 @@ router.post('/:pk/tfa/disable', (0, async_handler_1.default)(async (req, _res, n
     if (!req.accountability?.user) {
         throw new exceptions_1.InvalidCredentialsException();
     }
-    if (!req.accountability.admin || !req.params.pk) {
+    if (!req.accountability.admin || !req.params['pk']) {
         throw new exceptions_1.ForbiddenException();
     }
     const service = new services_1.TFAService({
         accountability: req.accountability,
         schema: req.schema,
     });
-    await service.disableTFA(req.params.pk);
+    await service.disableTFA(req.params['pk']);
     return next();
 }), respond_1.respond);
 exports.default = router;

package/dist/controllers/utils.js

@@ -18,9 +18,9 @@ const sanitize_query_1 = require("../utils/sanitize-query");
 const router = (0, express_1.Router)();
 router.get('/random/string', (0, async_handler_1.default)(async (req, res) => {
     const { nanoid } = await import('nanoid');
-    if (req.query && req.query.length && Number(req.query.length) > 500)
+    if (req.query && req.query['length'] && Number(req.query['length']) > 500)
         throw new exceptions_1.InvalidQueryException(`"length" can't be more than 500 characters`);
-    const string = nanoid(req.query?.length ? Number(req.query.length) : 32);
+    const string = nanoid(req.query?.['length'] ? Number(req.query['length']) : 32);
     return res.json({ data: string });
 }));
 router.post('/hash/generate', (0, async_handler_1.default)(async (req, res) => {
@@ -55,12 +55,12 @@ router.post('/sort/:collection', collection_exists_1.default, (0, async_handler_
     await service.sort(req.collection, req.body);
     return res.status(200).end();
 }));
-router.post('/revert/:revision', (0, async_handler_1.default)(async (req, res, next) => {
+router.post('/revert/:revision', (0, async_handler_1.default)(async (req, _res, next) => {
     const service = new services_1.RevisionsService({
         accountability: req.accountability,
         schema: req.schema,
     });
-    await service.revert(req.params.revision);
+    await service.revert(req.params['revision']);
     next();
 }), respond_1.respond);
 router.post('/import/:collection', collection_exists_1.default, (0, async_handler_1.default)(async (req, res, next) => {
@@ -83,7 +83,7 @@ router.post('/import/:collection', collection_exists_1.default, (0, async_handle
     const busboy = (0, busboy_1.default)({ headers });
     busboy.on('file', async (_fieldname, fileStream, { mimeType }) => {
         try {
-            await service.import(req.params.collection, mimeType, fileStream);
+            await service.import(req.params['collection'], mimeType, fileStream);
         }
         catch (err) {
             return next(err);
@@ -93,7 +93,7 @@ router.post('/import/:collection', collection_exists_1.default, (0, async_handle
     busboy.on('error', (err) => next(err));
     req.pipe(busboy);
 }));
-router.post('/export/:collection', collection_exists_1.default, (0, async_handler_1.default)(async (req, res, next) => {
+router.post('/export/:collection', collection_exists_1.default, (0, async_handler_1.default)(async (req, _res, next) => {
     if (!req.body.query) {
         throw new exceptions_1.InvalidPayloadException(`"query" is required.`);
     }
@@ -106,7 +106,7 @@ router.post('/export/:collection', collection_exists_1.default, (0, async_handle
     });
     const sanitizedQuery = (0, sanitize_query_1.sanitizeQuery)(req.body.query, req.accountability ?? null);
     // We're not awaiting this, as it's supposed to run async in the background
-    service.exportToFile(req.params.collection, sanitizedQuery, req.body.format, {
+    service.exportToFile(req.params['collection'], sanitizedQuery, req.body.format, {
         file: req.body.file,
     });
     return next();

package/dist/controllers/webhooks.js

@@ -30,11 +30,11 @@ router.post('/', (0, async_handler_1.default)(async (req, res, next) => {
     try {
         if (Array.isArray(req.body)) {
             const items = await service.readMany(savedKeys, req.sanitizedQuery);
-            res.locals.payload = { data: items };
+            res.locals['payload'] = { data: items };
         }
         else {
             const item = await service.readOne(savedKeys[0], req.sanitizedQuery);
-            res.locals.payload = { data: item };
+            res.locals['payload'] = { data: item };
         }
     }
     catch (error) {
@@ -56,7 +56,7 @@ const readHandler = (0, async_handler_1.default)(async (req, res, next) => {
     });
     const records = await service.readByQuery(req.sanitizedQuery);
     const meta = await metaService.getMetaForQuery(req.collection, req.sanitizedQuery);
-    res.locals.payload = { data: records || null, meta };
+    res.locals['payload'] = { data: records || null, meta };
     return next();
 });
 router.get('/', (0, validate_batch_1.validateBatch)('read'), readHandler, respond_1.respond);
@@ -66,8 +66,8 @@ router.get('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
         accountability: req.accountability,
         schema: req.schema,
     });
-    const record = await service.readOne(req.params.pk, req.sanitizedQuery);
-    res.locals.payload = { data: record || null };
+    const record = await service.readOne(req.params['pk'], req.sanitizedQuery);
+    res.locals['payload'] = { data: record || null };
     return next();
 }), respond_1.respond);
 router.patch('/', (0, validate_batch_1.validateBatch)('update'), (0, async_handler_1.default)(async (req, res, next) => {
@@ -85,7 +85,7 @@ router.patch('/', (0, validate_batch_1.validateBatch)('update'), (0, async_handl
     }
     try {
         const result = await service.readMany(keys, req.sanitizedQuery);
-        res.locals.payload = { data: result };
+        res.locals['payload'] = { data: result };
     }
     catch (error) {
         if (error instanceof exceptions_1.ForbiddenException) {
@@ -100,10 +100,10 @@ router.patch('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
         accountability: req.accountability,
         schema: req.schema,
     });
-    const primaryKey = await service.updateOne(req.params.pk, req.body);
+    const primaryKey = await service.updateOne(req.params['pk'], req.body);
     try {
         const item = await service.readOne(primaryKey, req.sanitizedQuery);
-        res.locals.payload = { data: item || null };
+        res.locals['payload'] = { data: item || null };
     }
     catch (error) {
         if (error instanceof exceptions_1.ForbiddenException) {
@@ -113,7 +113,7 @@ router.patch('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
     }
     return next();
 }), respond_1.respond);
-router.delete('/', (0, async_handler_1.default)(async (req, res, next) => {
+router.delete('/', (0, async_handler_1.default)(async (req, _res, next) => {
     const service = new services_1.WebhooksService({
         accountability: req.accountability,
         schema: req.schema,
@@ -130,12 +130,12 @@ router.delete('/', (0, async_handler_1.default)(async (req, res, next) => {
     }
     return next();
 }), respond_1.respond);
-router.delete('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
+router.delete('/:pk', (0, async_handler_1.default)(async (req, _res, next) => {
     const service = new services_1.WebhooksService({
         accountability: req.accountability,
         schema: req.schema,
     });
-    await service.deleteOne(req.params.pk);
+    await service.deleteOne(req.params['pk']);
     return next();
 }), respond_1.respond);
 exports.default = router;

package/dist/database/helpers/fn/types.d.ts

@@ -7,7 +7,6 @@ export type FnHelperOptions = {
     originalCollectionName: string | undefined;
 };
 export declare abstract class FnHelper extends DatabaseHelper {
-    protected knex: Knex;
     protected schema: SchemaOverview;
     constructor(knex: Knex, schema: SchemaOverview);
     abstract year(table: string, column: string, options?: FnHelperOptions): Knex.Raw;

package/dist/database/helpers/fn/types.js

@@ -4,11 +4,9 @@ exports.FnHelper = void 0;
 const apply_query_1 = require("../../../utils/apply-query");
 const types_1 = require("../types");
 class FnHelper extends types_1.DatabaseHelper {
-    knex;
     schema;
     constructor(knex, schema) {
         super(knex);
-        this.knex = knex;
         this.schema = schema;
         this.schema = schema;
     }

package/dist/database/helpers/index.d.ts

@@ -6,8 +6,8 @@ import * as geometryHelpers from './geometry';
 import * as schemaHelpers from './schema';
 export declare function getHelpers(database: Knex): {
     date: dateHelpers.postgres | dateHelpers.oracle | dateHelpers.mysql | dateHelpers.mssql | dateHelpers.sqlite;
-    st: geometryHelpers.sqlite | geometryHelpers.postgres | geometryHelpers.mysql | geometryHelpers.mssql | geometryHelpers.oracle | geometryHelpers.redshift;
-    schema: schemaHelpers.sqlite | schemaHelpers.postgres | schemaHelpers.mysql | schemaHelpers.cockroachdb | schemaHelpers.mssql | schemaHelpers.oracle;
+    st: geometryHelpers.mysql | geometryHelpers.postgres | geometryHelpers.mssql | geometryHelpers.sqlite | geometryHelpers.oracle | geometryHelpers.redshift;
+    schema: schemaHelpers.mysql | schemaHelpers.cockroachdb | schemaHelpers.mssql | schemaHelpers.postgres | schemaHelpers.sqlite | schemaHelpers.oracle;
 };
-export declare function getFunctions(database: Knex, schema: SchemaOverview): fnHelpers.sqlite | fnHelpers.postgres | fnHelpers.mysql | fnHelpers.mssql | fnHelpers.oracle;
+export declare function getFunctions(database: Knex, schema: SchemaOverview): fnHelpers.mysql | fnHelpers.postgres | fnHelpers.mssql | fnHelpers.sqlite | fnHelpers.oracle;
 export type Helpers = ReturnType<typeof getHelpers>;

package/dist/database/index.js

@@ -30,7 +30,7 @@ function getDatabase() {
             requiredEnvVars.push('DB_FILENAME');
             break;
         case 'oracledb':
-            if (!env_1.default.DB_CONNECT_STRING) {
+            if (!env_1.default['DB_CONNECT_STRING']) {
                 requiredEnvVars.push('DB_HOST', 'DB_PORT', 'DB_DATABASE', 'DB_USER', 'DB_PASSWORD');
             }
             else {
@@ -47,7 +47,7 @@ function getDatabase() {
             }
             break;
         case 'mssql':
-            if (!env_1.default.DB_TYPE || env_1.default.DB_TYPE === 'default') {
+            if (!env_1.default['DB_TYPE'] || env_1.default['DB_TYPE'] === 'default') {
                 requiredEnvVars.push('DB_HOST', 'DB_PORT', 'DB_DATABASE', 'DB_USER', 'DB_PASSWORD');
             }
             break;
@@ -211,7 +211,7 @@ async function validateMigrations() {
     const database = getDatabase();
     try {
         let migrationFiles = await fs_extra_1.default.readdir(path_1.default.join(__dirname, 'migrations'));
-        const customMigrationsPath = path_1.default.resolve(env_1.default.EXTENSIONS_PATH, 'migrations');
+        const customMigrationsPath = path_1.default.resolve(env_1.default['EXTENSIONS_PATH'], 'migrations');
         let customMigrationFiles = ((await fs_extra_1.default.pathExists(customMigrationsPath)) && (await fs_extra_1.default.readdir(customMigrationsPath))) || [];
         migrationFiles = migrationFiles.filter((file) => file.startsWith('run') === false && file.endsWith('.d.ts') === false);
         customMigrationFiles = customMigrationFiles.filter((file) => file.endsWith('.js'));
@@ -255,10 +255,10 @@ async function validateDatabaseCharset(database) {
         const { collation } = await database.select(database.raw(`@@collation_database as collation`)).first();
         const tables = await database('information_schema.tables')
             .select({ name: 'TABLE_NAME', collation: 'TABLE_COLLATION' })
-            .where({ TABLE_SCHEMA: env_1.default.DB_DATABASE });
+            .where({ TABLE_SCHEMA: env_1.default['DB_DATABASE'] });
         const columns = await database('information_schema.columns')
             .select({ table_name: 'TABLE_NAME', name: 'COLUMN_NAME', collation: 'COLLATION_NAME' })
-            .where({ TABLE_SCHEMA: env_1.default.DB_DATABASE })
+            .where({ TABLE_SCHEMA: env_1.default['DB_DATABASE'] })
             .whereNot({ COLLATION_NAME: collation });
         let inconsistencies = '';
         for (const table of tables) {

package/dist/database/migrations/20210805B-change-image-metadata-structure.js

@@ -60,25 +60,25 @@ async function down(knex) {
         if (Object.keys(prevMetadata).filter((key) => key !== 'icc' && key !== 'iptc').length > 0) {
             // Put all data under 'exif' and rename/move keys afterwards
             const newMetadata = { exif: prevMetadata };
-            if (newMetadata.exif.ifd0) {
-                newMetadata.exif.image = newMetadata.exif.ifd0;
-                delete newMetadata.exif.ifd0;
+            if (newMetadata.exif['ifd0']) {
+                newMetadata.exif['image'] = newMetadata.exif['ifd0'];
+                delete newMetadata.exif['ifd0'];
             }
-            if (newMetadata.exif.ifd1) {
-                newMetadata.exif.thumbnail = newMetadata.exif.ifd1;
-                delete newMetadata.exif.ifd1;
+            if (newMetadata.exif['ifd1']) {
+                newMetadata.exif['thumbnail'] = newMetadata.exif['ifd1'];
+                delete newMetadata.exif['ifd1'];
             }
-            if (newMetadata.exif.interop) {
-                newMetadata.exif.interoperability = newMetadata.exif.interop;
-                delete newMetadata.exif.interop;
+            if (newMetadata.exif['interop']) {
+                newMetadata.exif['interoperability'] = newMetadata.exif['interop'];
+                delete newMetadata.exif['interop'];
             }
-            if (newMetadata.exif.icc) {
-                newMetadata.icc = newMetadata.exif.icc;
-                delete newMetadata.exif.icc;
+            if (newMetadata.exif['icc']) {
+                newMetadata.icc = newMetadata.exif['icc'];
+                delete newMetadata.exif['icc'];
             }
-            if (newMetadata.exif.iptc) {
-                newMetadata.iptc = newMetadata.exif.iptc;
-                delete newMetadata.exif.iptc;
+            if (newMetadata.exif['iptc']) {
+                newMetadata.iptc = newMetadata.exif['iptc'];
+                delete newMetadata.exif['iptc'];
             }
             await knex('directus_files')
                 .update({ metadata: JSON.stringify(newMetadata) })

package/dist/database/migrations/run.js

@@ -13,7 +13,7 @@ const dynamic_import_1 = require("../../utils/dynamic-import");
 const format_title_1 = __importDefault(require("@directus/format-title"));
 async function run(database, direction, log = true) {
     let migrationFiles = await fs_extra_1.default.readdir(__dirname);
-    const customMigrationsPath = path_1.default.resolve(env_1.default.EXTENSIONS_PATH, 'migrations');
+    const customMigrationsPath = path_1.default.resolve(env_1.default['EXTENSIONS_PATH'], 'migrations');
     let customMigrationFiles = ((await fs_extra_1.default.pathExists(customMigrationsPath)) && (await fs_extra_1.default.readdir(customMigrationsPath))) || [];
     migrationFiles = migrationFiles.filter((file) => /^[0-9]+[A-Z]-[^.]+\.(?:js|ts)$/.test(file));
     customMigrationFiles = customMigrationFiles.filter((file) => file.endsWith('.js'));

package/dist/database/run-ast.js

@@ -64,7 +64,7 @@ async function runAST(originalAST, schema, options) {
         // Run the items through the special transforms
         const payloadService = new payload_1.PayloadService(collection, { knex, schema });
         let items = await payloadService.processValues('read', rawItems);
-        if (!items || items.length === 0)
+        if (!items || (Array.isArray(items) && items.length === 0))
             return items;
         // Apply the `_in` filters to the nested collection batches
         const nestedNodes = applyParentFilters(schema, nestedCollectionNodes, items);
@@ -76,8 +76,8 @@ async function runAST(originalAST, schema, options) {
                 while (hasMore) {
                     const node = (0, lodash_1.merge)({}, nestedNode, {
                         query: {
-                            limit: env_1.default.RELATIONAL_BATCH_SIZE,
-                            offset: batchCount * env_1.default.RELATIONAL_BATCH_SIZE,
+                            limit: env_1.default['RELATIONAL_BATCH_SIZE'],
+                            offset: batchCount * env_1.default['RELATIONAL_BATCH_SIZE'],
                             page: null,
                         },
                     });
@@ -85,7 +85,7 @@ async function runAST(originalAST, schema, options) {
                     if (nestedItems) {
                         items = mergeWithParentItems(schema, nestedItems, items, nestedNode);
                     }
-                    if (!nestedItems || nestedItems.length < env_1.default.RELATIONAL_BATCH_SIZE) {
+                    if (!nestedItems || nestedItems.length < env_1.default['RELATIONAL_BATCH_SIZE']) {
                         hasMore = false;
                     }
                     batchCount++;
@@ -280,7 +280,7 @@ function applyParentFilters(schema, nestedCollectionNodes, parentItem) {
             continue;
         if (nestedNode.type === 'm2o') {
             const foreignField = schema.collections[nestedNode.relation.related_collection].primary;
-            const foreignIds = (0, lodash_1.uniq)(parentItems.map((res) => res[nestedNode.relation.field])).filter((id) => id);
+            const foreignIds = (0, lodash_1.uniq)(parentItems.map((res) => res[nestedNode.relation.field])).filter((id) => !(0, lodash_1.isNil)(id));
             (0, lodash_1.merge)(nestedNode, { query: { filter: { [foreignField]: { _in: foreignIds } } } });
         }
         else if (nestedNode.type === 'o2m') {
@@ -302,7 +302,7 @@ function applyParentFilters(schema, nestedCollectionNodes, parentItem) {
                 });
             }
             const foreignField = nestedNode.relation.field;
-            const foreignIds = (0, lodash_1.uniq)(parentItems.map((res) => res[nestedNode.parentKey])).filter((id) => id);
+            const foreignIds = (0, lodash_1.uniq)(parentItems.map((res) => res[nestedNode.parentKey])).filter((id) => !(0, lodash_1.isNil)(id));
             (0, lodash_1.merge)(nestedNode, { query: { filter: { [foreignField]: { _in: foreignIds } } } });
         }
         else if (nestedNode.type === 'a2o') {

package/dist/database/system-data/collections/index.js

@@ -4,6 +4,6 @@ exports.systemCollectionRows = void 0;
 const lodash_1 = require("lodash");
 const require_yaml_1 = require("../../../utils/require-yaml");
 const systemData = (0, require_yaml_1.requireYAML)(require.resolve('./collections.yaml'));
-exports.systemCollectionRows = systemData.data.map((row) => {
-    return (0, lodash_1.merge)({ system: true }, systemData.defaults, row);
+exports.systemCollectionRows = systemData['data'].map((row) => {
+    return (0, lodash_1.merge)({ system: true }, systemData['defaults'], row);
 });

package/dist/database/system-data/fields/index.js

@@ -18,15 +18,15 @@ for (const filepath of fieldData) {
     if (filepath.includes('_defaults') || filepath.includes('index'))
         continue;
     const systemFields = (0, require_yaml_1.requireYAML)(path_1.default.resolve(__dirname, filepath));
-    systemFields.fields.forEach((field, index) => {
+    systemFields['fields'].forEach((field, index) => {
         const systemField = (0, lodash_1.merge)({ system: true }, defaults, field, {
-            collection: systemFields.table,
+            collection: systemFields['table'],
             sort: index + 1,
         });
         // Dynamically populate auth providers field
         if (systemField.collection === 'directus_users' && systemField.field === 'provider') {
             (0, get_auth_providers_1.getAuthProviders)().forEach(({ name }) => {
-                systemField.options?.choices?.push({
+                systemField.options?.['choices']?.push({
                     text: (0, format_title_1.default)(name),
                     value: name,
                 });

package/dist/env.js

@@ -308,7 +308,7 @@ function refreshEnv() {
 }
 exports.refreshEnv = refreshEnv;
 function processConfiguration() {
-    const configPath = path_1.default.resolve(process.env.CONFIG_PATH || defaults.CONFIG_PATH);
+    const configPath = path_1.default.resolve(process.env['CONFIG_PATH'] || defaults['CONFIG_PATH']);
     if (fs_1.default.existsSync(configPath) === false)
         return {};
     const fileExt = path_1.default.extname(configPath).toLowerCase();

package/dist/exceptions/database/dialects/mssql.js

@@ -54,8 +54,8 @@ async function uniqueViolation(error) {
     const parenMatches = error.message.match(betweenParens);
     if (!quoteMatches || !parenMatches)
         return error;
-    const keyName = quoteMatches[1]?.slice(1, -1);
-    let collection = quoteMatches[0]?.slice(1, -1);
+    const keyName = quoteMatches[1].slice(1, -1);
+    let collection = quoteMatches[0].slice(1, -1);
     let field = null;
     if (keyName) {
         const database = (0, database_1.default)();

package/dist/exceptions/database/dialects/mysql.js

@@ -49,7 +49,7 @@ function uniqueViolation(error) {
      */
     /** MySQL 8+ style error message */
     if (matches[1].includes('.')) {
-        const collection = matches[1]?.slice(1, -1).split('.')[0];
+        const collection = matches[1].slice(1, -1).split('.')[0];
         let field = null;
         const indexName = matches[1]?.slice(1, -1).split('.')[1];
         if (indexName?.startsWith(`${collection}_`) && indexName.endsWith('_unique')) {
@@ -64,7 +64,7 @@ function uniqueViolation(error) {
     }
     else {
         /** MySQL 5.7 style error message */
-        const indexName = matches[1]?.slice(1, -1);
+        const indexName = matches[1].slice(1, -1);
         const collection = indexName.split('_')[0];
         let field = null;
         if (indexName?.startsWith(`${collection}_`) && indexName.endsWith('_unique')) {
@@ -127,9 +127,9 @@ function foreignKeyViolation(error) {
     const parenMatches = error.sql.match(betweenParens);
     if (!tickMatches || !parenMatches)
         return error;
-    const collection = tickMatches[1]?.slice(1, -1);
-    const field = tickMatches[3]?.slice(1, -1);
-    const invalid = parenMatches[1]?.slice(1, -1);
+    const collection = tickMatches[1].slice(1, -1);
+    const field = tickMatches[3].slice(1, -1);
+    const invalid = parenMatches[1].slice(1, -1);
     return new invalid_foreign_key_1.InvalidForeignKeyException(field, {
         collection,
         field,
@@ -143,6 +143,6 @@ function containsNullValues(error) {
     const tickMatches = error.sql.match(betweenTicks);
     if (!tickMatches)
         return error;
-    const field = tickMatches[1]?.slice(1, -1);
+    const field = tickMatches[1].slice(1, -1);
     return new contains_null_values_1.ContainsNullValuesException(field);
 }

package/dist/exceptions/database/record-not-unique.d.ts

@@ -2,7 +2,7 @@ import { BaseException } from '@directus/shared/exceptions';
 type Extensions = {
     collection: string;
     field: string | null;
-    invalid?: string;
+    invalid?: string | undefined;
 };
 export declare class RecordNotUniqueException extends BaseException {
     constructor(field: string | null, extensions?: Extensions);