[entity][entity-cache-adapter-redis] move transformer responsibility

CHANGELOG.md

@@ -3,42 +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.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)
-
-
-### Features
-
-* add local memory cache package  ([#158](https://github.com/expo/entity/issues/158)) ([85d3575](https://github.com/expo/entity/commit/85d35752fa0919a62efb776a762a6829e83ca7af))
-
-### Chores
-
-* Refactor cachers to use an abstract class and interface  ([#157](https://github.com/expo/entity/pull/157)) 
-
-
-
-
-
-# [0.23.0](https://github.com/expo/entity/compare/v0.22.0...v0.23.0) (2022-02-09)
-
-### Breaking changes
-
-* Move data transforming responsibilities to the CacheAdapter instead of the ReadThroughEntityCache. Affects any classes extending the EntityCacheAdapter and relying on the transformation behavior of the ReadThroughEntityCache. ([#153](https://github.com/expo/entity/pull/153))
-
-
-
-
 # [0.22.0](https://github.com/expo/entity/compare/v0.21.0...v0.22.0) (2022-02-04)
 
 

lerna.json

@@ -4,5 +4,5 @@
   ],
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "0.25.0"
+  "version": "0.22.0"
 }

package.json

@@ -18,7 +18,6 @@
   "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",
@@ -44,11 +43,9 @@
   },
   "dependencies": {
     "@expo/entity": "file:packages/entity",
-    "@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-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"
   }
 }

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

@@ -1,22 +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.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)
-
-
-### Features
-
-* add local memory cache package  ([#158](https://github.com/expo/entity/issues/158)) ([85d3575](https://github.com/expo/entity/commit/85d35752fa0919a62efb776a762a6829e83ca7af))

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

@@ -1,46 +0,0 @@
-# `@expo/entity-cache-adapter-local-memory`
-
-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.
-
-[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-box invalidation is not possible. Do not use this cache
-if you have the following use cases:
-
-- The objects stored have high mutability
-- Reading a stale object from the cache is not acceptable in your application
-- 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
-- You have a low TTL setting in your cache
-
-## Usage
-
-During `EntityCompanionProvider` instantiation:
-
-```typescript
-export const createDefaultEntityCompanionProvider = (
-  metricsAdapter: IEntityMetricsAdapter = new NoOpEntityMetricsAdapter()
-): EntityCompanionProvider => {
-  return new EntityCompanionProvider(
-    metricsAdapter,
-    {
-      ...
-    },
-    {
-      ['local-memory']: {
-        cacheAdapterProvider: new LocalMemoryCacheAdapterProvider.getProvider(),
-      },
-    }
-  );
-};
-
-```

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

@@ -1,38 +0,0 @@
-{
-  "name": "@expo/entity-cache-adapter-local-memory",
-  "version": "0.25.0",
-  "description": "Cross-request local memory cache adapter 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",
-    "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": "*"
-  },
-  "dependencies": {
-    "lru-cache": "^7.3.1"
-  },
-  "devDependencies": {
-    "@expo/entity": "^0.25.0"
-  }
-}

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

@@ -1,154 +0,0 @@
-import { CacheLoadResult, CacheStatus, IEntityGenericCacher } from '@expo/entity';
-import LRUCache from 'lru-cache';
-
-// Sentinel value we store in local memory to negatively cache a database miss.
-// The sentinel value is distinct from any (positively) cached value.
-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>) {}
-
-  static createLRUCache<TFields>(
-    options: { maxSize?: number; ttlSeconds?: number } = {}
-  ): LocalMemoryCache<TFields> {
-    const DEFAULT_LRU_CACHE_MAX_AGE_SECONDS = 10;
-    const DEFAULT_LRU_CACHE_SIZE = 10000;
-    const maxAgeSeconds = options.ttlSeconds ?? DEFAULT_LRU_CACHE_MAX_AGE_SECONDS;
-    const lruCacheOptions: LRUCacheOptionsV7<string, TFields> = {
-      max: options.maxSize ?? DEFAULT_LRU_CACHE_SIZE,
-      sizeCalculation: (value: LocalMemoryCacheValue<TFields>) =>
-        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> {
-    return new LRUCache<string, LocalMemoryCacheValue<TFields>>({
-      max: 0,
-      maxAge: -1,
-    });
-  }
-
-  public async loadManyAsync(
-    keys: readonly string[]
-  ): Promise<ReadonlyMap<string, CacheLoadResult<TFields>>> {
-    const cacheResults = new Map<string, CacheLoadResult<TFields>>();
-    for (const key of keys) {
-      const cacheResult = this.localMemoryCache.get(key);
-      if (cacheResult === DOES_NOT_EXIST_LOCAL_MEMORY_CACHE) {
-        cacheResults.set(key, {
-          status: CacheStatus.NEGATIVE,
-        });
-      } else if (cacheResult) {
-        cacheResults.set(key, {
-          status: CacheStatus.HIT,
-          item: cacheResult as unknown as TFields,
-        });
-      } else {
-        cacheResults.set(key, {
-          status: CacheStatus.MISS,
-        });
-      }
-    }
-    return cacheResults;
-  }
-
-  public async cacheManyAsync(objectMap: ReadonlyMap<string, Readonly<TFields>>): Promise<void> {
-    for (const [key, item] of objectMap) {
-      this.localMemoryCache.set(key, item);
-    }
-  }
-
-  public async cacheDBMissesAsync(keys: readonly string[]): Promise<void> {
-    for (const key of keys) {
-      this.localMemoryCache.set(key, DOES_NOT_EXIST_LOCAL_MEMORY_CACHE);
-    }
-  }
-
-  public async invalidateManyAsync(keys: readonly string[]): Promise<void> {
-    for (const key of keys) {
-      this.localMemoryCache.del(key);
-    }
-  }
-
-  public makeCacheKey(parts: string[]): string {
-    const delimiter = ':';
-    const escapedParts = parts.map((part) =>
-      part.replace('\\', '\\\\').replace(delimiter, `\\${delimiter}`)
-    );
-    return escapedParts.join(delimiter);
-  }
-}

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

@@ -1,80 +0,0 @@
-import { EntityCacheAdapter, CacheLoadResult, EntityConfiguration, mapKeys } from '@expo/entity';
-import invariant from 'invariant';
-
-import GenericLocalMemoryCacher, { LocalMemoryCache } from './GenericLocalMemoryCacher';
-
-export default class LocalMemoryCacheAdapter<TFields> extends EntityCacheAdapter<TFields> {
-  private readonly genericLocalMemoryCacher: GenericLocalMemoryCacher<TFields>;
-
-  constructor(
-    entityConfiguration: EntityConfiguration<TFields>,
-    localMemoryCache: LocalMemoryCache<TFields>
-  ) {
-    super(entityConfiguration);
-    this.genericLocalMemoryCacher = new GenericLocalMemoryCacher(localMemoryCache);
-  }
-
-  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 = await this.genericLocalMemoryCacher.loadManyAsync(
-      Array.from(localMemoryCacheKeyToFieldValueMapping.keys())
-    );
-
-    return mapKeys(cacheResults, (cacheKey) => {
-      const fieldValue = localMemoryCacheKeyToFieldValueMapping.get(cacheKey);
-      invariant(
-        fieldValue !== undefined,
-        'Unspecified cache key %s returned from generic local memory cacher',
-        cacheKey
-      );
-      return fieldValue;
-    });
-  }
-
-  public async cacheManyAsync<N extends keyof TFields>(
-    fieldName: N,
-    objectMap: ReadonlyMap<NonNullable<TFields[N]>, Readonly<TFields>>
-  ): Promise<void> {
-    await this.genericLocalMemoryCacher.cacheManyAsync(
-      mapKeys(objectMap, (fieldValue) => this.makeCacheKey(fieldName, fieldValue))
-    );
-  }
-
-  public async cacheDBMissesAsync<N extends keyof TFields>(
-    fieldName: N,
-    fieldValues: readonly NonNullable<TFields[N]>[]
-  ): Promise<void> {
-    await this.genericLocalMemoryCacher.cacheDBMissesAsync(
-      fieldValues.map((fieldValue) => this.makeCacheKey(fieldName, fieldValue))
-    );
-  }
-
-  public async invalidateManyAsync<N extends keyof TFields>(
-    fieldName: N,
-    fieldValues: readonly NonNullable<TFields[N]>[]
-  ): Promise<void> {
-    await this.genericLocalMemoryCacher.invalidateManyAsync(
-      fieldValues.map((fieldValue) => this.makeCacheKey(fieldName, fieldValue))
-    );
-  }
-
-  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),
-    ];
-    return this.genericLocalMemoryCacher.makeCacheKey(parts);
-  }
-}

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

@@ -1,45 +0,0 @@
-import {
-  computeIfAbsent,
-  EntityCacheAdapter,
-  EntityConfiguration,
-  IEntityCacheAdapterProvider,
-} from '@expo/entity';
-
-import GenericLocalMemoryCacher, { LocalMemoryCache } from './GenericLocalMemoryCacher';
-import LocalMemoryCacheAdapter from './LocalMemoryCacheAdapter';
-
-export default class LocalMemoryCacheAdapterProvider implements IEntityCacheAdapterProvider {
-  // local memory cache adapters should be shared/reused across requests
-  static localMemoryCacheAdapterMap = new Map<string, LocalMemoryCacheAdapter<any>>();
-
-  static getNoOpProvider(): IEntityCacheAdapterProvider {
-    return new LocalMemoryCacheAdapterProvider(<TFields>() =>
-      GenericLocalMemoryCacher.createNoOpCache<TFields>()
-    );
-  }
-
-  static getProvider(
-    options: { maxSize?: number; ttlSeconds?: number } = {}
-  ): IEntityCacheAdapterProvider {
-    return new LocalMemoryCacheAdapterProvider(<TFields>() =>
-      GenericLocalMemoryCacher.createLRUCache<TFields>(options)
-    );
-  }
-
-  private constructor(
-    private readonly localMemoryCacheCreator: <TFields>() => LocalMemoryCache<TFields>
-  ) {}
-
-  public getCacheAdapter<TFields>(
-    entityConfiguration: EntityConfiguration<TFields>
-  ): EntityCacheAdapter<TFields> {
-    return computeIfAbsent(
-      LocalMemoryCacheAdapterProvider.localMemoryCacheAdapterMap,
-      entityConfiguration.tableName,
-      () => {
-        const localMemoryCache = this.localMemoryCacheCreator<TFields>();
-        return new LocalMemoryCacheAdapter(entityConfiguration, localMemoryCache);
-      }
-    );
-  }
-}

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

