directus 9.23.1 → 9.23.4

package/dist/utils/get-graphql-type.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getGraphQLType = void 0;
 const graphql_1 = require("graphql");
 const graphql_compose_1 = require("graphql-compose");
+const bigint_1 = require("../services/graphql/types/bigint");
 const date_1 = require("../services/graphql/types/date");
 const geojson_1 = require("../services/graphql/types/geojson");
 const hash_1 = require("../services/graphql/types/hash");
-const bigint_1 = require("../services/graphql/types/bigint");
 function getGraphQLType(localType, special) {
     if (special.includes('conceal')) {
         return hash_1.GraphQLHash;

package/dist/utils/get-ip-from-req.d.ts

@@ -1,2 +1,2 @@
-import { Request } from 'express';
+import type { Request } from 'express';
 export declare function getIPFromReq(req: Request): string;

package/dist/utils/get-ip-from-req.js

@@ -9,8 +9,8 @@ const env_1 = __importDefault(require("../env"));
 const logger_1 = __importDefault(require("../logger"));
 function getIPFromReq(req) {
     let ip = req.ip;
-    if (env_1.default.IP_CUSTOM_HEADER) {
-        const customIPHeaderValue = req.get(env_1.default.IP_CUSTOM_HEADER);
+    if (env_1.default['IP_CUSTOM_HEADER']) {
+        const customIPHeaderValue = req.get(env_1.default['IP_CUSTOM_HEADER']);
         if (typeof customIPHeaderValue === 'string' && (0, net_1.isIP)(customIPHeaderValue) !== 0) {
             ip = customIPHeaderValue;
         }

package/dist/utils/get-local-type.d.ts

@@ -1,4 +1,4 @@
-import { FieldMeta, Type } from '@directus/shared/types';
+import type { FieldMeta, Type } from '@directus/shared/types';
 export default function getLocalType(column?: {
     data_type: string;
     numeric_precision?: null | number;

package/dist/utils/get-local-type.js

@@ -100,7 +100,7 @@ function getLocalType(column, field) {
         return 'alias';
     const dataType = column.data_type.toLowerCase();
     const type = localTypeMap[dataType.split('(')[0]];
-    const special = field === null || field === void 0 ? void 0 : field.special;
+    const special = field?.special;
     if (special) {
         if (special.includes('cast-json'))
             return 'json';
@@ -114,7 +114,7 @@ function getLocalType(column, field) {
             return 'timestamp';
         if (special.includes('cast-datetime'))
             return 'dateTime';
-        if (type === null || type === void 0 ? void 0 : type.startsWith('geometry')) {
+        if (type?.startsWith('geometry')) {
             return special[0] || 'geometry';
         }
     }
@@ -126,6 +126,6 @@ function getLocalType(column, field) {
     if (column.data_type === 'nvarchar' && column.max_length === -1) {
         return 'text';
     }
-    return type !== null && type !== void 0 ? type : 'unknown';
+    return type ?? 'unknown';
 }
 exports.default = getLocalType;

package/dist/utils/get-milliseconds.js

@@ -6,10 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getMilliseconds = void 0;
 const ms_1 = __importDefault(require("ms"));
 function getMilliseconds(value, fallback = undefined) {
-    var _a;
     if ((typeof value !== 'string' && typeof value !== 'number') || value === '') {
         return fallback;
     }
-    return (_a = (0, ms_1.default)(String(value))) !== null && _a !== void 0 ? _a : fallback;
+    return (0, ms_1.default)(String(value)) ?? fallback;
 }
 exports.getMilliseconds = getMilliseconds;

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

@@ -1,2 +1,2 @@
-import { Accountability, Permission, SchemaOverview } from '@directus/shared/types';
+import type { Accountability, Permission, SchemaOverview } from '@directus/shared/types';
 export declare function getPermissions(accountability: Accountability, schema: SchemaOverview): Promise<Permission[]>;

package/dist/utils/get-permissions.js

@@ -11,18 +11,18 @@ const cache_1 = require("../cache");
 const database_1 = __importDefault(require("../database"));
 const app_access_permissions_1 = require("../database/system-data/app-access-permissions");
 const env_1 = __importDefault(require("../env"));
+const logger_1 = __importDefault(require("../logger"));
 const roles_1 = require("../services/roles");
 const users_1 = require("../services/users");
 const merge_permissions_1 = require("../utils/merge-permissions");
 const merge_permissions_for_share_1 = require("./merge-permissions-for-share");
-const logger_1 = __importDefault(require("../logger"));
 async function getPermissions(accountability, schema) {
     const database = (0, database_1.default)();
     const { cache } = (0, cache_1.getCache)();
     let permissions = [];
     const { user, role, app, admin, share_scope } = accountability;
     const cacheKey = `permissions-${(0, object_hash_1.default)({ user, role, app, admin, share_scope })}`;
-    if (cache && env_1.default.CACHE_PERMISSIONS !== false) {
+    if (cache && env_1.default['CACHE_PERMISSIONS'] !== false) {
         let cachedPermissions;
         try {
             cachedPermissions = await (0, cache_1.getSystemCache)(cacheKey);
@@ -31,20 +31,20 @@ async function getPermissions(accountability, schema) {
             logger_1.default.warn(err, `[cache] Couldn't read key ${cacheKey}. ${err.message}`);
         }
         if (cachedPermissions) {
-            if (!cachedPermissions.containDynamicData) {
-                return processPermissions(accountability, cachedPermissions.permissions, {});
+            if (!cachedPermissions['containDynamicData']) {
+                return processPermissions(accountability, cachedPermissions['permissions'], {});
             }
-            const cachedFilterContext = await (0, cache_1.getCacheValue)(cache, `filterContext-${(0, object_hash_1.default)({ user, role, permissions: cachedPermissions.permissions })}`);
+            const cachedFilterContext = await (0, cache_1.getCacheValue)(cache, `filterContext-${(0, object_hash_1.default)({ user, role, permissions: cachedPermissions['permissions'] })}`);
             if (cachedFilterContext) {
-                return processPermissions(accountability, cachedPermissions.permissions, cachedFilterContext);
+                return processPermissions(accountability, cachedPermissions['permissions'], cachedFilterContext);
             }
             else {
-                const { permissions: parsedPermissions, requiredPermissionData, containDynamicData, } = parsePermissions(cachedPermissions.permissions);
+                const { permissions: parsedPermissions, requiredPermissionData, containDynamicData, } = parsePermissions(cachedPermissions['permissions']);
                 permissions = parsedPermissions;
                 const filterContext = containDynamicData
                     ? await getFilterContext(schema, accountability, requiredPermissionData)
                     : {};
-                if (containDynamicData && env_1.default.CACHE_ENABLED !== false) {
+                if (containDynamicData && env_1.default['CACHE_ENABLED'] !== false) {
                     await (0, cache_1.setCacheValue)(cache, `filterContext-${(0, object_hash_1.default)({ user, role, permissions })}`, filterContext);
                 }
                 return processPermissions(accountability, permissions, filterContext);
@@ -71,9 +71,9 @@ async function getPermissions(accountability, schema) {
         const filterContext = containDynamicData
             ? await getFilterContext(schema, accountability, requiredPermissionData)
             : {};
-        if (cache && env_1.default.CACHE_PERMISSIONS !== false) {
+        if (cache && env_1.default['CACHE_PERMISSIONS'] !== false) {
             await (0, cache_1.setSystemCache)(cacheKey, { permissions, containDynamicData });
-            if (containDynamicData && env_1.default.CACHE_ENABLED !== false) {
+            if (containDynamicData && env_1.default['CACHE_ENABLED'] !== false) {
                 await (0, cache_1.setCacheValue)(cache, `filterContext-${(0, object_hash_1.default)({ user, role, permissions })}`, filterContext);
             }
         }
@@ -137,12 +137,12 @@ async function getFilterContext(schema, accountability, requiredPermissionData)
     const rolesService = new roles_1.RolesService({ schema });
     const filterContext = {};
     if (accountability.user && requiredPermissionData.$CURRENT_USER.length > 0) {
-        filterContext.$CURRENT_USER = await usersService.readOne(accountability.user, {
+        filterContext['$CURRENT_USER'] = await usersService.readOne(accountability.user, {
             fields: requiredPermissionData.$CURRENT_USER,
         });
     }
     if (accountability.role && requiredPermissionData.$CURRENT_ROLE.length > 0) {
-        filterContext.$CURRENT_ROLE = await rolesService.readOne(accountability.role, {
+        filterContext['$CURRENT_ROLE'] = await rolesService.readOne(accountability.role, {
             fields: requiredPermissionData.$CURRENT_ROLE,
         });
     }

package/dist/utils/get-relation-info.d.ts

@@ -1,4 +1,4 @@
-import { Relation } from '@directus/shared/types';
+import type { Relation } from '@directus/shared/types';
 type RelationInfo = {
     relation: Relation | null;
     relationType: string | null;

package/dist/utils/get-relation-info.js

@@ -9,7 +9,6 @@ function checkImplicitRelation(field) {
     return null;
 }
 function getRelationInfo(relations, collection, field) {
-    var _a;
     if (field.startsWith('$FOLLOW') && field.length > 500) {
         throw new Error(`Implicit $FOLLOW statement is too big to parse. Got: "${field.substring(500)}..."`);
     }
@@ -40,11 +39,10 @@ function getRelationInfo(relations, collection, field) {
             return { relation, relationType: 'o2a' };
         }
     }
-    const relation = (_a = relations.find((relation) => {
-        var _a;
+    const relation = relations.find((relation) => {
         return ((relation.collection === collection && relation.field === field) ||
-            (relation.related_collection === collection && ((_a = relation.meta) === null || _a === void 0 ? void 0 : _a.one_field) === field));
-    })) !== null && _a !== void 0 ? _a : null;
+            (relation.related_collection === collection && relation.meta?.one_field === field));
+    }) ?? null;
     const relationType = relation ? (0, get_relation_type_1.getRelationType)({ relation, collection, field }) : null;
     return { relation, relationType };
 }

package/dist/utils/get-relation-type.d.ts

@@ -1,4 +1,4 @@
-import { Relation } from '@directus/shared/types';
+import type { Relation } from '@directus/shared/types';
 export declare function getRelationType(getRelationOptions: {
     relation?: Relation | null;
     collection: string | null;

package/dist/utils/get-relation-type.js

@@ -2,20 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRelationType = void 0;
 function getRelationType(getRelationOptions) {
-    var _a, _b, _c;
     const { relation, collection, field } = getRelationOptions;
     if (!relation)
         return null;
     if (relation.collection === collection &&
         relation.field === field &&
-        ((_a = relation.meta) === null || _a === void 0 ? void 0 : _a.one_collection_field) &&
-        ((_b = relation.meta) === null || _b === void 0 ? void 0 : _b.one_allowed_collections)) {
+        relation.meta?.one_collection_field &&
+        relation.meta?.one_allowed_collections) {
         return 'a2o';
     }
     if (relation.collection === collection && relation.field === field) {
         return 'm2o';
     }
-    if (relation.related_collection === collection && ((_c = relation.meta) === null || _c === void 0 ? void 0 : _c.one_field) === field) {
+    if (relation.related_collection === collection && relation.meta?.one_field === field) {
         return 'o2m';
     }
     return null;

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

@@ -1,5 +1,5 @@
-import { SchemaOverview } from '@directus/shared/types';
-import { Knex } from 'knex';
+import type { SchemaOverview } from '@directus/shared/types';
+import type { Knex } from 'knex';
 export declare function getSchema(options?: {
     database?: Knex;
     /**

package/dist/utils/get-schema.js

@@ -18,13 +18,13 @@ const services_1 = require("../services");
 const get_default_value_1 = __importDefault(require("./get-default-value"));
 const get_local_type_1 = __importDefault(require("./get-local-type"));
 async function getSchema(options) {
-    const database = (options === null || options === void 0 ? void 0 : options.database) || (0, database_1.default)();
+    const database = options?.database || (0, database_1.default)();
     const schemaInspector = (0, schema_1.default)(database);
     let result;
-    if (!(options === null || options === void 0 ? void 0 : options.bypassCache) && env_1.default.CACHE_SCHEMA !== false) {
+    if (!options?.bypassCache && env_1.default['CACHE_SCHEMA'] !== false) {
         let cachedSchema;
         try {
-            cachedSchema = (await (0, cache_1.getSystemCache)('schema'));
+            cachedSchema = await (0, cache_1.getSchemaCache)();
         }
         catch (err) {
             logger_1.default.warn(err, `[schema-cache] Couldn't retrieve cache. ${err}`);
@@ -35,7 +35,7 @@ async function getSchema(options) {
         else {
             result = await getDatabaseSchema(database, schemaInspector);
             try {
-                await (0, cache_1.setSystemCache)('schema', result);
+                await (0, cache_1.setSchemaCache)(result);
             }
             catch (err) {
                 logger_1.default.warn(err, `[schema-cache] Couldn't save cache. ${err}`);
@@ -49,7 +49,6 @@ async function getSchema(options) {
 }
 exports.getSchema = getSchema;
 async function getDatabaseSchema(database, schemaInspector) {
-    var _a, _b, _c, _d, _e, _f;
     const result = {
         collections: {},
         relations: [],
@@ -62,7 +61,7 @@ async function getDatabaseSchema(database, schemaInspector) {
         ...collections_1.systemCollectionRows,
     ];
     for (const [collection, info] of Object.entries(schemaOverview)) {
-        if ((0, utils_1.toArray)(env_1.default.DB_EXCLUDE_TABLES).includes(collection)) {
+        if ((0, utils_1.toArray)(env_1.default['DB_EXCLUDE_TABLES']).includes(collection)) {
             logger_1.default.trace(`Collection "${collection}" is configured to be excluded and will be ignored`);
             continue;
         }
@@ -78,17 +77,16 @@ async function getDatabaseSchema(database, schemaInspector) {
         result.collections[collection] = {
             collection,
             primary: info.primary,
-            singleton: (collectionMeta === null || collectionMeta === void 0 ? void 0 : collectionMeta.singleton) === true || (collectionMeta === null || collectionMeta === void 0 ? void 0 : collectionMeta.singleton) === 'true' || (collectionMeta === null || collectionMeta === void 0 ? void 0 : collectionMeta.singleton) === 1,
-            note: (collectionMeta === null || collectionMeta === void 0 ? void 0 : collectionMeta.note) || null,
-            sortField: (collectionMeta === null || collectionMeta === void 0 ? void 0 : collectionMeta.sort_field) || null,
+            singleton: collectionMeta?.singleton === true || collectionMeta?.singleton === 'true' || collectionMeta?.singleton === 1,
+            note: collectionMeta?.note || null,
+            sortField: collectionMeta?.sort_field || null,
             accountability: collectionMeta ? collectionMeta.accountability : 'all',
             fields: (0, lodash_1.mapValues)(schemaOverview[collection].columns, (column) => {
-                var _a, _b, _c;
                 return {
                     field: column.column_name,
-                    defaultValue: (_a = (0, get_default_value_1.default)(column)) !== null && _a !== void 0 ? _a : null,
-                    nullable: (_b = column.is_nullable) !== null && _b !== void 0 ? _b : true,
-                    generated: (_c = column.is_generated) !== null && _c !== void 0 ? _c : false,
+                    defaultValue: (0, get_default_value_1.default)(column) ?? null,
+                    nullable: column.is_nullable ?? true,
+                    generated: column.is_generated ?? false,
                     type: (0, get_local_type_1.default)(column),
                     dbType: column.data_type,
                     precision: column.numeric_precision || null,
@@ -116,22 +114,22 @@ async function getDatabaseSchema(database, schemaInspector) {
         if (constants_1.ALIAS_TYPES.some((type) => special.includes(type)) === false && !existing)
             continue;
         const type = (existing && (0, get_local_type_1.default)(column, { special })) || 'alias';
-        let validation = (_a = field.validation) !== null && _a !== void 0 ? _a : null;
+        let validation = field.validation ?? null;
         if (validation && typeof validation === 'string')
             validation = (0, utils_1.parseJSON)(validation);
         result.collections[field.collection].fields[field.field] = {
             field: field.field,
-            defaultValue: (_b = existing === null || existing === void 0 ? void 0 : existing.defaultValue) !== null && _b !== void 0 ? _b : null,
-            nullable: (_c = existing === null || existing === void 0 ? void 0 : existing.nullable) !== null && _c !== void 0 ? _c : true,
-            generated: (_d = existing === null || existing === void 0 ? void 0 : existing.generated) !== null && _d !== void 0 ? _d : false,
+            defaultValue: existing?.defaultValue ?? null,
+            nullable: existing?.nullable ?? true,
+            generated: existing?.generated ?? false,
             type: type,
-            dbType: (existing === null || existing === void 0 ? void 0 : existing.dbType) || null,
-            precision: (existing === null || existing === void 0 ? void 0 : existing.precision) || null,
-            scale: (existing === null || existing === void 0 ? void 0 : existing.scale) || null,
+            dbType: existing?.dbType || null,
+            precision: existing?.precision || null,
+            scale: existing?.scale || null,
             special: special,
             note: field.note,
-            alias: (_e = existing === null || existing === void 0 ? void 0 : existing.alias) !== null && _e !== void 0 ? _e : true,
-            validation: (_f = validation) !== null && _f !== void 0 ? _f : null,
+            alias: existing?.alias ?? true,
+            validation: validation ?? null,
         };
     }
     const relationsService = new services_1.RelationsService({ knex: database, schema: result });

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/is-url-allowed.js

@@ -13,7 +13,8 @@ function isUrlAllowed(url, allowList) {
     const urlAllowList = (0, utils_1.toArray)(allowList);
     if (urlAllowList.includes(url))
         return true;
-    const parsedWhitelist = urlAllowList.map((allowedURL) => {
+    const parsedWhitelist = urlAllowList
+        .map((allowedURL) => {
         try {
             const { hostname, pathname } = new url_1.URL(allowedURL);
             return hostname + pathname;
@@ -21,7 +22,9 @@ function isUrlAllowed(url, allowList) {
         catch {
             logger_1.default.warn(`Invalid URL used "${url}"`);
         }
-    });
+        return null;
+    })
+        .filter((f) => f);
     try {
         const { hostname, pathname } = new url_1.URL(url);
         return parsedWhitelist.includes(hostname + pathname);

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/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;