directus 9.20.4 → 9.21.2

package/dist/types/auth.d.ts

@@ -18,13 +18,13 @@ export interface User {
     app_access: boolean;
     admin_access: boolean;
 }
-export declare type AuthData = Record<string, any> | null;
+export type AuthData = Record<string, any> | null;
 export interface Session {
     token: string;
     expires: Date;
     share: string;
 }
-export declare type DirectusTokenPayload = {
+export type DirectusTokenPayload = {
     id?: string;
     role: string | null;
     app_access: boolean | number;
@@ -35,7 +35,7 @@ export declare type DirectusTokenPayload = {
         item: string;
     };
 };
-export declare type ShareData = {
+export type ShareData = {
     share_id: string;
     share_role: string;
     share_item: string;
@@ -46,7 +46,7 @@ export declare type ShareData = {
     share_max_uses?: number;
     share_password?: string;
 };
-export declare type LoginResult = {
+export type LoginResult = {
     accessToken: any;
     refreshToken: any;
     expires: any;

package/dist/types/collection.d.ts

@@ -1,6 +1,6 @@
 import { Table } from 'knex-schema-inspector/dist/types/table';
 import { Field } from '@directus/shared/types';
-export declare type CollectionMeta = {
+export type CollectionMeta = {
     collection: string;
     note: string | null;
     hidden: boolean;
@@ -11,7 +11,7 @@ export declare type CollectionMeta = {
     accountability: 'all' | 'accountability' | null;
     group: string | null;
 };
-export declare type Collection = {
+export type Collection = {
     collection: string;
     fields?: Field[];
     meta: CollectionMeta | null;

package/dist/types/events.d.ts

@@ -1,6 +1,6 @@
 import { ActionHandler, FilterHandler, InitHandler } from '@directus/shared/types';
 import { ScheduledTask } from 'node-cron';
-export declare type EventHandler = {
+export type EventHandler = {
     type: 'filter';
     name: string;
     handler: FilterHandler;

package/dist/types/files.d.ts

@@ -1,4 +1,4 @@
-export declare type File = {
+export type File = {
     id: string;
     storage: string;
     filename_disk: string;
@@ -19,7 +19,7 @@ export declare type File = {
     tags: string | null;
     metadata: Record<string, any> | null;
 };
-export declare type Metadata = {
+export type Metadata = {
     height?: number | undefined;
     width?: number | undefined;
     description?: string | undefined;

package/dist/types/items.d.ts

@@ -3,9 +3,9 @@
  * expecting an item vs any other generic object.
  */
 import { EventContext } from '@directus/shared/types';
-export declare type Item = Record<string, any>;
-export declare type PrimaryKey = string | number;
-export declare type Alterations = {
+export type Item = Record<string, any>;
+export type PrimaryKey = string | number;
+export type Alterations = {
     create: {
         [key: string]: any;
     }[];
@@ -14,7 +14,7 @@ export declare type Alterations = {
     }[];
     delete: (number | string)[];
 };
-export declare type MutationOptions = {
+export type MutationOptions = {
     /**
      * Callback function that's fired whenever a revision is made in the mutation
      */
@@ -37,7 +37,7 @@ export declare type MutationOptions = {
      */
     bypassEmitAction?: (params: ActionEventParams) => void;
 };
-export declare type ActionEventParams = {
+export type ActionEventParams = {
     event: string | string[];
     meta: Record<string, any>;
     context: EventContext;

package/dist/types/migration.d.ts

@@ -1,4 +1,4 @@
-export declare type Migration = {
+export type Migration = {
     version: string;
     name: string;
     timestamp: Date;

package/dist/types/revision.d.ts

@@ -1,4 +1,4 @@
-export declare type Revision = {
+export type Revision = {
     activity: number;
     collection: string;
     item: string | number;

package/dist/types/services.d.ts

@@ -1,7 +1,7 @@
 import { Knex } from 'knex';
 import { Accountability, Query, SchemaOverview } from '@directus/shared/types';
 import { Item, PrimaryKey } from './items';
-export declare type AbstractServiceOptions = {
+export type AbstractServiceOptions = {
     knex?: Knex;
     accountability?: Accountability | null;
     schema: SchemaOverview;

package/dist/types/snapshot.d.ts

@@ -1,20 +1,20 @@
 import { Collection } from './collection';
 import { Relation, RelationMeta, Field, FieldMeta } from '@directus/shared/types';
 import { Diff } from 'deep-diff';
-export declare type Snapshot = {
+export type Snapshot = {
     version: number;
     directus: string;
     collections: Collection[];
     fields: SnapshotField[];
     relations: SnapshotRelation[];
 };
-export declare type SnapshotField = Field & {
+export type SnapshotField = Field & {
     meta: Omit<FieldMeta, 'id'>;
 };
-export declare type SnapshotRelation = Relation & {
+export type SnapshotRelation = Relation & {
     meta: Omit<RelationMeta, 'id'>;
 };
-export declare type SnapshotDiff = {
+export type SnapshotDiff = {
     collections: {
         collection: string;
         diff: Diff<Collection | undefined>[];

package/dist/types/webhooks.d.ts

@@ -1,4 +1,4 @@
-export declare type Webhook = {
+export type Webhook = {
     id: number;
     name: string;
     method: 'GET' | 'POST';
@@ -9,7 +9,7 @@ export declare type Webhook = {
     collections: string[];
     headers: WebhookHeader[];
 };
-export declare type WebhookHeader = {
+export type WebhookHeader = {
     header: string;
     value: string;
 };

package/dist/utils/apply-snapshot.js

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

package/dist/utils/get-ast-from-query.d.ts

@@ -4,7 +4,7 @@
 import { Knex } from 'knex';
 import { AST } from '../types';
 import { Query, PermissionsAction, Accountability, SchemaOverview } from '@directus/shared/types';
-declare type GetASTOptions = {
+type GetASTOptions = {
     accountability?: Accountability | null;
     action?: PermissionsAction;
     knex?: Knex;

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

@@ -1,8 +1,8 @@
 import { Relation } from '@directus/shared/types';
-declare type AliasMap = string | {
+type AliasMap = string | {
     [key: string]: AliasMap;
 };
-export declare type ColPathProps = {
+export type ColPathProps = {
     path: string[];
     collection: string;
     aliasMap: AliasMap;

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

@@ -1,3 +1,3 @@
-export default function getModuleDefault<T>(mod: T | {
+export default function getModuleDefault<T extends object>(mod: T | {
     default: T;
 }): T;

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

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

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

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

package/dist/utils/get-schema.js

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

package/dist/utils/get-snapshot.js

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

package/dist/utils/job-queue.d.ts

@@ -1,4 +1,4 @@
-declare type Job = () => Promise<void> | void;
+type Job = () => Promise<void> | void;
 export declare class JobQueue {
     private running;
     private jobs;

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

@@ -1,3 +1,4 @@
+/// <reference types="lodash" />
 import { 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<{

package/dist/utils/reduce-schema.js

@@ -54,7 +54,9 @@ function reduceSchema(schema, permissions, actions = ['create', 'read', 'update'
             collectionsAllowed = false;
         }
         if (relation.related_collection &&
-            Object.keys(allowedFieldsInCollection).includes(relation.related_collection) === false) {
+            (Object.keys(allowedFieldsInCollection).includes(relation.related_collection) === false ||
+                // Ignore legacy permissions with an empty fields array
+                allowedFieldsInCollection[relation.related_collection].length === 0)) {
             collectionsAllowed = false;
         }
         if (((_a = relation.meta) === null || _a === void 0 ? void 0 : _a.one_allowed_collections) &&