@@ -1,174 +0,0 @@
-import { CacheStatus, ViewerContext } from '@expo/entity';
-import { v4 as uuidv4 } from 'uuid';
-
-import GenericLocalMemoryCacher from '../GenericLocalMemoryCacher';
-import LocalMemoryCacheAdapter from '../LocalMemoryCacheAdapter';
-import LocalMemoryCacheAdapterProvider from '../LocalMemoryCacheAdapterProvider';
-import LocalMemoryTestEntity from '../testfixtures/LocalMemoryTestEntity';
-import {
-  createLocalMemoryTestEntityCompanionProvider,
-  createNoopLocalMemoryIntegrationTestEntityCompanionProvider,
-} from '../testfixtures/createLocalMemoryTestEntityCompanionProvider';
-
-class TestViewerContext extends ViewerContext {}
-
-describe(LocalMemoryCacheAdapter, () => {
-  beforeEach(async () => {
-    LocalMemoryCacheAdapterProvider.localMemoryCacheAdapterMap.clear();
-  });
-
-  it('has correct caching behavior', async () => {
-    const viewerContext = new TestViewerContext(createLocalMemoryTestEntityCompanionProvider());
-    const cacheAdapter = viewerContext.entityCompanionProvider.getCompanionForEntity(
-      LocalMemoryTestEntity,
-      LocalMemoryTestEntity.getCompanionDefinition()
-    )['tableDataCoordinator']['cacheAdapter'];
-    const cacheKeyMaker = cacheAdapter['makeCacheKey'].bind(cacheAdapter);
-
-    const date = new Date();
-    const entity1Created = await LocalMemoryTestEntity.creator(viewerContext)
-      .setField('name', 'blah')
-      .setField('dateField', date)
-      .enforceCreateAsync();
-
-    // loading an entity should put it in cache
-    const entity1 = await LocalMemoryTestEntity.loader(viewerContext)
-      .enforcing()
-      .loadByIDAsync(entity1Created.getID());
-
-    const entitySpecificGenericCacher =
-      LocalMemoryCacheAdapterProvider.localMemoryCacheAdapterMap.get(
-        LocalMemoryTestEntity.getCompanionDefinition().entityConfiguration.tableName
-      )!['genericLocalMemoryCacher'];
-    const cachedResult = await entitySpecificGenericCacher.loadManyAsync([
-      cacheKeyMaker('id', entity1.getID()),
-    ]);
-    const cachedValue = cachedResult.get(cacheKeyMaker('id', entity1.getID()))!;
-    expect(cachedValue).toMatchObject({
-      status: CacheStatus.HIT,
-      item: {
-        id: entity1.getID(),
-        name: 'blah',
-        dateField: date,
-      },
-    });
-
-    // simulate non existent db fetch, should write negative result ('') to cache
-    const nonExistentId = uuidv4();
-
-    const entityNonExistentResult = await LocalMemoryTestEntity.loader(viewerContext).loadByIDAsync(
-      nonExistentId
-    );
-    expect(entityNonExistentResult.ok).toBe(false);
-
-    const nonExistentCachedResult = await entitySpecificGenericCacher.loadManyAsync([
-      cacheKeyMaker('id', nonExistentId),
-    ]);
-    expect(nonExistentCachedResult.get(cacheKeyMaker('id', nonExistentId))).toMatchObject({
-      status: CacheStatus.NEGATIVE,
-    });
-
-    // load again through entities framework to ensure it reads negative result
-    const entityNonExistentResult2 = await LocalMemoryTestEntity.loader(
-      viewerContext
-    ).loadByIDAsync(nonExistentId);
-    expect(entityNonExistentResult2.ok).toBe(false);
-
-    // invalidate from cache to ensure it invalidates correctly
-    await LocalMemoryTestEntity.loader(viewerContext).invalidateFieldsAsync(entity1.getAllFields());
-    const cachedResultMiss = await entitySpecificGenericCacher.loadManyAsync([
-      cacheKeyMaker('id', entity1.getID()),
-    ]);
-    const cachedValueMiss = cachedResultMiss.get(cacheKeyMaker('id', entity1.getID()));
-    expect(cachedValueMiss).toMatchObject({ status: CacheStatus.MISS });
-  });
-
-  it('shares the cache between different requests', async () => {
-    const genericLocalMemoryCacherLoadManySpy = jest.spyOn(
-      GenericLocalMemoryCacher.prototype as unknown as any,
-      'loadManyAsync'
-    );
-    const viewerContext = new TestViewerContext(createLocalMemoryTestEntityCompanionProvider());
-
-    const date = new Date();
-    const entity1Created = await LocalMemoryTestEntity.creator(viewerContext)
-      .setField('name', 'blah')
-      .setField('dateField', date)
-      .enforceCreateAsync();
-
-    // loading an entity should put it in cache
-    await LocalMemoryTestEntity.loader(viewerContext)
-      .enforcing()
-      .loadByIDAsync(entity1Created.getID());
-
-    // load entity with a different request
-    const viewerContext2 = new TestViewerContext(createLocalMemoryTestEntityCompanionProvider());
-    const entity1WithVc2 = await LocalMemoryTestEntity.loader(viewerContext2)
-      .enforcing()
-      .loadByIDAsync(entity1Created.getID());
-
-    const cacheAdapter = viewerContext.entityCompanionProvider.getCompanionForEntity(
-      LocalMemoryTestEntity,
-      LocalMemoryTestEntity.getCompanionDefinition()
-    )['tableDataCoordinator']['cacheAdapter'];
-    const cacheKeyMaker = cacheAdapter['makeCacheKey'].bind(cacheAdapter);
-    expect(entity1WithVc2.getAllFields()).toMatchObject({
-      id: entity1WithVc2.getID(),
-      name: 'blah',
-      dateField: date,
-    });
-    expect(genericLocalMemoryCacherLoadManySpy).toBeCalledWith([
-      cacheKeyMaker('id', entity1WithVc2.getID()),
-    ]);
-    expect(genericLocalMemoryCacherLoadManySpy).toBeCalledTimes(2);
-  });
-
-  it('respects the parameters of a noop cache', async () => {
-    const viewerContext = new TestViewerContext(
-      createNoopLocalMemoryIntegrationTestEntityCompanionProvider()
-    );
-    const cacheAdapter = viewerContext.entityCompanionProvider.getCompanionForEntity(
-      LocalMemoryTestEntity,
-      LocalMemoryTestEntity.getCompanionDefinition()
-    )['tableDataCoordinator']['cacheAdapter'];
-    const cacheKeyMaker = cacheAdapter['makeCacheKey'].bind(cacheAdapter);
-
-    const date = new Date();
-    const entity1Created = await LocalMemoryTestEntity.creator(viewerContext)
-      .setField('name', 'blah')
-      .setField('dateField', date)
-      .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)
-      .enforcing()
-      .loadByIDAsync(entity1Created.getID());
-
-    const entitySpecificGenericCacher =
-      LocalMemoryCacheAdapterProvider.localMemoryCacheAdapterMap.get(
-        LocalMemoryTestEntity.getCompanionDefinition().entityConfiguration.tableName
-      )!['genericLocalMemoryCacher'];
-    const cachedResult = await entitySpecificGenericCacher.loadManyAsync([
-      cacheKeyMaker('id', entity1.getID()),
-    ]);
-    const cachedValue = cachedResult.get(cacheKeyMaker('id', entity1.getID()))!;
-    expect(cachedValue).toMatchObject({
-      status: CacheStatus.MISS,
-    });
-
-    // a non existent db fetch should try to write negative result ('') but it's a noop cache, so it should be a miss
-    const nonExistentId = uuidv4();
-
-    const entityNonExistentResult = await LocalMemoryTestEntity.loader(viewerContext).loadByIDAsync(
-      nonExistentId
-    );
-    expect(entityNonExistentResult.ok).toBe(false);
-
-    const nonExistentCachedResult = await entitySpecificGenericCacher.loadManyAsync([
-      cacheKeyMaker('id', nonExistentId),
-    ]);
-    expect(nonExistentCachedResult.get(cacheKeyMaker('id', nonExistentId))).toMatchObject({
-      status: CacheStatus.MISS,
-    });
-  });
-});

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

