@expo/entity 0.35.0 → 0.36.0

package/src/__tests__/EntityDatabaseAdapter-test.ts

@@ -48,7 +48,7 @@ class TestEntityDatabaseAdapter extends EntityDatabaseAdapter<TestFields> {
     _queryInterface: any,
     _tableName: string,
     _tableField: string,
-    _tableValues: readonly any[]
+    _tableValues: readonly any[],
   ): Promise<object[]> {
     return this.fetchResults;
   }
@@ -57,7 +57,7 @@ class TestEntityDatabaseAdapter extends EntityDatabaseAdapter<TestFields> {
     _queryInterface: any,
     _tableName: string,
     _rawWhereClause: string,
-    _bindings: object | any[]
+    _bindings: object | any[],
   ): Promise<object[]> {
     return this.fetchRawWhereResults;
   }
@@ -66,7 +66,7 @@ class TestEntityDatabaseAdapter extends EntityDatabaseAdapter<TestFields> {
     _queryInterface: any,
     _tableName: string,
     _tableFieldSingleValueEqualityOperands: TableFieldSingleValueEqualityCondition[],
-    _tableFieldMultiValueEqualityOperands: TableFieldMultiValueEqualityCondition[]
+    _tableFieldMultiValueEqualityOperands: TableFieldMultiValueEqualityCondition[],
   ): Promise<object[]> {
     return this.fetchEqualityConditionResults;
   }
@@ -74,7 +74,7 @@ class TestEntityDatabaseAdapter extends EntityDatabaseAdapter<TestFields> {
   protected async insertInternalAsync(
     _queryInterface: any,
     _tableName: string,
-    _object: object
+    _object: object,
   ): Promise<object[]> {
     return this.insertResults;
   }
@@ -84,7 +84,7 @@ class TestEntityDatabaseAdapter extends EntityDatabaseAdapter<TestFields> {
     _tableName: string,
     _tableIdField: string,
     _id: any,
-    _object: object
+    _object: object,
   ): Promise<object[]> {
     return this.updateResults;
   }
@@ -93,7 +93,7 @@ class TestEntityDatabaseAdapter extends EntityDatabaseAdapter<TestFields> {
     _queryInterface: any,
     _tableName: string,
     _tableIdField: string,
-    _id: any
+    _id: any,
   ): Promise<number> {
     return this.deleteCount;
   }
@@ -166,7 +166,7 @@ describe(EntityDatabaseAdapter, () => {
       const queryContext = instance(mock(EntityQueryContext));
       const adapter = new TestEntityDatabaseAdapter({ insertResults: [] });
       await expect(adapter.insertAsync(queryContext, {} as any)).rejects.toThrowError(
-        'Empty results from database adapter insert'
+        'Empty results from database adapter insert',
       );
     });
 
@@ -176,7 +176,7 @@ describe(EntityDatabaseAdapter, () => {
         insertResults: [{ string_field: 'hello' }, { string_field: 'hello2' }],
       });
       await expect(adapter.insertAsync(queryContext, {} as any)).rejects.toThrowError(
-        'Excessive results from database adapter insert'
+        'Excessive results from database adapter insert',
       );
     });
   });
@@ -193,7 +193,7 @@ describe(EntityDatabaseAdapter, () => {
       const queryContext = instance(mock(EntityQueryContext));
       const adapter = new TestEntityDatabaseAdapter({ updateResults: [] });
       await expect(
-        adapter.updateAsync(queryContext, 'customIdField', 'wat', {} as any)
+        adapter.updateAsync(queryContext, 'customIdField', 'wat', {} as any),
       ).rejects.toThrowError('Empty results from database adapter update');
     });
 
@@ -203,7 +203,7 @@ describe(EntityDatabaseAdapter, () => {
         updateResults: [{ string_field: 'hello' }, { string_field: 'hello2' }],
       });
       await expect(
-        adapter.updateAsync(queryContext, 'customIdField', 'wat', {} as any)
+        adapter.updateAsync(queryContext, 'customIdField', 'wat', {} as any),
       ).rejects.toThrowError('Excessive results from database adapter update');
     });
   });
