[cache-adapter-local-memory] export classes

CHANGELOG.md

@@ -3,51 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [0.25.3](https://github.com/expo/entity/compare/v0.25.2...v0.25.3) (2022-03-12)
-
-
-### Bug Fixes
-
-* lock lru-cache to v6.0.0 ([#170](https://github.com/expo/entity/issues/170)) ([293868b](https://github.com/expo/entity/commit/293868b1a73df9f749216af68b1ae94ac22ac2b9))
-
-
-
-
-
-## [0.25.2](https://github.com/expo/entity/compare/v0.25.1...v0.25.2) (2022-03-12)
-
-
-### Bug Fixes
-
-* lru-cache yarn workspace version resolution ([#168](https://github.com/expo/entity/issues/168)) ([e76ca8c](https://github.com/expo/entity/commit/e76ca8c2f72da84aa372a64ef1898ade220ed0a8))
-
-
-
-
-
-## [0.25.1](https://github.com/expo/entity/compare/v0.25.0...v0.25.1) (2022-03-10)
-
-
-### Bug Fixes
-
-* add composed cache to index ([#166](https://github.com/expo/entity/issues/166)) ([5c82edc](https://github.com/expo/entity/commit/5c82edcd9f26854878d29950a05852e117bbd723))
-
-
-
-
-
-# [0.25.0](https://github.com/expo/entity/compare/v0.24.0...v0.25.0) (2022-03-10)
-
-
-### Features
-
-* composed cache adapter, composed secondary cache, local memory secondary cache ([#164](https://github.com/expo/entity/issues/164)) ([6b6e70e](https://github.com/expo/entity/commit/6b6e70e75f7e42a4dce13edeb406a4d88d9264f0))
-* privacy policy evaluation context ([#162](https://github.com/expo/entity/issues/162)) ([3a81a4c](https://github.com/expo/entity/commit/3a81a4c059e2e995eb800e35e76b3d432c22b23f))
-
-
-
-
-
 # [0.24.0](https://github.com/expo/entity/compare/v0.23.0...v0.24.0) (2022-02-16)
 
 

lerna.json

@@ -4,5 +4,5 @@
   ],
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "0.25.3"
+  "version": "0.24.0"
 }

package.json

@@ -18,11 +18,11 @@
   "devDependencies": {
     "@expo/entity": "file:packages/entity",
     "@expo/results": "^1.0.0",
+    "@types/lru-cache": "^5.1.1",
     "@types/invariant": "^2.2.33",
     "@types/ioredis": "^4.26.4",
     "@types/jest": "^26.0.10",
     "@types/jsbn": "^1.2.29",
-    "@types/lru-cache": "^5.1.1",
     "@types/node": "^14.6.0",
     "@types/uuid": "^8.3.0",
     "@typescript-eslint/eslint-plugin": "^4.14.0",
@@ -33,7 +33,6 @@
     "eslint-plugin-tsdoc": "^0.2.11",
     "jest": "^26.6.3",
     "lerna": "^4.0.0",
-    "lru-cache": "^6.0.0",
     "nullthrows": "^1.1.1",
     "pg": "^8.6.0",
     "prettier": "^2.3.2",
@@ -48,8 +47,7 @@
     "@expo/entity-cache-adapter-local-memory": "file:packages/entity-cache-adapter-local-memory",
     "@expo/entity-cache-adapter-redis": "file:packages/entity-cache-adapter-redis",
     "@expo/entity-database-adapter-knex": "file:packages/entity-database-adapter-knex",
-    "@expo/entity-ip-address-field": "file:packages/entity-ip-address-field",
+    "@expo/entity-secondary-cache-redis": "file:packages/entity-secondary-cache-redis",
-    "@expo/entity-secondary-cache-local-memory": "file:packages/entity-secondary-cache-local-memory",
+    "@expo/entity-ip-address-field": "file:packages/entity-ip-address-field"
-    "@expo/entity-secondary-cache-redis": "file:packages/entity-secondary-cache-redis"
   }
 }

packages/entity-cache-adapter-local-memory/CHANGELOG.md

@@ -3,47 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [0.25.3](https://github.com/expo/entity/compare/v0.25.2...v0.25.3) (2022-03-12)
-
-
-### Bug Fixes
-
-* lock lru-cache to v6.0.0 ([#170](https://github.com/expo/entity/issues/170)) ([293868b](https://github.com/expo/entity/commit/293868b1a73df9f749216af68b1ae94ac22ac2b9))
-
-
-
-
-
-## [0.25.2](https://github.com/expo/entity/compare/v0.25.1...v0.25.2) (2022-03-12)
-
-
-### Bug Fixes
-
-* lru-cache yarn workspace version resolution ([#168](https://github.com/expo/entity/issues/168)) ([e76ca8c](https://github.com/expo/entity/commit/e76ca8c2f72da84aa372a64ef1898ade220ed0a8))
-
-
-
-
-
-## [0.25.1](https://github.com/expo/entity/compare/v0.25.0...v0.25.1) (2022-03-10)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-local-memory
-
-
-
-
-
-# [0.25.0](https://github.com/expo/entity/compare/v0.24.0...v0.25.0) (2022-03-10)
-
-
-### Features
-
-* composed cache adapter, composed secondary cache, local memory secondary cache ([#164](https://github.com/expo/entity/issues/164)) ([6b6e70e](https://github.com/expo/entity/commit/6b6e70e75f7e42a4dce13edeb406a4d88d9264f0))
-
-
-
-
-
 # [0.24.0](https://github.com/expo/entity/compare/v0.23.0...v0.24.0) (2022-02-16)
 
 

packages/entity-cache-adapter-local-memory/README.md

@@ -3,26 +3,21 @@
 Cross-request [LRU](https://github.com/isaacs/node-lru-cache) cache adapter for `@expo/entity`. Use
 this cache with caution - it is nonstandard. The cache is shared between requests in the node process.
 
-Note: This uses version 6.0.0 of `node-lru-cache` since it the most tuned version for our use case (low TTL + LRU). Upgrading
-to 7.x will cause high memory usage for the entity cache adapter use case since it allocates fixed-size data structures up front to tune for the non-TTL use case: https://github.com/isaacs/node-lru-cache/issues/208.
-
-[Documentation](https://expo.github.io/entity/modules/_expo_cache_adapter_local_memory.html)
-
 ## Why NOT use this cache
 
-Because this is an in-memory cache, cross-machine invalidation is not possible. Do not use this cache
+Because this is an in-memory cache, cross-box invalidation is not possible. Do not use this cache
 if you have the following use cases:
 
-- The objects stored are mutable
+- The objects stored have high mutability
 - Reading a stale object from the cache is not acceptable in your application
-- Cross-machine invalidation is not possible
+- Cross-box invalidation is not possible
 
 ## Typical use cases
 
 If your application sees many requests fetching the same objects, you can save a trip to your cache
 cluster and backing datastore by using this in-memory cache. Here are some good use cases:
 
-- The objects stored are mostly immutable, and reading a stale object for a short TTL is acceptable
+- The objects stored are mostly immutable
 - You have a low TTL setting in your cache
 
 ## Usage

packages/entity-cache-adapter-local-memory/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/entity-cache-adapter-local-memory",
-  "version": "0.25.3",
+  "version": "0.24.0",
   "description": "Cross-request local memory cache adapter for @expo/entity",
   "files": [
     "build",
@@ -30,9 +30,9 @@
     "@expo/entity": "*"
   },
   "dependencies": {
-    "lru-cache": "^6.0.0"
+    "lru-cache": "^7.3.1"
   },
   "devDependencies": {
-    "@expo/entity": "^0.25.3"
+    "@expo/entity": "^0.24.0"
   }
 }

packages/entity-cache-adapter-local-memory/src/GenericLocalMemoryCacher.ts

@@ -7,6 +7,76 @@ export const DOES_NOT_EXIST_LOCAL_MEMORY_CACHE = Symbol('doesNotExist');
 type LocalMemoryCacheValue<TFields> = Readonly<TFields> | typeof DOES_NOT_EXIST_LOCAL_MEMORY_CACHE;
 export type LocalMemoryCache<TFields> = LRUCache<string, LocalMemoryCacheValue<TFields>>;
 
+type LRUCacheOptionsV7<K, V> = {
+  /**
+   * the number of most recently used items to keep.
+   * note that we may store fewer items than this if maxSize is hit.
+   */
+  max: number;
+
+  /**
+   * if you wish to track item size, you must provide a maxSize
+   * note that we still will only keep up to max *actual items*,
+   * so size tracking may cause fewer than max items to be stored.
+   * At the extreme, a single item of maxSize size will cause everything
+   * else in the cache to be dropped when it is added.  Use with caution!
+   * Note also that size tracking can negatively impact performance,
+   * though for most cases, only minimally.
+   */
+
+  maxSize?: number;
+
+  /**
+   * function to calculate size of items.  useful if storing strings or
+   * buffers or other items where memory size depends on the object itself.
+   * also note that oversized items do NOT immediately get dropped from
+   * the cache, though they will cause faster turnover in the storage.
+   */
+  sizeCalculation?: (value: V, key: K) => number;
+
+  /**
+   * function to call when the item is removed from the cache
+   * Note that using this can negatively impact performance.
+   */
+  dispose?: (value: V, key: K) => void;
+
+  /**
+   * max time to live for items before they are considered stale
+   * note that stale items are NOT preemptively removed by default,
+   * and MAY live in the cache, contributing to its LRU max, long after
+   * they have expired.
+   * Also, as this cache is optimized for LRU/MRU operations, some of
+   * the staleness/TTL checks will reduce performance, as they will incur
+   * overhead by deleting items.
+   * Must be a positive integer in ms, defaults to 0, which means "no TTL"
+   */
+  ttl?: number;
+
+  /**
+   * return stale items from cache.get() before disposing of them
+   * boolean, default false
+   */
+  allowStale?: boolean;
+
+  /**
+   * update the age of items on cache.get(), renewing their TTL
+   * boolean, default false
+   */
+  updateAgeOnGet?: boolean;
+
+  /**
+   * update the age of items on cache.has(), renewing their TTL
+   * boolean, default false
+   */
+  updateAgeOnHas?: boolean;
+
+  /**
+   * update the "recently-used"-ness of items on cache.has()
+   * boolean, default false
+   */
+  updateRecencyOnHas?: boolean;
+};
+
 export default class GenericLocalMemoryCacher<TFields> implements IEntityGenericCacher<TFields> {
   constructor(private readonly localMemoryCache: LocalMemoryCache<TFields>) {}
 
@@ -16,11 +86,13 @@ export default class GenericLocalMemoryCacher<TFields> implements IEntityGeneric
     const DEFAULT_LRU_CACHE_MAX_AGE_SECONDS = 10;
     const DEFAULT_LRU_CACHE_SIZE = 10000;
     const maxAgeSeconds = options.ttlSeconds ?? DEFAULT_LRU_CACHE_MAX_AGE_SECONDS;
-    return new LRUCache<string, LocalMemoryCacheValue<TFields>>({
+    const lruCacheOptions: LRUCacheOptionsV7<string, TFields> = {
       max: options.maxSize ?? DEFAULT_LRU_CACHE_SIZE,
-      length: (value) => (value === DOES_NOT_EXIST_LOCAL_MEMORY_CACHE ? 0 : 1),
+      sizeCalculation: (value: LocalMemoryCacheValue<TFields>) =>
-      maxAge: maxAgeSeconds * 1000, // convert to ms
+        value === DOES_NOT_EXIST_LOCAL_MEMORY_CACHE ? 0 : 1,
-    });
+      ttl: maxAgeSeconds * 1000, // convert to ms
+    };
+    return new LRUCache<string, LocalMemoryCacheValue<TFields>>(lruCacheOptions as any);
   }
 
   static createNoOpCache<TFields>(): LocalMemoryCache<TFields> {

packages/entity-cache-adapter-local-memory/src/__integration-tests__/LocalMemoryCacheAdapter-integration-test.ts

@@ -3,12 +3,12 @@ import { v4 as uuidv4 } from 'uuid';
 
 import GenericLocalMemoryCacher from '../GenericLocalMemoryCacher';
 import LocalMemoryCacheAdapter from '../LocalMemoryCacheAdapter';
-import LocalMemoryCacheAdapterProvider from '../LocalMemoryCacheAdapterProvider';
+import { LocalMemoryCacheAdapterProvider } from '../LocalMemoryCacheAdapterProvider';
 import LocalMemoryTestEntity from '../testfixtures/LocalMemoryTestEntity';
 import {
-  createLocalMemoryTestEntityCompanionProvider,
+  createLocalMemoryIntegrationTestEntityCompanionProvider,
   createNoopLocalMemoryIntegrationTestEntityCompanionProvider,
-} from '../testfixtures/createLocalMemoryTestEntityCompanionProvider';
+} from '../testfixtures/createLocalMemoryIntegrationTestEntityCompanionProvider';
 
 class TestViewerContext extends ViewerContext {}
 
@@ -18,7 +18,9 @@ describe(LocalMemoryCacheAdapter, () => {
   });
 
   it('has correct caching behavior', async () => {
-    const viewerContext = new TestViewerContext(createLocalMemoryTestEntityCompanionProvider());
+    const viewerContext = new TestViewerContext(
+      createLocalMemoryIntegrationTestEntityCompanionProvider()
+    );
     const cacheAdapter = viewerContext.entityCompanionProvider.getCompanionForEntity(
       LocalMemoryTestEntity,
       LocalMemoryTestEntity.getCompanionDefinition()
@@ -32,9 +34,9 @@ describe(LocalMemoryCacheAdapter, () => {
       .enforceCreateAsync();
 
     // loading an entity should put it in cache
-    const entity1 = await LocalMemoryTestEntity.loader(viewerContext).loadByIDAsync(
+    const entity1 = await LocalMemoryTestEntity.loader(viewerContext)
-      entity1Created.getID()
+      .enforcing()
-    );
+      .loadByIDAsync(entity1Created.getID());
 
     const entitySpecificGenericCacher =
       LocalMemoryCacheAdapterProvider.localMemoryCacheAdapterMap.get(
@@ -88,7 +90,9 @@ describe(LocalMemoryCacheAdapter, () => {
       GenericLocalMemoryCacher.prototype as unknown as any,
       'loadManyAsync'
     );
-    const viewerContext = new TestViewerContext(createLocalMemoryTestEntityCompanionProvider());
+    const viewerContext = new TestViewerContext(
+      createLocalMemoryIntegrationTestEntityCompanionProvider()
+    );
 
     const date = new Date();
     const entity1Created = await LocalMemoryTestEntity.creator(viewerContext)
@@ -97,13 +101,17 @@ describe(LocalMemoryCacheAdapter, () => {
       .enforceCreateAsync();
 
     // loading an entity should put it in cache
-    await LocalMemoryTestEntity.loader(viewerContext).loadByIDAsync(entity1Created.getID());
+    await LocalMemoryTestEntity.loader(viewerContext)
+      .enforcing()
+      .loadByIDAsync(entity1Created.getID());
 
     // load entity with a different request
-    const viewerContext2 = new TestViewerContext(createLocalMemoryTestEntityCompanionProvider());
+    const viewerContext2 = new TestViewerContext(
-    const entity1WithVc2 = await LocalMemoryTestEntity.loader(viewerContext2).loadByIDAsync(
+      createLocalMemoryIntegrationTestEntityCompanionProvider()
-      entity1Created.getID()
     );
+    const entity1WithVc2 = await LocalMemoryTestEntity.loader(viewerContext2)
+      .enforcing()
+      .loadByIDAsync(entity1Created.getID());
 
     const cacheAdapter = viewerContext.entityCompanionProvider.getCompanionForEntity(
       LocalMemoryTestEntity,
@@ -138,9 +146,9 @@ describe(LocalMemoryCacheAdapter, () => {
       .enforceCreateAsync();
 
     // loading an entity will try to put it in cache but it's a noop cache, so it should be a miss
-    const entity1 = await LocalMemoryTestEntity.loader(viewerContext).loadByIDAsync(
+    const entity1 = await LocalMemoryTestEntity.loader(viewerContext)
-      entity1Created.getID()
+      .enforcing()
-    );
+      .loadByIDAsync(entity1Created.getID());
 
     const entitySpecificGenericCacher =
       LocalMemoryCacheAdapterProvider.localMemoryCacheAdapterMap.get(

packages/entity-cache-adapter-local-memory/src/__tests__/GenericLocalMemoryCacher-test.ts

@@ -1,28 +0,0 @@
-import GenericLocalMemoryCacher from '../GenericLocalMemoryCacher';
-
-describe(GenericLocalMemoryCacher, () => {
-  describe(GenericLocalMemoryCacher.createLRUCache, () => {
-    it('creates a cache with default options', () => {
-      const cache = GenericLocalMemoryCacher.createLRUCache();
-      expect(cache.max).toBe(10000);
-      expect(cache.maxAge).toBe(10000);
-    });
-
-    it('respects specified options', () => {
-      const cache = GenericLocalMemoryCacher.createLRUCache({
-        ttlSeconds: 3,
-        maxSize: 10,
-      });
-      expect(cache.max).toBe(10);
-      expect(cache.maxAge).toBe(3000);
-    });
-  });
-
-  describe(GenericLocalMemoryCacher.createNoOpCache, () => {
-    it('creates a no-op cache', () => {
-      const cache = GenericLocalMemoryCacher.createNoOpCache<{ hello: 'world' }>();
-      cache.set('a', { hello: 'world' });
-      expect(cache.get('a')).toBeUndefined();
-    });
-  });
-});

packages/entity-cache-adapter-local-memory/src/__tests__/LocalMemoryCacheAdapter-test.ts

@@ -24,7 +24,10 @@ describe(LocalMemoryCacheAdapter, () => {
     it('returns appropriate cache results', async () => {
       const cacheAdapter = new LocalMemoryCacheAdapter(
         entityConfiguration,
-        GenericLocalMemoryCacher.createLRUCache()
+        GenericLocalMemoryCacher.createLRUCache({
+          maxSize: Number.MAX_SAFE_INTEGER,
+          ttlSeconds: Number.MAX_SAFE_INTEGER,
+        })
       );
 
       const cacheHits = new Map<string, Readonly<BlahFields>>([['test-id-1', { id: 'test-id-1' }]]);
@@ -49,7 +52,10 @@ describe(LocalMemoryCacheAdapter, () => {
     it('returns empty map when passed empty array of fieldValues', async () => {
       const cacheAdapter = new LocalMemoryCacheAdapter(
         entityConfiguration,
-        GenericLocalMemoryCacher.createLRUCache()
+        GenericLocalMemoryCacher.createLRUCache({
+          maxSize: Number.MAX_SAFE_INTEGER,
+          ttlSeconds: Number.MAX_SAFE_INTEGER,
+        })
       );
       const results = await cacheAdapter.loadManyAsync('id', []);
       expect(results).toEqual(new Map());
@@ -58,7 +64,10 @@ describe(LocalMemoryCacheAdapter, () => {
 
   describe('cacheManyAsync', () => {
     it('correctly caches all objects', async () => {
-      const localMemoryCache = GenericLocalMemoryCacher.createLRUCache<BlahFields>({});
+      const localMemoryCache = GenericLocalMemoryCacher.createLRUCache<BlahFields>({
+        maxSize: Number.MAX_SAFE_INTEGER,
+        ttlSeconds: Number.MAX_SAFE_INTEGER,
+      });
 
       const cacheAdapter = new LocalMemoryCacheAdapter(entityConfiguration, localMemoryCache);
       await cacheAdapter.cacheManyAsync('id', new Map([['test-id-1', { id: 'test-id-1' }]]));
@@ -72,7 +81,10 @@ describe(LocalMemoryCacheAdapter, () => {
 
   describe('cacheDBMissesAsync', () => {
     it('correctly caches misses', async () => {
-      const localMemoryCache = GenericLocalMemoryCacher.createLRUCache<BlahFields>({});
+      const localMemoryCache = GenericLocalMemoryCacher.createLRUCache<BlahFields>({
+        maxSize: Number.MAX_SAFE_INTEGER,
+        ttlSeconds: Number.MAX_SAFE_INTEGER,
+      });
 
       const cacheAdapter = new LocalMemoryCacheAdapter(entityConfiguration, localMemoryCache);
       await cacheAdapter.cacheDBMissesAsync('id', ['test-id-1']);
@@ -84,7 +96,10 @@ describe(LocalMemoryCacheAdapter, () => {
 
   describe('invalidateManyAsync', () => {
     it('invalidates correctly', async () => {
-      const localMemoryCache = GenericLocalMemoryCacher.createLRUCache<BlahFields>({});
+      const localMemoryCache = GenericLocalMemoryCacher.createLRUCache<BlahFields>({
+        maxSize: Number.MAX_SAFE_INTEGER,
+        ttlSeconds: Number.MAX_SAFE_INTEGER,
+      });
 
       const cacheAdapter = new LocalMemoryCacheAdapter(entityConfiguration, localMemoryCache);
       await cacheAdapter.cacheManyAsync('id', new Map([['test-id-1', { id: 'test-id-1' }]]));
@@ -99,7 +114,10 @@ describe(LocalMemoryCacheAdapter, () => {
     it('returns when passed empty array of fieldValues', async () => {
       const cacheAdapter = new LocalMemoryCacheAdapter(
         entityConfiguration,
-        GenericLocalMemoryCacher.createLRUCache<BlahFields>({})
+        GenericLocalMemoryCacher.createLRUCache<BlahFields>({
+          maxSize: Number.MAX_SAFE_INTEGER,
+          ttlSeconds: Number.MAX_SAFE_INTEGER,
+        })
       );
       await cacheAdapter.invalidateManyAsync('id', []);
     });

packages/entity-cache-adapter-local-memory/src/index.ts

@@ -4,7 +4,7 @@
  * @module @expo/entity-cache-adapter-local-memory
  */
 
-export { default as GenericLocalMemoryCacher } from './GenericLocalMemoryCacher';
-export * from './GenericLocalMemoryCacher';
 export { default as LocalMemoryCacheAdapter } from './LocalMemoryCacheAdapter';
 export { default as LocalMemoryCacheAdapterProvider } from './LocalMemoryCacheAdapterProvider';
+export { default as GenericLocalMemoryCacher } from './GenericLocalMemoryCacher';
+export * from './GenericLocalMemoryCacher';

packages/entity-cache-adapter-local-memory/src/testfixtures/createLocalMemoryIntegrationTestEntityCompanionProvider.ts

@@ -6,9 +6,9 @@ import {
   StubDatabaseAdapterProvider,
 } from '@expo/entity';
 
-import LocalMemoryCacheAdapterProvider from '../LocalMemoryCacheAdapterProvider';
+import { LocalMemoryCacheAdapterProvider } from '../LocalMemoryCacheAdapterProvider';
 
-export const createLocalMemoryTestEntityCompanionProvider = (
+export const createLocalMemoryIntegrationTestEntityCompanionProvider = (
   localMemoryOptions: { maxSize?: number; ttlSeconds?: number } = {},
   metricsAdapter: IEntityMetricsAdapter = new NoOpEntityMetricsAdapter()
 ): EntityCompanionProvider => {
@@ -41,7 +41,7 @@ export const createLocalMemoryTestEntityCompanionProvider = (
 export const createNoopLocalMemoryIntegrationTestEntityCompanionProvider = (
   metricsAdapter: IEntityMetricsAdapter = new NoOpEntityMetricsAdapter()
 ): EntityCompanionProvider => {
-  return createLocalMemoryTestEntityCompanionProvider(
+  return createLocalMemoryIntegrationTestEntityCompanionProvider(
     { maxSize: 0, ttlSeconds: 0 },
     metricsAdapter
   );

packages/entity-cache-adapter-redis/CHANGELOG.md

@@ -3,38 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [0.25.3](https://github.com/expo/entity/compare/v0.25.2...v0.25.3) (2022-03-12)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-## [0.25.2](https://github.com/expo/entity/compare/v0.25.1...v0.25.2) (2022-03-12)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-## [0.25.1](https://github.com/expo/entity/compare/v0.25.0...v0.25.1) (2022-03-10)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
-# [0.25.0](https://github.com/expo/entity/compare/v0.24.0...v0.25.0) (2022-03-10)
-
-**Note:** Version bump only for package @expo/entity-cache-adapter-redis
-
-
-
-
-
 # [0.24.0](https://github.com/expo/entity/compare/v0.23.0...v0.24.0) (2022-02-16)
 
 ### Chores

packages/entity-cache-adapter-redis/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/entity-cache-adapter-redis",
-  "version": "0.25.3",
+  "version": "0.24.0",
   "description": "Redis cache adapter for @expo/entity",
   "files": [
     "build",
@@ -33,6 +33,6 @@
     "ioredis": "^4.27.3"
   },
   "devDependencies": {
-    "@expo/entity": "^0.25.3"
+    "@expo/entity": "^0.24.0"
   }
 }

packages/entity-cache-adapter-redis/src/__integration-tests__/RedisCacheAdapter-integration-test.ts

@@ -52,9 +52,9 @@ describe(RedisCacheAdapter, () => {
       .enforceCreateAsync();
 
     // loading an entity should put it in cache
-    const entity1 = await RedisTestEntity.loader(viewerContext).loadByIDAsync(
+    const entity1 = await RedisTestEntity.loader(viewerContext)
-      entity1Created.getID()
+      .enforcing()
-    );
+      .loadByIDAsync(entity1Created.getID());
 
     const cachedJSON = await redisCacheAdapterContext.redisClient.get(
       cacheKeyMaker('id', entity1.getID())
@@ -102,14 +102,16 @@ describe(RedisCacheAdapter, () => {
     );
     expect(entity1.getField('dateField')).toEqual(date);
 
-    const entity2 = await RedisTestEntity.loader(viewerContext).loadByIDAsync(entity1.getID());
+    const entity2 = await RedisTestEntity.loader(viewerContext)
+      .enforcing()
+      .loadByIDAsync(entity1.getID());
     expect(entity2.getField('dateField')).toEqual(date);
 
     // simulate new request
     const vc2 = new TestViewerContext(
       createRedisIntegrationTestEntityCompanionProvider(redisCacheAdapterContext)
     );
-    const entity3 = await RedisTestEntity.loader(vc2).loadByIDAsync(entity1.getID());
+    const entity3 = await RedisTestEntity.loader(vc2).enforcing().loadByIDAsync(entity1.getID());
     expect(entity3.getField('dateField')).toEqual(date);
   });
 
@@ -120,17 +122,18 @@ describe(RedisCacheAdapter, () => {
     const entity1 = await enforceAsyncResult(
       RedisTestEntity.creator(viewerContext).setField('name', '').createAsync()
     );
-    const entity2 = await RedisTestEntity.loader(viewerContext).loadByFieldEqualingAsync(
+    const entity2 = await RedisTestEntity.loader(viewerContext)
-      'name',
+      .enforcing()
-      ''
+      .loadByFieldEqualingAsync('name', '');
-    );
     expect(entity2?.getID()).toEqual(entity1.getID());
 
     // simulate new request
     const vc2 = new TestViewerContext(
       createRedisIntegrationTestEntityCompanionProvider(redisCacheAdapterContext)
     );
-    const entity3 = await RedisTestEntity.loader(vc2).loadByFieldEqualingAsync('name', '');
+    const entity3 = await RedisTestEntity.loader(vc2)
+      .enforcing()
+      .loadByFieldEqualingAsync('name', '');
     expect(entity3?.getID()).toEqual(entity1.getID());
   });
 });

packages/entity-database-adapter-knex/CHANGELOG.md

@@ -3,38 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [0.25.3](https://github.com/expo/entity/compare/v0.25.2...v0.25.3) (2022-03-12)
-
-**Note:** Version bump only for package @expo/entity-database-adapter-knex
-
-
-
-
-
-## [0.25.2](https://github.com/expo/entity/compare/v0.25.1...v0.25.2) (2022-03-12)
-
-**Note:** Version bump only for package @expo/entity-database-adapter-knex
-
-
-
-
-
-## [0.25.1](https://github.com/expo/entity/compare/v0.25.0...v0.25.1) (2022-03-10)
-
-**Note:** Version bump only for package @expo/entity-database-adapter-knex
-
-
-
-
-
-# [0.25.0](https://github.com/expo/entity/compare/v0.24.0...v0.25.0) (2022-03-10)
-
-**Note:** Version bump only for package @expo/entity-database-adapter-knex
-
-
-
-
-
 # [0.24.0](https://github.com/expo/entity/compare/v0.23.0...v0.24.0) (2022-02-16)
 
 **Note:** Version bump only for package @expo/entity-database-adapter-knex

packages/entity-database-adapter-knex/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/entity-database-adapter-knex",
-  "version": "0.25.3",
+  "version": "0.24.0",
   "description": "Knex database adapter for @expo/entity",
   "files": [
     "build",
@@ -33,7 +33,7 @@
     "knex": "^1.0.2"
   },
   "devDependencies": {
-    "@expo/entity": "^0.25.3",
+    "@expo/entity": "^0.24.0",
     "pg": "^8.7.1"
   }
 }

packages/entity-database-adapter-knex/src/__integration-tests__/PostgresEntityIntegration-test.ts

@@ -50,7 +50,9 @@ describe('postgres entity integration', () => {
       PostgresTestEntity.updater(entity).setField('hasADog', false).updateAsync(),
     ]);
 
-    const loadedEntity = await PostgresTestEntity.loader(vc).loadByIDAsync(entity.getID());
+    const loadedEntity = await PostgresTestEntity.loader(vc)
+      .enforcing()
+      .loadByIDAsync(entity.getID());
 
     expect(loadedEntity.getField('hasACat')).toBe(true);
     expect(loadedEntity.getField('hasADog')).toBe(false);
@@ -183,22 +185,26 @@ describe('postgres entity integration', () => {
           .createAsync()
       );
 
-      const results = await PostgresTestEntity.loader(vc1).loadManyByFieldEqualityConjunctionAsync([
+      const results = await PostgresTestEntity.loader(vc1)
-        {
+        .enforcing()
-          fieldName: 'hasACat',
+        .loadManyByFieldEqualityConjunctionAsync([
-          fieldValue: false,
+          {
-        },
+            fieldName: 'hasACat',
-        {
+            fieldValue: false,
-          fieldName: 'hasADog',
+          },
-          fieldValue: true,
+          {
-        },
+            fieldName: 'hasADog',
-      ]);
+            fieldValue: true,
+          },
+        ]);
 
       expect(results).toHaveLength(2);
 
-      const results2 = await PostgresTestEntity.loader(vc1).loadManyByFieldEqualityConjunctionAsync(
+      const results2 = await PostgresTestEntity.loader(vc1)
-        [{ fieldName: 'hasADog', fieldValues: [true, false] }]
+        .enforcing()
-      );
+        .loadManyByFieldEqualityConjunctionAsync([
+          { fieldName: 'hasADog', fieldValues: [true, false] },
+        ]);
       expect(results2).toHaveLength(3);
     });
 
@@ -211,9 +217,9 @@ describe('postgres entity integration', () => {
 
       await enforceAsyncResult(PostgresTestEntity.creator(vc1).setField('name', 'c').createAsync());
 
-      const results = await PostgresTestEntity.loader(vc1).loadManyByFieldEqualityConjunctionAsync(
+      const results = await PostgresTestEntity.loader(vc1)
-        [],
+        .enforcing()
-        {
+        .loadManyByFieldEqualityConjunctionAsync([], {
           limit: 2,
           offset: 1,
           orderBy: [
@@ -222,8 +228,7 @@ describe('postgres entity integration', () => {
               order: OrderByOrdering.DESCENDING,
             },
           ],
-        }
+        });
-      );
       expect(results).toHaveLength(2);
       expect(results.map((e) => e.getField('name'))).toEqual(['b', 'a']);
     });
@@ -255,26 +260,28 @@ describe('postgres entity integration', () => {
           .createAsync()
       );
 
-      const results = await PostgresTestEntity.loader(vc1).loadManyByFieldEqualityConjunctionAsync([
+      const results = await PostgresTestEntity.loader(vc1)
-        { fieldName: 'name', fieldValue: null },
+        .enforcing()
-      ]);
+        .loadManyByFieldEqualityConjunctionAsync([{ fieldName: 'name', fieldValue: null }]);
       expect(results).toHaveLength(2);
       expect(results[0]!.getField('name')).toBeNull();
 
-      const results2 = await PostgresTestEntity.loader(vc1).loadManyByFieldEqualityConjunctionAsync(
+      const results2 = await PostgresTestEntity.loader(vc1)
-        [
+        .enforcing()
-          { fieldName: 'name', fieldValues: ['a', null] },
+        .loadManyByFieldEqualityConjunctionAsync(
-          { fieldName: 'hasADog', fieldValue: true },
+          [
-        ],
+            { fieldName: 'name', fieldValues: ['a', null] },
-        {
+            { fieldName: 'hasADog', fieldValue: true },
-          orderBy: [
-            {
-              fieldName: 'name',
-              order: OrderByOrdering.DESCENDING,
-            },
           ],
-        }
+          {
-      );
+            orderBy: [
+              {
+                fieldName: 'name',
+                order: OrderByOrdering.DESCENDING,
+              },
+            ],
+          }
+        );
       expect(results2).toHaveLength(2);
       expect(results2.map((e) => e.getField('name'))).toEqual([null, 'a']);
     });
@@ -291,10 +298,9 @@ describe('postgres entity integration', () => {
           .createAsync()
       );
 
-      const results = await PostgresTestEntity.loader(vc1).loadManyByRawWhereClauseAsync(
+      const results = await PostgresTestEntity.loader(vc1)
-        'name = ?',
+        .enforcing()
-        ['hello']
+        .loadManyByRawWhereClauseAsync('name = ?', ['hello']);
-      );
 
       expect(results).toHaveLength(1);
     });
@@ -310,9 +316,9 @@ describe('postgres entity integration', () => {
       );
 
       await expect(
-        PostgresTestEntity.loader(vc1).loadManyByRawWhereClauseAsync('invalid_column = ?', [
+        PostgresTestEntity.loader(vc1)
-          'hello',
+          .enforcing()
-        ])
+          .loadManyByRawWhereClauseAsync('invalid_column = ?', ['hello'])
       ).rejects.toThrow();
     });
 
@@ -340,10 +346,9 @@ describe('postgres entity integration', () => {
           .createAsync()
       );
 
-      const results = await PostgresTestEntity.loader(vc1).loadManyByRawWhereClauseAsync(
+      const results = await PostgresTestEntity.loader(vc1)
-        'has_a_dog = ?',
+        .enforcing()
-        [true],
+        .loadManyByRawWhereClauseAsync('has_a_dog = ?', [true], {
-        {
           limit: 2,
           offset: 1,
           orderBy: [
@@ -352,26 +357,25 @@ describe('postgres entity integration', () => {
               order: OrderByOrdering.ASCENDING,
             },
           ],
-        }
+        });
-      );
 
       expect(results).toHaveLength(2);
       expect(results.map((e) => e.getField('name'))).toEqual(['b', 'c']);
 
-      const resultsMultipleOrderBy = await PostgresTestEntity.loader(
+      const resultsMultipleOrderBy = await PostgresTestEntity.loader(vc1)
-        vc1
+        .enforcing()
-      ).loadManyByRawWhereClauseAsync('has_a_dog = ?', [true], {
+        .loadManyByRawWhereClauseAsync('has_a_dog = ?', [true], {
-        orderBy: [
+          orderBy: [
-          {
+            {
-            fieldName: 'hasADog',
+              fieldName: 'hasADog',
-            order: OrderByOrdering.ASCENDING,
+              order: OrderByOrdering.ASCENDING,
-          },
+            },
-          {
+            {
-            fieldName: 'name',
+              fieldName: 'name',
-            order: OrderByOrdering.DESCENDING,
+              order: OrderByOrdering.DESCENDING,
-          },
+            },
-        ],
+          ],
-      });
+        });
 
       expect(resultsMultipleOrderBy).toHaveLength(3);
       expect(resultsMultipleOrderBy.map((e) => e.getField('name'))).toEqual(['c', 'b', 'a']);
@@ -391,7 +395,9 @@ describe('postgres entity integration', () => {
             .enforceCreateAsync()
         ).rejects.toThrowError('name cannot have value beforeCreate');
         await expect(
-          PostgresTriggerTestEntity.loader(vc1).loadByFieldEqualingAsync('name', 'beforeCreate')
+          PostgresTriggerTestEntity.loader(vc1)
+            .enforcing()
+            .loadByFieldEqualingAsync('name', 'beforeCreate')
         ).resolves.toBeNull();
 
         await expect(
@@ -400,21 +406,27 @@ describe('postgres entity integration', () => {
             .enforceCreateAsync()
         ).rejects.toThrowError('name cannot have value afterCreate');
         await expect(
-          PostgresTriggerTestEntity.loader(vc1).loadByFieldEqualingAsync('name', 'afterCreate')
+          PostgresTriggerTestEntity.loader(vc1)
+            .enforcing()
+            .loadByFieldEqualingAsync('name', 'afterCreate')
         ).resolves.toBeNull();
 
         await expect(
           PostgresTriggerTestEntity.creator(vc1).setField('name', 'beforeAll').enforceCreateAsync()
         ).rejects.toThrowError('name cannot have value beforeAll');
         await expect(
-          PostgresTriggerTestEntity.loader(vc1).loadByFieldEqualingAsync('name', 'beforeAll')
+          PostgresTriggerTestEntity.loader(vc1)
+            .enforcing()
+            .loadByFieldEqualingAsync('name', 'beforeAll')
         ).resolves.toBeNull();
 
         await expect(
           PostgresTriggerTestEntity.creator(vc1).setField('name', 'afterAll').enforceCreateAsync()
         ).rejects.toThrowError('name cannot have value afterAll');
         await expect(
-          PostgresTriggerTestEntity.loader(vc1).loadByFieldEqualingAsync('name', 'afterAll')
+          PostgresTriggerTestEntity.loader(vc1)
+            .enforcing()
+            .loadByFieldEqualingAsync('name', 'afterAll')
         ).resolves.toBeNull();
 
         await expect(
@@ -423,7 +435,9 @@ describe('postgres entity integration', () => {
             .enforceCreateAsync()
         ).rejects.toThrowError('name cannot have value afterCommit');
         await expect(
-          PostgresTriggerTestEntity.loader(vc1).loadByFieldEqualingAsync('name', 'afterCommit')
+          PostgresTriggerTestEntity.loader(vc1)
+            .enforcing()
+            .loadByFieldEqualingAsync('name', 'afterCommit')
         ).resolves.not.toBeNull();
       });
     });
@@ -444,7 +458,9 @@ describe('postgres entity integration', () => {
             .enforceUpdateAsync()
         ).rejects.toThrowError('name cannot have value beforeUpdate');
         await expect(
-          PostgresTriggerTestEntity.loader(vc1).loadByFieldEqualingAsync('name', 'beforeUpdate')
+          PostgresTriggerTestEntity.loader(vc1)
+            .enforcing()
+            .loadByFieldEqualingAsync('name', 'beforeUpdate')
         ).resolves.toBeNull();
 
         await expect(
@@ -453,7 +469,9 @@ describe('postgres entity integration', () => {
             .enforceUpdateAsync()
         ).rejects.toThrowError('name cannot have value afterUpdate');
         await expect(
-          PostgresTriggerTestEntity.loader(vc1).loadByFieldEqualingAsync('name', 'afterUpdate')
+          PostgresTriggerTestEntity.loader(vc1)
+            .enforcing()
+            .loadByFieldEqualingAsync('name', 'afterUpdate')
         ).resolves.toBeNull();
 
         await expect(
@@ -462,7 +480,9 @@ describe('postgres entity integration', () => {
             .enforceUpdateAsync()
         ).rejects.toThrowError('name cannot have value beforeAll');
         await expect(
-          PostgresTriggerTestEntity.loader(vc1).loadByFieldEqualingAsync('name', 'beforeAll')
+          PostgresTriggerTestEntity.loader(vc1)
+            .enforcing()
+            .loadByFieldEqualingAsync('name', 'beforeAll')
         ).resolves.toBeNull();
 
         await expect(
@@ -471,7 +491,9 @@ describe('postgres entity integration', () => {
             .enforceUpdateAsync()
         ).rejects.toThrowError('name cannot have value afterAll');
         await expect(
-          PostgresTriggerTestEntity.loader(vc1).loadByFieldEqualingAsync('name', 'afterAll')
+          PostgresTriggerTestEntity.loader(vc1)
+            .enforcing()
+            .loadByFieldEqualingAsync('name', 'afterAll')
         ).resolves.toBeNull();
 
         await expect(
@@ -480,7 +502,9 @@ describe('postgres entity integration', () => {
             .enforceUpdateAsync()
         ).rejects.toThrowError('name cannot have value afterCommit');
         await expect(
-          PostgresTriggerTestEntity.loader(vc1).loadByFieldEqualingAsync('name', 'afterCommit')
+          PostgresTriggerTestEntity.loader(vc1)
+            .enforcing()
+            .loadByFieldEqualingAsync('name', 'afterCommit')
         ).resolves.not.toBeNull();
       });
     });
@@ -498,7 +522,9 @@ describe('postgres entity integration', () => {
           PostgresTriggerTestEntity.enforceDeleteAsync(entityBeforeDelete)
         ).rejects.toThrowError('name cannot have value beforeDelete');
         await expect(
-          PostgresTriggerTestEntity.loader(vc1).loadByFieldEqualingAsync('name', 'beforeDelete')
+          PostgresTriggerTestEntity.loader(vc1)
+            .enforcing()
+            .loadByFieldEqualingAsync('name', 'beforeDelete')
         ).resolves.not.toBeNull();
 
         const entityAfterDelete = await PostgresTriggerTestEntity.creator(vc1)
@@ -508,7 +534,9 @@ describe('postgres entity integration', () => {
           PostgresTriggerTestEntity.enforceDeleteAsync(entityAfterDelete)
         ).rejects.toThrowError('name cannot have value afterDelete');
         await expect(
-          PostgresTriggerTestEntity.loader(vc1).loadByFieldEqualingAsync('name', 'afterDelete')
+          PostgresTriggerTestEntity.loader(vc1)
+            .enforcing()
+            .loadByFieldEqualingAsync('name', 'afterDelete')
         ).resolves.not.toBeNull();
       });
     });
@@ -525,10 +553,9 @@ describe('postgres entity integration', () => {
               .enforceCreateAsync()
           ).rejects.toThrowError('name cannot have value beforeCreateAndBeforeUpdate');
           await expect(
-            PostgresValidatorTestEntity.loader(vc1).loadByFieldEqualingAsync(
+            PostgresValidatorTestEntity.loader(vc1)
-              'name',
+              .enforcing()
-              'beforeCreateAndBeforeUpdate'
+              .loadByFieldEqualingAsync('name', 'beforeCreateAndBeforeUpdate')
-            )
           ).resolves.toBeNull();
         });
       });
@@ -548,10 +575,9 @@ describe('postgres entity integration', () => {
               .enforceUpdateAsync()
           ).rejects.toThrowError('name cannot have value beforeCreateAndBeforeUpdate');
           await expect(
-            PostgresValidatorTestEntity.loader(vc1).loadByFieldEqualingAsync(
+            PostgresValidatorTestEntity.loader(vc1)
-              'name',
+              .enforcing()
-              'beforeCreateAndBeforeUpdate'
+              .loadByFieldEqualingAsync('name', 'beforeCreateAndBeforeUpdate')
-            )
           ).resolves.toBeNull();
         });
       });
@@ -566,10 +592,9 @@ describe('postgres entity integration', () => {
             .enforceCreateAsync();
           await PostgresValidatorTestEntity.enforceDeleteAsync(entityToDelete);
           await expect(
-            PostgresValidatorTestEntity.loader(vc1).loadByFieldEqualingAsync(
+            PostgresValidatorTestEntity.loader(vc1)
-              'name',
+              .enforcing()
-              'shouldBeDeleted'
+              .loadByFieldEqualingAsync('name', 'shouldBeDeleted')
-            )
           ).resolves.toBeNull();
         });
       });

packages/entity-database-adapter-knex/src/__integration-tests__/errors-test.ts

@@ -60,7 +60,7 @@ describe('postgres errors', () => {
     const vc2 = new ViewerContext(
       createKnexIntegrationTestEntityCompanionProvider(shortTimeoutKnexInstance)
     );
-    await expect(ErrorsTestEntity.loader(vc2).loadByIDAsync(1)).rejects.toThrow(
+    await expect(ErrorsTestEntity.loader(vc2).enforcing().loadByIDAsync(1)).rejects.toThrow(
       EntityDatabaseAdapterTransientError
     );
     await shortTimeoutKnexInstance.destroy();

packages/entity-example/CHANGELOG.md

@@ -3,41 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [0.25.3](https://github.com/expo/entity/compare/v0.25.2...v0.25.3) (2022-03-12)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-## [0.25.2](https://github.com/expo/entity/compare/v0.25.1...v0.25.2) (2022-03-12)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-## [0.25.1](https://github.com/expo/entity/compare/v0.25.0...v0.25.1) (2022-03-10)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
-# [0.25.0](https://github.com/expo/entity/compare/v0.24.0...v0.25.0) (2022-03-10)
-
-
-### Features
-
-* privacy policy evaluation context ([#162](https://github.com/expo/entity/issues/162)) ([3a81a4c](https://github.com/expo/entity/commit/3a81a4c059e2e995eb800e35e76b3d432c22b23f))
-
-
-
-
-
 # [0.24.0](https://github.com/expo/entity/compare/v0.23.0...v0.24.0) (2022-02-16)
 
 **Note:** Version bump only for package @expo/entity-example

packages/entity-example/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@expo/entity-example",
   "private": true,
-  "version": "0.25.3",
+  "version": "0.24.0",
   "description": "An example integration of the @expo/entity framework",
   "scripts": {
     "tsc": "tsc",
@@ -23,7 +23,7 @@
   "author": "Expo",
   "license": "MIT",
   "dependencies": {
-    "@expo/entity": "^0.25.3",
+    "@expo/entity": "^0.24.0",
     "apollo-server-koa": "^2.16.1",
     "graphql": "^15.3.0",
     "koa": "^2.13.0",

packages/entity-example/src/entities/AllowIfUserOwnerPrivacyRule.ts

@@ -3,7 +3,6 @@ import {
   ReadonlyEntity,
   EntityQueryContext,
   RuleEvaluationResult,
-  EntityPrivacyPolicyEvaluationContext,
 } from '@expo/entity';
 
 import { ExampleViewerContext } from '../viewerContexts';
@@ -35,7 +34,6 @@ export default class AllowIfUserOwnerPrivacyRule<
   async evaluateAsync(
     viewerContext: ExampleViewerContext,
     _queryContext: EntityQueryContext,
-    _evaluationContext: EntityPrivacyPolicyEvaluationContext,
     entity: TEntity
   ): Promise<RuleEvaluationResult> {
     if (viewerContext.isUserViewerContext()) {

packages/entity-example/src/routers/notesRouter.ts

@@ -19,10 +19,9 @@ router.get('/', async (ctx: ExampleContext) => {
   const viewerContext = ctx.state.viewerContext;
   let notes: readonly NoteEntity[] = [];
   if (viewerContext.isUserViewerContext()) {
-    notes = await NoteEntity.loader(viewerContext).loadManyByFieldEqualingAsync(
+    notes = await NoteEntity.loader(viewerContext)
-      'userID',
+      .enforcing()
-      viewerContext.userID
+      .loadManyByFieldEqualingAsync('userID', viewerContext.userID);
-    );
   }
   ctx.body = {
     notes: notes.map((note) => note.getAllFields()),

packages/entity-example/src/schema.ts

@@ -46,14 +46,16 @@ export const resolvers: IResolvers<any, GraphqlContext> = {
       return viewerContext.userID;
     },
     async noteByID(_root, args, { viewerContext }) {
-      return await NoteEntity.loader(viewerContext).loadByIDAsync(args.id);
+      return await NoteEntity.loader(viewerContext).enforcing().loadByIDAsync(args.id);
     },
   } as IResolverObject<any, GraphqlContext>,
 
   User: {
     id: (root) => root,
     async notes(root, _args, { viewerContext }) {
-      return await NoteEntity.loader(viewerContext).loadManyByFieldEqualingAsync('userID', root);
+      return await NoteEntity.loader(viewerContext)
+        .enforcing()
+        .loadManyByFieldEqualingAsync('userID', root);
     },
   } as IResolverObject<string, GraphqlContext>,
 
@@ -77,14 +79,18 @@ export const resolvers: IResolvers<any, GraphqlContext> = {
         .enforceCreateAsync();
     },
     async updateNote(_root, args, { viewerContext }) {
-      const existingNote = await NoteEntity.loader(viewerContext).loadByIDAsync(args.id);
+      const existingNote = await NoteEntity.loader(viewerContext)
+        .enforcing()
+        .loadByIDAsync(args.id);
       return await NoteEntity.updater(existingNote)
         .setField('title', args.note.title)
         .setField('body', args.note.body)
         .enforceUpdateAsync();
     },
     async deleteNote(_root, args, { viewerContext }) {
-      const existingNote = await NoteEntity.loader(viewerContext).loadByIDAsync(args.id);
+      const existingNote = await NoteEntity.loader(viewerContext)
+        .enforcing()
+        .loadByIDAsync(args.id);
       await NoteEntity.enforceDeleteAsync(existingNote);
       return existingNote;
     },

packages/entity-full-integration-tests/CHANGELOG.md

@@ -3,38 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [0.25.3](https://github.com/expo/entity/compare/v0.25.2...v0.25.3) (2022-03-12)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-## [0.25.2](https://github.com/expo/entity/compare/v0.25.1...v0.25.2) (2022-03-12)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-## [0.25.1](https://github.com/expo/entity/compare/v0.25.0...v0.25.1) (2022-03-10)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
-# [0.25.0](https://github.com/expo/entity/compare/v0.24.0...v0.25.0) (2022-03-10)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
 # [0.24.0](https://github.com/expo/entity/compare/v0.23.0...v0.24.0) (2022-02-16)
 
 **Note:** Version bump only for package @expo/entity-full-integration-tests

packages/entity-full-integration-tests/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@expo/entity-full-integration-tests",
   "private": true,
-  "version": "0.25.3",
+  "version": "0.24.0",
   "description": "Full redis and knex integration tests for the entity framework",
   "scripts": {
     "tsc": "tsc",
@@ -27,8 +27,8 @@
     "@expo/entity-database-adapter-knex": "*"
   },
   "devDependencies": {
-    "@expo/entity": "^0.25.3",
+    "@expo/entity": "^0.24.0",
-    "@expo/entity-cache-adapter-redis": "^0.25.3",
+    "@expo/entity-cache-adapter-redis": "^0.24.0",
-    "@expo/entity-database-adapter-knex": "^0.25.3"
+    "@expo/entity-database-adapter-knex": "^0.24.0"
   }
 }

packages/entity-full-integration-tests/src/__integration-tests__/EntityCacheInconsistency-test.ts

@@ -153,8 +153,10 @@ describe('Entity cache inconsistency', () => {
       .enforceCreateAsync();
 
     // put entities in cache and dataloader
-    await TestEntity.loader(viewerContext).loadByIDAsync(entity1.getID());
+    await TestEntity.loader(viewerContext).enforcing().loadByIDAsync(entity1.getID());
-    await TestEntity.loader(viewerContext).loadByFieldEqualingAsync('other_string', 'hello');
+    await TestEntity.loader(viewerContext)
+      .enforcing()
+      .loadByFieldEqualingAsync('other_string', 'hello');
 
     let openBarrier1: () => void;
     const barrier1 = new Promise<void>((resolve) => {
@@ -177,7 +179,7 @@ describe('Entity cache inconsistency', () => {
         const viewerContextInternal = new ViewerContext(
           createFullIntegrationTestEntityCompanionProvider(knexInstance, redisCacheAdapterContext)
         );
-        await TestEntity.loader(viewerContextInternal).loadByIDAsync(entity1.getID());
+        await TestEntity.loader(viewerContextInternal).enforcing().loadByIDAsync(entity1.getID());
 
         openBarrier2!();
       })(),
@@ -201,11 +203,12 @@ describe('Entity cache inconsistency', () => {
       createFullIntegrationTestEntityCompanionProvider(knexInstance, redisCacheAdapterContext)
     );
 
-    const loadedById = await TestEntity.loader(viewerContextLast).loadByIDAsync(entity1.getID());
+    const loadedById = await TestEntity.loader(viewerContextLast)
-    const loadedByField = await TestEntity.loader(viewerContextLast).loadByFieldEqualingAsync(
+      .enforcing()
-      'other_string',
+      .loadByIDAsync(entity1.getID());
-      'hello'
+    const loadedByField = await TestEntity.loader(viewerContextLast)
-    );
+      .enforcing()
+      .loadByFieldEqualingAsync('other_string', 'hello');
 
     expect(loadedById.getField('third_string')).toEqual('updated');
     expect(loadedByField!.getField('third_string')).toEqual('updated');

packages/entity-full-integration-tests/src/__integration-tests__/EntityEdgesIntegration-test.ts

@@ -87,20 +87,22 @@ describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {
         .enforceCreateAsync();
 
       await expect(
-        ParentEntity.loader(viewerContext).loadByIDNullableAsync(parent.getID())
+        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID())
       ).resolves.not.toBeNull();
       await expect(
-        ChildEntity.loader(viewerContext).loadByFieldEqualingAsync('parent_id', parent.getID())
+        ChildEntity.loader(viewerContext)
+          .enforcing()
+          .loadByFieldEqualingAsync('parent_id', parent.getID())
       ).resolves.not.toBeNull();
 
       await ParentEntity.enforceDeleteAsync(parent);
 
       await expect(
-        ParentEntity.loader(viewerContext).loadByIDNullableAsync(parent.getID())
+        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID())
       ).resolves.toBeNull();
 
       await expect(
-        ChildEntity.loader(viewerContext).loadByIDNullableAsync(child.getID())
+        ChildEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(child.getID())
       ).resolves.toBeNull();
     });
   });

packages/entity-full-integration-tests/src/__integration-tests__/EntitySelfReferentialEdgesIntegration-test.ts

@@ -224,18 +224,18 @@ describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {
 
     if (edgeDeletionBehavior === EntityEdgeDeletionBehavior.SET_NULL) {
       await expect(
-        CategoryEntity.loader(viewerContext).loadByIDNullableAsync(category1.getID())
+        CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(category1.getID())
       ).resolves.toBeNull();
-      const otherLoaded = await OtherEntity.loader(viewerContext).loadByIDNullableAsync(
+      const otherLoaded = await OtherEntity.loader(viewerContext)
-        other1.getID()
+        .enforcing()
-      );
+        .loadByIDNullableAsync(other1.getID());
       expect(otherLoaded?.getField('parent_category_id')).toBeNull();
     } else {
       await expect(
-        CategoryEntity.loader(viewerContext).loadByIDNullableAsync(category1.getID())
+        CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(category1.getID())
       ).resolves.toBeNull();
       await expect(
-        OtherEntity.loader(viewerContext).loadByIDNullableAsync(other1.getID())
+        OtherEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(other1.getID())
       ).resolves.toBeNull();
     }
   });

packages/entity-ip-address-field/CHANGELOG.md

@@ -3,38 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [0.25.3](https://github.com/expo/entity/compare/v0.25.2...v0.25.3) (2022-03-12)
-
-**Note:** Version bump only for package @expo/entity-ip-address-field
-
-
-
-
-
-## [0.25.2](https://github.com/expo/entity/compare/v0.25.1...v0.25.2) (2022-03-12)
-
-**Note:** Version bump only for package @expo/entity-ip-address-field
-
-
-
-
-
-## [0.25.1](https://github.com/expo/entity/compare/v0.25.0...v0.25.1) (2022-03-10)
-
-**Note:** Version bump only for package @expo/entity-ip-address-field
-
-
-
-
-
-# [0.25.0](https://github.com/expo/entity/compare/v0.24.0...v0.25.0) (2022-03-10)
-
-**Note:** Version bump only for package @expo/entity-ip-address-field
-
-
-
-
-
 # [0.24.0](https://github.com/expo/entity/compare/v0.23.0...v0.24.0) (2022-02-16)
 
 **Note:** Version bump only for package @expo/entity-ip-address-field

packages/entity-ip-address-field/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/entity-ip-address-field",
-  "version": "0.25.3",
+  "version": "0.24.0",
   "description": "IP address EntityField definitions for @expo/entity",
   "files": [
     "build",
@@ -28,7 +28,7 @@
     "ip-address": "^8.1.0"
   },
   "devDependencies": {
-    "@expo/entity": "^0.25.3",
+    "@expo/entity": "^0.24.0",
     "@types/jsbn": "^1.2.29"
   },
   "peerDependencies": {

packages/entity-secondary-cache-local-memory/CHANGELOG.md

@@ -1,35 +0,0 @@
-# Change Log
-
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-## [0.25.3](https://github.com/expo/entity/compare/v0.25.2...v0.25.3) (2022-03-12)
-
-**Note:** Version bump only for package @expo/entity-secondary-cache-local-memory
-
-
-
-
-
-## [0.25.2](https://github.com/expo/entity/compare/v0.25.1...v0.25.2) (2022-03-12)
-
-**Note:** Version bump only for package @expo/entity-secondary-cache-local-memory
-
-
-
-
-
-## [0.25.1](https://github.com/expo/entity/compare/v0.25.0...v0.25.1) (2022-03-10)
-
-**Note:** Version bump only for package @expo/entity-secondary-cache-local-memory
-
-
-
-
-
-# [0.25.0](https://github.com/expo/entity/compare/v0.24.0...v0.25.0) (2022-03-10)
-
-
-### Features
-
-* composed cache adapter, composed secondary cache, local memory secondary cache ([#164](https://github.com/expo/entity/issues/164)) ([6b6e70e](https://github.com/expo/entity/commit/6b6e70e75f7e42a4dce13edeb406a4d88d9264f0))

packages/entity-secondary-cache-local-memory/README.md

@@ -1,24 +0,0 @@
-# `@expo/entity-secondary-cache-local-memory`
-
-Cross-request [LRU](https://github.com/isaacs/node-lru-cache) secondary cache for `@expo/entity`. Use
-this cache with caution - it is nonstandard. The cache is shared between requests in the node process.
-
-[Documentation](https://expo.github.io/entity/modules/_expo_secondary_cache_local_memory.html)
-
-## Usage
-
-1. Create a concrete implementation of abstract class `EntitySecondaryCacheLoader`, in this example `TestEntitySecondaryCacheLoader`. The underlying data can come from anywhere, but an entity is constructed from the data and then authorized for the viewer.
-2. Create an instance of your `EntitySecondaryCacheLoader`, passing in a `LocalMemorySecondaryEntityCache`.
-    ```typescript
-    const secondaryCacheLoader = new TestSecondaryLocalMemoryCacheLoader(
-      new LocalMemorySecondaryEntityCache(
-        GenericLocalMemoryCacher.createLRUCache<LocalMemoryTestEntityFields>({})
-      ),
-      LocalMemoryTestEntity.loader(viewerContext)
-    );
-    ```
-3. Load entities through it:
-    ```typescript
-    const loadParams = { id: createdEntity.getID() };
-    const results = await secondaryCacheLoader.loadManyAsync([loadParams]);
-    ```

packages/entity-secondary-cache-local-memory/package.json

@@ -1,38 +0,0 @@
-{
-  "name": "@expo/entity-secondary-cache-local-memory",
-  "version": "0.25.3",
-  "description": "Local memory secondary cache for @expo/entity",
-  "files": [
-    "build",
-    "src"
-  ],
-  "main": "build/index.js",
-  "types": "build/index.d.ts",
-  "scripts": {
-    "tsc": "tsc",
-    "clean": "rm -rf build coverage coverage-integration",
-    "lint": "eslint src",
-    "lint-fix": "eslint src --fix",
-    "test": "jest --rootDir . --config ../../resources/jest.config.js --passWithNoTests",
-    "integration": "../../resources/run-with-docker yarn integration-no-setup",
-    "integration-no-setup": "jest --config ../../resources/jest-integration.config.js --rootDir . --runInBand --passWithNoTests",
-    "barrelsby": "barrelsby --directory src --location top --exclude tests__ --singleQuotes --exportDefault --delete"
-  },
-  "engines": {
-    "node": ">=12"
-  },
-  "keywords": [
-    "entity"
-  ],
-  "author": "Expo",
-  "license": "MIT",
-  "peerDependencies": {
-    "@expo/entity": "*",
-    "@expo/entity-cache-adapter-local-memory": "*"
-  },
-  "devDependencies": {
-    "@expo/entity": "^0.25.3",
-    "@expo/entity-cache-adapter-local-memory": "^0.25.3",
-    "nullthrows": "^1.1.1"
-  }
-}

packages/entity-secondary-cache-local-memory/src/LocalMemorySecondaryEntityCache.ts

@@ -1,21 +0,0 @@
-import { GenericSecondaryEntityCache } from '@expo/entity';
-import {
-  GenericLocalMemoryCacher,
-  LocalMemoryCache,
-} from '@expo/entity-cache-adapter-local-memory';
-
-/**
- * A local memory {@link GenericSecondaryEntityCache}.
- *
- * @remarks
- *
- * TLoadParams must be JSON stringifyable.
- */
-export default class LocalMemorySecondaryEntityCache<
-  TFields,
-  TLoadParams
-> extends GenericSecondaryEntityCache<TFields, TLoadParams> {
-  constructor(localMemoryCache: LocalMemoryCache<TFields>) {
-    super(new GenericLocalMemoryCacher(localMemoryCache), (params) => JSON.stringify(params));
-  }
-}

packages/entity-secondary-cache-local-memory/src/__tests__/LocalMemorySecondaryEntityCache-test.ts

@@ -1,226 +0,0 @@
-import {
-  EntitySecondaryCacheLoader,
-  mapMapAsync,
-  ViewerContext,
-  NoOpEntityMetricsAdapter,
-  IEntityMetricsAdapter,
-  EntityCompanionProvider,
-  StubQueryContextProvider,
-  StubDatabaseAdapterProvider,
-  AlwaysAllowPrivacyPolicyRule,
-  EntityPrivacyPolicy,
-  UUIDField,
-  StringField,
-  EntityConfiguration,
-  EntityCompanionDefinition,
-  Entity,
-} from '@expo/entity';
-import {
-  GenericLocalMemoryCacher,
-  LocalMemoryCacheAdapterProvider,
-} from '@expo/entity-cache-adapter-local-memory';
-import nullthrows from 'nullthrows';
-
-import LocalMemorySecondaryEntityCache from '../LocalMemorySecondaryEntityCache';
-
-export type LocalMemoryTestEntityFields = {
-  id: string;
-  name: string;
-};
-
-export default class LocalMemoryTestEntity extends Entity<
-  LocalMemoryTestEntityFields,
-  string,
-  ViewerContext
-> {
-  static getCompanionDefinition(): EntityCompanionDefinition<
-    LocalMemoryTestEntityFields,
-    string,
-    ViewerContext,
-    LocalMemoryTestEntity,
-    LocalMemoryTestEntityPrivacyPolicy
-  > {
-    return localMemoryTestEntityCompanionDefinition;
-  }
-}
-
-export class LocalMemoryTestEntityPrivacyPolicy extends EntityPrivacyPolicy<
-  LocalMemoryTestEntityFields,
-  string,
-  ViewerContext,
-  LocalMemoryTestEntity
-> {
-  protected override readonly createRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      LocalMemoryTestEntityFields,
-      string,
-      ViewerContext,
-      LocalMemoryTestEntity
-    >(),
-  ];
-  protected override readonly readRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      LocalMemoryTestEntityFields,
-      string,
-      ViewerContext,
-      LocalMemoryTestEntity
-    >(),
-  ];
-  protected override readonly updateRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      LocalMemoryTestEntityFields,
-      string,
-      ViewerContext,
-      LocalMemoryTestEntity
-    >(),
-  ];
-  protected override readonly deleteRules = [
-    new AlwaysAllowPrivacyPolicyRule<
-      LocalMemoryTestEntityFields,
-      string,
-      ViewerContext,
-      LocalMemoryTestEntity
-    >(),
-  ];
-}
-
-export const localMemoryTestEntityConfiguration =
-  new EntityConfiguration<LocalMemoryTestEntityFields>({
-    idField: 'id',
-    tableName: 'local_memory_test_entities',
-    schema: {
-      id: new UUIDField({
-        columnName: 'id',
-      }),
-      name: new StringField({
-        columnName: 'name',
-      }),
-    },
-    databaseAdapterFlavor: 'postgres',
-    cacheAdapterFlavor: 'local-memory',
-  });
-
-const localMemoryTestEntityCompanionDefinition = new EntityCompanionDefinition({
-  entityClass: LocalMemoryTestEntity,
-  entityConfiguration: localMemoryTestEntityConfiguration,
-  privacyPolicyClass: LocalMemoryTestEntityPrivacyPolicy,
-});
-
-export const createTestEntityCompanionProvider = (
-  metricsAdapter: IEntityMetricsAdapter = new NoOpEntityMetricsAdapter()
-): EntityCompanionProvider => {
-  return new EntityCompanionProvider(
-    metricsAdapter,
-    new Map([
-      [
-        'postgres',
-        {
-          adapterProvider: new StubDatabaseAdapterProvider(),
-          queryContextProvider: StubQueryContextProvider,
-        },
-      ],
-    ]),
-    new Map([
-      [
-        'local-memory',
-        {
-          cacheAdapterProvider: LocalMemoryCacheAdapterProvider.getProvider(),
-        },
-      ],
-    ])
-  );
-};
-
-class TestViewerContext extends ViewerContext {}
-
-type TestLoadParams = { id: string };
-
-const FAKE_ID = 'fake';
-
-class TestSecondaryLocalMemoryCacheLoader extends EntitySecondaryCacheLoader<
-  TestLoadParams,
-  LocalMemoryTestEntityFields,
-  string,
-  TestViewerContext,
-  LocalMemoryTestEntity,
-  LocalMemoryTestEntityPrivacyPolicy
-> {
-  public databaseLoadCount = 0;
-
-  protected async fetchObjectsFromDatabaseAsync(
-    loadParamsArray: readonly Readonly<TestLoadParams>[]
-  ): Promise<ReadonlyMap<Readonly<TestLoadParams>, Readonly<LocalMemoryTestEntityFields> | null>> {
-    this.databaseLoadCount += loadParamsArray.length;
-
-    const emptyMap = new Map(loadParamsArray.map((p) => [p, null]));
-    return await mapMapAsync(emptyMap, async (_value, loadParams) => {
-      if (loadParams.id === FAKE_ID) {
-        return null;
-      }
-      return nullthrows(
-        (
-          await this.entityLoader.loadManyByFieldEqualityConjunctionAsync([
-            { fieldName: 'id', fieldValue: loadParams.id },
-          ])
-        )[0]
-      ).getAllFields();
-    });
-  }
-}
-
-describe(LocalMemorySecondaryEntityCache, () => {
-  it('Loads through secondary loader, caches, and invalidates', async () => {
-    const viewerContext = new TestViewerContext(createTestEntityCompanionProvider());
-
-    const createdEntity = await LocalMemoryTestEntity.creator(viewerContext)
-      .setField('name', 'wat')
-      .enforceCreateAsync();
-
-    const secondaryCacheLoader = new TestSecondaryLocalMemoryCacheLoader(
-      new LocalMemorySecondaryEntityCache(
-        GenericLocalMemoryCacher.createLRUCache<LocalMemoryTestEntityFields>({})
-      ),
-      LocalMemoryTestEntity.loader(viewerContext)
-    );
-
-    const loadParams = { id: createdEntity.getID() };
-    const results = await secondaryCacheLoader.loadManyAsync([loadParams]);
-    expect(nullthrows(results.get(loadParams)).enforceValue().getID()).toEqual(
-      createdEntity.getID()
-    );
-
-    expect(secondaryCacheLoader.databaseLoadCount).toEqual(1);
-
-    const results2 = await secondaryCacheLoader.loadManyAsync([loadParams]);
-    expect(nullthrows(results2.get(loadParams)).enforceValue().getID()).toEqual(
-      createdEntity.getID()
-    );
-
-    expect(secondaryCacheLoader.databaseLoadCount).toEqual(1);
-
-    await secondaryCacheLoader.invalidateManyAsync([loadParams]);
-
-    const results3 = await secondaryCacheLoader.loadManyAsync([loadParams]);
-    expect(nullthrows(results3.get(loadParams)).enforceValue().getID()).toEqual(
-      createdEntity.getID()
-    );
-
-    expect(secondaryCacheLoader.databaseLoadCount).toEqual(2);
-  });
-
-  it('correctly handles uncached and unfetchable load params', async () => {
-    const viewerContext = new TestViewerContext(createTestEntityCompanionProvider());
-
-    const secondaryCacheLoader = new TestSecondaryLocalMemoryCacheLoader(
-      new LocalMemorySecondaryEntityCache(
-        GenericLocalMemoryCacher.createLRUCache<LocalMemoryTestEntityFields>({})
-      ),
-      LocalMemoryTestEntity.loader(viewerContext)
-    );
-
-    const loadParams = { id: FAKE_ID };
-    const results = await secondaryCacheLoader.loadManyAsync([loadParams]);
-    expect(results.size).toBe(1);
-    expect(results.get(loadParams)).toBe(null);
-  });
-});

packages/entity-secondary-cache-local-memory/src/index.ts

@@ -1,7 +0,0 @@
-/* eslint-disable tsdoc/syntax */
-/**
- * @packageDocumentation
- * @module @expo/entity-secondary-cache-local-memory
- */
-
-export { default as LocalMemorySecondaryEntityCache } from './LocalMemorySecondaryEntityCache';

packages/entity-secondary-cache-local-memory/tsconfig.json

@@ -1,7 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "build",
-  },
-  "include": ["src"]
-}

packages/entity-secondary-cache-redis/CHANGELOG.md

@@ -3,41 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [0.25.3](https://github.com/expo/entity/compare/v0.25.2...v0.25.3) (2022-03-12)
-
-**Note:** Version bump only for package @expo/entity-secondary-cache-redis
-
-
-
-
-
-## [0.25.2](https://github.com/expo/entity/compare/v0.25.1...v0.25.2) (2022-03-12)
-
-**Note:** Version bump only for package @expo/entity-secondary-cache-redis
-
-
-
-
-
-## [0.25.1](https://github.com/expo/entity/compare/v0.25.0...v0.25.1) (2022-03-10)
-
-**Note:** Version bump only for package @expo/entity-secondary-cache-redis
-
-
-
-
-
-# [0.25.0](https://github.com/expo/entity/compare/v0.24.0...v0.25.0) (2022-03-10)
-
-
-### Features
-
-* composed cache adapter, composed secondary cache, local memory secondary cache ([#164](https://github.com/expo/entity/issues/164)) ([6b6e70e](https://github.com/expo/entity/commit/6b6e70e75f7e42a4dce13edeb406a4d88d9264f0))
-
-
-
-
-
 # [0.24.0](https://github.com/expo/entity/compare/v0.23.0...v0.24.0) (2022-02-16)
 
 ### Chores

packages/entity-secondary-cache-redis/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/entity-secondary-cache-redis",
-  "version": "0.25.3",
+  "version": "0.24.0",
   "description": "Redis secondary cache for @expo/entity",
   "files": [
     "build",
@@ -34,8 +34,8 @@
     "ioredis": "^4.17.3"
   },
   "devDependencies": {
-    "@expo/entity": "^0.25.3",
+    "@expo/entity": "^0.24.0",
-    "@expo/entity-cache-adapter-redis": "^0.25.3",
+    "@expo/entity-cache-adapter-redis": "^0.24.0",
     "nullthrows": "^1.1.1"
   }
 }

packages/entity-secondary-cache-redis/src/RedisSecondaryEntityCache.ts

@@ -2,7 +2,9 @@ import { EntityConfiguration, GenericSecondaryEntityCache } from '@expo/entity';
 import { GenericRedisCacheContext, GenericRedisCacher } from '@expo/entity-cache-adapter-redis';
 
 /**
- * A redis {@link GenericSecondaryEntityCache}.
+ * A custom secondary read-through entity cache is a way to add a custom second layer of caching for a particular
+ * single entity load. One common way this may be used is to add a second layer of caching in a hot path that makes
+ * a call to {@link EntityLoader.loadManyByFieldEqualityConjunctionAsync} is guaranteed to return at most one entity.
  */
 export default class RedisSecondaryEntityCache<
   TFields,

packages/entity-secondary-cache-redis/src/__integration-tests__/RedisSecondaryEntityCache-integration-test.ts

@@ -40,9 +40,11 @@ class TestSecondaryRedisCacheLoader extends EntitySecondaryCacheLoader<
       }
       return nullthrows(
         (
-          await this.entityLoader.loadManyByFieldEqualityConjunctionAsync([
+          await this.entityLoader
-            { fieldName: 'id', fieldValue: loadParams.id },
+            .enforcing()
-          ])
+            .loadManyByFieldEqualityConjunctionAsync([
+              { fieldName: 'id', fieldValue: loadParams.id },
+            ])
         )[0]
       ).getAllFields();
     });

packages/entity/CHANGELOG.md

@@ -3,45 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [0.25.3](https://github.com/expo/entity/compare/v0.25.2...v0.25.3) (2022-03-12)
-
-**Note:** Version bump only for package @expo/entity
-
-
-
-
-
-## [0.25.2](https://github.com/expo/entity/compare/v0.25.1...v0.25.2) (2022-03-12)
-
-**Note:** Version bump only for package @expo/entity
-
-
-
-
-
-## [0.25.1](https://github.com/expo/entity/compare/v0.25.0...v0.25.1) (2022-03-10)
-
-
-### Bug Fixes
-
-* add composed cache to index ([#166](https://github.com/expo/entity/issues/166)) ([5c82edc](https://github.com/expo/entity/commit/5c82edcd9f26854878d29950a05852e117bbd723))
-
-
-
-
-
-# [0.25.0](https://github.com/expo/entity/compare/v0.24.0...v0.25.0) (2022-03-10)
-
-
-### Features
-
-* composed cache adapter, composed secondary cache, local memory secondary cache ([#164](https://github.com/expo/entity/issues/164)) ([6b6e70e](https://github.com/expo/entity/commit/6b6e70e75f7e42a4dce13edeb406a4d88d9264f0))
-* privacy policy evaluation context ([#162](https://github.com/expo/entity/issues/162)) ([3a81a4c](https://github.com/expo/entity/commit/3a81a4c059e2e995eb800e35e76b3d432c22b23f))
-
-
-
-
-
 # [0.24.0](https://github.com/expo/entity/compare/v0.23.0...v0.24.0) (2022-02-16)
 
 **Note:** Version bump only for package @expo/entity

packages/entity/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/entity",
-  "version": "0.25.3",
+  "version": "0.24.0",
   "description": "A privacy-first data model",
   "files": [
     "build",

packages/entity/src/ComposedEntityCacheAdapter.ts

@@ -1,86 +0,0 @@
-import nullthrows from 'nullthrows';
-
-import EntityCacheAdapter from './EntityCacheAdapter';
-import EntityConfiguration from './EntityConfiguration';
-import { CacheStatus, CacheLoadResult } from './internal/ReadThroughEntityCache';
-
-export default class ComposedEntityCacheAdapter<TFields> extends EntityCacheAdapter<TFields> {
-  /**
-   * A {@link EntityCacheAdapter} that composes other {@link EntityCacheAdapter} instances.
-   *
-   * @param entityConfiguration - configuration for entity being loaded
-   * @param cacheAdapters - list of cache adapters to compose in order of precedence.
-   *                        Earlier cache adapters are read from first and written to (including invalidations) last.
-   *                        Typically, caches closer to the application should be ordered before caches closer to the database.
-   */
-  constructor(
-    entityConfiguration: EntityConfiguration<TFields>,
-    private readonly cacheAdapters: EntityCacheAdapter<TFields>[]
-  ) {
-    super(entityConfiguration);
-  }
-
-  public async loadManyAsync<N extends keyof TFields>(
-    fieldName: N,
-    fieldValues: readonly NonNullable<TFields[N]>[]
-  ): Promise<ReadonlyMap<NonNullable<TFields[N]>, CacheLoadResult<TFields>>> {
-    const retMap = new Map<NonNullable<TFields[N]>, CacheLoadResult<TFields>>();
-
-    let unfulfilledFieldValues = fieldValues;
-    for (const cacheAdapter of this.cacheAdapters) {
-      const cacheResultsFromAdapter = await cacheAdapter.loadManyAsync(
-        fieldName,
-        unfulfilledFieldValues
-      );
-
-      const newUnfulfilledFieldValues = [];
-      for (const [fieldValue, cacheResult] of cacheResultsFromAdapter) {
-        if (cacheResult.status === CacheStatus.MISS) {
-          newUnfulfilledFieldValues.push(fieldValue);
-        } else {
-          retMap.set(fieldValue, cacheResult);
-        }
-      }
-      unfulfilledFieldValues = newUnfulfilledFieldValues;
-    }
-
-    for (const fieldValue of unfulfilledFieldValues) {
-      retMap.set(fieldValue, { status: CacheStatus.MISS });
-    }
-
-    return retMap;
-  }
-
-  public async cacheManyAsync<N extends keyof TFields>(
-    fieldName: N,
-    objectMap: ReadonlyMap<NonNullable<TFields[N]>, Readonly<TFields>>
-  ): Promise<void> {
-    // write to lower layers first
-    for (let i = this.cacheAdapters.length - 1; i >= 0; i--) {
-      const cacheAdapter = nullthrows(this.cacheAdapters[i]);
-      await cacheAdapter.cacheManyAsync(fieldName, objectMap);
-    }
-  }
-
-  public async cacheDBMissesAsync<N extends keyof TFields>(
-    fieldName: N,
-    fieldValues: readonly NonNullable<TFields[N]>[]
-  ): Promise<void> {
-    // write to lower layers first
-    for (let i = this.cacheAdapters.length - 1; i >= 0; i--) {
-      const cacheAdapter = nullthrows(this.cacheAdapters[i]);
-      await cacheAdapter.cacheDBMissesAsync(fieldName, fieldValues);
-    }
-  }
-
-  public async invalidateManyAsync<N extends keyof TFields>(
-    fieldName: N,
-    fieldValues: readonly NonNullable<TFields[N]>[]
-  ): Promise<void> {
-    // delete from lower layers first
-    for (let i = this.cacheAdapters.length - 1; i >= 0; i--) {
-      const cacheAdapter = nullthrows(this.cacheAdapters[i]);
-      await cacheAdapter.invalidateManyAsync(fieldName, fieldValues);
-    }
-  }
-}

packages/entity/src/ComposedSecondaryEntityCache.ts

@@ -1,63 +0,0 @@
-import nullthrows from 'nullthrows';
-
-import { ISecondaryEntityCache } from './EntitySecondaryCacheLoader';
-
-export default class ComposedSecondaryEntityCache<TLoadParams, TFields>
-  implements ISecondaryEntityCache<TFields, TLoadParams>
-{
-  /**
-   * A {@link ISecondaryEntityCache} that composes other {@link ISecondaryEntityCache} instances.
-   *
-   * @param secondaryEntityCaches - list of caches to compose in order of precedence.
-   *                                Earlier caches are read from first and written to (including invalidations) last.
-   *                                Typically, caches closer to the application should be ordered before caches closer to the database.
-   */
-  constructor(
-    private readonly secondaryEntityCaches: ISecondaryEntityCache<TFields, TLoadParams>[]
-  ) {}
-
-  async loadManyThroughAsync(
-    loadParamsArray: readonly Readonly<TLoadParams>[],
-    fetcher: (
-      fetcherLoadParamsArray: readonly Readonly<TLoadParams>[]
-    ) => Promise<ReadonlyMap<Readonly<TLoadParams>, Readonly<TFields> | null>>
-  ): Promise<ReadonlyMap<Readonly<TLoadParams>, Readonly<TFields> | null>> {
-    return await ComposedSecondaryEntityCache.loadManyThroughRecursivelyAsync(
-      this.secondaryEntityCaches,
-      loadParamsArray,
-      fetcher
-    );
-  }
-
-  private static async loadManyThroughRecursivelyAsync<TLoadParams, TFields>(
-    secondaryEntityCaches: ISecondaryEntityCache<TFields, TLoadParams>[],
-    loadParamsArray: readonly Readonly<TLoadParams>[],
-    fetcher: (
-      fetcherLoadParamsArray: readonly Readonly<TLoadParams>[]
-    ) => Promise<ReadonlyMap<Readonly<TLoadParams>, Readonly<TFields> | null>>
-  ): Promise<ReadonlyMap<Readonly<TLoadParams>, Readonly<TFields> | null>> {
-    if (secondaryEntityCaches.length === 0) {
-      return await fetcher(loadParamsArray);
-    }
-
-    const [firstCache, ...restCaches] = secondaryEntityCaches;
-
-    return await nullthrows(firstCache).loadManyThroughAsync(
-      loadParamsArray,
-      (fetcherLoadParamsArray) =>
-        ComposedSecondaryEntityCache.loadManyThroughRecursivelyAsync(
-          restCaches,
-          fetcherLoadParamsArray,
-          fetcher
-        )
-    );
-  }
-
-  async invalidateManyAsync(loadParamsArray: readonly Readonly<TLoadParams>[]): Promise<void> {
-    // invalidate lower layers first
-    for (let i = this.secondaryEntityCaches.length - 1; i >= 0; i--) {
-      const secondaryEntityCache = nullthrows(this.secondaryEntityCaches[i]);
-      await secondaryEntityCache.invalidateManyAsync(loadParamsArray);
-    }
-  }
-}

packages/entity/src/EnforcingEntityLoader.ts

@@ -0,0 +1,144 @@
+import { FieldEqualityCondition, QuerySelectionModifiers } from './EntityDatabaseAdapter';
+import EntityLoader from './EntityLoader';
+import EntityPrivacyPolicy from './EntityPrivacyPolicy';
+import ReadonlyEntity from './ReadonlyEntity';
+import ViewerContext from './ViewerContext';
+import { mapMap } from './utils/collections/maps';
+
+/**
+ * Enforcing view on an entity loader. All loads through this loader will throw
+ * if the loads are not successful.
+ */
+export default class EnforcingEntityLoader<
+  TFields,
+  TID extends NonNullable<TFields[TSelectedFields]>,
+  TViewerContext extends ViewerContext,
+  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>,
+  TPrivacyPolicy extends EntityPrivacyPolicy<
+    TFields,
+    TID,
+    TViewerContext,
+    TEntity,
+    TSelectedFields
+  >,
+  TSelectedFields extends keyof TFields
+> {
+  constructor(
+    private readonly entityLoader: EntityLoader<
+      TFields,
+      TID,
+      TViewerContext,
+      TEntity,
+      TPrivacyPolicy,
+      TSelectedFields
+    >
+  ) {}
+
+  /**
+   * Enforcing version of entity loader method by the same name.
+   * @throws {@link EntityNotAuthorizedError} when viewer is not authorized to view one or more of the returned entities
+   */
+  async loadManyByFieldEqualingManyAsync<N extends keyof Pick<TFields, TSelectedFields>>(
+    fieldName: N,
+    fieldValues: readonly NonNullable<TFields[N]>[]
+  ): Promise<ReadonlyMap<NonNullable<TFields[N]>, readonly TEntity[]>> {
+    const fieldValuesToResults = await this.entityLoader.loadManyByFieldEqualingManyAsync(
+      fieldName,
+      fieldValues
+    );
+    return mapMap(fieldValuesToResults, (results) =>
+      results.map((result) => result.enforceValue())
+    );
+  }
+
+  /**
+   * Enforcing version of entity loader method by the same name.
+   * @throws {@link EntityNotAuthorizedError} when viewer is not authorized to view one or more of the returned entities
+   */
+  async loadManyByFieldEqualingAsync<N extends keyof Pick<TFields, TSelectedFields>>(
+    fieldName: N,
+    fieldValue: NonNullable<TFields[N]>
+  ): Promise<readonly TEntity[]> {
+    const entityResults = await this.entityLoader.loadManyByFieldEqualingAsync(
+      fieldName,
+      fieldValue
+    );
+    return entityResults.map((result) => result.enforceValue());
+  }
+
+  /**
+   * Enforcing version of entity loader method by the same name.
+   * @throws {@link EntityNotAuthorizedError} when viewer is not authorized to view the returned entity
+   * @throws when multiple entities are found matching the condition
+   */
+  async loadByFieldEqualingAsync<N extends keyof Pick<TFields, TSelectedFields>>(
+    uniqueFieldName: N,
+    fieldValue: NonNullable<TFields[N]>
+  ): Promise<TEntity | null> {
+    const entityResult = await this.entityLoader.loadByFieldEqualingAsync(
+      uniqueFieldName,
+      fieldValue
+    );
+    return entityResult ? entityResult.enforceValue() : null;
+  }
+
+  /**
+   * Enforcing version of entity loader method by the same name.
+   * @throws {@link EntityNotAuthorizedError} when viewer is not authorized to view the returned entity
+   */
+  async loadByIDAsync(id: TID): Promise<TEntity> {
+    const entityResult = await this.entityLoader.loadByIDAsync(id);
+    return entityResult.enforceValue();
+  }
+
+  /**
+   * Enforcing version of entity loader method by the same name.
+   * @throws {@link EntityNotAuthorizedError} when viewer is not authorized to view the returned entity
+   * @throws when multiple entities are found matching the condition
+   */
+  async loadByIDNullableAsync(id: TID): Promise<TEntity | null> {
+    const entityResult = await this.entityLoader.loadByIDNullableAsync(id);
+    return entityResult ? entityResult.enforceValue() : null;
+  }
+
+  /**
+   * Enforcing version of entity loader method by the same name.
+   * @throws {@link EntityNotAuthorizedError} when viewer is not authorized to view one or more of the returned entities
+   */
+  async loadManyByIDsAsync(ids: readonly TID[]): Promise<ReadonlyMap<TID, TEntity>> {
+    const entityResults = await this.entityLoader.loadManyByIDsAsync(ids);
+    return mapMap(entityResults, (result) => result.enforceValue());
+  }
+
+  /**
+   * Enforcing version of entity loader method by the same name.
+   * @throws {@link EntityNotAuthorizedError} when viewer is not authorized to view one or more of the returned entities
+   */
+  async loadManyByFieldEqualityConjunctionAsync<N extends keyof Pick<TFields, TSelectedFields>>(
+    fieldEqualityOperands: FieldEqualityCondition<TFields, N>[],
+    querySelectionModifiers: QuerySelectionModifiers<TFields> = {}
+  ): Promise<readonly TEntity[]> {
+    const entityResults = await this.entityLoader.loadManyByFieldEqualityConjunctionAsync(
+      fieldEqualityOperands,
+      querySelectionModifiers
+    );
+    return entityResults.map((result) => result.enforceValue());
+  }
+
+  /**
+   * Enforcing version of entity loader method by the same name.
+   * @throws {@link EntityNotAuthorizedError} when viewer is not authorized to view one or more of the returned entities
+   */
+  async loadManyByRawWhereClauseAsync(
+    rawWhereClause: string,
+    bindings: any[] | object,
+    querySelectionModifiers: QuerySelectionModifiers<TFields> = {}
+  ): Promise<readonly TEntity[]> {
+    const entityResults = await this.entityLoader.loadManyByRawWhereClauseAsync(
+      rawWhereClause,
+      bindings,
+      querySelectionModifiers
+    );
+    return entityResults.map((result) => result.enforceValue());
+  }
+}

packages/entity/src/Entity.ts

@@ -69,7 +69,7 @@ export default abstract class Entity<
     return viewerContext
       .getViewerScopedEntityCompanionForClass(this)
       .getMutatorFactory()
-      .forCreate(queryContext, { cascadingDeleteCause: null });
+      .forCreate(queryContext);
   }
 
   /**
@@ -111,7 +111,7 @@ export default abstract class Entity<
       .getViewerContext()
       .getViewerScopedEntityCompanionForClass(this)
       .getMutatorFactory()
-      .forUpdate(existingEntity, queryContext, { cascadingDeleteCause: null });
+      .forUpdate(existingEntity, queryContext);
   }
 
   /**
@@ -152,7 +152,7 @@ export default abstract class Entity<
       .getViewerContext()
       .getViewerScopedEntityCompanionForClass(this)
       .getMutatorFactory()
-      .forDelete(existingEntity, queryContext, { cascadingDeleteCause: null })
+      .forDelete(existingEntity, queryContext)
       .deleteAsync();
   }
 
@@ -194,7 +194,7 @@ export default abstract class Entity<
       .getViewerContext()
       .getViewerScopedEntityCompanionForClass(this)
       .getMutatorFactory()
-      .forDelete(existingEntity, queryContext, { cascadingDeleteCause: null })
+      .forDelete(existingEntity, queryContext)
       .enforceDeleteAsync();
   }
 
@@ -251,7 +251,6 @@ export default abstract class Entity<
       privacyPolicy.authorizeUpdateAsync(
         existingEntity.getViewerContext(),
         queryContext,
-        { cascadingDeleteCause: null },
         existingEntity,
         companion.getMetricsAdapter()
       )
@@ -305,7 +304,6 @@ export default abstract class Entity<
       privacyPolicy.authorizeDeleteAsync(
         existingEntity.getViewerContext(),
         queryContext,
-        { cascadingDeleteCause: null },
         existingEntity,
         companion.getMetricsAdapter()
       )

packages/entity/src/EntityAssociationLoader.ts

@@ -69,11 +69,9 @@ export default class EntityAssociationLoader<
       .getViewerContext()
       .getViewerScopedEntityCompanionForClass(associatedEntityClass)
       .getLoaderFactory()
-      .forLoad(queryContext, { cascadingDeleteCause: null });
+      .forLoad(queryContext);
 
-    return (await loader.resultLoader.loadByIDAsync(
+    return (await loader.loadByIDAsync(associatedEntityID as unknown as TAssociatedID)) as Result<
-      associatedEntityID as unknown as TAssociatedID
-    )) as Result<
       null extends TFields[TIdentifyingField] ? TAssociatedEntity | null : TAssociatedEntity
     >;
   }
@@ -125,8 +123,8 @@ export default class EntityAssociationLoader<
       .getViewerContext()
       .getViewerScopedEntityCompanionForClass(associatedEntityClass)
       .getLoaderFactory()
-      .forLoad(queryContext, { cascadingDeleteCause: null });
+      .forLoad(queryContext);
-    return await loader.resultLoader.loadManyByFieldEqualingAsync(
+    return await loader.loadManyByFieldEqualingAsync(
       associatedEntityFieldContainingThisID,
       thisID as any
     );
@@ -182,8 +180,8 @@ export default class EntityAssociationLoader<
       .getViewerContext()
       .getViewerScopedEntityCompanionForClass(associatedEntityClass)
       .getLoaderFactory()
-      .forLoad(queryContext, { cascadingDeleteCause: null });
+      .forLoad(queryContext);
-    return await loader.resultLoader.loadByFieldEqualingAsync(
+    return await loader.loadByFieldEqualingAsync(
       associatedEntityLookupByField,
       associatedFieldValue as any
     );
@@ -240,8 +238,8 @@ export default class EntityAssociationLoader<
       .getViewerContext()
       .getViewerScopedEntityCompanionForClass(associatedEntityClass)
       .getLoaderFactory()
-      .forLoad(queryContext, { cascadingDeleteCause: null });
+      .forLoad(queryContext);
-    return await loader.resultLoader.loadManyByFieldEqualingAsync(
+    return await loader.loadManyByFieldEqualingAsync(
       associatedEntityLookupByField,
       associatedFieldValue as any
     );

packages/entity/src/EntityLoader.ts

@@ -1,14 +1,23 @@
+import { Result, asyncResult, result } from '@expo/results';
+import invariant from 'invariant';
+
+import EnforcingEntityLoader from './EnforcingEntityLoader';
 import { IEntityClass } from './Entity';
 import EntityConfiguration from './EntityConfiguration';
-import { FieldEqualityCondition, QuerySelectionModifiers } from './EntityDatabaseAdapter';
+import {
-import EntityPrivacyPolicy, { EntityPrivacyPolicyEvaluationContext } from './EntityPrivacyPolicy';
+  FieldEqualityCondition,
+  QuerySelectionModifiers,
+  isSingleValueFieldEqualityCondition,
+} from './EntityDatabaseAdapter';
+import EntityPrivacyPolicy from './EntityPrivacyPolicy';
 import { EntityQueryContext } from './EntityQueryContext';
-import EntityResultLoader from './EntityResultLoader';
 import ReadonlyEntity from './ReadonlyEntity';
 import ViewerContext from './ViewerContext';
+import EntityInvalidFieldValueError from './errors/EntityInvalidFieldValueError';
+import EntityNotFoundError from './errors/EntityNotFoundError';
 import EntityDataManager from './internal/EntityDataManager';
 import IEntityMetricsAdapter from './metrics/IEntityMetricsAdapter';
-import { mapMap } from './utils/collections/maps';
+import { mapMap, mapMapAsync } from './utils/collections/maps';
 
 /**
  * The primary interface for loading entities. All normal loads are batched,
@@ -28,24 +37,11 @@ export default class EntityLoader<
   >,
   TSelectedFields extends keyof TFields
 > {
-  /**
-   * Result-based view on an entity loader. All loads through this loader will wrap their results in Result.
-   */
-  public readonly resultLoader: EntityResultLoader<
-    TFields,
-    TID,
-    TViewerContext,
-    TEntity,
-    TPrivacyPolicy,
-    TSelectedFields
-  >;
-
   constructor(
-    viewerContext: TViewerContext,
+    private readonly viewerContext: TViewerContext,
-    queryContext: EntityQueryContext,
+    private readonly queryContext: EntityQueryContext,
-    privacyPolicyEvaluationContext: EntityPrivacyPolicyEvaluationContext,
+    private readonly entityConfiguration: EntityConfiguration<TFields>,
-    entityConfiguration: EntityConfiguration<TFields>,
+    private readonly entityClass: IEntityClass<
-    entityClass: IEntityClass<
       TFields,
       TID,
       TViewerContext,
@@ -53,105 +49,133 @@ export default class EntityLoader<
       TPrivacyPolicy,
       TSelectedFields
     >,
-    privacyPolicy: TPrivacyPolicy,
+    private readonly privacyPolicy: TPrivacyPolicy,
     private readonly dataManager: EntityDataManager<TFields>,
     protected readonly metricsAdapter: IEntityMetricsAdapter
-  ) {
+  ) {}
-    this.resultLoader = new EntityResultLoader(
+
-      viewerContext,
+  /**
-      queryContext,
+   * Enforcing view on this entity loader. All loads through this view are
-      privacyPolicyEvaluationContext,
+   * guaranteed to be the values of successful results (or null for some loader methods),
-      entityConfiguration,
+   * and will throw otherwise.
-      entityClass,
+   */
-      privacyPolicy,
+  enforcing(): EnforcingEntityLoader<
-      dataManager,
+    TFields,
-      metricsAdapter
+    TID,
-    );
+    TViewerContext,
+    TEntity,
+    TPrivacyPolicy,
+    TSelectedFields
+  > {
+    return new EnforcingEntityLoader(this);
   }
 
   /**
    * Load many entities where fieldName is one of fieldValues.
    * @param fieldName - entity field being queried
    * @param fieldValues - fieldName field values being queried
-   * @returns map from fieldValue to entities that match the query for that fieldValue
+   * @returns map from fieldValue to entity results that match the query for that fieldValue,
+   *          where result errors can be UnauthorizedError
    */
   async loadManyByFieldEqualingManyAsync<N extends keyof Pick<TFields, TSelectedFields>>(
     fieldName: N,
     fieldValues: readonly NonNullable<TFields[N]>[]
-  ): Promise<ReadonlyMap<NonNullable<TFields[N]>, readonly TEntity[]>> {
+  ): Promise<ReadonlyMap<NonNullable<TFields[N]>, readonly Result<TEntity>[]>> {
-    const fieldValuesToResults = await this.resultLoader.loadManyByFieldEqualingManyAsync(
+    this.validateFieldValues(fieldName, fieldValues);
+
+    const fieldValuesToFieldObjects = await this.dataManager.loadManyByFieldEqualingAsync(
+      this.queryContext,
       fieldName,
       fieldValues
     );
-    return mapMap(fieldValuesToResults, (results) =>
+
-      results.map((result) => result.enforceValue())
+    return await this.constructAndAuthorizeEntitiesAsync(fieldValuesToFieldObjects);
-    );
   }
 
   /**
    * Load many entities where fieldName equals fieldValue.
    * @param fieldName - entity field being queried
    * @param fieldValue - fieldName field value being queried
-   * @returns array of entities that match the query for fieldValue
+   * @returns array of entity results that match the query for fieldValue, where result error can be UnauthorizedError
    */
   async loadManyByFieldEqualingAsync<N extends keyof Pick<TFields, TSelectedFields>>(
     fieldName: N,
     fieldValue: NonNullable<TFields[N]>
-  ): Promise<readonly TEntity[]> {
+  ): Promise<readonly Result<TEntity>[]> {
-    const entityResults = await this.resultLoader.loadManyByFieldEqualingAsync(
+    const entityResults = await this.loadManyByFieldEqualingManyAsync(fieldName, [fieldValue]);
-      fieldName,
+    const entityResultsForFieldValue = entityResults.get(fieldValue);
-      fieldValue
+    invariant(
+      entityResultsForFieldValue !== undefined,
+      `${fieldValue} should be guaranteed to be present in returned map of entities`
     );
-    return entityResults.map((result) => result.enforceValue());
+    return entityResultsForFieldValue!;
   }
 
   /**
    * Load an entity where fieldName equals fieldValue, or null if no entity exists.
    * @param uniqueFieldName - entity field being queried
    * @param fieldValue - uniqueFieldName field value being queried
-   * @returns entity where uniqueFieldName equals fieldValue, or null if no entity matches the condition.
+   * @returns entity result where uniqueFieldName equals fieldValue, or null if no entity matches the condition.
    * @throws when multiple entities match the condition
    */
   async loadByFieldEqualingAsync<N extends keyof Pick<TFields, TSelectedFields>>(
     uniqueFieldName: N,
     fieldValue: NonNullable<TFields[N]>
-  ): Promise<TEntity | null> {
+  ): Promise<Result<TEntity> | null> {
-    const entityResult = await this.resultLoader.loadByFieldEqualingAsync(
+    const entityResults = await this.loadManyByFieldEqualingAsync(uniqueFieldName, fieldValue);
-      uniqueFieldName,
+    invariant(
-      fieldValue
+      entityResults.length <= 1,
+      `loadByFieldEqualing: Multiple entities of type ${this.entityClass.name} found for ${uniqueFieldName}=${fieldValue}`
     );
-    return entityResult ? entityResult.enforceValue() : null;
+    return entityResults[0] ?? null;
   }
 
   /**
    * Loads an entity by a specified ID.
    * @param id - ID of the entity
-   * @returns entity for matching ID
+   * @returns entity result for matching ID, where result error can be UnauthorizedError or EntityNotFoundError.
    */
-  async loadByIDAsync(id: TID): Promise<TEntity> {
+  async loadByIDAsync(id: TID): Promise<Result<TEntity>> {
-    const entityResult = await this.resultLoader.loadByIDAsync(id);
+    const entityResults = await this.loadManyByIDsAsync([id]);
-    return entityResult.enforceValue();
+    const entityResult = entityResults.get(id);
+    if (entityResult === undefined) {
+      return result(
+        new EntityNotFoundError(this.entityClass, this.entityConfiguration.idField, id)
+      );
+    }
+    return entityResult;
   }
 
   /**
    * Load an entity by a specified ID, or return null if non-existent.
    * @param id - ID of the entity
-   * @returns entity for matching ID, or null if no entity exists for ID.
+   * @returns entity result for matching ID, or null if no entity exists for ID.
    */
-  async loadByIDNullableAsync(id: TID): Promise<TEntity | null> {
+  async loadByIDNullableAsync(id: TID): Promise<Result<TEntity> | null> {
-    const entityResult = await this.resultLoader.loadByIDNullableAsync(id);
+    return await this.loadByFieldEqualingAsync(
-    return entityResult ? entityResult.enforceValue() : null;
+      this.entityConfiguration.idField as TSelectedFields,
+      id
+    );
   }
 
   /**
    * Loads many entities for a list of IDs.
    * @param viewerContext - viewer context of loading user
    * @param ids - IDs of the entities to load
-   * @returns map from ID to corresponding entity
+   * @returns map from ID to corresponding entity result, where result error can be UnauthorizedError or EntityNotFoundError.
    */
-  async loadManyByIDsAsync(ids: readonly TID[]): Promise<ReadonlyMap<TID, TEntity>> {
+  async loadManyByIDsAsync(ids: readonly TID[]): Promise<ReadonlyMap<TID, Result<TEntity>>> {
-    const entityResults = await this.resultLoader.loadManyByIDsAsync(ids);
+    const entityResults = (await this.loadManyByFieldEqualingManyAsync(
-    return mapMap(entityResults, (result) => result.enforceValue());
+      this.entityConfiguration.idField as TSelectedFields,
+      ids
+    )) as ReadonlyMap<TID, readonly Result<TEntity>[]>;
+    return mapMap(entityResults, (entityResultsForId, id) => {
+      const entityResult = entityResultsForId[0];
+      return (
+        entityResult ??
+        result(new EntityNotFoundError(this.entityClass, this.entityConfiguration.idField, id))
+      );
+    });
   }
 
   /**
@@ -166,17 +190,40 @@ export default class EntityLoader<
    *
    * @param fieldEqualityOperands - list of field equality WHERE clause operand specifications
    * @param querySelectionModifiers - limit, offset, and orderBy for the query
-   * @returns array of entities that match the query
+   * @returns array of entity results that match the query, where result error can be UnauthorizedError
    */
   async loadManyByFieldEqualityConjunctionAsync<N extends keyof Pick<TFields, TSelectedFields>>(
     fieldEqualityOperands: FieldEqualityCondition<TFields, N>[],
     querySelectionModifiers: QuerySelectionModifiers<TFields> = {}
-  ): Promise<readonly TEntity[]> {
+  ): Promise<readonly Result<TEntity>[]> {
-    const entityResults = await this.resultLoader.loadManyByFieldEqualityConjunctionAsync(
+    for (const fieldEqualityOperand of fieldEqualityOperands) {
+      const fieldValues = isSingleValueFieldEqualityCondition(fieldEqualityOperand)
+        ? [fieldEqualityOperand.fieldValue]
+        : fieldEqualityOperand.fieldValues;
+      this.validateFieldValues(fieldEqualityOperand.fieldName, fieldValues);
+    }
+
+    const fieldObjects = await this.dataManager.loadManyByFieldEqualityConjunctionAsync(
+      this.queryContext,
       fieldEqualityOperands,
       querySelectionModifiers
     );
-    return entityResults.map((result) => result.enforceValue());
+    const uncheckedEntityResults = this.tryConstructEntities(fieldObjects);
+    return await Promise.all(
+      uncheckedEntityResults.map(async (uncheckedEntityResult) => {
+        if (!uncheckedEntityResult.ok) {
+          return uncheckedEntityResult;
+        }
+        return await asyncResult(
+          this.privacyPolicy.authorizeReadAsync(
+            this.viewerContext,
+            this.queryContext,
+            uncheckedEntityResult.value,
+            this.metricsAdapter
+          )
+        );
+      })
+    );
   }
 
   /**
@@ -199,7 +246,7 @@ export default class EntityLoader<
    * @param rawWhereClause - parameterized SQL WHERE clause with positional binding placeholders or named binding placeholders
    * @param bindings - array of positional bindings or object of named bindings
    * @param querySelectionModifiers - limit, offset, and orderBy for the query
-   * @returns array of entities that match the query
+   * @returns array of entity results that match the query, where result error can be UnauthorizedError
    * @throws Error when rawWhereClause or bindings are invalid
    *
    * @deprecated prefer caching loaders
@@ -208,13 +255,29 @@ export default class EntityLoader<
     rawWhereClause: string,
     bindings: any[] | object,
     querySelectionModifiers: QuerySelectionModifiers<TFields> = {}
-  ): Promise<readonly TEntity[]> {
+  ): Promise<readonly Result<TEntity>[]> {
-    const entityResults = await this.resultLoader.loadManyByRawWhereClauseAsync(
+    const fieldObjects = await this.dataManager.loadManyByRawWhereClauseAsync(
+      this.queryContext,
       rawWhereClause,
       bindings,
       querySelectionModifiers
     );
-    return entityResults.map((result) => result.enforceValue());
+    const uncheckedEntityResults = this.tryConstructEntities(fieldObjects);
+    return await Promise.all(
+      uncheckedEntityResults.map(async (uncheckedEntityResult) => {
+        if (!uncheckedEntityResult.ok) {
+          return uncheckedEntityResult;
+        }
+        return await asyncResult(
+          this.privacyPolicy.authorizeReadAsync(
+            this.viewerContext,
+            this.queryContext,
+            uncheckedEntityResult.value,
+            this.metricsAdapter
+          )
+        );
+      })
+    );
   }
 
   /**
@@ -233,4 +296,62 @@ export default class EntityLoader<
   async invalidateEntityAsync(entity: TEntity): Promise<void> {
     await this.invalidateFieldsAsync(entity.getAllDatabaseFields());
   }
+
+  private tryConstructEntities(fieldsObjects: readonly TFields[]): readonly Result<TEntity>[] {
+    return fieldsObjects.map((fieldsObject) => {
+      try {
+        return result(new this.entityClass(this.viewerContext, fieldsObject));
+      } catch (e) {
+        if (!(e instanceof Error)) {
+          throw e;
+        }
+        return result(e);
+      }
+    });
+  }
+
+  /**
+   * Construct and authorize entities from fields map, returning error results for entities that fail
+   * to construct or fail to authorize.
+   *
+   * @param map - map from an arbitrary key type to an array of entity field objects
+   */
+  public async constructAndAuthorizeEntitiesAsync<K>(
+    map: ReadonlyMap<K, readonly Readonly<TFields>[]>
+  ): Promise<ReadonlyMap<K, readonly Result<TEntity>[]>> {
+    const uncheckedEntityResultsMap = mapMap(map, (fieldObjects) =>
+      this.tryConstructEntities(fieldObjects)
+    );
+    return await mapMapAsync(uncheckedEntityResultsMap, async (uncheckedEntityResults) => {
+      return await Promise.all(
+        uncheckedEntityResults.map(async (uncheckedEntityResult) => {
+          if (!uncheckedEntityResult.ok) {
+            return uncheckedEntityResult;
+          }
+          return await asyncResult(
+            this.privacyPolicy.authorizeReadAsync(
+              this.viewerContext,
+              this.queryContext,
+              uncheckedEntityResult.value,
+              this.metricsAdapter
+            )
+          );
+        })
+      );
+    });
+  }
+
+  private validateFieldValues<N extends keyof Pick<TFields, TSelectedFields>>(
+    fieldName: N,
+    fieldValues: readonly TFields[N][]
+  ): void {
+    const fieldDefinition = this.entityConfiguration.schema.get(fieldName);
+    invariant(fieldDefinition, `must have field definition for field = ${fieldName}`);
+    for (const fieldValue of fieldValues) {
+      const isInputValid = fieldDefinition.validateInputValue(fieldValue);
+      if (!isInputValid) {
+        throw new EntityInvalidFieldValueError(this.entityClass, fieldName, fieldValue);
+      }
+    }
+  }
 }

packages/entity/src/EntityLoaderFactory.ts

@@ -1,7 +1,7 @@
 import { IEntityClass } from './Entity';
 import EntityConfiguration from './EntityConfiguration';
 import EntityLoader from './EntityLoader';
-import EntityPrivacyPolicy, { EntityPrivacyPolicyEvaluationContext } from './EntityPrivacyPolicy';
+import EntityPrivacyPolicy from './EntityPrivacyPolicy';
 import { EntityQueryContext } from './EntityQueryContext';
 import ReadonlyEntity from './ReadonlyEntity';
 import ViewerContext from './ViewerContext';
@@ -47,13 +47,11 @@ export default class EntityLoaderFactory<
    */
   forLoad(
     viewerContext: TViewerContext,
-    queryContext: EntityQueryContext,
+    queryContext: EntityQueryContext
-    privacyPolicyEvaluationContext: EntityPrivacyPolicyEvaluationContext
   ): EntityLoader<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy, TSelectedFields> {
     return new EntityLoader(
       viewerContext,
       queryContext,
-      privacyPolicyEvaluationContext,
       this.entityConfiguration,
       this.entityClass,
       this.privacyPolicyClass,

packages/entity/src/EntityMutationInfo.ts

@@ -22,19 +22,9 @@ export type EntityValidatorMutationInfo<
       previousValue: TEntity;
     };
 
-/**
+export type EntityMutationTriggerDeleteCascadeInfo<> = {
- * Information about a cascading deletion.
- */
-export type EntityCascadingDeletionInfo = {
-  /**
-   * The entity that is being mutated at this step in the cascaded deletion.
-   */
   entity: Entity<any, any, any, any>;
-
+  cascadingDeleteCause: EntityMutationTriggerDeleteCascadeInfo | null;
-  /**
-   * The cascade deletion that caused this mutation.
-   */
-  cascadingDeleteCause: EntityCascadingDeletionInfo | null;
 };
 
 export type EntityTriggerMutationInfo<
@@ -53,5 +43,5 @@ export type EntityTriggerMutationInfo<
     }
   | {
       type: EntityMutationType.DELETE;
-      cascadingDeleteCause: EntityCascadingDeletionInfo | null;
+      cascadingDeleteCause: EntityMutationTriggerDeleteCascadeInfo | null;
     };

packages/entity/src/EntityMutator.ts

@@ -11,14 +11,14 @@ import {
   EntityValidatorMutationInfo,
   EntityMutationType,
   EntityTriggerMutationInfo,
-  EntityCascadingDeletionInfo,
+  EntityMutationTriggerDeleteCascadeInfo,
 } from './EntityMutationInfo';
 import EntityMutationTriggerConfiguration, {
   EntityMutationTrigger,
   EntityNonTransactionalMutationTrigger,
 } from './EntityMutationTriggerConfiguration';
 import EntityMutationValidator from './EntityMutationValidator';
-import EntityPrivacyPolicy, { EntityPrivacyPolicyEvaluationContext } from './EntityPrivacyPolicy';
+import EntityPrivacyPolicy from './EntityPrivacyPolicy';
 import { EntityQueryContext, EntityTransactionalQueryContext } from './EntityQueryContext';
 import ReadonlyEntity from './ReadonlyEntity';
 import ViewerContext from './ViewerContext';
@@ -44,7 +44,6 @@ abstract class BaseMutator<
   constructor(
     protected readonly viewerContext: TViewerContext,
     protected readonly queryContext: EntityQueryContext,
-    protected readonly privacyPolicyEvaluationContext: EntityPrivacyPolicyEvaluationContext,
     protected readonly entityConfiguration: EntityConfiguration<TFields>,
     protected readonly entityClass: IEntityClass<
       TFields,
@@ -221,7 +220,6 @@ export class CreateMutator<
       this.privacyPolicy.authorizeCreateAsync(
         this.viewerContext,
         queryContext,
-        this.privacyPolicyEvaluationContext,
         temporaryEntityForPrivacyCheck,
         this.metricsAdapter
       )
@@ -251,17 +249,15 @@ export class CreateMutator<
 
     const insertResult = await this.databaseAdapter.insertAsync(queryContext, this.fieldsForEntity);
 
-    const entityLoader = this.entityLoaderFactory.forLoad(
+    const entityLoader = this.entityLoaderFactory.forLoad(this.viewerContext, queryContext);
-      this.viewerContext,
-      queryContext,
-      this.privacyPolicyEvaluationContext
-    );
     queryContext.appendPostCommitInvalidationCallback(
       entityLoader.invalidateFieldsAsync.bind(entityLoader, insertResult)
     );
 
     const unauthorizedEntityAfterInsert = new this.entityClass(this.viewerContext, insertResult);
-    const newEntity = await entityLoader.loadByIDAsync(unauthorizedEntityAfterInsert.getID());
+    const newEntity = await entityLoader
+      .enforcing()
+      .loadByIDAsync(unauthorizedEntityAfterInsert.getID());
 
     await this.executeMutationTriggersAsync(
       this.mutationTriggers.afterCreate,
@@ -313,7 +309,6 @@ export class UpdateMutator<
   constructor(
     viewerContext: TViewerContext,
     queryContext: EntityQueryContext,
-    privacyPolicyEvaluationContext: EntityPrivacyPolicyEvaluationContext,
     entityConfiguration: EntityConfiguration<TFields>,
     entityClass: IEntityClass<
       TFields,
@@ -353,7 +348,6 @@ export class UpdateMutator<
     super(
       viewerContext,
       queryContext,
-      privacyPolicyEvaluationContext,
       entityConfiguration,
       entityClass,
       privacyPolicy,
@@ -415,7 +409,6 @@ export class UpdateMutator<
       this.privacyPolicy.authorizeUpdateAsync(
         this.viewerContext,
         queryContext,
-        this.privacyPolicyEvaluationContext,
         entityAboutToBeUpdated,
         this.metricsAdapter
       )
@@ -450,11 +443,7 @@ export class UpdateMutator<
       this.updatedFields
     );
 
-    const entityLoader = this.entityLoaderFactory.forLoad(
+    const entityLoader = this.entityLoaderFactory.forLoad(this.viewerContext, queryContext);
-      this.viewerContext,
-      queryContext,
-      this.privacyPolicyEvaluationContext
-    );
 
     queryContext.appendPostCommitInvalidationCallback(
       entityLoader.invalidateFieldsAsync.bind(
@@ -467,7 +456,9 @@ export class UpdateMutator<
     );
 
     const unauthorizedEntityAfterUpdate = new this.entityClass(this.viewerContext, updateResult);
-    const updatedEntity = await entityLoader.loadByIDAsync(unauthorizedEntityAfterUpdate.getID());
+    const updatedEntity = await entityLoader
+      .enforcing()
+      .loadByIDAsync(unauthorizedEntityAfterUpdate.getID());
 
     await this.executeMutationTriggersAsync(
       this.mutationTriggers.afterUpdate,
@@ -515,7 +506,6 @@ export class DeleteMutator<
   constructor(
     viewerContext: TViewerContext,
     queryContext: EntityQueryContext,
-    privacyPolicyEvaluationContext: EntityPrivacyPolicyEvaluationContext,
     entityConfiguration: EntityConfiguration<TFields>,
     entityClass: IEntityClass<
       TFields,
@@ -555,7 +545,6 @@ export class DeleteMutator<
     super(
       viewerContext,
       queryContext,
-      privacyPolicyEvaluationContext,
       entityConfiguration,
       entityClass,
       privacyPolicy,
@@ -589,7 +578,7 @@ export class DeleteMutator<
   private async deleteInTransactionAsync(
     processedEntityIdentifiersFromTransitiveDeletions: Set<string>,
     skipDatabaseDeletion: boolean,
-    cascadingDeleteCause: EntityCascadingDeletionInfo | null
+    cascadingDeleteCause: EntityMutationTriggerDeleteCascadeInfo | null
   ): Promise<Result<void>> {
     return await this.queryContext.runInTransactionIfNotInTransactionAsync((innerQueryContext) =>
       this.deleteInternalAsync(
@@ -605,13 +594,12 @@ export class DeleteMutator<
     queryContext: EntityTransactionalQueryContext,
     processedEntityIdentifiersFromTransitiveDeletions: Set<string>,
     skipDatabaseDeletion: boolean,
-    cascadingDeleteCause: EntityCascadingDeletionInfo | null
+    cascadingDeleteCause: EntityMutationTriggerDeleteCascadeInfo | null
   ): Promise<Result<void>> {
     const authorizeDeleteResult = await asyncResult(
       this.privacyPolicy.authorizeDeleteAsync(
         this.viewerContext,
         queryContext,
-        { cascadingDeleteCause },
         this.entity,
         this.metricsAdapter
       )
@@ -648,9 +636,7 @@ export class DeleteMutator<
       );
     }
 
-    const entityLoader = this.entityLoaderFactory.forLoad(this.viewerContext, queryContext, {
+    const entityLoader = this.entityLoaderFactory.forLoad(this.viewerContext, queryContext);
-      cascadingDeleteCause,
-    });
     queryContext.appendPostCommitInvalidationCallback(
       entityLoader.invalidateFieldsAsync.bind(entityLoader, this.entity.getAllDatabaseFields())
     );
@@ -698,7 +684,7 @@ export class DeleteMutator<
     entity: TEntity,
     queryContext: EntityTransactionalQueryContext,
     processedEntityIdentifiers: Set<string>,
-    cascadingDeleteCause: EntityCascadingDeletionInfo | null
+    cascadingDeleteCause: EntityMutationTriggerDeleteCascadeInfo | null
   ): Promise<void> {
     // prevent infinite reference cycles by keeping track of entities already processed
     if (processedEntityIdentifiers.has(entity.getUniqueIdentifier())) {
@@ -746,24 +732,19 @@ export class DeleteMutator<
               .getViewerScopedEntityCompanionForClass(entityClass)
               .getMutatorFactory();
 
-            const newCascadingDeleteCause = {
-              entity,
-              cascadingDeleteCause,
-            };
-
             let inboundReferenceEntities: readonly ReadonlyEntity<any, any, any, any>[];
             if (associatedEntityLookupByField) {
               inboundReferenceEntities = await loaderFactory
-                .forLoad(queryContext, { cascadingDeleteCause: newCascadingDeleteCause })
+                .forLoad(queryContext)
-
+                .enforcing()
                 .loadManyByFieldEqualingAsync(
                   fieldName,
                   entity.getField(associatedEntityLookupByField as any)
                 );
             } else {
               inboundReferenceEntities = await loaderFactory
-                .forLoad(queryContext, { cascadingDeleteCause: newCascadingDeleteCause })
+                .forLoad(queryContext)
-
+                .enforcing()
                 .loadManyByFieldEqualingAsync(fieldName, entity.getID());
             }
 
@@ -773,13 +754,14 @@ export class DeleteMutator<
                 await Promise.all(
                   inboundReferenceEntities.map((inboundReferenceEntity) =>
                     mutatorFactory
-                      .forDelete(inboundReferenceEntity, queryContext, {
+                      .forDelete(inboundReferenceEntity, queryContext)
-                        cascadingDeleteCause: newCascadingDeleteCause,
-                      })
                       .deleteInTransactionAsync(
                         processedEntityIdentifiers,
                         /* skipDatabaseDeletion */ true, // deletion is handled by DB
-                        newCascadingDeleteCause
+                        {
+                          entity,
+                          cascadingDeleteCause,
+                        }
                       )
                   )
                 );
@@ -789,9 +771,7 @@ export class DeleteMutator<
                 await Promise.all(
                   inboundReferenceEntities.map((inboundReferenceEntity) =>
                     mutatorFactory
-                      .forUpdate(inboundReferenceEntity, queryContext, {
+                      .forUpdate(inboundReferenceEntity, queryContext)
-                        cascadingDeleteCause: newCascadingDeleteCause,
-                      })
                       .setField(fieldName, null)
                       .enforceUpdateAsync()
                   )
@@ -802,13 +782,14 @@ export class DeleteMutator<
                 await Promise.all(
                   inboundReferenceEntities.map((inboundReferenceEntity) =>
                     mutatorFactory
-                      .forDelete(inboundReferenceEntity, queryContext, {
+                      .forDelete(inboundReferenceEntity, queryContext)
-                        cascadingDeleteCause: newCascadingDeleteCause,
-                      })
                       .deleteInTransactionAsync(
                         processedEntityIdentifiers,
                         /* skipDatabaseDeletion */ false,
-                        newCascadingDeleteCause
+                        {
+                          entity,
+                          cascadingDeleteCause,
+                        }
                       )
                   )
                 );

packages/entity/src/EntityMutatorFactory.ts

@@ -5,7 +5,7 @@ import EntityLoaderFactory from './EntityLoaderFactory';
 import EntityMutationTriggerConfiguration from './EntityMutationTriggerConfiguration';
 import EntityMutationValidator from './EntityMutationValidator';
 import { CreateMutator, UpdateMutator, DeleteMutator } from './EntityMutator';
-import EntityPrivacyPolicy, { EntityPrivacyPolicyEvaluationContext } from './EntityPrivacyPolicy';
+import EntityPrivacyPolicy from './EntityPrivacyPolicy';
 import { EntityQueryContext } from './EntityQueryContext';
 import ViewerContext from './ViewerContext';
 import IEntityMetricsAdapter from './metrics/IEntityMetricsAdapter';
@@ -72,13 +72,11 @@ export default class EntityMutatorFactory<
    */
   forCreate(
     viewerContext: TViewerContext,
-    queryContext: EntityQueryContext,
+    queryContext: EntityQueryContext
-    privacyPolicyEvaluationContext: EntityPrivacyPolicyEvaluationContext
   ): CreateMutator<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy, TSelectedFields> {
     return new CreateMutator(
       viewerContext,
       queryContext,
-      privacyPolicyEvaluationContext,
       this.entityConfiguration,
       this.entityClass,
       this.privacyPolicy,
@@ -98,13 +96,11 @@ export default class EntityMutatorFactory<
    */
   forUpdate(
     existingEntity: TEntity,
-    queryContext: EntityQueryContext,
+    queryContext: EntityQueryContext
-    privacyPolicyEvaluationContext: EntityPrivacyPolicyEvaluationContext
   ): UpdateMutator<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy, TSelectedFields> {
     return new UpdateMutator(
       existingEntity.getViewerContext(),
       queryContext,
-      privacyPolicyEvaluationContext,
       this.entityConfiguration,
       this.entityClass,
       this.privacyPolicy,
@@ -124,13 +120,11 @@ export default class EntityMutatorFactory<
    */
   forDelete(
     existingEntity: TEntity,
-    queryContext: EntityQueryContext,
+    queryContext: EntityQueryContext
-    privacyPolicyEvaluationContext: EntityPrivacyPolicyEvaluationContext
   ): DeleteMutator<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy, TSelectedFields> {
     return new DeleteMutator(
       existingEntity.getViewerContext(),
       queryContext,
-      privacyPolicyEvaluationContext,
       this.entityConfiguration,
       this.entityClass,
       this.privacyPolicy,

packages/entity/src/EntityPrivacyPolicy.ts

@@ -1,4 +1,3 @@
-import { EntityCascadingDeletionInfo } from './EntityMutationInfo';
 import { EntityQueryContext } from './EntityQueryContext';
 import ReadonlyEntity from './ReadonlyEntity';
 import ViewerContext from './ViewerContext';
@@ -8,17 +7,6 @@ import IEntityMetricsAdapter, {
 } from './metrics/IEntityMetricsAdapter';
 import PrivacyPolicyRule, { RuleEvaluationResult } from './rules/PrivacyPolicyRule';
 
-/**
- * Information about the reason this privacy policy is being evaluated.
- */
-export type EntityPrivacyPolicyEvaluationContext = {
-  /**
-   * When this privacy policy is being evaluated as a result of a cascading deletion, this will be populated
-   * with information on the cascading delete.
-   */
-  cascadingDeleteCause: EntityCascadingDeletionInfo | null;
-};
-
 export enum EntityPrivacyPolicyEvaluationMode {
   ENFORCE,
   DRY_RUN,
@@ -139,7 +127,6 @@ export default abstract class EntityPrivacyPolicy<
   async authorizeCreateAsync(
     viewerContext: TViewerContext,
     queryContext: EntityQueryContext,
-    evaluationContext: EntityPrivacyPolicyEvaluationContext,
     entity: TEntity,
     metricsAdapter: IEntityMetricsAdapter
   ): Promise<TEntity> {
@@ -147,7 +134,6 @@ export default abstract class EntityPrivacyPolicy<
       this.createRules,
       viewerContext,
       queryContext,
-      evaluationContext,
       entity,
       EntityAuthorizationAction.CREATE,
       metricsAdapter
@@ -165,7 +151,6 @@ export default abstract class EntityPrivacyPolicy<
   async authorizeReadAsync(
     viewerContext: TViewerContext,
     queryContext: EntityQueryContext,
-    evaluationContext: EntityPrivacyPolicyEvaluationContext,
     entity: TEntity,
     metricsAdapter: IEntityMetricsAdapter
   ): Promise<TEntity> {
@@ -173,7 +158,6 @@ export default abstract class EntityPrivacyPolicy<
       this.readRules,
       viewerContext,
       queryContext,
-      evaluationContext,
       entity,
       EntityAuthorizationAction.READ,
       metricsAdapter
@@ -191,7 +175,6 @@ export default abstract class EntityPrivacyPolicy<
   async authorizeUpdateAsync(
     viewerContext: TViewerContext,
     queryContext: EntityQueryContext,
-    evaluationContext: EntityPrivacyPolicyEvaluationContext,
     entity: TEntity,
     metricsAdapter: IEntityMetricsAdapter
   ): Promise<TEntity> {
@@ -199,7 +182,6 @@ export default abstract class EntityPrivacyPolicy<
       this.updateRules,
       viewerContext,
       queryContext,
-      evaluationContext,
       entity,
       EntityAuthorizationAction.UPDATE,
       metricsAdapter
@@ -217,7 +199,6 @@ export default abstract class EntityPrivacyPolicy<
   async authorizeDeleteAsync(
     viewerContext: TViewerContext,
     queryContext: EntityQueryContext,
-    evaluationContext: EntityPrivacyPolicyEvaluationContext,
     entity: TEntity,
     metricsAdapter: IEntityMetricsAdapter
   ): Promise<TEntity> {
@@ -225,7 +206,6 @@ export default abstract class EntityPrivacyPolicy<
       this.deleteRules,
       viewerContext,
       queryContext,
-      evaluationContext,
       entity,
       EntityAuthorizationAction.DELETE,
       metricsAdapter
@@ -236,7 +216,6 @@ export default abstract class EntityPrivacyPolicy<
     ruleset: readonly PrivacyPolicyRule<TFields, TID, TViewerContext, TEntity, TSelectedFields>[],
     viewerContext: TViewerContext,
     queryContext: EntityQueryContext,
-    evaluationContext: EntityPrivacyPolicyEvaluationContext,
     entity: TEntity,
     action: EntityAuthorizationAction,
     metricsAdapter: IEntityMetricsAdapter
@@ -249,7 +228,6 @@ export default abstract class EntityPrivacyPolicy<
             ruleset,
             viewerContext,
             queryContext,
-            evaluationContext,
             entity,
             action
           );
@@ -278,7 +256,6 @@ export default abstract class EntityPrivacyPolicy<
             ruleset,
             viewerContext,
             queryContext,
-            evaluationContext,
             entity,
             action
           );
@@ -308,7 +285,6 @@ export default abstract class EntityPrivacyPolicy<
             ruleset,
             viewerContext,
             queryContext,
-            evaluationContext,
             entity,
             action
           );
@@ -339,18 +315,12 @@ export default abstract class EntityPrivacyPolicy<
     ruleset: readonly PrivacyPolicyRule<TFields, TID, TViewerContext, TEntity, TSelectedFields>[],
     viewerContext: TViewerContext,
     queryContext: EntityQueryContext,
-    evaluationContext: EntityPrivacyPolicyEvaluationContext,
     entity: TEntity,
     action: EntityAuthorizationAction
   ): Promise<TEntity> {
     for (let i = 0; i < ruleset.length; i++) {
       const rule = ruleset[i]!;
-      const ruleEvaluationResult = await rule.evaluateAsync(
+      const ruleEvaluationResult = await rule.evaluateAsync(viewerContext, queryContext, entity);
-        viewerContext,
-        queryContext,
-        evaluationContext,
-        entity
-      );
       switch (ruleEvaluationResult) {
         case RuleEvaluationResult.DENY:
           throw new EntityNotAuthorizedError<

packages/entity/src/EntityResultLoader.ts

@@ -1,326 +0,0 @@
-import { Result, asyncResult, result } from '@expo/results';
-import invariant from 'invariant';
-
-import { IEntityClass } from './Entity';
-import EntityConfiguration from './EntityConfiguration';
-import {
-  FieldEqualityCondition,
-  QuerySelectionModifiers,
-  isSingleValueFieldEqualityCondition,
-} from './EntityDatabaseAdapter';
-import EntityPrivacyPolicy, { EntityPrivacyPolicyEvaluationContext } from './EntityPrivacyPolicy';
-import { EntityQueryContext } from './EntityQueryContext';
-import ReadonlyEntity from './ReadonlyEntity';
-import ViewerContext from './ViewerContext';
-import EntityInvalidFieldValueError from './errors/EntityInvalidFieldValueError';
-import EntityNotFoundError from './errors/EntityNotFoundError';
-import EntityDataManager from './internal/EntityDataManager';
-import IEntityMetricsAdapter from './metrics/IEntityMetricsAdapter';
-import { mapMap, mapMapAsync } from './utils/collections/maps';
-
-/**
- * Result-based view on an entity loader. All loads through this loader will wrap their results in Result.
- */
-export default class EntityResultLoader<
-  TFields,
-  TID extends NonNullable<TFields[TSelectedFields]>,
-  TViewerContext extends ViewerContext,
-  TEntity extends ReadonlyEntity<TFields, TID, TViewerContext, TSelectedFields>,
-  TPrivacyPolicy extends EntityPrivacyPolicy<
-    TFields,
-    TID,
-    TViewerContext,
-    TEntity,
-    TSelectedFields
-  >,
-  TSelectedFields extends keyof TFields
-> {
-  constructor(
-    private readonly viewerContext: TViewerContext,
-    private readonly queryContext: EntityQueryContext,
-    private readonly privacyPolicyEvaluationContext: EntityPrivacyPolicyEvaluationContext,
-    private readonly entityConfiguration: EntityConfiguration<TFields>,
-    private readonly entityClass: IEntityClass<
-      TFields,
-      TID,
-      TViewerContext,
-      TEntity,
-      TPrivacyPolicy,
-      TSelectedFields
-    >,
-    private readonly privacyPolicy: TPrivacyPolicy,
-    private readonly dataManager: EntityDataManager<TFields>,
-    protected readonly metricsAdapter: IEntityMetricsAdapter
-  ) {}
-
-  /**
-   * Load many entity results where fieldName is one of fieldValues.
-   * @param fieldName - entity field being queried
-   * @param fieldValues - fieldName field values being queried
-   * @returns map from fieldValue to entity results that match the query for that fieldValue,
-   *          where result errors can be UnauthorizedError
-   */
-  async loadManyByFieldEqualingManyAsync<N extends keyof Pick<TFields, TSelectedFields>>(
-    fieldName: N,
-    fieldValues: readonly NonNullable<TFields[N]>[]
-  ): Promise<ReadonlyMap<NonNullable<TFields[N]>, readonly Result<TEntity>[]>> {
-    this.validateFieldValues(fieldName, fieldValues);
-
-    const fieldValuesToFieldObjects = await this.dataManager.loadManyByFieldEqualingAsync(
-      this.queryContext,
-      fieldName,
-      fieldValues
-    );
-
-    return await this.constructAndAuthorizeEntitiesAsync(fieldValuesToFieldObjects);
-  }
-
-  /**
-   * Load many entity results where fieldName equals fieldValue.
-   * @param fieldName - entity field being queried
-   * @param fieldValue - fieldName field value being queried
-   * @returns array of entity results that match the query for fieldValue, where result error can be UnauthorizedError
-   */
-  async loadManyByFieldEqualingAsync<N extends keyof Pick<TFields, TSelectedFields>>(
-    fieldName: N,
-    fieldValue: NonNullable<TFields[N]>
-  ): Promise<readonly Result<TEntity>[]> {
-    const entityResults = await this.loadManyByFieldEqualingManyAsync(fieldName, [fieldValue]);
-    const entityResultsForFieldValue = entityResults.get(fieldValue);
-    invariant(
-      entityResultsForFieldValue !== undefined,
-      `${fieldValue} should be guaranteed to be present in returned map of entities`
-    );
-    return entityResultsForFieldValue!;
-  }
-
-  /**
-   * Load an entity result where fieldName equals fieldValue, or null if no entity exists.
-   * @param uniqueFieldName - entity field being queried
-   * @param fieldValue - uniqueFieldName field value being queried
-   * @returns entity result where uniqueFieldName equals fieldValue, or null if no entity matches the condition.
-   * @throws when multiple entities match the condition
-   */
-  async loadByFieldEqualingAsync<N extends keyof Pick<TFields, TSelectedFields>>(
-    uniqueFieldName: N,
-    fieldValue: NonNullable<TFields[N]>
-  ): Promise<Result<TEntity> | null> {
-    const entityResults = await this.loadManyByFieldEqualingAsync(uniqueFieldName, fieldValue);
-    invariant(
-      entityResults.length <= 1,
-      `loadByFieldEqualing: Multiple entities of type ${this.entityClass.name} found for ${uniqueFieldName}=${fieldValue}`
-    );
-    return entityResults[0] ?? null;
-  }
-
-  /**
-   * Loads an entityresult  by a specified ID.
-   * @param id - ID of the entity
-   * @returns entity result for matching ID, where result error can be UnauthorizedError or EntityNotFoundError.
-   */
-  async loadByIDAsync(id: TID): Promise<Result<TEntity>> {
-    const entityResults = await this.loadManyByIDsAsync([id]);
-    const entityResult = entityResults.get(id);
-    if (entityResult === undefined) {
-      return result(
-        new EntityNotFoundError(this.entityClass, this.entityConfiguration.idField, id)
-      );
-    }
-    return entityResult;
-  }
-
-  /**
-   * Load an entity result by a specified ID, or return null if non-existent.
-   * @param id - ID of the entity
-   * @returns entity result for matching ID, or null if no entity exists for ID.
-   */
-  async loadByIDNullableAsync(id: TID): Promise<Result<TEntity> | null> {
-    return await this.loadByFieldEqualingAsync(
-      this.entityConfiguration.idField as TSelectedFields,
-      id
-    );
-  }
-
-  /**
-   * Loads many entity results for a list of IDs.
-   * @param viewerContext - viewer context of loading user
-   * @param ids - IDs of the entities to load
-   * @returns map from ID to corresponding entity result, where result error can be UnauthorizedError or EntityNotFoundError.
-   */
-  async loadManyByIDsAsync(ids: readonly TID[]): Promise<ReadonlyMap<TID, Result<TEntity>>> {
-    const entityResults = (await this.loadManyByFieldEqualingManyAsync(
-      this.entityConfiguration.idField as TSelectedFields,
-      ids
-    )) as ReadonlyMap<TID, readonly Result<TEntity>[]>;
-    return mapMap(entityResults, (entityResultsForId, id) => {
-      const entityResult = entityResultsForId[0];
-      return (
-        entityResult ??
-        result(new EntityNotFoundError(this.entityClass, this.entityConfiguration.idField, id))
-      );
-    });
-  }
-
-  /**
-   * Loads many entity results matching the conjunction of WHERE clauses constructed from specified operands.
-   * Entities loaded using this method are not batched or cached.
-   *
-   * @example
-   * fieldEqualityOperands:
-   * `[{fieldName: 'hello', fieldValue: 1}, {fieldName: 'world', fieldValues: [2, 3]}]`
-   * Entities returned:
-   * `WHERE hello = 1 AND world = ANY({2, 3})`
-   *
-   * @param fieldEqualityOperands - list of field equality WHERE clause operand specifications
-   * @param querySelectionModifiers - limit, offset, and orderBy for the query
-   * @returns array of entity results that match the query, where result error can be UnauthorizedError
-   */
-  async loadManyByFieldEqualityConjunctionAsync<N extends keyof Pick<TFields, TSelectedFields>>(
-    fieldEqualityOperands: FieldEqualityCondition<TFields, N>[],
-    querySelectionModifiers: QuerySelectionModifiers<TFields> = {}
-  ): Promise<readonly Result<TEntity>[]> {
-    for (const fieldEqualityOperand of fieldEqualityOperands) {
-      const fieldValues = isSingleValueFieldEqualityCondition(fieldEqualityOperand)
-        ? [fieldEqualityOperand.fieldValue]
-        : fieldEqualityOperand.fieldValues;
-      this.validateFieldValues(fieldEqualityOperand.fieldName, fieldValues);
-    }
-
-    const fieldObjects = await this.dataManager.loadManyByFieldEqualityConjunctionAsync(
-      this.queryContext,
-      fieldEqualityOperands,
-      querySelectionModifiers
-    );
-    const uncheckedEntityResults = this.tryConstructEntities(fieldObjects);
-    return await Promise.all(
-      uncheckedEntityResults.map(async (uncheckedEntityResult) => {
-        if (!uncheckedEntityResult.ok) {
-          return uncheckedEntityResult;
-        }
-        return await asyncResult(
-          this.privacyPolicy.authorizeReadAsync(
-            this.viewerContext,
-            this.queryContext,
-            this.privacyPolicyEvaluationContext,
-            uncheckedEntityResult.value,
-            this.metricsAdapter
-          )
-        );
-      })
-    );
-  }
-
-  /**
-   * Loads many entity results matching the raw WHERE clause. Corresponds to the knex `whereRaw` argument format.
-   *
-   * @remarks
-   * Important notes:
-   * - Fields in clause are database column names instead of transformed entity field names.
-   * - Entities loaded using this method are not batched or cached.
-   * - Not all database adapters implement the ability to execute this method of fetching entities.
-   *
-   * @example
-   * rawWhereClause: `id = ?`
-   * bindings: `[1]`
-   * Entites returned `WHERE id = 1`
-   *
-   * {@link http://knexjs.org/#Builder-whereRaw}
-   * {@link http://knexjs.org/#Raw-Bindings}
-   *
-   * @param rawWhereClause - parameterized SQL WHERE clause with positional binding placeholders or named binding placeholders
-   * @param bindings - array of positional bindings or object of named bindings
-   * @param querySelectionModifiers - limit, offset, and orderBy for the query
-   * @returns array of entity results that match the query, where result error can be UnauthorizedError
-   * @throws Error when rawWhereClause or bindings are invalid
-   *
-   * @deprecated prefer caching loaders
-   */
-  async loadManyByRawWhereClauseAsync(
-    rawWhereClause: string,
-    bindings: any[] | object,
-    querySelectionModifiers: QuerySelectionModifiers<TFields> = {}
-  ): Promise<readonly Result<TEntity>[]> {
-    const fieldObjects = await this.dataManager.loadManyByRawWhereClauseAsync(
-      this.queryContext,
-      rawWhereClause,
-      bindings,
-      querySelectionModifiers
-    );
-    const uncheckedEntityResults = this.tryConstructEntities(fieldObjects);
-    return await Promise.all(
-      uncheckedEntityResults.map(async (uncheckedEntityResult) => {
-        if (!uncheckedEntityResult.ok) {
-          return uncheckedEntityResult;
-        }
-        return await asyncResult(
-          this.privacyPolicy.authorizeReadAsync(
-            this.viewerContext,
-            this.queryContext,
-            this.privacyPolicyEvaluationContext,
-            uncheckedEntityResult.value,
-            this.metricsAdapter
-          )
-        );
-      })
-    );
-  }
-
-  private tryConstructEntities(fieldsObjects: readonly TFields[]): readonly Result<TEntity>[] {
-    return fieldsObjects.map((fieldsObject) => {
-      try {
-        return result(new this.entityClass(this.viewerContext, fieldsObject));
-      } catch (e) {
-        if (!(e instanceof Error)) {
-          throw e;
-        }
-        return result(e);
-      }
-    });
-  }
-
-  /**
-   * Construct and authorize entities from fields map, returning error results for entities that fail
-   * to construct or fail to authorize.
-   *
-   * @param map - map from an arbitrary key type to an array of entity field objects
-   */
-  public async constructAndAuthorizeEntitiesAsync<K>(
-    map: ReadonlyMap<K, readonly Readonly<TFields>[]>
-  ): Promise<ReadonlyMap<K, readonly Result<TEntity>[]>> {
-    const uncheckedEntityResultsMap = mapMap(map, (fieldObjects) =>
-      this.tryConstructEntities(fieldObjects)
-    );
-    return await mapMapAsync(uncheckedEntityResultsMap, async (uncheckedEntityResults) => {
-      return await Promise.all(
-        uncheckedEntityResults.map(async (uncheckedEntityResult) => {
-          if (!uncheckedEntityResult.ok) {
-            return uncheckedEntityResult;
-          }
-          return await asyncResult(
-            this.privacyPolicy.authorizeReadAsync(
-              this.viewerContext,
-              this.queryContext,
-              this.privacyPolicyEvaluationContext,
-              uncheckedEntityResult.value,
-              this.metricsAdapter
-            )
-          );
-        })
-      );
-    });
-  }
-
-  private validateFieldValues<N extends keyof Pick<TFields, TSelectedFields>>(
-    fieldName: N,
-    fieldValues: readonly TFields[N][]
-  ): void {
-    const fieldDefinition = this.entityConfiguration.schema.get(fieldName);
-    invariant(fieldDefinition, `must have field definition for field = ${fieldName}`);
-    for (const fieldValue of fieldValues) {
-      const isInputValid = fieldDefinition.validateInputValue(fieldValue);
-      if (!isInputValid) {
-        throw new EntityInvalidFieldValueError(this.entityClass, fieldName, fieldValue);
-      }
-    }
-  }
-}

packages/entity/src/ReadonlyEntity.ts

@@ -156,6 +156,6 @@ export default abstract class ReadonlyEntity<
     return viewerContext
       .getViewerScopedEntityCompanionForClass(this)
       .getLoaderFactory()
-      .forLoad(queryContext, { cascadingDeleteCause: null });
+      .forLoad(queryContext);
   }
 }

packages/entity/src/ViewerScopedEntityLoaderFactory.ts

@@ -1,6 +1,6 @@
 import EntityLoader from './EntityLoader';
 import EntityLoaderFactory from './EntityLoaderFactory';
-import EntityPrivacyPolicy, { EntityPrivacyPolicyEvaluationContext } from './EntityPrivacyPolicy';
+import EntityPrivacyPolicy from './EntityPrivacyPolicy';
 import { EntityQueryContext } from './EntityQueryContext';
 import ReadonlyEntity from './ReadonlyEntity';
 import ViewerContext from './ViewerContext';
@@ -35,13 +35,8 @@ export default class ViewerScopedEntityLoaderFactory<
   ) {}
 
   forLoad(
-    queryContext: EntityQueryContext,
+    queryContext: EntityQueryContext
-    privacyPolicyEvaluationContext: EntityPrivacyPolicyEvaluationContext
   ): EntityLoader<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy, TSelectedFields> {
-    return this.entityLoaderFactory.forLoad(
+    return this.entityLoaderFactory.forLoad(this.viewerContext, queryContext);
-      this.viewerContext,
-      queryContext,
-      privacyPolicyEvaluationContext
-    );
   }
 }

packages/entity/src/ViewerScopedEntityMutatorFactory.ts

@@ -1,6 +1,6 @@
 import { CreateMutator, UpdateMutator, DeleteMutator } from './EntityMutator';
 import EntityMutatorFactory from './EntityMutatorFactory';
-import EntityPrivacyPolicy, { EntityPrivacyPolicyEvaluationContext } from './EntityPrivacyPolicy';
+import EntityPrivacyPolicy from './EntityPrivacyPolicy';
 import { EntityQueryContext } from './EntityQueryContext';
 import ReadonlyEntity from './ReadonlyEntity';
 import ViewerContext from './ViewerContext';
@@ -35,37 +35,22 @@ export default class ViewerScopedEntityMutatorFactory<
   ) {}
 
   forCreate(
-    queryContext: EntityQueryContext,
+    queryContext: EntityQueryContext
-    privacyPolicyEvaluationContext: EntityPrivacyPolicyEvaluationContext
   ): CreateMutator<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy, TSelectedFields> {
-    return this.entityMutatorFactory.forCreate(
+    return this.entityMutatorFactory.forCreate(this.viewerContext, queryContext);
-      this.viewerContext,
-      queryContext,
-      privacyPolicyEvaluationContext
-    );
   }
 
   forUpdate(
     existingEntity: TEntity,
-    queryContext: EntityQueryContext,
+    queryContext: EntityQueryContext
-    privacyPolicyEvaluationContext: EntityPrivacyPolicyEvaluationContext
   ): UpdateMutator<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy, TSelectedFields> {
-    return this.entityMutatorFactory.forUpdate(
+    return this.entityMutatorFactory.forUpdate(existingEntity, queryContext);
-      existingEntity,
-      queryContext,
-      privacyPolicyEvaluationContext
-    );
   }
 
   forDelete(
     existingEntity: TEntity,
-    queryContext: EntityQueryContext,
+    queryContext: EntityQueryContext
-    privacyPolicyEvaluationContext: EntityPrivacyPolicyEvaluationContext
   ): DeleteMutator<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy, TSelectedFields> {
-    return this.entityMutatorFactory.forDelete(
+    return this.entityMutatorFactory.forDelete(existingEntity, queryContext);
-      existingEntity,
-      queryContext,
-      privacyPolicyEvaluationContext
-    );
   }
 }

packages/entity/src/__tests__/ComposedCacheAdapter-test.ts

@@ -1,280 +0,0 @@
-import invariant from 'invariant';
-
-import ComposedEntityCacheAdapter from '../ComposedEntityCacheAdapter';
-import EntityCacheAdapter from '../EntityCacheAdapter';
-import EntityConfiguration from '../EntityConfiguration';
-import { UUIDField } from '../EntityFields';
-import { CacheLoadResult, CacheStatus } from '../internal/ReadThroughEntityCache';
-
-type BlahFields = {
-  id: string;
-};
-
-const entityConfiguration = new EntityConfiguration<BlahFields>({
-  idField: 'id',
-  tableName: 'blah',
-  schema: {
-    id: new UUIDField({ columnName: 'id', cache: true }),
-  },
-  databaseAdapterFlavor: 'postgres',
-  cacheAdapterFlavor: 'local-memory-and-redis',
-});
-
-export const DOES_NOT_EXIST_LOCAL_MEMORY_CACHE = Symbol('doesNotExist');
-type LocalMemoryCacheValue<TFields> = Readonly<TFields> | typeof DOES_NOT_EXIST_LOCAL_MEMORY_CACHE;
-
-class TestLocalCacheAdapter<TFields> extends EntityCacheAdapter<TFields> {
-  constructor(
-    entityConfiguration: EntityConfiguration<TFields>,
-    private readonly cache: Map<string, LocalMemoryCacheValue<TFields>>
-  ) {
-    super(entityConfiguration);
-  }
-
-  public async loadManyAsync<N extends keyof TFields>(
-    fieldName: N,
-    fieldValues: readonly NonNullable<TFields[N]>[]
-  ): Promise<ReadonlyMap<NonNullable<TFields[N]>, CacheLoadResult<TFields>>> {
-    const localMemoryCacheKeyToFieldValueMapping = new Map(
-      fieldValues.map((fieldValue) => [this.makeCacheKey(fieldName, fieldValue), fieldValue])
-    );
-    const cacheResults = new Map<NonNullable<TFields[N]>, CacheLoadResult<TFields>>();
-    for (const [cacheKey, fieldValue] of localMemoryCacheKeyToFieldValueMapping) {
-      const cacheResult = this.cache.get(cacheKey);
-      if (cacheResult === DOES_NOT_EXIST_LOCAL_MEMORY_CACHE) {
-        cacheResults.set(fieldValue, {
-          status: CacheStatus.NEGATIVE,
-        });
-      } else if (cacheResult) {
-        cacheResults.set(fieldValue, {
-          status: CacheStatus.HIT,
-          item: cacheResult,
-        });
-      } else {
-        cacheResults.set(fieldValue, {
-          status: CacheStatus.MISS,
-        });
-      }
-    }
-
-    return cacheResults;
-  }
-
-  public async cacheManyAsync<N extends keyof TFields>(
-    fieldName: N,
-    objectMap: ReadonlyMap<NonNullable<TFields[N]>, Readonly<TFields>>
-  ): Promise<void> {
-    for (const [fieldValue, item] of objectMap) {
-      const cacheKey = this.makeCacheKey(fieldName, fieldValue);
-      this.cache.set(cacheKey, item);
-    }
-  }
-
-  public async cacheDBMissesAsync<N extends keyof TFields>(
-    fieldName: N,
-    fieldValues: readonly NonNullable<TFields[N]>[]
-  ): Promise<void> {
-    for (const fieldValue of fieldValues) {
-      const cacheKey = this.makeCacheKey(fieldName, fieldValue);
-      this.cache.set(cacheKey, DOES_NOT_EXIST_LOCAL_MEMORY_CACHE);
-    }
-  }
-
-  public async invalidateManyAsync<N extends keyof TFields>(
-    fieldName: N,
-    fieldValues: readonly NonNullable<TFields[N]>[]
-  ): Promise<void> {
-    for (const fieldValue of fieldValues) {
-      const cacheKey = this.makeCacheKey(fieldName, fieldValue);
-      this.cache.delete(cacheKey);
-    }
-  }
-
-  private makeCacheKey<N extends keyof TFields>(
-    fieldName: N,
-    fieldValue: NonNullable<TFields[N]>
-  ): string {
-    const columnName = this.entityConfiguration.entityToDBFieldsKeyMapping.get(fieldName);
-    invariant(columnName, `database field mapping missing for ${fieldName}`);
-    const parts = [
-      this.entityConfiguration.tableName,
-      `${this.entityConfiguration.cacheKeyVersion}`,
-      columnName,
-      String(fieldValue),
-    ];
-    const delimiter = ':';
-    const escapedParts = parts.map((part) =>
-      part.replace('\\', '\\\\').replace(delimiter, `\\${delimiter}`)
-    );
-    return escapedParts.join(delimiter);
-  }
-}
-
-function makeTestCacheAdapters(): {
-  primaryCache: Map<string, LocalMemoryCacheValue<BlahFields>>;
-  primaryCacheAdapter: TestLocalCacheAdapter<BlahFields>;
-  fallbackCache: Map<string, LocalMemoryCacheValue<BlahFields>>;
-  fallbackCacheAdapter: TestLocalCacheAdapter<BlahFields>;
-  cacheAdapter: ComposedEntityCacheAdapter<BlahFields>;
-} {
-  const primaryCache = new Map();
-  const primaryCacheAdapter = new TestLocalCacheAdapter(entityConfiguration, primaryCache);
-
-  const fallbackCache = new Map();
-  const fallbackCacheAdapter = new TestLocalCacheAdapter(entityConfiguration, fallbackCache);
-
-  const cacheAdapter = new ComposedEntityCacheAdapter(entityConfiguration, [
-    primaryCacheAdapter,
-    fallbackCacheAdapter,
-  ]);
-
-  return {
-    primaryCache,
-    primaryCacheAdapter,
-    fallbackCache,
-    fallbackCacheAdapter,
-    cacheAdapter,
-  };
-}
-
-describe(ComposedEntityCacheAdapter, () => {
-  describe('loadManyAsync', () => {
-    it('returns primary results when populated', async () => {
-      const { primaryCacheAdapter, cacheAdapter } = makeTestCacheAdapters();
-
-      const cacheHits = new Map<string, Readonly<BlahFields>>([['test-id-1', { id: 'test-id-1' }]]);
-      await primaryCacheAdapter.cacheManyAsync('id', cacheHits);
-      await primaryCacheAdapter.cacheDBMissesAsync('id', ['test-id-2']);
-
-      const results = await cacheAdapter.loadManyAsync('id', [
-        'test-id-1',
-        'test-id-2',
-        'test-id-3',
-      ]);
-
-      expect(results.get('test-id-1')).toMatchObject({
-        status: CacheStatus.HIT,
-        item: { id: 'test-id-1' },
-      });
-      expect(results.get('test-id-2')).toMatchObject({ status: CacheStatus.NEGATIVE });
-      expect(results.get('test-id-3')).toMatchObject({ status: CacheStatus.MISS });
-      expect(results.size).toBe(3);
-    });
-
-    it('returns fallback adapter results primary is empty', async () => {
-      const { primaryCacheAdapter, cacheAdapter } = makeTestCacheAdapters();
-
-      const cacheHits = new Map<string, Readonly<BlahFields>>([['test-id-1', { id: 'test-id-1' }]]);
-      await primaryCacheAdapter.cacheManyAsync('id', cacheHits);
-      await primaryCacheAdapter.cacheDBMissesAsync('id', ['test-id-2']);
-
-      const results = await cacheAdapter.loadManyAsync('id', [
-        'test-id-1',
-        'test-id-2',
-        'test-id-3',
-      ]);
-
-      expect(results.get('test-id-1')).toMatchObject({
-        status: CacheStatus.HIT,
-        item: { id: 'test-id-1' },
-      });
-      expect(results.get('test-id-2')).toMatchObject({ status: CacheStatus.NEGATIVE });
-      expect(results.get('test-id-3')).toMatchObject({ status: CacheStatus.MISS });
-      expect(results.size).toBe(3);
-    });
-
-    it('returns empty map when passed empty array of fieldValues', async () => {
-      const { cacheAdapter } = makeTestCacheAdapters();
-      const results = await cacheAdapter.loadManyAsync('id', []);
-      expect(results).toEqual(new Map());
-    });
-
-    it('handles 0 cache adapter compose case', async () => {
-      const cacheAdapter = new ComposedEntityCacheAdapter(entityConfiguration, []);
-      const results = await cacheAdapter.loadManyAsync('id', []);
-      expect(results).toEqual(new Map());
-    });
-  });
-
-  describe('cacheManyAsync', () => {
-    it('correctly caches all objects', async () => {
-      const {
-        primaryCache,
-        primaryCacheAdapter,
-        fallbackCache,
-        fallbackCacheAdapter,
-        cacheAdapter,
-      } = makeTestCacheAdapters();
-
-      await cacheAdapter.cacheManyAsync('id', new Map([['test-id-1', { id: 'test-id-1' }]]));
-
-      const primaryLocalMemoryCacheKey = primaryCacheAdapter['makeCacheKey']('id', 'test-id-1');
-      expect(primaryCache.get(primaryLocalMemoryCacheKey)).toMatchObject({
-        id: 'test-id-1',
-      });
-
-      const fallbackLocalMemoryCacheKey = fallbackCacheAdapter['makeCacheKey']('id', 'test-id-1');
-      expect(fallbackCache.get(fallbackLocalMemoryCacheKey)).toMatchObject({
-        id: 'test-id-1',
-      });
-    });
-  });
-
-  describe('cacheDBMissesAsync', () => {
-    it('correctly caches misses', async () => {
-      const {
-        primaryCache,
-        primaryCacheAdapter,
-        fallbackCache,
-        fallbackCacheAdapter,
-        cacheAdapter,
-      } = makeTestCacheAdapters();
-
-      await cacheAdapter.cacheDBMissesAsync('id', ['test-id-1']);
-
-      const primaryLocalMemoryCacheKey = primaryCacheAdapter['makeCacheKey']('id', 'test-id-1');
-      expect(primaryCache.get(primaryLocalMemoryCacheKey)).toBe(DOES_NOT_EXIST_LOCAL_MEMORY_CACHE);
-
-      const fallbackLocalMemoryCacheKey = fallbackCacheAdapter['makeCacheKey']('id', 'test-id-1');
-      expect(fallbackCache.get(fallbackLocalMemoryCacheKey)).toBe(
-        DOES_NOT_EXIST_LOCAL_MEMORY_CACHE
-      );
-    });
-  });
-
-  describe('invalidateManyAsync', () => {
-    it('invalidates correctly', async () => {
-      const {
-        primaryCache,
-        primaryCacheAdapter,
-        fallbackCache,
-        fallbackCacheAdapter,
-        cacheAdapter,
-      } = makeTestCacheAdapters();
-
-      const cacheHits = new Map<string, Readonly<BlahFields>>([['test-id-1', { id: 'test-id-1' }]]);
-      await primaryCacheAdapter.cacheManyAsync('id', cacheHits);
-      await primaryCacheAdapter.cacheDBMissesAsync('id', ['test-id-2']);
-      await fallbackCacheAdapter.cacheManyAsync('id', cacheHits);
-      await fallbackCacheAdapter.cacheDBMissesAsync('id', ['test-id-2']);
-
-      await cacheAdapter.invalidateManyAsync('id', ['test-id-1', 'test-id-2']);
-
-      const primaryLocalMemoryCacheKey1 = primaryCacheAdapter['makeCacheKey']('id', 'test-id-1');
-      expect(primaryCache.get(primaryLocalMemoryCacheKey1)).toBe(undefined);
-      const primaryLocalMemoryCacheKey2 = primaryCacheAdapter['makeCacheKey']('id', 'test-id-1');
-      expect(primaryCache.get(primaryLocalMemoryCacheKey2)).toBe(undefined);
-
-      const fallbackLocalMemoryCacheKey1 = fallbackCacheAdapter['makeCacheKey']('id', 'test-id-1');
-      expect(fallbackCache.get(fallbackLocalMemoryCacheKey1)).toBe(undefined);
-      const fallbackLocalMemoryCacheKey2 = fallbackCacheAdapter['makeCacheKey']('id', 'test-id-1');
-      expect(fallbackCache.get(fallbackLocalMemoryCacheKey2)).toBe(undefined);
-    });
-
-    it('returns when passed empty array of fieldValues', async () => {
-      const { cacheAdapter } = makeTestCacheAdapters();
-
-      await cacheAdapter.invalidateManyAsync('id', []);
-    });
-  });
-});

packages/entity/src/__tests__/ComposedSecondaryEntityCache-test.ts

@@ -1,101 +0,0 @@
-import invariant from 'invariant';
-import nullthrows from 'nullthrows';
-
-import ComposedSecondaryEntityCache from '../ComposedSecondaryEntityCache';
-import { ISecondaryEntityCache } from '../EntitySecondaryCacheLoader';
-
-type TestFields = { id: string };
-type TestLoadParams = { lp: string };
-
-class TestEntitySecondaryCache implements ISecondaryEntityCache<TestFields, TestLoadParams> {
-  constructor(
-    private readonly prefilledResults: Map<Readonly<TestLoadParams>, Readonly<TestFields>>
-  ) {}
-
-  async loadManyThroughAsync(
-    loadParamsArray: readonly Readonly<TestLoadParams>[],
-    fetcher: (
-      fetcherLoadParamsArray: readonly Readonly<TestLoadParams>[]
-    ) => Promise<ReadonlyMap<Readonly<TestLoadParams>, Readonly<TestFields> | null>>
-  ): Promise<ReadonlyMap<Readonly<TestLoadParams>, Readonly<TestFields> | null>> {
-    // this does an unusual method of calling fetcher, but there's no constraint that says fetcher can only be called once
-    // so this tests that
-
-    const retMap = new Map<Readonly<TestLoadParams>, Readonly<TestFields> | null>();
-    for (const loadParams of loadParamsArray) {
-      if (this.prefilledResults.has(loadParams)) {
-        retMap.set(loadParams, nullthrows(this.prefilledResults.get(loadParams)));
-      } else {
-        const fetcherResult = await fetcher([loadParams]);
-        const toSet = fetcherResult.get(loadParams);
-        invariant(toSet !== undefined, 'should be set');
-        retMap.set(loadParams, toSet);
-      }
-    }
-    return retMap;
-  }
-
-  async invalidateManyAsync(loadParamsArray: readonly Readonly<TestLoadParams>[]): Promise<void> {
-    for (const loadParams of loadParamsArray) {
-      this.prefilledResults.delete(loadParams);
-    }
-  }
-}
-
-describe(ComposedSecondaryEntityCache, () => {
-  it('composes correctly', async () => {
-    // TODO(wschurman): investigate whether we can use immutable or something to do better object equality for the map keys
-    const lp1 = { lp: '1' };
-    const lp2 = { lp: '2' };
-    const lp3 = { lp: '3' };
-
-    const primarySecondaryEntityCache = new TestEntitySecondaryCache(
-      new Map([[lp1, { id: 'primary-1' }]])
-    );
-    const fallbackSecondaryEntityCache = new TestEntitySecondaryCache(
-      new Map([[lp2, { id: 'fallback-2' }]])
-    );
-
-    const composedSecondaryEntityCache = new ComposedSecondaryEntityCache([
-      primarySecondaryEntityCache,
-      fallbackSecondaryEntityCache,
-    ]);
-
-    const results = await composedSecondaryEntityCache.loadManyThroughAsync(
-      [lp1, lp2, lp3],
-      async (fetcherLoadParamsArray) =>
-        new Map(fetcherLoadParamsArray.map((flp) => [flp, { id: `db-fetched-${flp.lp}` }]))
-    );
-
-    expect(results.get(lp1)).toEqual({ id: 'primary-1' });
-    expect(results.get(lp2)).toEqual({ id: 'fallback-2' });
-    expect(results.get(lp3)).toEqual({ id: 'db-fetched-3' });
-
-    await composedSecondaryEntityCache.invalidateManyAsync([lp1, lp2, lp3]);
-
-    const resultsAfterInvalidate = await composedSecondaryEntityCache.loadManyThroughAsync(
-      [lp1, lp2, lp3],
-      async (fetcherLoadParamsArray) =>
-        new Map(fetcherLoadParamsArray.map((flp) => [flp, { id: `db-fetched-${flp.lp}` }]))
-    );
-
-    expect(resultsAfterInvalidate.get(lp1)).toEqual({ id: 'db-fetched-1' });
-    expect(resultsAfterInvalidate.get(lp2)).toEqual({ id: 'db-fetched-2' });
-    expect(resultsAfterInvalidate.get(lp3)).toEqual({ id: 'db-fetched-3' });
-  });
-
-  it('handles n=0 compose case', async () => {
-    const lp1 = { lp: '1' };
-    const composedSecondaryEntityCache = new ComposedSecondaryEntityCache<
-      TestLoadParams,
-      TestFields
-    >([]);
-    const results = await composedSecondaryEntityCache.loadManyThroughAsync(
-      [lp1],
-      async (fetcherLoadParamsArray) =>
-        new Map(fetcherLoadParamsArray.map((flp) => [flp, { id: `db-fetched-${flp.lp}` }]))
-    );
-
-    expect(results.get(lp1)).toEqual({ id: 'db-fetched-1' });
-  });
-});

packages/entity/src/__tests__/EnforcingEntityLoader-test.ts

@@ -1,17 +1,15 @@
 import { result } from '@expo/results';
 import { mock, instance, when, anything } from 'ts-mockito';
 
+import EnforcingEntityLoader from '../EnforcingEntityLoader';
 import EntityLoader from '../EntityLoader';
-import EnforcingEntityLoader from '../EntityResultLoader';
 
 describe(EnforcingEntityLoader, () => {
   describe('loadManyByFieldEqualingManyAsync', () => {
     it('throws when result is unsuccessful', async () => {
       const entityLoaderMock = mock<EntityLoader<any, any, any, any, any, any>>(EntityLoader);
       const rejection = new Error();
-      when(
+      when(entityLoaderMock.loadManyByFieldEqualingManyAsync(anything(), anything())).thenResolve(
-        entityLoaderMock.resultLoader.loadManyByFieldEqualingManyAsync(anything(), anything())
-      ).thenResolve(
         new Map(
           Object.entries({
             hello: [result(rejection)],
@@ -28,9 +26,7 @@ describe(EnforcingEntityLoader, () => {
     it('returns value when result is successful', async () => {
       const entityLoaderMock = mock<EntityLoader<any, any, any, any, any, any>>(EntityLoader);
       const resolved = {};
-      when(
+      when(entityLoaderMock.loadManyByFieldEqualingManyAsync(anything(), anything())).thenResolve(
-        entityLoaderMock.resultLoader.loadManyByFieldEqualingManyAsync(anything(), anything())
-      ).thenResolve(
         new Map(
           Object.entries({
             hello: [result(resolved)],
@@ -55,9 +51,9 @@ describe(EnforcingEntityLoader, () => {
     it('throws when result is unsuccessful', async () => {
       const entityLoaderMock = mock<EntityLoader<any, any, any, any, any, any>>(EntityLoader);
       const rejection = new Error();
-      when(
+      when(entityLoaderMock.loadManyByFieldEqualingAsync(anything(), anything())).thenResolve([
-        entityLoaderMock.resultLoader.loadManyByFieldEqualingAsync(anything(), anything())
+        result(rejection),
-      ).thenResolve([result(rejection)]);
+      ]);
       const entityLoader = instance(entityLoaderMock);
       const enforcingEntityLoader = new EnforcingEntityLoader(entityLoader);
       await expect(
@@ -68,9 +64,9 @@ describe(EnforcingEntityLoader, () => {
     it('returns value when result is successful', async () => {
       const entityLoaderMock = mock<EntityLoader<any, any, any, any, any, any>>(EntityLoader);
       const resolved = {};
-      when(
+      when(entityLoaderMock.loadManyByFieldEqualingAsync(anything(), anything())).thenResolve([
-        entityLoaderMock.resultLoader.loadManyByFieldEqualingAsync(anything(), anything())
+        result(resolved),
-      ).thenResolve([result(resolved)]);
+      ]);
       const entityLoader = instance(entityLoaderMock);
       const enforcingEntityLoader = new EnforcingEntityLoader(entityLoader);
       await expect(
@@ -83,9 +79,9 @@ describe(EnforcingEntityLoader, () => {
     it('throws when result is unsuccessful', async () => {
       const entityLoaderMock = mock<EntityLoader<any, any, any, any, any, any>>(EntityLoader);
       const rejection = new Error();
-      when(
+      when(entityLoaderMock.loadByFieldEqualingAsync(anything(), anything())).thenResolve(
-        entityLoaderMock.resultLoader.loadByFieldEqualingAsync(anything(), anything())
+        result(rejection)
-      ).thenResolve(result(rejection));
+      );
       const entityLoader = instance(entityLoaderMock);
       const enforcingEntityLoader = new EnforcingEntityLoader(entityLoader);
       await expect(
@@ -96,9 +92,9 @@ describe(EnforcingEntityLoader, () => {
     it('returns value when result is successful', async () => {
       const entityLoaderMock = mock<EntityLoader<any, any, any, any, any, any>>(EntityLoader);
       const resolved = {};
-      when(
+      when(entityLoaderMock.loadByFieldEqualingAsync(anything(), anything())).thenResolve(
-        entityLoaderMock.resultLoader.loadByFieldEqualingAsync(anything(), anything())
+        result(resolved)
-      ).thenResolve(result(resolved));
+      );
       const entityLoader = instance(entityLoaderMock);
       const enforcingEntityLoader = new EnforcingEntityLoader(entityLoader);
       await expect(
@@ -109,9 +105,9 @@ describe(EnforcingEntityLoader, () => {
     it('returns null when result is successful and no entity is found', async () => {
       const entityLoaderMock = mock<EntityLoader<any, any, any, any, any, any>>(EntityLoader);
       const resolved = null;
-      when(
+      when(entityLoaderMock.loadByFieldEqualingAsync(anything(), anything())).thenResolve(
-        entityLoaderMock.resultLoader.loadByFieldEqualingAsync(anything(), anything())
+        result(resolved)
-      ).thenResolve(result(resolved));
+      );
       const entityLoader = instance(entityLoaderMock);
       const enforcingEntityLoader = new EnforcingEntityLoader(entityLoader);
       await expect(
@@ -122,9 +118,9 @@ describe(EnforcingEntityLoader, () => {
     it('throws when multiple matching entities are found', async () => {
       const entityLoaderMock = mock<EntityLoader<any, any, any, any, any, any>>(EntityLoader);
       const multipleEntitiesError = new Error();
-      when(
+      when(entityLoaderMock.loadByFieldEqualingAsync(anything(), anything())).thenReject(
-        entityLoaderMock.resultLoader.loadByFieldEqualingAsync(anything(), anything())
+        multipleEntitiesError
-      ).thenReject(multipleEntitiesError);
+      );
       const entityLoader = instance(entityLoaderMock);
       const enforcingEntityLoader = new EnforcingEntityLoader(entityLoader);
       await expect(
@@ -137,7 +133,7 @@ describe(EnforcingEntityLoader, () => {
     it('throws when result is unsuccessful', async () => {
       const entityLoaderMock = mock<EntityLoader<any, any, any, any, any, any>>(EntityLoader);
       const rejection = new Error();
-      when(entityLoaderMock.resultLoader.loadByIDAsync(anything())).thenResolve(result(rejection));
+      when(entityLoaderMock.loadByIDAsync(anything())).thenResolve(result(rejection));
       const entityLoader = instance(entityLoaderMock);
       const enforcingEntityLoader = new EnforcingEntityLoader(entityLoader);
       await expect(enforcingEntityLoader.loadByIDAsync(anything())).rejects.toThrow(rejection);
@@ -146,7 +142,7 @@ describe(EnforcingEntityLoader, () => {
     it('returns value when result is successful', async () => {
       const entityLoaderMock = mock<EntityLoader<any, any, any, any, any, any>>(EntityLoader);
       const resolved = {};
-      when(entityLoaderMock.resultLoader.loadByIDAsync(anything())).thenResolve(result(resolved));
+      when(entityLoaderMock.loadByIDAsync(anything())).thenResolve(result(resolved));
       const entityLoader = instance(entityLoaderMock);
       const enforcingEntityLoader = new EnforcingEntityLoader(entityLoader);
       await expect(enforcingEntityLoader.loadByIDAsync(anything())).resolves.toEqual(resolved);
@@ -157,9 +153,7 @@ describe(EnforcingEntityLoader, () => {
     it('throws when result is unsuccessful', async () => {
       const entityLoaderMock = mock<EntityLoader<any, any, any, any, any, any>>(EntityLoader);
       const rejection = new Error();
-      when(entityLoaderMock.resultLoader.loadByIDNullableAsync(anything())).thenResolve(
+      when(entityLoaderMock.loadByIDNullableAsync(anything())).thenResolve(result(rejection));
-        result(rejection)
-      );
       const entityLoader = instance(entityLoaderMock);
       const enforcingEntityLoader = new EnforcingEntityLoader(entityLoader);
       await expect(enforcingEntityLoader.loadByIDNullableAsync(anything())).rejects.toThrow(
@@ -170,9 +164,7 @@ describe(EnforcingEntityLoader, () => {
     it('returns value when result is successful', async () => {
       const entityLoaderMock = mock<EntityLoader<any, any, any, any, any, any>>(EntityLoader);
       const resolved = {};
-      when(entityLoaderMock.resultLoader.loadByIDNullableAsync(anything())).thenResolve(
+      when(entityLoaderMock.loadByIDNullableAsync(anything())).thenResolve(result(resolved));
-        result(resolved)
-      );
       const entityLoader = instance(entityLoaderMock);
       const enforcingEntityLoader = new EnforcingEntityLoader(entityLoader);
       await expect(enforcingEntityLoader.loadByIDNullableAsync(anything())).resolves.toEqual(
@@ -183,9 +175,7 @@ describe(EnforcingEntityLoader, () => {
     it('returns null when non-existent object', async () => {
       const entityLoaderMock = mock<EntityLoader<any, any, any, any, any, any>>(EntityLoader);
       const resolved = null;
-      when(entityLoaderMock.resultLoader.loadByIDNullableAsync(anything())).thenResolve(
+      when(entityLoaderMock.loadByIDNullableAsync(anything())).thenResolve(result(resolved));
-        result(resolved)
-      );
       const entityLoader = instance(entityLoaderMock);
       const enforcingEntityLoader = new EnforcingEntityLoader(entityLoader);
       await expect(enforcingEntityLoader.loadByIDNullableAsync(anything())).resolves.toEqual(
@@ -198,7 +188,7 @@ describe(EnforcingEntityLoader, () => {
     it('throws when result is unsuccessful', async () => {
       const entityLoaderMock = mock<EntityLoader<any, any, any, any, any, any>>(EntityLoader);
       const rejection = new Error();
-      when(entityLoaderMock.resultLoader.loadManyByIDsAsync(anything())).thenResolve(
+      when(entityLoaderMock.loadManyByIDsAsync(anything())).thenResolve(
         new Map(
           Object.entries({
             hello: result(rejection),
@@ -213,7 +203,7 @@ describe(EnforcingEntityLoader, () => {
     it('returns value when result is successful', async () => {
       const entityLoaderMock = mock<EntityLoader<any, any, any, any, any, any>>(EntityLoader);
       const resolved = {};
-      when(entityLoaderMock.resultLoader.loadManyByIDsAsync(anything())).thenResolve(
+      when(entityLoaderMock.loadManyByIDsAsync(anything())).thenResolve(
         new Map(
           Object.entries({
             hello: result(resolved),
@@ -237,10 +227,7 @@ describe(EnforcingEntityLoader, () => {
       const entityLoaderMock = mock<EntityLoader<any, any, any, any, any, any>>(EntityLoader);
       const rejection = new Error();
       when(
-        entityLoaderMock.resultLoader.loadManyByFieldEqualityConjunctionAsync(
+        entityLoaderMock.loadManyByFieldEqualityConjunctionAsync(anything(), anything())
-          anything(),
-          anything()
-        )
       ).thenResolve([result(rejection)]);
       const entityLoader = instance(entityLoaderMock);
       const enforcingEntityLoader = new EnforcingEntityLoader(entityLoader);
@@ -253,10 +240,7 @@ describe(EnforcingEntityLoader, () => {
       const entityLoaderMock = mock<EntityLoader<any, any, any, any, any, any>>(EntityLoader);
       const resolved = {};
       when(
-        entityLoaderMock.resultLoader.loadManyByFieldEqualityConjunctionAsync(
+        entityLoaderMock.loadManyByFieldEqualityConjunctionAsync(anything(), anything())
-          anything(),
-          anything()
-        )
       ).thenResolve([result(resolved)]);
       const entityLoader = instance(entityLoaderMock);
       const enforcingEntityLoader = new EnforcingEntityLoader(entityLoader);
@@ -271,11 +255,7 @@ describe(EnforcingEntityLoader, () => {
       const entityLoaderMock = mock<EntityLoader<any, any, any, any, any, any>>(EntityLoader);
       const rejection = new Error();
       when(
-        entityLoaderMock.resultLoader.loadManyByRawWhereClauseAsync(
+        entityLoaderMock.loadManyByRawWhereClauseAsync(anything(), anything(), anything())
-          anything(),
-          anything(),
-          anything()
-        )
       ).thenResolve([result(rejection)]);
       const entityLoader = instance(entityLoaderMock);
       const enforcingEntityLoader = new EnforcingEntityLoader(entityLoader);
@@ -288,11 +268,7 @@ describe(EnforcingEntityLoader, () => {
       const entityLoaderMock = mock<EntityLoader<any, any, any, any, any, any>>(EntityLoader);
       const resolved = {};
       when(
-        entityLoaderMock.resultLoader.loadManyByRawWhereClauseAsync(
+        entityLoaderMock.loadManyByRawWhereClauseAsync(anything(), anything(), anything())
-          anything(),
-          anything(),
-          anything()
-        )
       ).thenResolve([result(resolved)]);
       const entityLoader = instance(entityLoaderMock);
       const enforcingEntityLoader = new EnforcingEntityLoader(entityLoader);

packages/entity/src/__tests__/EntityCommonUseCases-test.ts

@@ -5,7 +5,7 @@ import Entity from '../Entity';
 import EntityCompanionProvider, { EntityCompanionDefinition } from '../EntityCompanionProvider';
 import EntityConfiguration from '../EntityConfiguration';
 import { UUIDField } from '../EntityFields';
-import EntityPrivacyPolicy, { EntityPrivacyPolicyEvaluationContext } from '../EntityPrivacyPolicy';
+import EntityPrivacyPolicy from '../EntityPrivacyPolicy';
 import { EntityQueryContext } from '../EntityQueryContext';
 import ViewerContext from '../ViewerContext';
 import { enforceResultsAsync } from '../entityUtils';
@@ -51,7 +51,6 @@ class DenyIfNotOwnerPrivacyPolicyRule extends PrivacyPolicyRule<
   async evaluateAsync(
     viewerContext: TestUserViewerContext,
     _queryContext: EntityQueryContext,
-    _evaluationContext: EntityPrivacyPolicyEvaluationContext,
     entity: BlahEntity
   ): Promise<RuleEvaluationResult> {
     if (viewerContext.getUserID() === entity.getField('ownerID')) {
@@ -129,15 +128,15 @@ it('runs through a common workflow', async () => {
 
   // check that two people can't read each others data
   await expect(
-    enforceAsyncResult(BlahEntity.loader(vc1).resultLoader.loadByIDAsync(blahOwner2.getID()))
+    enforceAsyncResult(BlahEntity.loader(vc1).loadByIDAsync(blahOwner2.getID()))
   ).rejects.toBeInstanceOf(EntityNotAuthorizedError);
   await expect(
-    enforceAsyncResult(BlahEntity.loader(vc2).resultLoader.loadByIDAsync(blahOwner1.getID()))
+    enforceAsyncResult(BlahEntity.loader(vc2).loadByIDAsync(blahOwner1.getID()))
   ).rejects.toBeInstanceOf(EntityNotAuthorizedError);
 
   // check that all of owner 1's objects can be loaded
   const results = await enforceResultsAsync(
-    BlahEntity.loader(vc1).resultLoader.loadManyByFieldEqualingAsync('ownerID', vc1.getUserID()!)
+    BlahEntity.loader(vc1).loadManyByFieldEqualingAsync('ownerID', vc1.getUserID()!)
   );
   expect(results).toHaveLength(2);
 
@@ -149,10 +148,7 @@ it('runs through a common workflow', async () => {
   ).rejects.toBeInstanceOf(EntityNotAuthorizedError);
 
   // check that empty load many returns nothing
-  const results2 = await BlahEntity.loader(vc1).resultLoader.loadManyByFieldEqualingManyAsync(
+  const results2 = await BlahEntity.loader(vc1).loadManyByFieldEqualingManyAsync('ownerID', []);
-    'ownerID',
-    []
-  );
   for (const value in results2.values) {
     expect(value).toHaveLength(0);
   }

packages/entity/src/__tests__/EntityEdges-test.ts

@@ -5,13 +5,10 @@ import { EntityEdgeDeletionBehavior } from '../EntityFieldDefinition';
 import { UUIDField } from '../EntityFields';
 import { EntityTriggerMutationInfo, EntityMutationType } from '../EntityMutationInfo';
 import { EntityMutationTrigger } from '../EntityMutationTriggerConfiguration';
-import EntityPrivacyPolicy, {
+import EntityPrivacyPolicy from '../EntityPrivacyPolicy';
-  EntityPrivacyPolicyEvaluationContext,
+import { EntityTransactionalQueryContext } from '../EntityQueryContext';
-  EntityAuthorizationAction,
-} from '../EntityPrivacyPolicy';
-import { EntityTransactionalQueryContext, EntityQueryContext } from '../EntityQueryContext';
 import { CacheStatus } from '../internal/ReadThroughEntityCache';
-import PrivacyPolicyRule, { RuleEvaluationResult } from '../rules/PrivacyPolicyRule';
+import AlwaysAllowPrivacyPolicyRule from '../rules/AlwaysAllowPrivacyPolicyRule';
 import TestViewerContext from '../testfixtures/TestViewerContext';
 import { InMemoryFullCacheStubCacheAdapter } from '../utils/testing/StubCacheAdapter';
 import { createUnitTestEntityCompanionProvider } from '../utils/testing/createUnitTestEntityCompanionProvider';
@@ -30,83 +27,35 @@ interface GrandChildFields {
   parent_id: string;
 }
 
+class TestEntityPrivacyPolicy extends EntityPrivacyPolicy<
+  any,
+  string,
+  TestViewerContext,
+  any,
+  any
+> {
+  protected override readonly readRules = [
+    new AlwaysAllowPrivacyPolicyRule<any, string, TestViewerContext, any, any>(),
+  ];
+  protected override readonly createRules = [
+    new AlwaysAllowPrivacyPolicyRule<any, string, TestViewerContext, any, any>(),
+  ];
+  protected override readonly updateRules = [
+    new AlwaysAllowPrivacyPolicyRule<any, string, TestViewerContext, any, any>(),
+  ];
+  protected override readonly deleteRules = [
+    new AlwaysAllowPrivacyPolicyRule<any, string, TestViewerContext, any, any>(),
+  ];
+}
+
 // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
 const makeEntityClasses = (edgeDeletionBehavior: EntityEdgeDeletionBehavior) => {
   const triggerExecutionCounts = {
-    ParentEntity: 0,
+    parent: 0,
-    ChildEntity: 0,
+    child: 0,
-    GrandChildEntity: 0,
+    grandchild: 0,
   };
 
-  const privacyPolicyEvaluationRecords = {
-    shouldRecord: false,
-    ParentEntity: {
-      [EntityAuthorizationAction.CREATE]: [],
-      [EntityAuthorizationAction.READ]: [],
-      [EntityAuthorizationAction.UPDATE]: [],
-      [EntityAuthorizationAction.DELETE]: [],
-    },
-    ChildEntity: {
-      [EntityAuthorizationAction.CREATE]: [],
-      [EntityAuthorizationAction.READ]: [],
-      [EntityAuthorizationAction.UPDATE]: [],
-      [EntityAuthorizationAction.DELETE]: [],
-    },
-    GrandChildEntity: {
-      [EntityAuthorizationAction.CREATE]: [],
-      [EntityAuthorizationAction.READ]: [],
-      [EntityAuthorizationAction.UPDATE]: [],
-      [EntityAuthorizationAction.DELETE]: [],
-    },
-  };
-
-  class AlwaysAllowPrivacyPolicyRuleThatRecords extends PrivacyPolicyRule<
-    any,
-    string,
-    TestViewerContext,
-    any,
-    any
-  > {
-    constructor(private readonly action: EntityAuthorizationAction) {
-      super();
-    }
-
-    async evaluateAsync(
-      _viewerContext: TestViewerContext,
-      _queryContext: EntityQueryContext,
-      evaluationContext: EntityPrivacyPolicyEvaluationContext,
-      entity: any
-    ): Promise<RuleEvaluationResult> {
-      if (privacyPolicyEvaluationRecords.shouldRecord) {
-        (privacyPolicyEvaluationRecords as any)[entity.constructor.name][this.action].push(
-          evaluationContext
-        );
-      }
-      return RuleEvaluationResult.ALLOW;
-    }
-  }
-
-  class TestEntityPrivacyPolicy extends EntityPrivacyPolicy<
-    any,
-    string,
-    TestViewerContext,
-    any,
-    any
-  > {
-    protected override readonly readRules = [
-      new AlwaysAllowPrivacyPolicyRuleThatRecords(EntityAuthorizationAction.READ),
-    ];
-    protected override readonly createRules = [
-      new AlwaysAllowPrivacyPolicyRuleThatRecords(EntityAuthorizationAction.CREATE),
-    ];
-    protected override readonly updateRules = [
-      new AlwaysAllowPrivacyPolicyRuleThatRecords(EntityAuthorizationAction.UPDATE),
-    ];
-    protected override readonly deleteRules = [
-      new AlwaysAllowPrivacyPolicyRuleThatRecords(EntityAuthorizationAction.DELETE),
-    ];
-  }
-
   class ParentCheckInfoTrigger extends EntityMutationTrigger<
     ParentFields,
     string,
@@ -127,7 +76,7 @@ const makeEntityClasses = (edgeDeletionBehavior: EntityEdgeDeletionBehavior) =>
         throw new Error('Parent entity should not have casade delete cause');
       }
 
-      triggerExecutionCounts.ParentEntity++;
+      triggerExecutionCounts.parent++;
     }
   }
 
@@ -162,7 +111,7 @@ const makeEntityClasses = (edgeDeletionBehavior: EntityEdgeDeletionBehavior) =>
         throw new Error('Child entity should not have two-level casade delete cause');
       }
 
-      triggerExecutionCounts.ChildEntity++;
+      triggerExecutionCounts.child++;
     }
   }
 
@@ -216,7 +165,7 @@ const makeEntityClasses = (edgeDeletionBehavior: EntityEdgeDeletionBehavior) =>
         throw new Error('GrandChild entity should not have three-level casade delete cause');
       }
 
-      triggerExecutionCounts.GrandChildEntity++;
+      triggerExecutionCounts.grandchild++;
     }
   }
 
@@ -348,20 +297,14 @@ const makeEntityClasses = (edgeDeletionBehavior: EntityEdgeDeletionBehavior) =>
     ChildEntity,
     GrandChildEntity,
     triggerExecutionCounts,
-    privacyPolicyEvaluationRecords,
   };
 };
 
 describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {
   describe('EntityEdgeDeletionBehavior.CASCADE_DELETE', () => {
     it('deletes', async () => {
-      const {
+      const { ParentEntity, ChildEntity, GrandChildEntity, triggerExecutionCounts } =
-        ParentEntity,
+        makeEntityClasses(EntityEdgeDeletionBehavior.CASCADE_DELETE);
-        ChildEntity,
-        GrandChildEntity,
-        triggerExecutionCounts,
-        privacyPolicyEvaluationRecords,
-      } = makeEntityClasses(EntityEdgeDeletionBehavior.CASCADE_DELETE);
       const companionProvider = createUnitTestEntityCompanionProvider();
       const viewerContext = new TestViewerContext(companionProvider);
 
@@ -374,107 +317,40 @@ describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {
         .enforceCreateAsync();
 
       await expect(
-        ParentEntity.loader(viewerContext).loadByIDNullableAsync(parent.getID())
+        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID())
       ).resolves.not.toBeNull();
       await expect(
-        ChildEntity.loader(viewerContext).loadByIDNullableAsync(child.getID())
+        ChildEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(child.getID())
       ).resolves.not.toBeNull();
       await expect(
-        GrandChildEntity.loader(viewerContext).loadByIDNullableAsync(grandchild.getID())
+        GrandChildEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(grandchild.getID())
       ).resolves.not.toBeNull();
 
-      privacyPolicyEvaluationRecords.shouldRecord = true;
       await ParentEntity.enforceDeleteAsync(parent);
-      privacyPolicyEvaluationRecords.shouldRecord = false;
 
       await expect(
-        ParentEntity.loader(viewerContext).loadByIDNullableAsync(parent.getID())
+        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID())
       ).resolves.toBeNull();
       await expect(
-        ChildEntity.loader(viewerContext).loadByIDNullableAsync(child.getID())
+        ChildEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(child.getID())
       ).resolves.toBeNull();
       await expect(
-        GrandChildEntity.loader(viewerContext).loadByIDNullableAsync(grandchild.getID())
+        GrandChildEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(grandchild.getID())
       ).resolves.toBeNull();
 
       // two calls for each trigger, one beforeDelete, one afterDelete
       expect(triggerExecutionCounts).toMatchObject({
-        ParentEntity: 2,
+        parent: 2,
-        ChildEntity: 2,
+        child: 2,
-        GrandChildEntity: 2,
+        grandchild: 2,
-      });
-
-      expect(privacyPolicyEvaluationRecords).toMatchObject({
-        ParentEntity: {
-          [EntityAuthorizationAction.CREATE]: [],
-          [EntityAuthorizationAction.READ]: [],
-          [EntityAuthorizationAction.UPDATE]: [],
-          // one DELETE auth action for parent (since it's being deleted)
-          [EntityAuthorizationAction.DELETE]: [{ cascadingDeleteCause: null }],
-        },
-        ChildEntity: {
-          [EntityAuthorizationAction.CREATE]: [],
-          // one READ auth action for child in order to delete via cascade
-          [EntityAuthorizationAction.READ]: [
-            {
-              cascadingDeleteCause: {
-                entity: expect.any(ParentEntity),
-                cascadingDeleteCause: null,
-              },
-            },
-          ],
-          [EntityAuthorizationAction.UPDATE]: [],
-          // one DELETE auth action for child (since it's being deleted via cascade)
-          [EntityAuthorizationAction.DELETE]: [
-            {
-              cascadingDeleteCause: {
-                entity: expect.any(ParentEntity),
-                cascadingDeleteCause: null,
-              },
-            },
-          ],
-        },
-        GrandChildEntity: {
-          [EntityAuthorizationAction.CREATE]: [],
-          // one READ auth action for grandchild in order to delete via cascade
-          [EntityAuthorizationAction.READ]: [
-            {
-              cascadingDeleteCause: {
-                entity: expect.any(ChildEntity),
-                cascadingDeleteCause: {
-                  entity: expect.any(ParentEntity),
-                  cascadingDeleteCause: null,
-                },
-              },
-            },
-          ],
-          [EntityAuthorizationAction.UPDATE]: [],
-          // one DELETE auth action for grandchild (since it's being deleted via cascade)
-          [EntityAuthorizationAction.DELETE]: [
-            {
-              cascadingDeleteCause: {
-                entity: expect.any(ChildEntity),
-                cascadingDeleteCause: {
-                  entity: expect.any(ParentEntity),
-                  cascadingDeleteCause: null,
-                },
-              },
-            },
-          ],
-        },
       });
     });
   });
 
   describe('EntityEdgeDeletionBehavior.SET_NULL', () => {
     it('sets null', async () => {
-      const {
+      const { ParentEntity, ChildEntity, GrandChildEntity, triggerExecutionCounts } =
-        ParentEntity,
+        makeEntityClasses(EntityEdgeDeletionBehavior.SET_NULL);
-        ChildEntity,
-        GrandChildEntity,
-        triggerExecutionCounts,
-        privacyPolicyEvaluationRecords,
-      } = makeEntityClasses(EntityEdgeDeletionBehavior.SET_NULL);
 
       const companionProvider = createUnitTestEntityCompanionProvider();
       const viewerContext = new TestViewerContext(companionProvider);
@@ -488,100 +364,45 @@ describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {
         .enforceCreateAsync();
 
       await expect(
-        ParentEntity.loader(viewerContext).loadByIDNullableAsync(parent.getID())
+        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID())
       ).resolves.not.toBeNull();
       await expect(
-        ChildEntity.loader(viewerContext).loadByIDNullableAsync(child.getID())
+        ChildEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(child.getID())
       ).resolves.not.toBeNull();
       await expect(
-        GrandChildEntity.loader(viewerContext).loadByIDNullableAsync(grandchild.getID())
+        GrandChildEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(grandchild.getID())
       ).resolves.not.toBeNull();
 
-      privacyPolicyEvaluationRecords.shouldRecord = true;
       await ParentEntity.enforceDeleteAsync(parent);
-      privacyPolicyEvaluationRecords.shouldRecord = false;
 
       await expect(
-        ParentEntity.loader(viewerContext).loadByIDNullableAsync(parent.getID())
+        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID())
       ).resolves.toBeNull();
 
       const loadedChild = await ChildEntity.loader(viewerContext)
-
+        .enforcing()
         .loadByIDAsync(child.getID());
       expect(loadedChild.getField('parent_id')).toBeNull();
 
       const loadedGrandchild = await GrandChildEntity.loader(viewerContext)
-
+        .enforcing()
         .loadByIDAsync(grandchild.getID());
       expect(loadedGrandchild.getField('parent_id')).toEqual(loadedChild.getID());
 
       // two calls for only parent trigger, one beforeDelete, one afterDelete
       // when using set null the descendants aren't deleted
       expect(triggerExecutionCounts).toMatchObject({
-        ParentEntity: 2,
+        parent: 2,
-        ChildEntity: 0,
+        child: 0,
-        GrandChildEntity: 0,
+        grandchild: 0,
-      });
-
-      expect(privacyPolicyEvaluationRecords).toMatchObject({
-        ParentEntity: {
-          [EntityAuthorizationAction.CREATE]: [],
-          [EntityAuthorizationAction.READ]: [],
-          [EntityAuthorizationAction.UPDATE]: [],
-          // one DELETE auth action for parent (since it's being deleted)
-          [EntityAuthorizationAction.DELETE]: [{ cascadingDeleteCause: null }],
-        },
-        ChildEntity: {
-          [EntityAuthorizationAction.CREATE]: [],
-
-          // two READs auth action for Child during parent deletion:
-          // 1. Read to initiate the SET_NULL (to update the entity)
-          // 1. Read automatically post-update
-          // no other entities are read since it is not cascaded past first entity
-          [EntityAuthorizationAction.READ]: [
-            {
-              cascadingDeleteCause: {
-                entity: expect.any(ParentEntity),
-                cascadingDeleteCause: null,
-              },
-            },
-            {
-              cascadingDeleteCause: {
-                entity: expect.any(ParentEntity),
-                cascadingDeleteCause: null,
-              },
-            },
-          ],
-          // one UPDATE to set null
-          [EntityAuthorizationAction.UPDATE]: [
-            {
-              cascadingDeleteCause: {
-                entity: expect.any(ParentEntity),
-                cascadingDeleteCause: null,
-              },
-            },
-          ],
-          [EntityAuthorizationAction.DELETE]: [],
-        },
-        GrandChildEntity: {
-          [EntityAuthorizationAction.CREATE]: [],
-          [EntityAuthorizationAction.READ]: [],
-          [EntityAuthorizationAction.UPDATE]: [],
-          [EntityAuthorizationAction.DELETE]: [],
-        },
       });
     });
   });
 
   describe('EntityEdgeDeletionBehavior.CASCADE_DELETE_INVALIDATE_CACHE', () => {
     it('invalidates the cache', async () => {
-      const {
+      const { ParentEntity, ChildEntity, GrandChildEntity, triggerExecutionCounts } =
-        ParentEntity,
+        makeEntityClasses(EntityEdgeDeletionBehavior.CASCADE_DELETE_INVALIDATE_CACHE);
-        ChildEntity,
-        GrandChildEntity,
-        triggerExecutionCounts,
-        privacyPolicyEvaluationRecords,
-      } = makeEntityClasses(EntityEdgeDeletionBehavior.CASCADE_DELETE_INVALIDATE_CACHE);
 
       const companionProvider = createUnitTestEntityCompanionProvider();
       const viewerContext = new TestViewerContext(companionProvider);
@@ -595,16 +416,16 @@ describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {
         .enforceCreateAsync();
 
       await expect(
-        ParentEntity.loader(viewerContext).loadByIDNullableAsync(parent.getID())
+        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID())
       ).resolves.not.toBeNull();
       await expect(
         ChildEntity.loader(viewerContext)
-
+          .enforcing()
           .loadByFieldEqualingAsync('parent_id', parent.getID())
       ).resolves.not.toBeNull();
       await expect(
         GrandChildEntity.loader(viewerContext)
-
+          .enforcing()
           .loadByFieldEqualingAsync('parent_id', child.getID())
       ).resolves.not.toBeNull();
 
@@ -626,9 +447,7 @@ describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {
       ]);
       expect(grandChildCachedBefore.get(child.getID())?.status).toEqual(CacheStatus.HIT);
 
-      privacyPolicyEvaluationRecords.shouldRecord = true;
       await ParentEntity.enforceDeleteAsync(parent);
-      privacyPolicyEvaluationRecords.shouldRecord = false;
 
       const childCachedAfter = await childCacheAdapter.loadManyAsync('parent_id', [parent.getID()]);
       expect(childCachedAfter.get(parent.getID())?.status).toEqual(CacheStatus.MISS);
@@ -639,80 +458,20 @@ describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {
       expect(grandChildCachedAfter.get(child.getID())?.status).toEqual(CacheStatus.MISS);
 
       await expect(
-        ParentEntity.loader(viewerContext).loadByIDNullableAsync(parent.getID())
+        ParentEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parent.getID())
       ).resolves.toBeNull();
       await expect(
-        ChildEntity.loader(viewerContext).loadByIDNullableAsync(child.getID())
+        ChildEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(child.getID())
       ).resolves.not.toBeNull();
       await expect(
-        GrandChildEntity.loader(viewerContext).loadByIDNullableAsync(grandchild.getID())
+        GrandChildEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(grandchild.getID())
       ).resolves.not.toBeNull();
 
       // two calls for each trigger, one beforeDelete, one afterDelete
       expect(triggerExecutionCounts).toMatchObject({
-        ParentEntity: 2,
+        parent: 2,
-        ChildEntity: 2,
+        child: 2,
-        GrandChildEntity: 2,
+        grandchild: 2,
-      });
-
-      expect(privacyPolicyEvaluationRecords).toMatchObject({
-        ParentEntity: {
-          [EntityAuthorizationAction.CREATE]: [],
-          [EntityAuthorizationAction.READ]: [],
-          [EntityAuthorizationAction.UPDATE]: [],
-          // one DELETE auth action for parent (since it's being deleted)
-          [EntityAuthorizationAction.DELETE]: [{ cascadingDeleteCause: null }],
-        },
-        ChildEntity: {
-          [EntityAuthorizationAction.CREATE]: [],
-          // one READ auth action for child in order to delete via cascade
-          [EntityAuthorizationAction.READ]: [
-            {
-              cascadingDeleteCause: {
-                entity: expect.any(ParentEntity),
-                cascadingDeleteCause: null,
-              },
-            },
-          ],
-          [EntityAuthorizationAction.UPDATE]: [],
-          // one DELETE auth action for child (since it's being deleted via cascade)
-          [EntityAuthorizationAction.DELETE]: [
-            {
-              cascadingDeleteCause: {
-                entity: expect.any(ParentEntity),
-                cascadingDeleteCause: null,
-              },
-            },
-          ],
-        },
-        GrandChildEntity: {
-          [EntityAuthorizationAction.CREATE]: [],
-          // one READ auth action for grandchild in order to delete via cascade
-          [EntityAuthorizationAction.READ]: [
-            {
-              cascadingDeleteCause: {
-                entity: expect.any(ChildEntity),
-                cascadingDeleteCause: {
-                  entity: expect.any(ParentEntity),
-                  cascadingDeleteCause: null,
-                },
-              },
-            },
-          ],
-          [EntityAuthorizationAction.UPDATE]: [],
-          // one DELETE auth action for grandchild (since it's being deleted via cascade)
-          [EntityAuthorizationAction.DELETE]: [
-            {
-              cascadingDeleteCause: {
-                entity: expect.any(ChildEntity),
-                cascadingDeleteCause: {
-                  entity: expect.any(ParentEntity),
-                  cascadingDeleteCause: null,
-                },
-              },
-            },
-          ],
-        },
       });
     });
   });

packages/entity/src/__tests__/EntityLoader-constructor-test.ts

@@ -5,7 +5,7 @@ import { EntityCompanionDefinition } from '../EntityCompanionProvider';
 import EntityConfiguration from '../EntityConfiguration';
 import { StringField } from '../EntityFields';
 import EntityLoader from '../EntityLoader';
-import EntityPrivacyPolicy, { EntityPrivacyPolicyEvaluationContext } from '../EntityPrivacyPolicy';
+import EntityPrivacyPolicy from '../EntityPrivacyPolicy';
 import ViewerContext from '../ViewerContext';
 import EntityDataManager from '../internal/EntityDataManager';
 import ReadThroughEntityCache from '../internal/ReadThroughEntityCache';
@@ -118,7 +118,6 @@ export const testEntityCompanion = new EntityCompanionDefinition({
 describe(EntityLoader, () => {
   it('handles thrown errors and literals from constructor', async () => {
     const viewerContext = instance(mock(ViewerContext));
-    const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
     const metricsAdapter = instance(mock<IEntityMetricsAdapter>());
     const queryContext = StubQueryContextProvider.getQueryContext();
 
@@ -155,7 +154,6 @@ describe(EntityLoader, () => {
     const entityLoader = new EntityLoader(
       viewerContext,
       queryContext,
-      privacyPolicyEvaluationContext,
       testEntityConfiguration,
       TestEntity,
       privacyPolicy,
@@ -165,14 +163,14 @@ describe(EntityLoader, () => {
 
     let capturedThrownThing1: any;
     try {
-      await entityLoader.resultLoader.loadByIDAsync(ID_SENTINEL_THROW_LITERAL);
+      await entityLoader.loadByIDAsync(ID_SENTINEL_THROW_LITERAL);
     } catch (e) {
       capturedThrownThing1 = e;
     }
     expect(capturedThrownThing1).not.toBeInstanceOf(Error);
     expect(capturedThrownThing1).toEqual('hello');
 
-    const result = await entityLoader.resultLoader.loadByIDAsync(ID_SENTINEL_THROW_ERROR);
+    const result = await entityLoader.loadByIDAsync(ID_SENTINEL_THROW_ERROR);
     expect(result.ok).toBe(false);
     expect(result.enforceError().message).toEqual('world');
   });

packages/entity/src/__tests__/EntityLoader-test.ts

@@ -3,7 +3,6 @@ import { mock, instance, verify, spy, deepEqual, anyOfClass, anything, when } fr
 import { v4 as uuidv4 } from 'uuid';
 
 import EntityLoader from '../EntityLoader';
-import { EntityPrivacyPolicyEvaluationContext } from '../EntityPrivacyPolicy';
 import ViewerContext from '../ViewerContext';
 import { enforceResultsAsync } from '../entityUtils';
 import EntityDataManager from '../internal/EntityDataManager';
@@ -22,7 +21,6 @@ describe(EntityLoader, () => {
   it('loads entities', async () => {
     const dateToInsert = new Date();
     const viewerContext = instance(mock(ViewerContext));
-    const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
     const metricsAdapter = instance(mock<IEntityMetricsAdapter>());
     const queryContext = StubQueryContextProvider.getQueryContext();
 
@@ -71,46 +69,42 @@ describe(EntityLoader, () => {
     const entityLoader = new EntityLoader(
       viewerContext,
       queryContext,
-      privacyPolicyEvaluationContext,
       testEntityConfiguration,
       TestEntity,
       privacyPolicy,
       dataManager,
       metricsAdapter
     );
-    const entity = await enforceAsyncResult(entityLoader.resultLoader.loadByIDAsync(id1));
+    const entity = await enforceAsyncResult(entityLoader.loadByIDAsync(id1));
     expect(entity.getID()).toEqual(id1);
     expect(entity.getField('dateField')).toEqual(dateToInsert);
 
     const entities = await enforceResultsAsync(
-      entityLoader.resultLoader.loadManyByFieldEqualingAsync('stringField', 'huh')
+      entityLoader.loadManyByFieldEqualingAsync('stringField', 'huh')
     );
     expect(entities.map((m) => m.getID())).toEqual([id1, id2]);
 
-    const entityResultNumber3 = await entityLoader.resultLoader.loadByFieldEqualingAsync('intField', 3);
+    const entityResultNumber3 = await entityLoader.loadByFieldEqualingAsync('intField', 3);
     expect(entityResultNumber3).not.toBeNull();
     expect(entityResultNumber3!.enforceValue().getID()).toEqual(id2);
 
-    const entityResultNumber4 = await entityLoader.resultLoader.loadByFieldEqualingAsync('intField', 4);
+    const entityResultNumber4 = await entityLoader.loadByFieldEqualingAsync('intField', 4);
     expect(entityResultNumber4).toBeNull();
 
-    const entityResultDuplicateValues = await entityLoader.loadManyByFieldEqualingManyAsync(
+    const entityResultDuplicateValues = await entityLoader
-      'stringField',
+      .enforcing()
-      ['huh', 'huh']
+      .loadManyByFieldEqualingManyAsync('stringField', ['huh', 'huh']);
-    );
     expect(entityResultDuplicateValues.size).toBe(1);
     expect(entityResultDuplicateValues.get('huh')?.map((m) => m.getID())).toEqual([id1, id2]);
 
-    await expect(
+    await expect(entityLoader.loadByFieldEqualingAsync('stringField', 'huh')).rejects.toThrowError(
-      entityLoader.resultLoader.loadByFieldEqualingAsync('stringField', 'huh')
-    ).rejects.toThrowError(
       'loadByFieldEqualing: Multiple entities of type TestEntity found for stringField=huh'
     );
 
-    await expect(entityLoader.resultLoader.loadByIDNullableAsync(uuidv4())).resolves.toBeNull();
+    await expect(entityLoader.loadByIDNullableAsync(uuidv4())).resolves.toBeNull();
-    await expect(entityLoader.resultLoader.loadByIDNullableAsync(id1)).resolves.not.toBeNull();
+    await expect(entityLoader.loadByIDNullableAsync(id1)).resolves.not.toBeNull();
 
-    await expect(entityLoader.resultLoader.loadByIDAsync('not-a-uuid')).rejects.toThrowError(
+    await expect(entityLoader.loadByIDAsync('not-a-uuid')).rejects.toThrowError(
       'Entity field not valid: TestEntity (customIdField = not-a-uuid)'
     );
   });
@@ -119,7 +113,6 @@ describe(EntityLoader, () => {
     const privacyPolicy = new TestEntityPrivacyPolicy();
     const spiedPrivacyPolicy = spy(privacyPolicy);
     const viewerContext = instance(mock(ViewerContext));
-    const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
     const metricsAdapter = instance(mock<IEntityMetricsAdapter>());
     const queryContext = StubQueryContextProvider.getQueryContext();
 
@@ -176,7 +169,6 @@ describe(EntityLoader, () => {
     const entityLoader = new EntityLoader(
       viewerContext,
       queryContext,
-      privacyPolicyEvaluationContext,
       testEntityConfiguration,
       TestEntity,
       privacyPolicy,
@@ -184,7 +176,7 @@ describe(EntityLoader, () => {
       metricsAdapter
     );
     const entities = await enforceResultsAsync(
-      entityLoader.resultLoader.loadManyByFieldEqualityConjunctionAsync([
+      entityLoader.loadManyByFieldEqualityConjunctionAsync([
         {
           fieldName: 'stringField',
           fieldValue: 'huh',
@@ -200,14 +192,13 @@ describe(EntityLoader, () => {
       spiedPrivacyPolicy.authorizeReadAsync(
         viewerContext,
         queryContext,
-        privacyPolicyEvaluationContext,
         anyOfClass(TestEntity),
         anything()
       )
     ).twice();
 
     await expect(
-      entityLoader.resultLoader.loadManyByFieldEqualityConjunctionAsync([
+      entityLoader.loadManyByFieldEqualityConjunctionAsync([
         { fieldName: 'customIdField', fieldValue: 'not-a-uuid' },
       ])
     ).rejects.toThrowError('Entity field not valid: TestEntity (customIdField = not-a-uuid)');
@@ -218,7 +209,6 @@ describe(EntityLoader, () => {
     const spiedPrivacyPolicy = spy(privacyPolicy);
 
     const viewerContext = instance(mock(ViewerContext));
-    const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
     const metricsAdapter = instance(mock<IEntityMetricsAdapter>());
     const queryContext = StubQueryContextProvider.getQueryContext();
 
@@ -257,28 +247,20 @@ describe(EntityLoader, () => {
     const entityLoader = new EntityLoader(
       viewerContext,
       queryContext,
-      privacyPolicyEvaluationContext,
       testEntityConfiguration,
       TestEntity,
       privacyPolicy,
       dataManager,
       metricsAdapter
     );
-    const entity = await enforceAsyncResult(entityLoader.resultLoader.loadByIDAsync(id1));
+    const entity = await enforceAsyncResult(entityLoader.loadByIDAsync(id1));
     verify(
-      spiedPrivacyPolicy.authorizeReadAsync(
+      spiedPrivacyPolicy.authorizeReadAsync(viewerContext, queryContext, entity, anything())
-        viewerContext,
-        queryContext,
-        privacyPolicyEvaluationContext,
-        entity,
-        anything()
-      )
     ).once();
   });
 
   it('invalidates upon invalidate one', async () => {
     const viewerContext = instance(mock(ViewerContext));
-    const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
     const metricsAdapter = instance(mock<IEntityMetricsAdapter>());
     const queryContext = StubQueryContextProvider.getQueryContext();
     const privacyPolicy = instance(mock(TestEntityPrivacyPolicy));
@@ -289,7 +271,6 @@ describe(EntityLoader, () => {
     const entityLoader = new EntityLoader(
       viewerContext,
       queryContext,
-      privacyPolicyEvaluationContext,
       testEntityConfiguration,
       TestEntity,
       privacyPolicy,
@@ -305,7 +286,6 @@ describe(EntityLoader, () => {
 
   it('invalidates upon invalidate by field', async () => {
     const viewerContext = instance(mock(ViewerContext));
-    const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
     const metricsAdapter = instance(mock<IEntityMetricsAdapter>());
     const queryContext = StubQueryContextProvider.getQueryContext();
     const privacyPolicy = instance(mock(TestEntityPrivacyPolicy));
@@ -316,7 +296,6 @@ describe(EntityLoader, () => {
     const entityLoader = new EntityLoader(
       viewerContext,
       queryContext,
-      privacyPolicyEvaluationContext,
       testEntityConfiguration,
       TestEntity,
       privacyPolicy,
@@ -331,7 +310,6 @@ describe(EntityLoader, () => {
 
   it('invalidates upon invalidate by entity', async () => {
     const viewerContext = instance(mock(ViewerContext));
-    const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
     const metricsAdapter = instance(mock<IEntityMetricsAdapter>());
     const queryContext = StubQueryContextProvider.getQueryContext();
     const privacyPolicy = instance(mock(TestEntityPrivacyPolicy));
@@ -346,7 +324,6 @@ describe(EntityLoader, () => {
     const entityLoader = new EntityLoader(
       viewerContext,
       queryContext,
-      privacyPolicyEvaluationContext,
       testEntityConfiguration,
       TestEntity,
       privacyPolicy,
@@ -361,7 +338,6 @@ describe(EntityLoader, () => {
 
   it('returns error result when not allowed', async () => {
     const viewerContext = instance(mock(ViewerContext));
-    const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
     const metricsAdapter = instance(mock<IEntityMetricsAdapter>());
     const queryContext = StubQueryContextProvider.getQueryContext();
     const privacyPolicyMock = mock(TestEntityPrivacyPolicy);
@@ -378,7 +354,6 @@ describe(EntityLoader, () => {
       privacyPolicyMock.authorizeReadAsync(
         viewerContext,
         queryContext,
-        privacyPolicyEvaluationContext,
         anyOfClass(TestEntity),
         anything()
       )
@@ -390,7 +365,6 @@ describe(EntityLoader, () => {
     const entityLoader = new EntityLoader(
       viewerContext,
       queryContext,
-      privacyPolicyEvaluationContext,
       testEntityConfiguration,
       TestEntity,
       privacyPolicy,
@@ -398,7 +372,7 @@ describe(EntityLoader, () => {
       metricsAdapter
     );
 
-    const entityResult = await entityLoader.resultLoader.loadByIDAsync(id1);
+    const entityResult = await entityLoader.loadByIDAsync(id1);
     expect(entityResult.ok).toBe(false);
     expect(entityResult.reason).toEqual(rejectionError);
     expect(entityResult.value).toBe(undefined);
@@ -406,7 +380,6 @@ describe(EntityLoader, () => {
 
   it('throws upon database adapter error', async () => {
     const viewerContext = instance(mock(ViewerContext));
-    const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
     const metricsAdapter = instance(mock<IEntityMetricsAdapter>());
     const queryContext = StubQueryContextProvider.getQueryContext();
     const privacyPolicy = instance(mock(TestEntityPrivacyPolicy));
@@ -423,7 +396,6 @@ describe(EntityLoader, () => {
     const entityLoader = new EntityLoader(
       viewerContext,
       queryContext,
-      privacyPolicyEvaluationContext,
       testEntityConfiguration,
       TestEntity,
       privacyPolicy,
@@ -433,21 +405,21 @@ describe(EntityLoader, () => {
 
     const loadByValue = uuidv4();
 
-    await expect(entityLoader.resultLoader.loadByIDAsync(loadByValue)).rejects.toEqual(error);
     await expect(entityLoader.loadByIDAsync(loadByValue)).rejects.toEqual(error);
-    await expect(entityLoader.resultLoader.loadManyByIDsAsync([loadByValue])).rejects.toEqual(error);
+    await expect(entityLoader.enforcing().loadByIDAsync(loadByValue)).rejects.toEqual(error);
-    await expect(entityLoader.resultLoader.loadManyByIDsAsync([loadByValue])).rejects.toEqual(error);
+    await expect(entityLoader.loadManyByIDsAsync([loadByValue])).rejects.toEqual(error);
-    await expect(
+    await expect(entityLoader.loadManyByIDsAsync([loadByValue])).rejects.toEqual(error);
-      entityLoader.resultLoader.loadManyByFieldEqualingAsync('customIdField', loadByValue)
-    ).rejects.toEqual(error);
     await expect(
       entityLoader.loadManyByFieldEqualingAsync('customIdField', loadByValue)
     ).rejects.toEqual(error);
     await expect(
-      entityLoader.resultLoader.loadManyByFieldEqualingManyAsync('customIdField', [loadByValue])
+      entityLoader.enforcing().loadManyByFieldEqualingAsync('customIdField', loadByValue)
     ).rejects.toEqual(error);
     await expect(
       entityLoader.loadManyByFieldEqualingManyAsync('customIdField', [loadByValue])
     ).rejects.toEqual(error);
+    await expect(
+      entityLoader.enforcing().loadManyByFieldEqualingManyAsync('customIdField', [loadByValue])
+    ).rejects.toEqual(error);
   });
 });

packages/entity/src/__tests__/EntityMutator-MutationCacheConsistency-test.ts

@@ -78,7 +78,7 @@ class TestNonTransactionalMutationTrigger extends EntityNonTransactionalMutation
   ): Promise<void> {
     if (mutationInfo.type === EntityMutationType.DELETE) {
       const entityLoaded = await BlahEntity.loader(viewerContext)
-
+        .enforcing()
         .loadByIDNullableAsync(entity.getID());
       if (entityLoaded) {
         throw new Error(
@@ -97,7 +97,7 @@ describe('EntityMutator', () => {
     // put it in cache
     const entity = await BlahEntity.creator(viewerContext).enforceCreateAsync();
     const entityLoaded = await BlahEntity.loader(viewerContext)
-
+      .enforcing()
       .loadByIDAsync(entity.getID());
 
     await BlahEntity.enforceDeleteAsync(entityLoaded);

packages/entity/src/__tests__/EntityMutator-test.ts

@@ -25,7 +25,6 @@ import EntityMutationTriggerConfiguration, {
 } from '../EntityMutationTriggerConfiguration';
 import EntityMutationValidator from '../EntityMutationValidator';
 import EntityMutatorFactory from '../EntityMutatorFactory';
-import { EntityPrivacyPolicyEvaluationContext } from '../EntityPrivacyPolicy';
 import { EntityTransactionalQueryContext, EntityQueryContext } from '../EntityQueryContext';
 import ViewerContext from '../ViewerContext';
 import { enforceResultsAsync } from '../entityUtils';
@@ -341,7 +340,6 @@ describe(EntityMutatorFactory, () => {
   describe('forCreate', () => {
     it('creates entities', async () => {
       const viewerContext = mock<ViewerContext>();
-      const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
       const queryContext = StubQueryContextProvider.getQueryContext();
 
       const id1 = uuidv4();
@@ -365,7 +363,7 @@ describe(EntityMutatorFactory, () => {
         },
       ]);
       const newEntity = await entityMutatorFactory
-        .forCreate(viewerContext, queryContext, privacyPolicyEvaluationContext)
+        .forCreate(viewerContext, queryContext)
         .setField('stringField', 'huh')
         .enforceCreateAsync();
       expect(newEntity).toBeTruthy();
@@ -373,7 +371,6 @@ describe(EntityMutatorFactory, () => {
 
     it('checks privacy', async () => {
       const viewerContext = mock<ViewerContext>();
-      const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
       const queryContext = StubQueryContextProvider.getQueryContext();
 
       const id1 = uuidv4();
@@ -400,7 +397,7 @@ describe(EntityMutatorFactory, () => {
       const spiedPrivacyPolicy = spy(privacyPolicy);
 
       await entityMutatorFactory
-        .forCreate(viewerContext, queryContext, privacyPolicyEvaluationContext)
+        .forCreate(viewerContext, queryContext)
         .setField('stringField', 'huh')
         .enforceCreateAsync();
 
@@ -408,7 +405,6 @@ describe(EntityMutatorFactory, () => {
         spiedPrivacyPolicy.authorizeCreateAsync(
           viewerContext,
           anyOfClass(EntityTransactionalQueryContext),
-          privacyPolicyEvaluationContext,
           anyOfClass(TestEntity),
           anything()
         )
@@ -417,7 +413,6 @@ describe(EntityMutatorFactory, () => {
 
     it('executes triggers', async () => {
       const viewerContext = mock<ViewerContext>();
-      const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
       const queryContext = StubQueryContextProvider.getQueryContext();
 
       const id1 = uuidv4();
@@ -444,7 +439,7 @@ describe(EntityMutatorFactory, () => {
       const triggerSpies = setUpMutationTriggerSpies(mutationTriggers);
 
       await entityMutatorFactory
-        .forCreate(viewerContext, queryContext, privacyPolicyEvaluationContext)
+        .forCreate(viewerContext, queryContext)
         .setField('stringField', 'huh')
         .enforceCreateAsync();
 
@@ -465,7 +460,6 @@ describe(EntityMutatorFactory, () => {
 
     it('executes validators', async () => {
       const viewerContext = mock<ViewerContext>();
-      const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
       const queryContext = StubQueryContextProvider.getQueryContext();
 
       const id1 = uuidv4();
@@ -492,7 +486,7 @@ describe(EntityMutatorFactory, () => {
       const validatorSpies = setUpMutationValidatorSpies(mutationValidators);
 
       await entityMutatorFactory
-        .forCreate(viewerContext, queryContext, privacyPolicyEvaluationContext)
+        .forCreate(viewerContext, queryContext)
         .setField('stringField', 'huh')
         .enforceCreateAsync();
 
@@ -503,7 +497,6 @@ describe(EntityMutatorFactory, () => {
   describe('forUpdate', () => {
     it('updates entities', async () => {
       const viewerContext = mock<ViewerContext>();
-      const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
       const queryContext = StubQueryContextProvider.getQueryContext();
 
       const id1 = uuidv4();
@@ -528,13 +521,11 @@ describe(EntityMutatorFactory, () => {
       ]);
 
       const existingEntity = await enforceAsyncResult(
-        entityLoaderFactory
+        entityLoaderFactory.forLoad(viewerContext, queryContext).loadByIDAsync(id2)
-          .forLoad(viewerContext, queryContext, privacyPolicyEvaluationContext)
-          .resultLoader.loadByIDAsync(id2)
       );
 
       const updatedEntity = await entityMutatorFactory
-        .forUpdate(existingEntity, queryContext, privacyPolicyEvaluationContext)
+        .forUpdate(existingEntity, queryContext)
         .setField('stringField', 'huh2')
         .enforceUpdateAsync();
 
@@ -543,16 +534,13 @@ describe(EntityMutatorFactory, () => {
       expect(updatedEntity.getField('stringField')).toEqual('huh2');
 
       const reloadedEntity = await enforceAsyncResult(
-        entityLoaderFactory
+        entityLoaderFactory.forLoad(viewerContext, queryContext).loadByIDAsync(id2)
-          .forLoad(viewerContext, queryContext, privacyPolicyEvaluationContext)
-          .resultLoader.loadByIDAsync(id2)
       );
       expect(reloadedEntity.getAllFields()).toMatchObject(updatedEntity.getAllFields());
     });
 
     it('checks privacy', async () => {
       const viewerContext = mock<ViewerContext>();
-      const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
       const queryContext = StubQueryContextProvider.getQueryContext();
 
       const id1 = uuidv4();
@@ -580,13 +568,11 @@ describe(EntityMutatorFactory, () => {
       const spiedPrivacyPolicy = spy(privacyPolicy);
 
       const existingEntity = await enforceAsyncResult(
-        entityLoaderFactory
+        entityLoaderFactory.forLoad(viewerContext, queryContext).loadByIDAsync(id2)
-          .forLoad(viewerContext, queryContext, privacyPolicyEvaluationContext)
-          .resultLoader.loadByIDAsync(id2)
       );
 
       await entityMutatorFactory
-        .forUpdate(existingEntity, queryContext, privacyPolicyEvaluationContext)
+        .forUpdate(existingEntity, queryContext)
         .setField('stringField', 'huh2')
         .enforceUpdateAsync();
 
@@ -594,7 +580,6 @@ describe(EntityMutatorFactory, () => {
         spiedPrivacyPolicy.authorizeUpdateAsync(
           viewerContext,
           anyOfClass(EntityTransactionalQueryContext),
-          privacyPolicyEvaluationContext,
           anyOfClass(TestEntity),
           anything()
         )
@@ -603,7 +588,6 @@ describe(EntityMutatorFactory, () => {
 
     it('executes triggers', async () => {
       const viewerContext = mock<ViewerContext>();
-      const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
       const queryContext = StubQueryContextProvider.getQueryContext();
 
       const id1 = uuidv4();
@@ -631,13 +615,11 @@ describe(EntityMutatorFactory, () => {
       const triggerSpies = setUpMutationTriggerSpies(mutationTriggers);
 
       const existingEntity = await enforceAsyncResult(
-        entityLoaderFactory
+        entityLoaderFactory.forLoad(viewerContext, queryContext).loadByIDAsync(id2)
-          .forLoad(viewerContext, queryContext, privacyPolicyEvaluationContext)
-          .resultLoader.loadByIDAsync(id2)
       );
 
       await entityMutatorFactory
-        .forUpdate(existingEntity, queryContext, privacyPolicyEvaluationContext)
+        .forUpdate(existingEntity, queryContext)
         .setField('stringField', 'huh2')
         .enforceUpdateAsync();
 
@@ -657,7 +639,6 @@ describe(EntityMutatorFactory, () => {
     });
     it('executes validators', async () => {
       const viewerContext = mock<ViewerContext>();
-      const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
       const queryContext = StubQueryContextProvider.getQueryContext();
 
       const id1 = uuidv4();
@@ -685,13 +666,11 @@ describe(EntityMutatorFactory, () => {
       const validatorSpies = setUpMutationValidatorSpies(mutationValidators);
 
       const existingEntity = await enforceAsyncResult(
-        entityLoaderFactory
+        entityLoaderFactory.forLoad(viewerContext, queryContext).loadByIDAsync(id2)
-          .forLoad(viewerContext, queryContext, privacyPolicyEvaluationContext)
-          .resultLoader.loadByIDAsync(id2)
       );
 
       await entityMutatorFactory
-        .forUpdate(existingEntity, queryContext, privacyPolicyEvaluationContext)
+        .forUpdate(existingEntity, queryContext)
         .setField('stringField', 'huh2')
         .enforceUpdateAsync();
 
@@ -705,7 +684,6 @@ describe(EntityMutatorFactory, () => {
   describe('forDelete', () => {
     it('deletes entities', async () => {
       const viewerContext = mock<ViewerContext>();
-      const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
       const queryContext = StubQueryContextProvider.getQueryContext();
 
       const id1 = uuidv4();
@@ -721,28 +699,21 @@ describe(EntityMutatorFactory, () => {
       ]);
 
       const existingEntity = await enforceAsyncResult(
-        entityLoaderFactory
+        entityLoaderFactory.forLoad(viewerContext, queryContext).loadByIDAsync(id1)
-          .forLoad(viewerContext, queryContext, privacyPolicyEvaluationContext)
-          .resultLoader.loadByIDAsync(id1)
       );
       expect(existingEntity).toBeTruthy();
 
-      await entityMutatorFactory
+      await entityMutatorFactory.forDelete(existingEntity, queryContext).enforceDeleteAsync();
-        .forDelete(existingEntity, queryContext, privacyPolicyEvaluationContext)
-        .enforceDeleteAsync();
 
       await expect(
         enforceAsyncResult(
-          entityLoaderFactory
+          entityLoaderFactory.forLoad(viewerContext, queryContext).loadByIDAsync(id1)
-            .forLoad(viewerContext, queryContext, privacyPolicyEvaluationContext)
-            .resultLoader.loadByIDAsync(id1)
         )
       ).rejects.toBeInstanceOf(Error);
     });
 
     it('checks privacy', async () => {
       const viewerContext = mock<ViewerContext>();
-      const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
       const queryContext = StubQueryContextProvider.getQueryContext();
 
       const id1 = uuidv4();
@@ -761,20 +732,15 @@ describe(EntityMutatorFactory, () => {
       const spiedPrivacyPolicy = spy(privacyPolicy);
 
       const existingEntity = await enforceAsyncResult(
-        entityLoaderFactory
+        entityLoaderFactory.forLoad(viewerContext, queryContext).loadByIDAsync(id1)
-          .forLoad(viewerContext, queryContext, privacyPolicyEvaluationContext)
-          .resultLoader.loadByIDAsync(id1)
       );
 
-      await entityMutatorFactory
+      await entityMutatorFactory.forDelete(existingEntity, queryContext).enforceDeleteAsync();
-        .forDelete(existingEntity, queryContext, privacyPolicyEvaluationContext)
-        .enforceDeleteAsync();
 
       verify(
         spiedPrivacyPolicy.authorizeDeleteAsync(
           viewerContext,
           anyOfClass(EntityTransactionalQueryContext),
-          anything(),
           anyOfClass(TestEntity),
           anything()
         )
@@ -783,7 +749,6 @@ describe(EntityMutatorFactory, () => {
 
     it('executes triggers', async () => {
       const viewerContext = mock<ViewerContext>();
-      const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
       const queryContext = StubQueryContextProvider.getQueryContext();
 
       const id1 = uuidv4();
@@ -802,14 +767,10 @@ describe(EntityMutatorFactory, () => {
       const triggerSpies = setUpMutationTriggerSpies(mutationTriggers);
 
       const existingEntity = await enforceAsyncResult(
-        entityLoaderFactory
+        entityLoaderFactory.forLoad(viewerContext, queryContext).loadByIDAsync(id1)
-          .forLoad(viewerContext, queryContext, privacyPolicyEvaluationContext)
-          .resultLoader.loadByIDAsync(id1)
       );
 
-      await entityMutatorFactory
+      await entityMutatorFactory.forDelete(existingEntity, queryContext).enforceDeleteAsync();
-        .forDelete(existingEntity, queryContext, privacyPolicyEvaluationContext)
-        .enforceDeleteAsync();
 
       verifyTriggerCounts(
         viewerContext,
@@ -828,7 +789,6 @@ describe(EntityMutatorFactory, () => {
 
     it('does not execute validators', async () => {
       const viewerContext = mock<ViewerContext>();
-      const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
       const queryContext = StubQueryContextProvider.getQueryContext();
 
       const id1 = uuidv4();
@@ -847,14 +807,10 @@ describe(EntityMutatorFactory, () => {
       const validatorSpies = setUpMutationValidatorSpies(mutationValidators);
 
       const existingEntity = await enforceAsyncResult(
-        entityLoaderFactory
+        entityLoaderFactory.forLoad(viewerContext, queryContext).loadByIDAsync(id1)
-          .forLoad(viewerContext, queryContext, privacyPolicyEvaluationContext)
-          .resultLoader.loadByIDAsync(id1)
       );
 
-      await entityMutatorFactory
+      await entityMutatorFactory.forDelete(existingEntity, queryContext).enforceDeleteAsync();
-        .forDelete(existingEntity, queryContext, privacyPolicyEvaluationContext)
-        .enforceDeleteAsync();
 
       verifyValidatorCounts(viewerContext, validatorSpies, 0, {
         type: EntityMutationType.DELETE as any,
@@ -864,7 +820,6 @@ describe(EntityMutatorFactory, () => {
 
   it('invalidates cache for fields upon create', async () => {
     const viewerContext = mock<ViewerContext>();
-    const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
     const queryContext = StubQueryContextProvider.getQueryContext();
 
     const id1 = uuidv4();
@@ -881,29 +836,28 @@ describe(EntityMutatorFactory, () => {
 
     const entites1 = await enforceResultsAsync(
       entityLoaderFactory
-        .forLoad(viewerContext, queryContext, privacyPolicyEvaluationContext)
+        .forLoad(viewerContext, queryContext)
-        .resultLoader.loadManyByFieldEqualingAsync('stringField', 'huh')
+        .loadManyByFieldEqualingAsync('stringField', 'huh')
     );
     expect(entites1).toHaveLength(1);
 
     await enforceAsyncResult(
       entityMutatorFactory
-        .forCreate(viewerContext, queryContext, privacyPolicyEvaluationContext)
+        .forCreate(viewerContext, queryContext)
         .setField('stringField', 'huh')
         .createAsync()
     );
 
     const entities2 = await enforceResultsAsync(
       entityLoaderFactory
-        .forLoad(viewerContext, queryContext, privacyPolicyEvaluationContext)
+        .forLoad(viewerContext, queryContext)
-        .resultLoader.loadManyByFieldEqualingAsync('stringField', 'huh')
+        .loadManyByFieldEqualingAsync('stringField', 'huh')
     );
     expect(entities2).toHaveLength(2);
   });
 
   it('throws error when field not valid', async () => {
     const viewerContext = mock<ViewerContext>();
-    const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
     const queryContext = StubQueryContextProvider.getQueryContext();
     const id1 = uuidv4();
     const { entityMutatorFactory } = createEntityMutatorFactory([
@@ -919,19 +873,19 @@ describe(EntityMutatorFactory, () => {
 
     await expect(
       entityMutatorFactory
-        .forCreate(viewerContext, queryContext, privacyPolicyEvaluationContext)
+        .forCreate(viewerContext, queryContext)
         .setField('stringField', 10 as any)
         .createAsync()
     ).rejects.toThrowError('Entity field not valid: TestEntity (stringField = 10)');
 
     const createdEntity = await entityMutatorFactory
-      .forCreate(viewerContext, queryContext, privacyPolicyEvaluationContext)
+      .forCreate(viewerContext, queryContext)
       .setField('stringField', 'hello')
       .enforceCreateAsync();
 
     await expect(
       entityMutatorFactory
-        .forUpdate(createdEntity, queryContext, privacyPolicyEvaluationContext)
+        .forUpdate(createdEntity, queryContext)
         .setField('stringField', 10 as any)
         .updateAsync()
     ).rejects.toThrowError('Entity field not valid: TestEntity (stringField = 10)');
@@ -939,7 +893,6 @@ describe(EntityMutatorFactory, () => {
 
   it('returns error result when not authorized to create', async () => {
     const viewerContext = instance(mock(ViewerContext));
-    const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
     const queryContext = StubQueryContextProvider.getQueryContext();
     const privacyPolicyMock = mock(SimpleTestEntityPrivacyPolicy);
     const databaseAdapter = instance(mock<EntityDatabaseAdapter<SimpleTestFields>>());
@@ -963,7 +916,6 @@ describe(EntityMutatorFactory, () => {
       privacyPolicyMock.authorizeCreateAsync(
         viewerContext,
         anyOfClass(EntityTransactionalQueryContext),
-        anything(),
         anyOfClass(SimpleTestEntity),
         anything()
       )
@@ -972,7 +924,6 @@ describe(EntityMutatorFactory, () => {
       privacyPolicyMock.authorizeUpdateAsync(
         viewerContext,
         anyOfClass(EntityTransactionalQueryContext),
-        anything(),
         anyOfClass(SimpleTestEntity),
         anything()
       )
@@ -981,7 +932,6 @@ describe(EntityMutatorFactory, () => {
       privacyPolicyMock.authorizeDeleteAsync(
         viewerContext,
         anyOfClass(EntityTransactionalQueryContext),
-        anything(),
         anyOfClass(SimpleTestEntity),
         anything()
       )
@@ -999,7 +949,7 @@ describe(EntityMutatorFactory, () => {
     );
 
     const entityCreateResult = await entityMutatorFactory
-      .forCreate(viewerContext, queryContext, privacyPolicyEvaluationContext)
+      .forCreate(viewerContext, queryContext)
       .createAsync();
     expect(entityCreateResult.ok).toBe(false);
     expect(entityCreateResult.reason).toEqual(rejectionError);
@@ -1011,14 +961,14 @@ describe(EntityMutatorFactory, () => {
     });
 
     const entityUpdateResult = await entityMutatorFactory
-      .forUpdate(fakeEntity, queryContext, privacyPolicyEvaluationContext)
+      .forUpdate(fakeEntity, queryContext)
       .updateAsync();
     expect(entityUpdateResult.ok).toBe(false);
     expect(entityUpdateResult.reason).toEqual(rejectionError);
     expect(entityUpdateResult.value).toBe(undefined);
 
     const entityDeleteResult = await entityMutatorFactory
-      .forDelete(fakeEntity, queryContext, privacyPolicyEvaluationContext)
+      .forDelete(fakeEntity, queryContext)
       .deleteAsync();
     expect(entityDeleteResult.ok).toBe(false);
     expect(entityDeleteResult.reason).toEqual(rejectionError);
@@ -1027,7 +977,6 @@ describe(EntityMutatorFactory, () => {
 
   it('throws error when db adapter throws', async () => {
     const viewerContext = instance(mock(ViewerContext));
-    const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
     const queryContext = StubQueryContextProvider.getQueryContext();
     const privacyPolicy = instance(mock(SimpleTestEntityPrivacyPolicy));
     const databaseAdapterMock = mock<EntityDatabaseAdapter<SimpleTestFields>>();
@@ -1083,48 +1032,37 @@ describe(EntityMutatorFactory, () => {
     });
 
     await expect(
-      entityMutatorFactory
+      entityMutatorFactory.forCreate(viewerContext, queryContext).createAsync()
-        .forCreate(viewerContext, queryContext, privacyPolicyEvaluationContext)
-        .createAsync()
     ).rejects.toEqual(rejectionError);
     await expect(
-      entityMutatorFactory
+      entityMutatorFactory.forUpdate(fakeEntity, queryContext).updateAsync()
-        .forUpdate(fakeEntity, queryContext, privacyPolicyEvaluationContext)
-        .updateAsync()
     ).rejects.toEqual(rejectionError);
     await expect(
-      entityMutatorFactory
+      entityMutatorFactory.forDelete(fakeEntity, queryContext).deleteAsync()
-        .forDelete(fakeEntity, queryContext, privacyPolicyEvaluationContext)
-        .deleteAsync()
     ).rejects.toEqual(rejectionError);
   });
 
   it('records metrics appropriately', async () => {
     const viewerContext = mock<ViewerContext>();
-    const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
     const queryContext = StubQueryContextProvider.getQueryContext();
     const { entityMutatorFactory, metricsAdapter } = createEntityMutatorFactory([]);
     const spiedMetricsAdapter = spy(metricsAdapter);
 
     const newEntity = await enforceAsyncResult(
       entityMutatorFactory
-        .forCreate(viewerContext, queryContext, privacyPolicyEvaluationContext)
+        .forCreate(viewerContext, queryContext)
         .setField('stringField', 'huh')
         .createAsync()
     );
 
     await enforceAsyncResult(
       entityMutatorFactory
-        .forUpdate(newEntity, queryContext, privacyPolicyEvaluationContext)
+        .forUpdate(newEntity, queryContext)
         .setField('stringField', 'wat')
         .updateAsync()
     );
 
-    await enforceAsyncResult(
+    await enforceAsyncResult(entityMutatorFactory.forDelete(newEntity, queryContext).deleteAsync());
-      entityMutatorFactory
-        .forDelete(newEntity, queryContext, privacyPolicyEvaluationContext)
-        .deleteAsync()
-    );
 
     verify(
       spiedMetricsAdapter.logMutatorMutationEvent(

packages/entity/src/__tests__/EntityPrivacyPolicy-test.ts

@@ -8,7 +8,6 @@ import EntityPrivacyPolicy, {
   EntityPrivacyPolicyEvaluator,
   EntityAuthorizationAction,
   EntityPrivacyPolicyEvaluationMode,
-  EntityPrivacyPolicyEvaluationContext,
 } from '../EntityPrivacyPolicy';
 import { EntityQueryContext } from '../EntityQueryContext';
 import ViewerContext from '../ViewerContext';
@@ -167,7 +166,6 @@ class AlwaysThrowPrivacyPolicyRule extends PrivacyPolicyRule<
   evaluateAsync(
     _viewerContext: ViewerContext,
     _queryContext: EntityQueryContext,
-    _evaluationContext: EntityPrivacyPolicyEvaluationContext,
     _entity: BlahEntity
   ): Promise<RuleEvaluationResult> {
     throw new Error('WooHoo!');
@@ -247,19 +245,12 @@ describe(EntityPrivacyPolicy, () => {
     it('throws EntityNotAuthorizedError when deny', async () => {
       const viewerContext = instance(mock(ViewerContext));
       const queryContext = instance(mock(EntityQueryContext));
-      const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
       const metricsAdapterMock = mock<IEntityMetricsAdapter>();
       const metricsAdapter = instance(metricsAdapterMock);
       const entity = new BlahEntity(viewerContext, { id: '1' });
       const policy = new AlwaysDenyPolicy();
       await expect(
-        policy.authorizeCreateAsync(
+        policy.authorizeCreateAsync(viewerContext, queryContext, entity, metricsAdapter)
-          viewerContext,
-          queryContext,
-          privacyPolicyEvaluationContext,
-          entity,
-          metricsAdapter
-        )
       ).rejects.toBeInstanceOf(EntityNotAuthorizedError);
       verify(
         metricsAdapterMock.logAuthorizationEvent(
@@ -276,7 +267,6 @@ describe(EntityPrivacyPolicy, () => {
     it('returns entity when allowed', async () => {
       const viewerContext = instance(mock(ViewerContext));
       const queryContext = instance(mock(EntityQueryContext));
-      const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
       const metricsAdapterMock = mock<IEntityMetricsAdapter>();
       const metricsAdapter = instance(metricsAdapterMock);
       const entity = new BlahEntity(viewerContext, { id: '1' });
@@ -284,7 +274,6 @@ describe(EntityPrivacyPolicy, () => {
       const approvedEntity = await policy.authorizeCreateAsync(
         viewerContext,
         queryContext,
-        privacyPolicyEvaluationContext,
         entity,
         metricsAdapter
       );
@@ -304,19 +293,12 @@ describe(EntityPrivacyPolicy, () => {
     it('throws EntityNotAuthorizedError when all skipped', async () => {
       const viewerContext = instance(mock(ViewerContext));
       const queryContext = instance(mock(EntityQueryContext));
-      const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
       const metricsAdapterMock = mock<IEntityMetricsAdapter>();
       const metricsAdapter = instance(metricsAdapterMock);
       const entity = new BlahEntity(viewerContext, { id: '1' });
       const policy = new SkipAllPolicy();
       await expect(
-        policy.authorizeCreateAsync(
+        policy.authorizeCreateAsync(viewerContext, queryContext, entity, metricsAdapter)
-          viewerContext,
-          queryContext,
-          privacyPolicyEvaluationContext,
-          entity,
-          metricsAdapter
-        )
       ).rejects.toBeInstanceOf(EntityNotAuthorizedError);
       verify(
         metricsAdapterMock.logAuthorizationEvent(
@@ -333,19 +315,12 @@ describe(EntityPrivacyPolicy, () => {
     it('throws EntityNotAuthorizedError when empty policy', async () => {
       const viewerContext = instance(mock(ViewerContext));
       const queryContext = instance(mock(EntityQueryContext));
-      const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
       const metricsAdapterMock = mock<IEntityMetricsAdapter>();
       const metricsAdapter = instance(metricsAdapterMock);
       const entity = new BlahEntity(viewerContext, { id: '1' });
       const policy = new EmptyPolicy();
       await expect(
-        policy.authorizeCreateAsync(
+        policy.authorizeCreateAsync(viewerContext, queryContext, entity, metricsAdapter)
-          viewerContext,
-          queryContext,
-          privacyPolicyEvaluationContext,
-          entity,
-          metricsAdapter
-        )
       ).rejects.toBeInstanceOf(EntityNotAuthorizedError);
       verify(
         metricsAdapterMock.logAuthorizationEvent(
@@ -362,19 +337,12 @@ describe(EntityPrivacyPolicy, () => {
     it('throws when rule throws', async () => {
       const viewerContext = instance(mock(ViewerContext));
       const queryContext = instance(mock(EntityQueryContext));
-      const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
       const metricsAdapterMock = mock<IEntityMetricsAdapter>();
       const metricsAdapter = instance(metricsAdapterMock);
       const entity = new BlahEntity(viewerContext, { id: '1' });
       const policy = new ThrowAllPolicy();
       await expect(
-        policy.authorizeCreateAsync(
+        policy.authorizeCreateAsync(viewerContext, queryContext, entity, metricsAdapter)
-          viewerContext,
-          queryContext,
-          privacyPolicyEvaluationContext,
-          entity,
-          metricsAdapter
-        )
       ).rejects.toThrowError('WooHoo!');
       verify(metricsAdapterMock.logAuthorizationEvent(anything())).never();
     });
@@ -384,7 +352,6 @@ describe(EntityPrivacyPolicy, () => {
     it('returns entity when denied but calls denialHandler', async () => {
       const viewerContext = instance(mock(ViewerContext));
       const queryContext = instance(mock(EntityQueryContext));
-      const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
       const metricsAdapterMock = mock<IEntityMetricsAdapter>();
       const metricsAdapter = instance(metricsAdapterMock);
       const entity = new BlahEntity(viewerContext, { id: '1' });
@@ -395,7 +362,6 @@ describe(EntityPrivacyPolicy, () => {
       const approvedEntity = await policy.authorizeCreateAsync(
         viewerContext,
         queryContext,
-        privacyPolicyEvaluationContext,
         entity,
         metricsAdapter
       );
@@ -418,7 +384,6 @@ describe(EntityPrivacyPolicy, () => {
     it('does not log when not denied', async () => {
       const viewerContext = instance(mock(ViewerContext));
       const queryContext = instance(mock(EntityQueryContext));
-      const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
       const metricsAdapterMock = mock<IEntityMetricsAdapter>();
       const metricsAdapter = instance(metricsAdapterMock);
       const entity = new BlahEntity(viewerContext, { id: '1' });
@@ -429,7 +394,6 @@ describe(EntityPrivacyPolicy, () => {
       const approvedEntity = await policy.authorizeCreateAsync(
         viewerContext,
         queryContext,
-        privacyPolicyEvaluationContext,
         entity,
         metricsAdapter
       );
@@ -452,7 +416,6 @@ describe(EntityPrivacyPolicy, () => {
     it('passes through other errors', async () => {
       const viewerContext = instance(mock(ViewerContext));
       const queryContext = instance(mock(EntityQueryContext));
-      const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
       const metricsAdapterMock = mock<IEntityMetricsAdapter>();
       const metricsAdapter = instance(metricsAdapterMock);
       const entity = new BlahEntity(viewerContext, { id: '1' });
@@ -461,13 +424,7 @@ describe(EntityPrivacyPolicy, () => {
       const policySpy = spy(policy);
 
       await expect(
-        policy.authorizeCreateAsync(
+        policy.authorizeCreateAsync(viewerContext, queryContext, entity, metricsAdapter)
-          viewerContext,
-          queryContext,
-          privacyPolicyEvaluationContext,
-          entity,
-          metricsAdapter
-        )
       ).rejects.toThrowError('WooHoo!');
 
       verify(policySpy.denyHandler(anyOfClass(EntityNotAuthorizedError))).never();
@@ -480,7 +437,6 @@ describe(EntityPrivacyPolicy, () => {
     it('denies when denied but calls denialHandler', async () => {
       const viewerContext = instance(mock(ViewerContext));
       const queryContext = instance(mock(EntityQueryContext));
-      const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
       const metricsAdapterMock = mock<IEntityMetricsAdapter>();
       const metricsAdapter = instance(metricsAdapterMock);
       const entity = new BlahEntity(viewerContext, { id: '1' });
@@ -489,13 +445,7 @@ describe(EntityPrivacyPolicy, () => {
       const policySpy = spy(policy);
 
       await expect(
-        policy.authorizeCreateAsync(
+        policy.authorizeCreateAsync(viewerContext, queryContext, entity, metricsAdapter)
-          viewerContext,
-          queryContext,
-          privacyPolicyEvaluationContext,
-          entity,
-          metricsAdapter
-        )
       ).rejects.toBeInstanceOf(EntityNotAuthorizedError);
 
       verify(policySpy.denyHandler(anyOfClass(EntityNotAuthorizedError))).once();
@@ -515,7 +465,6 @@ describe(EntityPrivacyPolicy, () => {
     it('does not log when not denied', async () => {
       const viewerContext = instance(mock(ViewerContext));
       const queryContext = instance(mock(EntityQueryContext));
-      const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
       const metricsAdapterMock = mock<IEntityMetricsAdapter>();
       const metricsAdapter = instance(metricsAdapterMock);
       const entity = new BlahEntity(viewerContext, { id: '1' });
@@ -526,7 +475,6 @@ describe(EntityPrivacyPolicy, () => {
       const approvedEntity = await policy.authorizeCreateAsync(
         viewerContext,
         queryContext,
-        privacyPolicyEvaluationContext,
         entity,
         metricsAdapter
       );
@@ -549,7 +497,6 @@ describe(EntityPrivacyPolicy, () => {
     it('passes through other errors', async () => {
       const viewerContext = instance(mock(ViewerContext));
       const queryContext = instance(mock(EntityQueryContext));
-      const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
       const metricsAdapterMock = mock<IEntityMetricsAdapter>();
       const metricsAdapter = instance(metricsAdapterMock);
       const entity = new BlahEntity(viewerContext, { id: '1' });
@@ -558,13 +505,7 @@ describe(EntityPrivacyPolicy, () => {
       const policySpy = spy(policy);
 
       await expect(
-        policy.authorizeCreateAsync(
+        policy.authorizeCreateAsync(viewerContext, queryContext, entity, metricsAdapter)
-          viewerContext,
-          queryContext,
-          privacyPolicyEvaluationContext,
-          entity,
-          metricsAdapter
-        )
       ).rejects.toThrowError('WooHoo!');
 
       verify(policySpy.denyHandler(anyOfClass(EntityNotAuthorizedError))).never();

packages/entity/src/__tests__/EntitySecondaryCacheLoader-test.ts

@@ -79,7 +79,6 @@ describe(EntitySecondaryCacheLoader, () => {
           vc1,
           anyOfClass(EntityNonTransactionalQueryContext),
           anything(),
-          anything(),
           anything()
         )
       ).once();

packages/entity/src/__tests__/EntitySelfReferentialEdges-test.ts

@@ -98,25 +98,25 @@ describe('EntityEdgeDeletionBehavior.CASCADE_DELETE', () => {
       .enforceCreateAsync();
 
     await expect(
-      CategoryEntity.loader(viewerContext).loadByIDNullableAsync(parentCategory.getID())
+      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parentCategory.getID())
     ).resolves.not.toBeNull();
     await expect(
-      CategoryEntity.loader(viewerContext).loadByIDNullableAsync(subCategory.getID())
+      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(subCategory.getID())
     ).resolves.not.toBeNull();
     await expect(
-      CategoryEntity.loader(viewerContext).loadByIDNullableAsync(subSubCategory.getID())
+      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(subSubCategory.getID())
     ).resolves.not.toBeNull();
 
     await CategoryEntity.enforceDeleteAsync(parentCategory);
 
     await expect(
-      CategoryEntity.loader(viewerContext).loadByIDNullableAsync(parentCategory.getID())
+      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parentCategory.getID())
     ).resolves.toBeNull();
     await expect(
-      CategoryEntity.loader(viewerContext).loadByIDNullableAsync(subCategory.getID())
+      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(subCategory.getID())
     ).resolves.toBeNull();
     await expect(
-      CategoryEntity.loader(viewerContext).loadByIDNullableAsync(subSubCategory.getID())
+      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(subSubCategory.getID())
     ).resolves.toBeNull();
   });
 
@@ -137,10 +137,10 @@ describe('EntityEdgeDeletionBehavior.CASCADE_DELETE', () => {
     await CategoryEntity.enforceDeleteAsync(categoryA);
 
     await expect(
-      CategoryEntity.loader(viewerContext).loadByIDNullableAsync(categoryA.getID())
+      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(categoryA.getID())
     ).resolves.toBeNull();
     await expect(
-      CategoryEntity.loader(viewerContext).loadByIDNullableAsync(categoryB.getID())
+      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(categoryB.getID())
     ).resolves.toBeNull();
   });
 });
@@ -161,29 +161,29 @@ describe('EntityEdgeDeletionBehavior.SET_NULL', () => {
       .enforceCreateAsync();
 
     await expect(
-      CategoryEntity.loader(viewerContext).loadByIDNullableAsync(parentCategory.getID())
+      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parentCategory.getID())
     ).resolves.not.toBeNull();
     await expect(
-      CategoryEntity.loader(viewerContext).loadByIDNullableAsync(subCategory.getID())
+      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(subCategory.getID())
     ).resolves.not.toBeNull();
     await expect(
-      CategoryEntity.loader(viewerContext).loadByIDNullableAsync(subSubCategory.getID())
+      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(subSubCategory.getID())
     ).resolves.not.toBeNull();
 
     await CategoryEntity.enforceDeleteAsync(parentCategory);
 
     await expect(
-      CategoryEntity.loader(viewerContext).loadByIDNullableAsync(parentCategory.getID())
+      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parentCategory.getID())
     ).resolves.toBeNull();
 
-    const loadedSubCategory = await CategoryEntity.loader(viewerContext).loadByIDAsync(
+    const loadedSubCategory = await CategoryEntity.loader(viewerContext)
-      subCategory.getID()
+      .enforcing()
-    );
+      .loadByIDAsync(subCategory.getID());
     expect(loadedSubCategory.getField('parent_category_id')).toBeNull();
 
-    const loadedSubSubCategory = await CategoryEntity.loader(viewerContext).loadByIDAsync(
+    const loadedSubSubCategory = await CategoryEntity.loader(viewerContext)
-      subSubCategory.getID()
+      .enforcing()
-    );
+      .loadByIDAsync(subSubCategory.getID());
     expect(loadedSubSubCategory.getField('parent_category_id')).not.toBeNull();
   });
 
@@ -203,9 +203,9 @@ describe('EntityEdgeDeletionBehavior.SET_NULL', () => {
 
     await CategoryEntity.enforceDeleteAsync(categoryA);
 
-    const loadedCategoryB = await CategoryEntity.loader(viewerContext).loadByIDAsync(
+    const loadedCategoryB = await CategoryEntity.loader(viewerContext)
-      categoryB.getID()
+      .enforcing()
-    );
+      .loadByIDAsync(categoryB.getID());
     expect(loadedCategoryB.getField('parent_category_id')).toBeNull();
   });
 });
@@ -228,19 +228,17 @@ describe('EntityEdgeDeletionBehavior.CASCADE_DELETE_INVALIDATE_CACHE', () => {
       .enforceCreateAsync();
 
     await expect(
-      CategoryEntity.loader(viewerContext).loadByIDNullableAsync(parentCategory.getID())
+      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parentCategory.getID())
     ).resolves.not.toBeNull();
     await expect(
-      CategoryEntity.loader(viewerContext).loadByFieldEqualingAsync(
+      CategoryEntity.loader(viewerContext)
-        'parent_category_id',
+        .enforcing()
-        parentCategory.getID()
+        .loadByFieldEqualingAsync('parent_category_id', parentCategory.getID())
-      )
     ).resolves.not.toBeNull();
     await expect(
-      CategoryEntity.loader(viewerContext).loadByFieldEqualingAsync(
+      CategoryEntity.loader(viewerContext)
-        'parent_category_id',
+        .enforcing()
-        subCategory.getID()
+        .loadByFieldEqualingAsync('parent_category_id', subCategory.getID())
-      )
     ).resolves.not.toBeNull();
 
     const categoryCacheAdapter = viewerContext.getViewerScopedEntityCompanionForClass(
@@ -273,13 +271,13 @@ describe('EntityEdgeDeletionBehavior.CASCADE_DELETE_INVALIDATE_CACHE', () => {
     expect(subSubCategoryCachedAfter.get(subCategory.getID())?.status).toEqual(CacheStatus.MISS);
 
     await expect(
-      CategoryEntity.loader(viewerContext).loadByIDNullableAsync(parentCategory.getID())
+      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(parentCategory.getID())
     ).resolves.toBeNull();
     await expect(
-      CategoryEntity.loader(viewerContext).loadByIDNullableAsync(subCategory.getID())
+      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(subCategory.getID())
     ).resolves.not.toBeNull();
     await expect(
-      CategoryEntity.loader(viewerContext).loadByIDNullableAsync(subSubCategory.getID())
+      CategoryEntity.loader(viewerContext).enforcing().loadByIDNullableAsync(subSubCategory.getID())
     ).resolves.not.toBeNull();
   });
 
@@ -300,16 +298,14 @@ describe('EntityEdgeDeletionBehavior.CASCADE_DELETE_INVALIDATE_CACHE', () => {
       .enforceUpdateAsync();
 
     await expect(
-      CategoryEntity.loader(viewerContext).loadByFieldEqualingAsync(
+      CategoryEntity.loader(viewerContext)
-        'parent_category_id',
+        .enforcing()
-        categoryA.getID()
+        .loadByFieldEqualingAsync('parent_category_id', categoryA.getID())
-      )
     ).resolves.not.toBeNull();
     await expect(
-      CategoryEntity.loader(viewerContext).loadByFieldEqualingAsync(
+      CategoryEntity.loader(viewerContext)
-        'parent_category_id',
+        .enforcing()
-        categoryB.getID()
+        .loadByFieldEqualingAsync('parent_category_id', categoryB.getID())
-      )
     ).resolves.not.toBeNull();
 
     const categoryCacheAdapter = viewerContext.getViewerScopedEntityCompanionForClass(

packages/entity/src/__tests__/ViewerScopedEntityLoaderFactory-test.ts

@@ -1,7 +1,6 @@
 import { mock, verify, instance } from 'ts-mockito';
 
 import EntityLoaderFactory from '../EntityLoaderFactory';
-import { EntityPrivacyPolicyEvaluationContext } from '../EntityPrivacyPolicy';
 import { EntityQueryContext } from '../EntityQueryContext';
 import ViewerContext from '../ViewerContext';
 import ViewerScopedEntityLoaderFactory from '../ViewerScopedEntityLoaderFactory';
@@ -9,7 +8,6 @@ import ViewerScopedEntityLoaderFactory from '../ViewerScopedEntityLoaderFactory'
 describe(ViewerScopedEntityLoaderFactory, () => {
   it('correctly scopes viewer to entity loads', async () => {
     const viewerContext = instance(mock(ViewerContext));
-    const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
     const queryContext = instance(mock(EntityQueryContext));
     const baseLoader = mock<EntityLoaderFactory<any, any, any, any, any, any>>(EntityLoaderFactory);
     const baseLoaderInstance = instance(baseLoader);
@@ -23,8 +21,8 @@ describe(ViewerScopedEntityLoaderFactory, () => {
       any
     >(baseLoaderInstance, viewerContext);
 
-    viewerScopedEntityLoader.forLoad(queryContext, privacyPolicyEvaluationContext);
+    viewerScopedEntityLoader.forLoad(queryContext);
 
-    verify(baseLoader.forLoad(viewerContext, queryContext, privacyPolicyEvaluationContext)).once();
+    verify(baseLoader.forLoad(viewerContext, queryContext)).once();
   });
 });

packages/entity/src/__tests__/ViewerScopedEntityMutatorFactory-test.ts

@@ -1,7 +1,6 @@
 import { mock, instance, verify } from 'ts-mockito';
 
 import EntityMutatorFactory from '../EntityMutatorFactory';
-import { EntityPrivacyPolicyEvaluationContext } from '../EntityPrivacyPolicy';
 import { EntityQueryContext } from '../EntityQueryContext';
 import ViewerContext from '../ViewerContext';
 import ViewerScopedEntityMutatorFactory from '../ViewerScopedEntityMutatorFactory';
@@ -10,7 +9,6 @@ import TestEntity, { TestFields, TestEntityPrivacyPolicy } from '../testfixtures
 describe(ViewerScopedEntityMutatorFactory, () => {
   it('correctly scopes viewer to entity mutations', async () => {
     const viewerContext = instance(mock(ViewerContext));
-    const privacyPolicyEvaluationContext = instance(mock<EntityPrivacyPolicyEvaluationContext>());
     const queryContext = instance(mock(EntityQueryContext));
     const baseMutatorFactory =
       mock<
@@ -27,10 +25,8 @@ describe(ViewerScopedEntityMutatorFactory, () => {
       keyof TestFields
     >(baseMutatorFactoryInstance, viewerContext);
 
-    viewerScopedEntityLoader.forCreate(queryContext, privacyPolicyEvaluationContext);
+    viewerScopedEntityLoader.forCreate(queryContext);
 
-    verify(
+    verify(baseMutatorFactory.forCreate(viewerContext, queryContext)).once();
-      baseMutatorFactory.forCreate(viewerContext, queryContext, privacyPolicyEvaluationContext)
-    ).once();
   });
 });

packages/entity/src/__tests__/cases/TwoEntitySameTableDisjointRows-test.ts

@@ -28,16 +28,17 @@ describe('Two entities backed by the same table', () => {
     expect(two).toBeInstanceOf(TwoTestEntity);
 
     await expect(
-      TwoTestEntity.loader(viewerContext).loadByIDAsync(one.getID())
+      TwoTestEntity.loader(viewerContext).enforcing().loadByIDAsync(one.getID())
     ).rejects.toThrowError('TwoTestEntity must be instantiated with two data');
 
     await expect(
-      OneTestEntity.loader(viewerContext).loadByIDAsync(two.getID())
+      OneTestEntity.loader(viewerContext).enforcing().loadByIDAsync(two.getID())
     ).rejects.toThrowError('OneTestEntity must be instantiated with one data');
 
-    const manyResults = await OneTestEntity.loader(
+    const manyResults = await OneTestEntity.loader(viewerContext).loadManyByFieldEqualingAsync(
-      viewerContext
+      'common_other_field',
-    ).resultLoader.loadManyByFieldEqualingAsync('common_other_field', 'wat');
+      'wat'
+    );
     const successfulManyResults = successfulResults(manyResults);
     const failedManyResults = failedResults(manyResults);
 
@@ -51,7 +52,7 @@ describe('Two entities backed by the same table', () => {
 
     const fieldEqualityConjunctionResults = await OneTestEntity.loader(
       viewerContext
-    ).resultLoader.loadManyByFieldEqualityConjunctionAsync([
+    ).loadManyByFieldEqualityConjunctionAsync([
       {
         fieldName: 'common_other_field',
         fieldValue: 'wat',

packages/entity/src/__tests__/cases/TwoEntitySameTableOverlappingRows-test.ts

@@ -18,7 +18,7 @@ describe('Two entities backed by the same table', () => {
     expect(entity1).toBeInstanceOf(OneTestEntity);
 
     const entity2 = await TwoTestEntity.loader(viewerContext)
-
+      .enforcing()
       .loadByIDAsync(entity1.getID());
     expect(entity2).toBeInstanceOf(TwoTestEntity);
 
@@ -33,7 +33,7 @@ describe('Two entities backed by the same table', () => {
     });
 
     const loaded1 = await OneTestEntity.loader(viewerContext)
-
+      .enforcing()
       .loadByIDAsync(entity1.getID());
     expect(loaded1.getAllFields()).toMatchObject({
       id: updated2.getID(),
@@ -51,7 +51,7 @@ describe('Two entities backed by the same table', () => {
       .enforceCreateAsync();
 
     const loadedEntity = await TwoTestEntity.loader(viewerContext)
-
+      .enforcing()
       .loadByFieldEqualingAsync('other_field', 'huh');
     expect(loadedEntity?.getAllFields()).toMatchObject({
       id: entity.getID(),
@@ -60,12 +60,12 @@ describe('Two entities backed by the same table', () => {
     });
 
     const loaded1 = await OneTestEntity.loader(viewerContext)
-
+      .enforcing()
       .loadByIDAsync(entity.getID());
     await OneTestEntity.updater(loaded1).setField('fake_field', 'world').enforceUpdateAsync();
 
     const loaded2 = await TwoTestEntity.loader(viewerContext)
-
+      .enforcing()
       .loadByFieldEqualingAsync('other_field', 'huh');
     expect(loaded2?.getAllFields()).toMatchObject({
       id: entity.getID(),
@@ -74,7 +74,7 @@ describe('Two entities backed by the same table', () => {
     });
 
     const loaded22 = await TwoTestEntity.loader(viewerContext)
-
+      .enforcing()
       .loadByFieldEqualingAsync('fake_field', 'world');
     expect(loaded22?.getAllFields()).toMatchObject({
       id: entity.getID(),

packages/entity/src/index.ts

@@ -4,10 +4,8 @@
  * @module @expo/entity
  */
 
-export { default as ComposedEntityCacheAdapter } from './ComposedEntityCacheAdapter';
-export { default as ComposedSecondaryEntityCache } from './ComposedSecondaryEntityCache';
 export { default as GenericSecondaryEntityCache } from './GenericSecondaryEntityCache';
-export { default as EntityResultLoader } from './EntityResultLoader';
+export { default as EnforcingEntityLoader } from './EnforcingEntityLoader';
 export { default as Entity } from './Entity';
 export * from './Entity';
 export { default as EntityAssociationLoader } from './EntityAssociationLoader';

packages/entity/src/rules/AlwaysAllowPrivacyPolicyRule.ts

@@ -1,4 +1,3 @@
-import { EntityPrivacyPolicyEvaluationContext } from '../EntityPrivacyPolicy';
 import { EntityQueryContext } from '../EntityQueryContext';
 import ReadonlyEntity from '../ReadonlyEntity';
 import ViewerContext from '../ViewerContext';
@@ -17,7 +16,6 @@ export default class AlwaysAllowPrivacyPolicyRule<
   async evaluateAsync(
     _viewerContext: TViewerContext,
     _queryContext: EntityQueryContext,
-    _evaluationContext: EntityPrivacyPolicyEvaluationContext,
     _entity: TEntity
   ): Promise<RuleEvaluationResult> {
     return RuleEvaluationResult.ALLOW;

packages/entity/src/rules/AlwaysDenyPrivacyPolicyRule.ts

@@ -1,4 +1,3 @@
-import { EntityPrivacyPolicyEvaluationContext } from '../EntityPrivacyPolicy';
 import { EntityQueryContext } from '../EntityQueryContext';
 import ReadonlyEntity from '../ReadonlyEntity';
 import ViewerContext from '../ViewerContext';
@@ -17,7 +16,6 @@ export default class AlwaysDenyPrivacyPolicyRule<
   async evaluateAsync(
     _viewerContext: TViewerContext,
     _queryContext: EntityQueryContext,
-    _evaluationContext: EntityPrivacyPolicyEvaluationContext,
     _entity: TEntity
   ): Promise<RuleEvaluationResult> {
     return RuleEvaluationResult.DENY;

packages/entity/src/rules/AlwaysSkipPrivacyPolicyRule.ts

@@ -1,4 +1,3 @@
-import { EntityPrivacyPolicyEvaluationContext } from '../EntityPrivacyPolicy';
 import { EntityQueryContext } from '../EntityQueryContext';
 import ReadonlyEntity from '../ReadonlyEntity';
 import ViewerContext from '../ViewerContext';
@@ -17,7 +16,6 @@ export default class AlwaysSkipPrivacyPolicyRule<
   async evaluateAsync(
     _viewerContext: TViewerContext,
     _queryContext: EntityQueryContext,
-    _evaluationContext: EntityPrivacyPolicyEvaluationContext,
     _entity: TEntity
   ): Promise<RuleEvaluationResult> {
     return RuleEvaluationResult.SKIP;

packages/entity/src/rules/PrivacyPolicyRule.ts

@@ -1,4 +1,3 @@
-import { EntityPrivacyPolicyEvaluationContext } from '../EntityPrivacyPolicy';
 import { EntityQueryContext } from '../EntityQueryContext';
 import ReadonlyEntity from '../ReadonlyEntity';
 import ViewerContext from '../ViewerContext';
@@ -46,7 +45,6 @@ export default abstract class PrivacyPolicyRule<
   abstract evaluateAsync(
     viewerContext: TViewerContext,
     queryContext: EntityQueryContext,
-    evaluationContext: EntityPrivacyPolicyEvaluationContext,
     entity: TEntity
   ): Promise<RuleEvaluationResult>;
 }

packages/entity/src/rules/__tests__/AlwaysAllowPrivacyPolicyRule-test.ts

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

packages/entity/src/rules/__tests__/AlwaysDenyPrivacyPolicyRule-test.ts

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

packages/entity/src/rules/__tests__/AlwaysSkipPrivacyPolicyRule-test.ts

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

packages/entity/src/utils/testing/PrivacyPolicyRuleTestUtils.ts

@@ -1,4 +1,3 @@
-import { EntityPrivacyPolicyEvaluationContext } from '../../EntityPrivacyPolicy';
 import { EntityQueryContext } from '../../EntityQueryContext';
 import ReadonlyEntity from '../../ReadonlyEntity';
 import ViewerContext from '../../ViewerContext';
@@ -13,7 +12,6 @@ export interface Case<
 > {
   viewerContext: TViewerContext;
   queryContext: EntityQueryContext;
-  evaluationContext: EntityPrivacyPolicyEvaluationContext;
   entity: TEntity;
 }
 
@@ -50,11 +48,9 @@ export const describePrivacyPolicyRuleWithAsyncTestCase = <
     if (allowCases && allowCases.size > 0) {
       describe('allow cases', () => {
         test.each(Array.from(allowCases.keys()))('%p', async (caseKey) => {
-          const { viewerContext, queryContext, evaluationContext, entity } = await allowCases.get(
+          const { viewerContext, queryContext, entity } = await allowCases.get(caseKey)!();
-            caseKey
-          )!();
           await expect(
-            privacyPolicyRule.evaluateAsync(viewerContext, queryContext, evaluationContext, entity)
+            privacyPolicyRule.evaluateAsync(viewerContext, queryContext, entity)
           ).resolves.toEqual(RuleEvaluationResult.ALLOW);
         });
       });
@@ -63,11 +59,9 @@ export const describePrivacyPolicyRuleWithAsyncTestCase = <
     if (skipCases && skipCases.size > 0) {
       describe('skip cases', () => {
         test.each(Array.from(skipCases.keys()))('%p', async (caseKey) => {
-          const { viewerContext, queryContext, evaluationContext, entity } = await skipCases.get(
+          const { viewerContext, queryContext, entity } = await skipCases.get(caseKey)!();
-            caseKey
-          )!();
           await expect(
-            privacyPolicyRule.evaluateAsync(viewerContext, queryContext, evaluationContext, entity)
+            privacyPolicyRule.evaluateAsync(viewerContext, queryContext, entity)
           ).resolves.toEqual(RuleEvaluationResult.SKIP);
         });
       });
@@ -76,11 +70,9 @@ export const describePrivacyPolicyRuleWithAsyncTestCase = <
     if (denyCases && denyCases.size > 0) {
       describe('deny cases', () => {
         test.each(Array.from(denyCases.keys()))('%p', async (caseKey) => {
-          const { viewerContext, queryContext, evaluationContext, entity } = await denyCases.get(
+          const { viewerContext, queryContext, entity } = await denyCases.get(caseKey)!();
-            caseKey
-          )!();
           await expect(
-            privacyPolicyRule.evaluateAsync(viewerContext, queryContext, evaluationContext, entity)
+            privacyPolicyRule.evaluateAsync(viewerContext, queryContext, entity)
           ).resolves.toEqual(RuleEvaluationResult.DENY);
         });
       });

yarn.lock

@@ -508,35 +508,32 @@
     minimist "^1.2.0"
 
 "@expo/entity-cache-adapter-local-memory@file:packages/entity-cache-adapter-local-memory":
-  version "0.25.2"
+  version "0.23.0"
   dependencies:
-    lru-cache "^6.0.0"
+    lru-cache "^7.3.1"
 
 "@expo/entity-cache-adapter-redis@file:packages/entity-cache-adapter-redis":
-  version "0.25.2"
+  version "0.23.0"
   dependencies:
     ioredis "^4.27.3"
 
 "@expo/entity-database-adapter-knex@file:packages/entity-database-adapter-knex":
-  version "0.25.2"
+  version "0.23.0"
   dependencies:
     knex "^1.0.2"
 
 "@expo/entity-ip-address-field@file:packages/entity-ip-address-field":
-  version "0.25.2"
+  version "0.23.0"
   dependencies:
     ip-address "^8.1.0"
 
-"@expo/entity-secondary-cache-local-memory@file:packages/entity-secondary-cache-local-memory":
-  version "0.25.2"
-
 "@expo/entity-secondary-cache-redis@file:packages/entity-secondary-cache-redis":
-  version "0.25.2"
+  version "0.23.0"
   dependencies:
     ioredis "^4.17.3"
 
 "@expo/entity@file:packages/entity":
-  version "0.25.2"
+  version "0.23.0"
   dependencies:
     "@expo/results" "^1.0.0"
     dataloader "^2.0.0"
@@ -6578,6 +6575,11 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
+lru-cache@^7.3.1:
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.3.1.tgz#7702e80694ec2bf19865567a469f2b081fcf53f5"
+  integrity sha512-nX1x4qUrKqwbIAhv4s9et4FIUVzNOpeY07bsjGUy8gwJrXH/wScImSQqXErmo/b2jZY2r0mohbLA9zVj7u1cNw==
+
 lunr@^2.3.9:
   version "2.3.9"
   resolved "https://registry.yarnpkg.com/lunr/-/lunr-2.3.9.tgz#18b123142832337dd6e964df1a5a7707b25d35e1"