@directus/api 18.1.1 → 18.2.0

package/dist/extensions/lib/sandbox/register/operation.d.ts

@@ -1,6 +1,6 @@
 import type { PromiseCallback } from '@directus/types';
 import type { Reference } from 'isolated-vm';
 export declare function registerOperationGenerator(): {
-    register: (id: Reference<string>, cb: Reference<(data: Record<string, unknown>) => unknown | Promise<unknown> | void>) => void;
+    register: (id: Reference<string>, cb: Reference<(options: Record<string, unknown>) => unknown | Promise<unknown> | void>) => void;
     unregisterFunctions: PromiseCallback[];
 };

package/dist/extensions/lib/sandbox/register/operation.js

@@ -9,7 +9,10 @@ export function registerOperationGenerator() {
         if (cb.typeof !== 'function')
             throw new TypeError('Operation config handler has to be of type function');
         const idCopied = id.copySync();
-        const handler = async (data) => callReference(cb, [data]);
+        const handler = async (options) => {
+            const response = await callReference(cb, [options]);
+            return response.copy();
+        };
         flowManager.addOperation(idCopied, handler);
         unregisterFunctions.push(() => {
             flowManager.removeOperation(idCopied);

package/dist/redis/utils/redis-config-available.js

@@ -4,5 +4,8 @@ import { useEnv } from '@directus/env';
  */
 export const redisConfigAvailable = () => {
     const env = useEnv();
+    if ('REDIS_ENABLED' in env) {
+        return env['REDIS_ENABLED'] === true;
+    }
     return 'REDIS' in env || Object.keys(env).some((key) => key.startsWith('REDIS_'));
 };

package/dist/services/graphql/index.js

@@ -1,6 +1,7 @@
 import { Action, FUNCTIONS } from '@directus/constants';
 import { useEnv } from '@directus/env';
 import { ErrorCode, ForbiddenError, InvalidPayloadError, isDirectusError } from '@directus/errors';
+import { isSystemCollection } from '@directus/system-data';
 import { parseFilterFunctionPath, toBoolean } from '@directus/utils';
 import argon2 from 'argon2';
 import { GraphQLBoolean, GraphQLEnumType, GraphQLError, GraphQLFloat, GraphQLID, GraphQLInt, GraphQLList, GraphQLNonNull, GraphQLObjectType, GraphQLScalarType, GraphQLSchema, GraphQLString, GraphQLUnionType, NoSchemaIntrospectionCustomRule, execute, specifiedRules, validate, } from 'graphql';
@@ -12,6 +13,8 @@ import getDatabase from '../../database/index.js';
 import { generateHash } from '../../utils/generate-hash.js';
 import { getGraphQLType } from '../../utils/get-graphql-type.js';
 import { getService } from '../../utils/get-service.js';
+import isDirectusJWT from '../../utils/is-directus-jwt.js';
+import { verifyAccessJWT } from '../../utils/jwt.js';
 import { mergeVersionsRaw, mergeVersionsRecursive } from '../../utils/merge-version-data.js';
 import { reduceSchema } from '../../utils/reduce-schema.js';
 import { sanitizeQuery } from '../../utils/sanitize-query.js';
@@ -31,6 +34,7 @@ import { UsersService } from '../users.js';
 import { UtilsService } from '../utils.js';
 import { VersionsService } from '../versions.js';
 import { GraphQLExecutionError, GraphQLValidationError } from './errors/index.js';
+import { cache } from './schema-cache.js';
 import { createSubscriptionGenerator } from './subscription.js';
 import { GraphQLBigInt } from './types/bigint.js';
 import { GraphQLDate } from './types/date.js';
@@ -40,9 +44,6 @@ import { GraphQLStringOrFloat } from './types/string-or-float.js';
 import { GraphQLVoid } from './types/void.js';
 import { addPathToValidationError } from './utils/add-path-to-validation-error.js';
 import processError from './utils/process-error.js';
-import { isSystemCollection } from '@directus/system-data';
-import isDirectusJWT from '../../utils/is-directus-jwt.js';
-import { verifyAccessJWT } from '../../utils/jwt.js';
 const env = useEnv();
 const validationRules = Array.from(specifiedRules);
 if (env['GRAPHQL_INTROSPECTION'] === false) {
@@ -104,6 +105,10 @@ export class GraphQLService {
         return formattedResult;
     }
     getSchema(type = 'schema') {
+        const key = `${type}_${this.accountability?.role}_${this.accountability?.user}`;
+        const cachedSchema = cache.get(key);
+        if (cachedSchema)
+            return cachedSchema;
         // eslint-disable-next-line @typescript-eslint/no-this-alias
         const self = this;
         const schemaComposer = new SchemaComposer();
@@ -218,9 +223,13 @@ export class GraphQLService {
             }, {}));
         }
         if (type === 'sdl') {
-            return schemaComposer.toSDL();
+            const sdl = schemaComposer.toSDL();
+            cache.set(key, sdl);
+            return sdl;
         }
-        return schemaComposer.buildSchema();
+        const gqlSchema = schemaComposer.buildSchema();
+        cache.set(key, gqlSchema);
+        return gqlSchema;
         /**
          * Construct an object of types for every collection, using the permitted fields per action type
          * as it's fields.

package/dist/services/graphql/schema-cache.d.ts

@@ -0,0 +1,3 @@
+import { GraphQLSchema } from 'graphql';
+import LRUMapDefault from 'mnemonist/lru-map.js';
+export declare const cache: LRUMapDefault.default<string, string | GraphQLSchema>;

package/dist/services/graphql/schema-cache.js

@@ -0,0 +1,12 @@
+import { useEnv } from '@directus/env';
+import { GraphQLSchema } from 'graphql';
+import LRUMapDefault from 'mnemonist/lru-map.js';
+import { useBus } from '../../bus/index.js';
+// Workaround for misaligned types in mnemonist package exports
+const LRUMap = LRUMapDefault;
+const env = useEnv();
+const bus = useBus();
+export const cache = new LRUMap(Number(env['GRAPHQL_SCHEMA_CACHE_CAPACITY'] ?? 100));
+bus.subscribe('schemaChanged', () => {
+    cache.clear();
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@directus/api",
-  "version": "18.1.1",
+  "version": "18.2.0",
   "description": "Directus is a real-time API and App dashboard for managing SQL database content",
   "keywords": [
     "directus",
@@ -113,6 +113,7 @@
     "micromustache": "8.0.3",
     "mime-types": "2.1.35",
     "minimatch": "9.0.3",
+    "mnemonist": "0.39.8",
     "ms": "2.1.3",
     "nanoid": "5.0.6",
     "node-machine-id": "1.1.12",
@@ -144,28 +145,28 @@
     "ws": "8.16.0",
     "zod": "3.22.4",
     "zod-validation-error": "3.0.3",
-    "@directus/app": "11.0.2",
-    "@directus/errors": "0.2.4",
+    "@directus/app": "11.0.3",
+    "@directus/env": "1.1.0",
     "@directus/constants": "11.0.3",
+    "@directus/errors": "0.2.4",
+    "@directus/extensions-registry": "1.0.1",
     "@directus/extensions": "1.0.1",
     "@directus/extensions-sdk": "11.0.1",
-    "@directus/extensions-registry": "1.0.1",
-    "@directus/pressure": "1.0.17",
     "@directus/memory": "1.0.5",
+    "@directus/pressure": "1.0.17",
+    "@directus/specs": "10.2.7",
     "@directus/schema": "11.0.1",
     "@directus/storage": "10.0.11",
-    "@directus/specs": "10.2.7",
     "@directus/storage-driver-azure": "10.0.18",
-    "@directus/env": "1.0.4",
-    "@directus/storage-driver-gcs": "10.0.18",
     "@directus/storage-driver-cloudinary": "10.0.18",
-    "@directus/storage-driver-local": "10.0.18",
+    "@directus/storage-driver-gcs": "10.0.18",
     "@directus/storage-driver-s3": "10.0.19",
+    "@directus/storage-driver-local": "10.0.18",
+    "@directus/storage-driver-supabase": "1.0.10",
     "@directus/system-data": "1.0.1",
     "@directus/utils": "11.0.6",
-    "@directus/storage-driver-supabase": "1.0.10",
-    "@directus/validation": "0.0.13",
-    "directus": "10.10.2"
+    "directus": "10.10.3",
+    "@directus/validation": "0.0.13"
   },
   "devDependencies": {
     "@ngneat/falso": "7.2.0",
@@ -208,8 +209,8 @@
     "typescript": "5.3.3",
     "vitest": "1.3.1",
     "@directus/random": "0.2.7",
-    "@directus/tsconfig": "1.0.1",
-    "@directus/types": "11.0.7"
+    "@directus/types": "11.0.7",
+    "@directus/tsconfig": "1.0.1"
   },
   "optionalDependencies": {
     "@keyv/redis": "2.8.4",