@expo/entity 0.40.0 → 0.42.0

package/src/__tests__/EntityEdges-test.ts

@@ -13,10 +13,11 @@ import EntityPrivacyPolicy, {
 } from '../EntityPrivacyPolicy';
 import { EntityTransactionalQueryContext, EntityQueryContext } from '../EntityQueryContext';
 import { CacheStatus } from '../internal/ReadThroughEntityCache';
+import { SingleFieldHolder, SingleFieldValueHolder } from '../internal/SingleFieldHolder';
 import PrivacyPolicyRule, { RuleEvaluationResult } from '../rules/PrivacyPolicyRule';
-import TestViewerContext from '../testfixtures/TestViewerContext';
-import { InMemoryFullCacheStubCacheAdapter } from '../utils/testing/StubCacheAdapter';
-import { createUnitTestEntityCompanionProvider } from '../utils/testing/createUnitTestEntityCompanionProvider';
+import { InMemoryFullCacheStubCacheAdapter } from '../utils/__testfixtures__/StubCacheAdapter';
+import TestViewerContext from '../utils/__testfixtures__/TestViewerContext';
+import { createUnitTestEntityCompanionProvider } from '../utils/__testfixtures__/createUnitTestEntityCompanionProvider';
 
 interface OtherFields {
   id: string;
@@ -73,7 +74,7 @@ const makeEntityClasses = (edgeDeletionBehavior: EntityEdgeDeletionBehavior) =>
 
   class AlwaysAllowPrivacyPolicyRuleThatRecords extends PrivacyPolicyRule<
     any,
-    string,
+    'id',
     TestViewerContext,
     any,
     any
@@ -87,7 +88,7 @@ const makeEntityClasses = (edgeDeletionBehavior: EntityEdgeDeletionBehavior) =>
       _queryContext: EntityQueryContext,
       evaluationContext: EntityPrivacyPolicyEvaluationContext<
         any,
-        string,
+        'id',
         TestViewerContext,
         any,
         any
@@ -105,7 +106,7 @@ const makeEntityClasses = (edgeDeletionBehavior: EntityEdgeDeletionBehavior) =>
 
   class TestEntityPrivacyPolicy extends EntityPrivacyPolicy<
     any,
-    string,
+    'id',
     TestViewerContext,
     any,
     any
@@ -126,7 +127,7 @@ const makeEntityClasses = (edgeDeletionBehavior: EntityEdgeDeletionBehavior) =>
 
   class ParentCheckInfoDeletionTrigger extends EntityMutationTrigger<
     ParentFields,
-    string,
+    'id',
     TestViewerContext,
     ParentEntity
   > {
@@ -134,12 +135,7 @@ const makeEntityClasses = (edgeDeletionBehavior: EntityEdgeDeletionBehavior) =>
       _viewerContext: TestViewerContext,
       _queryContext: EntityTransactionalQueryContext,
       _entity: ParentEntity,
-      mutationInfo: EntityTriggerMutationInfo<
-        ParentFields,
-        string,
-        TestViewerContext,
-        ParentEntity
-      >,
+      mutationInfo: EntityTriggerMutationInfo<ParentFields, 'id', TestViewerContext, ParentEntity>,
     ): Promise<void> {
       invariant(mutationInfo.type === EntityMutationType.DELETE, 'invalid EntityMutationType');
       if (mutationInfo.cascadingDeleteCause !== null) {
@@ -152,7 +148,7 @@ const makeEntityClasses = (edgeDeletionBehavior: EntityEdgeDeletionBehavior) =>
 
   class ParentCheckInfoUpdateTrigger extends EntityMutationTrigger<
     ParentFields,
-    string,
+    'id',
     TestViewerContext,
     ParentEntity
   > {
@@ -160,12 +156,7 @@ const makeEntityClasses = (edgeDeletionBehavior: EntityEdgeDeletionBehavior) =>
       _viewerContext: TestViewerContext,
       _queryContext: EntityTransactionalQueryContext,
       _entity: ParentEntity,
-      mutationInfo: EntityTriggerMutationInfo<
-        ParentFields,
-        string,
-        TestViewerContext,
-        ParentEntity
-      >,
+      mutationInfo: EntityTriggerMutationInfo<ParentFields, 'id', TestViewerContext, ParentEntity>,
     ): Promise<void> {
       invariant(mutationInfo.type === EntityMutationType.UPDATE, 'invalid EntityMutationType');
       if (mutationInfo.cascadingDeleteCause !== null) {
@@ -178,7 +169,7 @@ const makeEntityClasses = (edgeDeletionBehavior: EntityEdgeDeletionBehavior) =>
 
   class ChildCheckInfoDeletionTrigger extends EntityMutationTrigger<
     ChildFields,
-    string,
+    'id',
     TestViewerContext,
     ChildEntity
   > {
@@ -186,7 +177,7 @@ const makeEntityClasses = (edgeDeletionBehavior: EntityEdgeDeletionBehavior) =>
       _viewerContext: TestViewerContext,
       _queryContext: EntityTransactionalQueryContext,
       _entity: ChildEntity,
-      mutationInfo: EntityTriggerMutationInfo<ChildFields, string, TestViewerContext, ChildEntity>,
+      mutationInfo: EntityTriggerMutationInfo<ChildFields, 'id', TestViewerContext, ChildEntity>,
     ): Promise<void> {
       invariant(mutationInfo.type === EntityMutationType.DELETE, 'invalid EntityMutationType');
       if (mutationInfo.cascadingDeleteCause === null) {
@@ -210,7 +201,7 @@ const makeEntityClasses = (edgeDeletionBehavior: EntityEdgeDeletionBehavior) =>
 
   class ChildCheckInfoUpdateTrigger extends EntityMutationTrigger<
     ChildFields,
-    string,
+    'id',
     TestViewerContext,
     ChildEntity
   > {
@@ -218,7 +209,7 @@ const makeEntityClasses = (edgeDeletionBehavior: EntityEdgeDeletionBehavior) =>
       _viewerContext: TestViewerContext,
       _queryContext: EntityTransactionalQueryContext,
       _entity: ChildEntity,
-      mutationInfo: EntityTriggerMutationInfo<ChildFields, string, TestViewerContext, ChildEntity>,
+      mutationInfo: EntityTriggerMutationInfo<ChildFields, 'id', TestViewerContext, ChildEntity>,
     ): Promise<void> {
       invariant(mutationInfo.type === EntityMutationType.UPDATE, 'invalid EntityMutationType');
       if (mutationInfo.cascadingDeleteCause === null) {
@@ -242,7 +233,7 @@ const makeEntityClasses = (edgeDeletionBehavior: EntityEdgeDeletionBehavior) =>
 
   class GrandChildCheckInfoDeletionTrigger extends EntityMutationTrigger<
     GrandChildFields,
-    string,
+    'id',
     TestViewerContext,
     GrandChildEntity
   > {
@@ -252,7 +243,7 @@ const makeEntityClasses = (edgeDeletionBehavior: EntityEdgeDeletionBehavior) =>
       _entity: GrandChildEntity,
       mutationInfo: EntityTriggerMutationInfo<
         GrandChildFields,
-        string,
+        'id',
         TestViewerContext,
         GrandChildEntity
       >,
@@ -293,7 +284,7 @@ const makeEntityClasses = (edgeDeletionBehavior: EntityEdgeDeletionBehavior) =>
 
   class GrandChildCheckInfoUpdateTrigger extends EntityMutationTrigger<
     GrandChildFields,
-    string,
+    'id',
     TestViewerContext,
     GrandChildEntity
   > {
@@ -303,7 +294,7 @@ const makeEntityClasses = (edgeDeletionBehavior: EntityEdgeDeletionBehavior) =>
       _entity: GrandChildEntity,
       mutationInfo: EntityTriggerMutationInfo<
         GrandChildFields,
-        string,
+        'id',
         TestViewerContext,
         GrandChildEntity
       >,
@@ -342,10 +333,10 @@ const makeEntityClasses = (edgeDeletionBehavior: EntityEdgeDeletionBehavior) =>
     }
   }
 
-  class OtherEntity extends Entity<OtherFields, string, TestViewerContext> {
+  class OtherEntity extends Entity<OtherFields, 'id', TestViewerContext> {
     static defineCompanionDefinition(): EntityCompanionDefinition<
       OtherFields,
-      string,
+      'id',
       TestViewerContext,
       OtherEntity,
       TestEntityPrivacyPolicy
@@ -358,10 +349,10 @@ const makeEntityClasses = (edgeDeletionBehavior: EntityEdgeDeletionBehavior) =>
     }
   }
 
-  class ParentEntity extends Entity<ParentFields, string, TestViewerContext> {
+  class ParentEntity extends Entity<ParentFields, 'id', TestViewerContext> {
     static defineCompanionDefinition(): EntityCompanionDefinition<
       ParentFields,
-      string,
+      'id',
       TestViewerContext,
       ParentEntity,
       TestEntityPrivacyPolicy
@@ -381,10 +372,10 @@ const makeEntityClasses = (edgeDeletionBehavior: EntityEdgeDeletionBehavior) =>
     }
   }
 
-  class ChildEntity extends Entity<ChildFields, string, TestViewerContext> {
+  class ChildEntity extends Entity<ChildFields, 'id', TestViewerContext> {
     static defineCompanionDefinition(): EntityCompanionDefinition<
       ChildFields,
-      string,
+      'id',
       TestViewerContext,
       ChildEntity,
       TestEntityPrivacyPolicy
@@ -404,10 +395,10 @@ const makeEntityClasses = (edgeDeletionBehavior: EntityEdgeDeletionBehavior) =>
     }
   }
 
-  class GrandChildEntity extends Entity<GrandChildFields, string, TestViewerContext> {
+  class GrandChildEntity extends Entity<GrandChildFields, 'id', TestViewerContext> {
     static defineCompanionDefinition(): EntityCompanionDefinition<
       GrandChildFields,
-      string,
+      'id',
       TestViewerContext,
       GrandChildEntity,
       TestEntityPrivacyPolicy
@@ -427,7 +418,7 @@ const makeEntityClasses = (edgeDeletionBehavior: EntityEdgeDeletionBehavior) =>
     }
   }
 
-  const otherEntityConfiguration = new EntityConfiguration<OtherFields>({
+  const otherEntityConfiguration = new EntityConfiguration<OtherFields, 'id'>({
     idField: 'id',
     tableName: 'others',
     schema: {
@@ -440,7 +431,7 @@ const makeEntityClasses = (edgeDeletionBehavior: EntityEdgeDeletionBehavior) =>
     cacheAdapterFlavor: 'redis',
   });
 
-  const parentEntityConfiguration = new EntityConfiguration<ParentFields>({
+  const parentEntityConfiguration = new EntityConfiguration<ParentFields, 'id'>({
     idField: 'id',
     tableName: 'parents',
     inboundEdges: [ChildEntity],
@@ -454,7 +445,7 @@ const makeEntityClasses = (edgeDeletionBehavior: EntityEdgeDeletionBehavior) =>
     cacheAdapterFlavor: 'redis',
   });
 
-  const childEntityConfiguration = new EntityConfiguration<ChildFields>({
+  const childEntityConfiguration = new EntityConfiguration<ChildFields, 'id'>({
     idField: 'id',
     tableName: 'children',
     inboundEdges: [GrandChildEntity],
@@ -484,7 +475,7 @@ const makeEntityClasses = (edgeDeletionBehavior: EntityEdgeDeletionBehavior) =>
     cacheAdapterFlavor: 'redis',
   });
 
-  const grandChildEntityConfiguration = new EntityConfiguration<GrandChildFields>({
+  const grandChildEntityConfiguration = new EntityConfiguration<GrandChildFields, 'id'>({
     idField: 'id',
     tableName: 'grandchildren',
     schema: {
@@ -527,42 +518,36 @@ describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {
       const companionProvider = createUnitTestEntityCompanionProvider();
       const viewerContext = new TestViewerContext(companionProvider);
 
-      const parent = await ParentEntity.creator(viewerContext).enforcing().createAsync();
+      const parent = await ParentEntity.creator(viewerContext).createAsync();
       const child = await ChildEntity.creator(viewerContext)
-        .enforcing()
         .setField('parent_id', parent.getID())
         .createAsync();
       const grandchild = await GrandChildEntity.creator(viewerContext)
-        .enforcing()
         .setField('parent_id', child.getID())
         .createAsync();
 
       await expect(
-        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID()),
+        ParentEntity.loader(viewerContext).loadByIDNullableAsync(parent.getID()),
       ).resolves.not.toBeNull();
       await expect(
-        ChildEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(child.getID()),
+        ChildEntity.loader(viewerContext).loadByIDNullableAsync(child.getID()),
       ).resolves.not.toBeNull();
       await expect(
-        GrandChildEntity.loader(viewerContext)
-          .enforcing()
-          .loadByIDNullableAsync(grandchild.getID()),
+        GrandChildEntity.loader(viewerContext).loadByIDNullableAsync(grandchild.getID()),
       ).resolves.not.toBeNull();
 
       privacyPolicyEvaluationRecords.shouldRecord = true;
-      await ParentEntity.deleter(parent).enforcing().deleteAsync();
+      await ParentEntity.deleter(parent).deleteAsync();
       privacyPolicyEvaluationRecords.shouldRecord = false;
 
       await expect(
-        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID()),
+        ParentEntity.loader(viewerContext).loadByIDNullableAsync(parent.getID()),
       ).resolves.toBeNull();
       await expect(
-        ChildEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(child.getID()),
+        ChildEntity.loader(viewerContext).loadByIDNullableAsync(child.getID()),
       ).resolves.toBeNull();
       await expect(
-        GrandChildEntity.loader(viewerContext)
-          .enforcing()
-          .loadByIDNullableAsync(grandchild.getID()),
+        GrandChildEntity.loader(viewerContext).loadByIDNullableAsync(grandchild.getID()),
       ).resolves.toBeNull();
 
       // two calls for each trigger, one beforeDelete, one afterDelete
@@ -651,44 +636,38 @@ describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {
       const companionProvider = createUnitTestEntityCompanionProvider();
       const viewerContext = new TestViewerContext(companionProvider);
 
-      const parent = await ParentEntity.creator(viewerContext).enforcing().createAsync();
+      const parent = await ParentEntity.creator(viewerContext).createAsync();
       const child = await ChildEntity.creator(viewerContext)
-        .enforcing()
         .setField('parent_id', parent.getID())
         .createAsync();
       const grandchild = await GrandChildEntity.creator(viewerContext)
-        .enforcing()
         .setField('parent_id', child.getID())
         .createAsync();
 
       await expect(
-        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID()),
+        ParentEntity.loader(viewerContext).loadByIDNullableAsync(parent.getID()),
       ).resolves.not.toBeNull();
       await expect(
-        ChildEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(child.getID()),
+        ChildEntity.loader(viewerContext).loadByIDNullableAsync(child.getID()),
       ).resolves.not.toBeNull();
       await expect(
-        GrandChildEntity.loader(viewerContext)
-          .enforcing()
-          .loadByIDNullableAsync(grandchild.getID()),
+        GrandChildEntity.loader(viewerContext).loadByIDNullableAsync(grandchild.getID()),
       ).resolves.not.toBeNull();
 
       privacyPolicyEvaluationRecords.shouldRecord = true;
-      await ParentEntity.deleter(parent).enforcing().deleteAsync();
+      await ParentEntity.deleter(parent).deleteAsync();
       privacyPolicyEvaluationRecords.shouldRecord = false;
 
       await expect(
-        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID()),
+        ParentEntity.loader(viewerContext).loadByIDNullableAsync(parent.getID()),
       ).resolves.toBeNull();
 
-      const loadedChild = await ChildEntity.loader(viewerContext)
-        .enforcing()
-        .loadByIDAsync(child.getID());
+      const loadedChild = await ChildEntity.loader(viewerContext).loadByIDAsync(child.getID());
       expect(loadedChild.getField('parent_id')).toBeNull();
 
-      const loadedGrandchild = await GrandChildEntity.loader(viewerContext)
-        .enforcing()
-        .loadByIDAsync(grandchild.getID());
+      const loadedGrandchild = await GrandChildEntity.loader(viewerContext).loadByIDAsync(
+        grandchild.getID(),
+      );
       expect(loadedGrandchild.getField('parent_id')).toEqual(loadedChild.getID());
 
       // two calls for only parent trigger, one beforeDelete, one afterDelete
@@ -766,72 +745,81 @@ describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {
       const companionProvider = createUnitTestEntityCompanionProvider();
       const viewerContext = new TestViewerContext(companionProvider);
 
-      const parent = await ParentEntity.creator(viewerContext).enforcing().createAsync();
+      const parent = await ParentEntity.creator(viewerContext).createAsync();
       const child = await ChildEntity.creator(viewerContext)
-        .enforcing()
         .setField('parent_id', parent.getID())
         .createAsync();
       const grandchild = await GrandChildEntity.creator(viewerContext)
-        .enforcing()
         .setField('parent_id', child.getID())
         .createAsync();
 
       await expect(
-        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID()),
+        ParentEntity.loader(viewerContext).loadByIDNullableAsync(parent.getID()),
       ).resolves.not.toBeNull();
       await expect(
-        ChildEntity.loader(viewerContext)
-          .enforcing()
-          .loadByFieldEqualingAsync('parent_id', parent.getID()),
+        ChildEntity.loader(viewerContext).loadByFieldEqualingAsync('parent_id', parent.getID()),
       ).resolves.not.toBeNull();
       await expect(
-        GrandChildEntity.loader(viewerContext)
-          .enforcing()
-          .loadByFieldEqualingAsync('parent_id', child.getID()),
+        GrandChildEntity.loader(viewerContext).loadByFieldEqualingAsync('parent_id', child.getID()),
       ).resolves.not.toBeNull();
 
       const childCacheAdapter = viewerContext.getViewerScopedEntityCompanionForClass(ChildEntity)[
         'entityCompanion'
-      ]['tableDataCoordinator']['cacheAdapter'] as InMemoryFullCacheStubCacheAdapter<ChildFields>;
-      const childCachedBefore = await childCacheAdapter.loadManyAsync('parent_id', [
-        parent.getID(),
-      ]);
-      expect(childCachedBefore.get(parent.getID())?.status).toEqual(CacheStatus.HIT);
+      ]['tableDataCoordinator']['cacheAdapter'] as InMemoryFullCacheStubCacheAdapter<
+        ChildFields,
+        'id'
+      >;
+      const childCachedBefore = await childCacheAdapter.loadManyAsync(
+        new SingleFieldHolder('parent_id'),
+        [new SingleFieldValueHolder(parent.getID())],
+      );
+      expect(childCachedBefore.get(new SingleFieldValueHolder(parent.getID()))?.status).toEqual(
+        CacheStatus.HIT,
+      );
 
       const grandChildCacheAdapter = viewerContext.getViewerScopedEntityCompanionForClass(
         GrandChildEntity,
       )['entityCompanion']['tableDataCoordinator'][
         'cacheAdapter'
-      ] as InMemoryFullCacheStubCacheAdapter<ChildFields>;
-      const grandChildCachedBefore = await grandChildCacheAdapter.loadManyAsync('parent_id', [
-        child.getID(),
-      ]);
-      expect(grandChildCachedBefore.get(child.getID())?.status).toEqual(CacheStatus.HIT);
+      ] as InMemoryFullCacheStubCacheAdapter<ChildFields, 'id'>;
+      const grandChildCachedBefore = await grandChildCacheAdapter.loadManyAsync(
+        new SingleFieldHolder('parent_id'),
+        [new SingleFieldValueHolder(child.getID())],
+      );
+      expect(grandChildCachedBefore.get(new SingleFieldValueHolder(child.getID()))?.status).toEqual(
+        CacheStatus.HIT,
+      );
 
       privacyPolicyEvaluationRecords.shouldRecord = true;
-      await ParentEntity.deleter(parent).enforcing().deleteAsync();
+      await ParentEntity.deleter(parent).deleteAsync();
       privacyPolicyEvaluationRecords.shouldRecord = false;
 
-      const childCachedAfter = await childCacheAdapter.loadManyAsync('parent_id', [parent.getID()]);
-      expect(childCachedAfter.get(parent.getID())?.status).toEqual(CacheStatus.MISS);
-
-      const grandChildCachedAfter = await grandChildCacheAdapter.loadManyAsync('parent_id', [
-        child.getID(),
-      ]);
-      expect(grandChildCachedAfter.get(child.getID())?.status).toEqual(CacheStatus.HIT);
+      const childCachedAfter = await childCacheAdapter.loadManyAsync(
+        new SingleFieldHolder('parent_id'),
+        [new SingleFieldValueHolder(parent.getID())],
+      );
+      expect(childCachedAfter.get(new SingleFieldValueHolder(parent.getID()))?.status).toEqual(
+        CacheStatus.MISS,
+      );
+
+      const grandChildCachedAfter = await grandChildCacheAdapter.loadManyAsync(
+        new SingleFieldHolder('parent_id'),
+        [new SingleFieldValueHolder(child.getID())],
+      );
+      expect(grandChildCachedAfter.get(new SingleFieldValueHolder(child.getID()))?.status).toEqual(
+        CacheStatus.HIT,
+      );
 
       await expect(
-        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID()),
+        ParentEntity.loader(viewerContext).loadByIDNullableAsync(parent.getID()),
       ).resolves.toBeNull();
 
-      const loadedChild = await ChildEntity.loader(viewerContext)
-        .enforcing()
-        .loadByIDAsync(child.getID());
+      const loadedChild = await ChildEntity.loader(viewerContext).loadByIDAsync(child.getID());
       expect(loadedChild).not.toBeNull();
 
-      const loadedGrandchild = await GrandChildEntity.loader(viewerContext)
-        .enforcing()
-        .loadByIDAsync(grandchild.getID());
+      const loadedGrandchild = await GrandChildEntity.loader(viewerContext).loadByIDAsync(
+        grandchild.getID(),
+      );
       expect(loadedGrandchild.getField('parent_id')).toEqual(loadedChild.getID());
 
       // two calls for only parent trigger, one beforeDelete, one afterDelete
@@ -907,70 +895,79 @@ describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {
       const companionProvider = createUnitTestEntityCompanionProvider();
       const viewerContext = new TestViewerContext(companionProvider);
 
-      const parent = await ParentEntity.creator(viewerContext).enforcing().createAsync();
+      const parent = await ParentEntity.creator(viewerContext).createAsync();
       const child = await ChildEntity.creator(viewerContext)
-        .enforcing()
         .setField('parent_id', parent.getID())
         .createAsync();
       const grandchild = await GrandChildEntity.creator(viewerContext)
-        .enforcing()
         .setField('parent_id', child.getID())
         .createAsync();
 
       await expect(
-        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID()),
+        ParentEntity.loader(viewerContext).loadByIDNullableAsync(parent.getID()),
       ).resolves.not.toBeNull();
       await expect(
-        ChildEntity.loader(viewerContext)
-          .enforcing()
-          .loadByFieldEqualingAsync('parent_id', parent.getID()),
+        ChildEntity.loader(viewerContext).loadByFieldEqualingAsync('parent_id', parent.getID()),
       ).resolves.not.toBeNull();
       await expect(
-        GrandChildEntity.loader(viewerContext)
-          .enforcing()
-          .loadByFieldEqualingAsync('parent_id', child.getID()),
+        GrandChildEntity.loader(viewerContext).loadByFieldEqualingAsync('parent_id', child.getID()),
       ).resolves.not.toBeNull();
 
       const childCacheAdapter = viewerContext.getViewerScopedEntityCompanionForClass(ChildEntity)[
         'entityCompanion'
-      ]['tableDataCoordinator']['cacheAdapter'] as InMemoryFullCacheStubCacheAdapter<ChildFields>;
-      const childCachedBefore = await childCacheAdapter.loadManyAsync('parent_id', [
-        parent.getID(),
-      ]);
-      expect(childCachedBefore.get(parent.getID())?.status).toEqual(CacheStatus.HIT);
+      ]['tableDataCoordinator']['cacheAdapter'] as InMemoryFullCacheStubCacheAdapter<
+        ChildFields,
+        'id'
+      >;
+      const childCachedBefore = await childCacheAdapter.loadManyAsync(
+        new SingleFieldHolder('parent_id'),
+        [new SingleFieldValueHolder(parent.getID())],
+      );
+      expect(childCachedBefore.get(new SingleFieldValueHolder(parent.getID()))?.status).toEqual(
+        CacheStatus.HIT,
+      );
 
       const grandChildCacheAdapter = viewerContext.getViewerScopedEntityCompanionForClass(
         GrandChildEntity,
       )['entityCompanion']['tableDataCoordinator'][
         'cacheAdapter'
-      ] as InMemoryFullCacheStubCacheAdapter<ChildFields>;
-      const grandChildCachedBefore = await grandChildCacheAdapter.loadManyAsync('parent_id', [
-        child.getID(),
-      ]);
-      expect(grandChildCachedBefore.get(child.getID())?.status).toEqual(CacheStatus.HIT);
+      ] as InMemoryFullCacheStubCacheAdapter<ChildFields, 'id'>;
+      const grandChildCachedBefore = await grandChildCacheAdapter.loadManyAsync(
+        new SingleFieldHolder('parent_id'),
+        [new SingleFieldValueHolder(child.getID())],
+      );
+      expect(grandChildCachedBefore.get(new SingleFieldValueHolder(child.getID()))?.status).toEqual(
+        CacheStatus.HIT,
+      );
 
       privacyPolicyEvaluationRecords.shouldRecord = true;
-      await ParentEntity.deleter(parent).enforcing().deleteAsync();
+      await ParentEntity.deleter(parent).deleteAsync();
       privacyPolicyEvaluationRecords.shouldRecord = false;
 
-      const childCachedAfter = await childCacheAdapter.loadManyAsync('parent_id', [parent.getID()]);
-      expect(childCachedAfter.get(parent.getID())?.status).toEqual(CacheStatus.MISS);
-
-      const grandChildCachedAfter = await grandChildCacheAdapter.loadManyAsync('parent_id', [
-        child.getID(),
-      ]);
-      expect(grandChildCachedAfter.get(child.getID())?.status).toEqual(CacheStatus.MISS);
+      const childCachedAfter = await childCacheAdapter.loadManyAsync(
+        new SingleFieldHolder('parent_id'),
+        [new SingleFieldValueHolder(parent.getID())],
+      );
+      expect(childCachedAfter.get(new SingleFieldValueHolder(parent.getID()))?.status).toEqual(
+        CacheStatus.MISS,
+      );
+
+      const grandChildCachedAfter = await grandChildCacheAdapter.loadManyAsync(
+        new SingleFieldHolder('parent_id'),
+        [new SingleFieldValueHolder(child.getID())],
+      );
+      expect(grandChildCachedAfter.get(new SingleFieldValueHolder(child.getID()))?.status).toEqual(
+        CacheStatus.MISS,
+      );
 
       await expect(
-        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID()),
+        ParentEntity.loader(viewerContext).loadByIDNullableAsync(parent.getID()),
       ).resolves.toBeNull();
       await expect(
-        ChildEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(child.getID()),
+        ChildEntity.loader(viewerContext).loadByIDNullableAsync(child.getID()),
       ).resolves.not.toBeNull();
       await expect(
-        GrandChildEntity.loader(viewerContext)
-          .enforcing()
-          .loadByIDNullableAsync(grandchild.getID()),
+        GrandChildEntity.loader(viewerContext).loadByIDNullableAsync(grandchild.getID()),
       ).resolves.not.toBeNull();
 
       // two calls for each trigger, one beforeDelete, one afterDelete

package/src/__tests__/EntityFields-test.ts

@@ -13,9 +13,9 @@ import {
   EnumField,
   StrictEnumField,
 } from '../EntityFields';
-import describeFieldTestCase from '../utils/testing/describeFieldTestCase';
+import describeFieldTestCase from '../utils/__testfixtures__/describeFieldTestCase';
 
-class TestFieldDefinition extends EntityFieldDefinition<string> {
+class TestFieldDefinition extends EntityFieldDefinition<string, false> {
   protected validateInputValueInternal(value: string): boolean {
     return value === 'helloworld';
   }

package/src/__tests__/EntityLoader-test.ts

@@ -3,17 +3,15 @@ import EnforcingEntityLoader from '../EnforcingEntityLoader';
 import EntityLoader from '../EntityLoader';
 import EntityLoaderUtils from '../EntityLoaderUtils';
 import ViewerContext from '../ViewerContext';
-import SimpleTestEntity from '../testfixtures/SimpleTestEntity';
-import { createUnitTestEntityCompanionProvider } from '../utils/testing/createUnitTestEntityCompanionProvider';
+import SimpleTestEntity from '../utils/__testfixtures__/SimpleTestEntity';
+import { createUnitTestEntityCompanionProvider } from '../utils/__testfixtures__/createUnitTestEntityCompanionProvider';
 
 describe(EntityLoader, () => {
   describe('enforcing', () => {
     it('creates a new EnforcingEntityLoader', async () => {
       const companionProvider = createUnitTestEntityCompanionProvider();
       const viewerContext = new ViewerContext(companionProvider);
-      expect(SimpleTestEntity.loader(viewerContext).enforcing()).toBeInstanceOf(
-        EnforcingEntityLoader,
-      );
+      expect(SimpleTestEntity.loader(viewerContext)).toBeInstanceOf(EnforcingEntityLoader);
     });
   });
 
@@ -21,7 +19,7 @@ describe(EntityLoader, () => {
     it('creates a new AuthorizationResultBasedEntityLoader', async () => {
       const companionProvider = createUnitTestEntityCompanionProvider();
       const viewerContext = new ViewerContext(companionProvider);
-      expect(SimpleTestEntity.loader(viewerContext).withAuthorizationResults()).toBeInstanceOf(
+      expect(SimpleTestEntity.loaderWithAuthorizationResults(viewerContext)).toBeInstanceOf(
         AuthorizationResultBasedEntityLoader,
       );
     });
@@ -31,7 +29,7 @@ describe(EntityLoader, () => {
     it('returns a instance of EntityLoaderUtils', async () => {
       const companionProvider = createUnitTestEntityCompanionProvider();
       const viewerContext = new ViewerContext(companionProvider);
-      expect(SimpleTestEntity.loader(viewerContext).utils()).toBeInstanceOf(EntityLoaderUtils);
+      expect(SimpleTestEntity.loaderUtils(viewerContext)).toBeInstanceOf(EntityLoaderUtils);
     });
   });
 });