@directus/api 10.1.0 → 11.0.0

package/dist/utils/redact.d.ts

@@ -0,0 +1,11 @@
+import type { UnknownObject } from '@directus/types';
+type Paths = string[][];
+/**
+ * Redact values at certain paths in an object.
+ * @param input Input object in which values should be redacted.
+ * @param paths Nested array of object paths to be redacted (supports `*` for shallow matching, `**` for deep matching).
+ * @param replacement Replacement the values are redacted by.
+ * @returns Redacted object.
+ */
+export declare function redact(input: UnknownObject, paths: Paths, replacement: string): UnknownObject;
+export {};

package/dist/utils/redact.js

@@ -0,0 +1,75 @@
+import { isObject } from '@directus/utils';
+/**
+ * Redact values at certain paths in an object.
+ * @param input Input object in which values should be redacted.
+ * @param paths Nested array of object paths to be redacted (supports `*` for shallow matching, `**` for deep matching).
+ * @param replacement Replacement the values are redacted by.
+ * @returns Redacted object.
+ */
+export function redact(input, paths, replacement) {
+    const wildcardChars = ['*', '**'];
+    const clone = structuredClone(input);
+    const visited = new WeakSet();
+    traverse(clone, paths);
+    return clone;
+    function traverse(object, checkPaths) {
+        if (checkPaths.length === 0) {
+            return;
+        }
+        visited.add(object);
+        const globalCheckPaths = [];
+        for (const key of Object.keys(object)) {
+            const localCheckPaths = [];
+            for (const [index, path] of [...checkPaths].entries()) {
+                const [current, ...remaining] = path;
+                const escapedKey = wildcardChars.includes(key) ? `\\${key}` : key;
+                switch (current) {
+                    case escapedKey:
+                        if (remaining.length > 0) {
+                            localCheckPaths.push(remaining);
+                        }
+                        else {
+                            object[key] = replacement;
+                            checkPaths.splice(index, 1);
+                        }
+                        break;
+                    case '*':
+                        if (remaining.length > 0) {
+                            globalCheckPaths.push(remaining);
+                            checkPaths.splice(index, 1);
+                        }
+                        else {
+                            object[key] = replacement;
+                        }
+                        break;
+                    case '**':
+                        if (remaining.length > 0) {
+                            const [next, ...nextRemaining] = remaining;
+                            if (next === escapedKey) {
+                                if (nextRemaining.length === 0) {
+                                    object[key] = replacement;
+                                }
+                                else {
+                                    localCheckPaths.push(nextRemaining);
+                                }
+                            }
+                            else if (next !== undefined && wildcardChars.includes(next)) {
+                                localCheckPaths.push(remaining);
+                            }
+                            else {
+                                localCheckPaths.push(path);
+                            }
+                        }
+                        else {
+                            object[key] = replacement;
+                        }
+                        break;
+                }
+            }
+            const value = object[key];
+            if (isObject(value) && !visited.has(value)) {
+                traverse(value, [...globalCheckPaths, ...localCheckPaths]);
+            }
+        }
+    }
+}

package/dist/utils/sanitize-query.js

@@ -1,15 +1,24 @@
 import { parseFilter, parseJSON } from '@directus/utils';
 import { flatten, get, isPlainObject, merge, set } from 'lodash-es';
+import { getEnv } 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'])) &&
+        Number.isFinite(Number(env['QUERY_LIMIT_MAX']));
     if (rawQuery['limit'] !== undefined) {
         const limit = sanitizeLimit(rawQuery['limit']);
         if (typeof limit === 'number') {
-            query.limit = limit;
+            query.limit = limit === -1 && hasMaxLimit ? Number(env['QUERY_LIMIT_MAX']) : limit;
         }
     }
+    else if (hasMaxLimit) {
+        query.limit = Math.min(Number(env['QUERY_LIMIT_DEFAULT']), Number(env['QUERY_LIMIT_MAX']));
+    }
     if (rawQuery['fields']) {
         query.fields = sanitizeFields(rawQuery['fields']);
     }

package/dist/utils/schedule.d.ts

@@ -0,0 +1,5 @@
+export interface ScheduledJob {
+    stop(): Promise<void>;
+}
+export declare function validateCron(rule: string): boolean;
+export declare function scheduleSynchronizedJob(id: string, rule: string, cb: (fireDate: Date) => void | Promise<void>): ScheduledJob;

package/dist/utils/schedule.js

