@directus/api 24.0.0 → 24.0.1

package/dist/database/get-ast-from-query/lib/parse-fields.js

@@ -169,10 +169,11 @@ export async function parseFields(options, context) {
                     continue;
                 }
             }
+            const childQuery = { ...options.query };
             // update query alias for children parseFields
             const deepAlias = getDeepQuery(options.deep?.[fieldKey] || {})?.['alias'];
-            if (!isEmpty(deepAlias))
-                options.query.alias = deepAlias;
+            // reset alias to empty if none are present
+            childQuery.alias = isEmpty(deepAlias) ? {} : deepAlias;
             child = {
                 type: relationType,
                 name: relatedCollection,
@@ -184,7 +185,7 @@ export async function parseFields(options, context) {
                 children: await parseFields({
                     parentCollection: relatedCollection,
                     fields: nestedFields,
-                    query: options.query,
+                    query: childQuery,
                     deep: options.deep?.[fieldKey] || {},
                     accountability: options.accountability,
                 }, context),

package/dist/database/helpers/index.d.ts

@@ -3,17 +3,15 @@ import type { Knex } from 'knex';
 import * as dateHelpers from './date/index.js';
 import * as fnHelpers from './fn/index.js';
 import * as geometryHelpers from './geometry/index.js';
+import * as numberHelpers from './number/index.js';
 import * as schemaHelpers from './schema/index.js';
 import * as sequenceHelpers from './sequence/index.js';
-import * as numberHelpers from './number/index.js';
-import * as nullableUpdateHelper from './nullable-update/index.js';
 export declare function getHelpers(database: Knex): {
     date: dateHelpers.postgres | dateHelpers.oracle | dateHelpers.mysql | dateHelpers.mssql | dateHelpers.sqlite;
     st: geometryHelpers.postgres | geometryHelpers.mssql | geometryHelpers.mysql | geometryHelpers.sqlite | geometryHelpers.oracle | geometryHelpers.redshift;
     schema: schemaHelpers.cockroachdb | schemaHelpers.mssql | schemaHelpers.mysql | schemaHelpers.postgres | schemaHelpers.sqlite | schemaHelpers.oracle | schemaHelpers.redshift;
     sequence: sequenceHelpers.mysql | sequenceHelpers.postgres;
     number: numberHelpers.cockroachdb | numberHelpers.mssql | numberHelpers.postgres | numberHelpers.sqlite | numberHelpers.oracle;
-    nullableUpdate: nullableUpdateHelper.postgres | nullableUpdateHelper.oracle;
 };
 export declare function getFunctions(database: Knex, schema: SchemaOverview): fnHelpers.postgres | fnHelpers.mssql | fnHelpers.mysql | fnHelpers.sqlite | fnHelpers.oracle;
 export type Helpers = ReturnType<typeof getHelpers>;

package/dist/database/helpers/index.js

@@ -2,10 +2,9 @@ import { getDatabaseClient } from '../index.js';
 import * as dateHelpers from './date/index.js';
 import * as fnHelpers from './fn/index.js';
 import * as geometryHelpers from './geometry/index.js';
+import * as numberHelpers from './number/index.js';
 import * as schemaHelpers from './schema/index.js';
 import * as sequenceHelpers from './sequence/index.js';
-import * as numberHelpers from './number/index.js';
-import * as nullableUpdateHelper from './nullable-update/index.js';
 export function getHelpers(database) {
     const client = getDatabaseClient(database);
     return {
@@ -14,7 +13,6 @@ export function getHelpers(database) {
         schema: new schemaHelpers[client](database),
         sequence: new sequenceHelpers[client](database),
         number: new numberHelpers[client](database),
-        nullableUpdate: new nullableUpdateHelper[client](database),
     };
 }
 export function getFunctions(database, schema) {

package/dist/database/helpers/schema/dialects/oracle.d.ts

@@ -1,5 +1,6 @@
 import type { KNEX_TYPES } from '@directus/constants';
-import type { Field, Relation, Type } from '@directus/types';
+import type { Column } from '@directus/schema';
+import type { Field, RawField, Relation, Type } from '@directus/types';
 import type { Knex } from 'knex';
 import type { Options, SortRecord, Sql } from '../types.js';
 import { SchemaHelper } from '../types.js';
@@ -10,6 +11,10 @@ export declare class SchemaHelperOracle extends SchemaHelper {
     preRelationChange(relation: Partial<Relation>): void;
     processFieldType(field: Field): Type;
     getDatabaseSize(): Promise<number | null>;
+    /**
+     * Oracle throws an error when overwriting the nullable option for an existing column with the same value.
+     */
+    setNullable(column: Knex.ColumnBuilder, field: RawField | Field, existing: Column | null): void;
     prepQueryParams(queryParams: Sql): Sql;
     prepBindings(bindings: Knex.Value[]): any;
     addInnerSortFieldsToGroupBy(groupByFields: (string | Knex.Raw)[], sortRecords: SortRecord[], _hasRelationalSort: boolean): void;

package/dist/database/helpers/schema/dialects/oracle.js

@@ -52,6 +52,21 @@ export class SchemaHelperOracle extends SchemaHelper {
             return null;
         }
     }
+    /**
+     * Oracle throws an error when overwriting the nullable option for an existing column with the same value.
+     */
+    setNullable(column, field, existing) {
+        if (!existing) {
+            super.setNullable(column, field, existing);
+            return;
+        }
+        if (field.schema?.is_nullable === false && existing.is_nullable === true) {
+            column.notNullable();
+        }
+        else if (field.schema?.is_nullable === true && existing.is_nullable === false) {
+            column.nullable();
+        }
+    }
     prepQueryParams(queryParams) {
         return prepQueryParams(queryParams, { format: (index) => `:${index + 1}` });
     }

package/dist/database/helpers/schema/types.d.ts

@@ -1,5 +1,6 @@
 import type { KNEX_TYPES } from '@directus/constants';
-import type { Field, Relation, Type } from '@directus/types';
+import type { Column } from '@directus/schema';
+import type { Field, RawField, Relation, Type } from '@directus/types';
 import type { Knex } from 'knex';
 import type { DatabaseClient } from '../../../types/index.js';
 import { DatabaseHelper } from '../types.js';
@@ -25,6 +26,7 @@ export declare abstract class SchemaHelper extends DatabaseHelper {
     preColumnChange(): Promise<boolean>;
     postColumnChange(): Promise<void>;
     preRelationChange(_relation: Partial<Relation>): void;
+    setNullable(column: Knex.ColumnBuilder, field: RawField | Field, existing: Column | null): void;
     processFieldType(field: Field): Type;
     constraintName(existingName: string): string;
     applyLimit(rootQuery: Knex.QueryBuilder, limit: number): void;

package/dist/database/helpers/schema/types.js

@@ -66,6 +66,15 @@ export class SchemaHelper extends DatabaseHelper {
     preRelationChange(_relation) {
         return;
     }
+    setNullable(column, field, existing) {
+        const isNullable = field.schema?.is_nullable ?? existing?.is_nullable ?? true;
+        if (isNullable) {
+            column.nullable();
+        }
+        else {
+            column.notNullable();
+        }
+    }
     processFieldType(field) {
         return field.type;
     }

package/dist/operations/mail/index.d.ts

@@ -1,10 +1,13 @@
 export type Options = {
-    body?: string;
-    template?: string;
-    data?: Record<string, any>;
     to: string;
     type: 'wysiwyg' | 'markdown' | 'template';
     subject: string;
+    body?: string;
+    template?: string;
+    data?: Record<string, any>;
+    cc?: string;
+    bcc?: string;
+    replyTo?: string;
 };
 declare const _default: import("@directus/extensions").OperationApiConfig<Options>;
 export default _default;

package/dist/operations/mail/index.js

@@ -5,9 +5,9 @@ import { useLogger } from '../../logger/index.js';
 const logger = useLogger();
 export default defineOperationApi({
     id: 'mail',
-    handler: async ({ body, template, data, to, type, subject }, { accountability, database, getSchema }) => {
+    handler: async ({ body, template, data, to, type, subject, cc, bcc, replyTo }, { accountability, database, getSchema }) => {
         const mailService = new MailService({ schema: await getSchema({ database }), accountability, knex: database });
-        const mailObject = { to, subject };
+        const mailObject = { to, subject, cc, bcc, replyTo };
         const safeBody = typeof body !== 'string' ? JSON.stringify(body) : body;
         if (type === 'template') {
             mailObject.template = {

package/dist/services/fields.js

@@ -674,7 +674,17 @@ export class FieldsService {
         else {
             throw new InvalidPayloadError({ reason: `Illegal type passed: "${field.type}"` });
         }
-        const setDefaultValue = (defaultValue) => {
+        /**
+         * The column nullability must be set on every alter or it will be dropped
+         * This is due to column.alter() not being incremental per https://knexjs.org/guide/schema-builder.html#alter
+         */
+        this.helpers.schema.setNullable(column, field, existing);
+        /**
+         * The default value must be set on every alter or it will be dropped
+         * This is due to column.alter() not being incremental per https://knexjs.org/guide/schema-builder.html#alter
+         */
+        const defaultValue = field.schema?.default_value !== undefined ? field.schema?.default_value : existing?.default_value;
+        if (defaultValue !== undefined) {
             const newDefaultValueIsString = typeof defaultValue === 'string';
             const newDefaultIsNowFunction = newDefaultValueIsString && defaultValue.toLowerCase() === 'now()';
             const newDefaultIsCurrentTimestamp = newDefaultValueIsString && defaultValue === 'CURRENT_TIMESTAMP';
@@ -694,57 +704,31 @@ export class FieldsService {
             else {
                 column.defaultTo(defaultValue);
             }
-        };
-        // for a new item, set the default value and nullable as provided without any further considerations
-        if (!existing) {
-            if (field.schema?.default_value !== undefined) {
-                setDefaultValue(field.schema.default_value);
-            }
-            if (field.schema?.is_nullable || field.schema?.is_nullable === undefined) {
-                column.nullable();
-            }
-            else {
-                column.notNullable();
-            }
-        }
-        else {
-            // for an existing item: if nullable option changed, we have to provide the default values as well and actually vice versa
-            // see https://knexjs.org/guide/schema-builder.html#alter
-            // To overwrite a nullable option with the same value this is not possible for Oracle though, hence the DB helper
-            if (field.schema?.default_value !== undefined || field.schema?.is_nullable !== undefined) {
-                this.helpers.nullableUpdate.updateNullableValue(column, field, existing);
-                let defaultValue = null;
-                if (field.schema?.default_value !== undefined) {
-                    defaultValue = field.schema.default_value;
-                }
-                else if (existing.default_value !== undefined) {
-                    defaultValue = existing.default_value;
-                }
-                setDefaultValue(defaultValue);
-            }
         }
         if (field.schema?.is_primary_key) {
             column.primary().notNullable();
         }
         else if (!existing?.is_primary_key) {
             // primary key will already have unique/index constraints
-            const uniqueIndexName = this.helpers.schema.generateIndexName('unique', collection, field.field);
             if (field.schema?.is_unique === true) {
                 if (!existing || existing.is_unique === false) {
-                    column.unique({ indexName: uniqueIndexName });
+                    column.unique({ indexName: this.helpers.schema.generateIndexName('unique', collection, field.field) });
                 }
             }
             else if (field.schema?.is_unique === false) {
-                if (existing && existing.is_unique === true) {
-                    table.dropUnique([field.field], uniqueIndexName);
+                if (existing?.is_unique === true) {
+                    table.dropUnique([field.field], this.helpers.schema.generateIndexName('unique', collection, field.field));
                 }
             }
-            const indexName = this.helpers.schema.generateIndexName('index', collection, field.field);
-            if (field.schema?.is_indexed === true && !existing?.is_indexed) {
-                column.index(indexName);
+            if (field.schema?.is_indexed === true) {
+                if (!existing || existing.is_indexed === false) {
+                    column.index(this.helpers.schema.generateIndexName('index', collection, field.field));
+                }
             }
-            else if (field.schema?.is_indexed === false && existing?.is_indexed) {
-                table.dropIndex([field.field], indexName);
+            else if (field.schema?.is_indexed === false) {
+                if (existing?.is_indexed === true) {
+                    table.dropIndex([field.field], this.helpers.schema.generateIndexName('index', collection, field.field));
+                }
             }
         }
         if (existing) {

package/dist/services/files.js

@@ -1,5 +1,5 @@
 import { useEnv } from '@directus/env';
-import { ContentTooLargeError, ForbiddenError, InvalidPayloadError, ServiceUnavailableError } from '@directus/errors';
+import { ContentTooLargeError, InvalidPayloadError, ServiceUnavailableError } from '@directus/errors';
 import formatTitle from '@directus/format-title';
 import { toArray } from '@directus/utils';
 import encodeURL from 'encodeurl';
@@ -211,10 +211,11 @@ export class FilesService extends ItemsService {
      */
     async deleteMany(keys) {
         const storage = await getStorage();
-        const files = await super.readMany(keys, { fields: ['id', 'storage', 'filename_disk'], limit: -1 });
-        if (!files) {
-            throw new ForbiddenError();
-        }
+        const sudoFilesItemsService = new FilesService({
+            knex: this.knex,
+            schema: this.schema,
+        });
+        const files = await sudoFilesItemsService.readMany(keys, { fields: ['id', 'storage', 'filename_disk'], limit: -1 });
         await super.deleteMany(keys);
         for (const file of files) {
             const disk = storage.location(file['storage']);

package/dist/utils/get-schema.js

@@ -44,10 +44,10 @@ export async function getSchema(options, attempt = 0) {
         const subscription = new Promise((resolve, reject) => {
             bus.subscribe(messageKey, busListener).catch(reject);
             function busListener(options) {
+                cleanup();
                 if (options.schema === null) {
                     return reject();
                 }
-                cleanup();
                 setLocalSchemaCache(options.schema).catch(reject);
                 resolve(options.schema);
             }

package/dist/utils/sanitize-schema.d.ts

@@ -16,7 +16,7 @@ export declare function sanitizeCollection(collection: Collection | undefined):
  * @returns sanitized field
  */
 export declare function sanitizeField(field: Field | undefined, sanitizeAllSchema?: boolean): Partial<Field> | undefined;
-export declare function sanitizeColumn(column: Column): Pick<Column, "table" | "name" | "numeric_precision" | "data_type" | "default_value" | "max_length" | "numeric_scale" | "is_nullable" | "is_unique" | "is_indexed" | "is_primary_key" | "is_generated" | "generation_expression" | "has_auto_increment" | "foreign_key_table" | "foreign_key_column">;
+export declare function sanitizeColumn(column: Column): Pick<Column, "table" | "name" | "data_type" | "default_value" | "max_length" | "numeric_precision" | "numeric_scale" | "is_nullable" | "is_unique" | "is_indexed" | "is_primary_key" | "is_generated" | "generation_expression" | "has_auto_increment" | "foreign_key_table" | "foreign_key_column">;
 /**
  * Pick certain database vendor specific relation properties that should be compared when performing diff
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@directus/api",
-  "version": "24.0.0",
+  "version": "24.0.1",
   "description": "Directus is a real-time API and App dashboard for managing SQL database content",
   "keywords": [
     "directus",
@@ -128,7 +128,7 @@
     "otplib": "12.0.1",
     "p-limit": "6.2.0",
     "p-queue": "8.0.1",
-    "papaparse": "5.5.0",
+    "papaparse": "5.4.1",
     "pino": "9.6.0",
     "pino-http": "10.3.0",
     "pino-http-print": "3.1.0",
@@ -147,29 +147,29 @@
     "ws": "8.18.0",
     "zod": "3.24.1",
     "zod-validation-error": "3.4.0",
+    "@directus/app": "13.6.0",
     "@directus/constants": "13.0.0",
-    "@directus/app": "13.5.0",
     "@directus/env": "5.0.0",
     "@directus/errors": "2.0.0",
-    "@directus/extensions": "3.0.0",
-    "@directus/extensions-sdk": "13.0.0",
-    "@directus/extensions-registry": "3.0.0",
+    "@directus/extensions": "3.0.1",
+    "@directus/extensions-registry": "3.0.1",
+    "@directus/extensions-sdk": "13.0.1",
     "@directus/format-title": "12.0.0",
     "@directus/memory": "3.0.0",
-    "@directus/pressure": "3.0.0",
     "@directus/schema": "13.0.0",
     "@directus/specs": "11.1.0",
-    "@directus/storage": "12.0.0",
     "@directus/storage-driver-azure": "12.0.0",
-    "@directus/storage-driver-gcs": "12.0.0",
-    "@directus/storage-driver-local": "12.0.0",
+    "@directus/pressure": "3.0.0",
+    "@directus/storage": "12.0.0",
     "@directus/storage-driver-cloudinary": "12.0.0",
+    "@directus/storage-driver-local": "12.0.0",
+    "@directus/storage-driver-gcs": "12.0.0",
+    "@directus/storage-driver-s3": "12.0.0",
     "@directus/storage-driver-supabase": "3.0.0",
-    "@directus/system-data": "3.0.0",
     "@directus/utils": "13.0.0",
-    "@directus/storage-driver-s3": "12.0.0",
+    "@directus/system-data": "3.0.0",
     "@directus/validation": "2.0.0",
-    "directus": "11.4.0"
+    "directus": "11.4.1"
   },
   "devDependencies": {
     "@directus/tsconfig": "3.0.0",

package/dist/database/helpers/nullable-update/dialects/default.d.ts

@@ -1,3 +0,0 @@
-import { NullableFieldUpdateHelper } from '../types.js';
-export declare class NullableFieldUpdateHelperDefault extends NullableFieldUpdateHelper {
-}

package/dist/database/helpers/nullable-update/dialects/default.js

@@ -1,3 +0,0 @@
-import { NullableFieldUpdateHelper } from '../types.js';
-export class NullableFieldUpdateHelperDefault extends NullableFieldUpdateHelper {
-}

package/dist/database/helpers/nullable-update/dialects/oracle.d.ts

@@ -1,12 +0,0 @@
-import type { Column } from '@directus/schema';
-import type { Field, RawField } from '@directus/types';
-import type { Knex } from 'knex';
-import { NullableFieldUpdateHelper } from '../types.js';
-/**
- * Oracle throws an error when overwriting the nullable option with same value.
- * Therefore we need to check if the nullable option has changed and only then apply it.
- * The default value can be set regardless of the previous value.
- */
-export declare class NullableFieldUpdateHelperOracle extends NullableFieldUpdateHelper {
-    updateNullableValue(column: Knex.ColumnBuilder, field: RawField | Field, existing: Column): void;
-}

package/dist/database/helpers/nullable-update/dialects/oracle.js

@@ -1,16 +0,0 @@
-import { NullableFieldUpdateHelper } from '../types.js';
-/**
- * Oracle throws an error when overwriting the nullable option with same value.
- * Therefore we need to check if the nullable option has changed and only then apply it.
- * The default value can be set regardless of the previous value.
- */
-export class NullableFieldUpdateHelperOracle extends NullableFieldUpdateHelper {
-    updateNullableValue(column, field, existing) {
-        if (field.schema?.is_nullable === false && existing.is_nullable === true) {
-            column.notNullable();
-        }
-        else if (field.schema?.is_nullable === true && existing.is_nullable === false) {
-            column.nullable();
-        }
-    }
-}

package/dist/database/helpers/nullable-update/index.d.ts

@@ -1,7 +0,0 @@
-export { NullableFieldUpdateHelperOracle as oracle } from './dialects/oracle.js';
-export { NullableFieldUpdateHelperDefault as postgres } from './dialects/default.js';
-export { NullableFieldUpdateHelperDefault as mysql } from './dialects/default.js';
-export { NullableFieldUpdateHelperDefault as cockroachdb } from './dialects/default.js';
-export { NullableFieldUpdateHelperDefault as redshift } from './dialects/default.js';
-export { NullableFieldUpdateHelperDefault as sqlite } from './dialects/default.js';
-export { NullableFieldUpdateHelperDefault as mssql } from './dialects/default.js';

package/dist/database/helpers/nullable-update/index.js

@@ -1,7 +0,0 @@
-export { NullableFieldUpdateHelperOracle as oracle } from './dialects/oracle.js';
-export { NullableFieldUpdateHelperDefault as postgres } from './dialects/default.js';
-export { NullableFieldUpdateHelperDefault as mysql } from './dialects/default.js';
-export { NullableFieldUpdateHelperDefault as cockroachdb } from './dialects/default.js';
-export { NullableFieldUpdateHelperDefault as redshift } from './dialects/default.js';
-export { NullableFieldUpdateHelperDefault as sqlite } from './dialects/default.js';
-export { NullableFieldUpdateHelperDefault as mssql } from './dialects/default.js';

package/dist/database/helpers/nullable-update/types.d.ts

@@ -1,7 +0,0 @@
-import type { Knex } from 'knex';
-import { DatabaseHelper } from '../types.js';
-import type { Column } from '@directus/schema';
-import type { Field, RawField } from '@directus/types';
-export declare class NullableFieldUpdateHelper extends DatabaseHelper {
-    updateNullableValue(column: Knex.ColumnBuilder, field: RawField | Field, existing: Column): void;
-}

package/dist/database/helpers/nullable-update/types.js

@@ -1,12 +0,0 @@
-import { DatabaseHelper } from '../types.js';
-export class NullableFieldUpdateHelper extends DatabaseHelper {
-    updateNullableValue(column, field, existing) {
-        const isNullable = field.schema?.is_nullable ?? existing?.is_nullable ?? true;
-        if (isNullable) {
-            column.nullable();
-        }
-        else {
-            column.notNullable();
-        }
-    }
-}