directus 9.22.4 → 9.23.3

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.d.ts

@@ -0,0 +1,4 @@
+/**
+ * Safely parse human readable time format into milliseconds
+ */
+export declare function getMilliseconds<T>(value: unknown, fallback?: T): number | T;

package/dist/utils/get-milliseconds.js

@@ -0,0 +1,14 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getMilliseconds = void 0;
+const ms_1 = __importDefault(require("ms"));
+function getMilliseconds(value, fallback = undefined) {
+    if ((typeof value !== 'string' && typeof value !== 'number') || value === '') {
+        return fallback;
+    }
+    return (0, ms_1.default)(String(value)) ?? fallback;
+}
+exports.getMilliseconds = getMilliseconds;

package/dist/utils/get-milliseconds.test.d.ts

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

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 });

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

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSnapshotDiff = void 0;
 const deep_diff_1 = require("deep-diff");
 const lodash_1 = require("lodash");
+const types_1 = require("../types");
+const sanitize_schema_1 = require("./sanitize-schema");
 function getSnapshotDiff(current, after) {
     const diffedSnapshot = {
         collections: (0, lodash_1.orderBy)([
@@ -10,7 +12,7 @@ function getSnapshotDiff(current, after) {
                 const afterCollection = after.collections.find((afterCollection) => afterCollection.collection === currentCollection.collection);
                 return {
                     collection: currentCollection.collection,
-                    diff: (0, deep_diff_1.diff)(currentCollection, afterCollection),
+                    diff: (0, deep_diff_1.diff)((0, sanitize_schema_1.sanitizeCollection)(currentCollection), (0, sanitize_schema_1.sanitizeCollection)(afterCollection)),
                 };
             }),
             ...after.collections
@@ -20,16 +22,17 @@ function getSnapshotDiff(current, after) {
             })
                 .map((afterCollection) => ({
                 collection: afterCollection.collection,
-                diff: (0, deep_diff_1.diff)(undefined, afterCollection),
+                diff: (0, deep_diff_1.diff)(undefined, (0, sanitize_schema_1.sanitizeCollection)(afterCollection)),
             })),
         ].filter((obj) => Array.isArray(obj.diff)), 'collection'),
         fields: (0, lodash_1.orderBy)([
             ...current.fields.map((currentField) => {
                 const afterField = after.fields.find((afterField) => afterField.collection === currentField.collection && afterField.field === currentField.field);
+                const isAutoIncrementPrimaryKey = !!currentField.schema?.is_primary_key && !!currentField.schema?.has_auto_increment;
                 return {
                     collection: currentField.collection,
                     field: currentField.field,
-                    diff: (0, deep_diff_1.diff)(currentField, afterField),
+                    diff: (0, deep_diff_1.diff)((0, sanitize_schema_1.sanitizeField)(currentField, isAutoIncrementPrimaryKey), (0, sanitize_schema_1.sanitizeField)(afterField, isAutoIncrementPrimaryKey)),
                 };
             }),
             ...after.fields
@@ -40,7 +43,7 @@ function getSnapshotDiff(current, after) {
                 .map((afterField) => ({
                 collection: afterField.collection,
                 field: afterField.field,
-                diff: (0, deep_diff_1.diff)(undefined, afterField),
+                diff: (0, deep_diff_1.diff)(undefined, (0, sanitize_schema_1.sanitizeField)(afterField)),
             })),
         ].filter((obj) => Array.isArray(obj.diff)), ['collection']),
         relations: (0, lodash_1.orderBy)([
@@ -50,7 +53,7 @@ function getSnapshotDiff(current, after) {
                     collection: currentRelation.collection,
                     field: currentRelation.field,
                     related_collection: currentRelation.related_collection,
-                    diff: (0, deep_diff_1.diff)(currentRelation, afterRelation),
+                    diff: (0, deep_diff_1.diff)((0, sanitize_schema_1.sanitizeRelation)(currentRelation), (0, sanitize_schema_1.sanitizeRelation)(afterRelation)),
                 };
             }),
             ...after.relations
@@ -62,7 +65,7 @@ function getSnapshotDiff(current, after) {
                 collection: afterRelation.collection,
                 field: afterRelation.field,
                 related_collection: afterRelation.related_collection,
-                diff: (0, deep_diff_1.diff)(undefined, afterRelation),
+                diff: (0, deep_diff_1.diff)(undefined, (0, sanitize_schema_1.sanitizeRelation)(afterRelation)),
             })),
         ].filter((obj) => Array.isArray(obj.diff)), ['collection']),
     };
@@ -70,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) === 'D'; })
+        .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

@@ -1,18 +1,39 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSnapshot = void 0;
-const database_1 = __importDefault(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 package_json_1 = require("../../package.json");
+const database_1 = __importStar(require("../database"));
+const services_1 = require("../services");
+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 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 database = options?.database ?? (0, database_1.default)();
+    const vendor = (0, database_1.getDatabaseClient)(database);
+    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 });
@@ -30,15 +51,15 @@ async function getSnapshot(options) {
     return {
         version: 1,
         directus: package_json_1.version,
-        collections: collectionsSorted,
-        fields: fieldsSorted,
-        relations: relationsSorted,
+        vendor,
+        collections: collectionsSorted.map((collection) => (0, sanitize_schema_1.sanitizeCollection)(collection)),
+        fields: fieldsSorted.map((field) => (0, sanitize_schema_1.sanitizeField)(field)),
+        relations: relationsSorted.map((relation) => (0, sanitize_schema_1.sanitizeRelation)(relation)),
     };
 }
 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/get-versioned-hash.d.ts

@@ -0,0 +1 @@
+export declare function getVersionedHash(item: Record<string, any>): string;

package/dist/utils/get-versioned-hash.js

@@ -0,0 +1,12 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getVersionedHash = void 0;
+const object_hash_1 = __importDefault(require("object-hash"));
+const package_json_1 = require("../../package.json");
+function getVersionedHash(item) {
+    return (0, object_hash_1.default)({ item, version: package_json_1.version });
+}
+exports.getVersionedHash = getVersionedHash;

package/dist/utils/get-versioned-hash.test.d.ts

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

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/map-values-deep.d.ts

@@ -0,0 +1 @@
+export declare function mapValuesDeep(obj: Record<string, any>, fn: (key: string, value: any) => any): Record<string, any>;

package/dist/utils/map-values-deep.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mapValuesDeep = void 0;
+function mapValuesDeep(obj, fn) {
+    return recurse(obj);
+    function recurse(obj, prefix = '') {
+        if (Array.isArray(obj)) {
+            return obj.map((value, index) => {
+                if (typeof value === 'object' && value !== null) {
+                    return recurse(value, prefix + `[${index}]`);
+                }
+                else {
+                    return fn(prefix + `[${index}]`, value);
+                }
+            });
+        }
+        else {
+            return Object.fromEntries(Object.entries(obj).map(([key, value]) => {
+                if (typeof value === 'object' && value !== null) {
+                    return [key, recurse(value, prefix + (prefix ? '.' : '') + key)];
+                }
+                else {
+                    return [key, fn(prefix + (prefix ? '.' : '') + key, value)];
+                }
+            }));
+        }
+    }
+}
+exports.mapValuesDeep = mapValuesDeep;

package/dist/utils/map-values-deep.test.d.ts

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

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;