directus 9.14.5 → 9.16.0

package/dist/database/migrations/20210415A-make-filesize-nullable.js

@@ -4,7 +4,7 @@ exports.down = exports.up = void 0;
 const helpers_1 = require("../helpers");
 async function up(knex) {
     const helper = (0, helpers_1.getHelpers)(knex).schema;
-    await helper.changeToInteger('directus_files', 'filesize', {
+    await helper.changeToType('directus_files', 'filesize', 'integer', {
         nullable: true,
         default: null,
     });
@@ -12,7 +12,7 @@ async function up(knex) {
 exports.up = up;
 async function down(knex) {
     const helper = (0, helpers_1.getHelpers)(knex).schema;
-    await helper.changeToInteger('directus_files', 'filesize', {
+    await helper.changeToType('directus_files', 'filesize', 'integer', {
         nullable: false,
         default: 0,
     });

package/dist/database/migrations/20210510A-restructure-relations.js

@@ -9,10 +9,10 @@ async function up(knex) {
         table.string('one_deselect_action').defaultTo('nullify');
     });
     await knex('directus_relations').update({ one_deselect_action: 'nullify' });
-    await helper.changeToString('directus_relations', 'sort_field', {
+    await helper.changeToType('directus_relations', 'sort_field', 'string', {
         length: 64,
     });
-    await helper.changeToString('directus_relations', 'one_deselect_action', {
+    await helper.changeToType('directus_relations', 'one_deselect_action', 'string', {
         nullable: false,
         default: 'nullify',
     });
@@ -20,7 +20,7 @@ async function up(knex) {
 exports.up = up;
 async function down(knex) {
     const helper = (0, helpers_1.getHelpers)(knex).schema;
-    await helper.changeToString('directus_relations', 'sort_field', {
+    await helper.changeToType('directus_relations', 'sort_field', 'string', {
         length: 255,
     });
     await knex.schema.alterTable('directus_relations', (table) => {

package/dist/database/migrations/20210903A-add-auth-provider.js

@@ -11,7 +11,7 @@ async function up(knex) {
         table.string('provider', 128).notNullable().defaultTo('default');
         table.string('external_identifier').unique();
     });
-    await helper.changeToString('directus_users', 'email', {
+    await helper.changeToType('directus_users', 'email', 'string', {
         nullable: true,
         length: 128,
     });
@@ -29,7 +29,7 @@ async function down(knex) {
         table.dropColumn('provider');
         table.dropColumn('external_identifier');
     });
-    await helper.changeToString('directus_users', 'email', {
+    await helper.changeToType('directus_users', 'email', 'string', {
         nullable: false,
         length: 128,
     });

package/dist/database/migrations/20210907A-webhooks-collections-not-null.js

@@ -4,13 +4,15 @@ exports.down = exports.up = void 0;
 const helpers_1 = require("../helpers");
 async function up(knex) {
     const helper = (0, helpers_1.getHelpers)(knex).schema;
-    await helper.changeToText('directus_webhooks', 'collections', {
+    const type = helper.isOneOfClients(['oracle', 'cockroachdb']) ? 'text' : 'string';
+    await helper.changeToType('directus_webhooks', 'collections', type, {
         nullable: false,
     });
 }
 exports.up = up;
 async function down(knex) {
     const helper = (0, helpers_1.getHelpers)(knex).schema;
-    await helper.changeToText('directus_webhooks', 'collections');
+    const type = helper.isOneOfClients(['oracle', 'cockroachdb']) ? 'text' : 'string';
+    await helper.changeToType('directus_webhooks', 'collections', type);
 }
 exports.down = down;

package/dist/database/migrations/20210920A-webhooks-url-not-null.js

@@ -9,7 +9,7 @@ async function up(knex) {
         // "20201105B-change-webhook-url-type.ts"
         return;
     }
-    await helper.changeToText('directus_webhooks', 'url', {
+    await helper.changeToType('directus_webhooks', 'url', 'string', {
         nullable: false,
     });
 }
@@ -21,6 +21,6 @@ async function down(knex) {
         // "20201105B-change-webhook-url-type.ts"
         return;
     }
-    await helper.changeToText('directus_webhooks', 'url');
+    await helper.changeToType('directus_webhooks', 'url', 'string');
 }
 exports.down = down;

package/dist/database/migrations/20220303A-remove-default-project-color.js

@@ -4,7 +4,7 @@ exports.down = exports.up = void 0;
 const helpers_1 = require("../helpers");
 async function up(knex) {
     const helper = (0, helpers_1.getHelpers)(knex).schema;
-    await helper.changeToString('directus_settings', 'project_color', {
+    await helper.changeToType('directus_settings', 'project_color', 'string', {
         nullable: true,
         default: null,
         length: 50,
@@ -13,7 +13,7 @@ async function up(knex) {
 exports.up = up;
 async function down(knex) {
     const helper = (0, helpers_1.getHelpers)(knex).schema;
-    await helper.changeToString('directus_settings', 'project_color', {
+    await helper.changeToType('directus_settings', 'project_color', 'string', {
         nullable: true,
         default: '#00C897',
         length: 10,

package/dist/database/migrations/20220325B-add-default-language.js

@@ -7,7 +7,7 @@ async function up(knex) {
     await knex.schema.alterTable('directus_settings', (table) => {
         table.string('default_language').notNullable().defaultTo('en-US');
     });
-    await helper.changeToString('directus_users', 'language', {
+    await helper.changeToType('directus_users', 'language', 'string', {
         nullable: true,
         default: null,
         length: 255,
@@ -19,7 +19,7 @@ async function down(knex) {
     await knex.schema.alterTable('directus_settings', (table) => {
         table.dropColumn('default_language');
     });
-    await helper.changeToString('directus_users', 'language', {
+    await helper.changeToType('directus_users', 'language', 'string', {
         nullable: true,
         default: 'en-US',
         length: 255,

package/dist/database/migrations/20220402A-remove-default-value-panel-icon.js

@@ -4,7 +4,7 @@ exports.down = exports.up = void 0;
 const helpers_1 = require("../helpers");
 async function up(knex) {
     const helper = (0, helpers_1.getHelpers)(knex).schema;
-    await helper.changeToString('directus_panels', 'icon', {
+    await helper.changeToType('directus_panels', 'icon', 'string', {
         nullable: true,
         default: null,
         length: 30,
@@ -13,7 +13,7 @@ async function up(knex) {
 exports.up = up;
 async function down(knex) {
     const helper = (0, helpers_1.getHelpers)(knex).schema;
-    await helper.changeToString('directus_panels', 'icon', {
+    await helper.changeToType('directus_panels', 'icon', 'string', {
         nullable: true,
         default: 'insert_chart',
         length: 30,

package/dist/database/migrations/20220801A-update-notifications-timestamp-column.d.ts

@@ -0,0 +1,3 @@
+import { Knex } from 'knex';
+export declare function up(knex: Knex): Promise<void>;
+export declare function down(knex: Knex): Promise<void>;

package/dist/database/migrations/20220801A-update-notifications-timestamp-column.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.down = exports.up = void 0;
+const helpers_1 = require("../helpers");
+async function up(knex) {
+    const helper = (0, helpers_1.getHelpers)(knex).schema;
+    await helper.changeToType('directus_notifications', 'timestamp', 'timestamp', {
+        nullable: true,
+        default: knex.fn.now(),
+    });
+}
+exports.up = up;
+async function down(knex) {
+    const helper = (0, helpers_1.getHelpers)(knex).schema;
+    await helper.changeToType('directus_notifications', 'timestamp', 'timestamp', {
+        nullable: false,
+    });
+}
+exports.down = down;

package/dist/database/migrations/20220802A-add-custom-aspect-ratios.d.ts

@@ -0,0 +1,3 @@
+import { Knex } from 'knex';
+export declare function up(knex: Knex): Promise<void>;
+export declare function down(knex: Knex): Promise<void>;

package/dist/database/migrations/20220802A-add-custom-aspect-ratios.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.down = exports.up = void 0;
+async function up(knex) {
+    await knex.schema.alterTable('directus_settings', (table) => {
+        table.json('custom_aspect_ratios');
+    });
+}
+exports.up = up;
+async function down(knex) {
+    await knex.schema.alterTable('directus_settings', (table) => {
+        table.dropColumn('custom_aspect_ratios');
+    });
+}
+exports.down = down;

package/dist/database/migrations/run.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/database/migrations/run.test.js

@@ -0,0 +1,92 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const knex_1 = __importDefault(require("knex"));
+const knex_mock_client_1 = require("knex-mock-client");
+const run_1 = __importDefault(require("./run"));
+describe('run', () => {
+    let db;
+    let tracker;
+    beforeAll(() => {
+        db = (0, knex_1.default)({ client: knex_mock_client_1.MockClient });
+        tracker = (0, knex_mock_client_1.getTracker)();
+    });
+    afterEach(() => {
+        tracker.reset();
+    });
+    describe('when passed the argument up', () => {
+        it('returns "Nothing To Upgrade" if no directus_migrations', async () => {
+            tracker.on.select('directus_migrations').response(['Empty']);
+            await (0, run_1.default)(db, 'up').catch((e) => {
+                expect(e).toBeInstanceOf(Error);
+                expect(e.message).toBe('Nothing to upgrade');
+            });
+        });
+        it('returns "Method implemented in the dialect driver" if no directus_migrations', async () => {
+            tracker.on.select('directus_migrations').response([]);
+            await (0, run_1.default)(db, 'up').catch((e) => {
+                expect(e).toBeInstanceOf(Error);
+                expect(e.message).toBe('Method implemented in the dialect driver');
+            });
+        });
+        it('returns undefined if the migration is successful', async () => {
+            tracker.on.select('directus_migrations').response([
+                {
+                    version: '20201028A',
+                    name: 'Remove Collection Foreign Keys',
+                    timestamp: '2021-11-27 11:36:56.471595-05',
+                },
+            ]);
+            tracker.on.delete('directus_relations').response([]);
+            tracker.on.insert('directus_migrations').response(['Remove System Relations', '20201029A']);
+            expect(await (0, run_1.default)(db, 'up')).toBe(undefined);
+        });
+    });
+    describe('when passed the argument down', () => {
+        it('returns "Nothing To downgrade" if no valid directus_migrations', async () => {
+            tracker.on.select('directus_migrations').response(['Empty']);
+            await (0, run_1.default)(db, 'down').catch((e) => {
+                expect(e).toBeInstanceOf(Error);
+                expect(e.message).toBe(`Couldn't find migration`);
+            });
+        });
+        it('returns "Method implemented in the dialect driver" if no directus_migrations', async () => {
+            tracker.on.select('directus_migrations').response([]);
+            await (0, run_1.default)(db, 'down').catch((e) => {
+                expect(e).toBeInstanceOf(Error);
+                expect(e.message).toBe('Nothing to downgrade');
+            });
+        });
+        it(`returns "Couldn't find migration" if an invalid migration object is supplied`, async () => {
+            tracker.on.select('directus_migrations').response([
+                {
+                    version: '202018129A',
+                    name: 'Fake Migration',
+                    timestamp: '2020-00-32 11:36:56.471595-05',
+                },
+            ]);
+            await (0, run_1.default)(db, 'down').catch((e) => {
+                expect(e).toBeInstanceOf(Error);
+                expect(e.message).toBe(`Couldn't find migration`);
+            });
+        });
+    });
+    describe('when passed the argument latest', () => {
+        it('returns "Nothing To downgrade" if no valid directus_migrations', async () => {
+            tracker.on.select('directus_migrations').response(['Empty']);
+            await (0, run_1.default)(db, 'latest').catch((e) => {
+                expect(e).toBeInstanceOf(Error);
+                expect(e.message).toBe(`Method implemented in the dialect driver`);
+            });
+        });
+        it('returns "Method implemented in the dialect driver" if no directus_migrations', async () => {
+            tracker.on.select('directus_migrations').response([]);
+            await (0, run_1.default)(db, 'latest').catch((e) => {
+                expect(e).toBeInstanceOf(Error);
+                expect(e.message).toBe('Method implemented in the dialect driver');
+            });
+        });
+    });
+});

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

@@ -392,3 +392,36 @@ fields:
   - field: translation_strings
     special: cast-json
     hidden: true
+
+  - field: image_editor
+    interface: presentation-divider
+    options:
+      icon: image
+      title: $t:fields.directus_settings.image_editor
+    special:
+      - alias
+      - no-data
+    width: full
+
+  - field: custom_aspect_ratios
+    interface: list
+    special: cast-json
+    options:
+      template: '{{text}}'
+      fields:
+        - field: text
+          name: $t:text
+          type: string
+          meta:
+            interface: text-input
+            width: half
+            options:
+              placeholder: $t:text
+        - field: value
+          name: $t:value
+          type: float
+          meta:
+            interface: input
+            width: half
+            options:
+              placeholder: $t:value

package/dist/env.js

@@ -138,6 +138,13 @@ const allowedEnvironmentVars = [
     // extensions
     'EXTENSIONS_PATH',
     'EXTENSIONS_AUTO_RELOAD',
+    // messenger
+    'MESSENGER_STORE',
+    'MESSENGER_NAMESPACE',
+    'MESSENGER_REDIS',
+    'MESSENGER_REDIS_HOST',
+    'MESSENGER_REDIS_PORT',
+    'MESSENGER_REDIS_PASSWORD',
     // emails
     'EMAIL_FROM',
     'EMAIL_TRANSPORT',
@@ -226,6 +233,7 @@ const defaults = {
     EXPORT_BATCH_SIZE: 5000,
     FILE_METADATA_ALLOW_LIST: 'ifd0.Make,ifd0.Model,exif.FNumber,exif.ExposureTime,exif.FocalLength,exif.ISO',
     GRAPHQL_INTROSPECTION: true,
+    FLOWS_EXEC_ALLOWED_MODULES: false,
 };
 // Allows us to force certain environment variable into a type, instead of relying
 // on the auto-parsed type in processValues. ref #3705

package/dist/env.test.d.ts

@@ -0,0 +1,8 @@
+declare const testEnv: {
+    NUMBER: string;
+    NUMBER_CAST_AS_STRING: string;
+    REGEX: string;
+    CSV: string;
+    CSV_CAST_AS_STRING: string;
+    MULTIPLE: string;
+};

package/dist/env.test.js

@@ -0,0 +1,39 @@
+"use strict";
+const testEnv = {
+    NUMBER: '1234',
+    NUMBER_CAST_AS_STRING: 'string:1234',
+    REGEX: 'regex:\\.example\\.com$',
+    CSV: 'one,two,three,four',
+    CSV_CAST_AS_STRING: 'string:one,two,three,four',
+    MULTIPLE: 'array:string:https://example.com,regex:\\.example2\\.com$',
+};
+describe('env processed values', () => {
+    const originalEnv = process.env;
+    let env;
+    beforeEach(() => {
+        jest.resetModules();
+        process.env = { ...testEnv };
+        env = jest.requireActual('../src/env').default;
+    });
+    afterEach(() => {
+        process.env = originalEnv;
+    });
+    test('Number value should be a number', () => {
+        expect(env.NUMBER).toStrictEqual(1234);
+    });
+    test('Number value casted as string should be a string', () => {
+        expect(env.NUMBER_CAST_AS_STRING).toStrictEqual('1234');
+    });
+    test('Value casted as regex', () => {
+        expect(env.REGEX).toBeInstanceOf(RegExp);
+    });
+    test('CSV value should be an array', () => {
+        expect(env.CSV).toStrictEqual(['one', 'two', 'three', 'four']);
+    });
+    test('CSV value casted as string should be a string', () => {
+        expect(env.CSV_CAST_AS_STRING).toStrictEqual('one,two,three,four');
+    });
+    test('Multiple type cast', () => {
+        expect(env.MULTIPLE).toStrictEqual(['https://example.com', /\.example2\.com$/]);
+    });
+});

package/dist/extensions.d.ts

@@ -1,5 +1,5 @@
 import { Router } from 'express';
-import { AppExtensionType, ExtensionType } from '@directus/shared/types';
+import { AppExtensionType, ExtensionType, HybridExtensionType } from '@directus/shared/types';
 export declare function getExtensionManager(): ExtensionManager;
 declare type Options = {
     schedule: boolean;
@@ -19,7 +19,7 @@ declare class ExtensionManager {
     initialize(options?: Partial<Options>): Promise<void>;
     reload(): void;
     getExtensionsList(type?: ExtensionType): string[];
-    getAppExtensions(type: AppExtensionType): string | undefined;
+    getAppExtensions(type: AppExtensionType | HybridExtensionType): string | undefined;
     getEndpointRouter(): Router;
     private load;
     private unload;

package/dist/extensions.js

@@ -132,7 +132,7 @@ class ExtensionManager {
     }
     async load() {
         try {
-            await (0, node_1.ensureExtensionDirs)(env_1.default.EXTENSIONS_PATH, env_1.default.SERVE_APP ? constants_1.EXTENSION_TYPES : constants_1.API_EXTENSION_TYPES);
+            await (0, node_1.ensureExtensionDirs)(env_1.default.EXTENSIONS_PATH, env_1.default.SERVE_APP ? constants_1.EXTENSION_TYPES : constants_1.API_OR_HYBRID_EXTENSION_TYPES);
             this.extensions = await this.getExtensions();
         }
         catch (err) {
@@ -160,9 +160,9 @@ class ExtensionManager {
     initializeWatcher() {
         if (this.options.watch && !this.watcher) {
             logger_1.default.info('Watching extensions for changes...');
-            const localExtensionPaths = (env_1.default.SERVE_APP ? constants_1.EXTENSION_TYPES : constants_1.API_EXTENSION_TYPES).flatMap((type) => {
+            const localExtensionPaths = (env_1.default.SERVE_APP ? constants_1.EXTENSION_TYPES : constants_1.API_OR_HYBRID_EXTENSION_TYPES).flatMap((type) => {
                 const typeDir = path_1.default.posix.join(path_1.default.relative('.', env_1.default.EXTENSIONS_PATH).split(path_1.default.sep).join(path_1.default.posix.sep), (0, utils_1.pluralize)(type));
-                return (0, utils_1.isHybridExtension)(type)
+                return (0, utils_1.isIn)(type, constants_1.HYBRID_EXTENSION_TYPES)
                     ? [path_1.default.posix.join(typeDir, '*', 'app.js'), path_1.default.posix.join(typeDir, '*', 'api.js')]
                     : path_1.default.posix.join(typeDir, '*', 'index.js');
             });
@@ -179,9 +179,9 @@ class ExtensionManager {
         if (this.watcher) {
             const toPackageExtensionPaths = (extensions) => extensions
                 .filter((extension) => !extension.local)
-                .flatMap((extension) => extension.type === constants_1.PACK_EXTENSION_TYPE
+                .flatMap((extension) => (0, utils_1.isTypeIn)(extension, constants_1.PACKAGE_EXTENSION_TYPES)
                 ? path_1.default.resolve(extension.path, 'package.json')
-                : (0, utils_1.isExtensionObject)(extension, constants_1.HYBRID_EXTENSION_TYPES)
+                : (0, utils_1.isTypeIn)(extension, constants_1.HYBRID_EXTENSION_TYPES)
                     ? [
                         path_1.default.resolve(extension.path, extension.entrypoint.app),
                         path_1.default.resolve(extension.path, extension.entrypoint.api),
@@ -194,8 +194,8 @@ class ExtensionManager {
         }
     }
     async getExtensions() {
-        const packageExtensions = await (0, node_1.getPackageExtensions)('.', env_1.default.SERVE_APP ? constants_1.EXTENSION_PACKAGE_TYPES : constants_1.API_EXTENSION_PACKAGE_TYPES);
-        const localExtensions = await (0, node_1.getLocalExtensions)(env_1.default.EXTENSIONS_PATH, env_1.default.SERVE_APP ? constants_1.EXTENSION_TYPES : constants_1.API_EXTENSION_TYPES);
+        const packageExtensions = await (0, node_1.getPackageExtensions)('.', env_1.default.SERVE_APP ? constants_1.EXTENSION_PACKAGE_TYPES : constants_1.API_OR_HYBRID_EXTENSION_PACKAGE_TYPES);
+        const localExtensions = await (0, node_1.getLocalExtensions)(env_1.default.EXTENSIONS_PATH, env_1.default.SERVE_APP ? constants_1.EXTENSION_TYPES : constants_1.API_OR_HYBRID_EXTENSION_TYPES);
         return [...packageExtensions, ...localExtensions];
     }
     async generateExtensionBundles() {
@@ -205,7 +205,7 @@ class ExtensionManager {
             replacement: path,
         }));
         const bundles = {};
-        for (const extensionType of constants_1.APP_EXTENSION_TYPES) {
+        for (const extensionType of constants_1.APP_OR_HYBRID_EXTENSION_TYPES) {
             const entry = (0, node_1.generateExtensionsEntry)(extensionType, this.extensions);
             try {
                 const bundle = await (0, rollup_1.rollup)({
@@ -226,7 +226,8 @@ class ExtensionManager {
         return bundles;
     }
     async getSharedDepsMapping(deps) {
-        const appDir = await fs_extra_1.default.readdir(path_1.default.join((0, node_1.resolvePackage)('@directus/app'), 'dist', 'assets'));
+        var _a;
+        const appDir = await fs_extra_1.default.readdir(path_1.default.join((0, node_1.resolvePackage)('@directus/app', (_a = require.main) === null || _a === void 0 ? void 0 : _a.filename), 'dist', 'assets'));
         const depsMapping = {};
         for (const dep of deps) {
             const depRegex = new RegExp(`${(0, lodash_1.escapeRegExp)(dep.replace(/\//g, '_'))}\\.[0-9a-f]{8}\\.entry\\.js`);

package/dist/flows.js

@@ -124,11 +124,12 @@ class FlowManager {
         const flows = await flowsService.readByQuery({
             filter: { status: { _eq: 'active' } },
             fields: ['*', 'operations.*'],
+            limit: -1,
         });
         const flowTrees = flows.map((flow) => (0, construct_flow_tree_1.constructFlowTree)(flow));
         for (const flow of flowTrees) {
             if (flow.trigger === 'event') {
-                const events = (_d = (_c = (_b = (_a = flow.options) === null || _a === void 0 ? void 0 : _a.scope) === null || _b === void 0 ? void 0 : _b.map((scope) => {
+                const events = (_d = (_c = (_b = (0, utils_1.toArray)((_a = flow.options) === null || _a === void 0 ? void 0 : _a.scope)) === null || _b === void 0 ? void 0 : _b.map((scope) => {
                     var _a, _b, _c;
                     if (['items.create', 'items.update', 'items.delete'].includes(scope)) {
                         return ((_c = (_b = (_a = flow.options) === null || _a === void 0 ? void 0 : _a.collections) === null || _b === void 0 ? void 0 : _b.map((collection) => {

package/dist/logger.js

@@ -67,7 +67,6 @@ const httpLoggerEnvConfig = (0, get_config_from_env_1.getConfigFromEnv)('LOGGER_
 exports.expressLogger = (0, pino_http_1.default)({
     logger,
     ...httpLoggerEnvConfig,
-}, {
     serializers: {
         req(request) {
             const output = pino_http_1.stdSerializers.req(request);

package/dist/middleware/authenticate.test.d.ts

@@ -0,0 +1 @@
+import '../../src/types/express.d.ts';