@expo/entity 0.35.0 → 0.36.0

package/src/ComposedSecondaryEntityCache.ts

@@ -14,19 +14,19 @@ export default class ComposedSecondaryEntityCache<TLoadParams, TFields>
    *                                Typically, caches closer to the application should be ordered before caches closer to the database.
    */
   constructor(
-    private readonly secondaryEntityCaches: ISecondaryEntityCache<TFields, TLoadParams>[]
+    private readonly secondaryEntityCaches: ISecondaryEntityCache<TFields, TLoadParams>[],
   ) {}
 
   async loadManyThroughAsync(
     loadParamsArray: readonly Readonly<TLoadParams>[],
     fetcher: (
-      fetcherLoadParamsArray: readonly Readonly<TLoadParams>[]
-    ) => Promise<ReadonlyMap<Readonly<TLoadParams>, Readonly<TFields> | null>>
+      fetcherLoadParamsArray: readonly Readonly<TLoadParams>[],
+    ) => Promise<ReadonlyMap<Readonly<TLoadParams>, Readonly<TFields> | null>>,
   ): Promise<ReadonlyMap<Readonly<TLoadParams>, Readonly<TFields> | null>> {
     return await ComposedSecondaryEntityCache.loadManyThroughRecursivelyAsync(
       this.secondaryEntityCaches,
       loadParamsArray,
-      fetcher
+      fetcher,
     );
   }
 
@@ -34,8 +34,8 @@ export default class ComposedSecondaryEntityCache<TLoadParams, TFields>
     secondaryEntityCaches: ISecondaryEntityCache<TFields, TLoadParams>[],
     loadParamsArray: readonly Readonly<TLoadParams>[],
     fetcher: (
-      fetcherLoadParamsArray: readonly Readonly<TLoadParams>[]
-    ) => Promise<ReadonlyMap<Readonly<TLoadParams>, Readonly<TFields> | null>>
+      fetcherLoadParamsArray: readonly Readonly<TLoadParams>[],
+    ) => Promise<ReadonlyMap<Readonly<TLoadParams>, Readonly<TFields> | null>>,
   ): Promise<ReadonlyMap<Readonly<TLoadParams>, Readonly<TFields> | null>> {
     if (secondaryEntityCaches.length === 0) {
       return await fetcher(loadParamsArray);
@@ -49,8 +49,8 @@ export default class ComposedSecondaryEntityCache<TLoadParams, TFields>
         ComposedSecondaryEntityCache.loadManyThroughRecursivelyAsync(
           restCaches,
           fetcherLoadParamsArray,
-          fetcher
-        )
+          fetcher,
+        ),
     );
   }
 

package/src/EnforcingEntityLoader.ts

@@ -1,17 +1,18 @@
+import AuthorizationResultBasedEntityLoader from './AuthorizationResultBasedEntityLoader';
 import {
   FieldEqualityCondition,
   QuerySelectionModifiers,
   QuerySelectionModifiersWithOrderByRaw,
 } from './EntityDatabaseAdapter';
-import EntityLoader from './EntityLoader';
 import EntityPrivacyPolicy from './EntityPrivacyPolicy';
 import ReadonlyEntity from './ReadonlyEntity';
 import ViewerContext from './ViewerContext';
 import { mapMap } from './utils/collections/maps';
 
 /**
- * Enforcing view on an entity loader. All loads through this loader will throw
- * if the loads are not successful.
+ * Enforcing entity loader. All normal loads are batched,
+ * cached, and authorized against the entity's EntityPrivacyPolicy. All loads
+ * through this loader will throw if the load is not successful.
  */
 export default class EnforcingEntityLoader<
   TFields extends object,
@@ -25,17 +26,17 @@ export default class EnforcingEntityLoader<
     TEntity,
     TSelectedFields
   >,
