directus 9.21.0 → 9.22.0

package/dist/utils/apply-snapshot.js

@@ -12,13 +12,19 @@ const get_schema_1 = require("./get-schema");
 const get_snapshot_1 = require("./get-snapshot");
 const get_snapshot_diff_1 = require("./get-snapshot-diff");
 const cache_1 = require("../cache");
+const emitter_1 = __importDefault(require("../emitter"));
 async function applySnapshot(snapshot, options) {
     var _a, _b, _c, _d;
     const database = (_a = options === null || options === void 0 ? void 0 : options.database) !== null && _a !== void 0 ? _a : (0, database_1.default)();
-    const schema = (_b = options === null || options === void 0 ? void 0 : options.schema) !== null && _b !== void 0 ? _b : (await (0, get_schema_1.getSchema)({ database }));
+    const schema = (_b = options === null || options === void 0 ? void 0 : options.schema) !== null && _b !== void 0 ? _b : (await (0, get_schema_1.getSchema)({ database, bypassCache: true }));
     const { systemCache } = (0, cache_1.getCache)();
     const current = (_c = options === null || options === void 0 ? void 0 : options.current) !== null && _c !== void 0 ? _c : (await (0, get_snapshot_1.getSnapshot)({ database, schema }));
     const snapshotDiff = (_d = options === null || options === void 0 ? void 0 : options.diff) !== null && _d !== void 0 ? _d : (0, get_snapshot_diff_1.getSnapshotDiff)(current, snapshot);
+    const nestedActionEvents = [];
+    const mutationOptions = {
+        autoPurgeSystemCache: false,
+        bypassEmitAction: (params) => nestedActionEvents.push(params),
+    };
     await database.transaction(async (trx) => {
         const collectionsService = new services_1.CollectionsService({ knex: trx, schema });
         const getNestedCollectionsToCreate = (currentLevelCollection) => snapshotDiff.collections.filter(({ diff }) => { var _a, _b; return ((_b = (_a = diff[0].rhs) === null || _a === void 0 ? void 0 : _a.meta) === null || _b === void 0 ? void 0 : _b.group) === currentLevelCollection; });
@@ -49,7 +55,7 @@ async function applySnapshot(snapshot, options) {
                         await collectionsService.createOne({
                             ...diff[0].rhs,
                             fields,
-                        });
+                        }, mutationOptions);
                     }
                     catch (err) {
                         logger_1.default.error(`Failed to create collection "${collection}"`);
@@ -69,7 +75,7 @@ async function applySnapshot(snapshot, options) {
                         const relationsService = new services_1.RelationsService({ knex: trx, schema });
                         for (const relation of relations) {
                             try {
-                                await relationsService.deleteOne(relation.collection, relation.field);
+                                await relationsService.deleteOne(relation.collection, relation.field, mutationOptions);
                             }
                             catch (err) {
                                 logger_1.default.error(`Failed to delete collection "${collection}" due to relation "${relation.collection}.${relation.field}"`);
@@ -81,7 +87,7 @@ async function applySnapshot(snapshot, options) {
                     }
                     await deleteCollections(getNestedCollectionsToDelete(collection));
                     try {
-                        await collectionsService.deleteOne(collection);
+                        await collectionsService.deleteOne(collection, mutationOptions);
                     }
                     catch (err) {
                         logger_1.default.error(`Failed to delete collection "${collection}"`);
@@ -130,7 +136,7 @@ async function applySnapshot(snapshot, options) {
                 });
                 if (newValues) {
                     try {
-                        await collectionsService.updateOne(collection, newValues);
+                        await collectionsService.updateOne(collection, newValues, mutationOptions);
                     }
                     catch (err) {
                         logger_1.default.error(`Failed to update collection "${collection}"`);
@@ -139,11 +145,14 @@ async function applySnapshot(snapshot, options) {
                 }
             }
         }
-        const fieldsService = new services_1.FieldsService({ knex: trx, schema: await (0, get_schema_1.getSchema)({ database: trx }) });
+        const fieldsService = new services_1.FieldsService({
+            knex: trx,
+            schema: await (0, get_schema_1.getSchema)({ database: trx, bypassCache: true }),
+        });
         for (const { collection, field, diff } of snapshotDiff.fields) {
             if ((diff === null || diff === void 0 ? void 0 : diff[0].kind) === 'N' && !isNestedMetaUpdate(diff === null || diff === void 0 ? void 0 : diff[0])) {
                 try {
-                    await fieldsService.createField(collection, diff[0].rhs);
+                    await fieldsService.createField(collection, diff[0].rhs, undefined, mutationOptions);
                 }
                 catch (err) {
                     logger_1.default.error(`Failed to create field "${collection}.${field}"`);
@@ -158,7 +167,7 @@ async function applySnapshot(snapshot, options) {
                     try {
                         await fieldsService.updateField(collection, {
                             ...newValues,
-                        });
+                        }, mutationOptions);
                     }
                     catch (err) {
                         logger_1.default.error(`Failed to update field "${collection}.${field}"`);
@@ -168,7 +177,7 @@ async function applySnapshot(snapshot, options) {
             }
             if ((diff === null || diff === void 0 ? void 0 : diff[0].kind) === 'D' && !isNestedMetaUpdate(diff === null || diff === void 0 ? void 0 : diff[0])) {
                 try {
-                    await fieldsService.deleteField(collection, field);
+                    await fieldsService.deleteField(collection, field, mutationOptions);
                 }
                 catch (err) {
                     logger_1.default.error(`Failed to delete field "${collection}.${field}"`);
@@ -179,7 +188,10 @@ async function applySnapshot(snapshot, options) {
                 snapshotDiff.relations = snapshotDiff.relations.filter((relation) => (relation.collection === collection && relation.field === field) === false);
             }
         }
-        const relationsService = new services_1.RelationsService({ knex: trx, schema: await (0, get_schema_1.getSchema)({ database: trx }) });
+        const relationsService = new services_1.RelationsService({
+            knex: trx,
+            schema: await (0, get_schema_1.getSchema)({ database: trx, bypassCache: true }),
+        });
         for (const { collection, field, diff } of snapshotDiff.relations) {
             const structure = {};
             for (const diffEdit of diff) {
@@ -187,7 +199,7 @@ async function applySnapshot(snapshot, options) {
             }
             if ((diff === null || diff === void 0 ? void 0 : diff[0].kind) === 'N') {
                 try {
-                    await relationsService.createOne(diff[0].rhs);
+                    await relationsService.createOne(diff[0].rhs, mutationOptions);
                 }
                 catch (err) {
                     logger_1.default.error(`Failed to create relation "${collection}.${field}"`);
@@ -200,7 +212,7 @@ async function applySnapshot(snapshot, options) {
                 });
                 if (newValues) {
                     try {
-                        await relationsService.updateOne(collection, field, newValues);
+                        await relationsService.updateOne(collection, field, newValues, mutationOptions);
                     }
                     catch (err) {
                         logger_1.default.error(`Failed to update relation "${collection}.${field}"`);
@@ -210,7 +222,7 @@ async function applySnapshot(snapshot, options) {
             }
             if ((diff === null || diff === void 0 ? void 0 : diff[0].kind) === 'D') {
                 try {
-                    await relationsService.deleteOne(collection, field);
+                    await relationsService.deleteOne(collection, field, mutationOptions);
                 }
                 catch (err) {
                     logger_1.default.error(`Failed to delete relation "${collection}.${field}"`);
@@ -220,6 +232,13 @@ async function applySnapshot(snapshot, options) {
         }
     });
     await (systemCache === null || systemCache === void 0 ? void 0 : systemCache.clear());
+    if (nestedActionEvents.length > 0) {
+        const updatedSchema = await (0, get_schema_1.getSchema)({ database, bypassCache: true });
+        for (const nestedActionEvent of nestedActionEvents) {
+            nestedActionEvent.context.schema = updatedSchema;
+            emitter_1.default.emitAction(nestedActionEvent.event, nestedActionEvent.meta, nestedActionEvent.context);
+        }
+    }
 }
 exports.applySnapshot = applySnapshot;
 function isNestedMetaUpdate(diff) {

package/dist/utils/dynamic-import.d.ts

@@ -0,0 +1 @@
+export declare const dynamicImport: (mod: string) => Promise<any>;

package/dist/utils/dynamic-import.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.dynamicImport = void 0;
+const dynamicImport = async (mod) => {
+    return process.env.VITEST ? await import(mod) : require(mod);
+};
+exports.dynamicImport = dynamicImport;

package/dist/utils/get-collection-from-alias.d.ts

@@ -0,0 +1,6 @@
+import { AliasMap } from './get-column-path';
+/**
+ * Extract the collection of an alias within an aliasMap
+ * For example: 'ljnsv.name' -> 'authors'
+ */
+export declare function getCollectionFromAlias(alias: string, aliasMap: AliasMap): string | undefined;

package/dist/utils/get-collection-from-alias.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCollectionFromAlias = void 0;
+/**
+ * Extract the collection of an alias within an aliasMap
+ * For example: 'ljnsv.name' -> 'authors'
+ */
+function getCollectionFromAlias(alias, aliasMap) {
+    for (const aliasValue of Object.values(aliasMap)) {
+        if (aliasValue.alias === alias) {
+            return aliasValue.collection;
+        }
+    }
+}
+exports.getCollectionFromAlias = getCollectionFromAlias;

package/dist/utils/get-collection-from-alias.test.d.ts

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

package/dist/utils/get-column-path.d.ts

@@ -1,20 +1,26 @@
-import { Relation } from '@directus/shared/types';
-type AliasMap = string | {
-    [key: string]: AliasMap;
+import { Relation, SchemaOverview } from '@directus/shared/types';
+export type AliasMap = {
+    [key: string]: {
+        alias: string;
+        collection: string;
+    };
 };
 export type ColPathProps = {
     path: string[];
     collection: string;
     aliasMap: AliasMap;
     relations: Relation[];
+    schema?: SchemaOverview;
+};
+export type ColPathResult = {
+    columnPath: string;
+    targetCollection: string;
+    addNestedPkField?: string;
 };
 /**
  * Converts a Directus field list path to the correct SQL names based on the constructed alias map.
  * For example: ['author', 'role', 'name'] -> 'ljnsv.name'
  * Also returns the target collection of the column: 'directus_roles'
+ * If the last filter path is an alias field, a nested PK is appended to the path
  */
-export declare function getColumnPath({ path, collection, aliasMap, relations }: ColPathProps): {
-    columnPath: string;
-    targetCollection: string;
-};
-export {};
+export declare function getColumnPath({ path, collection, aliasMap, relations, schema }: ColPathProps): ColPathResult;

package/dist/utils/get-column-path.js

@@ -3,15 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getColumnPath = void 0;
 const get_relation_info_1 = require("./get-relation-info");
 const exceptions_1 = require("../exceptions");
-const lodash_1 = require("lodash");
 /**
  * Converts a Directus field list path to the correct SQL names based on the constructed alias map.
  * For example: ['author', 'role', 'name'] -> 'ljnsv.name'
  * Also returns the target collection of the column: 'directus_roles'
+ * If the last filter path is an alias field, a nested PK is appended to the path
  */
-function getColumnPath({ path, collection, aliasMap, relations }) {
+function getColumnPath({ path, collection, aliasMap, relations, schema }) {
     return followRelation(path);
-    function followRelation(pathParts, parentCollection = collection, parentAlias) {
+    function followRelation(pathParts, parentCollection = collection, parentFields, addNestedPkField) {
+        var _a, _b, _c, _d;
         /**
          * For A2M fields, the path can contain an optional collection scope <field>:<scope>
          */
@@ -20,7 +21,7 @@ function getColumnPath({ path, collection, aliasMap, relations }) {
         if (!relation) {
             throw new exceptions_1.InvalidQueryException(`"${parentCollection}.${pathRoot}" is not a relational field`);
         }
-        const alias = (0, lodash_1.get)(aliasMap, parentAlias ? [parentAlias, ...pathParts] : pathParts);
+        const alias = parentFields ? (_a = aliasMap[`${parentFields}.${pathParts[0]}`]) === null || _a === void 0 ? void 0 : _a.alias : (_b = aliasMap[pathParts[0]]) === null || _b === void 0 ? void 0 : _b.alias;
         const remainingParts = pathParts.slice(1);
         let parent;
         if (relationType === 'a2o') {
@@ -36,13 +37,29 @@ function getColumnPath({ path, collection, aliasMap, relations }) {
         else {
             parent = relation.collection;
         }
+        // Top level alias field
+        if (schema && !(((_c = remainingParts[0]) !== null && _c !== void 0 ? _c : parent).includes('(') && ((_d = remainingParts[0]) !== null && _d !== void 0 ? _d : parent).includes(')'))) {
+            if (remainingParts.length === 0) {
+                remainingParts.push(schema.collections[parent].primary);
+                addNestedPkField = schema.collections[parent].primary;
+            }
+            // Nested level alias field
+            else if (remainingParts.length === 1 && schema.collections[parent].fields[remainingParts[0]].type === 'alias') {
+                remainingParts.push(schema.collections[relation.related_collection].primary);
+                addNestedPkField = schema.collections[relation.related_collection].primary;
+            }
+        }
         if (remainingParts.length === 1) {
-            return { columnPath: `${alias || parent}.${remainingParts[0]}`, targetCollection: parent };
+            return {
+                columnPath: `${alias || parent}.${remainingParts[0]}`,
+                targetCollection: parent,
+                addNestedPkField,
+            };
         }
         if (remainingParts.length) {
-            return followRelation(remainingParts, parent, alias);
+            return followRelation(remainingParts, parent, `${parentFields ? parentFields + '.' : ''}${pathParts[0]}`, addNestedPkField);
         }
-        return { columnPath: '', targetCollection: '' };
+        return { columnPath: '', targetCollection: '', addNestedPkField };
     }
 }
 exports.getColumnPath = getColumnPath;

package/dist/utils/get-column.d.ts

@@ -1,5 +1,9 @@
 import { Query, SchemaOverview } from '@directus/shared/types';
 import { Knex } from 'knex';
+type GetColumnOptions = {
+    query?: Query;
+    originalCollectionName?: string;
+};
 /**
  * Return column prefixed by table. If column includes functions (like `year(date_created)`), the
  * column is replaced with the appropriate SQL
@@ -8,6 +12,9 @@ import { Knex } from 'knex';
  * @param table Collection or alias in which column resides
  * @param column name of the column
  * @param alias Whether or not to add a SQL AS statement
+ * @param schema For retrieval of the column type
+ * @param options Optional parameters
  * @returns Knex raw instance
  */
-export declare function getColumn(knex: Knex, table: string, column: string, alias: string | false | undefined, schema: SchemaOverview, query?: Query): Knex.Raw;
+export declare function getColumn(knex: Knex, table: string, column: string, alias: string | false | undefined, schema: SchemaOverview, options?: GetColumnOptions): Knex.Raw;
+export {};

package/dist/utils/get-column.js

@@ -14,21 +14,28 @@ const apply_function_to_column_name_1 = require("./apply-function-to-column-name
  * @param table Collection or alias in which column resides
  * @param column name of the column
  * @param alias Whether or not to add a SQL AS statement
+ * @param schema For retrieval of the column type
+ * @param options Optional parameters
  * @returns Knex raw instance
  */
-function getColumn(knex, table, column, alias = (0, apply_function_to_column_name_1.applyFunctionToColumnName)(column), schema, query) {
+function getColumn(knex, table, column, alias = (0, apply_function_to_column_name_1.applyFunctionToColumnName)(column), schema, options) {
     var _a, _b, _c, _d;
     const fn = (0, helpers_1.getFunctions)(knex, schema);
     if (column.includes('(') && column.includes(')')) {
         const functionName = column.split('(')[0];
         const columnName = column.match(constants_1.REGEX_BETWEEN_PARENS)[1];
         if (functionName in fn) {
-            const type = (_d = (_c = (_b = (_a = schema === null || schema === void 0 ? void 0 : schema.collections[table]) === null || _a === void 0 ? void 0 : _a.fields) === null || _b === void 0 ? void 0 : _b[columnName]) === null || _c === void 0 ? void 0 : _c.type) !== null && _d !== void 0 ? _d : 'unknown';
+            const collectionName = (options === null || options === void 0 ? void 0 : options.originalCollectionName) || table;
+            const type = (_d = (_c = (_b = (_a = schema === null || schema === void 0 ? void 0 : schema.collections[collectionName]) === null || _a === void 0 ? void 0 : _a.fields) === null || _b === void 0 ? void 0 : _b[columnName]) === null || _c === void 0 ? void 0 : _c.type) !== null && _d !== void 0 ? _d : 'unknown';
             const allowedFunctions = (0, utils_1.getFunctionsForType)(type);
             if (allowedFunctions.includes(functionName) === false) {
                 throw new exceptions_1.InvalidQueryException(`Invalid function specified "${functionName}"`);
             }
-            const result = fn[functionName](table, columnName, { type, query });
+            const result = fn[functionName](table, columnName, {
+                type,
+                query: options === null || options === void 0 ? void 0 : options.query,
+                originalCollectionName: options === null || options === void 0 ? void 0 : options.originalCollectionName,
+            });
             if (alias) {
                 return knex.raw(result + ' AS ??', [alias]);
             }

package/dist/utils/get-config-from-env.js

@@ -6,10 +6,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getConfigFromEnv = void 0;
 const camelcase_1 = __importDefault(require("camelcase"));
 const lodash_1 = require("lodash");
-const env_1 = __importDefault(require("../env"));
+const env_1 = require("../env");
 function getConfigFromEnv(prefix, omitPrefix, type = 'camelcase') {
+    const env = (0, env_1.getEnv)();
     const config = {};
-    for (const [key, value] of Object.entries(env_1.default)) {
+    for (const [key, value] of Object.entries(env)) {
         if (key.toLowerCase().startsWith(prefix.toLowerCase()) === false)
             continue;
         if (omitPrefix) {

package/dist/utils/get-default-value.d.ts

@@ -1,3 +1,3 @@
-import { SchemaOverview } from '@directus/schema/dist/types/overview';
+import { SchemaOverview } from '@directus/schema/types/overview';
 import { Column } from 'knex-schema-inspector/dist/types/column';
 export default function getDefaultValue(column: SchemaOverview[string]['columns'][string] | Column): string | boolean | number | Record<string, any> | any[] | null;

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

@@ -1,6 +1,10 @@
-import { Accountability, SchemaOverview } from '@directus/shared/types';
+import { SchemaOverview } from '@directus/shared/types';
 import { Knex } from 'knex';
 export declare function getSchema(options?: {
-    accountability?: Accountability;
     database?: Knex;
+    /**
+     * To bypass any cached schema if bypassCache is enabled.
+     * Used to ensure schema snapshot/apply is not using outdated schema
+     */
+    bypassCache?: boolean;
 }): Promise<SchemaOverview>;

package/dist/utils/get-schema.js

@@ -21,7 +21,7 @@ async function getSchema(options) {
     const database = (options === null || options === void 0 ? void 0 : options.database) || (0, database_1.default)();
     const schemaInspector = (0, schema_1.default)(database);
     let result;
-    if (env_1.default.CACHE_SCHEMA !== false) {
+    if (!(options === null || options === void 0 ? void 0 : options.bypassCache) && env_1.default.CACHE_SCHEMA !== false) {
         let cachedSchema;
         try {
             cachedSchema = (await (0, cache_1.getSystemCache)('schema'));

package/dist/utils/get-snapshot.js

@@ -12,7 +12,7 @@ const lodash_1 = require("lodash");
 async function getSnapshot(options) {
     var _a, _b;
     const database = (_a = options === null || options === void 0 ? void 0 : options.database) !== null && _a !== void 0 ? _a : (0, database_1.default)();
-    const schema = (_b = options === null || options === void 0 ? void 0 : options.schema) !== null && _b !== void 0 ? _b : (await (0, get_schema_1.getSchema)({ database }));
+    const schema = (_b = options === null || options === void 0 ? void 0 : options.schema) !== null && _b !== void 0 ? _b : (await (0, get_schema_1.getSchema)({ database, bypassCache: true }));
     const collectionsService = new services_1.CollectionsService({ knex: database, schema });
     const fieldsService = new services_1.FieldsService({ knex: database, schema });
     const relationsService = new services_1.RelationsService({ knex: database, schema });

package/dist/utils/parse-image-metadata.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="node" />
+export declare function parseIptc(buffer: Buffer): Record<string, unknown>;
+export declare function parseXmp(buffer: Buffer): Record<string, unknown>;

package/dist/utils/parse-image-metadata.js

@@ -0,0 +1,73 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseXmp = exports.parseIptc = void 0;
+const IPTC_ENTRY_TYPES = new Map([
+    [0x78, 'caption'],
+    [0x6e, 'credit'],
+    [0x19, 'keywords'],
+    [0x37, 'dateCreated'],
+    [0x50, 'byline'],
+    [0x55, 'bylineTitle'],
+    [0x7a, 'captionWriter'],
+    [0x69, 'headline'],
+    [0x74, 'copyright'],
+    [0x0f, 'category'],
+]);
+const IPTC_ENTRY_MARKER = Buffer.from([0x1c, 0x02]);
+function parseIptc(buffer) {
+    if (!Buffer.isBuffer(buffer))
+        return {};
+    const iptc = {};
+    let lastIptcEntryPos = buffer.indexOf(IPTC_ENTRY_MARKER);
+    while (lastIptcEntryPos !== -1) {
+        lastIptcEntryPos = buffer.indexOf(IPTC_ENTRY_MARKER, lastIptcEntryPos + IPTC_ENTRY_MARKER.byteLength);
+        const iptcBlockTypePos = lastIptcEntryPos + IPTC_ENTRY_MARKER.byteLength;
+        const iptcBlockSizePos = iptcBlockTypePos + 1;
+        const iptcBlockDataPos = iptcBlockSizePos + 2;
+        const iptcBlockType = buffer.readUInt8(iptcBlockTypePos);
+        const iptcBlockSize = buffer.readUInt16BE(iptcBlockSizePos);
+        if (!IPTC_ENTRY_TYPES.has(iptcBlockType)) {
+            continue;
+        }
+        const iptcBlockTypeId = IPTC_ENTRY_TYPES.get(iptcBlockType);
+        const iptcData = buffer.subarray(iptcBlockDataPos, iptcBlockDataPos + iptcBlockSize).toString();
+        if (iptcBlockTypeId) {
+            if (iptc[iptcBlockTypeId] == null) {
+                iptc[iptcBlockTypeId] = iptcData;
+            }
+            else if (Array.isArray(iptc[iptcBlockTypeId])) {
+                iptc[iptcBlockTypeId].push(iptcData);
+            }
+            else {
+                iptc[iptcBlockTypeId] = [iptc[iptcBlockTypeId], iptcData];
+            }
+        }
+    }
+    return iptc;
+}
+exports.parseIptc = parseIptc;
+function parseXmp(buffer) {
+    const xmp = {};
+    ['title', 'description', 'rights', 'creator', 'subject'].forEach((x) => {
+        const tagRegex = new RegExp(`<dc:${x}>(.*?)</dc:${x}>`, 'smig'), tagMatches = tagRegex.exec(buffer.toString());
+        if (!tagMatches || tagMatches.length === 0) {
+            return;
+        }
+        const value = tagMatches[1].trim();
+        if (value.toLowerCase().indexOf('<rdf:bag>') === 0) {
+            const r = new RegExp('<rdf:li>(.*?)</rdf:li>', 'smig');
+            let match = r.exec(value);
+            const result = [];
+            while (match) {
+                result.push(match[1]);
+                match = r.exec(value);
+            }
+            xmp[x] = result;
+        }
+        else {
+            xmp[x] = value.replace(/<[^>]*>?/gm, '').trim();
+        }
+    });
+    return xmp;
+}
+exports.parseXmp = parseXmp;

package/dist/utils/track.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.track = void 0;
-const axios_1 = __importDefault(require("axios"));
 const ms_1 = __importDefault(require("ms"));
 const node_machine_id_1 = require("node-machine-id");
 const os_1 = __importDefault(require("os"));
@@ -14,10 +13,11 @@ const env_1 = __importDefault(require("../env"));
 const logger_1 = __importDefault(require("../logger"));
 const utils_1 = require("@directus/shared/utils");
 async function track(event) {
+    const axios = (await import('axios')).default;
     if (env_1.default.TELEMETRY !== false) {
         const info = await getEnvInfo(event);
         try {
-            await axios_1.default.post('https://telemetry.directus.io/', info);
+            await axios.post('https://telemetry.directus.io/', info);
         }
         catch (err) {
             if (env_1.default.NODE_ENV === 'development') {

package/dist/utils/validate-env.js

@@ -4,11 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateEnv = void 0;
-const env_1 = __importDefault(require("../env"));
+const env_1 = require("../env");
 const logger_1 = __importDefault(require("../logger"));
 function validateEnv(requiredKeys) {
+    const env = (0, env_1.getEnv)();
     for (const requiredKey of requiredKeys) {
-        if (requiredKey in env_1.default === false) {
+        if (requiredKey in env === false) {
             logger_1.default.error(`"${requiredKey}" Environment Variable is missing.`);
             process.exit(1);
         }

package/dist/webhooks.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.unregister = exports.register = exports.reload = exports.init = void 0;
-const axios_1 = __importDefault(require("axios"));
 const database_1 = __importDefault(require("./database"));
 const emitter_1 = __importDefault(require("./emitter"));
 const logger_1 = __importDefault(require("./logger"));
@@ -53,6 +52,7 @@ function unregister() {
 exports.unregister = unregister;
 function createHandler(webhook, event) {
     return async (meta, context) => {
+        const axios = (await import('axios')).default;
         if (webhook.collections.includes(meta.collection) === false)
             return;
         const webhookPayload = {
@@ -66,7 +66,7 @@ function createHandler(webhook, event) {
             ...meta,
         };
         try {
-            await (0, axios_1.default)({
+            await axios({
                 url: webhook.url,
                 method: webhook.method,
                 data: webhook.data ? webhookPayload : null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "directus",
-  "version": "9.21.0",
+  "version": "9.22.0",
   "description": "Directus is a real-time API and App dashboard for managing SQL database content",
   "keywords": [
     "directus",
@@ -66,16 +66,7 @@
   "dependencies": {
     "@authenio/samlify-node-xmllint": "2.0.0",
     "@aws-sdk/client-ses": "3.211.0",
-    "@directus/app": "9.21.0",
-    "@directus/drive": "9.21.0",
-    "@directus/drive-azure": "9.21.0",
-    "@directus/drive-gcs": "9.21.0",
-    "@directus/drive-s3": "9.21.0",
-    "@directus/extensions-sdk": "9.21.0",
     "@directus/format-title": "9.15.0",
-    "@directus/schema": "9.21.0",
-    "@directus/shared": "9.21.0",
-    "@directus/specs": "9.21.0",
     "@godaddy/terminus": "4.11.2",
     "@rollup/plugin-alias": "4.0.2",
     "@rollup/plugin-virtual": "3.0.1",
@@ -94,13 +85,12 @@
     "csv-parser": "3.0.0",
     "date-fns": "2.29.3",
     "deep-diff": "1.0.2",
-    "deep-map": "2.0.0",
     "destroy": "1.2.0",
     "dotenv": "16.0.3",
     "encodeurl": "1.0.2",
     "eventemitter2": "6.4.9",
     "execa": "5.1.1",
-    "exifr": "7.1.3",
+    "exif-reader": "1.0.3",
     "express": "4.18.2",
     "fast-redact": "3.1.2",
     "flat": "5.0.2",
@@ -109,6 +99,7 @@
     "graphql": "16.6.0",
     "graphql-compose": "9.0.10",
     "helmet": "6.0.0",
+    "icc": "2.0.0",
     "inquirer": "8.2.4",
     "ioredis": "5.2.4",
     "joi": "17.7.0",
@@ -138,9 +129,9 @@
     "pino": "8.7.0",
     "pino-http": "8.2.1",
     "pino-http-print": "3.1.0",
+    "pino-pretty": "9.1.1",
     "qs": "6.11.0",
     "rate-limiter-flexible": "2.4.1",
-    "resolve-cwd": "3.0.0",
     "rollup": "3.3.0",
     "samlify": "2.8.7",
     "sanitize-html": "2.7.3",
@@ -153,10 +144,21 @@
     "uuid": "9.0.0",
     "uuid-validate": "0.0.3",
     "vm2": "3.9.11",
-    "wellknown": "0.5.0"
+    "wellknown": "0.5.0",
+    "@directus/app": "9.22.0",
+    "@directus/extensions-sdk": "9.22.0",
+    "@directus/schema": "9.22.0",
+    "@directus/shared": "9.22.0",
+    "@directus/specs": "9.22.0",
+    "@directus/storage": "9.22.0",
+    "@directus/storage-driver-azure": "9.22.0",
+    "@directus/storage-driver-cloudinary": "9.21.2",
+    "@directus/storage-driver-gcs": "9.22.0",
+    "@directus/storage-driver-local": "9.22.0",
+    "@directus/storage-driver-s3": "9.22.0"
   },
   "devDependencies": {
-    "@otplib/preset-default": "12.0.1",
+    "@ngneat/falso": "6.3.0",
     "@types/async": "3.2.15",
     "@types/busboy": "1.5.0",
     "@types/bytes": "3.1.1",
@@ -165,10 +167,9 @@
     "@types/deep-diff": "1.0.1",
     "@types/destroy": "1.0.0",
     "@types/encodeurl": "1.0.0",
+    "@types/exif-reader": "1.0.0",
     "@types/express": "4.17.14",
-    "@types/express-pino-logger": "4.0.3",
     "@types/express-serve-static-core": "4.17.31",
-    "@types/express-session": "1.17.5",
     "@types/fast-redact": "3.0.2",
     "@types/flat": "5.0.2",
     "@types/fs-extra": "9.0.13",
@@ -192,7 +193,6 @@
     "@types/sanitize-html": "2.6.2",
     "@types/sharp": "0.31.0",
     "@types/stream-json": "1.7.2",
-    "@types/supertest": "2.0.12",
     "@types/uuid": "8.3.4",
     "@types/uuid-validate": "0.0.1",
     "@types/wellknown": "0.5.4",
@@ -200,8 +200,6 @@
     "copyfiles": "2.4.1",
     "form-data": "4.0.0",
     "knex-mock-client": "1.8.4",
-    "rimraf": "3.0.2",
-    "supertest": "6.3.1",
     "ts-node": "10.9.1",
     "ts-node-dev": "2.0.0",
     "typescript": "4.9.3",
@@ -222,9 +220,7 @@
     "node": ">=12.20.0"
   },
   "scripts": {
-    "prebuild": "pnpm cleanup",
     "build": "tsc --build && copyfiles \"src/**/*.{yaml,liquid}\" -u 1 dist",
-    "cleanup": "rimraf dist",
     "cli": "NODE_ENV=development SERVE_APP=false ts-node --script-mode --transpile-only src/cli/run.ts",
     "dev": "NODE_ENV=development SERVE_APP=false ts-node-dev --files --transpile-only --respawn --watch \".env\" --inspect=0 --exit-child -- src/start.ts",
     "start": "npx directus start",