@directus/api 9.25.1 → 9.26.0

package/dist/app.js

@@ -6,7 +6,6 @@ import { createRequire } from 'node:module';
 import path from 'path';
 import qs from 'qs';
 import { registerAuthProviders } from './auth.js';
-import { flushCaches } from './cache.js';
 import activityRouter from './controllers/activity.js';
 import assetsRouter from './controllers/assets.js';
 import authRouter from './controllers/auth.js';
@@ -76,7 +75,6 @@ export default async function createApp() {
     if ((await validateMigrations()) === false) {
         logger.warn(`Database migrations have not all been run`);
     }
-    await flushCaches();
     await registerAuthProviders();
     const extensionManager = getExtensionManager();
     const flowManager = getFlowManager();

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

@@ -1,5 +1,5 @@
 import { Router } from 'express';
-import { Client } from 'openid-client';
+import type { Client } from 'openid-client';
 import { UsersService } from '../../services/users.js';
 import type { AuthDriverOptions, User } from '../../types/index.js';
 import { LocalAuthDriver } from './local.js';

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

@@ -1,5 +1,5 @@
 import { Router } from 'express';
-import { Client } from 'openid-client';
+import type { Client } from 'openid-client';
 import { UsersService } from '../../services/users.js';
 import type { AuthDriverOptions, User } from '../../types/index.js';
 import { LocalAuthDriver } from './local.js';

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

@@ -1,5 +1,5 @@
 import chalk from 'chalk';
-import execa from 'execa';
+import { execa } from 'execa';
 import inquirer from 'inquirer';
 import Joi from 'joi';
 import ora from 'ora';

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

@@ -9,8 +9,8 @@ import logger from '../../../logger.js';
 import { DiffKind } from '../../../types/index.js';
 import { isNestedMetaUpdate } from '../../../utils/apply-diff.js';
 import { applySnapshot } from '../../../utils/apply-snapshot.js';
-import { getSnapshot } from '../../../utils/get-snapshot.js';
 import { getSnapshotDiff } from '../../../utils/get-snapshot-diff.js';
+import { getSnapshot } from '../../../utils/get-snapshot.js';
 export async function apply(snapshotPath, options) {
     const filename = path.resolve(process.cwd(), snapshotPath);
     const database = getDatabase();

package/dist/controllers/assets.js

@@ -105,18 +105,23 @@ asyncHandler(async (req, res) => {
         accountability: req.accountability,
         schema: req.schema,
     });
+    const vary = ['Origin', 'Cache-Control'];
     const transformation = res.locals['transformation'].key
         ? res.locals['shortcuts'].find((transformation) => transformation['key'] === res.locals['transformation'].key)
         : res.locals['transformation'];
-    if (transformation.format === 'auto' && req.headers.accept) {
-        let format = 'jpg';
-        if (req.headers.accept.includes('image/webp')) {
+    if (transformation.format === 'auto') {
+        let format;
+        if (req.headers.accept?.includes('image/avif')) {
+            format = 'avif';
+        }
+        else if (req.headers.accept?.includes('image/webp')) {
             format = 'webp';
         }
-        else if (req.headers.accept.includes('image/avif')) {
-            format = 'avif';
+        else {
+            format = 'jpg';
         }
         transformation.format = format;
+        vary.push('Accept');
     }
     let range = undefined;
     if (req.headers.range) {
@@ -141,6 +146,7 @@ asyncHandler(async (req, res) => {
     res.setHeader('Content-Type', file.type);
     res.setHeader('Accept-Ranges', 'bytes');
     res.setHeader('Cache-Control', getCacheControlHeader(req, getMilliseconds(env['ASSETS_CACHE_TTL']), false, true));
+    res.setHeader('Vary', vary.join(', '));
     const unixTime = Date.parse(file.modified_on);
     if (!Number.isNaN(unixTime)) {
         const lastModifiedDate = new Date(unixTime);

package/dist/controllers/files.d.ts

@@ -1,4 +1,4 @@
-import { RequestHandler } from 'express';
+import type { RequestHandler } from 'express';
 declare const router: import("express-serve-static-core").Router;
 export declare const multipartHandler: RequestHandler;
 export default router;

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

@@ -1,5 +1,6 @@
 import type { Knex } from 'knex';
-import { FnHelper, FnHelperOptions } from '../types.js';
+import type { FnHelperOptions } from '../types.js';
+import { FnHelper } from '../types.js';
 export declare class FnHelperMSSQL extends FnHelper {
     year(table: string, column: string, options: FnHelperOptions): Knex.Raw;
     month(table: string, column: string, options: FnHelperOptions): Knex.Raw;

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

@@ -1,5 +1,6 @@
 import type { Knex } from 'knex';
-import { FnHelper, FnHelperOptions } from '../types.js';
+import type { FnHelperOptions } from '../types.js';
+import { FnHelper } from '../types.js';
 export declare class FnHelperMySQL extends FnHelper {
     year(table: string, column: string): Knex.Raw;
     month(table: string, column: string): Knex.Raw;

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

@@ -1,5 +1,6 @@
 import type { Knex } from 'knex';
-import { FnHelper, FnHelperOptions } from '../types.js';
+import type { FnHelperOptions } from '../types.js';
+import { FnHelper } from '../types.js';
 export declare class FnHelperOracle extends FnHelper {
     year(table: string, column: string, options: FnHelperOptions): Knex.Raw;
     month(table: string, column: string, options: FnHelperOptions): Knex.Raw;

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

@@ -1,5 +1,6 @@
 import type { Knex } from 'knex';
-import { FnHelper, FnHelperOptions } from '../types.js';
+import type { FnHelperOptions } from '../types.js';
+import { FnHelper } from '../types.js';
 export declare class FnHelperPostgres extends FnHelper {
     year(table: string, column: string, options: FnHelperOptions): Knex.Raw;
     month(table: string, column: string, options: FnHelperOptions): Knex.Raw;

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

@@ -1,5 +1,6 @@
 import type { Knex } from 'knex';
-import { FnHelper, FnHelperOptions } from '../types.js';
+import type { FnHelperOptions } from '../types.js';
+import { FnHelper } from '../types.js';
 export declare class FnHelperSQLite extends FnHelper {
     year(table: string, column: string, options?: FnHelperOptions): Knex.Raw;
     month(table: string, column: string, options?: FnHelperOptions): Knex.Raw;

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

@@ -1,6 +1,6 @@
 import type { Field, RawField } from '@directus/types';
 import type { Knex } from 'knex';
-import { GeoJSONGeometry } from 'wellknown';
+import type { GeoJSONGeometry } from 'wellknown';
 import { DatabaseHelper } from '../types.js';
 export declare abstract class GeometryHelper extends DatabaseHelper {
     supported(): boolean | Promise<boolean>;

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

@@ -1,5 +1,6 @@
 import type { KNEX_TYPES } from '@directus/constants';
-import { Options, SchemaHelper } from '../types.js';
+import type { Options } from '../types.js';
+import { SchemaHelper } from '../types.js';
 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/oracle.d.ts

@@ -1,6 +1,7 @@
 import type { KNEX_TYPES } from '@directus/constants';
 import type { Field, Relation, Type } from '@directus/types';
-import { Options, SchemaHelper } from '../types.js';
+import type { Options } from '../types.js';
+import { SchemaHelper } from '../types.js';
 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/migrations/run.js

@@ -4,6 +4,7 @@ import { orderBy } from 'lodash-es';
 import { dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import path from 'path';
+import { flushCaches } from '../../cache.js';
 import env from '../../env.js';
 import logger from '../../logger.js';
 const __dirname = dirname(fileURLToPath(import.meta.url));
@@ -59,6 +60,7 @@ export default async function run(database, direction, log = true) {
         }
         await up(database);
         await database.insert({ version: nextVersion.version, name: nextVersion.name }).into('directus_migrations');
+        await flushCaches(true);
     }
     async function down() {
         const lastAppliedMigration = orderBy(completedMigrations, ['timestamp', 'version'], ['desc', 'desc'])[0];
@@ -75,10 +77,13 @@ export default async function run(database, direction, log = true) {
         }
         await down(database);
         await database('directus_migrations').delete().where({ version: migration.version });
+        await flushCaches(true);
     }
     async function latest() {
+        let needsCacheFlush = false;
         for (const migration of migrations) {
             if (migration.completed === false) {
+                needsCacheFlush = true;
                 const { up } = await import(`file://${migration.file}`);
                 if (log) {
                     logger.info(`Applying ${migration.name}...`);
@@ -87,5 +92,8 @@ export default async function run(database, direction, log = true) {
                 await database.insert({ version: migration.version, name: migration.name }).into('directus_migrations');
             }
         }
+        if (needsCacheFlush) {
+            await flushCaches(true);
+        }
     }
 }

package/dist/extensions.js

@@ -5,9 +5,8 @@ import { ensureExtensionDirs, generateExtensionsEntrypoint, getLocalExtensions,
 import aliasDefault from '@rollup/plugin-alias';
 import nodeResolveDefault from '@rollup/plugin-node-resolve';
 import virtualDefault from '@rollup/plugin-virtual';
-import chokidar from 'chokidar';
+import chokidar, { FSWatcher } from 'chokidar';
 import express, { Router } from 'express';
-import globby from 'globby';
 import { clone, escapeRegExp } from 'lodash-es';
 import { schedule, validate } from 'node-cron';
 import { readdir } from 'node:fs/promises';
@@ -67,15 +66,15 @@ class ExtensionManager {
         this.appExtensionChunks = new Map();
     }
     async initialize(options = {}) {
-        const prevOptions = this.options;
         this.options = {
             ...defaultOptions,
             ...options,
         };
-        if (!prevOptions.watch && this.options.watch) {
+        const wasWatcherInitialized = this.watcher !== null;
+        if (this.options.watch && !wasWatcherInitialized) {
             this.initializeWatcher();
         }
-        else if (prevOptions.watch && !this.options.watch) {
+        else if (!this.options.watch && wasWatcherInitialized) {
             await this.closeWatcher();
         }
         if (!this.isLoaded) {
@@ -85,7 +84,7 @@ class ExtensionManager {
                 logger.info(`Loaded extensions: ${loadedExtensions.map((ext) => ext.name).join(', ')}`);
             }
         }
-        if (!prevOptions.watch && this.options.watch) {
+        if (this.options.watch && !wasWatcherInitialized) {
             this.updateWatchedExtensions(this.extensions);
         }
     }
@@ -198,35 +197,39 @@ class ExtensionManager {
         this.isLoaded = false;
     }
     initializeWatcher() {
-        if (!this.watcher) {
-            logger.info('Watching extensions for changes...');
-            const localExtensionPaths = NESTED_EXTENSION_TYPES.flatMap((type) => {
-                const typeDir = path.posix.join(pathToRelativeUrl(env['EXTENSIONS_PATH']), pluralize(type));
-                if (isIn(type, HYBRID_EXTENSION_TYPES)) {
-                    return [path.posix.join(typeDir, '*', 'app.js'), path.posix.join(typeDir, '*', 'api.js')];
-                }
-                else {
-                    return path.posix.join(typeDir, '*', 'index.js');
-                }
-            });
-            this.watcher = chokidar.watch([path.resolve('package.json'), ...localExtensionPaths], {
-                ignoreInitial: true,
-            });
-            this.watcher
-                .on('add', () => this.reload())
-                .on('change', () => this.reload())
-                .on('unlink', () => this.reload());
-        }
+        logger.info('Watching extensions for changes...');
+        const extensionDirUrl = pathToRelativeUrl(env['EXTENSIONS_PATH']);
+        const localExtensionUrls = NESTED_EXTENSION_TYPES.flatMap((type) => {
+            const typeDir = path.posix.join(extensionDirUrl, pluralize(type));
+            const fileExts = ['js', 'mjs', 'cjs'];
+            if (isIn(type, HYBRID_EXTENSION_TYPES)) {
+                return [
+                    path.posix.join(typeDir, '*', `app.{${fileExts.join()}}`),
+                    path.posix.join(typeDir, '*', `api.{${fileExts.join()}}`),
+                ];
+            }
+            else {
+                return path.posix.join(typeDir, '*', `index.{${fileExts.join()}}`);
+            }
+        });
+        this.watcher = chokidar.watch([path.resolve('package.json'), path.posix.join(extensionDirUrl, '*', 'package.json'), ...localExtensionUrls], {
+            ignoreInitial: true,
+        });
+        this.watcher
+            .on('add', () => this.reload())
+            .on('change', () => this.reload())
+            .on('unlink', () => this.reload());
     }
     async closeWatcher() {
         if (this.watcher) {
             await this.watcher.close();
+            this.watcher = null;
         }
     }
     updateWatchedExtensions(added, removed = []) {
         if (this.watcher) {
             const toPackageExtensionPaths = (extensions) => extensions
-                .filter((extension) => !extension.local)
+                .filter((extension) => !extension.local || extension.type === 'bundle')
                 .flatMap((extension) => isTypeIn(extension, HYBRID_EXTENSION_TYPES) || extension.type === 'bundle'
                 ? [
                     path.resolve(extension.path, extension.entrypoint.app),
@@ -295,7 +298,7 @@ class ExtensionManager {
         for (const hook of hooks) {
             try {
                 const hookPath = path.resolve(hook.path, hook.entrypoint);
-                const hookInstance = await import(`file://${hookPath}`);
+                const hookInstance = await import(`./${pathToRelativeUrl(hookPath, __dirname)}?t=${Date.now()}`);
                 const config = getModuleDefault(hookInstance);
                 this.registerHook(config);
                 this.apiExtensions.push({ path: hookPath });
@@ -311,7 +314,7 @@ class ExtensionManager {
         for (const endpoint of endpoints) {
             try {
                 const endpointPath = path.resolve(endpoint.path, endpoint.entrypoint);
-                const endpointInstance = await import(`file://${endpointPath}`);
+                const endpointInstance = await import(`./${pathToRelativeUrl(endpointPath, __dirname)}?t=${Date.now()}`);
                 const config = getModuleDefault(endpointInstance);
                 this.registerEndpoint(config, endpoint.name);
                 this.apiExtensions.push({ path: endpointPath });
@@ -323,20 +326,17 @@ class ExtensionManager {
         }
     }
     async registerOperations() {
-        const internalPaths = await globby(path.posix.join(pathToRelativeUrl(__dirname), 'operations/*/index.(js|ts)'));
-        const internalOperations = internalPaths.map((internalPath) => {
-            const dirs = internalPath.split(path.sep);
-            return {
-                name: dirs[dirs.length - 2],
-                path: dirs.slice(0, -1).join(path.sep),
-                entrypoint: { api: dirs[dirs.length - 1] },
-            };
-        });
+        const internalOperations = await readdir(path.join(__dirname, 'operations'));
+        for (const operation of internalOperations) {
+            const operationInstance = await import(`./operations/${operation}/index.js`);
+            const config = getModuleDefault(operationInstance);
+            this.registerOperation(config);
+        }
         const operations = this.extensions.filter((extension) => extension.type === 'operation');
-        for (const operation of [...internalOperations, ...operations]) {
+        for (const operation of operations) {
             try {
                 const operationPath = path.resolve(operation.path, operation.entrypoint.api);
-                const operationInstance = await import(`file://${operationPath}`);
+                const operationInstance = await import(`./${pathToRelativeUrl(operationPath, __dirname)}?t=${Date.now()}`);
                 const config = getModuleDefault(operationInstance);
                 this.registerOperation(config);
                 this.apiExtensions.push({ path: operationPath });
@@ -352,7 +352,7 @@ class ExtensionManager {
         for (const bundle of bundles) {
             try {
                 const bundlePath = path.resolve(bundle.path, bundle.entrypoint.api);
-                const bundleInstances = await import(`file://${bundlePath}`);
+                const bundleInstances = await import(`./${pathToRelativeUrl(bundlePath, __dirname)}?t=${Date.now()}`);
                 const configs = getModuleDefault(bundleInstances);
                 for (const { config } of configs.hooks) {
                     this.registerHook(config);

package/dist/mailer.d.ts

@@ -1,2 +1,2 @@
-import { Transporter } from 'nodemailer';
+import type { Transporter } from 'nodemailer';
 export default function getMailer(): Transporter;

package/dist/operations/exec/index.js

@@ -1,6 +1,6 @@
 import { defineOperationApi, toArray } from '@directus/utils';
-import { NodeVM, VMScript } from 'vm2';
 import { isBuiltin } from 'node:module';
+import { NodeVM, VMScript } from 'vm2';
 export default defineOperationApi({
     id: 'exec',
     handler: async ({ code }, { data, env }) => {

package/dist/operations/mail/index.d.ts

@@ -1,7 +1,9 @@
-type Options = {
-    body: string;
+export type Options = {
+    body?: string;
+    template?: string;
+    data?: Record<string, any>;
     to: string;
-    type: 'wysiwyg' | 'markdown';
+    type: 'wysiwyg' | 'markdown' | 'template';
     subject: string;
 };
 declare const _default: import("@directus/types").OperationApiConfig<Options>;

package/dist/operations/mail/index.js

@@ -3,15 +3,19 @@ import { MailService } from '../../services/mail/index.js';
 import { md } from '../../utils/md.js';
 export default defineOperationApi({
     id: 'mail',
-    handler: async ({ body, to, type, subject }, { accountability, database, getSchema }) => {
+    handler: async ({ body, template, data, to, type, subject }, { accountability, database, getSchema }) => {
         const mailService = new MailService({ schema: await getSchema({ database }), accountability, knex: database });
-        // If 'body' is of type object/undefined (happens when body consists solely of a placeholder)
-        // convert it to JSON string
+        const mailObject = { to, subject };
         const safeBody = typeof body !== 'string' ? JSON.stringify(body) : body;
-        await mailService.send({
-            html: type === 'wysiwyg' ? safeBody : md(safeBody),
-            to,
-            subject,
-        });
+        if (type === 'template') {
+            mailObject.template = {
+                name: template || 'base',
+                data: data || {},
+            };
+        }
+        else {
+            mailObject.html = type === 'wysiwyg' ? safeBody : md(safeBody);
+        }
+        await mailService.send(mailObject);
     },
 });

package/dist/operations/mail/index.test.d.ts

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

package/dist/rate-limiter.d.ts

@@ -1,4 +1,4 @@
-import { IRateLimiterOptions, IRateLimiterStoreOptions, RateLimiterAbstract } from 'rate-limiter-flexible';
+import type { IRateLimiterOptions, IRateLimiterStoreOptions, RateLimiterAbstract } from 'rate-limiter-flexible';
 type IRateLimiterOptionsOverrides = Partial<IRateLimiterOptions> | Partial<IRateLimiterStoreOptions>;
 export declare function createRateLimiter(configPrefix?: string, configOverrides?: IRateLimiterOptionsOverrides): RateLimiterAbstract;
 export {};

package/dist/rate-limiter.js

@@ -1,5 +1,5 @@
 import { merge } from 'lodash-es';
-import { RateLimiterMemcache, RateLimiterMemory, RateLimiterRedis, } from 'rate-limiter-flexible';
+import { RateLimiterMemcache, RateLimiterMemory, RateLimiterRedis } from 'rate-limiter-flexible';
 import env from './env.js';
 import { getConfigFromEnv } from './utils/get-config-from-env.js';
 import { createRequire } from 'node:module';

package/dist/server.js

@@ -1,17 +1,17 @@
+import { isUpToDate } from '@directus/update-check';
 import { createTerminus } from '@godaddy/terminus';
 import * as http from 'http';
 import * as https from 'https';
 import { once } from 'lodash-es';
 import qs from 'qs';
-import { isUpToDate } from '@directus/update-check';
 import url from 'url';
-import * as pkg from './utils/package.js';
 import createApp from './app.js';
 import getDatabase from './database/index.js';
 import emitter from './emitter.js';
 import env from './env.js';
 import logger from './logger.js';
 import { getConfigFromEnv } from './utils/get-config-from-env.js';
+import * as pkg from './utils/package.js';
 export let SERVER_ONLINE = true;
 export async function createServer() {
     const server = http.createServer(await createApp());

package/dist/services/collections.d.ts

@@ -1,8 +1,8 @@
+import type { SchemaInspector, Table } from '@directus/schema';
 import type { Accountability, RawField, SchemaOverview } from '@directus/types';
 import type Keyv from 'keyv';
 import type { Knex } from 'knex';
-import type { Table, SchemaInspector } from '@directus/schema';
-import { Helpers } from '../database/helpers/index.js';
+import type { Helpers } from '../database/helpers/index.js';
 import type { AbstractServiceOptions, Collection, CollectionMeta, MutationOptions } from '../types/index.js';
 export type RawCollection = {
     collection: string;

package/dist/services/collections.js

@@ -1,10 +1,10 @@
 import { createInspector } from '@directus/schema';
 import { addFieldFlag } from '@directus/utils';
-import { omit, chunk } from 'lodash-es';
+import { chunk, omit } from 'lodash-es';
 import { clearSystemCache, getCache } from '../cache.js';
 import { ALIAS_TYPES } from '../constants.js';
-import getDatabase, { getSchemaInspector } from '../database/index.js';
 import { getHelpers } from '../database/helpers/index.js';
+import getDatabase, { getSchemaInspector } from '../database/index.js';
 import { systemCollectionRows } from '../database/system-data/collections/index.js';
 import emitter from '../emitter.js';
 import env from '../env.js';

package/dist/services/fields.d.ts

@@ -2,7 +2,7 @@ import type { Column, SchemaInspector } from '@directus/schema';
 import type { Accountability, Field, RawField, SchemaOverview, Type } from '@directus/types';
 import type Keyv from 'keyv';
 import type { Knex } from 'knex';
-import { Helpers } from '../database/helpers/index.js';
+import type { Helpers } from '../database/helpers/index.js';
 import { ItemsService } from '../services/items.js';
 import { PayloadService } from '../services/payload.js';
 import type { AbstractServiceOptions, MutationOptions } from '../types/index.js';

package/dist/services/fields.js

@@ -1,5 +1,5 @@
-import { createInspector } from '@directus/schema';
 import { KNEX_TYPES, REGEX_BETWEEN_PARENS } from '@directus/constants';
+import { createInspector } from '@directus/schema';
 import { addFieldFlag, toArray } from '@directus/utils';
 import { isEqual, isNil } from 'lodash-es';
 import { clearSystemCache, getCache } from '../cache.js';

package/dist/services/graphql/index.d.ts

@@ -1,6 +1,7 @@
 import type { BaseException } from '@directus/exceptions';
 import type { Accountability, Filter, Query, SchemaOverview } from '@directus/types';
-import { ArgumentNode, FormattedExecutionResult, FragmentDefinitionNode, GraphQLError, GraphQLResolveInfo, GraphQLSchema, SelectionNode } from 'graphql';
+import type { ArgumentNode, FormattedExecutionResult, FragmentDefinitionNode, GraphQLResolveInfo, SelectionNode } from 'graphql';
+import { GraphQLError, GraphQLSchema } from 'graphql';
 import { ObjectTypeComposer, SchemaComposer } from 'graphql-compose';
 import type { Knex } from 'knex';
 import type { AbstractServiceOptions, GraphQLParams, Item } from '../../types/index.js';

package/dist/services/graphql/index.js

@@ -1,9 +1,8 @@
-import { FUNCTIONS } from '@directus/constants';
-import { Action } from '@directus/constants';
+import { Action, FUNCTIONS } from '@directus/constants';
 import { parseFilterFunctionPath } from '@directus/utils';
 import argon2 from 'argon2';
-import { execute, GraphQLBoolean, GraphQLEnumType, GraphQLError, GraphQLFloat, GraphQLID, GraphQLInt, GraphQLList, GraphQLNonNull, GraphQLObjectType, GraphQLString, GraphQLUnionType, NoSchemaIntrospectionCustomRule, specifiedRules, validate, } from 'graphql';
-import { GraphQLJSON, SchemaComposer, toInputObjectType, } from 'graphql-compose';
+import { GraphQLBoolean, GraphQLEnumType, GraphQLError, GraphQLFloat, GraphQLID, GraphQLInt, GraphQLList, GraphQLNonNull, GraphQLObjectType, GraphQLScalarType, GraphQLSchema, GraphQLString, GraphQLUnionType, NoSchemaIntrospectionCustomRule, execute, specifiedRules, validate, } from 'graphql';
+import { GraphQLJSON, InputTypeComposer, ObjectTypeComposer, SchemaComposer, toInputObjectType } from 'graphql-compose';
 import { flatten, get, mapKeys, merge, omit, pick, set, transform, uniq } from 'lodash-es';
 import { clearSystemCache, getCache } from '../../cache.js';
 import { DEFAULT_AUTH_PROVIDER, GENERATE_SPECIAL } from '../../constants.js';

package/dist/services/graphql/utils/add-path-to-validation-error.js

@@ -1,4 +1,4 @@
-import { locatedError } from 'graphql';
+import { GraphQLError, Token, locatedError } from 'graphql';
 export function addPathToValidationError(validationError) {
     const token = validationError.nodes?.[0]?.loc?.startToken;
     if (!token)

package/dist/services/payload.d.ts

@@ -1,6 +1,6 @@
 import type { Accountability, SchemaOverview } from '@directus/types';
 import type { Knex } from 'knex';
-import { Helpers } from '../database/helpers/index.js';
+import type { Helpers } from '../database/helpers/index.js';
 import type { AbstractServiceOptions, ActionEventParams, Item, MutationOptions, PrimaryKey } from '../types/index.js';
 type Action = 'create' | 'read' | 'update';
 type Transformers = {

package/dist/services/payload.js

@@ -1,12 +1,12 @@
-import { format, parseISO, isValid } from 'date-fns';
 import { parseJSON, toArray } from '@directus/utils';
+import { format, isValid, parseISO } from 'date-fns';
 import flat from 'flat';
 import Joi from 'joi';
 import { clone, cloneDeep, isNil, isObject, isPlainObject, omit, pick } from 'lodash-es';
 import { v4 as uuid } from 'uuid';
 import { parse as wktToGeoJSON } from 'wellknown';
-import getDatabase from '../database/index.js';
 import { getHelpers } from '../database/helpers/index.js';
+import getDatabase from '../database/index.js';
 import { ForbiddenException, InvalidPayloadException } from '../exceptions/index.js';
 import { generateHash } from '../utils/generate-hash.js';
 import { ItemsService } from './items.js';

package/dist/services/permissions.d.ts

@@ -1,6 +1,7 @@
 import type { PermissionsAction, Query } from '@directus/types';
 import type Keyv from 'keyv';
-import { ItemsService, QueryOptions } from '../services/items.js';
+import type { QueryOptions } from '../services/items.js';
+import { ItemsService } from '../services/items.js';
 import type { AbstractServiceOptions, Item, MutationOptions, PrimaryKey } from '../types/index.js';
 export declare class PermissionsService extends ItemsService {
     systemCache: Keyv<any>;

package/dist/services/relations.d.ts

@@ -1,10 +1,11 @@
+import type { SchemaInspector } from '@directus/schema';
 import type { Accountability, Relation, RelationMeta, SchemaOverview } from '@directus/types';
 import type Keyv from 'keyv';
 import type { Knex } from 'knex';
-import type { SchemaInspector } from '@directus/schema';
-import { Helpers } from '../database/helpers/index.js';
+import type { Helpers } from '../database/helpers/index.js';
 import type { AbstractServiceOptions, MutationOptions } from '../types/index.js';
-import { ItemsService, QueryOptions } from './items.js';
+import type { QueryOptions } from './items.js';
+import { ItemsService } from './items.js';
 import { PermissionsService } from './permissions.js';
 export declare class RelationsService {
     knex: Knex;

package/dist/services/relations.js

@@ -1,8 +1,8 @@
 import { createInspector } from '@directus/schema';
 import { toArray } from '@directus/utils';
 import { clearSystemCache, getCache } from '../cache.js';
-import getDatabase, { getSchemaInspector } from '../database/index.js';
 import { getHelpers } from '../database/helpers/index.js';
+import getDatabase, { getSchemaInspector } from '../database/index.js';
 import { systemRelationRows } from '../database/system-data/relations/index.js';
 import emitter from '../emitter.js';
 import { ForbiddenException, InvalidPayloadException } from '../exceptions/index.js';

package/dist/services/server.js

@@ -150,7 +150,8 @@ export class ServerService {
             }
             const endTime = performance.now();
             checks[`${client}:responseTime`][0].observedValue = +(endTime - startTime).toFixed(3);
-            if (checks[`${client}:responseTime`][0].observedValue > checks[`${client}:responseTime`][0].threshold &&
+            if (Number(checks[`${client}:responseTime`][0].observedValue) >
+                checks[`${client}:responseTime`][0].threshold &&
                 checks[`${client}:responseTime`][0].status !== 'error') {
                 checks[`${client}:responseTime`][0].status = 'warn';
             }
@@ -307,7 +308,7 @@ export class ServerService {
                 finally {
                     const endTime = performance.now();
                     checks[`storage:${location}:responseTime`][0].observedValue = +(endTime - startTime).toFixed(3);
-                    if (checks[`storage:${location}:responseTime`][0].observedValue >
+                    if (Number(checks[`storage:${location}:responseTime`][0].observedValue) >
                         checks[`storage:${location}:responseTime`][0].threshold &&
                         checks[`storage:${location}:responseTime`][0].status !== 'error') {
                         checks[`storage:${location}:responseTime`][0].status = 'warn';

package/dist/services/webhooks.d.ts

@@ -1,4 +1,4 @@
-import { Messenger } from '../messenger.js';
+import type { Messenger } from '../messenger.js';
 import type { AbstractServiceOptions, Item, MutationOptions, PrimaryKey, Webhook } from '../types/index.js';
 import { ItemsService } from './items.js';
 export declare class WebhooksService extends ItemsService<Webhook> {

package/dist/utils/apply-diff.d.ts

@@ -1,7 +1,7 @@
 import type { SchemaOverview } from '@directus/types';
 import type { Diff } from 'deep-diff';
 import type { Knex } from 'knex';
-import { Snapshot, SnapshotDiff, SnapshotField } from '../types/index.js';
+import type { Snapshot, SnapshotDiff, SnapshotField } from '../types/index.js';
 export declare function applyDiff(currentSnapshot: Snapshot, snapshotDiff: SnapshotDiff, options?: {
     database?: Knex;
     schema?: SchemaOverview;

package/dist/utils/apply-diff.js

@@ -1,15 +1,15 @@
 import deepDiff from 'deep-diff';
 import { cloneDeep, merge, set } from 'lodash-es';
 import { clearSystemCache } from '../cache.js';
+import { getHelpers } from '../database/helpers/index.js';
 import getDatabase from '../database/index.js';
 import emitter from '../emitter.js';
 import logger from '../logger.js';
 import { CollectionsService } from '../services/collections.js';
 import { FieldsService } from '../services/fields.js';
 import { RelationsService } from '../services/relations.js';
-import { DiffKind, } from '../types/index.js';
+import { DiffKind } from '../types/index.js';
 import { getSchema } from './get-schema.js';
-import { getHelpers } from '../database/helpers/index.js';
 export async function applyDiff(currentSnapshot, snapshotDiff, options) {
     const database = options?.database ?? getDatabase();
     const helpers = getHelpers(database);

package/dist/utils/apply-query.d.ts

@@ -1,6 +1,6 @@
 import type { Aggregate, Filter, Query, SchemaOverview } from '@directus/types';
 import type { Knex } from 'knex';
-import { AliasMap } from './get-column-path.js';
+import type { AliasMap } from './get-column-path.js';
 export declare const generateAlias: (size?: number | undefined) => string;
 /**
  * Apply the Query to a given Knex query builder instance

package/dist/utils/apply-query.js

@@ -3,8 +3,8 @@ import { clone, isPlainObject } from 'lodash-es';
 import validate from 'uuid-validate';
 import { getHelpers } from '../database/helpers/index.js';
 import { InvalidQueryException } from '../exceptions/invalid-query.js';
-import { getColumn } from './get-column.js';
 import { getColumnPath } from './get-column-path.js';
+import { getColumn } from './get-column.js';
 import { getRelationInfo } from './get-relation-info.js';
 import { stripFunction } from './strip-function.js';
 // @ts-ignore

package/dist/utils/get-cache-key.js

@@ -1,10 +1,12 @@
 import hash from 'object-hash';
 import url from 'url';
 import { getGraphqlQueryAndVariables } from './get-graphql-query-and-variables.js';
+import { version } from './package.js';
 export function getCacheKey(req) {
     const path = url.parse(req.originalUrl).pathname;
     const isGraphQl = path?.startsWith('/graphql');
     const info = {
+        version,
         user: req.accountability?.user || null,
         path,
         query: isGraphQl ? getGraphqlQueryAndVariables(req) : req.sanitizedQuery,

package/dist/utils/get-graphql-type.d.ts

@@ -1,3 +1,4 @@
 import type { Type } from '@directus/types';
-import { GraphQLList, GraphQLScalarType, GraphQLType } from 'graphql';
+import type { GraphQLType } from 'graphql';
+import { GraphQLList, GraphQLScalarType } from 'graphql';
 export declare function getGraphQLType(localType: Type | 'alias' | 'unknown', special: string[]): GraphQLScalarType | GraphQLList<GraphQLType>;

package/dist/utils/get-graphql-type.js

@@ -1,4 +1,4 @@
-import { GraphQLBoolean, GraphQLFloat, GraphQLInt, GraphQLList, GraphQLString, } from 'graphql';
+import { GraphQLBoolean, GraphQLFloat, GraphQLInt, GraphQLList, GraphQLScalarType, GraphQLString } from 'graphql';
 import { GraphQLJSON } from 'graphql-compose';
 import { GraphQLBigInt } from '../services/graphql/types/bigint.js';
 import { GraphQLDate } from '../services/graphql/types/date.js';

package/dist/utils/get-snapshot-diff.d.ts

@@ -1,2 +1,2 @@
-import { Snapshot, SnapshotDiff } from '../types/index.js';
+import type { Snapshot, SnapshotDiff } from '../types/index.js';
 export declare function getSnapshotDiff(current: Snapshot, after: Snapshot): SnapshotDiff;

package/dist/utils/validate-diff.d.ts

@@ -1,4 +1,4 @@
-import { SnapshotDiffWithHash, SnapshotWithHash } from '../types/snapshot.js';
+import type { SnapshotDiffWithHash, SnapshotWithHash } from '../types/snapshot.js';
 /**
  * Validates the diff against the current schema snapshot.
  *

package/dist/utils/validate-snapshot.d.ts

@@ -1,4 +1,4 @@
-import { Snapshot } from '../types/index.js';
+import type { Snapshot } from '../types/index.js';
 /**
  * Validates the snapshot against the current instance.
  **/

package/dist/utils/validate-snapshot.js

@@ -1,10 +1,10 @@
-import { version as currentDirectusVersion } from './package.js';
-import { InvalidPayloadException } from '../exceptions/invalid-payload.js';
-import { getDatabaseClient } from '../database/index.js';
-import Joi from 'joi';
 import { TYPES } from '@directus/constants';
+import Joi from 'joi';
 import { ALIAS_TYPES } from '../constants.js';
+import { getDatabaseClient } from '../database/index.js';
+import { InvalidPayloadException } from '../exceptions/invalid-payload.js';
 import { DatabaseClients } from '../types/index.js';
+import { version as currentDirectusVersion } from './package.js';
 const snapshotJoiSchema = Joi.object({
     version: Joi.number().valid(1).required(),
     directus: Joi.string().required(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@directus/api",
-  "version": "9.25.1",
+  "version": "9.26.0",
   "description": "Directus is a real-time API and App dashboard for managing SQL database content",
   "type": "module",
   "keywords": [
@@ -64,21 +64,21 @@
   ],
   "dependencies": {
     "@authenio/samlify-node-xmllint": "2.0.0",
-    "@aws-sdk/client-ses": "3.292.0",
+    "@aws-sdk/client-ses": "3.316.0",
     "@directus/format-title": "10.0.0",
-    "@godaddy/terminus": "4.11.2",
-    "@rollup/plugin-alias": "4.0.3",
-    "@rollup/plugin-node-resolve": "15.0.1",
+    "@godaddy/terminus": "4.12.0",
+    "@rollup/plugin-alias": "5.0.0",
+    "@rollup/plugin-node-resolve": "15.0.2",
     "@rollup/plugin-virtual": "3.0.1",
     "argon2": "0.30.3",
     "async": "3.2.4",
-    "axios": "1.3.4",
+    "axios": "1.3.6",
     "busboy": "1.6.0",
     "bytes": "3.1.2",
-    "camelcase": "6.3.0",
-    "chalk": "4.1.2",
+    "camelcase": "7.0.1",
+    "chalk": "5.2.0",
     "chokidar": "3.5.3",
-    "commander": "9.5.0",
+    "commander": "10.0.1",
     "content-disposition": "0.5.4",
     "cookie-parser": "1.4.6",
     "cors": "2.8.5",
@@ -89,20 +89,19 @@
     "dotenv": "16.0.3",
     "encodeurl": "1.0.2",
     "eventemitter2": "6.4.9",
-    "execa": "5.1.1",
+    "execa": "7.1.1",
     "exif-reader": "1.2.0",
     "express": "4.18.2",
     "fast-redact": "3.1.2",
     "flat": "5.0.2",
-    "fs-extra": "11.1.0",
-    "globby": "11.1.0",
+    "fs-extra": "11.1.1",
     "graphql": "16.6.0",
     "graphql-compose": "9.0.10",
-    "helmet": "6.0.1",
-    "icc": "2.0.0",
-    "inquirer": "8.2.5",
-    "ioredis": "5.3.1",
-    "joi": "17.8.4",
+    "helmet": "6.1.5",
+    "icc": "3.0.0",
+    "inquirer": "9.1.5",
+    "ioredis": "5.3.2",
+    "joi": "17.9.1",
     "js-yaml": "4.1.0",
     "js2xmlparser": "5.0.0",
     "json2csv": "5.0.7",
@@ -110,20 +109,20 @@
     "keyv": "4.5.2",
     "knex": "2.4.2",
     "ldapjs": "2.3.3",
-    "liquidjs": "10.6.1",
+    "liquidjs": "10.7.0",
     "lodash-es": "4.17.21",
-    "marked": "4.2.12",
+    "marked": "4.3.0",
     "micromustache": "8.0.3",
     "mime-types": "2.1.35",
     "ms": "2.1.3",
-    "nanoid": "3.3.4",
+    "nanoid": "4.0.2",
     "node-cron": "3.0.2",
     "node-machine-id": "1.1.12",
     "nodemailer": "6.9.1",
     "object-hash": "3.0.0",
     "openapi3-ts": "3.2.0",
     "openid-client": "5.4.0",
-    "ora": "5.4.1",
+    "ora": "6.3.0",
     "otplib": "12.0.1",
     "pino": "8.11.0",
     "pino-http": "8.3.3",
@@ -131,38 +130,38 @@
     "pino-pretty": "10.0.0",
     "qs": "6.11.1",
     "rate-limiter-flexible": "2.4.1",
-    "rollup": "3.19.1",
+    "rollup": "3.20.7",
     "samlify": "2.8.10",
     "sanitize-html": "2.10.0",
-    "sharp": "0.31.3",
+    "sharp": "0.32.0",
     "snappy": "7.2.2",
     "stream-json": "1.7.5",
-    "strip-bom-stream": "4.0.0",
+    "strip-bom-stream": "5.0.0",
     "tmp-promise": "3.0.3",
     "tsx": "3.12.6",
     "uuid": "9.0.0",
     "uuid-validate": "0.0.3",
-    "vm2": "3.9.16",
+    "vm2": "3.9.17",
     "wellknown": "0.5.0",
-    "@directus/app": "9.25.1",
-    "@directus/constants": "9.25.1",
-    "@directus/exceptions": "9.25.1",
-    "@directus/extensions-sdk": "9.25.1",
-    "@directus/schema": "9.25.1",
-    "@directus/specs": "9.25.1",
-    "@directus/storage": "9.25.1",
-    "@directus/storage-driver-azure": "9.25.1",
-    "@directus/storage-driver-cloudinary": "9.25.1",
-    "@directus/storage-driver-gcs": "9.25.1",
-    "@directus/storage-driver-local": "9.25.1",
-    "@directus/storage-driver-s3": "9.25.1",
-    "@directus/update-check": "9.25.1",
-    "@directus/utils": "9.25.1"
+    "@directus/app": "9.26.0",
+    "@directus/constants": "9.26.0",
+    "@directus/exceptions": "9.26.0",
+    "@directus/extensions-sdk": "9.26.0",
+    "@directus/schema": "9.26.0",
+    "@directus/specs": "9.26.0",
+    "@directus/storage": "9.26.0",
+    "@directus/storage-driver-azure": "9.26.0",
+    "@directus/storage-driver-cloudinary": "9.26.0",
+    "@directus/storage-driver-gcs": "9.26.0",
+    "@directus/storage-driver-local": "9.26.0",
+    "@directus/storage-driver-s3": "9.26.0",
+    "@directus/update-check": "9.26.0",
+    "@directus/utils": "9.26.0"
   },
   "devDependencies": {
-    "@directus/tsconfig": "0.0.6",
+    "@directus/tsconfig": "0.0.7",
     "@ngneat/falso": "6.4.0",
-    "@types/async": "3.2.18",
+    "@types/async": "3.2.19",
     "@types/busboy": "1.5.0",
     "@types/bytes": "3.1.1",
     "@types/content-disposition": "0.5.5",
@@ -177,36 +176,35 @@
     "@types/fast-redact": "3.0.2",
     "@types/flat": "5.0.2",
     "@types/fs-extra": "11.0.1",
-    "@types/inquirer": "8.2.6",
+    "@types/inquirer": "9.0.3",
     "@types/js-yaml": "4.0.5",
     "@types/json2csv": "5.0.3",
     "@types/jsonwebtoken": "9.0.1",
-    "@types/keyv": "3.1.4",
+    "@types/keyv": "4.2.0",
     "@types/ldapjs": "2.2.5",
     "@types/lodash-es": "4.17.7",
     "@types/marked": "4.0.8",
     "@types/mime-types": "2.1.1",
     "@types/ms": "0.7.31",
-    "@types/node": "18.15.3",
+    "@types/node": "18.15.13",
     "@types/node-cron": "3.0.7",
     "@types/nodemailer": "6.4.7",
     "@types/object-hash": "3.0.2",
     "@types/qs": "6.9.7",
     "@types/sanitize-html": "2.9.0",
-    "@types/sharp": "0.31.1",
     "@types/stream-json": "1.7.3",
     "@types/supertest": "2.0.12",
     "@types/uuid": "9.0.1",
     "@types/uuid-validate": "0.0.1",
     "@types/wellknown": "0.5.4",
-    "@vitest/coverage-c8": "0.29.3",
+    "@vitest/coverage-c8": "0.30.1",
     "copyfiles": "2.4.1",
     "form-data": "4.0.0",
     "knex-mock-client": "2.0.0",
     "supertest": "6.3.3",
-    "typescript": "4.9.5",
-    "vitest": "0.29.3",
-    "@directus/types": "9.25.1"
+    "typescript": "5.0.4",
+    "vitest": "0.30.1",
+    "@directus/types": "9.26.0"
   },
   "optionalDependencies": {
     "@keyv/redis": "2.5.7",
@@ -217,7 +215,7 @@
     "nodemailer-sendgrid": "1.0.3",
     "pg": "8.10.0",
     "sqlite3": "5.1.6",
-    "tedious": "15.1.3"
+    "tedious": "16.0.0"
   },
   "engines": {
     "node": ">=18.0.0"