@expo/entity 0.55.0 → 0.57.0

package/src/internal/__tests__/ReadThroughEntityCache-test.ts

@@ -76,7 +76,7 @@ describe(ReadThroughEntityCache, () => {
 
       when(
         cacheAdapterMock.loadManyAsync(
-          deepEqualEntityAware(new SingleFieldHolder('id')),
+          deepEqualEntityAware(new SingleFieldHolder<BlahFields, 'id', 'id'>('id')),
           deepEqualEntityAware([
             new SingleFieldValueHolder('wat'),
             new SingleFieldValueHolder('who'),
@@ -102,7 +102,7 @@ describe(ReadThroughEntityCache, () => {
 
       verify(
         cacheAdapterMock.loadManyAsync(
-          deepEqualEntityAware(new SingleFieldHolder('id')),
+          deepEqualEntityAware(new SingleFieldHolder<BlahFields, 'id', 'id'>('id')),
           deepEqualEntityAware([
             new SingleFieldValueHolder('wat'),
             new SingleFieldValueHolder('who'),
@@ -111,7 +111,7 @@ describe(ReadThroughEntityCache, () => {
       ).once();
       verify(
         cacheAdapterMock.cacheManyAsync(
-          deepEqualEntityAware(new SingleFieldHolder('id')),
+          deepEqualEntityAware(new SingleFieldHolder<BlahFields, 'id', 'id'>('id')),
           deepEqualEntityAware(
             new SingleFieldValueHolderMap(
               new Map([
@@ -146,7 +146,7 @@ describe(ReadThroughEntityCache, () => {
 
       when(
         cacheAdapterMock.loadManyAsync(
-          deepEqualEntityAware(new SingleFieldHolder('id')),
+          deepEqualEntityAware(new SingleFieldHolder<BlahFields, 'id', 'id'>('id')),
           deepEqualEntityAware([
             new SingleFieldValueHolder('wat'),
             new SingleFieldValueHolder('who'),
@@ -170,7 +170,7 @@ describe(ReadThroughEntityCache, () => {
 
       verify(
         cacheAdapterMock.loadManyAsync(
-          deepEqualEntityAware(new SingleFieldHolder('id')),
+          deepEqualEntityAware(new SingleFieldHolder<BlahFields, 'id', 'id'>('id')),
           deepEqualEntityAware([
             new SingleFieldValueHolder('wat'),
             new SingleFieldValueHolder('who'),
@@ -179,7 +179,7 @@ describe(ReadThroughEntityCache, () => {
       ).once();
       verify(
         cacheAdapterMock.cacheManyAsync(
-          deepEqualEntityAware(new SingleFieldHolder('id')),
+          deepEqualEntityAware(new SingleFieldHolder<BlahFields, 'id', 'id'>('id')),
           deepEqualEntityAware(
             new SingleFieldValueHolderMap(
               new Map([
@@ -216,7 +216,7 @@ describe(ReadThroughEntityCache, () => {
 
       when(
         cacheAdapterMock.loadManyAsync(
-          deepEqualEntityAware(new SingleFieldHolder('id')),
+          deepEqualEntityAware(new SingleFieldHolder<BlahFields, 'id', 'id'>('id')),
           deepEqualEntityAware([new SingleFieldValueHolder('why')]),
         ),
       ).thenResolve(
@@ -233,19 +233,19 @@ describe(ReadThroughEntityCache, () => {
 
       verify(
         cacheAdapterMock.loadManyAsync(
-          deepEqualEntityAware(new SingleFieldHolder('id')),
+          deepEqualEntityAware(new SingleFieldHolder<BlahFields, 'id', 'id'>('id')),
           deepEqualEntityAware([new SingleFieldValueHolder('why')]),
         ),
       ).once();
       verify(
         cacheAdapterMock.cacheManyAsync(
-          deepEqualEntityAware(new SingleFieldHolder('id')),
+          deepEqualEntityAware(new SingleFieldHolder<BlahFields, 'id', 'id'>('id')),
           deepEqualEntityAware(new SingleFieldValueHolderMap(new Map())),
         ),
       ).once();
       verify(
         cacheAdapterMock.cacheDBMissesAsync(
-          deepEqualEntityAware(new SingleFieldHolder('id')),
+          deepEqualEntityAware(new SingleFieldHolder<BlahFields, 'id', 'id'>('id')),
           deepEqualEntityAware([new SingleFieldValueHolder('why')]),
         ),
       ).once();
@@ -260,7 +260,7 @@ describe(ReadThroughEntityCache, () => {
 
       when(
         cacheAdapterMock.loadManyAsync(
-          deepEqualEntityAware(new SingleFieldHolder('id')),
+          deepEqualEntityAware(new SingleFieldHolder<BlahFields, 'id', 'id'>('id')),
           deepEqualEntityAware([new SingleFieldValueHolder('why')]),
         ),
       ).thenResolve(
@@ -276,12 +276,22 @@ describe(ReadThroughEntityCache, () => {
       );
       verify(
         cacheAdapterMock.loadManyAsync(
-          deepEqualEntityAware(new SingleFieldHolder('id')),
+          deepEqualEntityAware(new SingleFieldHolder<BlahFields, 'id', 'id'>('id')),
           deepEqualEntityAware([new SingleFieldValueHolder('why')]),
         ),
       ).once();
-      verify(cacheAdapterMock.cacheManyAsync(new SingleFieldHolder('id'), anything())).never();
-      verify(cacheAdapterMock.cacheDBMissesAsync(new SingleFieldHolder('id'), anything())).never();
+      verify(
+        cacheAdapterMock.cacheManyAsync(
+          new SingleFieldHolder<BlahFields, 'id', 'id'>('id'),
+          anything(),
+        ),
+      ).never();
+      verify(
+        cacheAdapterMock.cacheDBMissesAsync(
+          new SingleFieldHolder<BlahFields, 'id', 'id'>('id'),
+          anything(),
+        ),
+      ).never();
       expect(result).toEqual(new SingleFieldValueHolderMap(new Map()));
     });
 
@@ -293,7 +303,7 @@ describe(ReadThroughEntityCache, () => {
 
       when(
         cacheAdapterMock.loadManyAsync(
-          deepEqualEntityAware(new SingleFieldHolder('id')),
+          deepEqualEntityAware(new SingleFieldHolder<BlahFields, 'id', 'id'>('id')),
           deepEqualEntityAware([
             new SingleFieldValueHolder('wat'),
             new SingleFieldValueHolder('who'),
@@ -324,7 +334,7 @@ describe(ReadThroughEntityCache, () => {
       );
       verify(
         cacheAdapterMock.loadManyAsync(
-          deepEqualEntityAware(new SingleFieldHolder('id')),
+          deepEqualEntityAware(new SingleFieldHolder<BlahFields, 'id', 'id'>('id')),
           deepEqualEntityAware([
             new SingleFieldValueHolder('wat'),
             new SingleFieldValueHolder('who'),
@@ -335,7 +345,7 @@ describe(ReadThroughEntityCache, () => {
       ).once();
       verify(
         cacheAdapterMock.cacheManyAsync(
-          deepEqualEntityAware(new SingleFieldHolder('id')),
+          deepEqualEntityAware(new SingleFieldHolder<BlahFields, 'id', 'id'>('id')),
           deepEqualEntityAware(
             new SingleFieldValueHolderMap(
               new Map([[new SingleFieldValueHolder('wat'), { id: 'wat' }]]),
@@ -345,7 +355,7 @@ describe(ReadThroughEntityCache, () => {
       ).once();
       verify(
         cacheAdapterMock.cacheDBMissesAsync(
-          deepEqualEntityAware(new SingleFieldHolder('id')),
+          deepEqualEntityAware(new SingleFieldHolder<BlahFields, 'id', 'id'>('id')),
           deepEqualEntityAware([new SingleFieldValueHolder('how')]),
         ),
       ).once();
@@ -372,7 +382,12 @@ describe(ReadThroughEntityCache, () => {
         [new SingleFieldValueHolder<BlahFields, 'id'>('wat')],
         fetcher,
       );
-      verify(cacheAdapterMock.loadManyAsync(new SingleFieldHolder('id'), anything())).never();
+      verify(
+        cacheAdapterMock.loadManyAsync(
+          new SingleFieldHolder<BlahFields, 'id', 'id'>('id'),
+          anything(),
+        ),
+      ).never();
       expect(result).toEqual(
         new SingleFieldValueHolderMap(
           new Map([[new SingleFieldValueHolder('wat'), [{ id: 'wat' }]]]),
@@ -390,7 +405,7 @@ describe(ReadThroughEntityCache, () => {
 
       when(
         cacheAdapterMock.loadManyAsync(
-          deepEqualEntityAware(new SingleFieldHolder('id')),
+          deepEqualEntityAware(new SingleFieldHolder<BlahFields, 'id', 'id'>('id')),
           deepEqualEntityAware([
             new SingleFieldValueHolder('wat'),
             new SingleFieldValueHolder('who'),
@@ -416,7 +431,7 @@ describe(ReadThroughEntityCache, () => {
 
       verify(
         cacheAdapterMock.loadManyAsync(
-          deepEqualEntityAware(new SingleFieldHolder('id')),
+          deepEqualEntityAware(new SingleFieldHolder<BlahFields, 'id', 'id'>('id')),
           deepEqualEntityAware([
             new SingleFieldValueHolder('wat'),
             new SingleFieldValueHolder('who'),
@@ -425,7 +440,7 @@ describe(ReadThroughEntityCache, () => {
       ).once();
       verify(
         cacheAdapterMock.cacheManyAsync(
-          deepEqualEntityAware(new SingleFieldHolder('id')),
+          deepEqualEntityAware(new SingleFieldHolder<BlahFields, 'id', 'id'>('id')),
           deepEqualEntityAware(
             new Map([
               [new SingleFieldValueHolder('wat'), { id: 'wat' }],
@@ -456,12 +471,12 @@ describe(ReadThroughEntityCache, () => {
       const cacheAdapterMock = mock<IEntityCacheAdapter<BlahFields, 'id'>>();
       const cacheAdapter = instance(cacheAdapterMock);
       const entityCache = new ReadThroughEntityCache(makeEntityConfiguration(true), cacheAdapter);
-      await entityCache.invalidateManyAsync(new SingleFieldHolder('id'), [
+      await entityCache.invalidateManyAsync(new SingleFieldHolder<BlahFields, 'id', 'id'>('id'), [
         new SingleFieldValueHolder('wat'),
       ]);
       verify(
         cacheAdapterMock.invalidateManyAsync(
-          deepEqualEntityAware(new SingleFieldHolder('id')),
+          deepEqualEntityAware(new SingleFieldHolder<BlahFields, 'id', 'id'>('id')),
           deepEqualEntityAware([new SingleFieldValueHolder('wat')]),
         ),
       ).once();

package/src/metrics/EntityMetricsUtils.ts

@@ -30,6 +30,29 @@ export const timeAndLogLoadEventAsync =
     return result;
   };
 
+export const timeAndLogLoadOneEventAsync =
+  (
+    metricsAdapter: IEntityMetricsAdapter,
+    loadType: EntityMetricsLoadType,
+    entityClassName: string,
+    queryContext: EntityQueryContext,
+  ) =>
+  async <TFields>(promise: Promise<Readonly<TFields> | null>) => {
+    const startTime = Date.now();
+    const result = await promise;
+    const endTime = Date.now();
+
+    metricsAdapter.logDataManagerLoadEvent({
+      type: loadType,
+      isInTransaction: queryContext.isInTransaction(),
+      entityClassName,
+      duration: endTime - startTime,
+      count: result ? 1 : 0,
+    });
+
+    return result;
+  };
+
 export const timeAndLogLoadMapEventAsync =
   (
     metricsAdapter: IEntityMetricsAdapter,

package/src/metrics/IEntityMetricsAdapter.ts

@@ -8,6 +8,9 @@ export enum EntityMetricsLoadType {
   LOAD_MANY,
   LOAD_MANY_EQUALITY_CONJUNCTION,
   LOAD_MANY_RAW,
+  LOAD_MANY_SQL,
+  LOAD_ONE,
+  LOAD_PAGE,
 }
 
 /**

package/src/metrics/__tests__/EntityMetricsUtils-test.ts

@@ -0,0 +1,120 @@
+import { describe, expect, it } from '@jest/globals';
+import { anyNumber, deepEqual, instance, mock, verify, when } from 'ts-mockito';
+
+import { EntityQueryContext } from '../../EntityQueryContext';
+import {
+  timeAndLogLoadEventAsync,
+  timeAndLogLoadMapEventAsync,
+  timeAndLogMutationEventAsync,
+} from '../EntityMetricsUtils';
+import {
+  EntityMetricsLoadType,
+  EntityMetricsMutationType,
+  IEntityMetricsAdapter,
+} from '../IEntityMetricsAdapter';
+
+describe(timeAndLogLoadEventAsync, () => {
+  it('returns the result from the wrapped promise and logs', async () => {
+    const metricsAdapterMock = mock<IEntityMetricsAdapter>();
+    const metricsAdapter = instance(metricsAdapterMock);
+
+    const queryContextMock = mock<EntityQueryContext>();
+    when(queryContextMock.isInTransaction()).thenReturn(false);
+    const queryContext = instance(queryContextMock);
+
+    const expectedResult = [{ id: 1 }, { id: 2 }];
+
+    const result = await timeAndLogLoadEventAsync(
+      metricsAdapter,
+      EntityMetricsLoadType.LOAD_MANY,
+      'TestEntity',
+      queryContext,
+    )(Promise.resolve(expectedResult));
+
+    expect(result).toBe(expectedResult);
+
+    verify(
+      metricsAdapterMock.logDataManagerLoadEvent(
+        deepEqual({
+          type: EntityMetricsLoadType.LOAD_MANY,
+          isInTransaction: false,
+          entityClassName: 'TestEntity',
+          duration: anyNumber(),
+          count: expectedResult.length,
+        }),
+      ),
+    ).once();
+  });
+});
+
+describe(timeAndLogLoadMapEventAsync, () => {
+  it('returns the result from the wrapped promise and logs with count summed across map values', async () => {
+    const metricsAdapterMock = mock<IEntityMetricsAdapter>();
+    const metricsAdapter = instance(metricsAdapterMock);
+
+    const queryContextMock = mock<EntityQueryContext>();
+    when(queryContextMock.isInTransaction()).thenReturn(false);
+    const queryContext = instance(queryContextMock);
+
+    const key1 = { serialize: () => 'key1' };
+    const key2 = { serialize: () => 'key2' };
+    const expectedResult = new Map([
+      [key1, [{ id: 1 }, { id: 2 }]],
+      [key2, [{ id: 3 }]],
+    ]);
+
+    const result = await timeAndLogLoadMapEventAsync(
+      metricsAdapter,
+      EntityMetricsLoadType.LOAD_MANY,
+      'TestEntity',
+      queryContext,
+    )(Promise.resolve(expectedResult));
+
+    expect(result).toBe(expectedResult);
+
+    verify(
+      metricsAdapterMock.logDataManagerLoadEvent(
+        deepEqual({
+          type: EntityMetricsLoadType.LOAD_MANY,
+          isInTransaction: false,
+          entityClassName: 'TestEntity',
+          duration: anyNumber(),
+          count: 3,
+        }),
+      ),
+    ).once();
+  });
+});
+
+describe(timeAndLogMutationEventAsync, () => {
+  it('returns the result from the wrapped promise and logs', async () => {
+    const metricsAdapterMock = mock<IEntityMetricsAdapter>();
+    const metricsAdapter = instance(metricsAdapterMock);
+
+    const queryContextMock = mock<EntityQueryContext>();
+    when(queryContextMock.isInTransaction()).thenReturn(true);
+    const queryContext = instance(queryContextMock);
+
+    const expectedResult = { id: 1, name: 'created' };
+
+    const result = await timeAndLogMutationEventAsync(
+      metricsAdapter,
+      EntityMetricsMutationType.CREATE,
+      'TestEntity',
+      queryContext,
+    )(Promise.resolve(expectedResult));
+
+    expect(result).toBe(expectedResult);
+
+    verify(
+      metricsAdapterMock.logMutatorMutationEvent(
+        deepEqual({
+          type: EntityMetricsMutationType.CREATE,
+          isInTransaction: true,
+          entityClassName: 'TestEntity',
+          duration: anyNumber(),
+        }),
+      ),
+    ).once();
+  });
+});

package/src/rules/AllowIfAllSubRulesAllowPrivacyPolicyRule.ts

@@ -1,4 +1,4 @@
-import { EntityPrivacyPolicyEvaluationContext } from '../EntityPrivacyPolicy';
+import { EntityPrivacyPolicyRuleEvaluationContext } from '../EntityPrivacyPolicy';
 import { EntityQueryContext } from '../EntityQueryContext';
 import { ReadonlyEntity } from '../ReadonlyEntity';
 import { ViewerContext } from '../ViewerContext';
@@ -26,7 +26,7 @@ export class AllowIfAllSubRulesAllowPrivacyPolicyRule<
   async evaluateAsync(
     viewerContext: TViewerContext,
     queryContext: EntityQueryContext,
-    evaluationContext: EntityPrivacyPolicyEvaluationContext<
+    evaluationContext: EntityPrivacyPolicyRuleEvaluationContext<
       TFields,
       TIDField,
       TViewerContext,

package/src/rules/AllowIfAnySubRuleAllowsPrivacyPolicyRule.ts

@@ -1,4 +1,4 @@
-import { EntityPrivacyPolicyEvaluationContext } from '../EntityPrivacyPolicy';
+import { EntityPrivacyPolicyRuleEvaluationContext } from '../EntityPrivacyPolicy';
 import { EntityQueryContext } from '../EntityQueryContext';
 import { ReadonlyEntity } from '../ReadonlyEntity';
 import { ViewerContext } from '../ViewerContext';
@@ -26,7 +26,7 @@ export class AllowIfAnySubRuleAllowsPrivacyPolicyRule<
   async evaluateAsync(
     viewerContext: TViewerContext,
     queryContext: EntityQueryContext,
-    evaluationContext: EntityPrivacyPolicyEvaluationContext<
+    evaluationContext: EntityPrivacyPolicyRuleEvaluationContext<
       TFields,
       TIDField,
       TViewerContext,

package/src/rules/EvaluateIfEntityFieldPredicatePrivacyPolicyRule.ts

@@ -1,4 +1,4 @@
-import { EntityPrivacyPolicyEvaluationContext } from '../EntityPrivacyPolicy';
+import { EntityPrivacyPolicyRuleEvaluationContext } from '../EntityPrivacyPolicy';
 import { EntityQueryContext } from '../EntityQueryContext';
 import { ReadonlyEntity } from '../ReadonlyEntity';
 import { ViewerContext } from '../ViewerContext';
@@ -29,7 +29,7 @@ export class EvaluateIfEntityFieldPredicatePrivacyPolicyRule<
   async evaluateAsync(
     viewerContext: TViewerContext,
     queryContext: EntityQueryContext,
-    evaluationContext: EntityPrivacyPolicyEvaluationContext<
+    evaluationContext: EntityPrivacyPolicyRuleEvaluationContext<
       TFields,
       TIDField,
       TViewerContext,

package/src/rules/PrivacyPolicyRule.ts

@@ -1,4 +1,4 @@
-import { EntityPrivacyPolicyEvaluationContext } from '../EntityPrivacyPolicy';
+import { EntityPrivacyPolicyRuleEvaluationContext } from '../EntityPrivacyPolicy';
 import { EntityQueryContext } from '../EntityQueryContext';
 import { ReadonlyEntity } from '../ReadonlyEntity';
 import { ViewerContext } from '../ViewerContext';
@@ -46,7 +46,7 @@ export abstract class PrivacyPolicyRule<
   abstract evaluateAsync(
     viewerContext: TViewerContext,
     queryContext: EntityQueryContext,
-    evaluationContext: EntityPrivacyPolicyEvaluationContext<
+    evaluationContext: EntityPrivacyPolicyRuleEvaluationContext<
       TFields,
       TIDField,
       TViewerContext,

package/src/rules/__tests__/AllowIfAllSubRulesAllowPrivacyPolicyRule-test.ts

@@ -1,6 +1,6 @@
 import { anything, instance, mock } from 'ts-mockito';
 
-import { EntityPrivacyPolicyEvaluationContext } from '../../EntityPrivacyPolicy';
+import { EntityPrivacyPolicyRuleEvaluationContext } from '../../EntityPrivacyPolicy';
 import { EntityQueryContext } from '../../EntityQueryContext';
 import { ViewerContext } from '../../ViewerContext';
 import { describePrivacyPolicyRule } from '../../utils/__testfixtures__/PrivacyPolicyRuleTestUtils';
@@ -20,7 +20,7 @@ describePrivacyPolicyRule(
         viewerContext: instance(mock(ViewerContext)),
         queryContext: instance(mock(EntityQueryContext)),
         evaluationContext:
-          instance(mock<EntityPrivacyPolicyEvaluationContext<any, any, any, any, any>>()),
+          instance(mock<EntityPrivacyPolicyRuleEvaluationContext<any, any, any, any, any>>()),
         entity: anything(),
       },
     ],
@@ -38,7 +38,7 @@ describePrivacyPolicyRule(
         viewerContext: instance(mock(ViewerContext)),
         queryContext: instance(mock(EntityQueryContext)),
         evaluationContext:
-          instance(mock<EntityPrivacyPolicyEvaluationContext<any, any, any, any, any>>()),
+          instance(mock<EntityPrivacyPolicyRuleEvaluationContext<any, any, any, any, any>>()),
         entity: anything(),
       },
     ],
@@ -56,7 +56,7 @@ describePrivacyPolicyRule(
         viewerContext: instance(mock(ViewerContext)),
         queryContext: instance(mock(EntityQueryContext)),
         evaluationContext:
-          instance(mock<EntityPrivacyPolicyEvaluationContext<any, any, any, any, any>>()),
+          instance(mock<EntityPrivacyPolicyRuleEvaluationContext<any, any, any, any, any>>()),
         entity: anything(),
       },
     ],

package/src/rules/__tests__/AllowIfAnySubRuleAllowsPrivacyPolicyRule-test.ts

@@ -1,6 +1,6 @@
 import { anything, instance, mock } from 'ts-mockito';
 
-import { EntityPrivacyPolicyEvaluationContext } from '../../EntityPrivacyPolicy';
+import { EntityPrivacyPolicyRuleEvaluationContext } from '../../EntityPrivacyPolicy';
 import { EntityQueryContext } from '../../EntityQueryContext';
 import { ViewerContext } from '../../ViewerContext';
 import { describePrivacyPolicyRule } from '../../utils/__testfixtures__/PrivacyPolicyRuleTestUtils';
@@ -20,7 +20,7 @@ describePrivacyPolicyRule(
         viewerContext: instance(mock(ViewerContext)),
         queryContext: instance(mock(EntityQueryContext)),
         evaluationContext:
-          instance(mock<EntityPrivacyPolicyEvaluationContext<any, any, any, any, any>>()),
+          instance(mock<EntityPrivacyPolicyRuleEvaluationContext<any, any, any, any, any>>()),
         entity: anything(),
       },
     ],
@@ -38,7 +38,7 @@ describePrivacyPolicyRule(
         viewerContext: instance(mock(ViewerContext)),
         queryContext: instance(mock(EntityQueryContext)),
         evaluationContext:
-          instance(mock<EntityPrivacyPolicyEvaluationContext<any, any, any, any, any>>()),
+          instance(mock<EntityPrivacyPolicyRuleEvaluationContext<any, any, any, any, any>>()),
         entity: anything(),
       },
     ],
@@ -56,7 +56,7 @@ describePrivacyPolicyRule(
         viewerContext: instance(mock(ViewerContext)),
         queryContext: instance(mock(EntityQueryContext)),
         evaluationContext:
-          instance(mock<EntityPrivacyPolicyEvaluationContext<any, any, any, any, any>>()),
+          instance(mock<EntityPrivacyPolicyRuleEvaluationContext<any, any, any, any, any>>()),
         entity: anything(),
       },
     ],

package/src/rules/__tests__/AllowIfInParentCascadeDeletionPrivacyPolicyRule-test.ts

@@ -1,4 +1,4 @@
-import { instance, mock, when } from 'ts-mockito';
+import { anything, instance, mock, when } from 'ts-mockito';
 
 import { EntityCompanionDefinition } from '../../EntityCompanionProvider';
 import { EntityPrivacyPolicy } from '../../EntityPrivacyPolicy';
@@ -96,6 +96,7 @@ describePrivacyPolicyRule(
         viewerContext: instance(mock(ViewerContext)),
         queryContext: instance(mock(EntityQueryContext)),
         evaluationContext: {
+          action: anything(),
           previousValue: instance(childEntityMock),
           cascadingDeleteCause: {
             entity: parentEntity,
@@ -109,6 +110,7 @@ describePrivacyPolicyRule(
         viewerContext: instance(mock(ViewerContext)),
         queryContext: instance(mock(EntityQueryContext)),
         evaluationContext: {
+          action: anything(),
           previousValue: instance(childEntityMock),
           cascadingDeleteCause: {
             entity: parentEntity,
@@ -124,6 +126,7 @@ describePrivacyPolicyRule(
         viewerContext: instance(mock(ViewerContext)),
         queryContext: instance(mock(EntityQueryContext)),
         evaluationContext: {
+          action: anything(),
           previousValue: null,
           cascadingDeleteCause: null,
         },
@@ -134,6 +137,7 @@ describePrivacyPolicyRule(
         viewerContext: instance(mock(ViewerContext)),
         queryContext: instance(mock(EntityQueryContext)),
         evaluationContext: {
+          action: anything(),
           previousValue: null,
           cascadingDeleteCause: {
             entity: instance(unrelatedOtherEntityMock),
@@ -147,6 +151,7 @@ describePrivacyPolicyRule(
         viewerContext: instance(mock(ViewerContext)),
         queryContext: instance(mock(EntityQueryContext)),
         evaluationContext: {
+          action: anything(),
           previousValue: null,
           cascadingDeleteCause: {
             entity: otherParentEntity,
@@ -160,6 +165,7 @@ describePrivacyPolicyRule(
         viewerContext: instance(mock(ViewerContext)),
         queryContext: instance(mock(EntityQueryContext)),
         evaluationContext: {
+          action: anything(),
           previousValue: null,
           cascadingDeleteCause: {
             entity: parentEntity,
@@ -173,6 +179,7 @@ describePrivacyPolicyRule(
         viewerContext: instance(mock(ViewerContext)),
         queryContext: instance(mock(EntityQueryContext)),
         evaluationContext: {
+          action: anything(),
           previousValue: null,
           cascadingDeleteCause: {
             entity: parentEntity,
@@ -186,6 +193,7 @@ describePrivacyPolicyRule(
         viewerContext: instance(mock(ViewerContext)),
         queryContext: instance(mock(EntityQueryContext)),
         evaluationContext: {
+          action: anything(),
           previousValue: instance(childEntityDifferentParentMock),
           cascadingDeleteCause: {
             entity: parentEntity,
@@ -232,6 +240,7 @@ describePrivacyPolicyRule(
         viewerContext: instance(mock(ViewerContext)),
         queryContext: instance(mock(EntityQueryContext)),
         evaluationContext: {
+          action: anything(),
           previousValue: instance(childEntityWithNameRefMock),
           cascadingDeleteCause: {
             entity: parentEntityWithName,
@@ -245,6 +254,7 @@ describePrivacyPolicyRule(
         viewerContext: instance(mock(ViewerContext)),
         queryContext: instance(mock(EntityQueryContext)),
         evaluationContext: {
+          action: anything(),
           previousValue: instance(childEntityWithNameRefMock),
           cascadingDeleteCause: {
             entity: parentEntityWithName,

package/src/rules/__tests__/AlwaysAllowPrivacyPolicyRule-test.ts

@@ -1,6 +1,6 @@
 import { anything, instance, mock } from 'ts-mockito';
 
-import { EntityPrivacyPolicyEvaluationContext } from '../../EntityPrivacyPolicy';
+import { EntityPrivacyPolicyRuleEvaluationContext } from '../../EntityPrivacyPolicy';
 import { EntityQueryContext } from '../../EntityQueryContext';
 import { ViewerContext } from '../../ViewerContext';
 import { describePrivacyPolicyRule } from '../../utils/__testfixtures__/PrivacyPolicyRuleTestUtils';
@@ -12,7 +12,7 @@ describePrivacyPolicyRule(new AlwaysAllowPrivacyPolicyRule(), {
       viewerContext: instance(mock(ViewerContext)),
       queryContext: instance(mock(EntityQueryContext)),
       evaluationContext:
-        instance(mock<EntityPrivacyPolicyEvaluationContext<any, any, any, any, any>>()),
+        instance(mock<EntityPrivacyPolicyRuleEvaluationContext<any, any, any, any, any>>()),
       entity: anything(),
     },
   ],

package/src/rules/__tests__/AlwaysDenyPrivacyPolicyRule-test.ts

@@ -1,6 +1,6 @@
 import { anything, instance, mock } from 'ts-mockito';
 
-import { EntityPrivacyPolicyEvaluationContext } from '../../EntityPrivacyPolicy';
+import { EntityPrivacyPolicyRuleEvaluationContext } from '../../EntityPrivacyPolicy';
 import { EntityQueryContext } from '../../EntityQueryContext';
 import { ViewerContext } from '../../ViewerContext';
 import { describePrivacyPolicyRule } from '../../utils/__testfixtures__/PrivacyPolicyRuleTestUtils';
@@ -12,7 +12,7 @@ describePrivacyPolicyRule(new AlwaysDenyPrivacyPolicyRule(), {
       viewerContext: instance(mock(ViewerContext)),
       queryContext: instance(mock(EntityQueryContext)),
       evaluationContext:
-        instance(mock<EntityPrivacyPolicyEvaluationContext<any, any, any, any, any>>()),
+        instance(mock<EntityPrivacyPolicyRuleEvaluationContext<any, any, any, any, any>>()),
       entity: anything(),
     },
   ],

package/src/rules/__tests__/AlwaysSkipPrivacyPolicyRule-test.ts

@@ -1,6 +1,6 @@
 import { anything, instance, mock } from 'ts-mockito';
 
-import { EntityPrivacyPolicyEvaluationContext } from '../../EntityPrivacyPolicy';
+import { EntityPrivacyPolicyRuleEvaluationContext } from '../../EntityPrivacyPolicy';
 import { EntityQueryContext } from '../../EntityQueryContext';
 import { ViewerContext } from '../../ViewerContext';
 import { describePrivacyPolicyRule } from '../../utils/__testfixtures__/PrivacyPolicyRuleTestUtils';
@@ -12,7 +12,7 @@ describePrivacyPolicyRule(new AlwaysSkipPrivacyPolicyRule(), {
       viewerContext: instance(mock(ViewerContext)),
       queryContext: instance(mock(EntityQueryContext)),
       evaluationContext:
-        instance(mock<EntityPrivacyPolicyEvaluationContext<any, any, any, any, any>>()),
+        instance(mock<EntityPrivacyPolicyRuleEvaluationContext<any, any, any, any, any>>()),
       entity: anything(),
     },
   ],

package/src/rules/__tests__/EvaluateIfEntityFieldPredicatePrivacyPolicyRule-test.ts

@@ -1,6 +1,6 @@
 import { mock, instance, when } from 'ts-mockito';
 
-import { EntityPrivacyPolicyEvaluationContext } from '../../EntityPrivacyPolicy';
+import { EntityPrivacyPolicyRuleEvaluationContext } from '../../EntityPrivacyPolicy';
 import { EntityQueryContext } from '../../EntityQueryContext';
 import { ViewerContext } from '../../ViewerContext';
 import { describePrivacyPolicyRule } from '../../utils/__testfixtures__/PrivacyPolicyRuleTestUtils';
@@ -30,7 +30,7 @@ describePrivacyPolicyRule<TestFields, 'customIdField', ViewerContext, TestEntity
         viewerContext: instance(mock(ViewerContext)),
         queryContext: instance(mock(EntityQueryContext)),
         evaluationContext:
-          instance(mock<EntityPrivacyPolicyEvaluationContext<any, any, any, any, any>>()),
+          instance(mock<EntityPrivacyPolicyRuleEvaluationContext<any, any, any, any, any>>()),
         entity: entityBlah,
       },
     ],
@@ -39,7 +39,7 @@ describePrivacyPolicyRule<TestFields, 'customIdField', ViewerContext, TestEntity
         viewerContext: instance(mock(ViewerContext)),
         queryContext: instance(mock(EntityQueryContext)),
         evaluationContext:
-          instance(mock<EntityPrivacyPolicyEvaluationContext<any, any, any, any, any>>()),
+          instance(mock<EntityPrivacyPolicyRuleEvaluationContext<any, any, any, any, any>>()),
         entity: entityFoo,
       },
     ],