-  TSelectedFields extends keyof TFields
+  TSelectedFields extends keyof TFields,
 > {
   constructor(
-    private readonly entityLoader: EntityLoader<
+    private readonly entityLoader: AuthorizationResultBasedEntityLoader<
       TFields,
       TID,
       TViewerContext,
       TEntity,
       TPrivacyPolicy,
       TSelectedFields
-    >
+    >,
   ) {}
 
   /**
@@ -44,14 +45,14 @@ export default class EnforcingEntityLoader<
    */
   async loadManyByFieldEqualingManyAsync<N extends keyof Pick<TFields, TSelectedFields>>(
     fieldName: N,
-    fieldValues: readonly NonNullable<TFields[N]>[]
+    fieldValues: readonly NonNullable<TFields[N]>[],
   ): Promise<ReadonlyMap<NonNullable<TFields[N]>, readonly TEntity[]>> {
     const fieldValuesToResults = await this.entityLoader.loadManyByFieldEqualingManyAsync(
       fieldName,
-      fieldValues
+      fieldValues,
     );
     return mapMap(fieldValuesToResults, (results) =>
-      results.map((result) => result.enforceValue())
+      results.map((result) => result.enforceValue()),
     );
   }
 
@@ -61,11 +62,11 @@ export default class EnforcingEntityLoader<
    */
   async loadManyByFieldEqualingAsync<N extends keyof Pick<TFields, TSelectedFields>>(
     fieldName: N,
-    fieldValue: NonNullable<TFields[N]>
+    fieldValue: NonNullable<TFields[N]>,
   ): Promise<readonly TEntity[]> {
     const entityResults = await this.entityLoader.loadManyByFieldEqualingAsync(
       fieldName,
-      fieldValue
+      fieldValue,
     );
     return entityResults.map((result) => result.enforceValue());
   }
@@ -77,11 +78,11 @@ export default class EnforcingEntityLoader<
    */
   async loadByFieldEqualingAsync<N extends keyof Pick<TFields, TSelectedFields>>(
     uniqueFieldName: N,
-    fieldValue: NonNullable<TFields[N]>
+    fieldValue: NonNullable<TFields[N]>,
   ): Promise<TEntity | null> {
     const entityResult = await this.entityLoader.loadByFieldEqualingAsync(
       uniqueFieldName,
-      fieldValue
+      fieldValue,
     );
     return entityResult ? entityResult.enforceValue() : null;
   }
@@ -130,11 +131,11 @@ export default class EnforcingEntityLoader<
   async loadFirstByFieldEqualityConjunctionAsync<N extends keyof Pick<TFields, TSelectedFields>>(
     fieldEqualityOperands: FieldEqualityCondition<TFields, N>[],
     querySelectionModifiers: Omit<QuerySelectionModifiers<TFields>, 'limit'> &
-      Required<Pick<QuerySelectionModifiers<TFields>, 'orderBy'>>
+      Required<Pick<QuerySelectionModifiers<TFields>, 'orderBy'>>,
   ): Promise<TEntity | null> {
     const entityResult = await this.entityLoader.loadFirstByFieldEqualityConjunctionAsync(
       fieldEqualityOperands,
-      querySelectionModifiers
+      querySelectionModifiers,
     );
     return entityResult ? entityResult.enforceValue() : null;
   }
@@ -145,11 +146,11 @@ export default class EnforcingEntityLoader<
    */
   async loadManyByFieldEqualityConjunctionAsync<N extends keyof Pick<TFields, TSelectedFields>>(
     fieldEqualityOperands: FieldEqualityCondition<TFields, N>[],
-    querySelectionModifiers: QuerySelectionModifiers<TFields> = {}
+    querySelectionModifiers: QuerySelectionModifiers<TFields> = {},
   ): Promise<readonly TEntity[]> {
     const entityResults = await this.entityLoader.loadManyByFieldEqualityConjunctionAsync(
       fieldEqualityOperands,
-      querySelectionModifiers
+      querySelectionModifiers,
     );
     return entityResults.map((result) => result.enforceValue());
   }
@@ -161,12 +162,12 @@ export default class EnforcingEntityLoader<
   async loadManyByRawWhereClauseAsync(
     rawWhereClause: string,
     bindings: any[] | object,
-    querySelectionModifiers: QuerySelectionModifiersWithOrderByRaw<TFields> = {}
+    querySelectionModifiers: QuerySelectionModifiersWithOrderByRaw<TFields> = {},
   ): Promise<readonly TEntity[]> {
     const entityResults = await this.entityLoader.loadManyByRawWhereClauseAsync(
       rawWhereClause,
       bindings,
-      querySelectionModifiers
+      querySelectionModifiers,
     );
     return entityResults.map((result) => result.enforceValue());
   }

package/src/Entity.ts

@@ -1,4 +1,4 @@
-import { Result, asyncResult } from '@expo/results';
+import { Result } from '@expo/results';
 
 import { EntityCompanionDefinition } from './EntityCompanionProvider';
 import { CreateMutator, UpdateMutator } from './EntityMutator';
@@ -29,7 +29,7 @@ export default abstract class Entity<
   TFields extends object,
   TID extends NonNullable<TFields[TSelectedFields]>,
   TViewerContext extends ViewerContext,
-  TSelectedFields extends keyof TFields = keyof TFields
+  TSelectedFields extends keyof TFields = keyof TFields,
 > extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields> {
   /**
    * Vend mutator for creating a new entity in given query context.
@@ -50,7 +50,7 @@ export default abstract class Entity<
       TMEntity,
       TMSelectedFields
     >,
-    TMSelectedFields extends keyof TMFields = keyof TMFields
+    TMSelectedFields extends keyof TMFields = keyof TMFields,
   >(
     this: IEntityClass<
       TMFields,
@@ -64,7 +64,7 @@ export default abstract class Entity<
     queryContext: EntityQueryContext = viewerContext
       .getViewerScopedEntityCompanionForClass(this)
       .getQueryContextProvider()
-      .getQueryContext()
+      .getQueryContext(),
   ): CreateMutator<TMFields, TMID, TMViewerContext, TMEntity, TMPrivacyPolicy, TMSelectedFields> {
     return viewerContext
       .getViewerScopedEntityCompanionForClass(this)
@@ -90,7 +90,7 @@ export default abstract class Entity<
       TMEntity,
       TMSelectedFields
     >,
-    TMSelectedFields extends keyof TMFields = keyof TMFields
+    TMSelectedFields extends keyof TMFields = keyof TMFields,
   >(
     this: IEntityClass<
       TMFields,
@@ -105,7 +105,7 @@ export default abstract class Entity<
       .getViewerContext()
       .getViewerScopedEntityCompanionForClass(this)
       .getQueryContextProvider()
-      .getQueryContext()
+      .getQueryContext(),
   ): UpdateMutator<TMFields, TMID, TMViewerContext, TMEntity, TMPrivacyPolicy, TMSelectedFields> {
     return existingEntity
       .getViewerContext()
@@ -131,7 +131,7 @@ export default abstract class Entity<
       TMEntity,
       TMSelectedFields
     >,
-    TMSelectedFields extends keyof TMFields = keyof TMFields
+    TMSelectedFields extends keyof TMFields = keyof TMFields,
   >(
     this: IEntityClass<
       TMFields,
@@ -146,7 +146,7 @@ export default abstract class Entity<
       .getViewerContext()
       .getViewerScopedEntityCompanionForClass(this)
       .getQueryContextProvider()
-      .getQueryContext()
+      .getQueryContext(),
   ): Promise<Result<void>> {
     return existingEntity
       .getViewerContext()
@@ -173,7 +173,7 @@ export default abstract class Entity<
       TMEntity,
       TMSelectedFields
     >,
-    TMSelectedFields extends keyof TMFields = keyof TMFields
+    TMSelectedFields extends keyof TMFields = keyof TMFields,
   >(
     this: IEntityClass<
       TMFields,
@@ -188,7 +188,7 @@ export default abstract class Entity<
       .getViewerContext()
       .getViewerScopedEntityCompanionForClass(this)
       .getQueryContextProvider()
-      .getQueryContext()
+      .getQueryContext(),
   ): Promise<void> {
     return existingEntity
       .getViewerContext()
@@ -197,121 +197,6 @@ export default abstract class Entity<
       .forDelete(existingEntity, queryContext)
       .enforceDeleteAsync();
   }
-
-  /**
-   * Check whether an entity loaded by a viewer can be updated by that same viewer.
-   *
-   * @remarks
-   *
-   * This may be useful in situations relying upon the thrown privacy policy thrown authorization error
-   * is insufficient for the task at hand. When dealing with purely a sequence of mutations it is easy
-   * to roll back all mutations given a single authorization error by wrapping them in a single transaction.
-   * When certain portions of a mutation cannot be rolled back transactionally (third pary calls,
-   * legacy code, etc), using this method can help decide whether the sequence of mutations will fail before
-   * attempting them. Note that if any privacy policy rules use a piece of data being updated in the mutations
-   * the result of this method and the update mutation itself may differ.
-   *
-   * @param existingEntity - entity loaded by viewer
-   * @param queryContext - query context in which to perform the check
-   */
-  static async canViewerUpdateAsync<
-    TMFields extends object,
-    TMID extends NonNullable<TMFields[TMSelectedFields]>,
-    TMViewerContext extends ViewerContext,
-    TMEntity extends Entity<TMFields, TMID, TMViewerContext, TMSelectedFields>,
-    TMPrivacyPolicy extends EntityPrivacyPolicy<
-      TMFields,
-      TMID,
-      TMViewerContext,
-      TMEntity,
-      TMSelectedFields
-    >,
-    TMSelectedFields extends keyof TMFields = keyof TMFields
-  >(
-    this: IEntityClass<
-      TMFields,
-      TMID,
-      TMViewerContext,
-      TMEntity,
-      TMPrivacyPolicy,
-      TMSelectedFields
-    >,
-    existingEntity: TMEntity,
-    queryContext: EntityQueryContext = existingEntity
-      .getViewerContext()
-      .getViewerScopedEntityCompanionForClass(this)
-      .getQueryContextProvider()
-      .getQueryContext()
-  ): Promise<boolean> {
-    const companion = existingEntity
-      .getViewerContext()
-      .getViewerScopedEntityCompanionForClass(this);
-    const privacyPolicy = companion.entityCompanion.privacyPolicy;
-    const evaluationResult = await asyncResult(
-      privacyPolicy.authorizeUpdateAsync(
-        existingEntity.getViewerContext(),
-        queryContext,
-        { cascadingDeleteCause: null },
-        existingEntity,
-        companion.getMetricsAdapter()
-      )
-    );
-    return evaluationResult.ok;
-  }
-
-  /**
-   * Check whether an entity loaded by a viewer can be deleted by that same viewer.
-   *
-   * @remarks
-   * See remarks for canViewerUpdate.
-   *
-   * @param existingEntity - entity loaded by viewer
-   * @param queryContext - query context in which to perform the check
-   */
-  static async canViewerDeleteAsync<
-    TMFields extends object,
-    TMID extends NonNullable<TMFields[TMSelectedFields]>,
-    TMViewerContext extends ViewerContext,
-    TMEntity extends Entity<TMFields, TMID, TMViewerContext, TMSelectedFields>,
-    TMPrivacyPolicy extends EntityPrivacyPolicy<
-      TMFields,
-      TMID,
-      TMViewerContext,
-      TMEntity,
-      TMSelectedFields
-    >,
-    TMSelectedFields extends keyof TMFields = keyof TMFields
-  >(
-    this: IEntityClass<
-      TMFields,
-      TMID,
-      TMViewerContext,
-      TMEntity,
-      TMPrivacyPolicy,
-      TMSelectedFields
-    >,
-    existingEntity: TMEntity,
-    queryContext: EntityQueryContext = existingEntity
-      .getViewerContext()
-      .getViewerScopedEntityCompanionForClass(this)
-      .getQueryContextProvider()
-      .getQueryContext()
-  ): Promise<boolean> {
-    const companion = existingEntity
-      .getViewerContext()
-      .getViewerScopedEntityCompanionForClass(this);
-    const privacyPolicy = companion.entityCompanion.privacyPolicy;
-    const evaluationResult = await asyncResult(
-      privacyPolicy.authorizeDeleteAsync(
-        existingEntity.getViewerContext(),
-        queryContext,
-        { cascadingDeleteCause: null },
-        existingEntity,
-        companion.getMetricsAdapter()
-      )
-    );
-    return evaluationResult.ok;
-  }
 }
 
 /**
@@ -329,7 +214,7 @@ export interface IEntityClass<
     TEntity,
     TSelectedFields
   >,
-  TSelectedFields extends keyof TFields = keyof TFields
+  TSelectedFields extends keyof TFields = keyof TFields,
 > {
   new (constructorParam: {
     viewerContext: TViewerContext;

package/src/EntityAssociationLoader.ts

@@ -16,7 +16,7 @@ export default class EntityAssociationLoader<
   TID extends NonNullable<TFields[TSelectedFields]>,
   TViewerContext extends ViewerContext,
   TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>,
-  TSelectedFields extends keyof TFields
+  TSelectedFields extends keyof TFields,
 > {
   constructor(private readonly entity: TEntity) {}
 
@@ -44,7 +44,7 @@ export default class EntityAssociationLoader<
       TAssociatedEntity,
       TAssociatedSelectedFields
     >,
-    TAssociatedSelectedFields extends keyof TAssociatedFields = keyof TAssociatedFields
+    TAssociatedSelectedFields extends keyof TAssociatedFields = keyof TAssociatedFields,
   >(
     fieldIdentifyingAssociatedEntity: TIdentifyingField,
     associatedEntityClass: IEntityClass<
@@ -59,7 +59,7 @@ export default class EntityAssociationLoader<
       .getViewerContext()
       .getViewerScopedEntityCompanionForClass(associatedEntityClass)
       .getQueryContextProvider()
-      .getQueryContext()
+      .getQueryContext(),
   ): Promise<
     Result<null extends TFields[TIdentifyingField] ? TAssociatedEntity | null : TAssociatedEntity>
   > {
@@ -74,9 +74,11 @@ export default class EntityAssociationLoader<
       .getViewerContext()
       .getViewerScopedEntityCompanionForClass(associatedEntityClass)
       .getLoaderFactory()
-      .forLoad(queryContext, { cascadingDeleteCause: null });
+      .forLoad(queryContext, { previousValue: null, cascadingDeleteCause: null });
 
-    return (await loader.loadByIDAsync(associatedEntityID as unknown as TAssociatedID)) as Result<
+    return (await loader
+      .withAuthorizationResults()
+      .loadByIDAsync(associatedEntityID as unknown as TAssociatedID)) as Result<
       null extends TFields[TIdentifyingField] ? TAssociatedEntity | null : TAssociatedEntity
     >;
   }
@@ -106,7 +108,7 @@ export default class EntityAssociationLoader<
       TAssociatedEntity,
       TAssociatedSelectedFields
     >,
-    TAssociatedSelectedFields extends keyof TAssociatedFields = keyof TAssociatedFields
+    TAssociatedSelectedFields extends keyof TAssociatedFields = keyof TAssociatedFields,
   >(
     associatedEntityClass: IEntityClass<
       TAssociatedFields,
@@ -121,18 +123,17 @@ export default class EntityAssociationLoader<
       .getViewerContext()
       .getViewerScopedEntityCompanionForClass(associatedEntityClass)
       .getQueryContextProvider()
-      .getQueryContext()
+      .getQueryContext(),
   ): Promise<readonly Result<TAssociatedEntity>[]> {
     const thisID = this.entity.getID();
     const loader = this.entity
       .getViewerContext()
       .getViewerScopedEntityCompanionForClass(associatedEntityClass)
       .getLoaderFactory()
-      .forLoad(queryContext, { cascadingDeleteCause: null });
-    return await loader.loadManyByFieldEqualingAsync(
-      associatedEntityFieldContainingThisID,
-      thisID as any
-    );
+      .forLoad(queryContext, { previousValue: null, cascadingDeleteCause: null });
+    return await loader
+      .withAuthorizationResults()
+      .loadManyByFieldEqualingAsync(associatedEntityFieldContainingThisID, thisID as any);
   }
 
   /**
@@ -159,7 +160,7 @@ export default class EntityAssociationLoader<
       TAssociatedEntity,
       TAssociatedSelectedFields
     >,
-    TAssociatedSelectedFields extends keyof TAssociatedFields = keyof TAssociatedFields
+    TAssociatedSelectedFields extends keyof TAssociatedFields = keyof TAssociatedFields,
   >(
     fieldIdentifyingAssociatedEntity: keyof Pick<TFields, TSelectedFields>,
     associatedEntityClass: IEntityClass<
@@ -175,7 +176,7 @@ export default class EntityAssociationLoader<
       .getViewerContext()
       .getViewerScopedEntityCompanionForClass(associatedEntityClass)
       .getQueryContextProvider()
-      .getQueryContext()
+      .getQueryContext(),
   ): Promise<Result<TAssociatedEntity> | null> {
     const associatedFieldValue = this.entity.getField(fieldIdentifyingAssociatedEntity);
     if (!associatedFieldValue) {
@@ -185,11 +186,10 @@ export default class EntityAssociationLoader<
       .getViewerContext()
       .getViewerScopedEntityCompanionForClass(associatedEntityClass)
       .getLoaderFactory()
-      .forLoad(queryContext, { cascadingDeleteCause: null });
-    return await loader.loadByFieldEqualingAsync(
-      associatedEntityLookupByField,
-      associatedFieldValue as any
-    );
+      .forLoad(queryContext, { previousValue: null, cascadingDeleteCause: null });
+    return await loader
+      .withAuthorizationResults()
+      .loadByFieldEqualingAsync(associatedEntityLookupByField, associatedFieldValue as any);
   }
 
   /**
@@ -216,7 +216,7 @@ export default class EntityAssociationLoader<
       TAssociatedEntity,
       TAssociatedSelectedFields
     >,
-    TAssociatedSelectedFields extends keyof TAssociatedFields = keyof TAssociatedFields
+    TAssociatedSelectedFields extends keyof TAssociatedFields = keyof TAssociatedFields,
   >(
     fieldIdentifyingAssociatedEntity: keyof Pick<TFields, TSelectedFields>,
     associatedEntityClass: IEntityClass<
@@ -232,7 +232,7 @@ export default class EntityAssociationLoader<
       .getViewerContext()
       .getViewerScopedEntityCompanionForClass(associatedEntityClass)
       .getQueryContextProvider()
-      .getQueryContext()
+      .getQueryContext(),
   ): Promise<readonly Result<TAssociatedEntity>[]> {
     const associatedFieldValue = this.entity.getField(fieldIdentifyingAssociatedEntity);
     if (!associatedFieldValue) {
@@ -243,11 +243,10 @@ export default class EntityAssociationLoader<
       .getViewerContext()
       .getViewerScopedEntityCompanionForClass(associatedEntityClass)
       .getLoaderFactory()
-      .forLoad(queryContext, { cascadingDeleteCause: null });
-    return await loader.loadManyByFieldEqualingAsync(
-      associatedEntityLookupByField,
-      associatedFieldValue as any
-    );
+      .forLoad(queryContext, { previousValue: null, cascadingDeleteCause: null });
+    return await loader
+      .withAuthorizationResults()
+      .loadManyByFieldEqualingAsync(associatedEntityLookupByField, associatedFieldValue as any);
   }
 
   /**
@@ -267,7 +266,7 @@ export default class EntityAssociationLoader<
       TEntity2,
       TSelectedFields2
     >,
-    TSelectedFields2 extends keyof TFields2 = keyof TFields2
+    TSelectedFields2 extends keyof TFields2 = keyof TFields2,
   >(
     loadDirectives: [
       EntityLoadThroughDirective<
@@ -279,9 +278,9 @@ export default class EntityAssociationLoader<
         TPrivacyPolicy2,
         TSelectedFields,
         TSelectedFields2
-      >
+      >,
     ],
-    queryContext?: EntityQueryContext
+    queryContext?: EntityQueryContext,
   ): Promise<Result<TEntity2> | null>;
 
   /**
@@ -312,7 +311,7 @@ export default class EntityAssociationLoader<
       TSelectedFields3
     >,
     TSelectedFields2 extends keyof TFields2 = keyof TFields2,
-    TSelectedFields3 extends keyof TFields3 = keyof TFields3
+    TSelectedFields3 extends keyof TFields3 = keyof TFields3,
   >(
     loadDirectives: [
       EntityLoadThroughDirective<
@@ -334,9 +333,9 @@ export default class EntityAssociationLoader<
         TPrivacyPolicy3,
         TSelectedFields2,
         TSelectedFields3
-      >
+      >,
     ],
-    queryContext?: EntityQueryContext
+    queryContext?: EntityQueryContext,
   ): Promise<Result<TEntity3> | null>;
 
   /**
@@ -378,9 +377,9 @@ export default class EntityAssociationLoader<
     >,
     TSelectedFields2 extends keyof TFields2 = keyof TFields2,
     TSelectedFields3 extends keyof TFields3 = keyof TFields3,
-    TSelectedFields4 extends keyof TFields4 = keyof TFields4
+    TSelectedFields4 extends keyof TFields4 = keyof TFields4,
   >(
-    loadDirective: [
+    loadDirectives: [
       EntityLoadThroughDirective<
         TViewerContext,
         TFields,
@@ -410,9 +409,9 @@ export default class EntityAssociationLoader<
         TPrivacyPolicy4,
         TSelectedFields3,
         TSelectedFields4
-      >
+      >,
     ],
-    queryContext?: EntityQueryContext
+    queryContext?: EntityQueryContext,
   ): Promise<Result<TEntity4> | null>;
 
   /**
@@ -423,12 +422,12 @@ export default class EntityAssociationLoader<
    */
   async loadAssociatedEntityThroughAsync(
     loadDirectives: EntityLoadThroughDirective<TViewerContext, any, any, any, any, any, any, any>[],
-    queryContext?: EntityQueryContext
+    queryContext?: EntityQueryContext,
   ): Promise<Result<ReadonlyEntity<any, any, any, any>> | null>;
 
   async loadAssociatedEntityThroughAsync(
     loadDirectives: EntityLoadThroughDirective<TViewerContext, any, any, any, any, any, any, any>[],
-    queryContext?: EntityQueryContext
+    queryContext?: EntityQueryContext,
   ): Promise<Result<ReadonlyEntity<any, any, any, any>> | null> {
     let currentEntity: ReadonlyEntity<any, any, any, any> = this.entity;
     for (const loadDirective of loadDirectives) {
@@ -445,7 +444,7 @@ export default class EntityAssociationLoader<
             fieldIdentifyingAssociatedEntity,
             associatedEntityClass,
             associatedEntityLookupByField,
-            queryContext
+            queryContext,
           );
       } else {
         const associatedEntityResultLocal = await currentEntity
@@ -453,7 +452,7 @@ export default class EntityAssociationLoader<
           .loadAssociatedEntityAsync(
             fieldIdentifyingAssociatedEntity,
             associatedEntityClass,
-            queryContext
+            queryContext,
           );
 
         if (associatedEntityResultLocal.ok && associatedEntityResultLocal.value === null) {
@@ -498,7 +497,7 @@ export interface EntityLoadThroughDirective<
     TAssociatedSelectedFields
   >,
   TSelectedFields extends keyof TFields = keyof TFields,
-  TAssociatedSelectedFields extends keyof TAssociatedFields = keyof TAssociatedFields
+  TAssociatedSelectedFields extends keyof TAssociatedFields = keyof TAssociatedFields,
 > {
   /**
    * Class of entity to load at this step.

package/src/EntityCompanion.ts

@@ -7,6 +7,7 @@ import ReadonlyEntity from './ReadonlyEntity';
 import ViewerContext from './ViewerContext';
 import EntityTableDataCoordinator from './internal/EntityTableDataCoordinator';
 import IEntityMetricsAdapter from './metrics/IEntityMetricsAdapter';
+import { mergeEntityMutationTriggerConfigurations } from './utils/mergeEntityMutationTriggerConfigurations';
 
 export interface IPrivacyPolicyClass<TPrivacyPolicy> {
   new (): TPrivacyPolicy;
@@ -27,7 +28,7 @@ export default class EntityCompanion<
     TEntity,
     TSelectedFields
   >,
-  TSelectedFields extends keyof TFields
+  TSelectedFields extends keyof TFields,
 > {
   public readonly privacyPolicy: TPrivacyPolicy;
 
@@ -59,7 +60,7 @@ export default class EntityCompanion<
       TSelectedFields
     >,
     private readonly tableDataCoordinator: EntityTableDataCoordinator<TFields>,
-    private readonly metricsAdapter: IEntityMetricsAdapter
+    private readonly metricsAdapter: IEntityMetricsAdapter,
   ) {
     this.privacyPolicy = new entityCompanionDefinition.privacyPolicyClass();
     this.entityLoaderFactory = new EntityLoaderFactory<
@@ -76,10 +77,13 @@ export default class EntityCompanion<
       entityCompanionDefinition.entityClass,
       this.privacyPolicy,
       entityCompanionDefinition.mutationValidators ?? [],
-      entityCompanionDefinition.mutationTriggers ?? {},
+      mergeEntityMutationTriggerConfigurations(
+        entityCompanionDefinition.mutationTriggers ?? {},
+        entityCompanionProvider.globalMutationTriggers ?? {},
+      ),
       this.entityLoaderFactory,
       tableDataCoordinator.databaseAdapter,
-      metricsAdapter
+      metricsAdapter,
     );
   }