@directus/api 32.1.1 → 33.0.0

package/dist/cli/commands/roles/create.js

@@ -1,9 +1,9 @@
-import { getSchema } from '../../../utils/get-schema.js';
-import { RolesService } from '../../../services/roles.js';
-import { PoliciesService } from '../../../services/index.js';
-import { AccessService } from '../../../services/index.js';
 import getDatabase from '../../../database/index.js';
 import { useLogger } from '../../../logger/index.js';
+import { PoliciesService } from '../../../services/index.js';
+import { AccessService } from '../../../services/index.js';
+import { RolesService } from '../../../services/roles.js';
+import { getSchema } from '../../../utils/get-schema.js';
 export default async function rolesCreate({ role: name, admin, app, }) {
     const database = getDatabase();
     const logger = useLogger();

package/dist/cli/commands/schema/apply.js

@@ -1,10 +1,10 @@
-import { parseJSON } from '@directus/utils';
+import { promises as fs } from 'fs';
+import path from 'path';
 import { DiffKind } from '@directus/types';
+import { parseJSON } from '@directus/utils';
 import chalk from 'chalk';
-import { promises as fs } from 'fs';
 import inquirer from 'inquirer';
 import { load as loadYaml } from 'js-yaml';
-import path from 'path';
 import getDatabase, { isInstalled, validateDatabaseConnection } from '../../../database/index.js';
 import { useLogger } from '../../../logger/index.js';
 import { isNestedMetaUpdate } from '../../../utils/apply-diff.js';

package/dist/cli/commands/schema/snapshot.js

@@ -1,7 +1,7 @@
 import { promises as fs, constants as fsConstants } from 'fs';
+import path from 'path';
 import inquirer from 'inquirer';
 import { dump as toYaml } from 'js-yaml';
-import path from 'path';
 import getDatabase from '../../../database/index.js';
 import { useLogger } from '../../../logger/index.js';
 import { getSnapshot } from '../../../utils/get-snapshot.js';

package/dist/cli/utils/create-db-connection.d.ts

@@ -1,5 +1,5 @@
-import type { Knex } from 'knex';
 import type { Driver } from '@directus/types';
+import type { Knex } from 'knex';
 export type Credentials = {
     filename?: string;
     host?: string;

package/dist/cli/utils/create-db-connection.js

@@ -1,7 +1,7 @@
-import knex from 'knex';
 import { dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import path from 'path';
+import knex from 'knex';
 const __dirname = dirname(fileURLToPath(import.meta.url));
 export default function createDBConnection(client, credentials) {
     let connection = {};

package/dist/cli/utils/create-env/index.js

@@ -1,9 +1,9 @@
 import fs from 'fs';
-import { Liquid } from 'liquidjs';
 import { dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import path from 'path';
 import { promisify } from 'util';
+import { Liquid } from 'liquidjs';
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const readFile = promisify(fs.readFile);
 const writeFile = promisify(fs.writeFile);

package/dist/constants.d.ts

@@ -1,5 +1,5 @@
-import type { CookieOptions } from 'express';
 import type { TransformationParams } from '@directus/types';
+import type { CookieOptions } from 'express';
 export declare const SYSTEM_ASSET_ALLOW_LIST: TransformationParams[];
 export declare const ASSET_TRANSFORM_QUERY_KEYS: readonly ["key", "transforms", "width", "height", "format", "fit", "quality", "withoutEnlargement", "focal_point_x", "focal_point_y"];
 export declare const FILTER_VARIABLES: string[];
@@ -15,11 +15,15 @@ export declare const OAS_REQUIRED_SCHEMAS: string[];
 export declare const SUPPORTED_IMAGE_TRANSFORM_FORMATS: string[];
 /** Formats where metadata extraction is supported */
 export declare const SUPPORTED_IMAGE_METADATA_FORMATS: string[];
-/** Resumable uploads */
+/** File uploads */
+export declare const FILE_UPLOADS: {
+    MAX_SIZE: number | null;
+    MAX_CONCURRENCY: number;
+};
+/** Resumable uploads (TUS) */
 export declare const RESUMABLE_UPLOADS: {
     ENABLED: boolean;
     CHUNK_SIZE: number | null;
-    MAX_SIZE: number | null;
     EXPIRATION_TIME: number;
     SCHEDULE: string;
 };

package/dist/constants.js

@@ -1,7 +1,7 @@
-import { getMilliseconds } from './utils/get-milliseconds.js';
 import { useEnv } from '@directus/env';
 import { toBoolean } from '@directus/utils';
 import bytes from 'bytes';
+import { getMilliseconds } from './utils/get-milliseconds.js';
 const env = useEnv();
 export const SYSTEM_ASSET_ALLOW_LIST = [
     {
@@ -87,11 +87,15 @@ export const SUPPORTED_IMAGE_METADATA_FORMATS = [
     'image/tiff',
     'image/avif',
 ];
-/** Resumable uploads */
+/** File uploads */
+export const FILE_UPLOADS = {
+    MAX_SIZE: bytes.parse(env['FILES_MAX_UPLOAD_SIZE']),
+    MAX_CONCURRENCY: Number(env['FILES_MAX_UPLOAD_CONCURRENCY']),
+};
+/** Resumable uploads (TUS) */
 export const RESUMABLE_UPLOADS = {
     ENABLED: toBoolean(env['TUS_ENABLED']),
     CHUNK_SIZE: bytes.parse(env['TUS_CHUNK_SIZE']),
-    MAX_SIZE: bytes.parse(env['FILES_MAX_UPLOAD_SIZE']),
     EXPIRATION_TIME: getMilliseconds(env['TUS_UPLOAD_EXPIRATION'], 600_000 /* 10min */),
     SCHEDULE: String(env['TUS_CLEANUP_SCHEDULE']),
 };

package/dist/controllers/access.js

@@ -3,8 +3,8 @@ import express from 'express';
 import { respond } from '../middleware/respond.js';
 import useCollection from '../middleware/use-collection.js';
 import { validateBatch } from '../middleware/validate-batch.js';
-import { MetaService } from '../services/meta.js';
 import { AccessService } from '../services/access.js';
+import { MetaService } from '../services/meta.js';
 import asyncHandler from '../utils/async-handler.js';
 import { sanitizeQuery } from '../utils/sanitize-query.js';
 const router = express.Router();

package/dist/controllers/assets.js

@@ -1,10 +1,12 @@
 import { useEnv } from '@directus/env';
-import { InvalidQueryError, RangeNotSatisfiableError } from '@directus/errors';
+import { InvalidPayloadError, InvalidQueryError, RangeNotSatisfiableError } from '@directus/errors';
 import { TransformationMethods } from '@directus/types';
-import { parseJSON } from '@directus/utils';
+import { getDateTimeFormatted, parseJSON } from '@directus/utils';
 import contentDisposition from 'content-disposition';
 import { Router } from 'express';
 import { merge, pick } from 'lodash-es';
+import * as z from 'zod';
+import { fromZodError } from 'zod-validation-error';
 import { ASSET_TRANSFORM_QUERY_KEYS, SYSTEM_ASSET_ALLOW_LIST } from '../constants.js';
 import getDatabase from '../database/index.js';
 import { useLogger } from '../logger/index.js';
@@ -15,9 +17,44 @@ import asyncHandler from '../utils/async-handler.js';
 import { getCacheControlHeader } from '../utils/get-cache-headers.js';
 import { getConfigFromEnv } from '../utils/get-config-from-env.js';
 import { getMilliseconds } from '../utils/get-milliseconds.js';
+import { isValidUuid } from '../utils/is-valid-uuid.js';
 const router = Router();
 const env = useEnv();
 router.use(useCollection('directus_files'));
+router.post('/folder/:pk', asyncHandler(async (req, res) => {
+    const service = new AssetsService({
+        accountability: req.accountability,
+        schema: req.schema,
+    });
+    const { archive, complete, metadata } = await service.zipFolder(req.params['pk']);
+    res.setHeader('Content-Type', 'application/zip');
+    res.setHeader('Content-Disposition', `attachment; filename="folder-${metadata['name'] ? metadata['name'] : 'unknown'}-${getDateTimeFormatted()}.zip"`);
+    archive.pipe(res);
+    await complete();
+}));
+router.post('/files/', asyncHandler(async (req, res) => {
+    const service = new AssetsService({
+        accountability: req.accountability,
+        schema: req.schema,
+    });
+    const { error, data } = z
+        .object({
+        ids: z
+            .array(z.string().refine((v) => isValidUuid(v), {
+            error: '"id" must be a uuid',
+        }))
+            .min(1),
+    })
+        .safeParse(req.body);
+    if (error) {
+        throw new InvalidPayloadError({ reason: fromZodError(error).message });
+    }
+    const { archive, complete } = await service.zipFiles(data.ids);
+    res.setHeader('Content-Type', 'application/zip');
+    res.setHeader('Content-Disposition', `attachment; filename="files-${getDateTimeFormatted()}.zip"`);
+    archive.pipe(res);
+    await complete();
+}));
 router.get('/:pk/:filename?', 
 // Validate query params
 asyncHandler(async (req, res, next) => {
@@ -152,7 +189,7 @@ asyncHandler(async (req, res) => {
         }
     }
     const { stream, file, stat } = await service.getAsset(id, { transformationParams, acceptFormat }, range, true);
-    const filename = req.params['filename'] ?? file.filename_download;
+    const filename = req.params['filename'] ?? file.filename_download ?? file.id;
     res.attachment(filename);
     res.setHeader('Content-Type', file.type);
     res.setHeader('Accept-Ranges', 'bytes');

package/dist/controllers/extensions.js

@@ -1,6 +1,6 @@
+import { EXTENSION_TYPES } from '@directus/constants';
 import { useEnv } from '@directus/env';
 import { ErrorCode, ForbiddenError, isDirectusError, RouteNotFoundError } from '@directus/errors';
-import { EXTENSION_TYPES } from '@directus/constants';
 import { account, describe, list, } from '@directus/extensions-registry';
 import { isIn } from '@directus/utils';
 import express from 'express';

package/dist/controllers/fields.js

@@ -1,15 +1,15 @@
 import { TYPES } from '@directus/constants';
+import { ErrorCode, InvalidPayloadError } from '@directus/errors';
 import { ForbiddenError, isDirectusError } from '@directus/errors';
+import { isSystemField } from '@directus/system-data';
 import { Router } from 'express';
 import Joi from 'joi';
 import { ALIAS_TYPES } from '../constants.js';
-import { ErrorCode, InvalidPayloadError } from '@directus/errors';
 import validateCollection from '../middleware/collection-exists.js';
 import { respond } from '../middleware/respond.js';
 import useCollection from '../middleware/use-collection.js';
 import { FieldsService, systemFieldUpdateSchema } from '../services/fields.js';
 import asyncHandler from '../utils/async-handler.js';
-import { isSystemField } from '@directus/system-data';
 const router = Router();
 router.use(useCollection('directus_fields'));
 router.get('/', asyncHandler(async (req, res, next) => {

package/dist/controllers/files.js

@@ -1,3 +1,4 @@
+import path from 'path';
 import { useEnv } from '@directus/env';
 import { ErrorCode, InvalidPayloadError, isDirectusError } from '@directus/errors';
 import formatTitle from '@directus/format-title';
@@ -7,7 +8,6 @@ import bytes from 'bytes';
 import express from 'express';
 import Joi from 'joi';
 import { minimatch } from 'minimatch';
-import path from 'path';
 import { respond } from '../middleware/respond.js';
 import useCollection from '../middleware/use-collection.js';
 import { validateBatch } from '../middleware/validate-batch.js';

package/dist/controllers/items.js

@@ -1,4 +1,4 @@
-import { ErrorCode, ForbiddenError, RouteNotFoundError, isDirectusError } from '@directus/errors';
+import { ErrorCode, ForbiddenError, isDirectusError, RouteNotFoundError } from '@directus/errors';
 import { isSystemCollection } from '@directus/system-data';
 import express from 'express';
 import collectionExists from '../middleware/collection-exists.js';

package/dist/controllers/mcp.js

@@ -1,6 +1,6 @@
 import { ForbiddenError } from '@directus/errors';
 import { Router } from 'express';
-import { DirectusMCP } from '../mcp/index.js';
+import { DirectusMCP } from '../ai/mcp/index.js';
 import { SettingsService } from '../services/settings.js';
 import asyncHandler from '../utils/async-handler.js';
 const router = Router();

package/dist/controllers/not-found.js

@@ -1,6 +1,6 @@
+import { RouteNotFoundError } from '@directus/errors';
 import getDatabase from '../database/index.js';
 import emitter from '../emitter.js';
-import { RouteNotFoundError } from '@directus/errors';
 /**
  * Handles not found routes.
  *

package/dist/controllers/relations.js

@@ -1,7 +1,7 @@
+import { ErrorCode, InvalidPayloadError } from '@directus/errors';
 import { isDirectusError } from '@directus/errors';
 import express from 'express';
 import Joi from 'joi';
-import { ErrorCode, InvalidPayloadError } from '@directus/errors';
 import validateCollection from '../middleware/collection-exists.js';
 import { respond } from '../middleware/respond.js';
 import useCollection from '../middleware/use-collection.js';

package/dist/database/errors/dialects/mysql.d.ts

@@ -1,3 +1,3 @@
-import type { MySQLError } from './types.js';
 import type { Item } from '@directus/types';
+import type { MySQLError } from './types.js';
 export declare function extractError(error: MySQLError, data: Partial<Item>): MySQLError | Error;

package/dist/database/errors/dialects/postgres.d.ts

@@ -1,3 +1,3 @@
-import type { PostgresError } from './types.js';
 import type { Item } from '@directus/types';
+import type { PostgresError } from './types.js';
 export declare function extractError(error: PostgresError, data: Partial<Item>): PostgresError | Error;

package/dist/database/errors/dialects/sqlite.d.ts

@@ -1,3 +1,3 @@
-import type { SQLiteError } from './types.js';
 import type { Item } from '@directus/types';
+import type { SQLiteError } from './types.js';
 export declare function extractError(error: SQLiteError, data: Partial<Item>): SQLiteError | Error;

package/dist/database/errors/translate.d.ts

@@ -1,5 +1,5 @@
-import type { SQLError } from './dialects/types.js';
 import type { Item } from '@directus/types';
+import type { SQLError } from './dialects/types.js';
 /**
  * Translates an error thrown by any of the databases into a pre-defined Exception. Currently
  * supports:

package/dist/database/errors/translate.js

@@ -1,5 +1,5 @@
-import getDatabase, { getDatabaseClient } from '../index.js';
 import emitter from '../../emitter.js';
+import getDatabase, { getDatabaseClient } from '../index.js';
 import { extractError as mssql } from './dialects/mssql.js';
 import { extractError as mysql } from './dialects/mysql.js';
 import { extractError as oracle } from './dialects/oracle.js';

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

@@ -1,5 +1,5 @@
-import { DateHelper } from '../types.js';
 import { parseISO } from 'date-fns';
+import { DateHelper } from '../types.js';
 export class DateHelperMSSQL extends DateHelper {
     writeTimestamp(date) {
         const parsedDate = parseISO(date);

package/dist/database/helpers/date/dialects/mysql.js

@@ -1,5 +1,5 @@
-import { DateHelper } from '../types.js';
 import { parseISO } from 'date-fns';
+import { DateHelper } from '../types.js';
 export class DateHelperMySQL extends DateHelper {
     readTimestampString(date) {
         const parsedDate = new Date(date);

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

@@ -1,5 +1,5 @@
-import { DatabaseHelper } from '../types.js';
 import { parseISO } from 'date-fns';
+import { DatabaseHelper } from '../types.js';
 export class DateHelper extends DatabaseHelper {
     parse(date) {
         // Date generated from NOW()

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

@@ -5,6 +5,7 @@ import { SchemaHelper } from '../types.js';
 export declare class SchemaHelperCockroachDb extends SchemaHelper {
     changeToType(table: string, column: string, type: (typeof KNEX_TYPES)[number], options?: Options): Promise<void>;
     constraintName(existingName: string): string;
+    changePrimaryKey(table: string, to: string | string[]): Promise<void>;
     getDatabaseSize(): Promise<number | null>;
     addInnerSortFieldsToGroupBy(groupByFields: (string | Knex.Raw)[], sortRecords: SortRecord[], hasRelationalSort: boolean): void;
     createIndex(collection: string, field: string, options?: CreateIndexOptions): Promise<Knex.SchemaBuilder>;

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

@@ -1,6 +1,8 @@
+import assert from 'node:assert';
+import { useEnv } from '@directus/env';
+import { toArray } from '@directus/utils';
 import {} from 'knex';
 import { SchemaHelper } from '../types.js';
-import { useEnv } from '@directus/env';
 const env = useEnv();
 export class SchemaHelperCockroachDb extends SchemaHelper {
     async changeToType(table, column, type, options = {}) {
@@ -17,6 +19,27 @@ export class SchemaHelperCockroachDb extends SchemaHelper {
             return existingName + suffix;
         }
     }
+    async changePrimaryKey(table, to) {
+        const primaryColumns = toArray(to);
+        const placeholders = primaryColumns.map(() => '??').join(', ');
+        assert(primaryColumns.length > 0, 'At least 1 "to" column is required');
+        assert(primaryColumns[0] && primaryColumns[0].length > 0, '"to" column cannot be empty');
+        /* Before adding the new PK field(s) we drop the existing constraint to ensure no leftover secondary index on the original PK field.
+         * - https://www.cockroachlabs.com/docs/stable/primary-key#changing-primary-key-columns
+         *
+         * CockroachDB requires that when changing a PK the current one be dropped and new one added in the same transaction.
+         * To prevent this error from being thrown both operations are executed in the same statement via `,`.
+         * As it is done in a single operation no need for transaction rollback support.
+         * - https://www.cockroachlabs.com/docs/stable/primary-key.html
+         * - https://www.cockroachlabs.com/docs/stable/alter-table#synopsis
+         */
+        await this.knex.raw(`ALTER TABLE ?? DROP CONSTRAINT ?? , ADD CONSTRAINT ?? PRIMARY KEY (${placeholders})`, [
+            table,
+            `${table}_pkey`,
+            `${table}_pkey`,
+            ...primaryColumns,
+        ]);
+    }
     async getDatabaseSize() {
         try {
             const result = await this.knex

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

@@ -1,5 +1,5 @@
 import type { Knex } from 'knex';
-import { SchemaHelper, type CreateIndexOptions, type SortRecord, type Sql } from '../types.js';
+import { type CreateIndexOptions, SchemaHelper, type SortRecord, type Sql } from '../types.js';
 export declare class SchemaHelperMSSQL extends SchemaHelper {
     generateIndexName(type: 'unique' | 'foreign' | 'index', collection: string, fields: string | string[]): string;
     applyLimit(rootQuery: Knex.QueryBuilder, limit: number): void;

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

@@ -1,7 +1,8 @@
 import type { Knex } from 'knex';
-import { SchemaHelper, type CreateIndexOptions, type SortRecord } from '../types.js';
+import { type CreateIndexOptions, SchemaHelper, type SortRecord } from '../types.js';
 export declare class SchemaHelperMySQL extends SchemaHelper {
     generateIndexName(type: 'unique' | 'foreign' | 'index', collection: string, fields: string | string[]): string;
+    changePrimaryKey(table: string, to: string | string[]): Promise<void>;
     getDatabaseSize(): Promise<number | null>;
     addInnerSortFieldsToGroupBy(groupByFields: (string | Knex.Raw)[], sortRecords: SortRecord[], hasRelationalSort: boolean): void;
     createIndex(collection: string, field: string, options?: CreateIndexOptions): Promise<Knex.SchemaBuilder>;

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

@@ -1,4 +1,6 @@
+import assert from 'node:assert';
 import { useEnv } from '@directus/env';
+import { toArray } from '@directus/utils';
 import { getDefaultIndexName } from '../../../../utils/get-default-index-name.js';
 import { SchemaHelper } from '../types.js';
 const env = useEnv();
@@ -6,6 +8,17 @@ export class SchemaHelperMySQL extends SchemaHelper {
     generateIndexName(type, collection, fields) {
         return getDefaultIndexName(type, collection, fields, { maxLength: 64 });
     }
+    async changePrimaryKey(table, to) {
+        const primaryColumns = toArray(to);
+        const placeholders = primaryColumns.map(() => '??').join(', ');
+        // validate input
+        assert(primaryColumns.length > 0, 'At least 1 "to" column is required');
+        assert(primaryColumns[0] && primaryColumns[0].length > 0, '"to" column cannot be empty');
+        await this.knex.raw(`ALTER TABLE ?? DROP PRIMARY KEY, ADD PRIMARY KEY (${placeholders})`, [
+            table,
+            ...primaryColumns,
+        ]);
+    }
     async getDatabaseSize() {
         try {
             const result = (await this.knex
@@ -29,8 +42,8 @@ export class SchemaHelperMySQL extends SchemaHelper {
             MySQL only requires all selected sort columns that are not functionally dependent on the primary key to be included.
 
             > If the ONLY_FULL_GROUP_BY SQL mode is enabled (which it is by default),
-              MySQL rejects queries for which the select list, HAVING condition, or ORDER BY list refer to
-              nonaggregated columns that are neither named in the GROUP BY clause nor are functionally dependent on them.
+                MySQL rejects queries for which the select list, HAVING condition, or ORDER BY list refer to
+                nonaggregated columns that are neither named in the GROUP BY clause nor are functionally dependent on them.
 
             https://dev.mysql.com/doc/refman/8.4/en/group-by-handling.html
 
@@ -66,7 +79,7 @@ export class SchemaHelperMySQL extends SchemaHelper {
             /*
             Seems it is not possible to determine whether "ALGORITHM=INPLACE LOCK=NONE" will be supported
             so we're just going to send it and fall back to blocking index creation on error
-            
+
             https://dev.mysql.com/doc/refman/8.4/en/create-index.html#:~:text=engine%20is%20changed.-,Table%20Copying%20and%20Locking%20Options,-ALGORITHM%20and%20LOCK
             */
             return this.knex

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

@@ -1,5 +1,5 @@
 import type { Knex } from 'knex';
-import { SchemaHelper, type CreateIndexOptions, type SortRecord } from '../types.js';
+import { type CreateIndexOptions, SchemaHelper, type SortRecord } from '../types.js';
 export declare class SchemaHelperPostgres extends SchemaHelper {
     generateIndexName(type: 'unique' | 'foreign' | 'index', collection: string, fields: string | string[]): string;
     getDatabaseSize(): Promise<number | null>;

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

@@ -25,6 +25,19 @@ export declare abstract class SchemaHelper extends DatabaseHelper {
     changeNullable(table: string, column: string, nullable: boolean): Promise<void>;
     generateIndexName(type: 'unique' | 'foreign' | 'index', collection: string, fields: string | string[]): string;
     changeToType(table: string, column: string, type: (typeof KNEX_TYPES)[number], options?: Options): Promise<void>;
+    /**
+     * Change a tables primary key
+     *
+     * @param table - The name of the table
+     * @param to - The new primary key column name(s)
+     *
+     * * @example
+     * // Changing a single primary key
+     * await changePrimaryKey('users', 'uuid');
+     * * // Creating a composite primary key
+     * await changePrimaryKey('order_items', ['order_id', 'product_id']);
+     */
+    changePrimaryKey(table: string, to: string | string[]): Promise<void>;
     protected changeToTypeByCopy(table: string, column: string, type: (typeof KNEX_TYPES)[number], options: Options): Promise<void>;
     preColumnChange(): Promise<boolean>;
     postColumnChange(): Promise<void>;

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

@@ -1,3 +1,5 @@
+import assert from 'node:assert';
+import { toArray } from '@directus/utils';
 import { getDefaultIndexName } from '../../../utils/get-default-index-name.js';
 import { getDatabaseClient } from '../../index.js';
 import { DatabaseHelper } from '../types.js';
@@ -33,6 +35,28 @@ export class SchemaHelper extends DatabaseHelper {
             b.alter();
         });
     }
+    /**
+     * Change a tables primary key
+     *
+     * @param table - The name of the table
+     * @param to - The new primary key column name(s)
+     *
+     * * @example
+     * // Changing a single primary key
+     * await changePrimaryKey('users', 'uuid');
+     * * // Creating a composite primary key
+     * await changePrimaryKey('order_items', ['order_id', 'product_id']);
+     */
+    async changePrimaryKey(table, to) {
+        const primaryColumns = toArray(to);
+        // validate input
+        assert(primaryColumns.length > 0, 'At least 1 "to" column is required');
+        assert(primaryColumns[0] && primaryColumns[0].length > 0, '"to" column cannot be empty');
+        await this.knex.schema.alterTable(table, (builder) => {
+            builder.dropPrimary();
+            builder.primary(primaryColumns);
+        });
+    }
     async changeToTypeByCopy(table, column, type, options) {
         const tempName = `${column}__temp`;
         await this.knex.schema.alterTable(table, (builder) => {

package/dist/database/index.js

@@ -1,13 +1,13 @@
+import { dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import path from 'path';
+import { performance } from 'perf_hooks';
 import { useEnv } from '@directus/env';
 import { createInspector } from '@directus/schema';
 import { isObject } from '@directus/utils';
 import fse from 'fs-extra';
 import knex from 'knex';
 import { isArray, merge, toArray } from 'lodash-es';
-import { dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
-import path from 'path';
-import { performance } from 'perf_hooks';
 import { getExtensionsPath } from '../extensions/lib/get-extensions-path.js';
 import { useLogger } from '../logger/index.js';
 import { useMetrics } from '../metrics/index.js';

package/dist/database/migrations/20220429A-add-flows.js

@@ -1,5 +1,5 @@
-import { parseJSON, toArray } from '@directus/utils';
 import { randomUUID } from 'node:crypto';
+import { parseJSON, toArray } from '@directus/utils';
 export async function up(knex) {
     await knex.schema.createTable('directus_flows', (table) => {
         table.uuid('id').primary().notNullable();

package/dist/database/migrations/20230526A-migrate-translation-strings.js

@@ -1,5 +1,5 @@
-import { set } from 'lodash-es';
 import { randomUUID } from 'node:crypto';
+import { set } from 'lodash-es';
 function transformStringsNewFormat(oldStrings) {
     return oldStrings.reduce((result, item) => {
         if (!item.key || !item.translations)

package/dist/database/migrations/20231009A-update-csv-fields-to-text.js

@@ -1,5 +1,5 @@
-import { getHelpers } from '../helpers/index.js';
 import { createInspector } from '@directus/schema';
+import { getHelpers } from '../helpers/index.js';
 export async function up(knex) {
     const inspector = createInspector(knex);
     const helper = getHelpers(knex).schema;

package/dist/database/migrations/20240204A-marketplace.js

@@ -1,7 +1,8 @@
-import { resolvePackage } from '@directus/utils/node';
 import { randomUUID } from 'node:crypto';
 import { dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
+import { resolvePackage } from '@directus/utils/node';
+import { getHelpers } from '../helpers/index.js';
 const __dirname = dirname(fileURLToPath(import.meta.url));
 export async function up(knex) {
     await knex.schema.alterTable('directus_extensions', (table) => {
@@ -58,11 +59,9 @@ export async function up(knex) {
     await knex.schema.alterTable('directus_extensions', (table) => {
         table.uuid('id').alter().notNullable();
     });
+    // knex does not bundle the drop + add PK, the transaction ensures they are apart of the same commit for databases that require it
     await knex.transaction(async (trx) => {
-        await trx.schema.alterTable('directus_extensions', (table) => {
-            table.dropPrimary();
-            table.primary(['id']);
-        });
+        await getHelpers(trx).schema.changePrimaryKey('directus_extensions', ['id']);
     });
     await knex.schema.alterTable('directus_extensions', (table) => {
         table.dropColumn('name');
@@ -79,7 +78,7 @@ export async function down(knex) {
     await knex.schema.alterTable('directus_extensions', (table) => {
         table.string('name');
     });
-    const installedExtensions = await knex.select(['id', 'folder', 'bundle']).from('directus_extensions');
+    const installedExtensions = await knex.select(['id', 'folder', 'bundle', 'source']).from('directus_extensions');
     const idMap = new Map(installedExtensions.map((extension) => [extension.id, extension.folder]));
     for (const { id, folder, bundle, source } of installedExtensions) {
         if (source === 'registry') {
@@ -93,8 +92,11 @@ export async function down(knex) {
         }
         await knex('directus_extensions').update({ name }).where({ id });
     }
+    await knex.transaction(async (trx) => {
+        await getHelpers(trx).schema.changePrimaryKey('directus_extensions', ['name']);
+    });
     await knex.schema.alterTable('directus_extensions', (table) => {
         table.dropColumns('id', 'folder', 'source', 'bundle');
-        table.string('name').alter().primary().notNullable();
+        table.string('name').alter().notNullable();
     });
 }

package/dist/database/migrations/20240311A-deprecate-webhooks.d.ts

@@ -1,4 +1,19 @@
 import type { Knex } from 'knex';
+export type Webhook = {
+    id: number;
+    name: string;
+    method: 'GET' | 'POST';
+    url: string;
+    status: 'active' | 'inactive';
+    data: boolean;
+    actions: string[];
+    collections: string[];
+    headers: WebhookHeader[];
+};
+export type WebhookHeader = {
+    header: string;
+    value: string;
+};
 /**
  * 0. Identify and persist which webhooks were active before deprecation
  * 1. Migrate existing webhooks over to identically behaving Flows

package/dist/database/migrations/20240311A-deprecate-webhooks.js

@@ -1,5 +1,5 @@
-import { parseJSON, toArray } from '@directus/utils';
 import { randomUUID } from 'node:crypto';
+import { parseJSON, toArray } from '@directus/utils';
 // To avoid typos
 const TABLE_WEBHOOKS = 'directus_webhooks';
 const TABLE_FLOWS = 'directus_flows';