@@ -213,7 +213,7 @@ describe(EntityDatabaseAdapter, () => {
       const queryContext = instance(mock(EntityQueryContext));
       const adapter = new TestEntityDatabaseAdapter({ deleteCount: 2 });
       await expect(adapter.deleteAsync(queryContext, 'customIdField', 'wat')).rejects.toThrowError(
-        'Excessive deletions from database adapter delet'
+        'Excessive deletions from database adapter delet',
       );
     });
   });

package/src/__tests__/EntityEdges-test.ts

@@ -18,12 +18,17 @@ import TestViewerContext from '../testfixtures/TestViewerContext';
 import { InMemoryFullCacheStubCacheAdapter } from '../utils/testing/StubCacheAdapter';
 import { createUnitTestEntityCompanionProvider } from '../utils/testing/createUnitTestEntityCompanionProvider';
 
+interface OtherFields {
+  id: string;
+}
+
 interface ParentFields {
   id: string;
 }
 
 interface ChildFields {
   id: string;
+  unused_other_edge_id: string | null;
   parent_id: string;
 }
 
@@ -80,12 +85,18 @@ const makeEntityClasses = (edgeDeletionBehavior: EntityEdgeDeletionBehavior) =>
     async evaluateAsync(
       _viewerContext: TestViewerContext,
       _queryContext: EntityQueryContext,
-      evaluationContext: EntityPrivacyPolicyEvaluationContext,
-      entity: any
+      evaluationContext: EntityPrivacyPolicyEvaluationContext<
+        any,
+        string,
+        TestViewerContext,
+        any,
+        any
+      >,
+      entity: any,
     ): Promise<RuleEvaluationResult> {
       if (privacyPolicyEvaluationRecords.shouldRecord) {
         (privacyPolicyEvaluationRecords as any)[entity.constructor.name][this.action].push(
-          evaluationContext
+          evaluationContext,
         );
       }
       return RuleEvaluationResult.ALLOW;
@@ -123,7 +134,12 @@ const makeEntityClasses = (edgeDeletionBehavior: EntityEdgeDeletionBehavior) =>
       _viewerContext: TestViewerContext,
       _queryContext: EntityTransactionalQueryContext,
       _entity: ParentEntity,
-      mutationInfo: EntityTriggerMutationInfo<ParentFields, string, TestViewerContext, ParentEntity>
+      mutationInfo: EntityTriggerMutationInfo<
+        ParentFields,
+        string,
+        TestViewerContext,
+        ParentEntity
+      >,
     ): Promise<void> {
       invariant(mutationInfo.type === EntityMutationType.DELETE, 'invalid EntityMutationType');
       if (mutationInfo.cascadingDeleteCause !== null) {
@@ -144,7 +160,12 @@ const makeEntityClasses = (edgeDeletionBehavior: EntityEdgeDeletionBehavior) =>
       _viewerContext: TestViewerContext,
       _queryContext: EntityTransactionalQueryContext,
       _entity: ParentEntity,
-      mutationInfo: EntityTriggerMutationInfo<ParentFields, string, TestViewerContext, ParentEntity>
+      mutationInfo: EntityTriggerMutationInfo<
+        ParentFields,
+        string,
+        TestViewerContext,
+        ParentEntity
+      >,
     ): Promise<void> {
       invariant(mutationInfo.type === EntityMutationType.UPDATE, 'invalid EntityMutationType');
       if (mutationInfo.cascadingDeleteCause !== null) {
@@ -165,7 +186,7 @@ const makeEntityClasses = (edgeDeletionBehavior: EntityEdgeDeletionBehavior) =>
       _viewerContext: TestViewerContext,
       _queryContext: EntityTransactionalQueryContext,
       _entity: ChildEntity,
-      mutationInfo: EntityTriggerMutationInfo<ChildFields, string, TestViewerContext, ChildEntity>
+      mutationInfo: EntityTriggerMutationInfo<ChildFields, string, TestViewerContext, ChildEntity>,
     ): Promise<void> {
       invariant(mutationInfo.type === EntityMutationType.DELETE, 'invalid EntityMutationType');
       if (mutationInfo.cascadingDeleteCause === null) {
@@ -197,7 +218,7 @@ const makeEntityClasses = (edgeDeletionBehavior: EntityEdgeDeletionBehavior) =>
       _viewerContext: TestViewerContext,
       _queryContext: EntityTransactionalQueryContext,
       _entity: ChildEntity,
-      mutationInfo: EntityTriggerMutationInfo<ChildFields, string, TestViewerContext, ChildEntity>
+      mutationInfo: EntityTriggerMutationInfo<ChildFields, string, TestViewerContext, ChildEntity>,
     ): Promise<void> {
       invariant(mutationInfo.type === EntityMutationType.UPDATE, 'invalid EntityMutationType');
       if (mutationInfo.cascadingDeleteCause === null) {
@@ -234,7 +255,7 @@ const makeEntityClasses = (edgeDeletionBehavior: EntityEdgeDeletionBehavior) =>
         string,
         TestViewerContext,
         GrandChildEntity
-      >
+      >,
     ): Promise<void> {
       invariant(mutationInfo.type === EntityMutationType.DELETE, 'invalid EntityMutationType');
       if (mutationInfo.cascadingDeleteCause === null) {
@@ -244,7 +265,7 @@ const makeEntityClasses = (edgeDeletionBehavior: EntityEdgeDeletionBehavior) =>
       const cascadingDeleteCauseEntity = mutationInfo.cascadingDeleteCause.entity;
       if (!(cascadingDeleteCauseEntity instanceof ChildEntity)) {
         throw new Error(
-          'GrandChild entity should have cascade delete cause entity of type ChildEntity'
+          'GrandChild entity should have cascade delete cause entity of type ChildEntity',
         );
       }
 
@@ -257,7 +278,7 @@ const makeEntityClasses = (edgeDeletionBehavior: EntityEdgeDeletionBehavior) =>
       const secondLevelCascadingDeleteCauseEntity = secondLevelCascadingDeleteCause.entity;
       if (!(secondLevelCascadingDeleteCauseEntity instanceof ParentEntity)) {
         throw new Error(
-          'GrandChild entity should have second level casade delete cause entity of type ParentEntity'
+          'GrandChild entity should have second level casade delete cause entity of type ParentEntity',
         );
       }
 
@@ -285,7 +306,7 @@ const makeEntityClasses = (edgeDeletionBehavior: EntityEdgeDeletionBehavior) =>
         string,
         TestViewerContext,
         GrandChildEntity
-      >
+      >,
     ): Promise<void> {
       invariant(mutationInfo.type === EntityMutationType.UPDATE, 'invalid EntityMutationType');
       if (mutationInfo.cascadingDeleteCause === null) {
@@ -295,7 +316,7 @@ const makeEntityClasses = (edgeDeletionBehavior: EntityEdgeDeletionBehavior) =>
       const cascadingDeleteCauseEntity = mutationInfo.cascadingDeleteCause.entity;
       if (!(cascadingDeleteCauseEntity instanceof ChildEntity)) {
         throw new Error(
-          'GrandChild entity should have cascade delete cause entity of type ChildEntity'
+          'GrandChild entity should have cascade delete cause entity of type ChildEntity',
         );
       }
 
@@ -308,7 +329,7 @@ const makeEntityClasses = (edgeDeletionBehavior: EntityEdgeDeletionBehavior) =>
       const secondLevelCascadingDeleteCauseEntity = secondLevelCascadingDeleteCause.entity;
       if (!(secondLevelCascadingDeleteCauseEntity instanceof ParentEntity)) {
         throw new Error(
-          'GrandChild entity should have second level casade delete cause entity of type ParentEntity'
+          'GrandChild entity should have second level casade delete cause entity of type ParentEntity',
         );
       }
 
@@ -321,6 +342,22 @@ const makeEntityClasses = (edgeDeletionBehavior: EntityEdgeDeletionBehavior) =>
     }
   }
 
+  class OtherEntity extends Entity<OtherFields, string, TestViewerContext> {
+    static defineCompanionDefinition(): EntityCompanionDefinition<
+      OtherFields,
+      string,
+      TestViewerContext,
+      OtherEntity,
+      TestEntityPrivacyPolicy
+    > {
+      return {
+        entityClass: ParentEntity,
+        entityConfiguration: otherEntityConfiguration,
+        privacyPolicyClass: TestEntityPrivacyPolicy,
+      };
+    }
+  }
+
   class ParentEntity extends Entity<ParentFields, string, TestViewerContext> {
     static defineCompanionDefinition(): EntityCompanionDefinition<
       ParentFields,
@@ -390,6 +427,19 @@ const makeEntityClasses = (edgeDeletionBehavior: EntityEdgeDeletionBehavior) =>
     }
   }
 
+  const otherEntityConfiguration = new EntityConfiguration<OtherFields>({
+    idField: 'id',
+    tableName: 'others',
+    schema: {
+      id: new UUIDField({
+        columnName: 'id',
+        cache: true,
+      }),
+    },
+    databaseAdapterFlavor: 'postgres',
+    cacheAdapterFlavor: 'redis',
+  });
+
   const parentEntityConfiguration = new EntityConfiguration<ParentFields>({
     idField: 'id',
     tableName: 'parents',
@@ -413,11 +463,19 @@ const makeEntityClasses = (edgeDeletionBehavior: EntityEdgeDeletionBehavior) =>
         columnName: 'id',
         cache: true,
       }),
+      unused_other_edge_id: new UUIDField({
+        columnName: 'unused_other_edge_id',
+        association: {
+          associatedEntityClass: OtherEntity,
+          edgeDeletionBehavior,
+        },
+      }),
       parent_id: new UUIDField({
         columnName: 'parent_id',
         cache: true,
         association: {
           associatedEntityClass: ParentEntity,
+          associatedEntityLookupByField: 'id', // sanity check that this functionality works by using it for one edge
           edgeDeletionBehavior,
         },
       }),
@@ -478,13 +536,15 @@ describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {
         .enforceCreateAsync();
 
       await expect(
-        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID())
+        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID()),
       ).resolves.not.toBeNull();
       await expect(
-        ChildEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(child.getID())
+        ChildEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(child.getID()),
       ).resolves.not.toBeNull();
       await expect(
-        GrandChildEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(grandchild.getID())
+        GrandChildEntity.loader(viewerContext)
+          .enforcing()
+          .loadByIDNullableAsync(grandchild.getID()),
       ).resolves.not.toBeNull();
 
       privacyPolicyEvaluationRecords.shouldRecord = true;
@@ -492,13 +552,15 @@ describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {
       privacyPolicyEvaluationRecords.shouldRecord = false;
 
       await expect(
-        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID())
+        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID()),
       ).resolves.toBeNull();
       await expect(
-        ChildEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(child.getID())
+        ChildEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(child.getID()),
       ).resolves.toBeNull();
       await expect(
-        GrandChildEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(grandchild.getID())
+        GrandChildEntity.loader(viewerContext)
+          .enforcing()
+          .loadByIDNullableAsync(grandchild.getID()),
       ).resolves.toBeNull();
 
       // two calls for each trigger, one beforeDelete, one afterDelete
@@ -596,13 +658,15 @@ describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {
         .enforceCreateAsync();
 
       await expect(
-        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID())
+        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID()),
       ).resolves.not.toBeNull();
       await expect(
-        ChildEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(child.getID())
+        ChildEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(child.getID()),
       ).resolves.not.toBeNull();
       await expect(
-        GrandChildEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(grandchild.getID())
+        GrandChildEntity.loader(viewerContext)
+          .enforcing()
+          .loadByIDNullableAsync(grandchild.getID()),
       ).resolves.not.toBeNull();
 
       privacyPolicyEvaluationRecords.shouldRecord = true;
@@ -610,7 +674,7 @@ describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {
       privacyPolicyEvaluationRecords.shouldRecord = false;
 
       await expect(
-        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID())
+        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID()),
       ).resolves.toBeNull();
 
       const loadedChild = await ChildEntity.loader(viewerContext)
