directus 9.22.4 → 9.23.1

package/dist/app.js

@@ -52,6 +52,7 @@ const presets_1 = __importDefault(require("./controllers/presets"));
 const relations_1 = __importDefault(require("./controllers/relations"));
 const revisions_1 = __importDefault(require("./controllers/revisions"));
 const roles_1 = __importDefault(require("./controllers/roles"));
+const schema_1 = __importDefault(require("./controllers/schema"));
 const server_1 = __importDefault(require("./controllers/server"));
 const settings_1 = __importDefault(require("./controllers/settings"));
 const users_1 = __importDefault(require("./controllers/users"));
@@ -74,8 +75,7 @@ const error_handler_1 = __importDefault(require("./middleware/error-handler"));
 const extract_token_1 = __importDefault(require("./middleware/extract-token"));
 const rate_limiter_1 = __importDefault(require("./middleware/rate-limiter"));
 const sanitize_query_1 = __importDefault(require("./middleware/sanitize-query"));
-const schema_1 = __importDefault(require("./middleware/schema"));
-const constants_1 = require("./constants");
+const schema_2 = __importDefault(require("./middleware/schema"));
 const track_1 = require("./utils/track");
 const validate_env_1 = require("./utils/validate-env");
 const validate_storage_1 = require("./utils/validate-storage");
