@directus/api 20.1.0 → 21.0.0

package/dist/services/tus/data-store.js

@@ -4,7 +4,7 @@ import { extname } from 'node:path';
 import stream from 'node:stream';
 import { DataStore, ERRORS, Upload } from '@tus/utils';
 import { ItemsService } from '../items.js';
-import { useLogger } from '../../logger.js';
+import { useLogger } from '../../logger/index.js';
 import getDatabase from '../../database/index.js';
 import { omit } from 'lodash-es';
 export class TusDataStore extends DataStore {
@@ -79,16 +79,15 @@ export class TusDataStore extends DataStore {
         }
         // If this is a new file upload, we need to generate a new primary key and DB record
         const primaryKey = await itemsService.createOne(fileData, { emitEvents: false });
+        // Set the file id, so it is available to be sent as a header on upload creation / resume
+        if (!upload.metadata['id']) {
+            upload.metadata['id'] = primaryKey;
+        }
         const fileExtension = extname(upload.metadata['filename_download']) ||
             (upload.metadata['type'] && '.' + extension(upload.metadata['type'])) ||
             '';
         // The filename_disk is the FINAL filename on disk
         fileData.filename_disk ||= primaryKey + (fileExtension || '');
-        // Temp filename is used for replacements
-        // const tempFilenameDisk = fileData.tus_id! + (fileExtension || '');
-        // if (isReplacement) {
-        // 	upload.metadata['temp_file'] = tempFilenameDisk;
-        // }
         try {
             // If this is a replacement, we'll write the file to a temp location first to ensure we don't overwrite the existing file if something goes wrong
             upload = (await this.storageDriver.createChunkedUpload(fileData.filename_disk, upload));

package/dist/services/tus/server.d.ts

@@ -4,5 +4,5 @@ type Context = {
     schema: SchemaOverview;
     accountability?: Accountability | undefined;
 };
-export declare function createTusServer(context: Context): Promise<Server>;
+export declare function createTusServer(context: Context): Promise<[Server, () => void]>;
 export {};

package/dist/services/tus/server.js

@@ -6,7 +6,7 @@
 import { useEnv } from '@directus/env';
 import { supportsTus } from '@directus/storage';
 import { toArray } from '@directus/utils';
-import { Server } from '@tus/server';
+import { Server, EVENTS } from '@tus/server';
 import { RESUMABLE_UPLOADS } from '../../constants.js';
 import { getStorage } from '../../storage/index.js';
 import { extractMetadata } from '../files/lib/extract-metadata.js';
@@ -33,7 +33,7 @@ async function createTusStore(context) {
 export async function createTusServer(context) {
     const env = useEnv();
     const store = await createTusStore(context);
-    return new Server({
+    const server = new Server({
         path: '/files/tus',
         datastore: store,
         locker: getTusLocker(),
@@ -77,4 +77,11 @@ export async function createTusServer(context) {
         },
         relativeLocation: String(env['PUBLIC_URL']).startsWith('http'),
     });
+    server.on(EVENTS.POST_CREATE, async (_req, res, upload) => {
+        res.setHeader('Directus-File-Id', upload.metadata['id']);
+    });
+    return [server, cleanup];
+    function cleanup() {
+        server.removeAllListeners();
+    }
 }

package/dist/services/users.js

@@ -7,7 +7,7 @@ import jwt from 'jsonwebtoken';
 import { isEmpty, mergeWith } from 'lodash-es';
 import { performance } from 'perf_hooks';
 import getDatabase from '../database/index.js';
-import { useLogger } from '../logger.js';
+import { useLogger } from '../logger/index.js';
 import { checkIncreasedUserLimits } from '../telemetry/utils/check-increased-user-limits.js';
 import { getRoleCountsByRoles } from '../telemetry/utils/get-role-counts-by-roles.js';
 import { getRoleCountsByUsers } from '../telemetry/utils/get-role-counts-by-users.js';

package/dist/services/webhooks.js

@@ -1,6 +1,6 @@
 import { ErrorCode, createError } from '@directus/errors';
 import { useBus } from '../bus/index.js';
-import { useLogger } from '../logger.js';
+import { useLogger } from '../logger/index.js';
 import { ItemsService } from './items.js';
 const logger = useLogger();
 export class WebhooksService extends ItemsService {

package/dist/telemetry/lib/track.js

@@ -1,6 +1,6 @@
 import { getNodeEnv } from '@directus/utils/node';
 import { setTimeout } from 'timers/promises';
-import { useLogger } from '../../logger.js';
+import { useLogger } from '../../logger/index.js';
 import { getRandomWaitTime } from '../utils/get-random-wait-time.js';
 import { getReport } from './get-report.js';
 import { sendReport } from './send-report.js';

package/dist/utils/apply-diff.js

@@ -4,7 +4,7 @@ import { flushCaches } from '../cache.js';
 import { getHelpers } from '../database/helpers/index.js';
 import getDatabase from '../database/index.js';
 import emitter from '../emitter.js';
-import { useLogger } from '../logger.js';
+import { useLogger } from '../logger/index.js';
 import { CollectionsService } from '../services/collections.js';
 import { FieldsService } from '../services/fields.js';
 import { RelationsService } from '../services/relations.js';

package/dist/utils/apply-query.js

@@ -391,11 +391,17 @@ export function applyFilter(knex, schema, rootQuery, rootFilter, collection, ali
             // Knex supports "raw" in the columnName parameter, but isn't typed as such. Too bad..
             // See https://github.com/knex/knex/issues/4518 @TODO remove as any once knex is updated
             // These operators don't rely on a value, and can thus be used without one (eg `?filter[field][_null]`)
-            if ((operator === '_null' && compareValue !== false) || (operator === '_nnull' && compareValue === false)) {
+            if ((operator === '_null' && compareValue !== false) ||
+                (operator === '_nnull' && compareValue === false) ||
+                (operator === '_eq' && compareValue === null)) {
                 dbQuery[logical].whereNull(selectionRaw);
+                return;
             }
-            if ((operator === '_nnull' && compareValue !== false) || (operator === '_null' && compareValue === false)) {
+            if ((operator === '_nnull' && compareValue !== false) ||
+                (operator === '_null' && compareValue === false) ||
+                (operator === '_neq' && compareValue === null)) {
                 dbQuery[logical].whereNotNull(selectionRaw);
+                return;
             }
             if ((operator === '_empty' && compareValue !== false) || (operator === '_nempty' && compareValue === false)) {
                 dbQuery[logical].andWhere((query) => {

package/dist/utils/delete-from-require-cache.js

@@ -1,5 +1,5 @@
 import { createRequire } from 'node:module';
-import { useLogger } from '../logger.js';
+import { useLogger } from '../logger/index.js';
 const require = createRequire(import.meta.url);
 export function deleteFromRequireCache(modulePath) {
     const logger = useLogger();

package/dist/utils/get-default-value.js

@@ -1,6 +1,6 @@
 import { parseJSON } from '@directus/utils';
 import { getNodeEnv } from '@directus/utils/node';
-import { useLogger } from '../logger.js';
+import { useLogger } from '../logger/index.js';
 import getLocalType from './get-local-type.js';
 export default function getDefaultValue(column, field) {
     const type = getLocalType(column, field);

package/dist/utils/get-ip-from-req.js

@@ -1,6 +1,6 @@
 import { useEnv } from '@directus/env';
 import { isIP } from 'net';
-import { useLogger } from '../logger.js';
+import { useLogger } from '../logger/index.js';
 export function getIPFromReq(req) {
     const env = useEnv();
     const logger = useLogger();

package/dist/utils/get-permissions.js

@@ -5,7 +5,7 @@ import hash from 'object-hash';
 import { getCache, getCacheValue, getSystemCache, setCacheValue, setSystemCache } from '../cache.js';
 import getDatabase from '../database/index.js';
 import { appAccessMinimalPermissions } from '@directus/system-data';
-import { useLogger } from '../logger.js';
+import { useLogger } from '../logger/index.js';
 import { RolesService } from '../services/roles.js';
 import { UsersService } from '../services/users.js';
 import { mergePermissionsForShare } from './merge-permissions-for-share.js';

package/dist/utils/get-schema.js

@@ -8,7 +8,7 @@ import { getSchemaCache, setSchemaCache } from '../cache.js';
 import { ALIAS_TYPES } from '../constants.js';
 import getDatabase from '../database/index.js';
 import { useLock } from '../lock/index.js';
-import { useLogger } from '../logger.js';
+import { useLogger } from '../logger/index.js';
 import { RelationsService } from '../services/relations.js';
 import getDefaultValue from './get-default-value.js';
 import { getSystemFieldRowsWithAuthProviders } from './get-field-system-rows.js';
@@ -17,9 +17,6 @@ const logger = useLogger();
 export async function getSchema(options, attempt = 0) {
     const MAX_ATTEMPTS = 3;
     const env = useEnv();
-    if (attempt >= MAX_ATTEMPTS) {
-        throw new Error(`Failed to get Schema information: hit infinite loop`);
-    }
     if (options?.bypassCache || env['CACHE_SCHEMA'] === false) {
         const database = options?.database || getDatabase();
         const schemaInspector = createInspector(database);
@@ -29,6 +26,9 @@ export async function getSchema(options, attempt = 0) {
     if (cached) {
         return cached;
     }
+    if (attempt >= MAX_ATTEMPTS) {
+        throw new Error(`Failed to get Schema information: hit infinite loop`);
+    }
     const lock = useLock();
     const bus = useBus();
     const lockKey = 'schemaCache--preparing';

package/dist/utils/is-url-allowed.js

@@ -1,6 +1,6 @@
 import { toArray } from '@directus/utils';
 import { URL } from 'url';
-import { useLogger } from '../logger.js';
+import { useLogger } from '../logger/index.js';
 /**
  * Check if URL matches allow list either exactly or by origin (protocol+domain+port) + pathname
  */

package/dist/utils/sanitize-query.js

@@ -2,7 +2,7 @@ import { useEnv } from '@directus/env';
 import { InvalidQueryError } from '@directus/errors';
 import { parseFilter, parseJSON } from '@directus/utils';
 import { flatten, get, isPlainObject, merge, set } from 'lodash-es';
-import { useLogger } from '../logger.js';
+import { useLogger } from '../logger/index.js';
 import { Meta } from '../types/index.js';
 export function sanitizeQuery(rawQuery, accountability) {
     const env = useEnv();

package/dist/utils/transaction.js

@@ -1,6 +1,6 @@
 import {} from 'knex';
 import { getDatabaseClient } from '../database/index.js';
-import { useLogger } from '../logger.js';
+import { useLogger } from '../logger/index.js';
 /**
  * Execute the given handler within the current transaction or a newly created one
  * if the current knex state isn't a transaction yet.

package/dist/utils/validate-env.js

@@ -1,5 +1,5 @@
 import { useEnv } from '@directus/env';
-import { useLogger } from '../logger.js';
+import { useLogger } from '../logger/index.js';
 export function validateEnv(requiredKeys) {
     const env = useEnv();
     const logger = useLogger();

package/dist/utils/validate-storage.js

@@ -4,7 +4,7 @@ import { constants } from 'fs';
 import { access } from 'node:fs/promises';
 import path from 'path';
 import { getExtensionsPath } from '../extensions/lib/get-extensions-path.js';
-import { useLogger } from '../logger.js';
+import { useLogger } from '../logger/index.js';
 export async function validateStorage() {
     const env = useEnv();
     const logger = useLogger();

package/dist/websocket/controllers/base.js

@@ -6,7 +6,7 @@ import { parse } from 'url';
 import WebSocket, { WebSocketServer } from 'ws';
 import { fromZodError } from 'zod-validation-error';
 import emitter from '../../emitter.js';
-import { useLogger } from '../../logger.js';
+import { useLogger } from '../../logger/index.js';
 import { createRateLimiter } from '../../rate-limiter.js';
 import { getAccountabilityForToken } from '../../utils/get-accountability-for-token.js';
 import { authenticateConnection, authenticationSuccess } from '../authenticate.js';

package/dist/websocket/controllers/graphql.js

@@ -1,6 +1,6 @@
 import { useEnv } from '@directus/env';
 import { CloseCode, MessageType, makeServer } from 'graphql-ws';
-import { useLogger } from '../../logger.js';
+import { useLogger } from '../../logger/index.js';
 import { bindPubSub } from '../../services/graphql/subscription.js';
 import { GraphQLService } from '../../services/index.js';
 import { getSchema } from '../../utils/get-schema.js';

package/dist/websocket/controllers/rest.js

@@ -1,7 +1,7 @@
 import { useEnv } from '@directus/env';
 import { parseJSON } from '@directus/utils';
 import emitter from '../../emitter.js';
-import { useLogger } from '../../logger.js';
+import { useLogger } from '../../logger/index.js';
 import { refreshAccountability } from '../authenticate.js';
 import { WebSocketError, handleWebSocketError } from '../errors.js';
 import { WebSocketMessage } from '../messages.js';

package/dist/websocket/errors.js

@@ -1,7 +1,7 @@
 import { isDirectusError } from '@directus/errors';
 import { ZodError } from 'zod';
 import { fromZodError } from 'zod-validation-error';
-import { useLogger } from '../logger.js';
+import { useLogger } from '../logger/index.js';
 export class WebSocketError extends Error {
     type;
     code;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@directus/api",
-  "version": "20.1.0",
+  "version": "21.0.0",
   "description": "Directus is a real-time API and App dashboard for managing SQL database content",
   "keywords": [
     "directus",
@@ -59,7 +59,7 @@
   ],
   "dependencies": {
     "@authenio/samlify-node-xmllint": "2.0.0",
-    "@aws-sdk/client-ses": "3.600.0",
+    "@aws-sdk/client-ses": "3.614.0",
     "@godaddy/terminus": "4.12.1",
     "@rollup/plugin-alias": "5.1.0",
     "@rollup/plugin-node-resolve": "15.2.3",
@@ -70,7 +70,7 @@
     "@types/cookie": "0.6.0",
     "argon2": "0.40.3",
     "async": "3.2.5",
-    "axios": "1.7.2",
+    "axios": "1.7.3",
     "busboy": "1.6.0",
     "bytes": "3.1.2",
     "camelcase": "8.0.0",
@@ -99,7 +99,7 @@
     "graphql-ws": "5.16.0",
     "helmet": "7.1.0",
     "icc": "3.0.0",
-    "inquirer": "9.3.2",
+    "inquirer": "9.3.5",
     "ioredis": "5.4.1",
     "ip-matching": "2.1.2",
     "isolated-vm": "4.7.2",
@@ -111,12 +111,12 @@
     "keyv": "4.5.4",
     "knex": "3.1.0",
     "ldapjs": "2.3.3",
-    "liquidjs": "10.14.0",
+    "liquidjs": "10.15.0",
     "lodash-es": "4.17.21",
     "marked": "12.0.2",
     "micromustache": "8.0.3",
     "mime-types": "2.1.35",
-    "minimatch": "9.0.4",
+    "minimatch": "9.0.5",
     "mnemonist": "0.39.8",
     "ms": "2.1.3",
     "nanoid": "5.0.7",
@@ -124,7 +124,7 @@
     "node-schedule": "2.1.1",
     "nodemailer": "6.9.14",
     "object-hash": "3.0.0",
-    "openapi3-ts": "4.3.2",
+    "openapi3-ts": "4.3.3",
     "openid-client": "5.6.5",
     "ora": "8.0.1",
     "otplib": "12.0.1",
@@ -135,7 +135,7 @@
     "pino-http": "9.0.0",
     "pino-http-print": "3.1.0",
     "pino-pretty": "11.2.1",
-    "qs": "6.12.2",
+    "qs": "6.12.3",
     "rate-limiter-flexible": "5.0.3",
     "rollup": "4.17.2",
     "samlify": "2.8.10",
@@ -143,35 +143,35 @@
     "sharp": "0.33.4",
     "snappy": "7.2.2",
     "stream-json": "1.8.0",
-    "tar": "7.4.0",
-    "tsx": "4.12.0",
+    "tar": "7.4.2",
+    "tsx": "4.16.5",
     "wellknown": "0.5.0",
     "ws": "8.18.0",
     "zod": "3.23.8",
     "zod-validation-error": "3.3.0",
-    "@directus/app": "12.2.1",
+    "@directus/app": "12.2.2",
+    "@directus/errors": "0.4.0",
     "@directus/constants": "11.0.4",
-    "@directus/env": "1.3.0",
-    "@directus/extensions": "1.0.9",
-    "@directus/extensions-registry": "1.0.9",
+    "@directus/env": "1.3.1",
+    "@directus/extensions": "1.0.10",
+    "@directus/extensions-registry": "1.0.10",
+    "@directus/extensions-sdk": "11.0.10",
     "@directus/format-title": "10.1.2",
-    "@directus/errors": "0.3.3",
-    "@directus/memory": "1.0.10",
-    "@directus/extensions-sdk": "11.0.9",
-    "@directus/pressure": "1.0.21",
-    "@directus/schema": "11.0.3",
-    "@directus/specs": "10.2.10",
-    "@directus/storage-driver-azure": "10.0.23",
+    "@directus/memory": "1.0.11",
+    "@directus/pressure": "1.0.22",
+    "@directus/schema": "11.0.4",
+    "@directus/specs": "10.2.11",
     "@directus/storage": "10.1.0",
-    "@directus/storage-driver-cloudinary": "10.0.23",
-    "@directus/storage-driver-gcs": "10.0.24",
+    "@directus/storage-driver-cloudinary": "10.0.24",
+    "@directus/storage-driver-azure": "10.0.24",
+    "@directus/storage-driver-gcs": "10.0.25",
     "@directus/storage-driver-local": "10.1.0",
-    "@directus/storage-driver-s3": "10.1.0",
-    "@directus/storage-driver-supabase": "1.0.15",
-    "@directus/system-data": "1.1.0",
-    "@directus/utils": "11.0.10",
-    "@directus/validation": "0.0.18",
-    "directus": "10.13.1"
+    "@directus/storage-driver-supabase": "1.0.16",
+    "@directus/storage-driver-s3": "10.1.1",
+    "@directus/utils": "11.0.11",
+    "@directus/validation": "0.0.19",
+    "@directus/system-data": "1.1.1",
+    "directus": "10.13.2"
   },
   "devDependencies": {
     "@ngneat/falso": "7.2.0",
@@ -196,7 +196,7 @@
     "@types/lodash-es": "4.17.12",
     "@types/mime-types": "2.1.4",
     "@types/ms": "0.7.34",
-    "@types/node": "18.19.33",
+    "@types/node": "18.19.43",
     "@types/node-schedule": "2.1.7",
     "@types/nodemailer": "6.4.15",
     "@types/object-hash": "3.0.6",
@@ -205,7 +205,7 @@
     "@types/sanitize-html": "2.11.0",
     "@types/stream-json": "1.7.7",
     "@types/wellknown": "0.5.8",
-    "@types/ws": "8.5.10",
+    "@types/ws": "8.5.11",
     "@vitest/coverage-v8": "1.5.3",
     "copyfiles": "2.4.1",
     "form-data": "4.0.0",
@@ -214,7 +214,7 @@
     "vitest": "1.5.3",
     "@directus/tsconfig": "1.0.1",
     "@directus/random": "0.2.8",
-    "@directus/types": "11.2.0"
+    "@directus/types": "11.2.1"
   },
   "optionalDependencies": {
     "@keyv/redis": "2.8.5",