@@ -707,17 +771,17 @@ describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {
         .enforceCreateAsync();
 
       await expect(
-        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID())
+        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID()),
       ).resolves.not.toBeNull();
       await expect(
         ChildEntity.loader(viewerContext)
           .enforcing()
-          .loadByFieldEqualingAsync('parent_id', parent.getID())
+          .loadByFieldEqualingAsync('parent_id', parent.getID()),
       ).resolves.not.toBeNull();
       await expect(
         GrandChildEntity.loader(viewerContext)
           .enforcing()
-          .loadByFieldEqualingAsync('parent_id', child.getID())
+          .loadByFieldEqualingAsync('parent_id', child.getID()),
       ).resolves.not.toBeNull();
 
       const childCacheAdapter = viewerContext.getViewerScopedEntityCompanionForClass(ChildEntity)[
@@ -729,7 +793,7 @@ describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {
       expect(childCachedBefore.get(parent.getID())?.status).toEqual(CacheStatus.HIT);
 
       const grandChildCacheAdapter = viewerContext.getViewerScopedEntityCompanionForClass(
-        GrandChildEntity
+        GrandChildEntity,
       )['entityCompanion']['tableDataCoordinator'][
         'cacheAdapter'
       ] as InMemoryFullCacheStubCacheAdapter<ChildFields>;
@@ -751,7 +815,7 @@ describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {
       expect(grandChildCachedAfter.get(child.getID())?.status).toEqual(CacheStatus.HIT);
 
       await expect(
-        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID())
+        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID()),
       ).resolves.toBeNull();
 
       const loadedChild = await ChildEntity.loader(viewerContext)
@@ -787,7 +851,7 @@ describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {
         ChildEntity: {
           [EntityAuthorizationAction.CREATE]: [],
 
-          // one READ auth action for child in order to update via cascade
+          // two READs auth action for child in order to update via cascade
           // no other entities are read since it is not cascaded past first entity
           [EntityAuthorizationAction.READ]: [
             {
@@ -796,6 +860,12 @@ describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {
                 cascadingDeleteCause: null,
               },
             },
+            {
+              cascadingDeleteCause: {
+                entity: expect.any(ParentEntity),
+                cascadingDeleteCause: null,
+              },
+            },
           ],
           // one UPDATE to set null
           [EntityAuthorizationAction.UPDATE]: [
@@ -840,17 +910,17 @@ describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {
         .enforceCreateAsync();
 
       await expect(
-        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID())
+        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID()),
       ).resolves.not.toBeNull();
       await expect(
         ChildEntity.loader(viewerContext)
           .enforcing()
-          .loadByFieldEqualingAsync('parent_id', parent.getID())
+          .loadByFieldEqualingAsync('parent_id', parent.getID()),
       ).resolves.not.toBeNull();
       await expect(
         GrandChildEntity.loader(viewerContext)
           .enforcing()
-          .loadByFieldEqualingAsync('parent_id', child.getID())
+          .loadByFieldEqualingAsync('parent_id', child.getID()),
       ).resolves.not.toBeNull();
 
       const childCacheAdapter = viewerContext.getViewerScopedEntityCompanionForClass(ChildEntity)[
@@ -862,7 +932,7 @@ describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {
       expect(childCachedBefore.get(parent.getID())?.status).toEqual(CacheStatus.HIT);
 
       const grandChildCacheAdapter = viewerContext.getViewerScopedEntityCompanionForClass(
-        GrandChildEntity
+        GrandChildEntity,
       )['entityCompanion']['tableDataCoordinator'][
         'cacheAdapter'
       ] as InMemoryFullCacheStubCacheAdapter<ChildFields>;
@@ -884,13 +954,15 @@ describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {
       expect(grandChildCachedAfter.get(child.getID())?.status).toEqual(CacheStatus.MISS);
 
       await expect(
-        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID())
+        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID()),
       ).resolves.toBeNull();
       await expect(
-        ChildEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(child.getID())
+        ChildEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(child.getID()),
       ).resolves.not.toBeNull();
       await expect(
-        GrandChildEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(grandchild.getID())
+        GrandChildEntity.loader(viewerContext)
+          .enforcing()
+          .loadByIDNullableAsync(grandchild.getID()),
       ).resolves.not.toBeNull();
 
       // two calls for each trigger, one beforeDelete, one afterDelete

package/src/__tests__/EntityFields-test.ts

@@ -11,6 +11,7 @@ import {
   StringArrayField,
   JSONObjectField,
   EnumField,
+  StrictEnumField,
 } from '../EntityFields';
 import describeFieldTestCase from '../utils/testing/describeFieldTestCase';
 
@@ -62,7 +63,7 @@ describeFieldTestCase(
     uuidv5('wat', uuidv5.DNS),
     /* UUIDv7 */ '018ebfda-dc80-782d-a891-22a0aa057d52',
   ],
-  [uuidv4().replace('-', ''), '', 'hello']
+  [uuidv4().replace('-', ''), '', 'hello'],
 );
 describeFieldTestCase(new DateField({ columnName: 'wat' }), [new Date()], [Date.now()]);
 describeFieldTestCase(new BooleanField({ columnName: 'wat' }), [true, false], [0, 1, '']);
@@ -71,7 +72,18 @@ describeFieldTestCase(new FloatField({ columnName: 'wat' }), [1, 0.5, -0.5], ['1
 describeFieldTestCase(
   new StringArrayField({ columnName: 'wat' }),
   [[['what']] as any, [[]] as any], // jest test cases need extra wrapping array
-  ['hello']
+  ['hello'],
 );
 describeFieldTestCase(new JSONObjectField({ columnName: 'wat' }), [{}], [true, 'hello']);
 describeFieldTestCase(new EnumField({ columnName: 'wat' }), ['hello', 1], [true]);
+
+enum TestEnum {
+  HELLO = 'world',
+  WHO = 'wat',
+}
+
+describeFieldTestCase(
+  new StrictEnumField({ columnName: 'wat', enum: TestEnum }),
+  [TestEnum.HELLO, TestEnum.WHO, 'world'],
+  ['what', 1, true],
+);

package/src/__tests__/EntityLoader-constructor-test.ts

@@ -121,7 +121,18 @@ export default class TestEntity extends Entity<
 describe(EntityLoader, () => {
   it('handles thrown errors and literals from constructor', async () => {
     const viewerContext = instance(mock(ViewerContext));
-    const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
+    const privacyPolicyEvaluationContext =
+      instance(
+        mock<
+          EntityPrivacyPolicyEvaluationContext<
+            TestFields,
+            string,
+            ViewerContext,
+            TestEntity,
+            TestFieldSelection
+          >
+        >(),
+      );
     const metricsAdapter = instance(mock<IEntityMetricsAdapter>());
     const queryContext = StubQueryContextProvider.getQueryContext();
 
@@ -141,8 +152,8 @@ describe(EntityLoader, () => {
               },
             ],
           ],
-        ])
-      )
+        ]),
+      ),
     );
     const privacyPolicy = new TestEntityPrivacyPolicy();
     const cacheAdapterProvider = new NoCacheStubCacheAdapterProvider();
@@ -153,7 +164,7 @@ describe(EntityLoader, () => {
       entityCache,
       StubQueryContextProvider,
       metricsAdapter,
-      TestEntity.name
+      TestEntity.name,
     );
     const entityLoader = new EntityLoader(
       viewerContext,
@@ -164,19 +175,21 @@ describe(EntityLoader, () => {
       /* entitySelectedFields */ undefined,
       privacyPolicy,
       dataManager,
-      metricsAdapter
+      metricsAdapter,
     );
 
     let capturedThrownThing1: any;
     try {
-      await entityLoader.loadByIDAsync(ID_SENTINEL_THROW_LITERAL);
+      await entityLoader.withAuthorizationResults().loadByIDAsync(ID_SENTINEL_THROW_LITERAL);
     } catch (e) {
       capturedThrownThing1 = e;
     }
     expect(capturedThrownThing1).not.toBeInstanceOf(Error);
     expect(capturedThrownThing1).toEqual('hello');
 
-    const result = await entityLoader.loadByIDAsync(ID_SENTINEL_THROW_ERROR);
+    const result = await entityLoader
+      .withAuthorizationResults()
+      .loadByIDAsync(ID_SENTINEL_THROW_ERROR);
     expect(result.ok).toBe(false);
     expect(result.enforceError().message).toEqual('world');
   });