@@ -165,7 +165,7 @@ async function createApp() {
     app.get('/robots.txt', (_, res) => {
         res.set('Content-Type', 'text/plain');
         res.status(200);
-        res.send(constants_1.ROBOTSTXT);
+        res.send(env_1.default.ROBOTS_TXT);
     });
     if (env_1.default.SERVE_APP) {
         const adminPath = require.resolve('@directus/app');
@@ -199,7 +199,7 @@ async function createApp() {
     app.use(check_ip_1.checkIP);
     app.use(sanitize_query_1.default);
     app.use(cache_1.default);
-    app.use(schema_1.default);
+    app.use(schema_2.default);
     app.use(get_permissions_1.default);
     await emitter_1.default.emitInit('middlewares.after', { app });
     await emitter_1.default.emitInit('routes.before', { app });
@@ -223,6 +223,7 @@ async function createApp() {
     app.use('/relations', relations_1.default);
     app.use('/revisions', revisions_1.default);
     app.use('/roles', roles_1.default);
+    app.use('/schema', schema_1.default);
     app.use('/server', server_1.default);
     app.use('/settings', settings_1.default);
     app.use('/shares', shares_1.default);

package/dist/auth/drivers/ldap.d.ts

@@ -1,8 +1,8 @@
 import { Router } from 'express';
 import { Client } from 'ldapjs';
-import { AuthDriver } from '../auth';
-import { AuthDriverOptions, User } from '../../types';
 import { UsersService } from '../../services';
+import { AuthDriverOptions, User } from '../../types';
+import { AuthDriver } from '../auth';
 export declare class LDAPAuthDriver extends AuthDriver {
     bindClient: Client;
     usersService: UsersService;

package/dist/auth/drivers/ldap.js

@@ -28,18 +28,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createLDAPAuthRouter = exports.LDAPAuthDriver = void 0;
 const express_1 = require("express");
-const ldapjs_1 = __importStar(require("ldapjs"));
-const ms_1 = __importDefault(require("ms"));
-const get_ip_from_req_1 = require("../../utils/get-ip-from-req");
 const joi_1 = __importDefault(require("joi"));
-const auth_1 = require("../auth");
+const ldapjs_1 = __importStar(require("ldapjs"));
+const env_1 = __importDefault(require("../../env"));
 const exceptions_1 = require("../../exceptions");
 const record_not_unique_1 = require("../../exceptions/database/record-not-unique");
+const logger_1 = __importDefault(require("../../logger"));
+const respond_1 = require("../../middleware/respond");
 const services_1 = require("../../services");
 const async_handler_1 = __importDefault(require("../../utils/async-handler"));
-const env_1 = __importDefault(require("../../env"));
-const respond_1 = require("../../middleware/respond");
-const logger_1 = __importDefault(require("../../logger"));
+const get_ip_from_req_1 = require("../../utils/get-ip-from-req");
+const get_milliseconds_1 = require("../../utils/get-milliseconds");
+const auth_1 = require("../auth");
 // 0x2: ACCOUNTDISABLE
 // 0x10: LOCKOUT
 // 0x800000: PASSWORD_EXPIRED
@@ -325,7 +325,7 @@ function createLDAPAuthRouter(provider) {
             res.cookie(env_1.default.REFRESH_TOKEN_COOKIE_NAME, refreshToken, {
                 httpOnly: true,
                 domain: env_1.default.REFRESH_TOKEN_COOKIE_DOMAIN,
-                maxAge: (0, ms_1.default)(env_1.default.REFRESH_TOKEN_TTL),
+                maxAge: (0, get_milliseconds_1.getMilliseconds)(env_1.default.REFRESH_TOKEN_TTL),
                 secure: (_b = env_1.default.REFRESH_TOKEN_COOKIE_SECURE) !== null && _b !== void 0 ? _b : false,
                 sameSite: env_1.default.REFRESH_TOKEN_COOKIE_SAME_SITE || 'strict',
             });

package/dist/auth/drivers/oauth2.js

@@ -32,7 +32,6 @@ const utils_1 = require("@directus/shared/utils");
 const express_1 = __importStar(require("express"));
 const flat_1 = __importDefault(require("flat"));
 const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
-const ms_1 = __importDefault(require("ms"));
 const openid_client_1 = require("openid-client");
 const auth_1 = require("../../auth");
 const env_1 = __importDefault(require("../../env"));
@@ -44,6 +43,7 @@ const services_1 = require("../../services");
 const async_handler_1 = __importDefault(require("../../utils/async-handler"));
 const get_config_from_env_1 = require("../../utils/get-config-from-env");
 const get_ip_from_req_1 = require("../../utils/get-ip-from-req");
+const get_milliseconds_1 = require("../../utils/get-milliseconds");
 const url_1 = require("../../utils/url");
 const local_1 = require("./local");
 class OAuth2AuthDriver extends local_1.LocalAuthDriver {
@@ -285,7 +285,7 @@ function createOAuth2AuthRouter(providerName) {
             res.cookie(env_1.default.REFRESH_TOKEN_COOKIE_NAME, refreshToken, {
                 httpOnly: true,
                 domain: env_1.default.REFRESH_TOKEN_COOKIE_DOMAIN,
-                maxAge: (0, ms_1.default)(env_1.default.REFRESH_TOKEN_TTL),
+                maxAge: (0, get_milliseconds_1.getMilliseconds)(env_1.default.REFRESH_TOKEN_TTL),
                 secure: (_a = env_1.default.REFRESH_TOKEN_COOKIE_SECURE) !== null && _a !== void 0 ? _a : false,
                 sameSite: env_1.default.REFRESH_TOKEN_COOKIE_SAME_SITE || 'strict',
             });

package/dist/auth/drivers/openid.js

@@ -32,7 +32,6 @@ const utils_1 = require("@directus/shared/utils");
 const express_1 = __importStar(require("express"));
 const flat_1 = __importDefault(require("flat"));
 const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
-const ms_1 = __importDefault(require("ms"));
 const openid_client_1 = require("openid-client");
 const auth_1 = require("../../auth");
 const env_1 = __importDefault(require("../../env"));
@@ -44,6 +43,7 @@ const services_1 = require("../../services");
 const async_handler_1 = __importDefault(require("../../utils/async-handler"));
 const get_config_from_env_1 = require("../../utils/get-config-from-env");
 const get_ip_from_req_1 = require("../../utils/get-ip-from-req");
+const get_milliseconds_1 = require("../../utils/get-milliseconds");
 const url_1 = require("../../utils/url");
 const local_1 = require("./local");
 class OpenIDAuthDriver extends local_1.LocalAuthDriver {
@@ -307,7 +307,7 @@ function createOpenIDAuthRouter(providerName) {
             res.cookie(env_1.default.REFRESH_TOKEN_COOKIE_NAME, refreshToken, {
                 httpOnly: true,
                 domain: env_1.default.REFRESH_TOKEN_COOKIE_DOMAIN,
-                maxAge: (0, ms_1.default)(env_1.default.REFRESH_TOKEN_TTL),
+                maxAge: (0, get_milliseconds_1.getMilliseconds)(env_1.default.REFRESH_TOKEN_TTL),
                 secure: (_a = env_1.default.REFRESH_TOKEN_COOKIE_SECURE) !== null && _a !== void 0 ? _a : false,
                 sameSite: env_1.default.REFRESH_TOKEN_COOKIE_SAME_SITE || 'strict',
             });

package/dist/cache.js

@@ -5,23 +5,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCacheValue = exports.setCacheValue = exports.getSystemCache = exports.setSystemCache = exports.clearSystemCache = exports.flushCaches = exports.getCache = void 0;
 const keyv_1 = __importDefault(require("keyv"));
-const ms_1 = __importDefault(require("ms"));
 const env_1 = __importDefault(require("./env"));
 const logger_1 = __importDefault(require("./logger"));
+const compress_1 = require("./utils/compress");
 const get_config_from_env_1 = require("./utils/get-config-from-env");
+const get_milliseconds_1 = require("./utils/get-milliseconds");
 const validate_env_1 = require("./utils/validate-env");
-const compress_1 = require("./utils/compress");
 let cache = null;
 let systemCache = null;
 let lockCache = null;
 function getCache() {
     if (env_1.default.CACHE_ENABLED === true && cache === null) {
         (0, validate_env_1.validateEnv)(['CACHE_NAMESPACE', 'CACHE_TTL', 'CACHE_STORE']);
-        cache = getKeyvInstance(env_1.default.CACHE_TTL ? (0, ms_1.default)(env_1.default.CACHE_TTL) : undefined);
+        cache = getKeyvInstance((0, get_milliseconds_1.getMilliseconds)(env_1.default.CACHE_TTL));
         cache.on('error', (err) => logger_1.default.warn(err, `[cache] ${err}`));
     }
     if (systemCache === null) {
-        systemCache = getKeyvInstance(env_1.default.CACHE_SYSTEM_TTL ? (0, ms_1.default)(env_1.default.CACHE_SYSTEM_TTL) : undefined, '_system');
+        systemCache = getKeyvInstance((0, get_milliseconds_1.getMilliseconds)(env_1.default.CACHE_SYSTEM_TTL), '_system');
         systemCache.on('error', (err) => logger_1.default.warn(err, `[cache] ${err}`));
     }
     if (lockCache === null) {

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

@@ -35,6 +35,8 @@ const js_yaml_1 = require("js-yaml");
 const path_1 = __importDefault(require("path"));
 const database_1 = __importStar(require("../../../database"));
 const logger_1 = __importDefault(require("../../../logger"));
+const types_1 = require("../../../types");
+const apply_diff_1 = require("../../../utils/apply-diff");
 const apply_snapshot_1 = require("../../../utils/apply-snapshot");
 const get_snapshot_1 = require("../../../utils/get-snapshot");
 const get_snapshot_diff_1 = require("../../../utils/get-snapshot-diff");
@@ -73,22 +75,22 @@ async function apply(snapshotPath, options) {
             if (snapshotDiff.collections.length > 0) {
                 message += chalk_1.default.black.underline.bold('Collections:');
                 for (const { collection, diff } of snapshotDiff.collections) {
-                    if (((_a = diff[0]) === null || _a === void 0 ? void 0 : _a.kind) === 'E') {
+                    if (((_a = diff[0]) === null || _a === void 0 ? void 0 : _a.kind) === types_1.DiffKind.EDIT) {
                         message += `\n  - ${chalk_1.default.blue('Update')} ${collection}`;
                         for (const change of diff) {
-                            if (change.kind === 'E') {
+                            if (change.kind === types_1.DiffKind.EDIT) {
                                 const path = change.path.slice(1).join('.');
                                 message += `\n    - Set ${path} to ${change.rhs}`;
                             }
                         }
                     }
-                    else if (((_b = diff[0]) === null || _b === void 0 ? void 0 : _b.kind) === 'D') {
+                    else if (((_b = diff[0]) === null || _b === void 0 ? void 0 : _b.kind) === types_1.DiffKind.DELETE) {
                         message += `\n  - ${chalk_1.default.red('Delete')} ${collection}`;
                     }
-                    else if (((_c = diff[0]) === null || _c === void 0 ? void 0 : _c.kind) === 'N') {
+                    else if (((_c = diff[0]) === null || _c === void 0 ? void 0 : _c.kind) === types_1.DiffKind.NEW) {
                         message += `\n  - ${chalk_1.default.green('Create')} ${collection}`;
                     }
-                    else if (((_d = diff[0]) === null || _d === void 0 ? void 0 : _d.kind) === 'A') {
+                    else if (((_d = diff[0]) === null || _d === void 0 ? void 0 : _d.kind) === types_1.DiffKind.ARRAY) {
                         message += `\n  - ${chalk_1.default.blue('Update')} ${collection}`;
                     }
                 }
@@ -96,28 +98,28 @@ async function apply(snapshotPath, options) {
             if (snapshotDiff.fields.length > 0) {
                 message += '\n\n' + chalk_1.default.black.underline.bold('Fields:');
                 for (const { collection, field, diff } of snapshotDiff.fields) {
-                    if (((_e = diff[0]) === null || _e === void 0 ? void 0 : _e.kind) === 'E' || (0, apply_snapshot_1.isNestedMetaUpdate)(diff[0])) {
+                    if (((_e = diff[0]) === null || _e === void 0 ? void 0 : _e.kind) === types_1.DiffKind.EDIT || (0, apply_diff_1.isNestedMetaUpdate)(diff[0])) {
                         message += `\n  - ${chalk_1.default.blue('Update')} ${collection}.${field}`;
                         for (const change of diff) {
                             const path = change.path.slice(1).join('.');
-                            if (change.kind === 'E') {
+                            if (change.kind === types_1.DiffKind.EDIT) {
                                 message += `\n    - Set ${path} to ${change.rhs}`;
                             }
-                            else if (change.kind === 'D') {
+                            else if (change.kind === types_1.DiffKind.DELETE) {
                                 message += `\n    - Remove ${path}`;
                             }
-                            else if (change.kind === 'N') {
+                            else if (change.kind === types_1.DiffKind.NEW) {
                                 message += `\n    - Add ${path} and set it to ${change.rhs}`;
                             }
                         }
                     }
-                    else if (((_f = diff[0]) === null || _f === void 0 ? void 0 : _f.kind) === 'D') {
+                    else if (((_f = diff[0]) === null || _f === void 0 ? void 0 : _f.kind) === types_1.DiffKind.DELETE) {
                         message += `\n  - ${chalk_1.default.red('Delete')} ${collection}.${field}`;
                     }
-                    else if (((_g = diff[0]) === null || _g === void 0 ? void 0 : _g.kind) === 'N') {
+                    else if (((_g = diff[0]) === null || _g === void 0 ? void 0 : _g.kind) === types_1.DiffKind.NEW) {
                         message += `\n  - ${chalk_1.default.green('Create')} ${collection}.${field}`;
                     }
-                    else if (((_h = diff[0]) === null || _h === void 0 ? void 0 : _h.kind) === 'A') {
+                    else if (((_h = diff[0]) === null || _h === void 0 ? void 0 : _h.kind) === types_1.DiffKind.ARRAY) {
                         message += `\n  - ${chalk_1.default.blue('Update')} ${collection}.${field}`;
                     }
                 }
@@ -125,22 +127,22 @@ async function apply(snapshotPath, options) {
             if (snapshotDiff.relations.length > 0) {
                 message += '\n\n' + chalk_1.default.black.underline.bold('Relations:');
                 for (const { collection, field, related_collection, diff } of snapshotDiff.relations) {
-                    if (((_j = diff[0]) === null || _j === void 0 ? void 0 : _j.kind) === 'E') {
+                    if (((_j = diff[0]) === null || _j === void 0 ? void 0 : _j.kind) === types_1.DiffKind.EDIT) {
                         message += `\n  - ${chalk_1.default.blue('Update')} ${collection}.${field}`;
                         for (const change of diff) {
-                            if (change.kind === 'E') {
+                            if (change.kind === types_1.DiffKind.EDIT) {
                                 const path = change.path.slice(1).join('.');
                                 message += `\n    - Set ${path} to ${change.rhs}`;
                             }
                         }
                     }
-                    else if (((_k = diff[0]) === null || _k === void 0 ? void 0 : _k.kind) === 'D') {
+                    else if (((_k = diff[0]) === null || _k === void 0 ? void 0 : _k.kind) === types_1.DiffKind.DELETE) {
                         message += `\n  - ${chalk_1.default.red('Delete')} ${collection}.${field}`;
                     }
-                    else if (((_l = diff[0]) === null || _l === void 0 ? void 0 : _l.kind) === 'N') {
+                    else if (((_l = diff[0]) === null || _l === void 0 ? void 0 : _l.kind) === types_1.DiffKind.NEW) {
                         message += `\n  - ${chalk_1.default.green('Create')} ${collection}.${field}`;
                     }
-                    else if (((_m = diff[0]) === null || _m === void 0 ? void 0 : _m.kind) === 'A') {
+                    else if (((_m = diff[0]) === null || _m === void 0 ? void 0 : _m.kind) === types_1.DiffKind.ARRAY) {
                         message += `\n  - ${chalk_1.default.blue('Update')} ${collection}.${field}`;
                     }
                     else {

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

@@ -1,4 +1,5 @@
 import { Knex } from 'knex';
+import { Driver } from '../../types';
 export type Credentials = {
     filename?: string;
     host?: string;
@@ -9,4 +10,4 @@ export type Credentials = {
     ssl?: boolean;
     options__encrypt?: boolean;
 };
-export default function createDBConnection(client: 'sqlite3' | 'mysql' | 'pg' | 'oracledb' | 'mssql' | 'cockroachdb', credentials: Credentials): Knex<any, unknown[]>;
+export default function createDBConnection(client: Driver, credentials: Credentials): Knex<any, unknown[]>;

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

@@ -167,7 +167,7 @@ STORAGE_LOCAL_ROOT="./uploads"
 # STORAGE_DIGITALOCEAN_DRIVER="s3"
 # STORAGE_DIGITALOCEAN_KEY="abcdef"
 # STORAGE_DIGITALOCEAN_SECRET="ghijkl"
-# STORAGE_DIGITALOCEAN_ENDPOINT="ams3.digitaloceanspaces.com"
+# STORAGE_DIGITALOCEAN_ENDPOINT="https://ams3.digitaloceanspaces.com"
 # STORAGE_DIGITALOCEAN_BUCKET="my-files"
 # STORAGE_DIGITALOCEAN_REGION="ams3"
 

package/dist/cli/utils/drivers.d.ts

@@ -1,9 +1,3 @@
-export declare const drivers: {
-    pg: string;
-    cockroachdb: string;
-    mysql: string;
-    sqlite3: string;
-    mssql: string;
-    oracledb: string;
-};
-export declare function getDriverForClient(client: string): keyof typeof drivers | null;
+import { Driver } from '../../types';
+export declare const drivers: Record<Driver, string>;
+export declare function getDriverForClient(client: string): Driver | null;

package/dist/constants.d.ts

@@ -1,3 +1,4 @@
+import { CookieOptions } from 'express';
 import { TransformationParams } from './types';
 export declare const SYSTEM_ASSET_ALLOW_LIST: TransformationParams[];
 export declare const ASSET_TRANSFORM_QUERY_KEYS: string[];
@@ -7,12 +8,5 @@ export declare const DEFAULT_AUTH_PROVIDER = "default";
 export declare const COLUMN_TRANSFORMS: string[];
 export declare const GENERATE_SPECIAL: string[];
 export declare const UUID_REGEX = "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}";
-export declare const COOKIE_OPTIONS: {
-    httpOnly: boolean;
-    domain: any;
-    maxAge: number;
-    secure: any;
-    sameSite: "lax" | "strict" | "none";
-};
-export declare const ROBOTSTXT: string;
+export declare const COOKIE_OPTIONS: CookieOptions;
 export declare const OAS_REQUIRED_SCHEMAS: string[];

package/dist/constants.js

@@ -4,9 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+exports.OAS_REQUIRED_SCHEMAS = 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"));
+const get_milliseconds_1 = require("./utils/get-milliseconds");
 exports.SYSTEM_ASSET_ALLOW_LIST = [
     {
         key: 'system-small-cover',
@@ -52,12 +52,8 @@ exports.UUID_REGEX = '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{1
 exports.COOKIE_OPTIONS = {
     httpOnly: true,
     domain: env_1.default.REFRESH_TOKEN_COOKIE_DOMAIN,
-    maxAge: (0, ms_1.default)(env_1.default.REFRESH_TOKEN_TTL),
+    maxAge: (0, get_milliseconds_1.getMilliseconds)(env_1.default.REFRESH_TOKEN_TTL),
     secure: (_a = env_1.default.REFRESH_TOKEN_COOKIE_SECURE) !== null && _a !== void 0 ? _a : false,
     sameSite: env_1.default.REFRESH_TOKEN_COOKIE_SAME_SITE || 'strict',
 };
-exports.ROBOTSTXT = `
-User-agent: *
-Disallow: /
-`.trim();
 exports.OAS_REQUIRED_SCHEMAS = ['Query', 'x-metadata'];

package/dist/controllers/assets.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("@directus/shared/utils");
 const express_1 = require("express");
 const lodash_1 = require("lodash");
-const ms_1 = __importDefault(require("ms"));
 const constants_1 = require("../constants");
 const database_1 = __importDefault(require("../database"));
 const env_1 = __importDefault(require("../env"));
@@ -16,7 +15,9 @@ const use_collection_1 = __importDefault(require("../middleware/use-collection")
 const services_1 = require("../services");
 const assets_1 = require("../types/assets");
 const async_handler_1 = __importDefault(require("../utils/async-handler"));
+const get_cache_headers_1 = require("../utils/get-cache-headers");
 const get_config_from_env_1 = require("../utils/get-config-from-env");
+const get_milliseconds_1 = require("../utils/get-milliseconds");
 const router = (0, express_1.Router)();
 router.use((0, use_collection_1.default)('directus_files'));
 router.get('/:pk/:filename?', 
@@ -102,7 +103,7 @@ router.get('/:pk/:filename?',
 }), 
 // Return file
 (0, async_handler_1.default)(async (req, res) => {
-    var _a, _b, _c;
+    var _a, _b;
     const id = (_a = req.params.pk) === null || _a === void 0 ? void 0 : _a.substring(0, 36);
     const service = new services_1.AssetsService({
         accountability: req.accountability,
@@ -123,11 +124,10 @@ router.get('/:pk/:filename?',
         }
     }
     const { stream, file, stat } = await service.getAsset(id, transformation, range);
-    const access = ((_b = req.accountability) === null || _b === void 0 ? void 0 : _b.role) ? 'private' : 'public';
-    res.attachment((_c = req.params.filename) !== null && _c !== void 0 ? _c : file.filename_download);
+    res.attachment((_b = req.params.filename) !== null && _b !== void 0 ? _b : file.filename_download);
     res.setHeader('Content-Type', file.type);
     res.setHeader('Accept-Ranges', 'bytes');
-    res.setHeader('Cache-Control', `${access}, max-age=${(0, ms_1.default)(env_1.default.ASSETS_CACHE_TTL) / 1000}`);
+    res.setHeader('Cache-Control', (0, get_cache_headers_1.getCacheControlHeader)(req, (0, get_milliseconds_1.getMilliseconds)(env_1.default.ASSETS_CACHE_TTL), false, true));
     const unixTime = Date.parse(file.modified_on);
     if (!Number.isNaN(unixTime)) {
         const lastModifiedDate = new Date(unixTime);

package/dist/controllers/extensions.js

@@ -3,16 +3,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const constants_1 = require("@directus/shared/constants");
+const utils_1 = require("@directus/shared/utils");
 const express_1 = require("express");
-const async_handler_1 = __importDefault(require("../utils/async-handler"));
+const env_1 = __importDefault(require("../env"));
 const exceptions_1 = require("../exceptions");
 const extensions_1 = require("../extensions");
-const ms_1 = __importDefault(require("ms"));
-const env_1 = __importDefault(require("../env"));
-const get_cache_headers_1 = require("../utils/get-cache-headers");
 const respond_1 = require("../middleware/respond");
-const utils_1 = require("@directus/shared/utils");
-const constants_1 = require("@directus/shared/constants");
+const async_handler_1 = __importDefault(require("../utils/async-handler"));
+const get_cache_headers_1 = require("../utils/get-cache-headers");
+const get_milliseconds_1 = require("../utils/get-milliseconds");
 const router = (0, express_1.Router)();
 router.get('/:type', (0, async_handler_1.default)(async (req, res, next) => {
     const type = (0, utils_1.depluralize)(req.params.type);
@@ -33,7 +33,7 @@ router.get('/sources/index.js', (0, async_handler_1.default)(async (req, res) =>
         throw new exceptions_1.RouteNotFoundException(req.path);
     }
     res.setHeader('Content-Type', 'application/javascript; charset=UTF-8');
-    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('Cache-Control', (0, get_cache_headers_1.getCacheControlHeader)(req, (0, get_milliseconds_1.getMilliseconds)(env_1.default.EXTENSIONS_CACHE_TTL), false, false));
     res.setHeader('Vary', 'Origin, Cache-Control');
     res.end(extensionSource);
 }));

package/dist/controllers/files.js

@@ -93,7 +93,7 @@ const multipartHandler = (req, res, next) => {
     function tryDone() {
         if (savedFiles.length === fileCount) {
             if (fileCount === 0) {
-                return next(new exceptions_1.InvalidPayloadException(`No files where included in the body`));
+                return next(new exceptions_1.InvalidPayloadException(`No files were included in the body`));
             }
             res.locals.savedFiles = savedFiles;
             return next();

package/dist/controllers/graphql.js

@@ -10,21 +10,29 @@ const services_1 = require("../services");
 const async_handler_1 = __importDefault(require("../utils/async-handler"));
 const router = (0, express_1.Router)();
 router.use('/system', graphql_1.parseGraphQL, (0, async_handler_1.default)(async (req, res, next) => {
+    var _a, _b;
     const service = new services_1.GraphQLService({
         accountability: req.accountability,
         schema: req.schema,
         scope: 'system',
     });
     res.locals.payload = await service.execute(res.locals.graphqlParams);
+    if (((_b = (_a = res.locals.payload) === null || _a === void 0 ? void 0 : _a.errors) === null || _b === void 0 ? void 0 : _b.length) > 0) {
+        res.locals.cache = false;
+    }
     return next();
 }), respond_1.respond);
 router.use('/', graphql_1.parseGraphQL, (0, async_handler_1.default)(async (req, res, next) => {
+    var _a, _b;
     const service = new services_1.GraphQLService({
         accountability: req.accountability,
         schema: req.schema,
         scope: 'items',
     });
     res.locals.payload = await service.execute(res.locals.graphqlParams);
+    if (((_b = (_a = res.locals.payload) === null || _a === void 0 ? void 0 : _a.errors) === null || _b === void 0 ? void 0 : _b.length) > 0) {
+        res.locals.cache = false;
+    }
     return next();
 }), respond_1.respond);
 exports.default = router;

package/dist/controllers/schema.d.ts

@@ -0,0 +1,2 @@
+declare const router: import("express-serve-static-core").Router;
+export default router;

package/dist/controllers/schema.js

@@ -0,0 +1,98 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("@directus/shared/utils");
+const busboy_1 = __importDefault(require("busboy"));
+const express_1 = __importDefault(require("express"));
+const js_yaml_1 = require("js-yaml");
+const exceptions_1 = require("../exceptions");
+const logger_1 = __importDefault(require("../logger"));
+const respond_1 = require("../middleware/respond");
+const schema_1 = require("../services/schema");
+const async_handler_1 = __importDefault(require("../utils/async-handler"));
+const get_versioned_hash_1 = require("../utils/get-versioned-hash");
+const router = express_1.default.Router();
+router.get('/snapshot', (0, async_handler_1.default)(async (req, res, next) => {
+    const service = new schema_1.SchemaService({ accountability: req.accountability });
+    const currentSnapshot = await service.snapshot();
+    res.locals.payload = { data: currentSnapshot };
+    return next();
+}), respond_1.respond);
+router.post('/apply', (0, async_handler_1.default)(async (req, _res, next) => {
+    const service = new schema_1.SchemaService({ accountability: req.accountability });
+    await service.apply(req.body);
+    return next();
+}), respond_1.respond);
+const schemaMultipartHandler = (req, res, next) => {
+    if (req.is('application/json')) {
+        if (Object.keys(req.body).length === 0)
+            throw new exceptions_1.InvalidPayloadException(`No data was included in the body`);
+        res.locals.uploadedSnapshot = req.body;
+        return next();
+    }
+    if (!req.is('multipart/form-data'))
+        throw new exceptions_1.UnsupportedMediaTypeException(`Unsupported Content-Type header`);
+    const headers = req.headers['content-type']
+        ? req.headers
+        : {
+            ...req.headers,
+            'content-type': 'application/octet-stream',
+        };
+    const busboy = (0, busboy_1.default)({ headers });
+    let isFileIncluded = false;
+    let uploadedSnapshot = null;
+    busboy.on('file', async (_, fileStream, { mimeType }) => {
+        if (isFileIncluded)
+            return next(new exceptions_1.InvalidPayloadException(`More than one file was included in the body`));
+        isFileIncluded = true;
+        const { readableStreamToString } = await import('@directus/utils/node');
+        try {
+            const uploadedString = await readableStreamToString(fileStream);
+            if (mimeType === 'application/json') {
+                try {
+                    uploadedSnapshot = (0, utils_1.parseJSON)(uploadedString);
+                }
+                catch (err) {
+                    logger_1.default.warn(err);
+                    throw new exceptions_1.InvalidPayloadException('Invalid JSON schema snapshot');
+                }
+            }
+            else {
+                try {
+                    uploadedSnapshot = (await (0, js_yaml_1.load)(uploadedString));
+                }
+                catch (err) {
+                    logger_1.default.warn(err);
+                    throw new exceptions_1.InvalidPayloadException('Invalid YAML schema snapshot');
+                }
+            }
+            if (!uploadedSnapshot)
+                throw new exceptions_1.InvalidPayloadException(`No file was included in the body`);
+            res.locals.uploadedSnapshot = uploadedSnapshot;
+            return next();
+        }
+        catch (error) {
+            busboy.emit('error', error);
+        }
+    });
+    busboy.on('error', (error) => next(error));
+    busboy.on('close', () => {
+        if (!isFileIncluded)
+            return next(new exceptions_1.InvalidPayloadException(`No file was included in the body`));
+    });
+    req.pipe(busboy);
+};
+router.post('/diff', (0, async_handler_1.default)(schemaMultipartHandler), (0, async_handler_1.default)(async (req, res, next) => {
+    const service = new schema_1.SchemaService({ accountability: req.accountability });
+    const snapshot = res.locals.uploadedSnapshot;
+    const currentSnapshot = await service.snapshot();
+    const snapshotDiff = await service.diff(snapshot, { currentSnapshot, force: 'force' in req.query });
+    if (!snapshotDiff)
+        return next();
+    const currentSnapshotHash = (0, get_versioned_hash_1.getVersionedHash)(currentSnapshot);
+    res.locals.payload = { data: { hash: currentSnapshotHash, diff: snapshotDiff } };
+    return next();
+}), respond_1.respond);
+exports.default = router;

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

@@ -1,6 +1,6 @@
 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>;
+    changeToType(table: string, column: string, type: (typeof KNEX_TYPES)[number], options?: Options): Promise<void>;
     constraintName(existingName: string): string;
 }

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

@@ -1,6 +1,9 @@
 import { KNEX_TYPES } from '@directus/shared/constants';
+import { Field, Relation, Type } from '@directus/shared/types';
 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>;
+    changeToType(table: string, column: string, type: (typeof KNEX_TYPES)[number], options?: Options): Promise<void>;
     castA2oPrimaryKey(): string;
+    preRelationChange(relation: Partial<Relation>): void;
+    processFieldType(field: Field): Type;
 }

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

@@ -9,5 +9,30 @@ class SchemaHelperOracle extends types_1.SchemaHelper {
     castA2oPrimaryKey() {
         return 'CAST(?? AS VARCHAR2(255))';
     }
+    preRelationChange(relation) {
+        var _a;
+        if (relation.collection === relation.related_collection) {
+            // Constraints are not allowed on self referencing relationships
+            // Setting NO ACTION throws - ORA-00905: missing keyword
+            if ((_a = relation.schema) === null || _a === void 0 ? void 0 : _a.on_delete) {
+                relation.schema.on_delete = null;
+            }
+        }
+    }
+    processFieldType(field) {
+        var _a, _b, _c, _d;
+        if (field.type === 'integer') {
+            if (((_a = field.schema) === null || _a === void 0 ? void 0 : _a.numeric_precision) === 20) {
+                return 'bigInteger';
+            }
+            else if (((_b = field.schema) === null || _b === void 0 ? void 0 : _b.numeric_precision) === 1) {
+                return 'boolean';
+            }
+            else if (((_c = field.schema) === null || _c === void 0 ? void 0 : _c.numeric_precision) || ((_d = field.schema) === null || _d === void 0 ? void 0 : _d.numeric_scale)) {
+                return 'decimal';
+            }
+        }
+        return field.type;
+    }
 }
 exports.SchemaHelperOracle = SchemaHelperOracle;