@directus/api 13.1.0-beta.0 → 13.1.1

package/dist/__utils__/snapshots.js

@@ -13,7 +13,6 @@ export const snapshotBeforeCreateCollection = {
                 item_duplication_fields: null,
                 note: null,
                 singleton: false,
-                branches_enabled: false,
                 translations: {},
             },
             schema: {
@@ -87,7 +86,6 @@ export const snapshotCreateCollection = {
                 item_duplication_fields: null,
                 note: null,
                 singleton: false,
-                branches_enabled: false,
                 translations: {},
             },
             schema: {
@@ -107,7 +105,6 @@ export const snapshotCreateCollection = {
                 item_duplication_fields: null,
                 note: null,
                 singleton: false,
-                branches_enabled: false,
                 translations: {},
             },
             schema: {
@@ -127,7 +124,6 @@ export const snapshotCreateCollection = {
                 item_duplication_fields: null,
                 note: null,
                 singleton: false,
-                branches_enabled: false,
                 translations: {},
             },
             schema: {
@@ -291,7 +287,6 @@ export const snapshotCreateCollectionNotNested = {
                 item_duplication_fields: null,
                 note: null,
                 singleton: false,
-                branches_enabled: false,
                 translations: {},
             },
             schema: {
@@ -311,7 +306,6 @@ export const snapshotCreateCollectionNotNested = {
                 item_duplication_fields: null,
                 note: null,
                 singleton: false,
-                branches_enabled: false,
                 translations: {},
             },
             schema: {
@@ -430,7 +424,6 @@ export const snapshotBeforeDeleteCollection = {
                 item_duplication_fields: null,
                 note: null,
                 singleton: false,
-                branches_enabled: false,
                 translations: {},
             },
             schema: {
@@ -450,7 +443,6 @@ export const snapshotBeforeDeleteCollection = {
                 item_duplication_fields: null,
                 note: null,
                 singleton: false,
-                branches_enabled: false,
                 translations: {},
             },
             schema: {
@@ -470,7 +462,6 @@ export const snapshotBeforeDeleteCollection = {
                 item_duplication_fields: null,
                 note: null,
                 singleton: false,
-                branches_enabled: false,
                 translations: {},
             },
             schema: {

package/dist/app.js

@@ -10,7 +10,6 @@ import { registerAuthProviders } from './auth.js';
 import activityRouter from './controllers/activity.js';
 import assetsRouter from './controllers/assets.js';
 import authRouter from './controllers/auth.js';
-import branchesRouter from './controllers/branches.js';
 import collectionsRouter from './controllers/collections.js';
 import dashboardsRouter from './controllers/dashboards.js';
 import extensionsRouter from './controllers/extensions.js';
@@ -200,7 +199,6 @@ export default async function createApp() {
     app.use('/graphql', graphqlRouter);
     app.use('/activity', activityRouter);
     app.use('/assets', assetsRouter);
-    app.use('/branches', branchesRouter);
     app.use('/collections', collectionsRouter);
     app.use('/dashboards', dashboardsRouter);
     app.use('/extensions', extensionsRouter);

package/dist/controllers/files.js

@@ -76,8 +76,8 @@ export const multipartHandler = (req, res, next) => {
             if (!payload.title) {
                 payload.title = formatTitle(path.parse(filename).name);
             }
-            payload.filename_download = filename;
         }
+        payload.filename_download = filename;
         const payloadWithRequiredFields = {
             ...payload,
             type: mimeType,

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

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

package/dist/database/helpers/index.js

@@ -3,12 +3,14 @@ import * as dateHelpers from './date/index.js';
 import * as fnHelpers from './fn/index.js';
 import * as geometryHelpers from './geometry/index.js';
 import * as schemaHelpers from './schema/index.js';
+import * as sequenceHelpers from './sequence/index.js';
 export function getHelpers(database) {
     const client = getDatabaseClient(database);
     return {
         date: new dateHelpers[client](database),
         st: new geometryHelpers[client](database),
         schema: new schemaHelpers[client](database),
+        sequence: new sequenceHelpers[client](database),
     };
 }
 export function getFunctions(database, schema) {

package/dist/database/helpers/sequence/dialects/default.d.ts

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

package/dist/database/helpers/sequence/dialects/default.js

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

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

@@ -0,0 +1,9 @@
+import type { Knex } from 'knex';
+import { AutoSequenceHelper } from '../types.js';
+export declare class AutoIncrementHelperPostgres extends AutoSequenceHelper {
+    /**
+     * Resets the auto increment sequence for a table based on the max value of the PK column.
+     * The sequence name of determined using a sub query.
+     */
+    resetAutoIncrementSequence(table: string, column: string): Promise<Knex.Raw | void>;
+}

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

@@ -0,0 +1,10 @@
+import { AutoSequenceHelper } from '../types.js';
+export class AutoIncrementHelperPostgres extends AutoSequenceHelper {
+    /**
+     * Resets the auto increment sequence for a table based on the max value of the PK column.
+     * The sequence name of determined using a sub query.
+     */
+    async resetAutoIncrementSequence(table, column) {
+        return await this.knex.raw(`WITH sequence_infos AS (SELECT pg_get_serial_sequence('${table}', '${column}') AS seq_name, MAX(${column}) as max_val FROM ${table}) SELECT SETVAL(seq_name, max_val) FROM sequence_infos;`);
+    }
+}

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

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

package/dist/database/helpers/sequence/index.js

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

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

@@ -0,0 +1,5 @@
+import type { Knex } from 'knex';
+import { DatabaseHelper } from '../types.js';
+export declare class AutoSequenceHelper extends DatabaseHelper {
+    resetAutoIncrementSequence(_table: string, _column: string): Promise<Knex.Raw | void>;
+}

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

@@ -0,0 +1,6 @@
+import { DatabaseHelper } from '../types.js';
+export class AutoSequenceHelper extends DatabaseHelper {
+    async resetAutoIncrementSequence(_table, _column) {
+        return;
+    }
+}

package/dist/database/index.js

@@ -43,6 +43,14 @@ export default function getDatabase() {
                 requiredEnvVars.push('DB_CONNECTION_STRING');
             }
             break;
+        case 'mysql':
+            if (!env['DB_SOCKET_PATH']) {
+                requiredEnvVars.push('DB_HOST', 'DB_PORT', 'DB_DATABASE', 'DB_USER', 'DB_PASSWORD');
+            }
+            else {
+                requiredEnvVars.push('DB_DATABASE', 'DB_USER', 'DB_PASSWORD', 'DB_SOCKET_PATH');
+            }
+            break;
         case 'mssql':
             if (!env['DB_TYPE'] || env['DB_TYPE'] === 'default') {
                 requiredEnvVars.push('DB_HOST', 'DB_PORT', 'DB_DATABASE', 'DB_USER', 'DB_PASSWORD');

package/dist/database/migrations/20230721A-require-shares-fields.js

@@ -1,28 +1,57 @@
+import { createInspector } from '@directus/schema';
+import logger from '../../logger.js';
+import { getHelpers } from '../helpers/index.js';
 export async function up(knex) {
+    const helper = getHelpers(knex).schema;
+    const isMysql = helper.isOneOfClients(['mysql']);
+    if (isMysql) {
+        await dropConstraint(knex);
+    }
     await knex.schema.alterTable('directus_shares', (table) => {
-        if (knex.client.constructor.name === 'Client_MySQL') {
-            // Temporary drop foreign key constraint, see https://github.com/directus/directus/issues/19399
-            table.dropForeign('collection', 'directus_shares_collection_foreign');
-        }
         table.dropNullable('collection');
-        if (knex.client.constructor.name === 'Client_MySQL') {
-            // Recreate foreign key constraint, from 20211211A-add-shares.ts
-            table.foreign('collection').references('directus_collections.collection').onDelete('CASCADE');
-        }
         table.dropNullable('item');
     });
+    if (isMysql) {
+        await recreateConstraint(knex);
+    }
 }
 export async function down(knex) {
+    const helper = getHelpers(knex).schema;
+    const isMysql = helper.isOneOfClients(['mysql']);
+    if (isMysql) {
+        await dropConstraint(knex);
+    }
     await knex.schema.alterTable('directus_shares', (table) => {
-        if (knex.client.constructor.name === 'Client_MySQL') {
-            // Temporary drop foreign key constraint, see https://github.com/directus/directus/issues/19399
-            table.dropForeign('collection', 'directus_shares_collection_foreign');
-        }
         table.setNullable('collection');
-        if (knex.client.constructor.name === 'Client_MySQL') {
-            // Recreate foreign key constraint, from 20211211A-add-shares.ts
-            table.foreign('collection').references('directus_collections.collection').onDelete('CASCADE');
-        }
         table.setNullable('item');
     });
+    if (isMysql) {
+        await recreateConstraint(knex);
+    }
+}
+/**
+ * Temporarily drop foreign key constraint for MySQL instances, see https://github.com/directus/directus/issues/19399
+ */
+async function dropConstraint(knex) {
+    const inspector = createInspector(knex);
+    const foreignKeys = await inspector.foreignKeys('directus_shares');
+    const collectionForeignKeys = foreignKeys.filter((fk) => fk.column === 'collection');
+    const constraintName = collectionForeignKeys[0]?.constraint_name;
+    if (constraintName && collectionForeignKeys.length === 1) {
+        await knex.schema.alterTable('directus_shares', (table) => {
+            table.dropForeign('collection', constraintName);
+        });
+    }
+    else {
+        logger.warn(`Unexpected number of foreign key constraints on 'directus_shares.collection':`);
+        logger.warn(JSON.stringify(collectionForeignKeys, null, 4));
+    }
+}
+/**
+ * Recreate foreign key constraint for MySQL instances, from 20211211A-add-shares.ts
+ */
+async function recreateConstraint(knex) {
+    return knex.schema.alterTable('directus_shares', async (table) => {
+        table.foreign('collection').references('directus_collections.collection').onDelete('CASCADE');
+    });
 }

package/dist/database/system-data/fields/collections.yaml

@@ -114,27 +114,8 @@ fields:
     interface: system-display-template
     options:
       collectionField: collection
-      injectBranchField: true
     width: full
 
-  - field: content_versioning_divider
-    special:
-      - alias
-      - no-data
-    interface: presentation-divider
-    options:
-      icon: update
-      title: $t:field_options.directus_collections.content_versioning_divider
-    width: full
-
-  - field: branches_enabled
-    interface: boolean
-    special:
-      - cast-boolean
-    options:
-      label: $t:field_options.directus_collections.enable_branches
-    width: half
-
   - field: archive_divider
     special:
       - alias

package/dist/env.d.ts

@@ -12,4 +12,4 @@ export declare const getEnv: () => Record<string, any>;
  * When changes have been made during runtime, like in the CLI, we can refresh the env object with
  * the newly created variables
  */
-export declare function refreshEnv(): void;
+export declare function refreshEnv(): Promise<void>;

package/dist/env.js

@@ -3,11 +3,14 @@
  * For all possible keys, see: https://docs.directus.io/self-hosted/config-options/
  */
 import { parseJSON, toArray } from '@directus/utils';
+import { JAVASCRIPT_FILE_EXTS } from '@directus/constants';
 import dotenv from 'dotenv';
 import fs from 'fs';
 import { clone, toNumber, toString } from 'lodash-es';
 import { createRequire } from 'node:module';
+import { pathToFileURL } from 'node:url';
 import path from 'path';
+import getModuleDefault from './utils/get-module-default.js';
 import { requireYAML } from './utils/require-yaml.js';
 import { toBoolean } from './utils/to-boolean.js';
 const require = createRequire(import.meta.url);
@@ -317,7 +320,7 @@ const typeMap = {
 let env = {
     ...defaults,
     ...process.env,
-    ...processConfiguration(),
+    ...(await processConfiguration()),
 };
 process.env = env;
 env = processValues(env);
@@ -330,35 +333,35 @@ export const getEnv = () => env;
  * When changes have been made during runtime, like in the CLI, we can refresh the env object with
  * the newly created variables
  */
-export function refreshEnv() {
+export async function refreshEnv() {
     env = {
         ...defaults,
         ...process.env,
-        ...processConfiguration(),
+        ...(await processConfiguration()),
     };
     process.env = env;
     env = processValues(env);
 }
-function processConfiguration() {
+async function processConfiguration() {
     const configPath = path.resolve(process.env['CONFIG_PATH'] || defaults['CONFIG_PATH']);
     if (fs.existsSync(configPath) === false)
         return {};
-    const fileExt = path.extname(configPath).toLowerCase();
-    if (fileExt === '.js') {
-        const module = require(configPath);
-        const exported = module.default || module;
-        if (typeof exported === 'function') {
-            return exported(process.env);
+    const fileExt = path.extname(configPath).toLowerCase().substring(1);
+    if (JAVASCRIPT_FILE_EXTS.includes(fileExt)) {
+        const data = await import(pathToFileURL(configPath).toString());
+        const config = getModuleDefault(data);
+        if (typeof config === 'function') {
+            return config(process.env);
         }
-        else if (typeof exported === 'object') {
-            return exported;
+        else if (typeof config === 'object') {
+            return config;
         }
-        throw new Error(`Invalid JS configuration file export type. Requires one of "function", "object", received: "${typeof exported}"`);
+        throw new Error(`Invalid JS configuration file export type. Requires one of "function", "object", received: "${typeof config}"`);
     }
-    if (fileExt === '.json') {
+    if (fileExt === 'json') {
         return require(configPath);
     }
-    if (fileExt === '.yaml' || fileExt === '.yml') {
+    if (fileExt === 'yaml' || fileExt === 'yml') {
         const data = requireYAML(configPath);
         if (typeof data === 'object') {
             return data;

package/dist/middleware/respond.js

@@ -1,9 +1,7 @@
 import { parse as parseBytesConfiguration } from 'bytes';
-import { assign } from 'lodash-es';
 import { getCache, setCacheValue } from '../cache.js';
 import env from '../env.js';
 import logger from '../logger.js';
-import { BranchesService } from '../services/branches.js';
 import { ExportService } from '../services/import-export.js';
 import asyncHandler from '../utils/async-handler.js';
 import { getCacheControlHeader } from '../utils/get-cache-headers.js';
@@ -41,24 +39,6 @@ export const respond = asyncHandler(async (req, res) => {
         res.setHeader('Cache-Control', 'no-cache');
         res.setHeader('Vary', 'Origin, Cache-Control');
     }
-    if (req.sanitizedQuery.branch &&
-        req.collection &&
-        (req.singleton || req.params['pk']) &&
-        'data' in res.locals['payload']) {
-        const branchesService = new BranchesService({ accountability: req.accountability ?? null, schema: req.schema });
-        const filter = {
-            name: { _eq: req.sanitizedQuery.branch },
-            collection: { _eq: req.collection },
-        };
-        if (req.params['pk']) {
-            filter['item'] = { _eq: req.params['pk'] };
-        }
-        const branch = await branchesService.readByQuery({ filter });
-        if (branch[0]) {
-            const commits = await branchesService.getBranchCommits(branch[0]['id']);
-            assign(res.locals['payload'].data, ...commits);
-        }
-    }
     if (req.sanitizedQuery.export) {
         const exportService = new ExportService({ accountability: req.accountability ?? null, schema: req.schema });
         let filename = '';

package/dist/services/activity.js

@@ -60,6 +60,9 @@ export class ActivityService extends ItemsService {
                         comment = comment.replace(new RegExp(mention, 'gm'), userPreviews[uuid] ?? '@Unknown User');
                     }
                     comment = `> ${comment.replace(/\n+/gm, '\n> ')}`;
+                    const href = new Url(env['PUBLIC_URL'])
+                        .addPath('admin', 'content', data['collection'], data['item'])
+                        .toString();
                     const message = `
 Hello ${userName(user)},
 
@@ -67,9 +70,7 @@ ${userName(sender)} has mentioned you in a comment:
 
 ${comment}
 
-<a href="${new Url(env['PUBLIC_URL'])
-                        .addPath('admin', 'content', data['collection'], data['item'])
-                        .toString()}">Click here to view.</a>
+<a href="${href}">Click here to view.</a>
 `;
                     await this.notificationsService.createOne({
                         recipient: userID,

package/dist/services/assets.js

@@ -129,7 +129,23 @@ export class AssetsService {
                 logger.error(e, `Couldn't transform file ${file.id}`);
                 readStream.unpipe(transformer);
             });
-            await storage.location(file.storage).write(assetFilename, readStream.pipe(transformer), type);
+            try {
+                await storage.location(file.storage).write(assetFilename, readStream.pipe(transformer), type);
+            }
+            catch (error) {
+                try {
+                    await storage.location(file.storage).delete(assetFilename);
+                }
+                catch {
+                    // Ignored to prevent original error from being overwritten
+                }
+                if (error?.message?.includes('timeout')) {
+                    throw new ServiceUnavailableError({ service: 'assets', reason: `Transformation timed out` });
+                }
+                else {
+                    throw error;
+                }
+            }
             return {
                 stream: await storage.location(file.storage).read(assetFilename, range),
                 stat: await storage.location(file.storage).stat(assetFilename),

package/dist/services/files.js

@@ -5,7 +5,9 @@ import exif from 'exif-reader';
 import { parse as parseIcc } from 'icc';
 import { clone, pick } from 'lodash-es';
 import { extension } from 'mime-types';
+import { PassThrough as PassThroughStream, Transform as TransformStream } from 'node:stream';
 import { pipeline } from 'node:stream/promises';
+import zlib from 'node:zlib';
 import path from 'path';
 import sharp from 'sharp';
 import url from 'url';
@@ -209,6 +211,7 @@ export class FilesService extends ItemsService {
             const axios = await getAxios();
             fileResponse = await axios.get(encodeURL(importURL), {
                 responseType: 'stream',
+                decompress: false,
             });
         }
         catch (err) {
@@ -227,7 +230,7 @@ export class FilesService extends ItemsService {
             title: formatTitle(filename),
             ...(body || {}),
         };
-        return await this.uploadOne(fileResponse.data, payload);
+        return await this.uploadOne(decompressResponse(fileResponse.data, fileResponse.headers), payload, payload.id);
     }
     /**
      * Create a file (only applicable when it is not a multipart/data POST request)
@@ -267,3 +270,57 @@ export class FilesService extends ItemsService {
         return keys;
     }
 }
+function decompressResponse(stream, headers) {
+    const contentEncoding = (headers['content-encoding'] || '').toLowerCase();
+    if (!['gzip', 'deflate', 'br'].includes(contentEncoding)) {
+        return stream;
+    }
+    let isEmpty = true;
+    const checker = new TransformStream({
+        transform(data, _encoding, callback) {
+            if (isEmpty === false) {
+                callback(null, data);
+                return;
+            }
+            isEmpty = false;
+            handleContentEncoding(data);
+            callback(null, data);
+        },
+        flush(callback) {
+            callback();
+        },
+    });
+    const finalStream = new PassThroughStream({
+        autoDestroy: false,
+        destroy(error, callback) {
+            stream.destroy();
+            callback(error);
+        },
+    });
+    stream.pipe(checker);
+    return finalStream;
+    function handleContentEncoding(data) {
+        let decompressStream;
+        if (contentEncoding === 'br') {
+            decompressStream = zlib.createBrotliDecompress();
+        }
+        else if (contentEncoding === 'deflate' && isDeflateAlgorithm(data)) {
+            decompressStream = zlib.createInflateRaw();
+        }
+        else {
+            decompressStream = zlib.createUnzip();
+        }
+        decompressStream.once('error', (error) => {
+            if (isEmpty && !stream.readable) {
+                finalStream.end();
+                return;
+            }
+            finalStream.destroy(error);
+        });
+        checker.pipe(decompressStream).pipe(finalStream);
+    }
+    function isDeflateAlgorithm(data) {
+        const DEFLATE_ALGORITHM_HEADER = 0x08;
+        return data.length > 0 && (data[0] & DEFLATE_ALGORITHM_HEADER) === 0;
+    }
+}

package/dist/services/import-export.js

@@ -17,9 +17,12 @@ import env from '../env.js';
 import { ForbiddenError, InvalidPayloadError, ServiceUnavailableError, UnsupportedMediaTypeError, } from '../errors/index.js';
 import logger from '../logger.js';
 import { getDateFormatted } from '../utils/get-date-formatted.js';
+import { userName } from '../utils/user-name.js';
 import { FilesService } from './files.js';
 import { ItemsService } from './items.js';
 import { NotificationsService } from './notifications.js';
+import { UsersService } from './users.js';
+import { Url } from '../utils/url.js';
 export class ImportService {
     knex;
     accountability;
@@ -226,10 +229,23 @@ export class ExportService {
                     accountability: this.accountability,
                     schema: this.schema,
                 });
+                const usersService = new UsersService({
+                    schema: this.schema,
+                });
+                const user = await usersService.readOne(this.accountability.user, {
+                    fields: ['first_name', 'last_name', 'email'],
+                });
+                const href = new Url(env['PUBLIC_URL']).addPath('admin', 'files', savedFile).toString();
+                const message = `
+Hello ${userName(user)},
+
+Your export of ${collection} is ready. <a href="${href}">Click here to view.</a>
+`;
                 await notificationsService.createOne({
                     recipient: this.accountability.user,
                     sender: this.accountability.user,
                     subject: `Your export of ${collection} is ready`,
+                    message,
                     collection: `directus_files`,
                     item: savedFile,
                 });