directus 9.21.2 → 9.22.1

package/dist/app.js

@@ -31,7 +31,6 @@ const express_1 = __importDefault(require("express"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const qs_1 = __importDefault(require("qs"));
-const helmet_1 = __importDefault(require("helmet"));
 const activity_1 = __importDefault(require("./controllers/activity"));
 const assets_1 = __importDefault(require("./controllers/assets"));
 const auth_1 = __importDefault(require("./controllers/auth"));
@@ -87,6 +86,7 @@ const url_1 = require("./utils/url");
 const get_config_from_env_1 = require("./utils/get-config-from-env");
 const lodash_1 = require("lodash");
 async function createApp() {
+    const helmet = await import('helmet');
     (0, validate_env_1.validateEnv)(['KEY', 'SECRET']);
     if (!new url_1.Url(env_1.default.PUBLIC_URL).isAbsolute()) {
         logger_1.default.warn('PUBLIC_URL should be a full URL');
@@ -111,7 +111,7 @@ async function createApp() {
     app.disable('x-powered-by');
     app.set('trust proxy', env_1.default.IP_TRUST_PROXY);
     app.set('query parser', (str) => qs_1.default.parse(str, { depth: 10 }));
-    app.use(helmet_1.default.contentSecurityPolicy((0, lodash_1.merge)({
+    app.use(helmet.contentSecurityPolicy((0, lodash_1.merge)({
         useDefaults: true,
         directives: {
             // Unsafe-eval is required for vue3 / vue-i18n / app extensions
@@ -130,7 +130,7 @@ async function createApp() {
         },
     }, (0, get_config_from_env_1.getConfigFromEnv)('CONTENT_SECURITY_POLICY_'))));
     if (env_1.default.HSTS_ENABLED) {
-        app.use(helmet_1.default.hsts((0, get_config_from_env_1.getConfigFromEnv)('HSTS_', ['HSTS_ENABLED'])));
+        app.use(helmet.hsts((0, get_config_from_env_1.getConfigFromEnv)('HSTS_', ['HSTS_ENABLED'])));
     }
     await emitter_1.default.emitInit('app.before', { app });
     await emitter_1.default.emitInit('middlewares.before', { app });
@@ -170,13 +170,17 @@ async function createApp() {
     if (env_1.default.SERVE_APP) {
         const adminPath = require.resolve('@directus/app');
         const adminUrl = new url_1.Url(env_1.default.PUBLIC_URL).addPath('admin');
+        const embeds = extensionManager.getEmbeds();
         // Set the App's base path according to the APIs public URL
         const html = await fs_extra_1.default.readFile(adminPath, 'utf8');
-        const htmlWithBase = html.replace(/<base \/>/, `<base href="${adminUrl.toString({ rootRelative: true })}/" />`);
+        const htmlWithVars = html
+            .replace(/<base \/>/, `<base href="${adminUrl.toString({ rootRelative: true })}/" />`)
+            .replace(/<embed-head \/>/, embeds.head)
+            .replace(/<embed-body \/>/, embeds.body);
         const sendHtml = (_req, res) => {
             res.setHeader('Cache-Control', 'no-cache');
             res.setHeader('Vary', 'Origin, Cache-Control');
-            res.send(htmlWithBase);
+            res.send(htmlWithVars);
         };
         const setStaticHeaders = (res) => {
             res.setHeader('Cache-Control', 'max-age=31536000, immutable');

package/dist/app.test.d.ts

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

package/dist/cli/commands/bootstrap/index.js

@@ -26,7 +26,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const nanoid_1 = require("nanoid");
 const run_1 = __importDefault(require("../../../database/migrations/run"));
 const run_2 = __importDefault(require("../../../database/seeds/run"));
 const env_1 = __importDefault(require("../../../env"));
@@ -78,6 +77,7 @@ async function waitForDatabase(database) {
     await (0, database_1.validateDatabaseConnection)(database);
 }
 async function createDefaultAdmin(schema) {
+    const { nanoid } = await import('nanoid');
     logger_1.default.info('Setting up first admin role...');
     const rolesService = new services_1.RolesService({ schema });
     const role = await rolesService.createOne(defaults_1.defaultAdminRole);
@@ -90,7 +90,7 @@ async function createDefaultAdmin(schema) {
     }
     let adminPassword = env_1.default.ADMIN_PASSWORD;
     if (!adminPassword) {
-        adminPassword = (0, nanoid_1.nanoid)(12);
+        adminPassword = nanoid(12);
         logger_1.default.info(`No admin password provided. Defaulting to "${adminPassword}"`);
     }
     await usersService.createOne({ email: adminEmail, password: adminPassword, role, ...defaults_1.defaultAdminUser });

package/dist/cli/commands/security/secret.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const nanoid_1 = require("nanoid");
 async function generateSecret() {
-    process.stdout.write((0, nanoid_1.nanoid)(32));
+    const { nanoid } = await import('nanoid');
+    process.stdout.write(nanoid(32));
     process.exit(0);
 }
 exports.default = generateSecret;

package/dist/cli/utils/create-env/env-stub.liquid

@@ -149,8 +149,8 @@ CACHE_ENABLED=false
 # memory | redis | memcache
 CACHE_STORE=memory
 
-# How long assets will be cached for in the browser. Sets the max-age value of the Cache-Control header ["30m"]
-ASSETS_CACHE_TTL="30m"
+# How long assets will be cached for in the browser. Sets the max-age value of the Cache-Control header ["30d"]
+ASSETS_CACHE_TTL="30d"
 
 # CACHE_REDIS="redis://@127.0.0.1:5105"
 # CACHE_MEMCACHE="localhost:5109"
@@ -227,7 +227,7 @@ CORS_METHODS=GET,POST,PATCH,DELETE
 # Value for the Access-Control-Allow-Headers header [Content-Type,Authorization]
 CORS_ALLOWED_HEADERS=Content-Type,Authorization
 
-# Value for the Access-Control-Expose-Headers header [Content-R
+# Value for the Access-Control-Expose-Headers header [Content-Range]
 CORS_EXPOSED_HEADERS=Content-Range
 
 # Whether or not to send the Access-Control-Allow-Credentials header [true]

package/dist/cli/utils/create-env/index.js

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = __importDefault(require("fs"));
 const liquidjs_1 = require("liquidjs");
-const nanoid_1 = require("nanoid");
 const path_1 = __importDefault(require("path"));
 const util_1 = require("util");
 const uuid_1 = require("uuid");
@@ -16,15 +15,13 @@ const open = (0, util_1.promisify)(fs_1.default.open);
 const liquidEngine = new liquidjs_1.Liquid({
     extname: '.liquid',
 });
-const defaults = {
-    security: {
-        KEY: (0, uuid_1.v4)(),
-        SECRET: (0, nanoid_1.nanoid)(32),
-    },
-};
 async function createEnv(client, credentials, directory) {
+    const { nanoid } = await import('nanoid');
     const config = {
-        ...defaults,
+        security: {
+            KEY: (0, uuid_1.v4)(),
+            SECRET: nanoid(32),
+        },
         database: {
             DB_CLIENT: client,
         },

package/dist/constants.d.ts

@@ -15,3 +15,4 @@ export declare const COOKIE_OPTIONS: {
     sameSite: "lax" | "strict" | "none";
 };
 export declare const ROBOTSTXT: string;
+export declare const OAS_REQUIRED_SCHEMAS: string[];

package/dist/constants.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ROBOTSTXT = exports.COOKIE_OPTIONS = exports.UUID_REGEX = exports.GENERATE_SPECIAL = exports.COLUMN_TRANSFORMS = exports.DEFAULT_AUTH_PROVIDER = exports.ALIAS_TYPES = exports.FILTER_VARIABLES = exports.ASSET_TRANSFORM_QUERY_KEYS = exports.SYSTEM_ASSET_ALLOW_LIST = void 0;
+exports.OAS_REQUIRED_SCHEMAS = exports.ROBOTSTXT = exports.COOKIE_OPTIONS = exports.UUID_REGEX = exports.GENERATE_SPECIAL = exports.COLUMN_TRANSFORMS = exports.DEFAULT_AUTH_PROVIDER = exports.ALIAS_TYPES = exports.FILTER_VARIABLES = exports.ASSET_TRANSFORM_QUERY_KEYS = exports.SYSTEM_ASSET_ALLOW_LIST = void 0;
 const env_1 = __importDefault(require("./env"));
 const ms_1 = __importDefault(require("ms"));
 exports.SYSTEM_ASSET_ALLOW_LIST = [
@@ -60,3 +60,4 @@ exports.ROBOTSTXT = `
 User-agent: *
 Disallow: /
 `.trim();
+exports.OAS_REQUIRED_SCHEMAS = ['Query', 'x-metadata'];

package/dist/controllers/assets.js

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("@directus/shared/utils");
 const express_1 = require("express");
-const helmet_1 = __importDefault(require("helmet"));
 const lodash_1 = require("lodash");
 const ms_1 = __importDefault(require("ms"));
 const constants_1 = require("../constants");
@@ -92,12 +91,15 @@ router.get('/:pk/:filename?',
             return next();
         throw new exceptions_1.InvalidQueryException(`Dynamic asset generation has been disabled for this project.`);
     }
-}), helmet_1.default.contentSecurityPolicy((0, lodash_1.merge)({
-    useDefaults: false,
-    directives: {
-        defaultSrc: ['none'],
-    },
-}, (0, get_config_from_env_1.getConfigFromEnv)('ASSETS_CONTENT_SECURITY_POLICY'))), 
+}), (0, async_handler_1.default)(async (req, res, next) => {
+    const helmet = await import('helmet');
+    return helmet.contentSecurityPolicy((0, lodash_1.merge)({
+        useDefaults: false,
+        directives: {
+            defaultSrc: ['none'],
+        },
+    }, (0, get_config_from_env_1.getConfigFromEnv)('ASSETS_CONTENT_SECURITY_POLICY')))(req, res, next);
+}), 
 // Return file
 (0, async_handler_1.default)(async (req, res) => {
     var _a, _b, _c;

package/dist/controllers/files.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.multipartHandler = void 0;
-const format_title_1 = __importDefault(require("@directus/format-title"));
 const utils_1 = require("@directus/shared/utils");
 const busboy_1 = __importDefault(require("busboy"));
 const express_1 = __importDefault(require("express"));
@@ -17,6 +16,8 @@ const use_collection_1 = __importDefault(require("../middleware/use-collection")
 const validate_batch_1 = require("../middleware/validate-batch");
 const services_1 = require("../services");
 const async_handler_1 = __importDefault(require("../utils/async-handler"));
+// @ts-ignore
+const format_title_1 = __importDefault(require("@directus/format-title"));
 const router = express_1.default.Router();
 router.use((0, use_collection_1.default)('directus_files'));
 const multipartHandler = (req, res, next) => {

package/dist/controllers/utils.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const argon2_1 = __importDefault(require("argon2"));
 const express_1 = require("express");
 const joi_1 = __importDefault(require("joi"));
-const nanoid_1 = require("nanoid");
 const exceptions_1 = require("../exceptions");
 const collection_exists_1 = __importDefault(require("../middleware/collection-exists"));
 const respond_1 = require("../middleware/respond");
@@ -18,9 +17,10 @@ const generate_hash_1 = require("../utils/generate-hash");
 const router = (0, express_1.Router)();
 router.get('/random/string', (0, async_handler_1.default)(async (req, res) => {
     var _a;
+    const { nanoid } = await import('nanoid');
     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 = (0, nanoid_1.nanoid)(((_a = req.query) === null || _a === void 0 ? void 0 : _a.length) ? Number(req.query.length) : 32);
+    const string = nanoid(((_a = req.query) === null || _a === void 0 ? void 0 : _a.length) ? Number(req.query.length) : 32);
     return res.json({ data: string });
 }));
 router.post('/hash/generate', (0, async_handler_1.default)(async (req, res) => {

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

@@ -35,7 +35,8 @@ class FnHelperMSSQL extends types_1.FnHelper {
     }
     count(table, column, options) {
         var _a, _b, _c, _d, _e;
-        const type = (_e = (_d = (_c = (_b = (_a = this.schema.collections) === null || _a === void 0 ? void 0 : _a[table]) === null || _b === void 0 ? void 0 : _b.fields) === null || _c === void 0 ? void 0 : _c[column]) === null || _d === void 0 ? void 0 : _d.type) !== null && _e !== void 0 ? _e : 'unknown';
+        const collectionName = (options === null || options === void 0 ? void 0 : options.originalCollectionName) || table;
+        const type = (_e = (_d = (_c = (_b = (_a = this.schema.collections) === null || _a === void 0 ? void 0 : _a[collectionName]) === null || _b === void 0 ? void 0 : _b.fields) === null || _c === void 0 ? void 0 : _c[column]) === null || _d === void 0 ? void 0 : _d.type) !== null && _e !== void 0 ? _e : 'unknown';
         if (type === 'json') {
             return this.knex.raw(`(SELECT COUNT(*) FROM OPENJSON(??.??, '$'))`, [table, column]);
         }

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

@@ -35,7 +35,8 @@ class FnHelperMySQL extends types_1.FnHelper {
     }
     count(table, column, options) {
         var _a, _b, _c, _d, _e;
-        const type = (_e = (_d = (_c = (_b = (_a = this.schema.collections) === null || _a === void 0 ? void 0 : _a[table]) === null || _b === void 0 ? void 0 : _b.fields) === null || _c === void 0 ? void 0 : _c[column]) === null || _d === void 0 ? void 0 : _d.type) !== null && _e !== void 0 ? _e : 'unknown';
+        const collectionName = (options === null || options === void 0 ? void 0 : options.originalCollectionName) || table;
+        const type = (_e = (_d = (_c = (_b = (_a = this.schema.collections) === null || _a === void 0 ? void 0 : _a[collectionName]) === null || _b === void 0 ? void 0 : _b.fields) === null || _c === void 0 ? void 0 : _c[column]) === null || _d === void 0 ? void 0 : _d.type) !== null && _e !== void 0 ? _e : 'unknown';
         if (type === 'json') {
             return this.knex.raw('JSON_LENGTH(??.??)', [table, column]);
         }

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

@@ -35,7 +35,8 @@ class FnHelperOracle extends types_1.FnHelper {
     }
     count(table, column, options) {
         var _a, _b, _c, _d, _e;
-        const type = (_e = (_d = (_c = (_b = (_a = this.schema.collections) === null || _a === void 0 ? void 0 : _a[table]) === null || _b === void 0 ? void 0 : _b.fields) === null || _c === void 0 ? void 0 : _c[column]) === null || _d === void 0 ? void 0 : _d.type) !== null && _e !== void 0 ? _e : 'unknown';
+        const collectionName = (options === null || options === void 0 ? void 0 : options.originalCollectionName) || table;
+        const type = (_e = (_d = (_c = (_b = (_a = this.schema.collections) === null || _a === void 0 ? void 0 : _a[collectionName]) === null || _b === void 0 ? void 0 : _b.fields) === null || _c === void 0 ? void 0 : _c[column]) === null || _d === void 0 ? void 0 : _d.type) !== null && _e !== void 0 ? _e : 'unknown';
         if (type === 'json') {
             return this.knex.raw("json_value(??.??, '$.size()')", [table, column]);
         }

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

@@ -35,7 +35,8 @@ class FnHelperPostgres extends types_1.FnHelper {
     }
     count(table, column, options) {
         var _a, _b, _c, _d, _e;
-        const type = (_e = (_d = (_c = (_b = (_a = this.schema.collections) === null || _a === void 0 ? void 0 : _a[table]) === null || _b === void 0 ? void 0 : _b.fields) === null || _c === void 0 ? void 0 : _c[column]) === null || _d === void 0 ? void 0 : _d.type) !== null && _e !== void 0 ? _e : 'unknown';
+        const collectionName = (options === null || options === void 0 ? void 0 : options.originalCollectionName) || table;
+        const type = (_e = (_d = (_c = (_b = (_a = this.schema.collections) === null || _a === void 0 ? void 0 : _a[collectionName]) === null || _b === void 0 ? void 0 : _b.fields) === null || _c === void 0 ? void 0 : _c[column]) === null || _d === void 0 ? void 0 : _d.type) !== null && _e !== void 0 ? _e : 'unknown';
         if (type === 'json') {
             const { dbType } = this.schema.collections[table].fields[column];
             return this.knex.raw(dbType === 'jsonb' ? 'jsonb_array_length(??.??)' : 'json_array_length(??.??)', [

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

@@ -59,7 +59,8 @@ class FnHelperSQLite extends types_1.FnHelper {
     }
     count(table, column, options) {
         var _a, _b, _c, _d, _e;
-        const type = (_e = (_d = (_c = (_b = (_a = this.schema.collections) === null || _a === void 0 ? void 0 : _a[table]) === null || _b === void 0 ? void 0 : _b.fields) === null || _c === void 0 ? void 0 : _c[column]) === null || _d === void 0 ? void 0 : _d.type) !== null && _e !== void 0 ? _e : 'unknown';
+        const collectionName = (options === null || options === void 0 ? void 0 : options.originalCollectionName) || table;
+        const type = (_e = (_d = (_c = (_b = (_a = this.schema.collections) === null || _a === void 0 ? void 0 : _a[collectionName]) === null || _b === void 0 ? void 0 : _b.fields) === null || _c === void 0 ? void 0 : _c[column]) === null || _d === void 0 ? void 0 : _d.type) !== null && _e !== void 0 ? _e : 'unknown';
         if (type === 'json') {
             return this.knex.raw(`json_array_length(??.??, '$')`, [table, column]);
         }

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

@@ -4,6 +4,7 @@ import { DatabaseHelper } from '../types';
 export type FnHelperOptions = {
     type?: string;
     query?: Query;
+    originalCollectionName?: string;
 };
 export declare abstract class FnHelper extends DatabaseHelper {
     protected knex: Knex;

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

@@ -12,17 +12,18 @@ class FnHelper extends types_1.DatabaseHelper {
     }
     _relationalCount(table, column, options) {
         var _a;
-        const relation = this.schema.relations.find((relation) => { var _a; return relation.related_collection === table && ((_a = relation === null || relation === void 0 ? void 0 : relation.meta) === null || _a === void 0 ? void 0 : _a.one_field) === column; });
-        const currentPrimary = this.schema.collections[table].primary;
+        const collectionName = (options === null || options === void 0 ? void 0 : options.originalCollectionName) || table;
+        const relation = this.schema.relations.find((relation) => { var _a; return relation.related_collection === collectionName && ((_a = relation === null || relation === void 0 ? void 0 : relation.meta) === null || _a === void 0 ? void 0 : _a.one_field) === column; });
+        const currentPrimary = this.schema.collections[collectionName].primary;
         if (!relation) {
-            throw new Error(`Field ${table}.${column} isn't a nested relational collection`);
+            throw new Error(`Field ${collectionName}.${column} isn't a nested relational collection`);
         }
         let countQuery = this.knex
             .count('*')
             .from(relation.collection)
             .where(relation.field, '=', this.knex.raw(`??.??`, [table, currentPrimary]));
         if ((_a = options === null || options === void 0 ? void 0 : options.query) === null || _a === void 0 ? void 0 : _a.filter) {
-            countQuery = (0, apply_query_1.applyFilter)(this.knex, this.schema, countQuery, options.query.filter, relation.collection, false);
+            countQuery = (0, apply_query_1.applyFilter)(this.knex, this.schema, countQuery, options.query.filter, relation.collection, {}).query;
         }
         return this.knex.raw('(' + countQuery.toQuery() + ')');
     }

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

@@ -7,7 +7,7 @@ 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.oracle | geometryHelpers.mssql | geometryHelpers.redshift;
-    schema: schemaHelpers.sqlite | schemaHelpers.postgres | schemaHelpers.cockroachdb | schemaHelpers.oracle;
+    schema: schemaHelpers.sqlite | schemaHelpers.postgres | schemaHelpers.mysql | schemaHelpers.cockroachdb | schemaHelpers.oracle | schemaHelpers.mssql;
 };
 export declare function getFunctions(database: Knex, schema: SchemaOverview): fnHelpers.sqlite | fnHelpers.postgres | fnHelpers.mysql | fnHelpers.oracle | fnHelpers.mssql;
 export type Helpers = ReturnType<typeof getHelpers>;

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

@@ -0,0 +1,6 @@
+import { Knex } from 'knex';
+import { SchemaHelper } from '../types';
+export declare class SchemaHelperMSSQL extends SchemaHelper {
+    applyOffset(rootQuery: Knex.QueryBuilder, offset: number): void;
+    formatUUID(uuid: string): string;
+}

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

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SchemaHelperMSSQL = void 0;
+const types_1 = require("../types");
+class SchemaHelperMSSQL extends types_1.SchemaHelper {
+    applyOffset(rootQuery, offset) {
+        rootQuery.offset(offset);
+        rootQuery.orderBy(1);
+    }
+    formatUUID(uuid) {
+        return uuid.toUpperCase();
+    }
+}
+exports.SchemaHelperMSSQL = SchemaHelperMSSQL;

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

@@ -0,0 +1,5 @@
+import { Knex } from 'knex';
+import { SchemaHelper } from '../types';
+export declare class SchemaHelperMySQL extends SchemaHelper {
+    applyMultiRelationalSort(knex: Knex, dbQuery: Knex.QueryBuilder, table: string, primaryKey: string, orderByString: string, orderByFields: Knex.Raw[]): Knex.QueryBuilder;
+}

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

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SchemaHelperMySQL = void 0;
+const database_1 = require("../../../../database");
+const types_1 = require("../types");
+class SchemaHelperMySQL extends types_1.SchemaHelper {
+    applyMultiRelationalSort(knex, dbQuery, table, primaryKey, orderByString, orderByFields) {
+        var _a;
+        if ((_a = (0, database_1.getDatabaseVersion)()) === null || _a === void 0 ? void 0 : _a.startsWith('5.7')) {
+            dbQuery.orderByRaw(`?? asc, ${orderByString.slice(9)}`, [`${table}.${primaryKey}`, ...orderByFields]);
+            dbQuery = knex
+                .select(knex.raw(`??, ( @rank := IF ( @cur_id = deep.${primaryKey}, @rank + 1, 1 ) ) AS directus_row_number, ( @cur_id := deep.${primaryKey} ) AS current_id`, 'deep.*'))
+                .from(knex.raw('? as ??, (SELECT @rank := 0,  @cur_id := null) vars', [dbQuery, 'deep']));
+            return dbQuery;
+        }
+        return super.applyMultiRelationalSort(knex, dbQuery, table, primaryKey, orderByString, orderByFields);
+    }
+}
+exports.SchemaHelperMySQL = SchemaHelperMySQL;

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

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

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

@@ -6,5 +6,8 @@ class SchemaHelperOracle extends types_1.SchemaHelper {
     async changeToType(table, column, type, options = {}) {
         await this.changeToTypeByCopy(table, column, type, options);
     }
+    castA2oPrimaryKey() {
+        return 'CAST(?? AS VARCHAR2(255))';
+    }
 }
 exports.SchemaHelperOracle = SchemaHelperOracle;

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

@@ -3,5 +3,5 @@ export { SchemaHelperCockroachDb as cockroachdb } from './dialects/cockroachdb';
 export { SchemaHelperDefault as redshift } from './dialects/default';
 export { SchemaHelperOracle as oracle } from './dialects/oracle';
 export { SchemaHelperSQLite as sqlite } from './dialects/sqlite';
-export { SchemaHelperDefault as mysql } from './dialects/default';
-export { SchemaHelperDefault as mssql } from './dialects/default';
+export { SchemaHelperMySQL as mysql } from './dialects/mysql';
+export { SchemaHelperMSSQL as mssql } from './dialects/mssql';

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

@@ -11,7 +11,7 @@ var oracle_1 = require("./dialects/oracle");
 Object.defineProperty(exports, "oracle", { enumerable: true, get: function () { return oracle_1.SchemaHelperOracle; } });
 var sqlite_1 = require("./dialects/sqlite");
 Object.defineProperty(exports, "sqlite", { enumerable: true, get: function () { return sqlite_1.SchemaHelperSQLite; } });
-var default_3 = require("./dialects/default");
-Object.defineProperty(exports, "mysql", { enumerable: true, get: function () { return default_3.SchemaHelperDefault; } });
-var default_4 = require("./dialects/default");
-Object.defineProperty(exports, "mssql", { enumerable: true, get: function () { return default_4.SchemaHelperDefault; } });
+var mysql_1 = require("./dialects/mysql");
+Object.defineProperty(exports, "mysql", { enumerable: true, get: function () { return mysql_1.SchemaHelperMySQL; } });
+var mssql_1 = require("./dialects/mssql");
+Object.defineProperty(exports, "mssql", { enumerable: true, get: function () { return mssql_1.SchemaHelperMSSQL; } });

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

@@ -1,5 +1,6 @@
 import { DatabaseHelper } from '../types';
 import { KNEX_TYPES } from '@directus/shared/constants';
+import { Knex } from 'knex';
 type Clients = 'mysql' | 'postgres' | 'cockroachdb' | 'sqlite' | 'oracle' | 'mssql' | 'redshift';
 export type Options = {
     nullable?: boolean;
@@ -14,5 +15,9 @@ export declare abstract class SchemaHelper extends DatabaseHelper {
     preColumnChange(): Promise<boolean>;
     postColumnChange(): Promise<void>;
     constraintName(existingName: string): string;
+    applyOffset(rootQuery: Knex.QueryBuilder, offset: number): void;
+    castA2oPrimaryKey(): string;
+    applyMultiRelationalSort(knex: Knex, dbQuery: Knex.QueryBuilder, table: string, primaryKey: string, orderByString: string, orderByFields: Knex.Raw[]): Knex.QueryBuilder;
+    formatUUID(uuid: string): string;
 }
 export {};

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

@@ -67,5 +67,18 @@ class SchemaHelper extends types_1.DatabaseHelper {
         // reference issue #14873
         return existingName;
     }
+    applyOffset(rootQuery, offset) {
+        rootQuery.offset(offset);
+    }
+    castA2oPrimaryKey() {
+        return 'CAST(?? AS CHAR(255))';
+    }
+    applyMultiRelationalSort(knex, dbQuery, table, primaryKey, orderByString, orderByFields) {
+        dbQuery.rowNumber(knex.ref('directus_row_number').toQuery(), knex.raw(`partition by ??${orderByString}`, [`${table}.${primaryKey}`, ...orderByFields]));
+        return dbQuery;
+    }
+    formatUUID(uuid) {
+        return uuid; // no-op by defaut
+    }
 }
 exports.SchemaHelper = SchemaHelper;

package/dist/database/index.d.ts

@@ -2,6 +2,12 @@ import SchemaInspector from '@directus/schema';
 import { Knex } from 'knex';
 export default function getDatabase(): Knex;
 export declare function getSchemaInspector(): ReturnType<typeof SchemaInspector>;
+/**
+ * Get database version. Value currently exists for MySQL only.
+ *
+ * @returns Cached database version
+ */
+export declare function getDatabaseVersion(): string | null;
 export declare function hasDatabaseConnection(database?: Knex): Promise<boolean>;
 export declare function validateDatabaseConnection(database?: Knex): Promise<void>;
 export declare function getDatabaseClient(database?: Knex): 'mysql' | 'postgres' | 'cockroachdb' | 'sqlite' | 'oracle' | 'mssql' | 'redshift';

package/dist/database/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateDatabaseExtensions = exports.validateMigrations = exports.isInstalled = exports.getDatabaseClient = exports.validateDatabaseConnection = exports.hasDatabaseConnection = exports.getSchemaInspector = void 0;
+exports.validateDatabaseExtensions = exports.validateMigrations = exports.isInstalled = exports.getDatabaseClient = exports.validateDatabaseConnection = exports.hasDatabaseConnection = exports.getDatabaseVersion = exports.getSchemaInspector = void 0;
 const schema_1 = __importDefault(require("@directus/schema"));
 const knex_1 = require("knex");
 const perf_hooks_1 = require("perf_hooks");
@@ -18,6 +18,7 @@ const util_1 = require("util");
 const helpers_1 = require("./helpers");
 let database = null;
 let inspector = null;
+let databaseVersion = null;
 function getDatabase() {
     if (database) {
         return database;
@@ -95,6 +96,15 @@ function getDatabase() {
             callback(null, conn);
         };
     }
+    if (client === 'mysql') {
+        poolConfig.afterCreate = async (conn, callback) => {
+            logger_1.default.trace('Retrieving database version');
+            const run = (0, util_1.promisify)(conn.query.bind(conn));
+            const version = await run('SELECT @@version;');
+            databaseVersion = version[0]['@@version'];
+            callback(null, conn);
+        };
+    }
     if (client === 'mssql') {
         // This brings MS SQL in line with the other DB vendors. We shouldn't do any automatic
         // timezone conversion on the database level, especially not when other database vendors don't
@@ -125,6 +135,15 @@ function getSchemaInspector() {
     return inspector;
 }
 exports.getSchemaInspector = getSchemaInspector;
+/**
+ * Get database version. Value currently exists for MySQL only.
+ *
+ * @returns Cached database version
+ */
+function getDatabaseVersion() {
+    return databaseVersion;
+}
+exports.getDatabaseVersion = getDatabaseVersion;
 async function hasDatabaseConnection(database) {
     database = database !== null && database !== void 0 ? database : getDatabase();
     try {

package/dist/database/migrations/20211007A-update-presets.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.down = exports.up = void 0;
 const utils_1 = require("@directus/shared/utils");
-const nanoid_1 = require("nanoid");
 async function up(knex) {
     var _a;
     await knex.schema.alterTable('directus_presets', (table) => {
@@ -54,6 +53,7 @@ async function up(knex) {
 exports.up = up;
 async function down(knex) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+    const { nanoid } = await import('nanoid');
     await knex.schema.alterTable('directus_presets', (table) => {
         table.json('filters');
     });
@@ -73,7 +73,7 @@ async function down(knex) {
                 if (!field || !operator || !value)
                     continue;
                 oldFilters.push({
-                    key: (0, nanoid_1.nanoid)(),
+                    key: nanoid(),
                     field,
                     operator: operator.substring(1),
                     value,