directus 9.23.1 → 9.23.3

package/dist/utils/get-snapshot-diff.js

@@ -27,9 +27,8 @@ function getSnapshotDiff(current, after) {
         ].filter((obj) => Array.isArray(obj.diff)), 'collection'),
         fields: (0, lodash_1.orderBy)([
             ...current.fields.map((currentField) => {
-                var _a, _b;
                 const afterField = after.fields.find((afterField) => afterField.collection === currentField.collection && afterField.field === currentField.field);
-                const isAutoIncrementPrimaryKey = !!((_a = currentField.schema) === null || _a === void 0 ? void 0 : _a.is_primary_key) && !!((_b = currentField.schema) === null || _b === void 0 ? void 0 : _b.has_auto_increment);
+                const isAutoIncrementPrimaryKey = !!currentField.schema?.is_primary_key && !!currentField.schema?.has_auto_increment;
                 return {
                     collection: currentField.collection,
                     field: currentField.field,
@@ -74,7 +73,7 @@ function getSnapshotDiff(current, after) {
      * When you delete a collection, we don't have to individually drop all the fields/relations as well
      */
     const deletedCollections = diffedSnapshot.collections
-        .filter((collection) => { var _a; return ((_a = collection.diff) === null || _a === void 0 ? void 0 : _a[0].kind) === types_1.DiffKind.DELETE; })
+        .filter((collection) => collection.diff?.[0].kind === types_1.DiffKind.DELETE)
         .map(({ collection }) => collection);
     diffedSnapshot.fields = diffedSnapshot.fields.filter((field) => deletedCollections.includes(field.collection) === false);
     diffedSnapshot.relations = diffedSnapshot.relations.filter((relation) => deletedCollections.includes(relation.collection) === false);

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

@@ -1,6 +1,6 @@
-import { Snapshot } from '../types';
-import { Knex } from 'knex';
-import { SchemaOverview } from '@directus/shared/types';
+import type { SchemaOverview } from '@directus/shared/types';
+import type { Knex } from 'knex';
+import type { Snapshot } from '../types';
 export declare function getSnapshot(options?: {
     database?: Knex;
     schema?: SchemaOverview;

package/dist/utils/get-snapshot.js

@@ -24,17 +24,16 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSnapshot = void 0;
+const lodash_1 = require("lodash");
+const package_json_1 = require("../../package.json");
 const database_1 = __importStar(require("../database"));
-const get_schema_1 = require("./get-schema");
 const services_1 = require("../services");
-const package_json_1 = require("../../package.json");
-const lodash_1 = require("lodash");
+const get_schema_1 = require("./get-schema");
 const sanitize_schema_1 = require("./sanitize-schema");
 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 database = options?.database ?? (0, database_1.default)();
     const vendor = (0, database_1.getDatabaseClient)(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 schema = options?.schema ?? (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 });
@@ -60,8 +59,7 @@ async function getSnapshot(options) {
 }
 exports.getSnapshot = getSnapshot;
 function excludeSystem(item) {
-    var _a;
-    if (((_a = item === null || item === void 0 ? void 0 : item.meta) === null || _a === void 0 ? void 0 : _a.system) === true)
+    if (item?.meta?.system === true)
         return false;
     return true;
 }

package/dist/utils/is-directus-jwt.js

@@ -11,7 +11,7 @@ const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
 function isDirectusJWT(string) {
     try {
         const payload = jsonwebtoken_1.default.decode(string, { json: true });
-        if ((payload === null || payload === void 0 ? void 0 : payload.iss) !== 'directus')
+        if (payload?.iss !== 'directus')
             return false;
         return true;
     }

package/dist/utils/job-queue.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JobQueue = void 0;
 class JobQueue {
+    running;
+    jobs;
     constructor() {
         this.running = false;
         this.jobs = [];

package/dist/utils/jwt.d.ts

@@ -1,2 +1,2 @@
-import { DirectusTokenPayload } from '../types';
+import type { DirectusTokenPayload } from '../types';
 export declare function verifyAccessJWT(token: string, secret: string): DirectusTokenPayload;

package/dist/utils/merge-permissions-for-share.d.ts

@@ -1,4 +1,4 @@
-import { Permission, Accountability, Filter, SchemaOverview } from '@directus/shared/types';
+import type { Permission, Accountability, Filter, SchemaOverview } from '@directus/shared/types';
 export declare function mergePermissionsForShare(currentPermissions: Permission[], accountability: Accountability, schema: SchemaOverview): Permission[];
 export declare function traverse(schema: SchemaOverview, rootItemPrimaryKeyField: string, rootItemPrimaryKey: string, currentCollection: string, parentCollections?: string[], path?: string[]): Partial<Permission>[];
 export declare function getFilterForPath(type: 'o2m' | 'm2o' | 'a2o', path: string[], rootPrimaryKeyField: string, rootPrimaryKey: string): Filter;

package/dist/utils/merge-permissions-for-share.js

@@ -53,7 +53,6 @@ function mergePermissionsForShare(currentPermissions, accountability, schema) {
 }
 exports.mergePermissionsForShare = mergePermissionsForShare;
 function traverse(schema, rootItemPrimaryKeyField, rootItemPrimaryKey, currentCollection, parentCollections = [], path = []) {
-    var _a, _b, _c;
     const permissions = [];
     // If there's already a permissions rule for the collection we're currently checking, we'll shortcircuit.
     // This prevents infinite loop in recursive relationships, like articles->related_articles->articles, or
@@ -82,7 +81,7 @@ function traverse(schema, rootItemPrimaryKeyField, rootItemPrimaryKey, currentCo
             });
             permissions.push(...traverse(schema, rootItemPrimaryKeyField, rootItemPrimaryKey, relation.collection, [...parentCollections, currentCollection], [...path, relation.field]));
         }
-        if (type === 'a2o' && ((_a = relation.meta) === null || _a === void 0 ? void 0 : _a.one_allowed_collections)) {
+        if (type === 'a2o' && relation.meta?.one_allowed_collections) {
             for (const collection of relation.meta.one_allowed_collections) {
                 permissions.push({
                     collection,
@@ -95,8 +94,8 @@ function traverse(schema, rootItemPrimaryKeyField, rootItemPrimaryKey, currentCo
                 collection: relation.related_collection,
                 permissions: getFilterForPath(type, [...path, `$FOLLOW(${relation.collection},${relation.field})`], rootItemPrimaryKeyField, rootItemPrimaryKey),
             });
-            if ((_b = relation.meta) === null || _b === void 0 ? void 0 : _b.one_field) {
-                permissions.push(...traverse(schema, rootItemPrimaryKeyField, rootItemPrimaryKey, relation.related_collection, [...parentCollections, currentCollection], [...path, (_c = relation.meta) === null || _c === void 0 ? void 0 : _c.one_field]));
+            if (relation.meta?.one_field) {
+                permissions.push(...traverse(schema, rootItemPrimaryKeyField, rootItemPrimaryKey, relation.related_collection, [...parentCollections, currentCollection], [...path, relation.meta?.one_field]));
             }
         }
     }

package/dist/utils/merge-permissions.d.ts

@@ -1,14 +1,14 @@
 /// <reference types="lodash" />
-import { Permission } from '@directus/shared/types';
+import type { Permission } from '@directus/shared/types';
 export declare function mergePermissions(strategy: 'and' | 'or', ...permissions: Permission[][]): Permission[];
 export declare function mergePermission(strategy: 'and' | 'or', currentPerm: Permission, newPerm: Permission): import("lodash").Omit<{
     permissions: import("@directus/shared/types").Filter | null;
     validation: import("@directus/shared/types").Filter | null;
     fields: string[] | null;
     presets: Record<string, any> | null;
-    id?: number | undefined;
+    id?: number;
     role: string | null;
     collection: string;
     action: import("@directus/shared/types").PermissionsAction;
-    system?: true | undefined;
+    system?: true;
 }, "id" | "system">;

package/dist/utils/redact-header-cookies.d.ts

@@ -0,0 +1 @@
+export declare function redactHeaderCookie(cookieHeader: string, cookieNames: string[]): string;

package/dist/utils/redact-header-cookies.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.redactHeaderCookie = void 0;
+function redactHeaderCookie(cookieHeader, cookieNames) {
+    for (const cookieName of cookieNames) {
+        const re = new RegExp(`(${cookieName}=)([^;]+)`);
+        cookieHeader = cookieHeader.replace(re, `$1--redacted--`);
+    }
+    return cookieHeader;
+}
+exports.redactHeaderCookie = redactHeaderCookie;

package/dist/utils/redact-header-cookies.test.d.ts

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

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

@@ -1,4 +1,4 @@
-import { Permission, PermissionsAction, SchemaOverview } from '@directus/shared/types';
+import type { Permission, PermissionsAction, SchemaOverview } from '@directus/shared/types';
 /**
  * Reduces the schema based on the included permissions. The resulting object is the schema structure, but with only
  * the allowed collections/fields/relations included based on the permissions.

package/dist/utils/reduce-schema.js

@@ -10,12 +10,13 @@ const lodash_1 = require("lodash");
  * @returns Reduced schema
  */
 function reduceSchema(schema, permissions, actions = ['create', 'read', 'update', 'delete']) {
-    var _a, _b, _c;
     const reduced = {
         collections: {},
         relations: [],
     };
-    const allowedFieldsInCollection = (_a = permissions === null || permissions === void 0 ? void 0 : permissions.filter((permission) => actions.includes(permission.action)).reduce((acc, permission) => {
+    const allowedFieldsInCollection = permissions
+        ?.filter((permission) => actions.includes(permission.action))
+        .reduce((acc, permission) => {
         if (!acc[permission.collection]) {
             acc[permission.collection] = [];
         }
@@ -23,20 +24,20 @@ function reduceSchema(schema, permissions, actions = ['create', 'read', 'update'
             acc[permission.collection] = (0, lodash_1.uniq)([...acc[permission.collection], ...permission.fields]);
         }
         return acc;
-    }, {})) !== null && _a !== void 0 ? _a : {};
+    }, {}) ?? {};
     for (const [collectionName, collection] of Object.entries(schema.collections)) {
-        if (!(permissions === null || permissions === void 0 ? void 0 : permissions.some((permission) => permission.collection === collectionName && actions.includes(permission.action)))) {
+        if (!permissions?.some((permission) => permission.collection === collectionName && actions.includes(permission.action))) {
             continue;
         }
         const fields = {};
         for (const [fieldName, field] of Object.entries(schema.collections[collectionName].fields)) {
-            if (!((_b = allowedFieldsInCollection[collectionName]) === null || _b === void 0 ? void 0 : _b.includes('*')) &&
-                !((_c = allowedFieldsInCollection[collectionName]) === null || _c === void 0 ? void 0 : _c.includes(fieldName))) {
+            if (!allowedFieldsInCollection[collectionName]?.includes('*') &&
+                !allowedFieldsInCollection[collectionName]?.includes(fieldName)) {
                 continue;
             }
-            const o2mRelation = schema.relations.find((relation) => { var _a; return relation.related_collection === collectionName && ((_a = relation.meta) === null || _a === void 0 ? void 0 : _a.one_field) === fieldName; });
+            const o2mRelation = schema.relations.find((relation) => relation.related_collection === collectionName && relation.meta?.one_field === fieldName);
             if (o2mRelation &&
-                !(permissions === null || permissions === void 0 ? void 0 : permissions.some((permission) => permission.collection === o2mRelation.collection && actions.includes(permission.action)))) {
+                !permissions?.some((permission) => permission.collection === o2mRelation.collection && actions.includes(permission.action))) {
                 continue;
             }
             fields[fieldName] = field;
@@ -47,7 +48,6 @@ function reduceSchema(schema, permissions, actions = ['create', 'read', 'update'
         };
     }
     reduced.relations = schema.relations.filter((relation) => {
-        var _a, _b, _c;
         let collectionsAllowed = true;
         let fieldsAllowed = true;
         if (Object.keys(allowedFieldsInCollection).includes(relation.collection) === false) {
@@ -59,7 +59,7 @@ function reduceSchema(schema, permissions, actions = ['create', 'read', 'update'
                 allowedFieldsInCollection[relation.related_collection].length === 0)) {
             collectionsAllowed = false;
         }
-        if (((_a = relation.meta) === null || _a === void 0 ? void 0 : _a.one_allowed_collections) &&
+        if (relation.meta?.one_allowed_collections &&
             relation.meta.one_allowed_collections.every((collection) => Object.keys(allowedFieldsInCollection).includes(collection)) === false) {
             collectionsAllowed = false;
         }
@@ -69,10 +69,10 @@ function reduceSchema(schema, permissions, actions = ['create', 'read', 'update'
             fieldsAllowed = false;
         }
         if (relation.related_collection &&
-            ((_b = relation.meta) === null || _b === void 0 ? void 0 : _b.one_field) &&
+            relation.meta?.one_field &&
             (!allowedFieldsInCollection[relation.related_collection] ||
                 (allowedFieldsInCollection[relation.related_collection].includes('*') === false &&
-                    allowedFieldsInCollection[relation.related_collection].includes((_c = relation.meta) === null || _c === void 0 ? void 0 : _c.one_field) === false))) {
+                    allowedFieldsInCollection[relation.related_collection].includes(relation.meta?.one_field) === false))) {
             fieldsAllowed = false;
         }
         return collectionsAllowed && fieldsAllowed;

package/dist/utils/sanitize-query.d.ts

@@ -1,2 +1,2 @@
-import { Accountability, Query } from '@directus/shared/types';
+import type { Accountability, Query } from '@directus/shared/types';
 export declare function sanitizeQuery(rawQuery: Record<string, any>, accountability?: Accountability | null): Query;

package/dist/utils/sanitize-query.js

@@ -59,7 +59,7 @@ function sanitizeQuery(rawQuery, accountability) {
 exports.sanitizeQuery = sanitizeQuery;
 function sanitizeFields(rawFields) {
     if (!rawFields)
-        return;
+        return null;
     let fields = [];
     if (typeof rawFields === 'string')
         fields = rawFields.split(',');

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

@@ -1,5 +1,5 @@
-import { Field, Relation } from '@directus/shared/types';
-import { Collection } from '../types';
+import type { Field, Relation } from '@directus/shared/types';
+import type { Collection } from '../types';
 /**
  * Pick certain database vendor specific collection properties that should be compared when performing diff
  *

package/dist/utils/should-skip-cache.d.ts

@@ -0,0 +1,7 @@
+import type { Request } from 'express';
+/**
+ * Whether to skip caching for the current request
+ *
+ * @param req Express request object
+ */
+export declare function shouldSkipCache(req: Request): boolean;

package/dist/utils/should-skip-cache.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.shouldSkipCache = void 0;
+const env_1 = require("../env");
+const url_1 = require("./url");
+/**
+ * Whether to skip caching for the current request
+ *
+ * @param req Express request object
+ */
+function shouldSkipCache(req) {
+    const env = (0, env_1.getEnv)();
+    // Always skip cache for requests coming from the data studio based on Referer header
+    const adminUrl = new url_1.Url(env.PUBLIC_URL).addPath('admin').toString();
+    if (req.get('Referer')?.startsWith(adminUrl))
+        return true;
+    if (env.CACHE_SKIP_ALLOWED && req.get('cache-control')?.includes('no-store'))
+        return true;
+    return false;
+}
+exports.shouldSkipCache = shouldSkipCache;

package/dist/utils/should-skip-cache.test.d.ts

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

package/dist/utils/transformations.d.ts

@@ -1,4 +1,4 @@
-import { File, Transformation, TransformationParams, TransformationPreset } from '../types';
+import type { File, Transformation, TransformationParams, TransformationPreset } from '../types';
 export declare function resolvePreset(input: TransformationParams | TransformationPreset, file: File): Transformation[];
 /**
  * Try to extract a file format from an array of `Transformation`'s.

package/dist/utils/transformations.js

@@ -4,9 +4,8 @@ exports.maybeExtractFormat = exports.resolvePreset = void 0;
 const lodash_1 = require("lodash");
 // Extract transforms from a preset
 function resolvePreset(input, file) {
-    var _a;
     // Do the format conversion last
-    return [extractResize(input), ...((_a = input.transforms) !== null && _a !== void 0 ? _a : []), extractToFormat(input, file)].filter((transform) => transform !== undefined);
+    return [extractResize(input), ...(input.transforms ?? []), extractToFormat(input, file)].filter((transform) => transform !== undefined);
 }
 exports.resolvePreset = resolvePreset;
 function extractOptions(keys, numberKeys = [], booleanKeys = []) {
@@ -49,9 +48,8 @@ function extractResize(input) {
  * Try to extract a file format from an array of `Transformation`'s.
  */
 function maybeExtractFormat(transforms) {
-    var _a;
     const toFormats = transforms.filter((t) => t[0] === 'toFormat');
     const lastToFormat = toFormats[toFormats.length - 1];
-    return lastToFormat ? (_a = lastToFormat[1]) === null || _a === void 0 ? void 0 : _a.toString() : undefined;
+    return lastToFormat ? lastToFormat[1]?.toString() : undefined;
 }
 exports.maybeExtractFormat = maybeExtractFormat;

package/dist/utils/url.js

@@ -3,6 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Url = void 0;
 const url_1 = require("url");
 class Url {
+    protocol;
+    host;
+    port;
+    path;
+    query;
+    hash;
     constructor(url) {
         const parsedUrl = new url_1.URL(url, 'http://localhost');
         const isProtocolRelative = /^\/\//.test(url);
@@ -44,9 +50,8 @@ class Url {
         return this;
     }
     toString({ rootRelative } = { rootRelative: false }) {
-        var _a;
         const protocol = this.protocol !== null ? `${this.protocol}:` : '';
-        const host = (_a = this.host) !== null && _a !== void 0 ? _a : '';
+        const host = this.host ?? '';
         const port = this.port !== null ? `:${this.port}` : '';
         const origin = `${this.host !== null ? `${protocol}//` : ''}${host}${port}`;
         const path = this.path.length ? `/${this.path.join('/')}` : '';

package/dist/utils/user-name.d.ts

@@ -1,2 +1,2 @@
-import { User } from '@directus/shared/types';
+import type { User } from '@directus/shared/types';
 export declare function userName(user: Partial<User>): string;

package/dist/utils/validate-diff.js

@@ -37,7 +37,7 @@ const applyJoiSchema = joi_1.default.object({
             .items(joi_1.default.object({
             collection: joi_1.default.string().required(),
             field: joi_1.default.string().required(),
-            related_collection: joi_1.default.string(),
+            related_collection: joi_1.default.string().allow(null),
             diff: joi_1.default.array().items(deepDiffSchema).required(),
         }))
             .required(),
@@ -49,7 +49,6 @@ const applyJoiSchema = joi_1.default.object({
  * @returns True if the diff can be applied (valid & not empty).
  */
 function validateApplyDiff(applyDiff, currentSnapshotWithHash) {
-    var _a, _b, _c, _d, _e, _f;
     const { error } = applyJoiSchema.validate(applyDiff);
     if (error)
         throw new index_1.InvalidPayloadException(error.message);
@@ -64,13 +63,13 @@ function validateApplyDiff(applyDiff, currentSnapshotWithHash) {
         return true;
     for (const diffCollection of applyDiff.diff.collections) {
         const collection = diffCollection.collection;
-        if (((_a = diffCollection.diff[0]) === null || _a === void 0 ? void 0 : _a.kind) === snapshot_1.DiffKind.NEW) {
+        if (diffCollection.diff[0]?.kind === snapshot_1.DiffKind.NEW) {
             const existingCollection = currentSnapshotWithHash.collections.find((c) => c.collection === diffCollection.collection);
             if (existingCollection) {
                 throw new index_1.InvalidPayloadException(`Provided diff is trying to create collection "${collection}" but it already exists. Please generate a new diff and try again.`);
             }
         }
-        else if (((_b = diffCollection.diff[0]) === null || _b === void 0 ? void 0 : _b.kind) === snapshot_1.DiffKind.DELETE) {
+        else if (diffCollection.diff[0]?.kind === snapshot_1.DiffKind.DELETE) {
             const existingCollection = currentSnapshotWithHash.collections.find((c) => c.collection === diffCollection.collection);
             if (!existingCollection) {
                 throw new index_1.InvalidPayloadException(`Provided diff is trying to delete collection "${collection}" but it does not exist. Please generate a new diff and try again.`);
@@ -79,13 +78,13 @@ function validateApplyDiff(applyDiff, currentSnapshotWithHash) {
     }
     for (const diffField of applyDiff.diff.fields) {
         const field = `${diffField.collection}.${diffField.field}`;
-        if (((_c = diffField.diff[0]) === null || _c === void 0 ? void 0 : _c.kind) === snapshot_1.DiffKind.NEW) {
+        if (diffField.diff[0]?.kind === snapshot_1.DiffKind.NEW) {
             const existingField = currentSnapshotWithHash.fields.find((f) => f.collection === diffField.collection && f.field === diffField.field);
             if (existingField) {
                 throw new index_1.InvalidPayloadException(`Provided diff is trying to create field "${field}" but it already exists. Please generate a new diff and try again.`);
             }
         }
-        else if (((_d = diffField.diff[0]) === null || _d === void 0 ? void 0 : _d.kind) === snapshot_1.DiffKind.DELETE) {
+        else if (diffField.diff[0]?.kind === snapshot_1.DiffKind.DELETE) {
             const existingField = currentSnapshotWithHash.fields.find((f) => f.collection === diffField.collection && f.field === diffField.field);
             if (!existingField) {
                 throw new index_1.InvalidPayloadException(`Provided diff is trying to delete field "${field}" but it does not exist. Please generate a new diff and try again.`);
@@ -96,13 +95,13 @@ function validateApplyDiff(applyDiff, currentSnapshotWithHash) {
         let relation = `${diffRelation.collection}.${diffRelation.field}`;
         if (diffRelation.related_collection)
             relation += `-> ${diffRelation.related_collection}`;
-        if (((_e = diffRelation.diff[0]) === null || _e === void 0 ? void 0 : _e.kind) === snapshot_1.DiffKind.NEW) {
+        if (diffRelation.diff[0]?.kind === snapshot_1.DiffKind.NEW) {
             const existingRelation = currentSnapshotWithHash.relations.find((r) => r.collection === diffRelation.collection && r.field === diffRelation.field);
             if (existingRelation) {
                 throw new index_1.InvalidPayloadException(`Provided diff is trying to create relation "${relation}" but it already exists. Please generate a new diff and try again.`);
             }
         }
-        else if (((_f = diffRelation.diff[0]) === null || _f === void 0 ? void 0 : _f.kind) === snapshot_1.DiffKind.DELETE) {
+        else if (diffRelation.diff[0]?.kind === snapshot_1.DiffKind.DELETE) {
             const existingRelation = currentSnapshotWithHash.relations.find((r) => r.collection === diffRelation.collection && r.field === diffRelation.field);
             if (!existingRelation) {
                 throw new index_1.InvalidPayloadException(`Provided diff is trying to delete relation "${relation}" but it does not exist. Please generate a new diff and try again.`);

package/dist/utils/validate-keys.d.ts

@@ -1,5 +1,5 @@
-import { SchemaOverview } from '@directus/shared/types';
-import { PrimaryKey } from '../types';
+import type { SchemaOverview } from '@directus/shared/types';
+import type { PrimaryKey } from '../types';
 /**
  * Validate keys based on its type
  */

package/dist/utils/validate-keys.js

@@ -4,8 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateKeys = void 0;
-const exceptions_1 = require("../exceptions");
 const uuid_validate_1 = __importDefault(require("uuid-validate"));
+const exceptions_1 = require("../exceptions");
 /**
  * Validate keys based on its type
  */

package/dist/utils/validate-query.d.ts

@@ -1,2 +1,2 @@
-import { Query } from '@directus/shared/types';
+import type { Query } from '@directus/shared/types';
 export declare function validateQuery(query: Query): Query;

package/dist/utils/validate-query.js

@@ -6,10 +6,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateQuery = void 0;
 const joi_1 = __importDefault(require("joi"));
 const lodash_1 = require("lodash");
-const exceptions_1 = require("../exceptions");
 const wellknown_1 = require("wellknown");
-const calculate_field_depth_1 = require("./calculate-field-depth");
 const env_1 = __importDefault(require("../env"));
+const exceptions_1 = require("../exceptions");
+const calculate_field_depth_1 = require("./calculate-field-depth");
 const querySchema = joi_1.default.object({
     fields: joi_1.default.array().items(joi_1.default.string()),
     group: joi_1.default.array().items(joi_1.default.string()),

package/dist/webhooks.js

@@ -82,7 +82,7 @@ function createHandler(webhook, event) {
 }
 function mergeHeaders(headerArray) {
     const headers = {};
-    for (const { header, value } of headerArray !== null && headerArray !== void 0 ? headerArray : []) {
+    for (const { header, value } of headerArray ?? []) {
         headers[header] = value;
     }
     return headers;