@expo/entity 0.40.0 → 0.42.0

package/src/EntityFields.ts

@@ -1,4 +1,8 @@
-import { EntityFieldDefinition } from './EntityFieldDefinition';
+import {
+  EntityFieldDefinition,
+  EntityFieldDefinitionOptions,
+  EntityFieldDefinitionOptionsExplicitCache,
+} from './EntityFieldDefinition';
 
 // Use our own regex since the `uuid` package doesn't support validating UUIDv6/7/8 yet
 const UUID_REGEX =
@@ -7,7 +11,10 @@ const UUID_REGEX =
 /**
  * EntityFieldDefinition for a column with a JS string type.
  */
-export class StringField extends EntityFieldDefinition<string> {
+export class StringField<TRequireExplicitCache extends boolean> extends EntityFieldDefinition<
+  string,
+  TRequireExplicitCache
+> {
   protected validateInputValueInternal(value: string): boolean {
     return typeof value === 'string';
   }
@@ -17,7 +24,9 @@ export class StringField extends EntityFieldDefinition<string> {
  * EntityFieldDefinition for a column with a JS string type.
  * Enforces that the string is a valid UUID.
  */
-export class UUIDField extends StringField {
+export class UUIDField<
+  TRequireExplicitCache extends boolean,
+> extends StringField<TRequireExplicitCache> {
   protected override validateInputValueInternal(value: string): boolean {
     return super.validateInputValueInternal(value) && UUID_REGEX.test(value);
   }
@@ -26,7 +35,10 @@ export class UUIDField extends StringField {
 /**
  * EntityFieldDefinition for a column with a JS Date type.
  */
-export class DateField extends EntityFieldDefinition<Date> {
+export class DateField<TRequireExplicitCache extends boolean> extends EntityFieldDefinition<
+  Date,
+  TRequireExplicitCache
+> {
   protected validateInputValueInternal(value: Date): boolean {
     return value instanceof Date;
   }
@@ -35,7 +47,10 @@ export class DateField extends EntityFieldDefinition<Date> {
 /**
  * EntityFieldDefinition for a column with a JS boolean type.
  */
-export class BooleanField extends EntityFieldDefinition<boolean> {
+export class BooleanField<TRequireExplicitCache extends boolean> extends EntityFieldDefinition<
+  boolean,
+  TRequireExplicitCache
+> {
   protected validateInputValueInternal(value: boolean): boolean {
     return typeof value === 'boolean';
   }
@@ -45,7 +60,10 @@ export class BooleanField extends EntityFieldDefinition<boolean> {
  * EntityFieldDefinition for a column with a JS number type.
  * Enforces that the number is an integer.
  */
-export class IntField extends EntityFieldDefinition<number> {
+export class IntField<TRequireExplicitCache extends boolean> extends EntityFieldDefinition<
+  number,
+  TRequireExplicitCache
+> {
   protected validateInputValueInternal(value: number): boolean {
     return typeof value === 'number' && Number.isInteger(value);
   }
@@ -55,7 +73,10 @@ export class IntField extends EntityFieldDefinition<number> {
  * EntityFieldDefinition for a column with a JS number type.
  * Enforces that the number is a float (which includes integers in JS).
  */
-export class FloatField extends EntityFieldDefinition<number> {
+export class FloatField<TRequireExplicitCache extends boolean> extends EntityFieldDefinition<
+  number,
+  TRequireExplicitCache
+> {
   protected validateInputValueInternal(value: number): boolean {
     return typeof value === 'number';
   }
@@ -65,7 +86,10 @@ export class FloatField extends EntityFieldDefinition<number> {
  * EntityFieldDefinition for a column with a JS string array type.
  * Enforces that every member of the string array is a string.
  */
-export class StringArrayField extends EntityFieldDefinition<string[]> {
+export class StringArrayField<TRequireExplicitCache extends boolean> extends EntityFieldDefinition<
+  string[],
+  TRequireExplicitCache
+> {
   protected validateInputValueInternal(value: string[]): boolean {
     return Array.isArray(value) && value.every((subValue) => typeof subValue === 'string');
   }
@@ -74,7 +98,10 @@ export class StringArrayField extends EntityFieldDefinition<string[]> {
 /**
  * EntityFieldDefinition for a column with a JS JSON object type.
  */
-export class JSONObjectField extends EntityFieldDefinition<object> {
+export class JSONObjectField<TRequireExplicitCache extends boolean> extends EntityFieldDefinition<
+  object,
+  TRequireExplicitCache
+> {
   protected validateInputValueInternal(value: object): boolean {
     return typeof value === 'object' && !Array.isArray(value);
   }
@@ -83,7 +110,10 @@ export class JSONObjectField extends EntityFieldDefinition<object> {
 /**
  * EntityFieldDefinition for a enum column with a JS string or number type.
  */
-export class EnumField extends EntityFieldDefinition<string | number> {
+export class EnumField<TRequireExplicitCache extends boolean> extends EntityFieldDefinition<
+  string | number,
+  TRequireExplicitCache
+> {
   protected validateInputValueInternal(value: string | number): boolean {
     return typeof value === 'number' || typeof value === 'string';
   }
@@ -92,9 +122,16 @@ export class EnumField extends EntityFieldDefinition<string | number> {
 /**
  * EntityFieldDefinition for a enum column with a strict typescript enum type.
  */
-export class StrictEnumField<T extends object> extends EnumField {
+export class StrictEnumField<
+  T extends object,
+  TRequireExplicitCache extends boolean,
+> extends EnumField<TRequireExplicitCache> {
   private readonly enum: T;
-  constructor(options: ConstructorParameters<typeof EnumField>[0] & { enum: T }) {
+  constructor(
+    options: TRequireExplicitCache extends true
+      ? EntityFieldDefinitionOptionsExplicitCache & { enum: T }
+      : EntityFieldDefinitionOptions & { enum: T },
+  ) {
     super(options);
     this.enum = options.enum;
   }

package/src/EntityLoader.ts

@@ -12,14 +12,14 @@ import ViewerContext from './ViewerContext';
  * cached, and authorized against the entity's EntityPrivacyPolicy.
  */
 export default class EntityLoader<
-  TFields extends object,
-  TID extends NonNullable<TFields[TSelectedFields]>,
+  TFields extends Record<string, any>,
+  TIDField extends keyof NonNullable<Pick<TFields, TSelectedFields>>,
   TViewerContext extends ViewerContext,
   TViewerContext2 extends TViewerContext,
-  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>,
+  TEntity extends ReadonlyEntity<TFields, TIDField, TViewerContext, TSelectedFields>,
   TPrivacyPolicy extends EntityPrivacyPolicy<
     TFields,
-    TID,
+    TIDField,
     TViewerContext,
     TEntity,
     TSelectedFields
@@ -31,7 +31,7 @@ export default class EntityLoader<
     private readonly queryContext: EntityQueryContext,
     private readonly entityClass: IEntityClass<
       TFields,
-      TID,
+      TIDField,
       TViewerContext,
       TEntity,
       TPrivacyPolicy,
@@ -46,7 +46,7 @@ export default class EntityLoader<
    */
   enforcing(): EnforcingEntityLoader<
     TFields,
-    TID,
+    TIDField,
     TViewerContext,
     TEntity,
     TPrivacyPolicy,
@@ -62,7 +62,7 @@ export default class EntityLoader<
    */
   withAuthorizationResults(): AuthorizationResultBasedEntityLoader<
     TFields,
-    TID,
+    TIDField,
     TViewerContext,
     TEntity,
     TPrivacyPolicy,
@@ -80,7 +80,7 @@ export default class EntityLoader<
    */
   public utils(): EntityLoaderUtils<
     TFields,
-    TID,
+    TIDField,
     TViewerContext,
     TEntity,
     TPrivacyPolicy,

package/src/EntityLoaderFactory.ts

@@ -12,13 +12,13 @@ import IEntityMetricsAdapter from './metrics/IEntityMetricsAdapter';
  * The primary entry point for loading entities.
  */
 export default class EntityLoaderFactory<
-  TFields extends object,
-  TID extends NonNullable<TFields[TSelectedFields]>,
+  TFields extends Record<string, any>,
+  TIDField extends keyof NonNullable<Pick<TFields, TSelectedFields>>,
   TViewerContext extends ViewerContext,
-  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>,
+  TEntity extends ReadonlyEntity<TFields, TIDField, TViewerContext, TSelectedFields>,
   TPrivacyPolicy extends EntityPrivacyPolicy<
     TFields,
-    TID,
+    TIDField,
     TViewerContext,
     TEntity,
     TSelectedFields
@@ -28,13 +28,13 @@ export default class EntityLoaderFactory<
   constructor(
     private readonly entityCompanion: EntityCompanion<
       TFields,
-      TID,
+      TIDField,
       TViewerContext,
       TEntity,
       TPrivacyPolicy,
       TSelectedFields
     >,
-    private readonly dataManager: EntityDataManager<TFields>,
+    private readonly dataManager: EntityDataManager<TFields, TIDField>,
     protected readonly metricsAdapter: IEntityMetricsAdapter,
   ) {}
 
@@ -48,14 +48,14 @@ export default class EntityLoaderFactory<
     queryContext: EntityQueryContext,
     privacyPolicyEvaluationContext: EntityPrivacyPolicyEvaluationContext<
       TFields,
-      TID,
+      TIDField,
       TViewerContext,
       TEntity,
       TSelectedFields
     >,
   ): AuthorizationResultBasedEntityLoader<
     TFields,
-    TID,
+    TIDField,
     TViewerContext,
     TEntity,
     TPrivacyPolicy,

package/src/EntityLoaderUtils.ts

@@ -9,6 +9,7 @@ import ReadonlyEntity from './ReadonlyEntity';
 import ViewerContext from './ViewerContext';
 import { pick } from './entityUtils';
 import EntityDataManager from './internal/EntityDataManager';
+import { SingleFieldHolder, SingleFieldValueHolder } from './internal/SingleFieldHolder';
 import IEntityMetricsAdapter from './metrics/IEntityMetricsAdapter';
 import { mapMapAsync } from './utils/collections/maps';
 
@@ -17,13 +18,13 @@ import { mapMapAsync } from './utils/collections/maps';
  * Methods are exposed publicly since in rare cases they may need to be called manually.
  */
 export default class EntityLoaderUtils<
-  TFields extends object,
-  TID extends NonNullable<TFields[TSelectedFields]>,
+  TFields extends Record<string, any>,
+  TIDField extends keyof NonNullable<Pick<TFields, TSelectedFields>>,
   TViewerContext extends ViewerContext,
-  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>,
+  TEntity extends ReadonlyEntity<TFields, TIDField, TViewerContext, TSelectedFields>,
   TPrivacyPolicy extends EntityPrivacyPolicy<
     TFields,
-    TID,
+    TIDField,
     TViewerContext,
     TEntity,
     TSelectedFields
@@ -35,15 +36,15 @@ export default class EntityLoaderUtils<
     private readonly queryContext: EntityQueryContext,
     private readonly privacyPolicyEvaluationContext: EntityPrivacyPolicyEvaluationContext<
       TFields,
-      TID,
+      TIDField,
       TViewerContext,
       TEntity,
       TSelectedFields
     >,
-    private readonly entityConfiguration: EntityConfiguration<TFields>,
+    private readonly entityConfiguration: EntityConfiguration<TFields, TIDField>,
     private readonly entityClass: IEntityClass<
       TFields,
-      TID,
+      TIDField,
       TViewerContext,
       TEntity,
       TPrivacyPolicy,
@@ -51,7 +52,7 @@ export default class EntityLoaderUtils<
     >,
     private readonly entitySelectedFields: TSelectedFields[] | undefined,
     private readonly privacyPolicy: TPrivacyPolicy,
-    private readonly dataManager: EntityDataManager<TFields>,
+    private readonly dataManager: EntityDataManager<TFields, TIDField>,
     protected readonly metricsAdapter: IEntityMetricsAdapter,
   ) {}
 
@@ -60,7 +61,35 @@ export default class EntityLoaderUtils<
    * @param objectFields - entity data object to be invalidated
    */
   async invalidateFieldsAsync(objectFields: Readonly<TFields>): Promise<void> {
-    await this.dataManager.invalidateObjectFieldsAsync(objectFields);
+    const keys = Object.keys(objectFields) as (keyof TFields)[];
+    const singleFieldKeyValues = keys
+      .map((fieldName: keyof TFields) => {
+        const value = objectFields[fieldName];
+        if (value === undefined || value === null) {
+          return null;
+        }
+        return [
+          new SingleFieldHolder<TFields, TIDField, typeof fieldName>(fieldName),
+          new SingleFieldValueHolder(value),
+        ] as const;
+      })
+      .filter((kv) => kv !== null);
+
+    const compositeFieldKeyValues = this.entityConfiguration.compositeFieldInfo
+      .getAllCompositeFieldHolders()
+      .map((compositeFieldHolder) => {
+        const compositeFieldValueHolder =
+          compositeFieldHolder.extractCompositeFieldValueHolderFromObjectFields(objectFields);
+        return compositeFieldValueHolder
+          ? ([compositeFieldHolder, compositeFieldValueHolder] as const)
+          : null;
+      })
+      .filter((kv) => kv !== null);
+
+    await this.dataManager.invalidateKeyValuePairsAsync([
+      ...singleFieldKeyValues,
+      ...compositeFieldKeyValues,
+    ]);
   }
 
   /**
@@ -86,7 +115,7 @@ export default class EntityLoaderUtils<
     const selectedFields = pick(fieldsObject, entitySelectedFields);
     return new this.entityClass({
       viewerContext: this.viewerContext,
-      id: id as TID,
+      id: id as TFields[TIDField],
       databaseFields: fieldsObject,
       selectedFields,
     });

package/src/EntityMutationInfo.ts

@@ -8,10 +8,10 @@ export enum EntityMutationType {
 }
 
 export type EntityValidatorMutationInfo<
-  TFields extends object,
-  TID extends NonNullable<TFields[TSelectedFields]>,
+  TFields extends Record<string, any>,
+  TIDField extends keyof NonNullable<Pick<TFields, TSelectedFields>>,
   TViewerContext extends ViewerContext,
-  TEntity extends Entity<TFields, TID, TViewerContext, TSelectedFields>,
+  TEntity extends Entity<TFields, TIDField, TViewerContext, TSelectedFields>,
   TSelectedFields extends keyof TFields = keyof TFields,
 > =
   | {
@@ -39,10 +39,10 @@ export type EntityCascadingDeletionInfo = {
 };
 
 export type EntityTriggerMutationInfo<
-  TFields extends object,
-  TID extends NonNullable<TFields[TSelectedFields]>,
+  TFields extends Record<string, any>,
+  TIDField extends keyof NonNullable<Pick<TFields, TSelectedFields>>,
   TViewerContext extends ViewerContext,
-  TEntity extends Entity<TFields, TID, TViewerContext, TSelectedFields>,
+  TEntity extends Entity<TFields, TIDField, TViewerContext, TSelectedFields>,
   TSelectedFields extends keyof TFields = keyof TFields,
 > =
   | {

package/src/EntityMutationTriggerConfiguration.ts

@@ -7,48 +7,84 @@ import ViewerContext from './ViewerContext';
  * Interface to define trigger behavior for entities.
  */
 export default interface EntityMutationTriggerConfiguration<
-  TFields extends object,
-  TID extends NonNullable<TFields[TSelectedFields]>,
+  TFields extends Record<string, any>,
+  TIDField extends keyof NonNullable<Pick<TFields, TSelectedFields>>,
   TViewerContext extends ViewerContext,
-  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>,
+  TEntity extends ReadonlyEntity<TFields, TIDField, TViewerContext, TSelectedFields>,
   TSelectedFields extends keyof TFields = keyof TFields,
 > {
   /**
    * Trigger set that runs within the transaction but before the entity is created in the database.
    */
-  beforeCreate?: EntityMutationTrigger<TFields, TID, TViewerContext, TEntity, TSelectedFields>[];
+  beforeCreate?: EntityMutationTrigger<
+    TFields,
+    TIDField,
+    TViewerContext,
+    TEntity,
+    TSelectedFields
+  >[];
   /**
    * Trigger set that runs within the transaction but after the entity is created in the database and cache is invalidated.
    */
-  afterCreate?: EntityMutationTrigger<TFields, TID, TViewerContext, TEntity, TSelectedFields>[];
+  afterCreate?: EntityMutationTrigger<
+    TFields,
+    TIDField,
+    TViewerContext,
+    TEntity,
+    TSelectedFields
+  >[];
 
   /**
    * Trigger set that runs within the transaction but before the entity is updated in the database.
    */
-  beforeUpdate?: EntityMutationTrigger<TFields, TID, TViewerContext, TEntity, TSelectedFields>[];
+  beforeUpdate?: EntityMutationTrigger<
+    TFields,
+    TIDField,
+    TViewerContext,
+    TEntity,
+    TSelectedFields
+  >[];
   /**
    * Trigger set that runs within the transaction but after the entity is updated in the database and cache is invalidated.
    */
-  afterUpdate?: EntityMutationTrigger<TFields, TID, TViewerContext, TEntity, TSelectedFields>[];
+  afterUpdate?: EntityMutationTrigger<
+    TFields,
+    TIDField,
+    TViewerContext,
+    TEntity,
+    TSelectedFields
+  >[];
 
   /**
    * Trigger set that runs within the transaction but before the entity is deleted from the database.
    */
-  beforeDelete?: EntityMutationTrigger<TFields, TID, TViewerContext, TEntity, TSelectedFields>[];
+  beforeDelete?: EntityMutationTrigger<
+    TFields,
+    TIDField,
+    TViewerContext,
+    TEntity,
+    TSelectedFields
+  >[];
   /**
    * Trigger set that runs within the transaction but after the entity is deleted from the database and cache is invalidated.
    */
-  afterDelete?: EntityMutationTrigger<TFields, TID, TViewerContext, TEntity, TSelectedFields>[];
+  afterDelete?: EntityMutationTrigger<
+    TFields,
+    TIDField,
+    TViewerContext,
+    TEntity,
+    TSelectedFields
+  >[];
 
   /**
    * Trigger set that runs within the transaction but before the entity is created, updated, or deleted.
    */
-  beforeAll?: EntityMutationTrigger<TFields, TID, TViewerContext, TEntity, TSelectedFields>[];
+  beforeAll?: EntityMutationTrigger<TFields, TIDField, TViewerContext, TEntity, TSelectedFields>[];
   /**
    * Trigger set that runs within the transaction but after the entity is created in, updated in, or deleted from
    * the database and the cache is invalidated.
    */
-  afterAll?: EntityMutationTrigger<TFields, TID, TViewerContext, TEntity, TSelectedFields>[];
+  afterAll?: EntityMutationTrigger<TFields, TIDField, TViewerContext, TEntity, TSelectedFields>[];
 
   /**
    * Trigger set that runs after committing the mutation transaction. If the call to the mutation is wrapped in a transaction, these
@@ -56,7 +92,7 @@ export default interface EntityMutationTriggerConfiguration<
    */
   afterCommit?: EntityNonTransactionalMutationTrigger<
     TFields,
-    TID,
+    TIDField,
     TViewerContext,
     TEntity,
     TSelectedFields
@@ -68,17 +104,23 @@ export default interface EntityMutationTriggerConfiguration<
  * same transaction as the mutation itself.
  */
 export abstract class EntityMutationTrigger<
-  TFields extends object,
-  TID extends NonNullable<TFields[TSelectedFields]>,
+  TFields extends Record<string, any>,
+  TIDField extends keyof NonNullable<Pick<TFields, TSelectedFields>>,
   TViewerContext extends ViewerContext,
-  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>,
+  TEntity extends ReadonlyEntity<TFields, TIDField, TViewerContext, TSelectedFields>,
   TSelectedFields extends keyof TFields = keyof TFields,
 > {
   abstract executeAsync(
     viewerContext: TViewerContext,
     queryContext: EntityTransactionalQueryContext,
     entity: TEntity,
-    mutationInfo: EntityTriggerMutationInfo<TFields, TID, TViewerContext, TEntity, TSelectedFields>,
+    mutationInfo: EntityTriggerMutationInfo<
+      TFields,
+      TIDField,
+      TViewerContext,
+      TEntity,
+      TSelectedFields
+    >,
   ): Promise<void>;
 }
 
@@ -87,15 +129,21 @@ export abstract class EntityMutationTrigger<
  * since they run after the transaction is committed.
  */
 export abstract class EntityNonTransactionalMutationTrigger<
-  TFields extends object,
-  TID extends NonNullable<TFields[TSelectedFields]>,
+  TFields extends Record<string, any>,
+  TIDField extends keyof NonNullable<Pick<TFields, TSelectedFields>>,
   TViewerContext extends ViewerContext,
-  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>,
+  TEntity extends ReadonlyEntity<TFields, TIDField, TViewerContext, TSelectedFields>,
   TSelectedFields extends keyof TFields = keyof TFields,
 > {
   abstract executeAsync(
     viewerContext: TViewerContext,
     entity: TEntity,
-    mutationInfo: EntityTriggerMutationInfo<TFields, TID, TViewerContext, TEntity, TSelectedFields>,
+    mutationInfo: EntityTriggerMutationInfo<
+      TFields,
+      TIDField,
+      TViewerContext,
+      TEntity,
+      TSelectedFields
+    >,
   ): Promise<void>;
 }

package/src/EntityMutationValidator.ts

@@ -8,10 +8,10 @@ import ViewerContext from './ViewerContext';
  * same transaction as the mutation itself before creating or updating an entity.
  */
 export default abstract class EntityMutationValidator<
-  TFields extends object,
-  TID extends NonNullable<TFields[TSelectedFields]>,
+  TFields extends Record<string, any>,
+  TIDField extends keyof NonNullable<Pick<TFields, TSelectedFields>>,
   TViewerContext extends ViewerContext,
-  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>,
+  TEntity extends ReadonlyEntity<TFields, TIDField, TViewerContext, TSelectedFields>,
   TSelectedFields extends keyof TFields = keyof TFields,
 > {
   abstract executeAsync(
@@ -20,7 +20,7 @@ export default abstract class EntityMutationValidator<
     entity: TEntity,
     mutationInfo: EntityValidatorMutationInfo<
       TFields,
-      TID,
+      TIDField,
       TViewerContext,
       TEntity,
       TSelectedFields

package/src/EntityMutatorFactory.ts

@@ -19,13 +19,13 @@ import IEntityMetricsAdapter from './metrics/IEntityMetricsAdapter';
  * The primary interface for creating, mutating, and deleting entities.
  */
 export default class EntityMutatorFactory<
-  TFields extends object,
-  TID extends NonNullable<TFields[TSelectedFields]>,
+  TFields extends Record<string, any>,
+  TIDField extends keyof NonNullable<Pick<TFields, TSelectedFields>>,
   TViewerContext extends ViewerContext,
-  TEntity extends Entity<TFields, TID, TViewerContext, TSelectedFields>,
+  TEntity extends Entity<TFields, TIDField, TViewerContext, TSelectedFields>,
   TPrivacyPolicy extends EntityPrivacyPolicy<
     TFields,
-    TID,
+    TIDField,
     TViewerContext,
     TEntity,
     TSelectedFields
@@ -34,10 +34,10 @@ export default class EntityMutatorFactory<
 > {
   constructor(
     private readonly entityCompanionProvider: EntityCompanionProvider,
-    private readonly entityConfiguration: EntityConfiguration<TFields>,
+    private readonly entityConfiguration: EntityConfiguration<TFields, TIDField>,
     private readonly entityClass: IEntityClass<
       TFields,
-      TID,
+      TIDField,
       TViewerContext,
       TEntity,
       TPrivacyPolicy,
@@ -46,27 +46,27 @@ export default class EntityMutatorFactory<
     private readonly privacyPolicy: TPrivacyPolicy,
     private readonly mutationValidators: EntityMutationValidator<
       TFields,
-      TID,
+      TIDField,
       TViewerContext,
       TEntity,
       TSelectedFields
     >[],
     private readonly mutationTriggers: EntityMutationTriggerConfiguration<
       TFields,
-      TID,
+      TIDField,
       TViewerContext,
       TEntity,
       TSelectedFields
     >,
     private readonly entityLoaderFactory: EntityLoaderFactory<
       TFields,
-      TID,
+      TIDField,
       TViewerContext,
       TEntity,
       TPrivacyPolicy,
       TSelectedFields
     >,
-    private readonly databaseAdapter: EntityDatabaseAdapter<TFields>,
+    private readonly databaseAdapter: EntityDatabaseAdapter<TFields, TIDField>,
     private readonly metricsAdapter: IEntityMetricsAdapter,
   ) {}
 
@@ -81,7 +81,7 @@ export default class EntityMutatorFactory<
     queryContext: EntityQueryContext,
   ): AuthorizationResultBasedCreateMutator<
     TFields,
-    TID,
+    TIDField,
     TViewerContext,
     TEntity,
     TPrivacyPolicy,
@@ -113,7 +113,7 @@ export default class EntityMutatorFactory<
     queryContext: EntityQueryContext,
   ): AuthorizationResultBasedUpdateMutator<
     TFields,
-    TID,
+    TIDField,
     TViewerContext,
     TEntity,
     TPrivacyPolicy,
@@ -145,7 +145,7 @@ export default class EntityMutatorFactory<
     queryContext: EntityQueryContext,
   ): AuthorizationResultBasedDeleteMutator<
     TFields,
-    TID,
+    TIDField,
     TViewerContext,
     TEntity,
     TPrivacyPolicy,