@directus/api 14.0.2 → 14.1.0

package/dist/services/server.js

@@ -34,6 +34,10 @@ export class ServerService {
                 'project_logo',
                 'project_color',
                 'default_appearance',
+                'default_theme_light',
+                'default_theme_dark',
+                'theme_light_overrides',
+                'theme_dark_overrides',
                 'default_language',
                 'public_foreground',
                 'public_background',

package/dist/storage/register-drivers.js

@@ -1,7 +1,6 @@
-import { getEnv } from '../env.js';
+import env from '../env.js';
 import { getStorageDriver } from './get-storage-driver.js';
 export const registerDrivers = async (storage) => {
-    const env = getEnv();
     const usedDrivers = [];
     for (const [key, value] of Object.entries(env)) {
         if ((key.startsWith('STORAGE_') && key.endsWith('_DRIVER')) === false)

package/dist/storage/register-locations.js

@@ -1,8 +1,7 @@
 import { toArray } from '@directus/utils';
-import { getEnv } from '../env.js';
+import env from '../env.js';
 import { getConfigFromEnv } from '../utils/get-config-from-env.js';
 export const registerLocations = async (storage) => {
-    const env = getEnv();
     const locations = toArray(env['STORAGE_LOCATIONS']);
     locations.forEach((location) => {
         location = location.trim();

package/dist/utils/get-auth-providers.d.ts

@@ -1,8 +1,8 @@
 interface AuthProvider {
-    label: string;
     name: string;
     driver: string;
     icon?: string;
+    label?: string;
 }
 export declare function getAuthProviders(): AuthProvider[];
 export {};

package/dist/utils/get-config-from-env.js

@@ -1,8 +1,7 @@
 import camelcase from 'camelcase';
 import { set } from 'lodash-es';
-import { getEnv } from '../env.js';
+import env from '../env.js';
 export function getConfigFromEnv(prefix, omitPrefix, type = 'camelcase') {
-    const env = getEnv();
     const config = {};
     for (const [key, value] of Object.entries(env)) {
         if (key.toLowerCase().startsWith(prefix.toLowerCase()) === false)

package/dist/utils/merge-permissions.js

@@ -1,4 +1,4 @@
-import { flatten, intersection, isEqual, merge, omit } from 'lodash-es';
+import { flatten, intersection, isEmpty, merge, omit } from 'lodash-es';
 export function mergePermissions(strategy, ...permissions) {
     const allPermissions = flatten(permissions);
     const mergedPermissions = allPermissions
@@ -27,15 +27,11 @@ export function mergePermission(strategy, currentPerm, newPerm) {
             };
         }
         else if (currentPerm.permissions) {
-            // Empty {} supersedes other permissions in _OR merge
-            if (strategy === 'or' && (isEqual(currentPerm.permissions, {}) || isEqual(newPerm.permissions, {}))) {
-                permissions = {};
-            }
-            else {
-                permissions = {
-                    [logicalKey]: [currentPerm.permissions, newPerm.permissions],
-                };
-            }
+            permissions = {
+                [logicalKey]: strategy === 'or'
+                    ? [currentPerm.permissions, newPerm.permissions].filter((p) => !isEmpty(p))
+                    : [currentPerm.permissions, newPerm.permissions],
+            };
         }
         else {
             permissions = {
@@ -53,15 +49,11 @@ export function mergePermission(strategy, currentPerm, newPerm) {
             };
         }
         else if (currentPerm.validation) {
-            // Empty {} supersedes other validations in _OR merge
-            if (strategy === 'or' && (isEqual(currentPerm.validation, {}) || isEqual(newPerm.validation, {}))) {
-                validation = {};
-            }
-            else {
-                validation = {
-                    [logicalKey]: [currentPerm.validation, newPerm.validation],
-                };
-            }
+            validation = {
+                [logicalKey]: strategy === 'or'
+                    ? [currentPerm.validation, newPerm.validation].filter((p) => !isEmpty(p))
+                    : [currentPerm.validation, newPerm.validation],
+            };
         }
         else {
             validation = {

package/dist/utils/sanitize-query.js

@@ -1,11 +1,10 @@
 import { parseFilter, parseJSON } from '@directus/utils';
 import { flatten, get, isPlainObject, merge, set } from 'lodash-es';
-import { getEnv } from '../env.js';
+import env from '../env.js';
 import logger from '../logger.js';
 import { Meta } from '../types/index.js';
 export function sanitizeQuery(rawQuery, accountability) {
     const query = {};
-    const env = getEnv();
     const hasMaxLimit = 'QUERY_LIMIT_MAX' in env &&
         Number(env['QUERY_LIMIT_MAX']) >= 0 &&
         !Number.isNaN(Number(env['QUERY_LIMIT_MAX'])) &&

package/dist/utils/should-clear-cache.js

@@ -1,4 +1,4 @@
-import { getEnv } from '../env.js';
+import env from '../env.js';
 /**
  * Check whether cache should be cleared
  *
@@ -7,7 +7,6 @@ import { getEnv } from '../env.js';
  * @param collection Collection name to check if cache purging should be ignored
  */
 export function shouldClearCache(cache, opts, collection) {
-    const env = getEnv();
     if (env['CACHE_AUTO_PURGE']) {
         if (collection && env['CACHE_AUTO_PURGE_IGNORE_LIST'].includes(collection)) {
             return false;

package/dist/utils/should-skip-cache.js

@@ -1,14 +1,13 @@
-import { getEnv } from '../env.js';
-import { Url } from './url.js';
-import url from 'url';
 import { getEndpoint } from '@directus/utils';
+import url from 'url';
+import env from '../env.js';
+import { Url } from './url.js';
 /**
  * Whether to skip caching for the current request
  *
  * @param req Express request object
  */
 export function shouldSkipCache(req) {
-    const env = getEnv();
     // Always skip cache for requests coming from the data studio based on Referer header
     const referer = req.get('Referer');
     if (referer) {

package/dist/utils/validate-env.js

@@ -1,7 +1,6 @@
-import { getEnv } from '../env.js';
+import env from '../env.js';
 import logger from '../logger.js';
 export function validateEnv(requiredKeys) {
-    const env = getEnv();
     for (const requiredKey of requiredKeys) {
         if (requiredKey in env === false) {
             logger.error(`"${requiredKey}" Environment Variable is missing.`);

package/dist/utils/validate-storage.js

@@ -1,9 +1,10 @@
-import env from '../env.js';
-import logger from '../logger.js';
-import { access } from 'node:fs/promises';
+import { toArray } from '@directus/utils';
 import { constants } from 'fs';
+import { access } from 'node:fs/promises';
 import path from 'path';
-import { toArray } from '@directus/utils';
+import env from '../env.js';
+import { getExtensionsPath } from '../extensions/lib/get-extensions-path.js';
+import logger from '../logger.js';
 export async function validateStorage() {
     if (env['DB_CLIENT'] === 'sqlite3') {
         try {
@@ -22,10 +23,12 @@ export async function validateStorage() {
             logger.warn(`Upload directory (${path.resolve(env['STORAGE_LOCAL_ROOT'])}) is not read/writeable!`);
         }
     }
-    try {
-        await access(env['EXTENSIONS_PATH'], constants.R_OK);
-    }
-    catch {
-        logger.warn(`Extensions directory (${path.resolve(env['EXTENSIONS_PATH'])}) is not readable!`);
+    if (!env['EXTENSIONS_LOCATION']) {
+        try {
+            await access(getExtensionsPath(), constants.R_OK);
+        }
+        catch {
+            logger.warn(`Extensions directory (${path.resolve(getExtensionsPath())}) is not readable!`);
+        }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@directus/api",
-  "version": "14.0.2",
+  "version": "14.1.0",
   "description": "Directus is a real-time API and App dashboard for managing SQL database content",
   "keywords": [
     "directus",
@@ -122,6 +122,7 @@
     "openid-client": "5.4.2",
     "ora": "6.3.1",
     "otplib": "12.0.1",
+    "p-queue": "7.4.1",
     "papaparse": "5.4.1",
     "pino": "8.14.1",
     "pino-http": "8.3.3",
@@ -144,23 +145,23 @@
     "ws": "8.14.2",
     "zod": "3.22.4",
     "zod-validation-error": "1.0.1",
-    "@directus/app": "10.12.0",
+    "@directus/app": "10.13.0",
     "@directus/constants": "11.0.1",
-    "@directus/extensions": "0.1.1",
     "@directus/errors": "0.2.0",
-    "@directus/extensions-sdk": "10.1.14",
-    "@directus/pressure": "1.0.12",
+    "@directus/extensions-sdk": "10.2.0",
+    "@directus/pressure": "1.0.13",
+    "@directus/extensions": "0.2.0",
     "@directus/schema": "11.0.0",
-    "@directus/specs": "10.2.1",
+    "@directus/specs": "10.2.2",
     "@directus/storage": "10.0.7",
-    "@directus/storage-driver-azure": "10.0.13",
-    "@directus/storage-driver-gcs": "10.0.13",
-    "@directus/storage-driver-cloudinary": "10.0.13",
-    "@directus/storage-driver-s3": "10.0.13",
-    "@directus/storage-driver-local": "10.0.13",
-    "@directus/storage-driver-supabase": "1.0.5",
-    "@directus/validation": "0.0.8",
-    "@directus/utils": "11.0.1"
+    "@directus/storage-driver-azure": "10.0.14",
+    "@directus/storage-driver-gcs": "10.0.14",
+    "@directus/storage-driver-cloudinary": "10.0.14",
+    "@directus/storage-driver-local": "10.0.14",
+    "@directus/storage-driver-s3": "10.0.14",
+    "@directus/storage-driver-supabase": "1.0.6",
+    "@directus/validation": "0.0.9",
+    "@directus/utils": "11.0.2"
   },
   "devDependencies": {
     "@ngneat/falso": "6.4.0",
@@ -210,7 +211,7 @@
     "vitest": "0.31.1",
     "@directus/random": "0.2.3",
     "@directus/tsconfig": "1.0.1",
-    "@directus/types": "11.0.1"
+    "@directus/types": "11.0.2"
   },
   "optionalDependencies": {
     "@keyv/redis": "2.5.8",

package/dist/__mocks__/cache.d.mts

@@ -1,5 +0,0 @@
-import type { Mock } from 'vitest';
-export declare const getCache: Mock;
-export declare const flushCaches: Mock;
-export declare const clearSystemCache: Mock;
-export declare const setSystemCache: Mock;

package/dist/__mocks__/cache.mjs

@@ -1,7 +0,0 @@
-import { vi } from 'vitest';
-export const getCache = vi
-    .fn()
-    .mockReturnValue({ cache: undefined, systemCache: undefined, lockCache: undefined });
-export const flushCaches = vi.fn();
-export const clearSystemCache = vi.fn();
-export const setSystemCache = vi.fn();