@directus/api 26.0.1 → 27.0.1

package/dist/services/payload.d.ts

@@ -1,4 +1,4 @@
-import type { Accountability, Item, PrimaryKey, SchemaOverview } from '@directus/types';
+import type { Accountability, Aggregate, FieldOverview, Item, PrimaryKey, SchemaOverview } from '@directus/types';
 import type { Knex } from 'knex';
 import type { Helpers } from '../database/helpers/index.js';
 import type { AbstractServiceOptions, ActionEventParams, MutationOptions } from '../types/index.js';
@@ -34,9 +34,9 @@ export declare class PayloadService {
     transformers: Transformers;
     processValues(action: Action, payloads: Partial<Item>[]): Promise<Partial<Item>[]>;
     processValues(action: Action, payload: Partial<Item>): Promise<Partial<Item>>;
-    processValues(action: Action, payloads: Partial<Item>[], aliasMap: Record<string, string>): Promise<Partial<Item>[]>;
-    processValues(action: Action, payload: Partial<Item>, aliasMap: Record<string, string>): Promise<Partial<Item>>;
-    processAggregates(payload: Partial<Item>[]): void;
+    processValues(action: Action, payloads: Partial<Item>[], aliasMap: Record<string, string>, aggregate: Aggregate): Promise<Partial<Item>[]>;
+    processValues(action: Action, payload: Partial<Item>, aliasMap: Record<string, string>, aggregate: Aggregate): Promise<Partial<Item>>;
+    processAggregates(payload: Partial<Item>[], aggregate?: Aggregate): void;
     processField(field: SchemaOverview['collections'][string]['fields'][string], payload: Partial<Item>, action: Action, accountability: Accountability | null): Promise<any>;
     /**
      * Native geometries are stored in custom binary format. We need to insert them with
@@ -44,12 +44,12 @@ export declare class PayloadService {
      * escaped. It's therefore placed as a Knex.Raw object in the payload. Thus the need
      * to check if the value is a raw instance before stringifying it in the next step.
      */
-    processGeometries<T extends Partial<Record<string, any>>[]>(payloads: T, action: Action): T;
+    processGeometries<T extends Partial<Record<string, any>>[]>(fieldEntries: [string, FieldOverview][], payloads: T, action: Action): T;
     /**
      * Knex returns `datetime` and `date` columns as Date.. This is wrong for date / datetime, as those
      * shouldn't return with time / timezone info respectively
      */
-    processDates(payloads: Partial<Record<string, any>>[], action: Action): Partial<Record<string, any>>[];
+    processDates(fieldEntries: [string, FieldOverview][], payloads: Partial<Record<string, any>>[], action: Action, aliasMap?: Record<string, string>, aggregate?: Aggregate): Partial<Record<string, any>>[];
     /**
      * Recursively save/update all nested related Any-to-One items
      */

package/dist/services/payload.js

@@ -123,7 +123,7 @@ export class PayloadService {
             return value;
         },
     };
