directus 9.20.4 → 9.21.2

package/dist/auth/drivers/openid.js

@@ -99,6 +99,7 @@ class OpenIDAuthDriver extends local_1.LocalAuthDriver {
                 code_challenge_method: 'S256',
                 // Some providers require state even with PKCE
                 state: codeChallenge,
+                nonce: codeChallenge,
             });
         }
         catch (e) {
@@ -122,7 +123,8 @@ class OpenIDAuthDriver extends local_1.LocalAuthDriver {
         let userInfo;
         try {
             const client = await this.client;
-            tokenSet = await client.callback(this.redirectUrl, { code: payload.code, state: payload.state }, { code_verifier: payload.codeVerifier, state: openid_client_1.generators.codeChallenge(payload.codeVerifier) });
+            const codeChallenge = openid_client_1.generators.codeChallenge(payload.codeVerifier);
+            tokenSet = await client.callback(this.redirectUrl, { code: payload.code, state: payload.state }, { code_verifier: payload.codeVerifier, state: codeChallenge, nonce: codeChallenge });
             userInfo = tokenSet.claims();
             if (client.issuer.metadata.userinfo_endpoint) {
                 userInfo = {

package/dist/cli/commands/schema/apply.js

@@ -33,7 +33,6 @@ const fs_1 = require("fs");
 const inquirer_1 = __importDefault(require("inquirer"));
 const js_yaml_1 = require("js-yaml");
 const path_1 = __importDefault(require("path"));
-const cache_1 = require("../../../cache");
 const database_1 = __importStar(require("../../../database"));
 const logger_1 = __importDefault(require("../../../logger"));
 const apply_snapshot_1 = require("../../../utils/apply-snapshot");
@@ -44,7 +43,6 @@ async function apply(snapshotPath, options) {
     const filename = path_1.default.resolve(process.cwd(), snapshotPath);
     const database = (0, database_1.default)();
     await (0, database_1.validateDatabaseConnection)(database);
-    await (0, cache_1.flushCaches)();
     if ((await (0, database_1.isInstalled)()) === false) {
         logger_1.default.error(`Directus isn't installed on this database. Please run "directus bootstrap" first.`);
         database.destroy();

package/dist/cli/commands/schema/snapshot.js

@@ -11,9 +11,7 @@ const fs_1 = require("fs");
 const path_1 = __importDefault(require("path"));
 const inquirer_1 = __importDefault(require("inquirer"));
 const js_yaml_1 = require("js-yaml");
-const cache_1 = require("../../../cache");
 async function snapshot(snapshotPath, options) {
-    await (0, cache_1.flushCaches)();
     const database = (0, database_1.default)();
     try {
         const snapshot = await (0, get_snapshot_1.getSnapshot)({ database });

package/dist/cli/utils/create-db-connection.d.ts

@@ -1,5 +1,5 @@
 import { Knex } from 'knex';
-export declare type Credentials = {
+export type Credentials = {
     filename?: string;
     host?: string;
     port?: number;

package/dist/controllers/extensions.js

@@ -26,23 +26,14 @@ router.get('/:type', (0, async_handler_1.default)(async (req, res, next) => {
     };
     return next();
 }), respond_1.respond);
-router.get('/:type/index.js', (0, async_handler_1.default)(async (req, res) => {
-    const type = (0, utils_1.depluralize)(req.params.type);
-    if (!(0, utils_1.isIn)(type, constants_1.APP_OR_HYBRID_EXTENSION_TYPES)) {
-        throw new exceptions_1.RouteNotFoundException(req.path);
-    }
+router.get('/sources/index.js', (0, async_handler_1.default)(async (req, res) => {
     const extensionManager = (0, extensions_1.getExtensionManager)();
-    const extensionSource = extensionManager.getAppExtensions(type);
-    if (extensionSource === undefined) {
+    const extensionSource = extensionManager.getAppExtensions();
+    if (extensionSource === null) {
         throw new exceptions_1.RouteNotFoundException(req.path);
     }
     res.setHeader('Content-Type', 'application/javascript; charset=UTF-8');
-    if (env_1.default.EXTENSIONS_CACHE_TTL) {
-        res.setHeader('Cache-Control', (0, get_cache_headers_1.getCacheControlHeader)(req, (0, ms_1.default)(env_1.default.EXTENSIONS_CACHE_TTL)));
-    }
-    else {
-        res.setHeader('Cache-Control', 'no-store');
-    }
+    res.setHeader('Cache-Control', env_1.default.EXTENSIONS_CACHE_TTL ? (0, get_cache_headers_1.getCacheControlHeader)(req, (0, ms_1.default)(env_1.default.EXTENSIONS_CACHE_TTL)) : 'no-store');
     res.setHeader('Vary', 'Origin, Cache-Control');
     res.end(extensionSource);
 }));

package/dist/database/helpers/date/dialects/sqlite.d.ts

@@ -1,5 +1,5 @@
 import { DateHelper } from '../types';
 export declare class DateHelperSQLite extends DateHelper {
-    parse(date: string): string;
+    parse(date: string | Date): string;
     fieldFlagForField(fieldType: string): string;
 }

package/dist/database/helpers/date/dialects/sqlite.js

@@ -7,6 +7,10 @@ class DateHelperSQLite extends types_1.DateHelper {
         if (!date) {
             return date;
         }
+        // Date generated from NOW()
+        if (date instanceof Date) {
+            return String(date.getTime());
+        }
         // Return the time as string
         if (date.length <= 8 && date.includes(':')) {
             return date;

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

@@ -1,6 +1,6 @@
 import { DatabaseHelper } from '../types';
 export declare abstract class DateHelper extends DatabaseHelper {
-    parse(date: string): string;
+    parse(date: string | Date): string;
     readTimestampString(date: string): string;
     writeTimestamp(date: string): Date;
     fieldFlagForField(_fieldType: string): string;

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

@@ -5,6 +5,10 @@ const types_1 = require("../types");
 const date_fns_1 = require("date-fns");
 class DateHelper extends types_1.DatabaseHelper {
     parse(date) {
+        // Date generated from NOW()
+        if (date instanceof Date) {
+            return date.toISOString();
+        }
         return date;
     }
     readTimestampString(date) {

package/dist/database/helpers/fn/dialects/mssql.d.ts

@@ -1,13 +1,13 @@
 import { FnHelper, FnHelperOptions } from '../types';
 import { Knex } from 'knex';
 export declare class FnHelperMSSQL extends FnHelper {
-    year(table: string, column: string): Knex.Raw;
-    month(table: string, column: string): Knex.Raw;
-    week(table: string, column: string): Knex.Raw;
-    day(table: string, column: string): Knex.Raw;
-    weekday(table: string, column: string): Knex.Raw;
-    hour(table: string, column: string): Knex.Raw;
-    minute(table: string, column: string): Knex.Raw;
-    second(table: string, column: string): Knex.Raw;
+    year(table: string, column: string, options: FnHelperOptions): Knex.Raw;
+    month(table: string, column: string, options: FnHelperOptions): Knex.Raw;
+    week(table: string, column: string, options: FnHelperOptions): Knex.Raw;
+    day(table: string, column: string, options: FnHelperOptions): Knex.Raw;
+    weekday(table: string, column: string, options: FnHelperOptions): Knex.Raw;
+    hour(table: string, column: string, options: FnHelperOptions): Knex.Raw;
+    minute(table: string, column: string, options: FnHelperOptions): Knex.Raw;
+    second(table: string, column: string, options: FnHelperOptions): Knex.Raw;
     count(table: string, column: string, options?: FnHelperOptions): Knex.Raw<any>;
 }

package/dist/database/helpers/fn/dialects/mssql.js

@@ -2,30 +2,36 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FnHelperMSSQL = void 0;
 const types_1 = require("../types");
+const parseLocaltime = (columnType) => {
+    if (columnType === 'timestamp') {
+        return ` AT TIME ZONE 'UTC'`;
+    }
+    return '';
+};
 class FnHelperMSSQL extends types_1.FnHelper {
-    year(table, column) {
-        return this.knex.raw('DATEPART(year, ??.??)', [table, column]);
+    year(table, column, options) {
+        return this.knex.raw(`DATEPART(year, ??.??${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)})`, [table, column]);
     }
-    month(table, column) {
-        return this.knex.raw('DATEPART(month, ??.??)', [table, column]);
+    month(table, column, options) {
+        return this.knex.raw(`DATEPART(month, ??.??${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)})`, [table, column]);
     }
-    week(table, column) {
-        return this.knex.raw('DATEPART(week, ??.??)', [table, column]);
+    week(table, column, options) {
+        return this.knex.raw(`DATEPART(week, ??.??${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)})`, [table, column]);
     }
-    day(table, column) {
-        return this.knex.raw('DATEPART(day, ??.??)', [table, column]);
+    day(table, column, options) {
+        return this.knex.raw(`DATEPART(day, ??.??${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)})`, [table, column]);
     }
-    weekday(table, column) {
-        return this.knex.raw('DATEPART(weekday, ??.??)', [table, column]);
+    weekday(table, column, options) {
+        return this.knex.raw(`DATEPART(weekday, ??.??${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)})`, [table, column]);
     }
-    hour(table, column) {
-        return this.knex.raw('DATEPART(hour, ??.??)', [table, column]);
+    hour(table, column, options) {
+        return this.knex.raw(`DATEPART(hour, ??.??${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)})`, [table, column]);
     }
-    minute(table, column) {
-        return this.knex.raw('DATEPART(minute, ??.??)', [table, column]);
+    minute(table, column, options) {
+        return this.knex.raw(`DATEPART(minute, ??.??${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)})`, [table, column]);
     }
-    second(table, column) {
-        return this.knex.raw('DATEPART(second, ??.??)', [table, column]);
+    second(table, column, options) {
+        return this.knex.raw(`DATEPART(second, ??.??${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)})`, [table, column]);
     }
     count(table, column, options) {
         var _a, _b, _c, _d, _e;

package/dist/database/helpers/fn/dialects/mysql.d.ts

@@ -1,13 +1,13 @@
 import { FnHelper, FnHelperOptions } from '../types';
 import { Knex } from 'knex';
 export declare class FnHelperMySQL extends FnHelper {
-    year(table: string, column: string): Knex.Raw;
-    month(table: string, column: string): Knex.Raw;
-    week(table: string, column: string): Knex.Raw;
-    day(table: string, column: string): Knex.Raw;
-    weekday(table: string, column: string): Knex.Raw;
-    hour(table: string, column: string): Knex.Raw;
-    minute(table: string, column: string): Knex.Raw;
-    second(table: string, column: string): Knex.Raw;
+    year(table: string, column: string, options: FnHelperOptions): Knex.Raw;
+    month(table: string, column: string, options: FnHelperOptions): Knex.Raw;
+    week(table: string, column: string, options: FnHelperOptions): Knex.Raw;
+    day(table: string, column: string, options: FnHelperOptions): Knex.Raw;
+    weekday(table: string, column: string, options: FnHelperOptions): Knex.Raw;
+    hour(table: string, column: string, options: FnHelperOptions): Knex.Raw;
+    minute(table: string, column: string, options: FnHelperOptions): Knex.Raw;
+    second(table: string, column: string, options: FnHelperOptions): Knex.Raw;
     count(table: string, column: string, options?: FnHelperOptions): Knex.Raw;
 }

package/dist/database/helpers/fn/dialects/mysql.js

@@ -2,30 +2,36 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FnHelperMySQL = void 0;
 const types_1 = require("../types");
+const parseLocaltime = (columnType) => {
+    if (columnType === 'timestamp') {
+        return `CONVERT_TZ(??.??, @@GLOBAL.time_zone, '+00:00')`;
+    }
+    return '??.??';
+};
 class FnHelperMySQL extends types_1.FnHelper {
-    year(table, column) {
-        return this.knex.raw('YEAR(??.??)', [table, column]);
+    year(table, column, options) {
+        return this.knex.raw(`YEAR(${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)})`, [table, column]);
     }
-    month(table, column) {
-        return this.knex.raw('MONTH(??.??)', [table, column]);
+    month(table, column, options) {
+        return this.knex.raw(`MONTH(${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)})`, [table, column]);
     }
-    week(table, column) {
-        return this.knex.raw('WEEK(??.??)', [table, column]);
+    week(table, column, options) {
+        return this.knex.raw(`WEEK(${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)})`, [table, column]);
     }
-    day(table, column) {
-        return this.knex.raw('DAYOFMONTH(??.??)', [table, column]);
+    day(table, column, options) {
+        return this.knex.raw(`DAYOFMONTH(${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)})`, [table, column]);
     }
-    weekday(table, column) {
-        return this.knex.raw('DAYOFWEEK(??.??)', [table, column]);
+    weekday(table, column, options) {
+        return this.knex.raw(`DAYOFWEEK(${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)})`, [table, column]);
     }
-    hour(table, column) {
-        return this.knex.raw('HOUR(??.??)', [table, column]);
+    hour(table, column, options) {
+        return this.knex.raw(`HOUR(${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)})`, [table, column]);
     }
-    minute(table, column) {
-        return this.knex.raw('MINUTE(??.??)', [table, column]);
+    minute(table, column, options) {
+        return this.knex.raw(`MINUTE(${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)})`, [table, column]);
     }
-    second(table, column) {
-        return this.knex.raw('SECOND(??.??)', [table, column]);
+    second(table, column, options) {
+        return this.knex.raw(`SECOND(${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)})`, [table, column]);
     }
     count(table, column, options) {
         var _a, _b, _c, _d, _e;

package/dist/database/helpers/fn/dialects/postgres.d.ts

@@ -1,13 +1,13 @@
 import { FnHelper, FnHelperOptions } from '../types';
 import { Knex } from 'knex';
 export declare class FnHelperPostgres extends FnHelper {
-    year(table: string, column: string): Knex.Raw;
-    month(table: string, column: string): Knex.Raw;
-    week(table: string, column: string): Knex.Raw;
-    day(table: string, column: string): Knex.Raw;
-    weekday(table: string, column: string): Knex.Raw;
-    hour(table: string, column: string): Knex.Raw;
-    minute(table: string, column: string): Knex.Raw;
-    second(table: string, column: string): Knex.Raw;
+    year(table: string, column: string, options: FnHelperOptions): Knex.Raw;
+    month(table: string, column: string, options: FnHelperOptions): Knex.Raw;
+    week(table: string, column: string, options: FnHelperOptions): Knex.Raw;
+    day(table: string, column: string, options: FnHelperOptions): Knex.Raw;
+    weekday(table: string, column: string, options: FnHelperOptions): Knex.Raw;
+    hour(table: string, column: string, options: FnHelperOptions): Knex.Raw;
+    minute(table: string, column: string, options: FnHelperOptions): Knex.Raw;
+    second(table: string, column: string, options: FnHelperOptions): Knex.Raw;
     count(table: string, column: string, options?: FnHelperOptions): Knex.Raw;
 }

package/dist/database/helpers/fn/dialects/postgres.js

@@ -2,30 +2,36 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FnHelperPostgres = void 0;
 const types_1 = require("../types");
+const parseLocaltime = (columnType) => {
+    if (columnType === 'timestamp') {
+        return ` AT TIME ZONE 'UTC'`;
+    }
+    return '';
+};
 class FnHelperPostgres extends types_1.FnHelper {
-    year(table, column) {
-        return this.knex.raw('EXTRACT(YEAR FROM ??.??)', [table, column]);
+    year(table, column, options) {
+        return this.knex.raw(`EXTRACT(YEAR FROM ??.??${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)})`, [table, column]);
     }
-    month(table, column) {
-        return this.knex.raw('EXTRACT(MONTH FROM ??.??)', [table, column]);
+    month(table, column, options) {
+        return this.knex.raw(`EXTRACT(MONTH FROM ??.??${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)})`, [table, column]);
     }
-    week(table, column) {
-        return this.knex.raw('EXTRACT(WEEK FROM ??.??)', [table, column]);
+    week(table, column, options) {
+        return this.knex.raw(`EXTRACT(WEEK FROM ??.??${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)})`, [table, column]);
     }
-    day(table, column) {
-        return this.knex.raw('EXTRACT(DAY FROM ??.??)', [table, column]);
+    day(table, column, options) {
+        return this.knex.raw(`EXTRACT(DAY FROM ??.??${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)})`, [table, column]);
     }
-    weekday(table, column) {
-        return this.knex.raw('EXTRACT(DOW FROM ??.??)', [table, column]);
+    weekday(table, column, options) {
+        return this.knex.raw(`EXTRACT(DOW FROM ??.??${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)})`, [table, column]);
     }
-    hour(table, column) {
-        return this.knex.raw('EXTRACT(HOUR FROM ??.??)', [table, column]);
+    hour(table, column, options) {
+        return this.knex.raw(`EXTRACT(HOUR FROM ??.??${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)})`, [table, column]);
     }
-    minute(table, column) {
-        return this.knex.raw('EXTRACT(MINUTE FROM ??.??)', [table, column]);
+    minute(table, column, options) {
+        return this.knex.raw(`EXTRACT(MINUTE FROM ??.??${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)})`, [table, column]);
     }
-    second(table, column) {
-        return this.knex.raw('EXTRACT(SECOND FROM ??.??)', [table, column]);
+    second(table, column, options) {
+        return this.knex.raw(`EXTRACT(SECOND FROM ??.??${parseLocaltime(options === null || options === void 0 ? void 0 : options.type)})`, [table, column]);
     }
     count(table, column, options) {
         var _a, _b, _c, _d, _e;

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

@@ -1,7 +1,7 @@
 import { Query, SchemaOverview } from '@directus/shared/types';
 import { Knex } from 'knex';
 import { DatabaseHelper } from '../types';
-export declare type FnHelperOptions = {
+export type FnHelperOptions = {
     type?: string;
     query?: Query;
 };

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

@@ -10,4 +10,4 @@ export declare function getHelpers(database: Knex): {
     schema: schemaHelpers.sqlite | schemaHelpers.postgres | schemaHelpers.cockroachdb | schemaHelpers.oracle;
 };
 export declare function getFunctions(database: Knex, schema: SchemaOverview): fnHelpers.sqlite | fnHelpers.postgres | fnHelpers.mysql | fnHelpers.oracle | fnHelpers.mssql;
-export declare type Helpers = ReturnType<typeof getHelpers>;
+export type Helpers = ReturnType<typeof getHelpers>;

package/dist/database/helpers/schema/dialects/cockroachdb.d.ts

@@ -2,4 +2,5 @@ import { KNEX_TYPES } from '@directus/shared/constants';
 import { Options, SchemaHelper } from '../types';
 export declare class SchemaHelperCockroachDb extends SchemaHelper {
     changeToType(table: string, column: string, type: typeof KNEX_TYPES[number], options?: Options): Promise<void>;
+    constraintName(existingName: string): string;
 }

package/dist/database/helpers/schema/dialects/cockroachdb.js

@@ -6,5 +6,16 @@ class SchemaHelperCockroachDb extends types_1.SchemaHelper {
     async changeToType(table, column, type, options = {}) {
         await this.changeToTypeByCopy(table, column, type, options);
     }
+    constraintName(existingName) {
+        const suffix = '_replaced';
+        // CockroachDB does not allow for dropping/creating constraints with the same
+        // name in a single transaction. reference issue #14873
+        if (existingName.endsWith(suffix)) {
+            return existingName.substring(0, existingName.length - suffix.length);
+        }
+        else {
+            return existingName + suffix;
+        }
+    }
 }
 exports.SchemaHelperCockroachDb = SchemaHelperCockroachDb;

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

@@ -1,7 +1,7 @@
 import { DatabaseHelper } from '../types';
 import { KNEX_TYPES } from '@directus/shared/constants';
-declare type Clients = 'mysql' | 'postgres' | 'cockroachdb' | 'sqlite' | 'oracle' | 'mssql' | 'redshift';
-export declare type Options = {
+type Clients = 'mysql' | 'postgres' | 'cockroachdb' | 'sqlite' | 'oracle' | 'mssql' | 'redshift';
+export type Options = {
     nullable?: boolean;
     default?: any;
     length?: number;
@@ -13,5 +13,6 @@ export declare abstract class SchemaHelper extends DatabaseHelper {
     protected changeToTypeByCopy(table: string, column: string, type: typeof KNEX_TYPES[number], options: Options): Promise<void>;
     preColumnChange(): Promise<boolean>;
     postColumnChange(): Promise<void>;
+    constraintName(existingName: string): string;
 }
 export {};

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

@@ -62,5 +62,10 @@ class SchemaHelper extends types_1.DatabaseHelper {
     async postColumnChange() {
         return;
     }
+    constraintName(existingName) {
+        // most vendors allow for dropping/creating constraints with the same name
+        // reference issue #14873
+        return existingName;
+    }
 }
 exports.SchemaHelper = SchemaHelper;

package/dist/database/migrations/run.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = 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];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -42,6 +65,7 @@ async function run(database, direction, log = true) {
     if (direction === 'latest')
         await latest();
     async function up() {
+        var _a;
         const currentVersion = completedMigrations[completedMigrations.length - 1];
         let nextVersion;
         if (!currentVersion) {
@@ -55,7 +79,7 @@ async function run(database, direction, log = true) {
         if (!nextVersion) {
             throw Error('Nothing to upgrade');
         }
-        const { up } = require(nextVersion.file);
+        const { up } = await (_a = nextVersion.file, Promise.resolve().then(() => __importStar(require(_a))));
         if (log) {
             logger_1.default.info(`Applying ${nextVersion.name}...`);
         }
@@ -63,6 +87,7 @@ async function run(database, direction, log = true) {
         await database.insert({ version: nextVersion.version, name: nextVersion.name }).into('directus_migrations');
     }
     async function down() {
+        var _a;
         const lastAppliedMigration = (0, lodash_1.orderBy)(completedMigrations, ['timestamp', 'version'], ['desc', 'desc'])[0];
         if (!lastAppliedMigration) {
             throw Error('Nothing to downgrade');
@@ -71,7 +96,7 @@ async function run(database, direction, log = true) {
         if (!migration) {
             throw new Error("Couldn't find migration");
         }
-        const { down } = require(migration.file);
+        const { down } = await (_a = migration.file, Promise.resolve().then(() => __importStar(require(_a))));
         if (log) {
             logger_1.default.info(`Undoing ${migration.name}...`);
         }
@@ -79,9 +104,10 @@ async function run(database, direction, log = true) {
         await database('directus_migrations').delete().where({ version: migration.version });
     }
     async function latest() {
+        var _a;
         for (const migration of migrations) {
             if (migration.completed === false) {
-                const { up } = require(migration.file);
+                const { up } = await (_a = migration.file, Promise.resolve().then(() => __importStar(require(_a))));
                 if (log) {
                     logger_1.default.info(`Applying ${migration.name}...`);
                 }

package/dist/database/run-ast.d.ts

@@ -1,7 +1,7 @@
 import { Item, SchemaOverview } from '@directus/shared/types';
 import { Knex } from 'knex';
 import { AST, NestedCollectionNode } from '../types/ast';
-declare type RunASTOptions = {
+type RunASTOptions = {
     /**
      * Query override for the current level
      */

package/dist/database/run-ast.js

@@ -209,7 +209,7 @@ function applyParentFilters(schema, nestedCollectionNodes, parentItem) {
                 const foreignField = nestedNode.relatedKey[relatedCollection];
                 const foreignIds = (0, lodash_1.uniq)(keysPerCollection[relatedCollection]);
                 (0, lodash_1.merge)(nestedNode, {
-                    query: { [relatedCollection]: { filter: { [foreignField]: { _in: foreignIds } } } },
+                    query: { [relatedCollection]: { filter: { [foreignField]: { _in: foreignIds } }, limit: foreignIds.length } },
                 });
             }
         }

package/dist/env.d.ts

@@ -4,6 +4,10 @@
  */
 declare let env: Record<string, any>;
 export default env;
+/**
+ * Small wrapper function that makes it easier to write unit tests against changing environments
+ */
+export declare const getEnv: () => Record<string, any>;
 /**
  * When changes have been made during runtime, like in the CLI, we can refresh the env object with
  * the newly created variables

package/dist/env.js

@@ -7,7 +7,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.refreshEnv = void 0;
+exports.refreshEnv = exports.getEnv = void 0;
 const dotenv_1 = __importDefault(require("dotenv"));
 const fs_1 = __importDefault(require("fs"));
 const lodash_1 = require("lodash");
@@ -265,11 +265,16 @@ const typeMap = {
 let env = {
     ...defaults,
     ...process.env,
-    ...getEnv(),
+    ...processConfiguration(),
 };
 process.env = env;
 env = processValues(env);
 exports.default = env;
+/**
+ * Small wrapper function that makes it easier to write unit tests against changing environments
+ */
+const getEnv = () => env;
+exports.getEnv = getEnv;
 /**
  * When changes have been made during runtime, like in the CLI, we can refresh the env object with
  * the newly created variables
@@ -278,13 +283,13 @@ function refreshEnv() {
     env = {
         ...defaults,
         ...process.env,
-        ...getEnv(),
+        ...processConfiguration(),
     };
     process.env = env;
     env = processValues(env);
 }
 exports.refreshEnv = refreshEnv;
-function getEnv() {
+function processConfiguration() {
     const configPath = path_1.default.resolve(process.env.CONFIG_PATH || defaults.CONFIG_PATH);
     if (fs_1.default.existsSync(configPath) === false)
         return {};

package/dist/env.test.d.ts

@@ -1,8 +1 @@
-declare const testEnv: {
-    NUMBER: string;
-    NUMBER_CAST_AS_STRING: string;
-    REGEX: string;
-    CSV: string;
-    CSV_CAST_AS_STRING: string;
-    MULTIPLE: string;
-};
+export {};

package/dist/exceptions/database/contains-null-values.d.ts

@@ -1,5 +1,5 @@
 import { BaseException } from '@directus/shared/exceptions';
-declare type Exceptions = {
+type Exceptions = {
     collection: string;
     field: string;
 };

package/dist/exceptions/database/dialects/types.d.ts

@@ -1,4 +1,4 @@
-export declare type MSSQLError = {
+export type MSSQLError = {
     message: string;
     code: 'EREQUEST';
     number: number;
@@ -8,7 +8,7 @@ export declare type MSSQLError = {
     procName: string;
     lineNumber: number;
 };
-export declare type MySQLError = {
+export type MySQLError = {
     message: string;
     code: string;
     errno: number;
@@ -17,7 +17,7 @@ export declare type MySQLError = {
     index: number;
     sql: string;
 };
-export declare type PostgresError = {
+export type PostgresError = {
     message: string;
     length: number;
     code: string;
@@ -28,14 +28,14 @@ export declare type PostgresError = {
     dataType?: string;
     constraint?: string;
 };
-export declare type OracleError = {
+export type OracleError = {
     message: string;
     errorNum: number;
     offset: number;
 };
-export declare type SQLiteError = {
+export type SQLiteError = {
     message: string;
     errno: number;
     code: string;
 };
-export declare type SQLError = MSSQLError & MySQLError & PostgresError & SQLiteError & OracleError & Error;
+export type SQLError = MSSQLError & MySQLError & PostgresError & SQLiteError & OracleError & Error;