@@ -0,0 +1,27 @@
+import cron from 'cron-parser';
+import schedule from 'node-schedule';
+import { SynchronizedClock } from '../synchronization.js';
+export function validateCron(rule) {
+    try {
+        cron.parseExpression(rule);
+    }
+    catch {
+        return false;
+    }
+    return true;
+}
+export function scheduleSynchronizedJob(id, rule, cb) {
+    const clock = new SynchronizedClock(`${id}:${rule}`);
+    const job = schedule.scheduleJob(rule, async (fireDate) => {
+        const nextTimestamp = job.nextInvocation().getTime();
+        const wasSet = await clock.set(nextTimestamp);
+        if (wasSet) {
+            await cb(fireDate);
+        }
+    });
+    const stop = async () => {
+        job.cancel();
+        await clock.reset();
+    };
+    return { stop };
+}

package/dist/utils/should-clear-cache.d.ts

@@ -0,0 +1,10 @@
+import type Keyv from 'keyv';
+import type { MutationOptions } from '../types/items.js';
+/**
+ * Check whether cache should be cleared
+ *
+ * @param cache Cache instance
+ * @param opts Mutation options
+ * @param collection Collection name to check if cache purging should be ignored
+ */
+export declare function shouldClearCache(cache: Keyv<any> | null, opts?: MutationOptions, collection?: string): cache is Keyv<any>;

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

@@ -0,0 +1,18 @@
+import { getEnv } from '../env.js';
+/**
+ * Check whether cache should be cleared
+ *
+ * @param cache Cache instance
+ * @param opts Mutation options
+ * @param collection Collection name to check if cache purging should be ignored
+ */
+export function shouldClearCache(cache, opts, collection) {
+    const env = getEnv();
+    if (collection && env['CACHE_AUTO_PURGE_IGNORE_LIST'].includes(collection)) {
+        return false;
+    }
+    if (cache && env['CACHE_AUTO_PURGE'] && opts?.autoPurgeCache !== false) {
+        return true;
+    }
+    return false;
+}

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

@@ -1,5 +1,7 @@
 import { getEnv } from '../env.js';
 import { Url } from './url.js';
+import url from 'url';
+import { getEndpoint } from '@directus/utils';
 /**
  * Whether to skip caching for the current request
  *
@@ -13,14 +15,28 @@ export function shouldSkipCache(req) {
         const adminUrl = new Url(env['PUBLIC_URL']).addPath('admin');
         if (adminUrl.isRootRelative()) {
             const refererUrl = new Url(referer);
-            if (refererUrl.path.join('/').startsWith(adminUrl.path.join('/')))
+            if (refererUrl.path.join('/').startsWith(adminUrl.path.join('/')) && checkAutoPurge())
                 return true;
         }
-        else if (referer.startsWith(adminUrl.toString())) {
+        else if (referer.startsWith(adminUrl.toString()) && checkAutoPurge()) {
             return true;
         }
     }
     if (env['CACHE_SKIP_ALLOWED'] && req.get('cache-control')?.includes('no-store'))
         return true;
     return false;
+    function checkAutoPurge() {
+        if (env['CACHE_AUTO_PURGE'] === false)
+            return true;
+        const path = url.parse(req.originalUrl).pathname;
+        if (!path)
+            return false;
+        for (const collection of env['CACHE_AUTO_PURGE_IGNORE_LIST']) {
+            const ignoredPath = getEndpoint(collection);
+            if (path.startsWith(ignoredPath)) {
+                return true;
+            }
+        }
+        return false;
+    }
 }

package/dist/utils/transformations.d.ts

@@ -1,5 +1,5 @@
-import type { File, Transformation, TransformationParams } from '../types/index.js';
-export declare function resolvePreset(input: TransformationParams, file: File): Transformation[];
+import type { File, Transformation, TransformationSet } from '../types/index.js';
+export declare function resolvePreset({ transformationParams, acceptFormat }: TransformationSet, file: File): Transformation[];
 /**
  * Try to extract a file format from an array of `Transformation`'s.
  */

package/dist/utils/transformations.js

