directus 9.23.1 → 9.23.3

package/dist/utils/get-ast-from-query.js

@@ -3,18 +3,17 @@
  * Generate an AST based on a given collection and query
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+const constants_1 = require("@directus/shared/constants");
 const lodash_1 = require("lodash");
 const get_relation_type_1 = require("../utils/get-relation-type");
-const constants_1 = require("@directus/shared/constants");
 async function getASTFromQuery(collection, query, schema, options) {
-    var _a, _b, _c, _d, _e;
     query = (0, lodash_1.cloneDeep)(query);
-    const accountability = options === null || options === void 0 ? void 0 : options.accountability;
-    const action = (options === null || options === void 0 ? void 0 : options.action) || 'read';
+    const accountability = options?.accountability;
+    const action = options?.action || 'read';
     const permissions = accountability && accountability.admin !== true
-        ? (_b = (_a = accountability === null || accountability === void 0 ? void 0 : accountability.permissions) === null || _a === void 0 ? void 0 : _a.filter((permission) => {
+        ? accountability?.permissions?.filter((permission) => {
             return permission.action === action;
-        })) !== null && _b !== void 0 ? _b : []
+        }) ?? []
         : null;
     const ast = {
         type: 'root',
@@ -49,24 +48,23 @@ async function getASTFromQuery(collection, query, schema, options) {
         // We'll default to the primary key for the standard sort output
         let sortField = schema.collections[collection].primary;
         // If a custom manual sort field is configured, use that
-        if ((_c = schema.collections[collection]) === null || _c === void 0 ? void 0 : _c.sortField) {
+        if (schema.collections[collection]?.sortField) {
             sortField = schema.collections[collection].sortField;
         }
         // When group by is used, default to the first column provided in the group by clause
-        if ((_d = query.group) === null || _d === void 0 ? void 0 : _d[0]) {
+        if (query.group?.[0]) {
             sortField = query.group[0];
         }
         query.sort = [sortField];
     }
     // When no group by is supplied, but an aggregate function is used, only a single row will be
     // returned. In those cases, we'll ignore the sort field altogether
-    if (query.aggregate && Object.keys(query.aggregate).length && !((_e = query.group) === null || _e === void 0 ? void 0 : _e[0])) {
+    if (query.aggregate && Object.keys(query.aggregate).length && !query.group?.[0]) {
         delete query.sort;
     }
     ast.children = await parseFields(collection, fields, deep);
     return ast;
     async function parseFields(parentCollection, fields, deep) {
-        var _a, _b;
         if (!fields)
             return [];
         fields = await convertWildcards(parentCollection, fields);
@@ -85,7 +83,7 @@ async function getASTFromQuery(collection, query, schema, options) {
             const isRelational = name.includes('.') ||
                 // We'll always treat top level o2m fields as a related item. This is an alias field, otherwise it won't return
                 // anything
-                !!schema.relations.find((relation) => { var _a; return relation.related_collection === parentCollection && ((_a = relation.meta) === null || _a === void 0 ? void 0 : _a.one_field) === name; });
+                !!schema.relations.find((relation) => relation.related_collection === parentCollection && relation.meta?.one_field === name);
             if (isRelational) {
                 // field is relational
                 const parts = fieldKey.split('.');
@@ -123,7 +121,7 @@ async function getASTFromQuery(collection, query, schema, options) {
                     const columnName = fieldKey.match(constants_1.REGEX_BETWEEN_PARENS)[1];
                     const foundField = schema.collections[parentCollection].fields[columnName];
                     if (foundField && foundField.type === 'alias') {
-                        const foundRelation = schema.relations.find((relation) => { var _a; return relation.related_collection === parentCollection && ((_a = relation.meta) === null || _a === void 0 ? void 0 : _a.one_field) === columnName; });
+                        const foundRelation = schema.relations.find((relation) => relation.related_collection === parentCollection && relation.meta?.one_field === columnName);
                         if (foundRelation) {
                             children.push({
                                 type: 'functionField',
@@ -173,8 +171,8 @@ async function getASTFromQuery(collection, query, schema, options) {
                     relation: relation,
                 };
                 for (const relatedCollection of allowedCollections) {
-                    child.children[relatedCollection] = await parseFields(relatedCollection, Array.isArray(nestedFields) ? nestedFields : nestedFields[relatedCollection] || ['*'], deep === null || deep === void 0 ? void 0 : deep[`${fieldKey}:${relatedCollection}`]);
-                    child.query[relatedCollection] = getDeepQuery((deep === null || deep === void 0 ? void 0 : deep[`${fieldKey}:${relatedCollection}`]) || {});
+                    child.children[relatedCollection] = await parseFields(relatedCollection, Array.isArray(nestedFields) ? nestedFields : nestedFields[relatedCollection] || [], deep?.[`${fieldKey}:${relatedCollection}`]);
+                    child.query[relatedCollection] = getDeepQuery(deep?.[`${fieldKey}:${relatedCollection}`] || {});
                     child.relatedKey[relatedCollection] = schema.collections[relatedCollection].primary;
                 }
             }
@@ -183,7 +181,7 @@ async function getASTFromQuery(collection, query, schema, options) {
                     continue;
                 }
                 // update query alias for children parseFields
-                const deepAlias = (_a = getDeepQuery((deep === null || deep === void 0 ? void 0 : deep[fieldKey]) || {})) === null || _a === void 0 ? void 0 : _a.alias;
+                const deepAlias = getDeepQuery(deep?.[fieldKey] || {})?.alias;
                 if (!(0, lodash_1.isEmpty)(deepAlias))
                     query.alias = deepAlias;
                 child = {
@@ -193,11 +191,11 @@ async function getASTFromQuery(collection, query, schema, options) {
                     parentKey: schema.collections[parentCollection].primary,
                     relatedKey: schema.collections[relatedCollection].primary,
                     relation: relation,
-                    query: getDeepQuery((deep === null || deep === void 0 ? void 0 : deep[fieldKey]) || {}),
-                    children: await parseFields(relatedCollection, nestedFields, (deep === null || deep === void 0 ? void 0 : deep[fieldKey]) || {}),
+                    query: getDeepQuery(deep?.[fieldKey] || {}),
+                    children: await parseFields(relatedCollection, nestedFields, deep?.[fieldKey] || {}),
                 };
                 if (relationType === 'o2m' && !child.query.sort) {
-                    child.query.sort = [((_b = relation.meta) === null || _b === void 0 ? void 0 : _b.sort_field) || schema.collections[relation.collection].primary];
+                    child.query.sort = [relation.meta?.sort_field || schema.collections[relation.collection].primary];
                 }
             }
             if (child) {
@@ -214,12 +212,11 @@ async function getASTFromQuery(collection, query, schema, options) {
         });
     }
     async function convertWildcards(parentCollection, fields) {
-        var _a, _b, _c;
         fields = (0, lodash_1.cloneDeep)(fields);
         const fieldsInCollection = Object.entries(schema.collections[parentCollection].fields).map(([name]) => name);
         let allowedFields = fieldsInCollection;
         if (permissions) {
-            const permittedFields = (_a = permissions.find((permission) => parentCollection === permission.collection)) === null || _a === void 0 ? void 0 : _a.fields;
+            const permittedFields = permissions.find((permission) => parentCollection === permission.collection)?.fields;
             if (permittedFields !== undefined)
                 allowedFields = permittedFields;
         }
@@ -233,7 +230,7 @@ async function getASTFromQuery(collection, query, schema, options) {
             if (fieldKey.includes('*') === false)
                 continue;
             if (fieldKey === '*') {
-                const aliases = Object.keys((_b = query.alias) !== null && _b !== void 0 ? _b : {});
+                const aliases = Object.keys(query.alias ?? {});
                 // Set to all fields in collection
                 if (allowedFields.includes('*')) {
                     fields.splice(index, 1, ...fieldsInCollection, ...aliases);
@@ -254,13 +251,12 @@ async function getASTFromQuery(collection, query, schema, options) {
                     ? schema.relations
                         .filter((relation) => relation.collection === parentCollection || relation.related_collection === parentCollection)
                         .map((relation) => {
-                        var _a;
                         const isMany = relation.collection === parentCollection;
-                        return isMany ? relation.field : (_a = relation.meta) === null || _a === void 0 ? void 0 : _a.one_field;
+                        return isMany ? relation.field : relation.meta?.one_field;
                     })
                     : allowedFields.filter((fieldKey) => !!getRelation(parentCollection, fieldKey));
                 const nonRelationalFields = allowedFields.filter((fieldKey) => relationalFields.includes(fieldKey) === false);
-                const aliasFields = Object.keys((_c = query.alias) !== null && _c !== void 0 ? _c : {}).map((fieldKey) => {
+                const aliasFields = Object.keys(query.alias ?? {}).map((fieldKey) => {
                     const name = query.alias[fieldKey];
                     if (relationalFields.includes(name)) {
                         return `${fieldKey}.${parts.slice(1).join('.')}`;
@@ -280,21 +276,19 @@ async function getASTFromQuery(collection, query, schema, options) {
     }
     function getRelation(collection, field) {
         const relation = schema.relations.find((relation) => {
-            var _a;
             return ((relation.collection === collection && relation.field === field) ||
-                (relation.related_collection === collection && ((_a = relation.meta) === null || _a === void 0 ? void 0 : _a.one_field) === field));
+                (relation.related_collection === collection && relation.meta?.one_field === field));
         });
         return relation;
     }
     function getRelatedCollection(collection, field) {
-        var _a;
         const relation = getRelation(collection, field);
         if (!relation)
             return null;
         if (relation.collection === collection && relation.field === field) {
             return relation.related_collection || null;
         }
-        if (relation.related_collection === collection && ((_a = relation.meta) === null || _a === void 0 ? void 0 : _a.one_field) === field) {
+        if (relation.related_collection === collection && relation.meta?.one_field === field) {
             return relation.collection || null;
         }
         return null;

package/dist/utils/get-cache-headers.d.ts

@@ -1,4 +1,4 @@
-import { Request } from 'express';
+import type { Request } from 'express';
 /**
  * Returns the Cache-Control header for the current request
  *

package/dist/utils/get-cache-headers.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCacheControlHeader = void 0;
 const env_1 = __importDefault(require("../env"));
+const should_skip_cache_1 = require("./should-skip-cache");
 /**
  * Returns the Cache-Control header for the current request
  *
@@ -14,10 +15,8 @@ const env_1 = __importDefault(require("../env"));
  * @param personalized Whether requests depend on the authentication status of users
  */
 function getCacheControlHeader(req, ttl, globalCacheSettings, personalized) {
-    var _a, _b, _c;
-    const noCacheRequested = ((_a = req.headers['cache-control']) === null || _a === void 0 ? void 0 : _a.includes('no-store')) || ((_b = req.headers['Cache-Control']) === null || _b === void 0 ? void 0 : _b.includes('no-store'));
     // When the user explicitly asked to skip the cache
-    if (noCacheRequested)
+    if ((0, should_skip_cache_1.shouldSkipCache)(req))
         return 'no-store';
     // When the resource / current request shouldn't be cached
     if (ttl === undefined || ttl < 0)
@@ -29,7 +28,7 @@ function getCacheControlHeader(req, ttl, globalCacheSettings, personalized) {
     // When caching depends on the authentication status of the users
     if (personalized) {
         // Allow response to be stored in shared cache (public) or local cache only (private)
-        const access = !!((_c = req.accountability) === null || _c === void 0 ? void 0 : _c.role) === false ? 'public' : 'private';
+        const access = !!req.accountability?.role === false ? 'public' : 'private';
         headerValues.push(access);
     }
     // Cache control header uses seconds for everything

package/dist/utils/get-cache-key.d.ts

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

package/dist/utils/get-cache-key.js

@@ -8,11 +8,10 @@ const object_hash_1 = __importDefault(require("object-hash"));
 const url_1 = __importDefault(require("url"));
 const get_graphql_query_and_variables_1 = require("./get-graphql-query-and-variables");
 function getCacheKey(req) {
-    var _a;
     const path = url_1.default.parse(req.originalUrl).pathname;
-    const isGraphQl = path === null || path === void 0 ? void 0 : path.startsWith('/graphql');
+    const isGraphQl = path?.startsWith('/graphql');
     const info = {
-        user: ((_a = req.accountability) === null || _a === void 0 ? void 0 : _a.user) || null,
+        user: req.accountability?.user || null,
         path,
         query: isGraphQl ? (0, get_graphql_query_and_variables_1.getGraphqlQueryAndVariables)(req) : req.sanitizedQuery,
     };

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

@@ -1,4 +1,4 @@
-import { AliasMap } from './get-column-path';
+import type { AliasMap } from './get-column-path';
 /**
  * Extract the collection of an alias within an aliasMap
  * For example: 'ljnsv.name' -> 'authors'

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

@@ -1,4 +1,4 @@
-import { Relation, SchemaOverview } from '@directus/shared/types';
+import type { Relation, SchemaOverview } from '@directus/shared/types';
 export type AliasMap = {
     [key: string]: {
         alias: string;
@@ -15,7 +15,7 @@ export type ColPathProps = {
 export type ColPathResult = {
     columnPath: string;
     targetCollection: string;
-    addNestedPkField?: string;
+    addNestedPkField: string | undefined;
 };
 /**
  * Converts a Directus field list path to the correct SQL names based on the constructed alias map.

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

@@ -1,8 +1,8 @@
 "use strict";
 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 get_relation_info_1 = require("./get-relation-info");
 /**
  * Converts a Directus field list path to the correct SQL names based on the constructed alias map.
  * For example: ['author', 'role', 'name'] -> 'ljnsv.name'
@@ -12,7 +12,6 @@ const exceptions_1 = require("../exceptions");
 function getColumnPath({ path, collection, aliasMap, relations, schema }) {
     return followRelation(path);
     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>
          */
@@ -21,7 +20,7 @@ function getColumnPath({ path, collection, aliasMap, relations, schema }) {
         if (!relation) {
             throw new exceptions_1.InvalidQueryException(`"${parentCollection}.${pathRoot}" is not a relational field`);
         }
-        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 alias = parentFields ? aliasMap[`${parentFields}.${pathParts[0]}`]?.alias : aliasMap[pathParts[0]]?.alias;
         const remainingParts = pathParts.slice(1);
         let parent;
         if (relationType === 'a2o') {
@@ -38,7 +37,7 @@ function getColumnPath({ path, collection, aliasMap, relations, schema }) {
             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 (schema && !((remainingParts[0] ?? parent).includes('(') && (remainingParts[0] ?? parent).includes(')'))) {
             if (remainingParts.length === 0) {
                 remainingParts.push(schema.collections[parent].primary);
                 addNestedPkField = schema.collections[parent].primary;

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

@@ -1,8 +1,8 @@
-import { Query, SchemaOverview } from '@directus/shared/types';
-import { Knex } from 'knex';
+import type { Query, SchemaOverview } from '@directus/shared/types';
+import type { Knex } from 'knex';
 type GetColumnOptions = {
-    query?: Query;
-    originalCollectionName?: string;
+    query?: Query | undefined;
+    originalCollectionName?: string | undefined;
 };
 /**
  * Return column prefixed by table. If column includes functions (like `year(date_created)`), the

package/dist/utils/get-column.js

@@ -19,22 +19,21 @@ const apply_function_to_column_name_1 = require("./apply-function-to-column-name
  * @returns Knex raw instance
  */
 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 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 collectionName = options?.originalCollectionName || table;
+            const type = schema?.collections[collectionName]?.fields?.[columnName]?.type ?? '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: options === null || options === void 0 ? void 0 : options.query,
-                originalCollectionName: options === null || options === void 0 ? void 0 : options.originalCollectionName,
+                query: options?.query,
+                originalCollectionName: options?.originalCollectionName,
             });
             if (alias) {
                 return knex.raw(result + ' AS ??', [alias]);

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

@@ -1,3 +1,3 @@
-import { SchemaOverview } from '@directus/schema/types/overview';
-import { Column } from 'knex-schema-inspector/dist/types/column';
+import type { SchemaOverview } from '@directus/schema/types/overview';
+import type { 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-default-value.js

@@ -8,9 +8,8 @@ const env_1 = __importDefault(require("../env"));
 const logger_1 = __importDefault(require("../logger"));
 const get_local_type_1 = __importDefault(require("./get-local-type"));
 function getDefaultValue(column) {
-    var _a;
     const type = (0, get_local_type_1.default)(column);
-    const defaultValue = (_a = column.default_value) !== null && _a !== void 0 ? _a : null;
+    const defaultValue = column.default_value ?? null;
     if (defaultValue === null)
         return null;
     if (defaultValue === '0000-00-00 00:00:00')

package/dist/utils/get-graphql-query-and-variables.d.ts

@@ -1,2 +1,2 @@
-import { Request } from 'express';
+import type { Request } from 'express';
 export declare function getGraphqlQueryAndVariables(req: Request): Pick<any, "query" | "variables">;

package/dist/utils/get-graphql-query-and-variables.js

@@ -3,8 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getGraphqlQueryAndVariables = void 0;
 const lodash_1 = require("lodash");
 function getGraphqlQueryAndVariables(req) {
-    var _a;
-    const isGet = ((_a = req.method) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === 'get';
+    const isGet = req.method?.toLowerCase() === 'get';
     return (0, lodash_1.pick)(isGet ? req.query : req.body, ['query', 'variables']);
 }
 exports.getGraphqlQueryAndVariables = getGraphqlQueryAndVariables;

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

@@ -1,3 +1,3 @@
-import { GraphQLScalarType, GraphQLList, GraphQLType } from 'graphql';
-import { Type } from '@directus/shared/types';
+import type { Type } from '@directus/shared/types';
+import { GraphQLList, GraphQLScalarType, GraphQLType } from 'graphql';
 export declare function getGraphQLType(localType: Type | 'alias' | 'unknown', special: string[]): GraphQLScalarType | GraphQLList<GraphQLType>;

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-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,11 +11,11 @@ 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)();

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: [],
@@ -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 });