@expo/entity 0.34.0 → 0.36.0

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,
@@ -61,7 +61,10 @@ export default abstract class Entity<
       TMSelectedFields
     >,
     viewerContext: TMViewerContext2,
-    queryContext: EntityQueryContext
+    queryContext: EntityQueryContext = viewerContext
+      .getViewerScopedEntityCompanionForClass(this)
+      .getQueryContextProvider()
+      .getQueryContext(),
   ): CreateMutator<TMFields, TMID, TMViewerContext, TMEntity, TMPrivacyPolicy, TMSelectedFields> {
     return viewerContext
       .getViewerScopedEntityCompanionForClass(this)
@@ -87,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,
@@ -98,7 +101,11 @@ export default abstract class Entity<
       TMSelectedFields
     >,
     existingEntity: TMEntity,
-    queryContext: EntityQueryContext
+    queryContext: EntityQueryContext = existingEntity
+      .getViewerContext()
+      .getViewerScopedEntityCompanionForClass(this)
+      .getQueryContextProvider()
+      .getQueryContext(),
   ): UpdateMutator<TMFields, TMID, TMViewerContext, TMEntity, TMPrivacyPolicy, TMSelectedFields> {
     return existingEntity
       .getViewerContext()
@@ -124,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,
@@ -135,7 +142,11 @@ export default abstract class Entity<
       TMSelectedFields
     >,
     existingEntity: TMEntity,
-    queryContext: EntityQueryContext
+    queryContext: EntityQueryContext = existingEntity
+      .getViewerContext()
+      .getViewerScopedEntityCompanionForClass(this)
+      .getQueryContextProvider()
+      .getQueryContext(),
   ): Promise<Result<void>> {
     return existingEntity
       .getViewerContext()
@@ -162,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,
@@ -173,7 +184,11 @@ export default abstract class Entity<
       TMSelectedFields
     >,
     existingEntity: TMEntity,
-    queryContext: EntityQueryContext
+    queryContext: EntityQueryContext = existingEntity
+      .getViewerContext()
+      .getViewerScopedEntityCompanionForClass(this)
+      .getQueryContextProvider()
+      .getQueryContext(),
   ): Promise<void> {
     return existingEntity
       .getViewerContext()
@@ -182,113 +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
-  ): 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
-  ): 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;
-  }
 }
 
 /**
@@ -306,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<
@@ -55,7 +55,11 @@ export default class EntityAssociationLoader<
       TAssociatedPrivacyPolicy,
       TAssociatedSelectedFields
     >,
-    queryContext: EntityQueryContext
+    queryContext: EntityQueryContext = this.entity
+      .getViewerContext()
+      .getViewerScopedEntityCompanionForClass(associatedEntityClass)
+      .getQueryContextProvider()
+      .getQueryContext(),
   ): Promise<
     Result<null extends TFields[TIdentifyingField] ? TAssociatedEntity | null : TAssociatedEntity>
   > {
@@ -70,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
     >;
   }
@@ -102,7 +108,7 @@ export default class EntityAssociationLoader<
       TAssociatedEntity,
       TAssociatedSelectedFields
     >,
-    TAssociatedSelectedFields extends keyof TAssociatedFields = keyof TAssociatedFields
+    TAssociatedSelectedFields extends keyof TAssociatedFields = keyof TAssociatedFields,
   >(
     associatedEntityClass: IEntityClass<
       TAssociatedFields,
@@ -113,18 +119,21 @@ export default class EntityAssociationLoader<
       TAssociatedSelectedFields
     >,
     associatedEntityFieldContainingThisID: keyof Pick<TAssociatedFields, TAssociatedSelectedFields>,
-    queryContext: EntityQueryContext
+    queryContext: EntityQueryContext = this.entity
+      .getViewerContext()
+      .getViewerScopedEntityCompanionForClass(associatedEntityClass)
+      .getQueryContextProvider()
+      .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);
   }
 
   /**
@@ -151,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<
@@ -163,7 +172,11 @@ export default class EntityAssociationLoader<
       TAssociatedSelectedFields
     >,
     associatedEntityLookupByField: keyof Pick<TAssociatedFields, TAssociatedSelectedFields>,
-    queryContext: EntityQueryContext
+    queryContext: EntityQueryContext = this.entity
+      .getViewerContext()
+      .getViewerScopedEntityCompanionForClass(associatedEntityClass)
+      .getQueryContextProvider()
+      .getQueryContext(),
   ): Promise<Result<TAssociatedEntity> | null> {
     const associatedFieldValue = this.entity.getField(fieldIdentifyingAssociatedEntity);
     if (!associatedFieldValue) {
@@ -173,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);
   }
 
   /**
@@ -204,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<
@@ -216,7 +228,11 @@ export default class EntityAssociationLoader<
       TAssociatedSelectedFields
     >,
     associatedEntityLookupByField: keyof Pick<TAssociatedFields, TAssociatedSelectedFields>,
-    queryContext: EntityQueryContext
+    queryContext: EntityQueryContext = this.entity
+      .getViewerContext()
+      .getViewerScopedEntityCompanionForClass(associatedEntityClass)
+      .getQueryContextProvider()
+      .getQueryContext(),
   ): Promise<readonly Result<TAssociatedEntity>[]> {
     const associatedFieldValue = this.entity.getField(fieldIdentifyingAssociatedEntity);
     if (!associatedFieldValue) {
@@ -227,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);
   }
 
   /**
@@ -251,7 +266,7 @@ export default class EntityAssociationLoader<
       TEntity2,
       TSelectedFields2
     >,
-    TSelectedFields2 extends keyof TFields2 = keyof TFields2
+    TSelectedFields2 extends keyof TFields2 = keyof TFields2,
   >(
     loadDirectives: [
       EntityLoadThroughDirective<
@@ -263,9 +278,9 @@ export default class EntityAssociationLoader<
         TPrivacyPolicy2,
         TSelectedFields,
         TSelectedFields2
-      >
+      >,
     ],
-    queryContext: EntityQueryContext
+    queryContext?: EntityQueryContext,
   ): Promise<Result<TEntity2> | null>;
 
   /**
@@ -296,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<
@@ -318,9 +333,9 @@ export default class EntityAssociationLoader<
         TPrivacyPolicy3,
         TSelectedFields2,
         TSelectedFields3
-      >
+      >,
     ],
-    queryContext: EntityQueryContext
+    queryContext?: EntityQueryContext,
   ): Promise<Result<TEntity3> | null>;
 
   /**
@@ -362,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,
@@ -394,9 +409,9 @@ export default class EntityAssociationLoader<
         TPrivacyPolicy4,
         TSelectedFields3,
         TSelectedFields4
-      >
+      >,
     ],
-    queryContext: EntityQueryContext
+    queryContext?: EntityQueryContext,
   ): Promise<Result<TEntity4> | null>;
 
   /**
@@ -407,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) {
@@ -429,7 +444,7 @@ export default class EntityAssociationLoader<
             fieldIdentifyingAssociatedEntity,
             associatedEntityClass,
             associatedEntityLookupByField,
-            queryContext
+            queryContext,
           );
       } else {
         const associatedEntityResultLocal = await currentEntity
@@ -437,7 +452,7 @@ export default class EntityAssociationLoader<
           .loadAssociatedEntityAsync(
             fieldIdentifyingAssociatedEntity,
             associatedEntityClass,
-            queryContext
+            queryContext,
           );
 
         if (associatedEntityResultLocal.ok && associatedEntityResultLocal.value === null) {
@@ -482,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,
     );
   }
 

package/src/EntityCompanionProvider.ts

@@ -61,7 +61,7 @@ export interface EntityCompanionDefinition<
     TEntity,
     TSelectedFields
   >,
-  TSelectedFields extends keyof TFields = keyof TFields
+  TSelectedFields extends keyof TFields = keyof TFields,
 > {
   /**
    * The concrete Entity class for which this is the definition.
@@ -139,6 +139,7 @@ export default class EntityCompanionProvider {
    * @param metricsAdapter - An IEntityMetricsAdapter for collecting metrics on this instance
    * @param databaseAdapterFlavors - Database adapter configurations for this instance
    * @param cacheAdapterFlavors - Cache adapter configurations for this instance
+   * @param globalMutationTriggers - Optional set of EntityMutationTrigger to run for all entity mutations systemwide.
    */
   constructor(
     public readonly metricsAdapter: IEntityMetricsAdapter,
@@ -146,7 +147,14 @@ export default class EntityCompanionProvider {
       DatabaseAdapterFlavor,
       DatabaseAdapterFlavorDefinition
     >,
-    private cacheAdapterFlavors: ReadonlyMap<CacheAdapterFlavor, CacheAdapterFlavorDefinition>
+    private cacheAdapterFlavors: ReadonlyMap<CacheAdapterFlavor, CacheAdapterFlavorDefinition>,
+    readonly globalMutationTriggers: EntityMutationTriggerConfiguration<
+      any,
+      any,
+      any,
+      any,
+      any
+    > = {},
   ) {}
 
   /**
@@ -167,7 +175,7 @@ export default class EntityCompanionProvider {
       TEntity,
       TSelectedFields
     >,
-    TSelectedFields extends keyof TFields
+    TSelectedFields extends keyof TFields,
   >(
     entityClass: IEntityClass<
       TFields,
@@ -176,58 +184,58 @@ export default class EntityCompanionProvider {
       TEntity,
       TPrivacyPolicy,
       TSelectedFields
-    >
+    >,
   ): EntityCompanion<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy, TSelectedFields> {
     const entityCompanionDefinition = computeIfAbsent(
       this.companionDefinitionMap,
       entityClass.name,
-      () => entityClass.defineCompanionDefinition()
+      () => entityClass.defineCompanionDefinition(),
     );
     const tableDataCoordinator = this.getTableDataCoordinatorForEntity(
       entityCompanionDefinition.entityConfiguration,
-      entityClass.name
+      entityClass.name,
     );
     return computeIfAbsent(this.companionMap, entityClass.name, () => {
       return new EntityCompanion(
         this,
         entityCompanionDefinition,
         tableDataCoordinator,
-        this.metricsAdapter
+        this.metricsAdapter,
       );
     });
   }
 
   getQueryContextProviderForDatabaseAdaptorFlavor(
-    databaseAdapterFlavor: DatabaseAdapterFlavor
+    databaseAdapterFlavor: DatabaseAdapterFlavor,
   ): EntityQueryContextProvider {
     const entityDatabaseAdapterFlavor = this.databaseAdapterFlavors.get(databaseAdapterFlavor);
     invariant(
       entityDatabaseAdapterFlavor,
-      `No database adaptor configuration found for flavor: ${databaseAdapterFlavor}`
+      `No database adaptor configuration found for flavor: ${databaseAdapterFlavor}`,
     );
 
     return entityDatabaseAdapterFlavor.queryContextProvider;
   }
 
-  private getTableDataCoordinatorForEntity<TFields>(
+  private getTableDataCoordinatorForEntity<TFields extends Record<string, any>>(
     entityConfiguration: EntityConfiguration<TFields>,
-    entityClassName: string
+    entityClassName: string,
   ): EntityTableDataCoordinator<TFields> {
     return computeIfAbsent(this.tableDataCoordinatorMap, entityConfiguration.tableName, () => {
       const entityDatabaseAdapterFlavor = this.databaseAdapterFlavors.get(
-        entityConfiguration.databaseAdapterFlavor
+        entityConfiguration.databaseAdapterFlavor,
       );
       invariant(
         entityDatabaseAdapterFlavor,
-        `No database adaptor configuration found for flavor: ${entityConfiguration.databaseAdapterFlavor}`
+        `No database adaptor configuration found for flavor: ${entityConfiguration.databaseAdapterFlavor}`,
       );
 
       const entityCacheAdapterFlavor = this.cacheAdapterFlavors.get(
-        entityConfiguration.cacheAdapterFlavor
+        entityConfiguration.cacheAdapterFlavor,
       );
       invariant(
         entityCacheAdapterFlavor,
-        `No cache adaptor configuration found for flavor: ${entityConfiguration.cacheAdapterFlavor}`
+        `No cache adaptor configuration found for flavor: ${entityConfiguration.cacheAdapterFlavor}`,
       );
 
       return new EntityTableDataCoordinator(
@@ -236,7 +244,7 @@ export default class EntityCompanionProvider {
         entityCacheAdapterFlavor.cacheAdapterProvider,
         entityDatabaseAdapterFlavor.queryContextProvider,
         this.metricsAdapter,
-        entityClassName
+        entityClassName,
       );
     });
   }