@@ -1,125 +0,0 @@
-import { CacheStatus, UUIDField, EntityConfiguration } from '@expo/entity';
-
-import GenericLocalMemoryCacher, {
-  DOES_NOT_EXIST_LOCAL_MEMORY_CACHE,
-} from '../GenericLocalMemoryCacher';
-import LocalMemoryCacheAdapter from '../LocalMemoryCacheAdapter';
-
-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',
-});
-
-describe(LocalMemoryCacheAdapter, () => {
-  describe('loadManyAsync', () => {
-    it('returns appropriate cache results', async () => {
-      const cacheAdapter = new LocalMemoryCacheAdapter(
-        entityConfiguration,
-        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' }]]);
-      await cacheAdapter.cacheManyAsync('id', cacheHits);
-      await cacheAdapter.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 = new LocalMemoryCacheAdapter(
-        entityConfiguration,
-        GenericLocalMemoryCacher.createLRUCache({
-          maxSize: Number.MAX_SAFE_INTEGER,
-          ttlSeconds: Number.MAX_SAFE_INTEGER,
-        })
-      );
-      const results = await cacheAdapter.loadManyAsync('id', []);
-      expect(results).toEqual(new Map());
-    });
-  });
-
-  describe('cacheManyAsync', () => {
-    it('correctly caches all objects', async () => {
-      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' }]]));
-
-      const cacheKey = cacheAdapter['makeCacheKey']('id', 'test-id-1');
-      expect(localMemoryCache.get(cacheKey)).toMatchObject({
-        id: 'test-id-1',
-      });
-    });
-  });
-
-  describe('cacheDBMissesAsync', () => {
-    it('correctly caches misses', async () => {
-      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']);
-
-      const cacheKey = cacheAdapter['makeCacheKey']('id', 'test-id-1');
-      expect(localMemoryCache.get(cacheKey)).toEqual(DOES_NOT_EXIST_LOCAL_MEMORY_CACHE);
-    });
-  });
-
-  describe('invalidateManyAsync', () => {
-    it('invalidates correctly', async () => {
-      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' }]]));
-      await cacheAdapter.cacheDBMissesAsync('id', ['test-id-2']);
-      await cacheAdapter.invalidateManyAsync('id', ['test-id-1', 'test-id-2']);
-
-      const results = await cacheAdapter.loadManyAsync('id', ['test-id-1', 'test-id-2']);
-      expect(results.get('test-id-1')).toMatchObject({ status: CacheStatus.MISS });
-      expect(results.get('test-id-2')).toMatchObject({ status: CacheStatus.MISS });
-    });
-
-    it('returns when passed empty array of fieldValues', async () => {
-      const cacheAdapter = new LocalMemoryCacheAdapter(
-        entityConfiguration,
-        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

@@ -1,10 +0,0 @@
-/* eslint-disable tsdoc/syntax */
-/**
- * @packageDocumentation
- * @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';

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

@@ -1,100 +0,0 @@
-import {
-  AlwaysAllowPrivacyPolicyRule,
-  EntityPrivacyPolicy,
-  ViewerContext,
-  UUIDField,
-  DateField,
-  StringField,
-  EntityConfiguration,
-  EntityCompanionDefinition,
-  Entity,
-} from '@expo/entity';
-
-export type LocalMemoryTestEntityFields = {
-  id: string;
-  name: string;
-  dateField: Date | null;
-};
-
-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',
-        cache: true,
-      }),
-      name: new StringField({
-        columnName: 'name',
-        cache: true,
-      }),
-      dateField: new DateField({
-        columnName: 'date_field',
-      }),
-    },
-    databaseAdapterFlavor: 'postgres',
-    cacheAdapterFlavor: 'local-memory',
-  });
-
-const localMemoryTestEntityCompanionDefinition = new EntityCompanionDefinition({
-  entityClass: LocalMemoryTestEntity,
-  entityConfiguration: localMemoryTestEntityConfiguration,
-  privacyPolicyClass: LocalMemoryTestEntityPrivacyPolicy,
-});

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

@@ -1,48 +0,0 @@
-import {
-  NoOpEntityMetricsAdapter,
-  IEntityMetricsAdapter,
-  EntityCompanionProvider,
-  StubQueryContextProvider,
-  StubDatabaseAdapterProvider,
-} from '@expo/entity';
-
-import LocalMemoryCacheAdapterProvider from '../LocalMemoryCacheAdapterProvider';
-
-export const createLocalMemoryTestEntityCompanionProvider = (
-  localMemoryOptions: { maxSize?: number; ttlSeconds?: number } = {},
-  metricsAdapter: IEntityMetricsAdapter = new NoOpEntityMetricsAdapter()
-): EntityCompanionProvider => {
-  const localMemoryCacheAdapterProvider =
-    localMemoryOptions.maxSize === 0 && localMemoryOptions.ttlSeconds === 0
-      ? LocalMemoryCacheAdapterProvider.getNoOpProvider()
-      : LocalMemoryCacheAdapterProvider.getProvider(localMemoryOptions);
-  return new EntityCompanionProvider(
-    metricsAdapter,
-    new Map([
-      [
-        'postgres',
-        {
-          adapterProvider: new StubDatabaseAdapterProvider(),
-          queryContextProvider: StubQueryContextProvider,
-        },
-      ],
-    ]),
-    new Map([
-      [
-        'local-memory',
-        {
-          cacheAdapterProvider: localMemoryCacheAdapterProvider,
-        },
-      ],
-    ])
-  );
-};
-
-export const createNoopLocalMemoryIntegrationTestEntityCompanionProvider = (
-  metricsAdapter: IEntityMetricsAdapter = new NoOpEntityMetricsAdapter()
-): EntityCompanionProvider => {
-  return createLocalMemoryTestEntityCompanionProvider(
-    { maxSize: 0, ttlSeconds: 0 },
-    metricsAdapter
-  );
-};

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

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

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

@@ -3,33 +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.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
-
-* Refactor cachers to use an abstract class and interface  ([#157](https://github.com/expo/entity/pull/157)) 
-
-
-
-
-
-# [0.23.0](https://github.com/expo/entity/compare/v0.22.0...v0.23.0) (2022-02-09)
-
-### Chores
-
-* Move data transforming responsibilities to the CacheAdapter instead of the ReadThroughEntityCache. ([#153](https://github.com/expo/entity/pull/153))
-
-
-
-
 # [0.22.0](https://github.com/expo/entity/compare/v0.21.0...v0.22.0) (2022-02-04)
 
 **Note:** Version bump only for package @expo/entity-cache-adapter-redis

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

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

packages/entity-cache-adapter-redis/src/GenericRedisCacher.ts

@@ -4,7 +4,6 @@ import {
   EntityConfiguration,
   transformCacheObjectToFields,
   transformFieldsToCacheObject,
-  IEntityGenericCacher,
 } from '@expo/entity';
 import { Redis } from 'ioredis';
 
@@ -34,7 +33,7 @@ export interface GenericRedisCacheContext {
   ttlSecondsNegative: number;
 }
 
-export default class GenericRedisCacher<TFields> implements IEntityGenericCacher<TFields> {
+export default class GenericRedisCacher<TFields> {
   constructor(
     private readonly context: GenericRedisCacheContext,
     private readonly entityConfiguration: EntityConfiguration<TFields>
@@ -97,7 +96,7 @@ export default class GenericRedisCacher<TFields> implements IEntityGenericCacher
     await wrapNativeRedisCallAsync(() => redisTransaction.exec());
   }
 
-  public async cacheDBMissesAsync(keys: readonly string[]): Promise<void> {
+  public async cacheDBMissesAsync(keys: string[]): Promise<void> {
     if (keys.length === 0) {
       return;
     }
@@ -114,7 +113,7 @@ export default class GenericRedisCacher<TFields> implements IEntityGenericCacher
     await wrapNativeRedisCallAsync(() => redisTransaction.exec());
   }
 
-  public async invalidateManyAsync(keys: readonly string[]): Promise<void> {
+  public async invalidateManyAsync(keys: string[]): Promise<void> {
     if (keys.length === 0) {
       return;
     }

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

@@ -1,125 +0,0 @@
-import { CacheStatus, ViewerContext } from '@expo/entity';
-import Redis from 'ioredis';
-import { URL } from 'url';
-
-import GenericRedisCacher from '../GenericRedisCacher';
-import { RedisCacheAdapterContext } from '../RedisCacheAdapter';
-import RedisTestEntity, {
-  redisTestEntityConfiguration,
-  RedisTestEntityFields,
-} from '../testfixtures/RedisTestEntity';
-import { createRedisIntegrationTestEntityCompanionProvider } from '../testfixtures/createRedisIntegrationTestEntityCompanionProvider';
-
-class TestViewerContext extends ViewerContext {}
-
-describe(GenericRedisCacher, () => {
-  let redisCacheAdapterContext: RedisCacheAdapterContext;
-
-  beforeAll(() => {
-    redisCacheAdapterContext = {
-      redisClient: new Redis(new URL(process.env['REDIS_URL']!).toString()),
-      makeKeyFn(...parts: string[]): string {
-        const delimiter = ':';
-        const escapedParts = parts.map((part) =>
-          part.replace('\\', '\\\\').replace(delimiter, `\\${delimiter}`)
-        );
-        return escapedParts.join(delimiter);
-      },
-      cacheKeyPrefix: 'test-',
-      cacheKeyVersion: 1,
-      ttlSecondsPositive: 86400, // 1 day
-      ttlSecondsNegative: 600, // 10 minutes
-    };
-  });
-
-  beforeEach(async () => {
-    await redisCacheAdapterContext.redisClient.flushdb();
-  });
-  afterAll(async () => {
-    redisCacheAdapterContext.redisClient.disconnect();
-  });
-
-  it('has correct caching and loading behavior', async () => {
-    const viewerContext = new TestViewerContext(
-      createRedisIntegrationTestEntityCompanionProvider(redisCacheAdapterContext)
-    );
-    const genericRedisCacher = new GenericRedisCacher(
-      {
-        redisClient: redisCacheAdapterContext.redisClient,
-        ttlSecondsNegative: redisCacheAdapterContext.ttlSecondsNegative,
-        ttlSecondsPositive: redisCacheAdapterContext.ttlSecondsPositive,
-      },
-      redisTestEntityConfiguration
-    );
-    const date = new Date();
-    const entity1Created = await RedisTestEntity.creator(viewerContext)
-      .setField('name', 'blah')
-      .setField('dateField', date)
-      .enforceCreateAsync();
-    const testKey = `test-id-key-${entity1Created.getID()}`;
-    const objectMap = new Map<string, Readonly<RedisTestEntityFields>>([
-      [testKey, entity1Created.getAllFields()],
-    ]);
-    await genericRedisCacher.cacheManyAsync(objectMap);
-
-    const cachedJSON = await redisCacheAdapterContext.redisClient.get(testKey);
-    const cachedValue = JSON.parse(cachedJSON!);
-    expect(cachedValue).toMatchObject({
-      id: entity1Created.getID(),
-      dateField: date.toISOString(),
-    });
-
-    const loadedObjectMap = await genericRedisCacher.loadManyAsync([testKey]);
-    const cacheLoadResult = loadedObjectMap.get(testKey)!;
-    expect(cacheLoadResult).toMatchObject({
-      status: CacheStatus.HIT,
-      item: entity1Created.getAllFields(),
-    });
-    expect(loadedObjectMap.size).toBe(1);
-  });
-  it('has correct negative caching behaviour', async () => {
-    const genericRedisCacher = new GenericRedisCacher(
-      {
-        redisClient: redisCacheAdapterContext.redisClient,
-        ttlSecondsNegative: redisCacheAdapterContext.ttlSecondsNegative,
-        ttlSecondsPositive: redisCacheAdapterContext.ttlSecondsPositive,
-      },
-      redisTestEntityConfiguration
-    );
-
-    const testKey = `test-id-key-non-existent-id`;
-    await genericRedisCacher.cacheDBMissesAsync([testKey]);
-    const loadedObjectMap = await genericRedisCacher.loadManyAsync([testKey]);
-    const cacheLoadResult = loadedObjectMap.get(testKey)!;
-    expect(cacheLoadResult.status).toBe(CacheStatus.NEGATIVE);
-  });
-  it('has correct invalidation behaviour', async () => {
-    const viewerContext = new TestViewerContext(
-      createRedisIntegrationTestEntityCompanionProvider(redisCacheAdapterContext)
-    );
-    const genericRedisCacher = new GenericRedisCacher(
-      {
-        redisClient: redisCacheAdapterContext.redisClient,
-        ttlSecondsNegative: redisCacheAdapterContext.ttlSecondsNegative,
-        ttlSecondsPositive: redisCacheAdapterContext.ttlSecondsPositive,
-      },
-      redisTestEntityConfiguration
-    );
-    const date = new Date();
-    const entity1Created = await RedisTestEntity.creator(viewerContext)
-      .setField('name', 'blah')
-      .setField('dateField', date)
-      .enforceCreateAsync();
-    const testKey = `test-id-key-${entity1Created.getID()}`;
-    const objectMap = new Map<string, Readonly<RedisTestEntityFields>>([
-      [testKey, entity1Created.getAllFields()],
-    ]);
-    await genericRedisCacher.cacheManyAsync(objectMap);
-
-    await genericRedisCacher.invalidateManyAsync([testKey]);
-
-    const loadedObjectMap = await genericRedisCacher.loadManyAsync([testKey]);
-    const cacheLoadResult = loadedObjectMap.get(testKey)!;
-    expect(cacheLoadResult.status).toBe(CacheStatus.MISS);
-  });
-});

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

@@ -3,30 +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.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
-
-
-
-
-
-# [0.23.0](https://github.com/expo/entity/compare/v0.22.0...v0.23.0) (2022-02-09)
-
-**Note:** Version bump only for package @expo/entity-database-adapter-knex
-
-
-
-
-
 # [0.22.0](https://github.com/expo/entity/compare/v0.21.0...v0.22.0) (2022-02-04)
 
 

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

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

packages/entity-example/CHANGELOG.md

@@ -3,33 +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.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
-
-
-
-
-
-# [0.23.0](https://github.com/expo/entity/compare/v0.22.0...v0.23.0) (2022-02-09)
-
-**Note:** Version bump only for package @expo/entity-example
-
-
-
-
-
 # [0.22.0](https://github.com/expo/entity/compare/v0.21.0...v0.22.0) (2022-02-04)
 
 **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.0",
+  "version": "0.22.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.0",
+    "@expo/entity": "^0.22.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-full-integration-tests/CHANGELOG.md

@@ -3,30 +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.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
-
-
-
-
-
-# [0.23.0](https://github.com/expo/entity/compare/v0.22.0...v0.23.0) (2022-02-09)
-
-**Note:** Version bump only for package @expo/entity-full-integration-tests
-
-
-
-
-
 # [0.22.0](https://github.com/expo/entity/compare/v0.21.0...v0.22.0) (2022-02-04)
 
 **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.0",
+  "version": "0.22.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.0",
-    "@expo/entity-cache-adapter-redis": "^0.25.0",
-    "@expo/entity-database-adapter-knex": "^0.25.0"
+    "@expo/entity": "^0.22.0",
+    "@expo/entity-cache-adapter-redis": "^0.22.0",
+    "@expo/entity-database-adapter-knex": "^0.22.0"
   }
 }

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

@@ -3,30 +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.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
-
-
-
-
-
-# [0.23.0](https://github.com/expo/entity/compare/v0.22.0...v0.23.0) (2022-02-09)
-
-**Note:** Version bump only for package @expo/entity-ip-address-field
-
-
-
-
-
 # [0.22.0](https://github.com/expo/entity/compare/v0.21.0...v0.22.0) (2022-02-04)
 
 **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.0",
+  "version": "0.22.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.0",
+    "@expo/entity": "^0.22.0",
     "@types/jsbn": "^1.2.29"
   },
   "peerDependencies": {

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

@@ -1,11 +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.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.0",
-  "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.0",
-    "@expo/entity-cache-adapter-local-memory": "^0.25.0",
-    "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,228 +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
-            .enforcing()
-            .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,35 +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.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
-
-* Refactor cachers to use an abstract class and interface  ([#157](https://github.com/expo/entity/pull/157))
-
-
-
-
-# [0.23.0](https://github.com/expo/entity/compare/v0.22.0...v0.23.0) (2022-02-09)
-
-### Chores
-
-* Move data transforming responsibilities to the CacheAdapter instead of the RedisSecondaryEntityCache. ([#153](https://github.com/expo/entity/pull/153))
-
-
-
-
 # [0.22.0](https://github.com/expo/entity/compare/v0.21.0...v0.22.0) (2022-02-04)
 
 **Note:** Version bump only for package @expo/entity-secondary-cache-redis

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

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

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

@@ -1,18 +1,120 @@
-import { EntityConfiguration, GenericSecondaryEntityCache } from '@expo/entity';
+import {
+  CacheStatus,
+  EntityConfiguration,
+  filterMap,
+  ISecondaryEntityCache,
+  zipToMap,
+} from '@expo/entity';
 import { GenericRedisCacheContext, GenericRedisCacher } from '@expo/entity-cache-adapter-redis';
+import invariant from 'invariant';
 
 /**
- * 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,
-  TLoadParams
-> extends GenericSecondaryEntityCache<TFields, TLoadParams> {
+export default class RedisSecondaryEntityCache<TFields, TLoadParams>
+  implements ISecondaryEntityCache<TFields, TLoadParams>
+{
+  private readonly genericRedisCacher: GenericRedisCacher<TFields>;
+
   constructor(
     entityConfiguration: EntityConfiguration<TFields>,
     genericRedisCacheContext: GenericRedisCacheContext,
-    constructRedisKey: (params: Readonly<TLoadParams>) => string
+    private readonly constructRedisKey: (params: Readonly<TLoadParams>) => string
   ) {
-    super(new GenericRedisCacher(genericRedisCacheContext, entityConfiguration), constructRedisKey);
+    this.genericRedisCacher = new GenericRedisCacher(genericRedisCacheContext, entityConfiguration);
+  }
+
+  /**
+   * Read-through cache function. Steps:
+   *
+   * 1. Check for cached objects
+   * 2. Query the fetcher for loadParams not in the cache
+   * 3. Cache the results from the fetcher
+   * 4. Negatively cache anything missing from the fetcher
+   * 5. Return the full set of data for the query.
+   *
+   * @param loadParamsArray - array of loadParams to load from the cache
+   * @param fetcher - closure used to provide underlying data source objects for loadParams
+   * @returns map from loadParams to the entity field object
+   */
+  public 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>> {
+    const redisKeys = loadParamsArray.map(this.constructRedisKey);
+    const redisKeyToLoadParamsMap = zipToMap(redisKeys, loadParamsArray);
+
+    const cacheLoadResults = await this.genericRedisCacher.loadManyAsync(redisKeys);
+
+    invariant(
+      cacheLoadResults.size === loadParamsArray.length,
+      `${this.constructor.name} loadMany should return a result for each key`
+    );
+
+    const redisKeysToFetch = Array.from(
+      filterMap(
+        cacheLoadResults,
+        (cacheLoadResult) => cacheLoadResult.status === CacheStatus.MISS
+      ).keys()
+    );
+
+    // put transformed cache hits in result map
+    const results: Map<Readonly<TLoadParams>, Readonly<TFields> | null> = new Map();
+    cacheLoadResults.forEach((cacheLoadResult, redisKey) => {
+      if (cacheLoadResult.status === CacheStatus.HIT) {
+        const loadParams = redisKeyToLoadParamsMap.get(redisKey);
+        invariant(loadParams !== undefined, 'load params should be in redis key map');
+        results.set(loadParams, cacheLoadResult.item);
+      }
+    });
+
+    // fetch any misses from DB, add DB objects to results, cache DB results, inform cache of any missing DB results
+    if (redisKeysToFetch.length > 0) {
+      const loadParamsToFetch = redisKeysToFetch.map((redisKey) => {
+        const loadParams = redisKeyToLoadParamsMap.get(redisKey);
+        invariant(loadParams !== undefined, 'load params should be in redis key map');
+        return loadParams;
+      });
+      const fetchResults = await fetcher(loadParamsToFetch);
+
+      const fetchMisses = loadParamsToFetch.filter((loadParams) => {
+        // all values of fetchResults should be field objects or undefined
+        return !fetchResults.get(loadParams);
+      });
+
+      for (const fetchMiss of fetchMisses) {
+        results.set(fetchMiss, null);
+      }
+
+      const objectsToCache: Map<string, Readonly<TFields>> = new Map();
+      for (const [loadParams, object] of fetchResults.entries()) {
+        if (object) {
+          objectsToCache.set(this.constructRedisKey(loadParams), object);
+          results.set(loadParams, object);
+        }
+      }
+
+      await Promise.all([
+        this.genericRedisCacher.cacheManyAsync(objectsToCache),
+        this.genericRedisCacher.cacheDBMissesAsync(fetchMisses.map(this.constructRedisKey)),
+      ]);
+    }
+
+    return results;
+  }
+
+  /**
+   * Invalidate the cache for objects cached by constructRedisKey(loadParams).
+   *
+   * @param loadParamsArray - load params to invalidate
+   */
+  public async invalidateManyAsync(
+    loadParamsArray: readonly Readonly<TLoadParams>[]
+  ): Promise<void> {
+    await this.genericRedisCacher.invalidateManyAsync(loadParamsArray.map(this.constructRedisKey));
   }
 }

packages/entity/CHANGELOG.md

@@ -3,39 +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.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
-
-
-
-
-
-### Chores
-
-* Refactor cachers to use an abstract class and interface  ([#157](https://github.com/expo/entity/pull/157)) 
-
-# [0.23.0](https://github.com/expo/entity/compare/v0.22.0...v0.23.0) (2022-02-09)
-
-### Breaking changes
-
-* Move data transforming responsibilities to the CacheAdapter instead of the ReadThroughEntityCache. Affects any classes extending the EntityCacheAdapter and relying on the transformation behavior of the ReadThroughEntityCache. ([#153](https://github.com/expo/entity/pull/153))
-
-
-
-
 # [0.22.0](https://github.com/expo/entity/compare/v0.21.0...v0.22.0) (2022-02-04)
 
 **Note:** Version bump only for package @expo/entity

packages/entity/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/entity",
-  "version": "0.25.0",
+  "version": "0.22.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/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,7 +69,7 @@ export default class EntityAssociationLoader<
       .getViewerContext()
       .getViewerScopedEntityCompanionForClass(associatedEntityClass)
       .getLoaderFactory()
-      .forLoad(queryContext, { cascadingDeleteCause: null });
+      .forLoad(queryContext);
 
     return (await loader.loadByIDAsync(associatedEntityID as unknown as TAssociatedID)) as Result<
       null extends TFields[TIdentifyingField] ? TAssociatedEntity | null : TAssociatedEntity
@@ -123,7 +123,7 @@ export default class EntityAssociationLoader<
       .getViewerContext()
       .getViewerScopedEntityCompanionForClass(associatedEntityClass)
       .getLoaderFactory()
-      .forLoad(queryContext, { cascadingDeleteCause: null });
+      .forLoad(queryContext);
     return await loader.loadManyByFieldEqualingAsync(
       associatedEntityFieldContainingThisID,
       thisID as any
@@ -180,7 +180,7 @@ export default class EntityAssociationLoader<
       .getViewerContext()
       .getViewerScopedEntityCompanionForClass(associatedEntityClass)
       .getLoaderFactory()
-      .forLoad(queryContext, { cascadingDeleteCause: null });
+      .forLoad(queryContext);
     return await loader.loadByFieldEqualingAsync(
       associatedEntityLookupByField,
       associatedFieldValue as any
@@ -238,7 +238,7 @@ export default class EntityAssociationLoader<
       .getViewerContext()
       .getViewerScopedEntityCompanionForClass(associatedEntityClass)
       .getLoaderFactory()
-      .forLoad(queryContext, { cascadingDeleteCause: null });
+      .forLoad(queryContext);
     return await loader.loadManyByFieldEqualingAsync(
       associatedEntityLookupByField,
       associatedFieldValue as any

packages/entity/src/EntityFieldDefinition.ts

@@ -28,9 +28,6 @@ export enum EntityEdgeDeletionBehavior {
   SET_NULL,
 }
 
-/**
- * Defines an association between entities. An association is primarily used to define cascading deletion behavior.
- */
 export interface EntityAssociationDefinition<
   TViewerContext extends ViewerContext,
   TAssociatedFields,
@@ -86,10 +83,6 @@ export interface EntityAssociationDefinition<
   edgeDeletionBehavior?: EntityEdgeDeletionBehavior;
 }
 
-/**
- * Definition for a field referencing a column in the underlying database. Specifies things like
- * cache behavior and associations, and handles input validation.
- */
 export abstract class EntityFieldDefinition<T> {
   readonly columnName: string;
   readonly cache: boolean;
@@ -100,7 +93,6 @@ export abstract class EntityFieldDefinition<T> {
    * @param cache - Whether or not to cache loaded instances of the entity by this field. The column name is
    *              used to derive a cache key for the cache entry. If true, this column must be able uniquely
    *              identify the entity.
-   * @param association - Defines the association behavior for an entity that this column references.
    */
   constructor({
     columnName,

packages/entity/src/EntityFields.ts

@@ -2,104 +2,59 @@ import { validate as validateUUID } from 'uuid';
 
 import { EntityFieldDefinition } from './EntityFieldDefinition';
 
-/**
- * {@link EntityFieldDefinition} for a column with a JS string type.
- */
 export class StringField extends EntityFieldDefinition<string> {
   protected validateInputValueInternal(value: string): boolean {
     return typeof value === 'string';
   }
 }
-
-/**
- * {@link EntityFieldDefinition} for a column with a JS string type.
- * Enforces that the string is a valid UUID.
- */
 export class UUIDField extends StringField {
   protected override validateInputValueInternal(value: string): boolean {
     return validateUUID(value);
   }
 }
-
-/**
- * {@link EntityFieldDefinition} for a column with a JS Date type.
- */
 export class DateField extends EntityFieldDefinition<Date> {
   protected validateInputValueInternal(value: Date): boolean {
     return value instanceof Date;
   }
 }
-
-/**
- * {@link EntityFieldDefinition} for a column with a JS boolean type.
- */
 export class BooleanField extends EntityFieldDefinition<boolean> {
   protected validateInputValueInternal(value: boolean): boolean {
     return typeof value === 'boolean';
   }
 }
 
-/**
- * {@link EntityFieldDefinition} for a column with a JS number type.
- * Enforces that the number is an integer.
- */
 export class IntField extends EntityFieldDefinition<number> {
   protected validateInputValueInternal(value: number): boolean {
     return typeof value === 'number' && Number.isInteger(value);
   }
 }
 
-/**
- * {@link EntityFieldDefinition} for a column with a JS number type.
- * Enforces that the number is a float (which includes integers in JS).
- */
 export class FloatField extends EntityFieldDefinition<number> {
   protected validateInputValueInternal(value: number): boolean {
     return typeof value === 'number';
   }
 }
 
-/**
- * {@link EntityFieldDefinition} for a column with a JS string array type.
- * Enforces that every member of the string array is a string.
- */
 export class StringArrayField extends EntityFieldDefinition<string[]> {
   protected validateInputValueInternal(value: string[]): boolean {
     return Array.isArray(value) && value.every((subValue) => typeof subValue === 'string');
   }
 }
-
-/**
- * {@link EntityFieldDefinition} for a column with a JS JSON object type.
- */
 export class JSONObjectField extends EntityFieldDefinition<object> {
   protected validateInputValueInternal(value: object): boolean {
     return typeof value === 'object' && !Array.isArray(value);
   }
 }
-
-/**
- * {@link EntityFieldDefinition} for a enum column with a JS string or number type.
- */
 export class EnumField extends EntityFieldDefinition<string | number> {
   protected validateInputValueInternal(value: string | number): boolean {
     return typeof value === 'number' || typeof value === 'string';
   }
 }
-
-/**
- * {@link EntityFieldDefinition} for a column with a JS JSON array type.
- */
 export class JSONArrayField extends EntityFieldDefinition<any[]> {
   protected validateInputValueInternal(value: any[]): boolean {
     return Array.isArray(value);
   }
 }
-
-/**
- * {@link EntityFieldDefinition} for a column that may be a JS JSON array type.
- * Does not do any validation.
- */
 export class MaybeJSONArrayField extends EntityFieldDefinition<any | any[]> {
   protected validateInputValueInternal(_value: any): boolean {
     return true;

packages/entity/src/EntityLoader.ts

@@ -9,7 +9,7 @@ import {
   QuerySelectionModifiers,
   isSingleValueFieldEqualityCondition,
 } from './EntityDatabaseAdapter';
-import EntityPrivacyPolicy, { EntityPrivacyPolicyEvaluationContext } from './EntityPrivacyPolicy';
+import EntityPrivacyPolicy from './EntityPrivacyPolicy';
 import { EntityQueryContext } from './EntityQueryContext';
 import ReadonlyEntity from './ReadonlyEntity';
 import ViewerContext from './ViewerContext';
@@ -40,7 +40,6 @@ export default class EntityLoader<
   constructor(
     private readonly viewerContext: TViewerContext,
     private readonly queryContext: EntityQueryContext,
-    private readonly privacyPolicyEvaluationContext: EntityPrivacyPolicyEvaluationContext,
     private readonly entityConfiguration: EntityConfiguration<TFields>,
     private readonly entityClass: IEntityClass<
       TFields,
@@ -219,7 +218,6 @@ export default class EntityLoader<
           this.privacyPolicy.authorizeReadAsync(
             this.viewerContext,
             this.queryContext,
-            this.privacyPolicyEvaluationContext,
             uncheckedEntityResult.value,
             this.metricsAdapter
           )
@@ -274,7 +272,6 @@ export default class EntityLoader<
           this.privacyPolicy.authorizeReadAsync(
             this.viewerContext,
             this.queryContext,
-            this.privacyPolicyEvaluationContext,
             uncheckedEntityResult.value,
             this.metricsAdapter
           )
@@ -335,7 +332,6 @@ export default class EntityLoader<
             this.privacyPolicy.authorizeReadAsync(
               this.viewerContext,
               this.queryContext,
-              this.privacyPolicyEvaluationContext,
               uncheckedEntityResult.value,
               this.metricsAdapter
             )

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,
-    privacyPolicyEvaluationContext: EntityPrivacyPolicyEvaluationContext
+    queryContext: EntityQueryContext
   ): 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;
     };
 
-/**
- * Information about a cascading deletion.
- */
-export type EntityCascadingDeletionInfo = {
-  /**
-   * The entity that is being mutated at this step in the cascaded deletion.
-   */
+export type EntityMutationTriggerDeleteCascadeInfo<> = {
   entity: Entity<any, any, any, any>;
-
-  /**
-   * The cascade deletion that caused this mutation.
-   */
-  cascadingDeleteCause: EntityCascadingDeletionInfo | null;
+  cascadingDeleteCause: EntityMutationTriggerDeleteCascadeInfo | 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,11 +249,7 @@ export class CreateMutator<
 
     const insertResult = await this.databaseAdapter.insertAsync(queryContext, this.fieldsForEntity);
 
-    const entityLoader = this.entityLoaderFactory.forLoad(
-      this.viewerContext,
-      queryContext,
-      this.privacyPolicyEvaluationContext
-    );
+    const entityLoader = this.entityLoaderFactory.forLoad(this.viewerContext, queryContext);
     queryContext.appendPostCommitInvalidationCallback(
       entityLoader.invalidateFieldsAsync.bind(entityLoader, insertResult)
     );
@@ -315,7 +309,6 @@ export class UpdateMutator<
   constructor(
     viewerContext: TViewerContext,
     queryContext: EntityQueryContext,
-    privacyPolicyEvaluationContext: EntityPrivacyPolicyEvaluationContext,
     entityConfiguration: EntityConfiguration<TFields>,
     entityClass: IEntityClass<
       TFields,
@@ -355,7 +348,6 @@ export class UpdateMutator<
     super(
       viewerContext,
       queryContext,
-      privacyPolicyEvaluationContext,
       entityConfiguration,
       entityClass,
       privacyPolicy,
@@ -417,7 +409,6 @@ export class UpdateMutator<
       this.privacyPolicy.authorizeUpdateAsync(
         this.viewerContext,
         queryContext,
-        this.privacyPolicyEvaluationContext,
         entityAboutToBeUpdated,
         this.metricsAdapter
       )
@@ -452,11 +443,7 @@ export class UpdateMutator<
       this.updatedFields
     );
 
-    const entityLoader = this.entityLoaderFactory.forLoad(
-      this.viewerContext,
-      queryContext,
-      this.privacyPolicyEvaluationContext
-    );
+    const entityLoader = this.entityLoaderFactory.forLoad(this.viewerContext, queryContext);
 
     queryContext.appendPostCommitInvalidationCallback(
       entityLoader.invalidateFieldsAsync.bind(
@@ -519,7 +506,6 @@ export class DeleteMutator<
   constructor(
     viewerContext: TViewerContext,
     queryContext: EntityQueryContext,
-    privacyPolicyEvaluationContext: EntityPrivacyPolicyEvaluationContext,
     entityConfiguration: EntityConfiguration<TFields>,
     entityClass: IEntityClass<
       TFields,
@@ -559,7 +545,6 @@ export class DeleteMutator<
     super(
       viewerContext,
       queryContext,
-      privacyPolicyEvaluationContext,
       entityConfiguration,
       entityClass,
       privacyPolicy,
@@ -593,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(
@@ -609,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
       )
@@ -652,9 +636,7 @@ export class DeleteMutator<
       );
     }
 
-    const entityLoader = this.entityLoaderFactory.forLoad(this.viewerContext, queryContext, {
-      cascadingDeleteCause,
-    });
+    const entityLoader = this.entityLoaderFactory.forLoad(this.viewerContext, queryContext);
     queryContext.appendPostCommitInvalidationCallback(
       entityLoader.invalidateFieldsAsync.bind(entityLoader, this.entity.getAllDatabaseFields())
     );
@@ -702,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())) {
@@ -750,15 +732,10 @@ 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,
@@ -766,7 +743,7 @@ export class DeleteMutator<
                 );
             } else {
               inboundReferenceEntities = await loaderFactory
-                .forLoad(queryContext, { cascadingDeleteCause: newCascadingDeleteCause })
+                .forLoad(queryContext)
                 .enforcing()
                 .loadManyByFieldEqualingAsync(fieldName, entity.getID());
             }
@@ -777,13 +754,14 @@ export class DeleteMutator<
                 await Promise.all(
                   inboundReferenceEntities.map((inboundReferenceEntity) =>
                     mutatorFactory
-                      .forDelete(inboundReferenceEntity, queryContext, {
-                        cascadingDeleteCause: newCascadingDeleteCause,
-                      })
+                      .forDelete(inboundReferenceEntity, queryContext)
                       .deleteInTransactionAsync(
                         processedEntityIdentifiers,
                         /* skipDatabaseDeletion */ true, // deletion is handled by DB
-                        newCascadingDeleteCause
+                        {
+                          entity,
+                          cascadingDeleteCause,
+                        }
                       )
                   )
                 );
@@ -793,9 +771,7 @@ export class DeleteMutator<
                 await Promise.all(
                   inboundReferenceEntities.map((inboundReferenceEntity) =>
                     mutatorFactory
-                      .forUpdate(inboundReferenceEntity, queryContext, {
-                        cascadingDeleteCause: newCascadingDeleteCause,
-                      })
+                      .forUpdate(inboundReferenceEntity, queryContext)
                       .setField(fieldName, null)
                       .enforceUpdateAsync()
                   )
@@ -806,13 +782,14 @@ export class DeleteMutator<
                 await Promise.all(
                   inboundReferenceEntities.map((inboundReferenceEntity) =>
                     mutatorFactory
-                      .forDelete(inboundReferenceEntity, queryContext, {
-                        cascadingDeleteCause: newCascadingDeleteCause,
-                      })
+                      .forDelete(inboundReferenceEntity, queryContext)
                       .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,
-    privacyPolicyEvaluationContext: EntityPrivacyPolicyEvaluationContext
+    queryContext: EntityQueryContext
   ): 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,
-    privacyPolicyEvaluationContext: EntityPrivacyPolicyEvaluationContext
+    queryContext: EntityQueryContext
   ): 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,
-    privacyPolicyEvaluationContext: EntityPrivacyPolicyEvaluationContext
+    queryContext: EntityQueryContext
   ): 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(
-        viewerContext,
-        queryContext,
-        evaluationContext,
-        entity
-      );
+      const ruleEvaluationResult = await rule.evaluateAsync(viewerContext, queryContext, entity);
       switch (ruleEvaluationResult) {
         case RuleEvaluationResult.DENY:
           throw new EntityNotAuthorizedError<

packages/entity/src/GenericSecondaryEntityCache.ts

@@ -1,98 +0,0 @@
-import invariant from 'invariant';
-
-import { ISecondaryEntityCache } from './EntitySecondaryCacheLoader';
-import IEntityGenericCacher from './IEntityGenericCacher';
-import { CacheStatus } from './internal/ReadThroughEntityCache';
-import { filterMap, zipToMap } from './utils/collections/maps';
-
-/**
- * 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 abstract class GenericSecondaryEntityCache<TFields, TLoadParams>
-  implements ISecondaryEntityCache<TFields, TLoadParams>
-{
-  constructor(
-    protected readonly cacher: IEntityGenericCacher<TFields>,
-    protected readonly constructCacheKey: (params: Readonly<TLoadParams>) => string
-  ) {}
-
-  public 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>> {
-    const cacheKeys = loadParamsArray.map(this.constructCacheKey);
-    const cacheKeyToLoadParamsMap = zipToMap(cacheKeys, loadParamsArray);
-
-    const cacheLoadResults = await this.cacher.loadManyAsync(cacheKeys);
-
-    invariant(
-      cacheLoadResults.size === loadParamsArray.length,
-      `${this.constructor.name} loadMany should return a result for each key`
-    );
-
-    const cacheKeysToFetch = Array.from(
-      filterMap(
-        cacheLoadResults,
-        (cacheLoadResult) => cacheLoadResult.status === CacheStatus.MISS
-      ).keys()
-    );
-
-    // put cache hits in result map
-    const results: Map<Readonly<TLoadParams>, Readonly<TFields> | null> = new Map();
-    cacheLoadResults.forEach((cacheLoadResult, cacheKey) => {
-      if (cacheLoadResult.status === CacheStatus.HIT) {
-        const loadParams = cacheKeyToLoadParamsMap.get(cacheKey);
-        invariant(loadParams !== undefined, 'load params should be in cache key map');
-        results.set(loadParams, cacheLoadResult.item);
-      }
-    });
-
-    // fetch any misses from DB, add DB objects to results, cache DB results, inform cache of any missing DB results
-    if (cacheKeysToFetch.length > 0) {
-      const loadParamsToFetch = cacheKeysToFetch.map((cacheKey) => {
-        const loadParams = cacheKeyToLoadParamsMap.get(cacheKey);
-        invariant(loadParams !== undefined, 'load params should be in cache key map');
-        return loadParams;
-      });
-      const fetchResults = await fetcher(loadParamsToFetch);
-
-      const fetchMisses = loadParamsToFetch.filter((loadParams) => {
-        // all values of fetchResults should be field objects or undefined
-        return !fetchResults.get(loadParams);
-      });
-
-      for (const fetchMiss of fetchMisses) {
-        results.set(fetchMiss, null);
-      }
-
-      const objectsToCache: Map<string, Readonly<TFields>> = new Map();
-      for (const [loadParams, object] of fetchResults.entries()) {
-        if (object) {
-          objectsToCache.set(this.constructCacheKey(loadParams), object);
-          results.set(loadParams, object);
-        }
-      }
-
-      await Promise.all([
-        this.cacher.cacheManyAsync(objectsToCache),
-        this.cacher.cacheDBMissesAsync(fetchMisses.map(this.constructCacheKey)),
-      ]);
-    }
-
-    return results;
-  }
-
-  /**
-   * Invalidate the cache for objects cached by constructCacheKey(loadParams).
-   *
-   * @param loadParamsArray - load params to invalidate
-   */
-  public invalidateManyAsync(loadParamsArray: readonly Readonly<TLoadParams>[]): Promise<void> {
-    const cacheKeys = loadParamsArray.map(this.constructCacheKey);
-    return this.cacher.invalidateManyAsync(cacheKeys);
-  }
-}

packages/entity/src/IEntityGenericCacher.ts

@@ -1,15 +0,0 @@
-import { CacheLoadResult } from './internal/ReadThroughEntityCache';
-
-/**
- * A cacher stores and loads key-value pairs. It also supports negative caching - it stores the absence
- * of keys that don't exist in the backing datastore.
- */
-export default interface IEntityGenericCacher<TFields> {
-  loadManyAsync(keys: readonly string[]): Promise<ReadonlyMap<string, CacheLoadResult<TFields>>>;
-
-  cacheManyAsync(objectMap: ReadonlyMap<string, Readonly<TFields>>): Promise<void>;
-
-  cacheDBMissesAsync(keys: readonly string[]): Promise<void>;
-
-  invalidateManyAsync(keys: readonly string[]): Promise<void>;
-}

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,
-    privacyPolicyEvaluationContext: EntityPrivacyPolicyEvaluationContext
+    queryContext: EntityQueryContext
   ): EntityLoader<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy, TSelectedFields> {
-    return this.entityLoaderFactory.forLoad(
-      this.viewerContext,
-      queryContext,
-      privacyPolicyEvaluationContext
-    );
+    return this.entityLoaderFactory.forLoad(this.viewerContext, queryContext);
   }
 }

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,
-    privacyPolicyEvaluationContext: EntityPrivacyPolicyEvaluationContext
+    queryContext: EntityQueryContext
   ): CreateMutator<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy, TSelectedFields> {
-    return this.entityMutatorFactory.forCreate(
-      this.viewerContext,
-      queryContext,
-      privacyPolicyEvaluationContext
-    );
+    return this.entityMutatorFactory.forCreate(this.viewerContext, queryContext);
   }
 
   forUpdate(
     existingEntity: TEntity,
-    queryContext: EntityQueryContext,
-    privacyPolicyEvaluationContext: EntityPrivacyPolicyEvaluationContext
+    queryContext: EntityQueryContext
   ): UpdateMutator<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy, TSelectedFields> {
-    return this.entityMutatorFactory.forUpdate(
-      existingEntity,
-      queryContext,
-      privacyPolicyEvaluationContext
-    );
+    return this.entityMutatorFactory.forUpdate(existingEntity, queryContext);
   }
 
   forDelete(
     existingEntity: TEntity,
-    queryContext: EntityQueryContext,
-    privacyPolicyEvaluationContext: EntityPrivacyPolicyEvaluationContext
+    queryContext: EntityQueryContext
   ): DeleteMutator<TFields, TID, TViewerContext, TEntity, TPrivacyPolicy, TSelectedFields> {
-    return this.entityMutatorFactory.forDelete(
-      existingEntity,
-      queryContext,
-      privacyPolicyEvaluationContext
-    );
+    return this.entityMutatorFactory.forDelete(existingEntity, queryContext);
   }
 }

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__/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')) {

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, {
-  EntityPrivacyPolicyEvaluationContext,
-  EntityAuthorizationAction,
-} from '../EntityPrivacyPolicy';
-import { EntityTransactionalQueryContext, EntityQueryContext } from '../EntityQueryContext';
+import EntityPrivacyPolicy from '../EntityPrivacyPolicy';
+import { EntityTransactionalQueryContext } 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,
-    ChildEntity: 0,
-    GrandChildEntity: 0,
+    parent: 0,
+    child: 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 {
-        ParentEntity,
-        ChildEntity,
-        GrandChildEntity,
-        triggerExecutionCounts,
-        privacyPolicyEvaluationRecords,
-      } = makeEntityClasses(EntityEdgeDeletionBehavior.CASCADE_DELETE);
+      const { ParentEntity, ChildEntity, GrandChildEntity, triggerExecutionCounts } =
+        makeEntityClasses(EntityEdgeDeletionBehavior.CASCADE_DELETE);
       const companionProvider = createUnitTestEntityCompanionProvider();
       const viewerContext = new TestViewerContext(companionProvider);
 
@@ -383,9 +326,7 @@ describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {
         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).enforcing().loadByIDNullableAsync(parent.getID())
@@ -399,82 +340,17 @@ describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {
 
       // two calls for each trigger, one beforeDelete, one afterDelete
       expect(triggerExecutionCounts).toMatchObject({
-        ParentEntity: 2,
-        ChildEntity: 2,
-        GrandChildEntity: 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,
-                },
-              },
-            },
-          ],
-        },
+        parent: 2,
+        child: 2,
+        grandchild: 2,
       });
     });
   });
 
   describe('EntityEdgeDeletionBehavior.SET_NULL', () => {
     it('sets null', async () => {
-      const {
-        ParentEntity,
-        ChildEntity,
-        GrandChildEntity,
-        triggerExecutionCounts,
-        privacyPolicyEvaluationRecords,
-      } = makeEntityClasses(EntityEdgeDeletionBehavior.SET_NULL);
+      const { ParentEntity, ChildEntity, GrandChildEntity, triggerExecutionCounts } =
+        makeEntityClasses(EntityEdgeDeletionBehavior.SET_NULL);
 
       const companionProvider = createUnitTestEntityCompanionProvider();
       const viewerContext = new TestViewerContext(companionProvider);
@@ -497,9 +373,7 @@ describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {
         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).enforcing().loadByIDNullableAsync(parent.getID())
@@ -518,70 +392,17 @@ describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {
       // two calls for only parent trigger, one beforeDelete, one afterDelete
       // when using set null the descendants aren't deleted
       expect(triggerExecutionCounts).toMatchObject({
-        ParentEntity: 2,
-        ChildEntity: 0,
-        GrandChildEntity: 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]: [],
-        },
+        parent: 2,
+        child: 0,
+        grandchild: 0,
       });
     });
   });
 
   describe('EntityEdgeDeletionBehavior.CASCADE_DELETE_INVALIDATE_CACHE', () => {
     it('invalidates the cache', async () => {
-      const {
-        ParentEntity,
-        ChildEntity,
-        GrandChildEntity,
-        triggerExecutionCounts,
-        privacyPolicyEvaluationRecords,
-      } = makeEntityClasses(EntityEdgeDeletionBehavior.CASCADE_DELETE_INVALIDATE_CACHE);
+      const { ParentEntity, ChildEntity, GrandChildEntity, triggerExecutionCounts } =
+        makeEntityClasses(EntityEdgeDeletionBehavior.CASCADE_DELETE_INVALIDATE_CACHE);
 
       const companionProvider = createUnitTestEntityCompanionProvider();
       const viewerContext = new TestViewerContext(companionProvider);
@@ -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);
@@ -650,69 +469,9 @@ describe('EntityMutator.processEntityDeletionForInboundEdgesAsync', () => {
 
       // two calls for each trigger, one beforeDelete, one afterDelete
       expect(triggerExecutionCounts).toMatchObject({
-        ParentEntity: 2,
-        ChildEntity: 2,
-        GrandChildEntity: 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,
-                },
-              },
-            },
-          ],
-        },
+        parent: 2,
+        child: 2,
+        grandchild: 2,
       });
     });
   });

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,

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,7 +69,6 @@ describe(EntityLoader, () => {
     const entityLoader = new EntityLoader(
       viewerContext,
       queryContext,
-      privacyPolicyEvaluationContext,
       testEntityConfiguration,
       TestEntity,
       privacyPolicy,
@@ -116,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();
 
@@ -173,7 +169,6 @@ describe(EntityLoader, () => {
     const entityLoader = new EntityLoader(
       viewerContext,
       queryContext,
-      privacyPolicyEvaluationContext,
       testEntityConfiguration,
       TestEntity,
       privacyPolicy,
@@ -197,7 +192,6 @@ describe(EntityLoader, () => {
       spiedPrivacyPolicy.authorizeReadAsync(
         viewerContext,
         queryContext,
-        privacyPolicyEvaluationContext,
         anyOfClass(TestEntity),
         anything()
       )
@@ -215,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();
 
@@ -254,7 +247,6 @@ describe(EntityLoader, () => {
     const entityLoader = new EntityLoader(
       viewerContext,
       queryContext,
-      privacyPolicyEvaluationContext,
       testEntityConfiguration,
       TestEntity,
       privacyPolicy,
@@ -263,19 +255,12 @@ describe(EntityLoader, () => {
     );
     const entity = await enforceAsyncResult(entityLoader.loadByIDAsync(id1));
     verify(
-      spiedPrivacyPolicy.authorizeReadAsync(
-        viewerContext,
-        queryContext,
-        privacyPolicyEvaluationContext,
-        entity,
-        anything()
-      )
+      spiedPrivacyPolicy.authorizeReadAsync(viewerContext, queryContext, 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));
@@ -286,7 +271,6 @@ describe(EntityLoader, () => {
     const entityLoader = new EntityLoader(
       viewerContext,
       queryContext,
-      privacyPolicyEvaluationContext,
       testEntityConfiguration,
       TestEntity,
       privacyPolicy,
@@ -302,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));
@@ -313,7 +296,6 @@ describe(EntityLoader, () => {
     const entityLoader = new EntityLoader(
       viewerContext,
       queryContext,
-      privacyPolicyEvaluationContext,
       testEntityConfiguration,
       TestEntity,
       privacyPolicy,
@@ -328,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));
@@ -343,7 +324,6 @@ describe(EntityLoader, () => {
     const entityLoader = new EntityLoader(
       viewerContext,
       queryContext,
-      privacyPolicyEvaluationContext,
       testEntityConfiguration,
       TestEntity,
       privacyPolicy,
@@ -358,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);
@@ -375,7 +354,6 @@ describe(EntityLoader, () => {
       privacyPolicyMock.authorizeReadAsync(
         viewerContext,
         queryContext,
-        privacyPolicyEvaluationContext,
         anyOfClass(TestEntity),
         anything()
       )
@@ -387,7 +365,6 @@ describe(EntityLoader, () => {
     const entityLoader = new EntityLoader(
       viewerContext,
       queryContext,
-      privacyPolicyEvaluationContext,
       testEntityConfiguration,
       TestEntity,
       privacyPolicy,
@@ -403,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));
@@ -420,7 +396,6 @@ describe(EntityLoader, () => {
     const entityLoader = new EntityLoader(
       viewerContext,
       queryContext,
-      privacyPolicyEvaluationContext,
       testEntityConfiguration,
       TestEntity,
       privacyPolicy,

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
-          .forLoad(viewerContext, queryContext, privacyPolicyEvaluationContext)
-          .loadByIDAsync(id2)
+        entityLoaderFactory.forLoad(viewerContext, queryContext).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
-          .forLoad(viewerContext, queryContext, privacyPolicyEvaluationContext)
-          .loadByIDAsync(id2)
+        entityLoaderFactory.forLoad(viewerContext, queryContext).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
-          .forLoad(viewerContext, queryContext, privacyPolicyEvaluationContext)
-          .loadByIDAsync(id2)
+        entityLoaderFactory.forLoad(viewerContext, queryContext).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
-          .forLoad(viewerContext, queryContext, privacyPolicyEvaluationContext)
-          .loadByIDAsync(id2)
+        entityLoaderFactory.forLoad(viewerContext, queryContext).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
-          .forLoad(viewerContext, queryContext, privacyPolicyEvaluationContext)
-          .loadByIDAsync(id2)
+        entityLoaderFactory.forLoad(viewerContext, queryContext).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
-          .forLoad(viewerContext, queryContext, privacyPolicyEvaluationContext)
-          .loadByIDAsync(id1)
+        entityLoaderFactory.forLoad(viewerContext, queryContext).loadByIDAsync(id1)
       );
       expect(existingEntity).toBeTruthy();
 
-      await entityMutatorFactory
-        .forDelete(existingEntity, queryContext, privacyPolicyEvaluationContext)
-        .enforceDeleteAsync();
+      await entityMutatorFactory.forDelete(existingEntity, queryContext).enforceDeleteAsync();
 
       await expect(
         enforceAsyncResult(
-          entityLoaderFactory
-            .forLoad(viewerContext, queryContext, privacyPolicyEvaluationContext)
-            .loadByIDAsync(id1)
+          entityLoaderFactory.forLoad(viewerContext, queryContext).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
-          .forLoad(viewerContext, queryContext, privacyPolicyEvaluationContext)
-          .loadByIDAsync(id1)
+        entityLoaderFactory.forLoad(viewerContext, queryContext).loadByIDAsync(id1)
       );
 
-      await entityMutatorFactory
-        .forDelete(existingEntity, queryContext, privacyPolicyEvaluationContext)
-        .enforceDeleteAsync();
+      await entityMutatorFactory.forDelete(existingEntity, queryContext).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
-          .forLoad(viewerContext, queryContext, privacyPolicyEvaluationContext)
-          .loadByIDAsync(id1)
+        entityLoaderFactory.forLoad(viewerContext, queryContext).loadByIDAsync(id1)
       );
 
-      await entityMutatorFactory
-        .forDelete(existingEntity, queryContext, privacyPolicyEvaluationContext)
-        .enforceDeleteAsync();
+      await entityMutatorFactory.forDelete(existingEntity, queryContext).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
-          .forLoad(viewerContext, queryContext, privacyPolicyEvaluationContext)
-          .loadByIDAsync(id1)
+        entityLoaderFactory.forLoad(viewerContext, queryContext).loadByIDAsync(id1)
       );
 
-      await entityMutatorFactory
-        .forDelete(existingEntity, queryContext, privacyPolicyEvaluationContext)
-        .enforceDeleteAsync();
+      await entityMutatorFactory.forDelete(existingEntity, queryContext).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,21 +836,21 @@ describe(EntityMutatorFactory, () => {
 
     const entites1 = await enforceResultsAsync(
       entityLoaderFactory
-        .forLoad(viewerContext, queryContext, privacyPolicyEvaluationContext)
+        .forLoad(viewerContext, queryContext)
         .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)
         .loadManyByFieldEqualingAsync('stringField', 'huh')
     );
     expect(entities2).toHaveLength(2);
@@ -903,7 +858,6 @@ describe(EntityMutatorFactory, () => {
 
   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
-        .forCreate(viewerContext, queryContext, privacyPolicyEvaluationContext)
-        .createAsync()
+      entityMutatorFactory.forCreate(viewerContext, queryContext).createAsync()
     ).rejects.toEqual(rejectionError);
     await expect(
-      entityMutatorFactory
-        .forUpdate(fakeEntity, queryContext, privacyPolicyEvaluationContext)
-        .updateAsync()
+      entityMutatorFactory.forUpdate(fakeEntity, queryContext).updateAsync()
     ).rejects.toEqual(rejectionError);
     await expect(
-      entityMutatorFactory
-        .forDelete(fakeEntity, queryContext, privacyPolicyEvaluationContext)
-        .deleteAsync()
+      entityMutatorFactory.forDelete(fakeEntity, queryContext).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(
-      entityMutatorFactory
-        .forDelete(newEntity, queryContext, privacyPolicyEvaluationContext)
-        .deleteAsync()
-    );
+    await enforceAsyncResult(entityMutatorFactory.forDelete(newEntity, queryContext).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(
-          viewerContext,
-          queryContext,
-          privacyPolicyEvaluationContext,
-          entity,
-          metricsAdapter
-        )
+        policy.authorizeCreateAsync(viewerContext, queryContext, 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(
-          viewerContext,
-          queryContext,
-          privacyPolicyEvaluationContext,
-          entity,
-          metricsAdapter
-        )
+        policy.authorizeCreateAsync(viewerContext, queryContext, 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(
-          viewerContext,
-          queryContext,
-          privacyPolicyEvaluationContext,
-          entity,
-          metricsAdapter
-        )
+        policy.authorizeCreateAsync(viewerContext, queryContext, 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(
-          viewerContext,
-          queryContext,
-          privacyPolicyEvaluationContext,
-          entity,
-          metricsAdapter
-        )
+        policy.authorizeCreateAsync(viewerContext, queryContext, 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(
-          viewerContext,
-          queryContext,
-          privacyPolicyEvaluationContext,
-          entity,
-          metricsAdapter
-        )
+        policy.authorizeCreateAsync(viewerContext, queryContext, 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(
-          viewerContext,
-          queryContext,
-          privacyPolicyEvaluationContext,
-          entity,
-          metricsAdapter
-        )
+        policy.authorizeCreateAsync(viewerContext, queryContext, 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(
-          viewerContext,
-          queryContext,
-          privacyPolicyEvaluationContext,
-          entity,
-          metricsAdapter
-        )
+        policy.authorizeCreateAsync(viewerContext, queryContext, 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__/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(
-      baseMutatorFactory.forCreate(viewerContext, queryContext, privacyPolicyEvaluationContext)
-    ).once();
+    verify(baseMutatorFactory.forCreate(viewerContext, queryContext)).once();
   });
 });

packages/entity/src/index.ts

@@ -4,7 +4,6 @@
  * @module @expo/entity
  */
 
-export { default as GenericSecondaryEntityCache } from './GenericSecondaryEntityCache';
 export { default as EnforcingEntityLoader } from './EnforcingEntityLoader';
 export { default as Entity } from './Entity';
 export * from './Entity';
@@ -44,7 +43,6 @@ export * from './EntityQueryContext';
 export { default as IEntityCacheAdapterProvider } from './IEntityCacheAdapterProvider';
 export { default as IEntityDatabaseAdapterProvider } from './IEntityDatabaseAdapterProvider';
 export { default as EntityQueryContextProvider } from './EntityQueryContextProvider';
-export { default as IEntityGenericCacher } from './IEntityGenericCacher';
 export { default as ReadonlyEntity } from './ReadonlyEntity';
 export { default as ViewerContext } from './ViewerContext';
 export { default as ViewerScopedEntityCompanion } from './ViewerScopedEntityCompanion';

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(
-            caseKey
-          )!();
+          const { viewerContext, queryContext, entity } = await allowCases.get(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(
-            caseKey
-          )!();
+          const { viewerContext, queryContext, entity } = await skipCases.get(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(
-            caseKey
-          )!();
+          const { viewerContext, queryContext, entity } = await denyCases.get(caseKey)!();
           await expect(
-            privacyPolicyRule.evaluateAsync(viewerContext, queryContext, evaluationContext, entity)
+            privacyPolicyRule.evaluateAsync(viewerContext, queryContext, entity)
           ).resolves.toEqual(RuleEvaluationResult.DENY);
         });
       });

yarn.lock

@@ -507,38 +507,28 @@
     exec-sh "^0.3.2"
     minimist "^1.2.0"
 
-"@expo/entity-cache-adapter-local-memory@file:packages/entity-cache-adapter-local-memory":
-  version "0.24.0"
-  dependencies:
-    lru-cache "^7.3.1"
-
 "@expo/entity-cache-adapter-redis@file:packages/entity-cache-adapter-redis":
-  version "0.24.0"
+  version "0.21.0"
   dependencies:
     ioredis "^4.27.3"
 
 "@expo/entity-database-adapter-knex@file:packages/entity-database-adapter-knex":
-  version "0.24.0"
+  version "0.21.0"
   dependencies:
     knex "^1.0.2"
 
 "@expo/entity-ip-address-field@file:packages/entity-ip-address-field":
-  version "0.24.0"
+  version "0.21.0"
   dependencies:
     ip-address "^8.1.0"
 
-"@expo/entity-secondary-cache-local-memory@file:packages/entity-secondary-cache-local-memory":
-  version "0.24.0"
-  dependencies:
-    ioredis "^4.17.3"
-
 "@expo/entity-secondary-cache-redis@file:packages/entity-secondary-cache-redis":
-  version "0.24.0"
+  version "0.21.0"
   dependencies:
     ioredis "^4.17.3"
 
 "@expo/entity@file:packages/entity":
-  version "0.24.0"
+  version "0.21.0"
   dependencies:
     "@expo/results" "^1.0.0"
     dataloader "^2.0.0"
@@ -2005,11 +1995,6 @@
   resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.1.tgz#459c65fa1867dafe6a8f322c4c51695663cc55e9"
   integrity sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w==
 
-"@types/lru-cache@^5.1.1":
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/@types/lru-cache/-/lru-cache-5.1.1.tgz#c48c2e27b65d2a153b19bfc1a317e30872e01eef"
-  integrity sha512-ssE3Vlrys7sdIzs5LOxCzTVMsU7i9oa/IaW92wF32JFb3CVczqOkru2xspuKczHEbG3nvmPY7IFqVmGGHdNbYw==
-
 "@types/mime@*":
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.1.tgz#dc488842312a7f075149312905b5e3c0b054c79d"
@@ -6580,11 +6565,6 @@ 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"