@directus/api 23.1.2 → 23.1.3

package/dist/controllers/items.js

@@ -75,7 +75,7 @@ const readHandler = asyncHandler(async (req, res, next) => {
     };
     return next();
 });
-router.search('/:collection', collectionExists, validateBatch('read'), readHandler, respond);
+router.search('/:collection', collectionExists, validateBatch('read'), readHandler, mergeContentVersions, respond);
 router.get('/:collection', collectionExists, readHandler, mergeContentVersions, respond);
 router.get('/:collection/:pk', collectionExists, asyncHandler(async (req, res, next) => {
     if (isSystemCollection(req.params['collection']))

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

@@ -6,6 +6,6 @@ export declare class SchemaHelperCockroachDb extends SchemaHelper {
     changeToType(table: string, column: string, type: (typeof KNEX_TYPES)[number], options?: Options): Promise<void>;
     constraintName(existingName: string): string;
     getDatabaseSize(): Promise<number | null>;
-    preprocessBindings(queryParams: Sql): Sql;
+    prepQueryParams(queryParams: Sql): Sql;
     addInnerSortFieldsToGroupBy(groupByFields: (string | Knex.Raw)[], sortRecords: SortRecord[], hasRelationalSort: boolean): void;
 }

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

@@ -1,7 +1,7 @@
 import {} from 'knex';
 import { SchemaHelper } from '../types.js';
 import { useEnv } from '@directus/env';
-import { preprocessBindings } from '../utils/preprocess-bindings.js';
+import { prepQueryParams } from '../utils/prep-query-params.js';
 const env = useEnv();
 export class SchemaHelperCockroachDb extends SchemaHelper {
     async changeToType(table, column, type, options = {}) {
@@ -29,8 +29,8 @@ export class SchemaHelperCockroachDb extends SchemaHelper {
             return null;
         }
     }
-    preprocessBindings(queryParams) {
-        return preprocessBindings(queryParams, { format: (index) => `$${index + 1}` });
+    prepQueryParams(queryParams) {
+        return prepQueryParams(queryParams, { format: (index) => `$${index + 1}` });
     }
     addInnerSortFieldsToGroupBy(groupByFields, sortRecords, hasRelationalSort) {
         if (hasRelationalSort) {

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

@@ -5,6 +5,6 @@ export declare class SchemaHelperMSSQL extends SchemaHelper {
     applyOffset(rootQuery: Knex.QueryBuilder, offset: number): void;
     formatUUID(uuid: string): string;
     getDatabaseSize(): Promise<number | null>;
-    preprocessBindings(queryParams: Sql): Sql;
+    prepQueryParams(queryParams: Sql): Sql;
     addInnerSortFieldsToGroupBy(groupByFields: (string | Knex.Raw)[], sortRecords: SortRecord[], _hasRelationalSort: boolean): void;
 }

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

@@ -1,5 +1,5 @@
 import { SchemaHelper } from '../types.js';
-import { preprocessBindings } from '../utils/preprocess-bindings.js';
+import { prepQueryParams } from '../utils/prep-query-params.js';
 export class SchemaHelperMSSQL extends SchemaHelper {
     applyLimit(rootQuery, limit) {
         // The ORDER BY clause is invalid in views, inline functions, derived tables, subqueries,
@@ -27,8 +27,8 @@ export class SchemaHelperMSSQL extends SchemaHelper {
             return null;
         }
     }
-    preprocessBindings(queryParams) {
-        return preprocessBindings(queryParams, { format: (index) => `@p${index}` });
+    prepQueryParams(queryParams) {
+        return prepQueryParams(queryParams, { format: (index) => `@p${index}` });
     }
     addInnerSortFieldsToGroupBy(groupByFields, sortRecords, _hasRelationalSort) {
         /*

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

@@ -9,6 +9,7 @@ export declare class SchemaHelperOracle extends SchemaHelper {
     preRelationChange(relation: Partial<Relation>): void;
     processFieldType(field: Field): Type;
     getDatabaseSize(): Promise<number | null>;
-    preprocessBindings(queryParams: Sql): Sql;
+    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

@@ -1,5 +1,5 @@
 import { SchemaHelper } from '../types.js';
-import { preprocessBindings } from '../utils/preprocess-bindings.js';
+import { prepQueryParams } from '../utils/prep-query-params.js';
 export class SchemaHelperOracle extends SchemaHelper {
     async changeToType(table, column, type, options = {}) {
         await this.changeToTypeByCopy(table, column, type, options);
@@ -39,8 +39,13 @@ export class SchemaHelperOracle extends SchemaHelper {
             return null;
         }
     }
-    preprocessBindings(queryParams) {
-        return preprocessBindings(queryParams, { format: (index) => `:${index + 1}` });
+    prepQueryParams(queryParams) {
+        return prepQueryParams(queryParams, { format: (index) => `:${index + 1}` });
+    }
+    prepBindings(bindings) {
+        // Create an object with keys 1, 2, 3, ... and the bindings as values
+        // This will use the "named" binding syntax in the oracledb driver instead of the positional binding
+        return Object.fromEntries(bindings.map((binding, index) => [index + 1, binding]));
     }
     addInnerSortFieldsToGroupBy(groupByFields, sortRecords, _hasRelationalSort) {
         /*

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

@@ -2,6 +2,6 @@ import type { Knex } from 'knex';
 import { SchemaHelper, type SortRecord, type Sql } from '../types.js';
 export declare class SchemaHelperPostgres extends SchemaHelper {
     getDatabaseSize(): Promise<number | null>;
-    preprocessBindings(queryParams: Sql): Sql;
+    prepQueryParams(queryParams: Sql): Sql;
     addInnerSortFieldsToGroupBy(groupByFields: (string | Knex.Raw)[], sortRecords: SortRecord[], hasRelationalSort: boolean): void;
 }

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

@@ -1,6 +1,6 @@
 import { useEnv } from '@directus/env';
 import { SchemaHelper } from '../types.js';
-import { preprocessBindings } from '../utils/preprocess-bindings.js';
+import { prepQueryParams } from '../utils/prep-query-params.js';
 const env = useEnv();
 export class SchemaHelperPostgres extends SchemaHelper {
     async getDatabaseSize() {
@@ -12,8 +12,8 @@ export class SchemaHelperPostgres extends SchemaHelper {
             return null;
         }
     }
-    preprocessBindings(queryParams) {
-        return preprocessBindings(queryParams, { format: (index) => `$${index + 1}` });
+    prepQueryParams(queryParams) {
+        return prepQueryParams(queryParams, { format: (index) => `$${index + 1}` });
     }
     addInnerSortFieldsToGroupBy(groupByFields, sortRecords, hasRelationalSort) {
         if (hasRelationalSort) {

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

@@ -35,6 +35,7 @@ export declare abstract class SchemaHelper extends DatabaseHelper {
      * @returns Size of the database in bytes
      */
     getDatabaseSize(): Promise<number | null>;
-    preprocessBindings(queryParams: Sql): Sql;
+    prepQueryParams(queryParams: Sql): Sql;
+    prepBindings(bindings: Knex.Value[]): any;
     addInnerSortFieldsToGroupBy(_groupByFields: (string | Knex.Raw)[], _sortRecords: SortRecord[], _hasRelationalSort: boolean): void;
 }

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

@@ -94,9 +94,12 @@ export class SchemaHelper extends DatabaseHelper {
     async getDatabaseSize() {
         return null;
     }
-    preprocessBindings(queryParams) {
+    prepQueryParams(queryParams) {
         return queryParams;
     }
+    prepBindings(bindings) {
+        return bindings;
+    }
     addInnerSortFieldsToGroupBy(_groupByFields, _sortRecords, _hasRelationalSort) {
         // no-op by default
     }

package/dist/database/helpers/schema/utils/{preprocess-bindings.d.ts → prep-query-params.d.ts}

@@ -1,12 +1,12 @@
 import type { Knex } from 'knex';
 import type { Sql } from '../types.js';
-export type PreprocessBindingsOptions = {
+export type PrepQueryParamsOptions = {
     format(index: number): string;
 };
 /**
  * Preprocess a SQL query, such that repeated binding values are bound to the same binding index.
  **/
-export declare function preprocessBindings(queryParams: (Partial<Sql> & Pick<Sql, 'sql'>) | string, options: PreprocessBindingsOptions): {
+export declare function prepQueryParams(queryParams: (Partial<Sql> & Pick<Sql, 'sql'>) | string, options: PrepQueryParamsOptions): {
     sql: string;
     bindings: Knex.Value[];
 };

package/dist/database/helpers/schema/utils/{preprocess-bindings.js → prep-query-params.js}

@@ -2,7 +2,7 @@ import { isString } from 'lodash-es';
 /**
  * Preprocess a SQL query, such that repeated binding values are bound to the same binding index.
  **/
-export function preprocessBindings(queryParams, options) {
+export function prepQueryParams(queryParams, options) {
     const query = { bindings: [], ...(isString(queryParams) ? { sql: queryParams } : queryParams) };
     // bindingIndices[i] is the index of the first occurrence of query.bindings[i]
     const bindingIndices = new Map();

package/dist/database/index.js

@@ -3,7 +3,7 @@ import { createInspector } from '@directus/schema';
 import { isObject } from '@directus/utils';
 import fse from 'fs-extra';
 import knex from 'knex';
-import { merge } from 'lodash-es';
+import { isArray, merge } from 'lodash-es';
 import { dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import path from 'path';
@@ -139,7 +139,13 @@ export function getDatabase() {
             delta = performance.now() - time;
             times.delete(queryInfo.__knexUid);
         }
-        logger.trace(`[${delta ? delta.toFixed(3) : '?'}ms] ${queryInfo.sql} [${(queryInfo.bindings ?? []).join(', ')}]`);
+        // eslint-disable-next-line no-nested-ternary
+        const bindings = queryInfo.bindings
+            ? isArray(queryInfo.bindings)
+                ? queryInfo.bindings
+                : Object.values(queryInfo.bindings)
+            : [];
+        logger.trace(`[${delta ? delta.toFixed(3) : '?'}ms] ${queryInfo.sql} [${bindings.join(', ')}]`);
     })
         .on('query-error', (_, queryInfo) => {
         times.delete(queryInfo.__knexUid);

package/dist/database/run-ast/utils/with-preprocess-bindings.js

@@ -4,9 +4,10 @@ export function withPreprocessBindings(knex, dbQuery) {
     dbQuery.client = new Proxy(dbQuery.client, {
         get(target, prop, receiver) {
             if (prop === 'query') {
-                return (connection, queryParam) => {
-                    return Reflect.get(target, prop, receiver).bind(target)(connection, schemaHelper.preprocessBindings(queryParam));
-                };
+                return (connection, queryParams) => Reflect.get(target, prop, receiver).bind(dbQuery.client)(connection, schemaHelper.prepQueryParams(queryParams));
+            }
+            if (prop === 'prepBindings') {
+                return (bindings) => schemaHelper.prepBindings(Reflect.get(target, prop, receiver).bind(dbQuery.client)(bindings));
             }
             return Reflect.get(target, prop, receiver);
         },

package/dist/permissions/modules/validate-access/lib/validate-item-access.js

@@ -1,3 +1,4 @@
+import { toBoolean } from '@directus/utils';
 import { fetchPermittedAstRootFields } from '../../../../database/run-ast/modules/fetch-permitted-ast-root-fields.js';
 import { processAst } from '../../process-ast/process-ast.js';
 export async function validateItemAccess(options, context) {
@@ -31,7 +32,7 @@ export async function validateItemAccess(options, context) {
     if (items && items.length === options.primaryKeys.length) {
         const { fields } = options;
         if (fields) {
-            return items.every((item) => fields.every((field) => item[field] === 1));
+            return items.every((item) => fields.every((field) => toBoolean(item[field])));
         }
         return true;
     }

package/dist/storage/register-locations.js

@@ -6,6 +6,7 @@ export const registerLocations = async (storage) => {
     const env = useEnv();
     const locations = toArray(env['STORAGE_LOCATIONS']);
     const tus = {
+        enabled: RESUMABLE_UPLOADS.ENABLED,
         chunkSize: RESUMABLE_UPLOADS.CHUNK_SIZE,
     };
     locations.forEach((location) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@directus/api",
-  "version": "23.1.2",
+  "version": "23.1.3",
   "description": "Directus is a real-time API and App dashboard for managing SQL database content",
   "keywords": [
     "directus",
@@ -149,29 +149,29 @@
     "ws": "8.18.0",
     "zod": "3.23.8",
     "zod-validation-error": "3.4.0",
-    "@directus/app": "13.3.2",
-    "@directus/constants": "12.0.0",
-    "@directus/env": "3.1.3",
+    "@directus/app": "13.3.3",
+    "@directus/constants": "12.0.1",
+    "@directus/env": "4.0.0",
     "@directus/errors": "1.0.1",
-    "@directus/extensions-registry": "2.0.4",
-    "@directus/extensions": "2.0.4",
-    "@directus/extensions-sdk": "12.1.2",
+    "@directus/extensions": "2.0.5",
+    "@directus/extensions-registry": "2.0.5",
+    "@directus/extensions-sdk": "12.1.3",
     "@directus/format-title": "11.0.0",
-    "@directus/memory": "2.0.4",
-    "@directus/pressure": "2.0.3",
+    "@directus/memory": "2.0.5",
+    "@directus/pressure": "2.0.4",
     "@directus/schema": "12.1.1",
     "@directus/specs": "11.1.0",
     "@directus/storage": "11.0.1",
-    "@directus/storage-driver-azure": "11.1.0",
-    "@directus/storage-driver-gcs": "11.1.0",
-    "@directus/storage-driver-cloudinary": "11.1.0",
+    "@directus/storage-driver-azure": "11.1.1",
+    "@directus/storage-driver-cloudinary": "11.1.1",
+    "@directus/storage-driver-gcs": "11.1.1",
     "@directus/storage-driver-local": "11.0.1",
-    "@directus/storage-driver-s3": "11.0.3",
-    "@directus/storage-driver-supabase": "2.1.0",
+    "@directus/storage-driver-s3": "11.0.4",
+    "@directus/storage-driver-supabase": "2.1.1",
     "@directus/system-data": "2.1.1",
-    "@directus/validation": "1.0.3",
-    "@directus/utils": "12.0.3",
-    "directus": "11.2.1"
+    "@directus/utils": "12.0.4",
+    "@directus/validation": "1.0.4",
+    "directus": "11.2.2"
   },
   "devDependencies": {
     "@ngneat/falso": "7.2.0",
@@ -215,7 +215,7 @@
     "vitest": "2.1.2",
     "@directus/random": "1.0.0",
     "@directus/tsconfig": "2.0.0",
-    "@directus/types": "12.2.1"
+    "@directus/types": "12.2.2"
   },
   "optionalDependencies": {
     "@keyv/redis": "3.0.1",