-    async processValues(action, payload, aliasMap = {}) {
+    async processValues(action, payload, aliasMap = {}, aggregate = {}) {
         const processedPayload = toArray(payload);
         if (processedPayload.length === 0)
             return [];
@@ -153,8 +153,8 @@ export class PayloadService {
                     record[name] = newValue;
             }
         }
-        this.processGeometries(processedPayload, action);
-        this.processDates(processedPayload, action);
+        this.processGeometries(fieldEntries, processedPayload, action);
+        this.processDates(fieldEntries, processedPayload, action, aliasMap, aggregate);
         if (['create', 'update'].includes(action)) {
             processedPayload.forEach((record) => {
                 for (const [key, value] of Object.entries(record)) {
@@ -167,15 +167,30 @@ export class PayloadService {
             });
         }
         if (action === 'read') {
-            this.processAggregates(processedPayload);
+            this.processAggregates(processedPayload, aggregate);
         }
         if (Array.isArray(payload)) {
             return processedPayload;
         }
         return processedPayload[0];
     }
-    processAggregates(payload) {
-        const aggregateKeys = Object.keys(payload[0]).filter((key) => key.includes('->'));
+    processAggregates(payload, aggregate = {}) {
+        /**
+         * Build access path with -> delimiter
+         *
+         * input: { min: [ 'date', 'datetime', 'timestamp' ] }
+         * output: [ 'min->date', 'min->datetime', 'min->timestamp' ]
+         */
+        const aggregateKeys = Object.entries(aggregate).reduce((acc, [key, values]) => {
+            acc.push(...values.map((value) => `${key}->${value}`));
+            return acc;
+        }, []);
+        /**
+         * Expand -> delimited keys in the payload to the equivalent expanded object
+         *
+         * before: { "min->date": "2025-04-09", "min->datetime": "2025-04-08T12:00:00", "min->timestamp": "2025-04-17T23:18:00.000Z" }
+         * after: { "min": { "date": "2025-04-09", "datetime": "2025-04-08T12:00:00", "timestamp": "2025-04-17T23:18:00.000Z" } }
+         */
         if (aggregateKeys.length) {
             for (const item of payload) {
                 Object.assign(item, unflatten(pick(item, aggregateKeys), { delimiter: '->' }));
@@ -208,12 +223,11 @@ export class PayloadService {
      * escaped. It's therefore placed as a Knex.Raw object in the payload. Thus the need
      * to check if the value is a raw instance before stringifying it in the next step.
      */
-    processGeometries(payloads, action) {
+    processGeometries(fieldEntries, payloads, action) {
         const process = action == 'read'
             ? (value) => (typeof value === 'string' ? wktToGeoJSON(value) : value)
             : (value) => this.helpers.st.fromGeoJSON(typeof value == 'string' ? parseJSON(value) : value);
-        const fieldsInCollection = Object.entries(this.schema.collections[this.collection].fields);
-        const geometryColumns = fieldsInCollection.filter(([_, field]) => field.type.startsWith('geometry'));
+        const geometryColumns = fieldEntries.filter(([_, field]) => field.type.startsWith('geometry'));
         for (const [name] of geometryColumns) {
             for (const payload of payloads) {
                 if (payload[name]) {
@@ -227,10 +241,28 @@ export class PayloadService {
      * Knex returns `datetime` and `date` columns as Date.. This is wrong for date / datetime, as those
      * shouldn't return with time / timezone info respectively
      */
-    processDates(payloads, action) {
-        const fieldsInCollection = Object.entries(this.schema.collections[this.collection].fields);
-        const dateColumns = fieldsInCollection.filter(([_name, field]) => ['dateTime', 'date', 'timestamp'].includes(field.type));
-        const timeColumns = fieldsInCollection.filter(([_name, field]) => {
+    processDates(fieldEntries, payloads, action, aliasMap = {}, aggregate = {}) {
+        // Include aggegation e.g. "count->id" in alias map
+        const aggregateMapped = Object.fromEntries(Object.entries(aggregate).reduce((acc, [key, values]) => {
+            acc.push(...values.map((value) => [`${key}->${value}`, value]));
+            return acc;
+        }, []));
+        const aliasFields = { ...aliasMap, ...aggregateMapped };
+        for (const aliasField in aliasFields) {
+            const schemaField = aliasFields[aliasField];
+            const field = this.schema.collections[this.collection].fields[schemaField];
+            if (field) {
+                fieldEntries.push([
+                    aliasField,
+                    {
+                        ...field,
+                        field: aliasField,
+                    },
+                ]);
+            }
+        }
+        const dateColumns = fieldEntries.filter(([_name, field]) => ['dateTime', 'date', 'timestamp'].includes(field.type));
+        const timeColumns = fieldEntries.filter(([_name, field]) => {
             return field.type === 'time';
         });
         if (dateColumns.length === 0 && timeColumns.length === 0)
@@ -555,6 +587,7 @@ export class PayloadService {
                             },
                         ],
                     },
+                    limit: -1,
                 };
                 // Nullify all related items that aren't included in the current payload
                 if (relation.meta.one_deselect_action === 'delete') {
@@ -654,6 +687,7 @@ export class PayloadService {
                                 },
                             ],
                         },
+                        limit: -1,
                     };
                     if (relation.meta.one_deselect_action === 'delete') {
                         await service.deleteByQuery(query, {

package/dist/services/server.js

@@ -329,8 +329,13 @@ export class ServerService {
                     await disk.write(`health-${checkID}`, Readable.from(['check']));
                     const fileStream = await disk.read(`health-${checkID}`);
                     fileStream.on('data', async () => {
-                        fileStream.destroy();
-                        await disk.delete(`health-${checkID}`);
+                        try {
+                            fileStream.destroy();
+                            await disk.delete(`health-${checkID}`);
+                        }
+                        catch (error) {
+                            logger.error(error);
+                        }
                     });
                 }
                 catch (err) {

package/dist/services/specifications.js

@@ -2,6 +2,7 @@ import { useEnv } from '@directus/env';
 import formatTitle from '@directus/format-title';
 import { spec } from '@directus/specs';
 import { isSystemCollection } from '@directus/system-data';
+import { getRelation } from '@directus/utils';
 import { version } from 'directus/version';
 import { cloneDeep, mergeWith } from 'lodash-es';
 import { OAS_REQUIRED_SCHEMAS } from '../constants.js';
@@ -345,8 +346,7 @@ class OASSpecsService {
         if (field.note) {
             propertyObject.description = field.note;
         }
-        const relation = schema.relations.find((relation) => (relation.collection === collection && relation.field === field.field) ||
-            (relation.related_collection === collection && relation.meta?.one_field === field.field));
+        const relation = getRelation(schema.relations, collection, field.field);
         if (!relation) {
             propertyObject = {
                 ...propertyObject,

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

@@ -1,7 +1,7 @@
 import type { Relation } from '@directus/types';
 type RelationInfo = {
     relation: Relation | null;
-    relationType: string | null;
+    relationType: 'o2m' | 'm2o' | 'a2o' | 'o2a' | null;
 };
 export declare function getRelationInfo(relations: Relation[], collection: string, field: string): RelationInfo;
 export {};

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

@@ -1,3 +1,4 @@
+import { getRelation } from '@directus/utils';
 import { getRelationType } from './get-relation-type.js';
 function checkImplicitRelation(field) {
     if (field.startsWith('$FOLLOW(') && field.endsWith(')')) {
@@ -36,10 +37,7 @@ export function getRelationInfo(relations, collection, field) {
             return { relation, relationType: 'o2a' };
         }
     }
-    const relation = relations.find((relation) => {
-        return ((relation.collection === collection && relation.field === field) ||
-            (relation.related_collection === collection && relation.meta?.one_field === field));
-    }) ?? null;
+    const relation = getRelation(relations, collection, field) ?? null;
     const relationType = relation ? getRelationType({ relation, collection, field }) : null;
     return { relation, relationType };
 }

package/dist/websocket/handlers/items.js

@@ -76,6 +76,11 @@ export class ItemsHandler {
                 await service.upsertSingleton(message.data);
                 result = await service.readSingleton(query);
             }
+            else if (Array.isArray(message.data)) {
+                const keys = await service.updateBatch(message.data);
+                meta = await metaService.getMetaForQuery(message.collection, query);
+                result = await service.readMany(keys, query);
+            }
             else {
                 const keys = await service.updateByQuery(query, message.data);
                 meta = await metaService.getMetaForQuery(message.collection, query);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@directus/api",
-  "version": "26.0.1",
+  "version": "27.0.1",
   "description": "Directus is a real-time API and App dashboard for managing SQL database content",
   "keywords": [
     "directus",
@@ -69,7 +69,7 @@
     "argon2": "0.41.1",
     "async": "3.2.6",
     "async-mutex": "0.5.0",
-    "axios": "1.8.1",
+    "axios": "1.8.4",
     "busboy": "1.6.0",
     "bytes": "3.1.2",
     "camelcase": "8.0.0",
@@ -139,7 +139,7 @@
     "qs": "6.14.0",
     "rate-limiter-flexible": "5.0.5",
     "rollup": "4.34.9",
-    "samlify": "2.8.10",
+    "samlify": "2.9.1",
     "sanitize-html": "2.14.0",
     "sharp": "0.33.5",
     "snappy": "7.2.2",
@@ -150,29 +150,30 @@
     "ws": "8.18.1",
     "zod": "3.24.2",
     "zod-validation-error": "3.4.0",
-    "@directus/app": "13.8.1",
-    "@directus/errors": "2.0.1",
+    "@directus/app": "13.9.1",
     "@directus/constants": "13.0.1",
-    "@directus/env": "5.0.3",
-    "@directus/extensions": "3.0.4",
-    "@directus/extensions-registry": "3.0.4",
-    "@directus/memory": "3.0.3",
-    "@directus/extensions-sdk": "13.0.4",
+    "@directus/env": "5.0.4",
+    "@directus/errors": "2.0.1",
+    "@directus/extensions-registry": "3.0.5",
+    "@directus/extensions-sdk": "13.1.0",
+    "@directus/extensions": "3.0.5",
     "@directus/format-title": "12.0.1",
+    "@directus/memory": "3.0.4",
     "@directus/schema": "13.0.1",
-    "@directus/specs": "11.1.0",
-    "@directus/pressure": "3.0.3",
+    "@directus/schema-builder": "0.0.0",
+    "@directus/pressure": "3.0.4",
     "@directus/storage": "12.0.0",
-    "@directus/storage-driver-cloudinary": "12.0.3",
-    "@directus/storage-driver-azure": "12.0.3",
-    "@directus/storage-driver-gcs": "12.0.3",
+    "@directus/storage-driver-azure": "12.0.4",
+    "@directus/storage-driver-cloudinary": "12.0.4",
+    "@directus/specs": "11.1.0",
+    "@directus/storage-driver-gcs": "12.0.4",
     "@directus/storage-driver-local": "12.0.0",
-    "@directus/storage-driver-s3": "12.0.3",
+    "@directus/storage-driver-s3": "12.0.4",
+    "@directus/storage-driver-supabase": "3.0.4",
+    "@directus/utils": "13.0.4",
     "@directus/system-data": "3.1.0",
-    "@directus/storage-driver-supabase": "3.0.3",
-    "@directus/utils": "13.0.3",
-    "@directus/validation": "2.0.3",
-    "directus": "11.6.1"
+    "directus": "11.7.1",
+    "@directus/validation": "2.0.4"
   },
   "devDependencies": {
     "@directus/tsconfig": "3.0.0",
@@ -216,7 +217,8 @@
     "typescript": "5.8.2",
     "vitest": "2.1.9",
     "@directus/random": "2.0.1",
-    "@directus/types": "13.1.0"
+    "@directus/types": "13.1.1",
+    "@directus/schema-builder": "0.0.0"
   },
   "optionalDependencies": {
     "@keyv/redis": "3.0.1",

package/dist/database/get-ast-from-query/utils/get-relation.d.ts

@@ -1,2 +0,0 @@
-import type { SchemaOverview } from '@directus/types';
-export declare function getRelation(schema: SchemaOverview, collection: string, field: string): import("@directus/types").Relation | undefined;

package/dist/database/get-ast-from-query/utils/get-relation.js

@@ -1,7 +0,0 @@
-export function getRelation(schema, collection, field) {
-    const relation = schema.relations.find((relation) => {
-        return ((relation.collection === collection && relation.field === field) ||
-            (relation.related_collection === collection && relation.meta?.one_field === field));
-    });
-    return relation;
-}

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

@@ -1,46 +0,0 @@
-import type { Aggregate, Filter, Permission, Query, SchemaOverview } from '@directus/types';
-import type { Knex } from 'knex';
-import type { AliasMap } from './get-column-path.js';
-export declare const generateAlias: (size?: number) => string;
-type ApplyQueryOptions = {
-    aliasMap?: AliasMap;
-    isInnerQuery?: boolean;
-    hasMultiRelationalSort?: boolean | undefined;
-    groupWhenCases?: number[][] | undefined;
-    groupColumnPositions?: number[] | undefined;
-};
-/**
- * Apply the Query to a given Knex query builder instance
- */
-export default function applyQuery(knex: Knex, collection: string, dbQuery: Knex.QueryBuilder, query: Query, schema: SchemaOverview, cases: Filter[], permissions: Permission[], options?: ApplyQueryOptions): {
-    query: Knex.QueryBuilder<any, any>;
-    hasJoins: boolean;
-    hasMultiRelationalFilter: boolean;
-};
-export type ColumnSortRecord = {
-    order: 'asc' | 'desc';
-    column: string;
-};
-export declare function applySort(knex: Knex, schema: SchemaOverview, rootQuery: Knex.QueryBuilder, query: Query, collection: string, aliasMap: AliasMap, returnRecords?: boolean): {
-    sortRecords: {
-        order: "asc" | "desc";
-        column: any;
-    }[];
-    hasJoins: boolean;
-    hasMultiRelationalSort: boolean;
-} | {
-    hasJoins: boolean;
-    hasMultiRelationalSort: boolean;
-    sortRecords?: never;
-};
-export declare function applyLimit(knex: Knex, rootQuery: Knex.QueryBuilder, limit: any): void;
-export declare function applyOffset(knex: Knex, rootQuery: Knex.QueryBuilder, offset: any): void;
-export declare function applyFilter(knex: Knex, schema: SchemaOverview, rootQuery: Knex.QueryBuilder, rootFilter: Filter, collection: string, aliasMap: AliasMap, cases: Filter[], permissions: Permission[]): {
-    query: Knex.QueryBuilder<any, any>;
-    hasJoins: boolean;
-    hasMultiRelationalFilter: boolean;
-};
-export declare function applySearch(knex: Knex, schema: SchemaOverview, dbQuery: Knex.QueryBuilder, searchQuery: string, collection: string, aliasMap: AliasMap, permissions: Permission[]): void;
-export declare function applyAggregate(schema: SchemaOverview, dbQuery: Knex.QueryBuilder, aggregate: Aggregate, collection: string, hasJoins: boolean): void;
-export declare function joinFilterWithCases(filter: Filter | null | undefined, cases: Filter[]): Filter | null;
-export {};