@@ -1,27 +1,44 @@
-export function resolvePreset(input, file) {
-    const transforms = input.transforms ? [...input.transforms] : [];
-    if (input.format || input.quality) {
+export function resolvePreset({ transformationParams, acceptFormat }, file) {
+    const transforms = transformationParams.transforms ? [...transformationParams.transforms] : [];
+    if (transformationParams.format || transformationParams.quality) {
         transforms.push([
             'toFormat',
-            input.format || file.type.split('/')[1],
+            getFormat(file, transformationParams.format, acceptFormat),
             {
-                quality: input.quality ? Number(input.quality) : undefined,
+                quality: transformationParams.quality ? Number(transformationParams.quality) : undefined,
             },
         ]);
     }
-    if (input.width || input.height) {
+    if (transformationParams.width || transformationParams.height) {
         transforms.push([
             'resize',
             {
-                width: input.width ? Number(input.width) : undefined,
-                height: input.height ? Number(input.height) : undefined,
-                fit: input.fit,
-                withoutEnlargement: input.withoutEnlargement ? Boolean(input.withoutEnlargement) : undefined,
+                width: transformationParams.width ? Number(transformationParams.width) : undefined,
+                height: transformationParams.height ? Number(transformationParams.height) : undefined,
+                fit: transformationParams.fit,
+                withoutEnlargement: transformationParams.withoutEnlargement
+                    ? Boolean(transformationParams.withoutEnlargement)
+                    : undefined,
             },
         ]);
     }
     return transforms;
 }
+function getFormat(file, format, acceptFormat) {
+    const fileType = file.type?.split('/')[1];
+    if (format) {
+        if (format !== 'auto') {
+            return format;
+        }
+        if (acceptFormat) {
+            return acceptFormat;
+        }
+        if (fileType && ['avif', 'webp', 'tiff'].includes(fileType)) {
+            return 'png';
+        }
+    }
+    return fileType || 'jpg';
+}
 /**
  * Try to extract a file format from an array of `Transformation`'s.
  */

package/dist/utils/validate-query.js

@@ -9,7 +9,9 @@ const querySchema = Joi.object({
     group: Joi.array().items(Joi.string()),
     sort: Joi.array().items(Joi.string()),
     filter: Joi.object({}).unknown(),
-    limit: Joi.number().integer().min(-1),
+    limit: 'QUERY_LIMIT_MAX' in env && env['QUERY_LIMIT_MAX'] !== -1
+        ? Joi.number().integer().min(-1).max(env['QUERY_LIMIT_MAX']) // min should be 0
+        : Joi.number().integer().min(-1),
     offset: Joi.number().integer().min(0),
     page: Joi.number().integer().min(0),
     meta: Joi.array().items(Joi.string().valid('total_count', 'filter_count')),

package/package.json

@@ -1,8 +1,7 @@
 {
   "name": "@directus/api",
-  "version": "10.1.0",
+  "version": "11.0.0",
   "description": "Directus is a real-time API and App dashboard for managing SQL database content",
-  "type": "module",
   "keywords": [
     "directus",
     "realtime",
@@ -23,9 +22,6 @@
     "vue"
   ],
   "homepage": "https://directus.io",
-  "bugs": {
-    "url": "https://github.com/directus/directus/issues"
-  },
   "repository": {
     "type": "git",
     "url": "https://github.com/directus/directus.git",
@@ -50,6 +46,7 @@
       "url": "https://github.com/benhaynes"
     }
   ],
+  "type": "module",
   "exports": {
     ".": "./dist/index.js",
     "./*": "./dist/*.js",
@@ -62,7 +59,7 @@
   ],
   "dependencies": {
     "@authenio/samlify-node-xmllint": "2.0.0",
-    "@aws-sdk/client-ses": "3.316.0",
+    "@aws-sdk/client-ses": "3.332.0",
     "@directus/format-title": "10.0.0",
     "@godaddy/terminus": "4.12.0",
     "@rollup/plugin-alias": "5.0.0",
@@ -70,7 +67,7 @@
     "@rollup/plugin-virtual": "3.0.1",
     "argon2": "0.30.3",
     "async": "3.2.4",
-    "axios": "1.3.6",
+    "axios": "1.4.0",
     "busboy": "1.6.0",
     "bytes": "3.1.2",
     "camelcase": "7.0.1",
@@ -80,8 +77,9 @@
     "content-disposition": "0.5.4",
     "cookie-parser": "1.4.6",
     "cors": "2.8.5",
+    "cron-parser": "4.8.1",
     "csv-parser": "3.0.0",
-    "date-fns": "2.29.3",
+    "date-fns": "2.30.0",
     "deep-diff": "1.0.2",
     "destroy": "1.2.0",
     "dotenv": "16.0.3",
@@ -90,16 +88,15 @@
     "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.1",
     "graphql": "16.6.0",
     "graphql-compose": "9.0.10",
-    "helmet": "6.1.5",
+    "helmet": "7.0.0",
     "icc": "3.0.0",
-    "inquirer": "9.1.5",
+    "inquirer": "9.2.4",
     "ioredis": "5.3.2",
-    "joi": "17.9.1",
+    "joi": "17.9.2",
     "js-yaml": "4.1.0",
     "js2xmlparser": "5.0.0",
     "json2csv": "5.0.7",
@@ -107,60 +104,59 @@
     "keyv": "4.5.2",
     "knex": "2.4.2",
     "ldapjs": "2.3.3",
-    "liquidjs": "10.7.0",
+    "liquidjs": "10.7.1",
     "lodash-es": "4.17.21",
-    "marked": "4.3.0",
+    "marked": "5.0.2",
     "micromustache": "8.0.3",
     "mime-types": "2.1.35",
+    "minimatch": "9.0.1",
     "ms": "2.1.3",
     "nanoid": "4.0.2",
-    "node-cron": "3.0.2",
     "node-machine-id": "1.1.12",
-    "nodemailer": "6.9.1",
+    "node-schedule": "2.1.1",
+    "nodemailer": "6.9.2",
     "object-hash": "3.0.0",
-    "openapi3-ts": "3.2.0",
-    "openid-client": "5.4.0",
-    "ora": "6.3.0",
+    "openapi3-ts": "4.1.2",
+    "openid-client": "5.4.2",
+    "ora": "6.3.1",
     "otplib": "12.0.1",
-    "pino": "8.11.0",
+    "pino": "8.14.1",
     "pino-http": "8.3.3",
     "pino-http-print": "3.1.0",
     "pino-pretty": "10.0.0",
-    "qs": "6.11.1",
+    "qs": "6.11.2",
     "rate-limiter-flexible": "2.4.1",
-    "rollup": "3.20.7",
+    "rollup": "3.22.0",
     "samlify": "2.8.10",
     "sanitize-html": "2.10.0",
-    "sharp": "0.32.0",
+    "sharp": "0.32.1",
     "snappy": "7.2.2",
     "stream-json": "1.7.5",
     "strip-bom-stream": "5.0.0",
     "tmp-promise": "3.0.3",
-    "tsx": "3.12.6",
+    "tsx": "3.12.7",
     "uuid": "9.0.0",
     "uuid-validate": "0.0.3",
-    "vm2": "3.9.17",
+    "vm2": "3.9.19",
     "wellknown": "0.5.0",
-    "@directus/app": "10.1.0",
+    "@directus/app": "10.3.0",
     "@directus/constants": "10.1.0",
-    "@directus/exceptions": "10.0.1",
-    "@directus/extensions-sdk": "10.1.0",
-    "@directus/pressure": "1.0.0",
-    "@directus/schema": "10.0.0",
-    "@directus/specs": "10.1.0",
-    "@directus/storage": "10.0.1",
-    "@directus/storage-driver-azure": "10.0.1",
-    "@directus/storage-driver-cloudinary": "10.0.1",
-    "@directus/storage-driver-gcs": "10.0.1",
-    "@directus/storage-driver-local": "10.0.1",
-    "@directus/storage-driver-s3": "10.0.1",
-    "@directus/update-check": "10.0.1",
-    "@directus/utils": "10.0.1"
+    "@directus/exceptions": "10.0.2",
+    "@directus/extensions-sdk": "10.1.2",
+    "@directus/pressure": "1.0.2",
+    "@directus/schema": "10.0.1",
+    "@directus/specs": "10.1.1",
+    "@directus/storage": "10.0.2",
+    "@directus/storage-driver-azure": "10.0.3",
+    "@directus/storage-driver-cloudinary": "10.0.3",
+    "@directus/storage-driver-gcs": "10.0.3",
+    "@directus/storage-driver-local": "10.0.3",
+    "@directus/storage-driver-s3": "10.0.3",
+    "@directus/utils": "10.0.3"
   },
   "devDependencies": {
-    "@directus/tsconfig": "0.0.7",
     "@ngneat/falso": "6.4.0",
-    "@types/async": "3.2.19",
+    "@types/async": "3.2.20",
     "@types/busboy": "1.5.0",
     "@types/bytes": "3.1.1",
     "@types/content-disposition": "0.5.5",
@@ -171,22 +167,21 @@
     "@types/encodeurl": "1.0.0",
     "@types/exif-reader": "1.0.0",
     "@types/express": "4.17.17",
-    "@types/express-serve-static-core": "4.17.33",
-    "@types/fast-redact": "3.0.2",
+    "@types/express-serve-static-core": "4.17.35",
     "@types/flat": "5.0.2",
     "@types/fs-extra": "11.0.1",
     "@types/inquirer": "9.0.3",
     "@types/js-yaml": "4.0.5",
     "@types/json2csv": "5.0.3",
-    "@types/jsonwebtoken": "9.0.1",
+    "@types/jsonwebtoken": "9.0.2",
     "@types/keyv": "4.2.0",
     "@types/ldapjs": "2.2.5",
     "@types/lodash-es": "4.17.7",
-    "@types/marked": "4.0.8",
+    "@types/marked": "4.3.0",
     "@types/mime-types": "2.1.1",
     "@types/ms": "0.7.31",
-    "@types/node": "18.15.13",
-    "@types/node-cron": "3.0.7",
+    "@types/node": "18.16.12",
+    "@types/node-schedule": "2.1.0",
     "@types/nodemailer": "6.4.7",
     "@types/object-hash": "3.0.2",
     "@types/qs": "6.9.7",
@@ -196,25 +191,26 @@
     "@types/uuid": "9.0.1",
     "@types/uuid-validate": "0.0.1",
     "@types/wellknown": "0.5.4",
-    "@vitest/coverage-c8": "0.31.0",
+    "@vitest/coverage-c8": "0.31.1",
     "copyfiles": "2.4.1",
     "form-data": "4.0.0",
     "knex-mock-client": "2.0.0",
     "supertest": "6.3.3",
     "typescript": "5.0.4",
-    "vitest": "0.31.0",
-    "@directus/types": "10.0.0"
+    "vitest": "0.31.1",
+    "@directus/tsconfig": "0.0.7",
+    "@directus/types": "10.1.0"
   },
   "optionalDependencies": {
-    "@keyv/redis": "2.5.7",
+    "@keyv/redis": "2.5.8",
     "keyv-memcache": "1.3.3",
     "memcached": "2.2.2",
     "mysql": "2.18.1",
     "nodemailer-mailgun-transport": "2.1.5",
     "nodemailer-sendgrid": "1.0.3",
-    "pg": "8.10.0",
+    "pg": "8.11.0",
     "sqlite3": "5.1.6",
-    "tedious": "16.0.0"
+    "tedious": "16.1.0"
   },
   "engines": {
     "node": ">=18.0.0"

package/dist/utils/get-os-info.d.ts

@@ -1,9 +0,0 @@
-/**
- * Get current host OS information
- *
- * @returns Object of OS type and version
- */
-export declare function getOSInfo(): {
-    osType: string;
-    osVersion: string;
-};

package/dist/utils/get-os-info.js

@@ -1,40 +0,0 @@
-import os from 'os';
-/**
- * Get current host OS information
- *
- * @returns Object of OS type and version
- */
-export function getOSInfo() {
-    const osType = os.type() === 'Darwin' ? 'macOS' : os.type();
-    const osVersion = osType === 'macOS' ? macosRelease() : os.release();
-    return { osType, osVersion };
-}
-/**
- * Get the name and version of a macOS release from the Darwin version.
- * Lifted from `macos-release`.
- */
-function macosRelease() {
-    const release = Number(os.release().split('.')[0]);
-    const nameMap = new Map([
-        [22, ['Ventura', '13']],
-        [21, ['Monterey', '12']],
-        [20, ['Big Sur', '11']],
-        [19, ['Catalina', '10.15']],
-        [18, ['Mojave', '10.14']],
-        [17, ['High Sierra', '10.13']],
-        [16, ['Sierra', '10.12']],
-        [15, ['El Capitan', '10.11']],
-        [14, ['Yosemite', '10.10']],
-        [13, ['Mavericks', '10.9']],
-        [12, ['Mountain Lion', '10.8']],
-        [11, ['Lion', '10.7']],
-        [10, ['Snow Leopard', '10.6']],
-        [9, ['Leopard', '10.5']],
-        [8, ['Tiger', '10.4']],
-        [7, ['Panther', '10.3']],
-        [6, ['Jaguar', '10.2']],
-        [5, ['Puma', '10.1']],
-    ]);
-    const current = nameMap.get(release);
-    return current ? `${current[0]} (${current[1]})` : 'Unknown';
-}