@expo/entity-cache-adapter-redis 0.31.1 → 0.33.0

package/build/__tests__/{RedisCacheAdapter-test.js → GenericRedisCacher-test.js}

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const entity_1 = require("@expo/entity");
 const ts_mockito_1 = require("ts-mockito");
-const RedisCacheAdapter_1 = __importDefault(require("../RedisCacheAdapter"));
+const GenericRedisCacher_1 = __importDefault(require("../GenericRedisCacher"));
 const entityConfiguration = new entity_1.EntityConfiguration({
     idField: 'id',
     tableName: 'blah',
@@ -15,39 +15,43 @@ const entityConfiguration = new entity_1.EntityConfiguration({
     databaseAdapterFlavor: 'postgres',
     cacheAdapterFlavor: 'redis',
 });
-describe(RedisCacheAdapter_1.default, () => {
+describe(GenericRedisCacher_1.default, () => {
     describe('loadManyAsync', () => {
         it('returns appropriate cache results', async () => {
             const redisResults = new Map();
             const mockRedisClient = (0, ts_mockito_1.mock)();
             // need to have one anything() for each element of spread, in this case 3
-            (0, ts_mockito_1.when)(mockRedisClient.mget((0, ts_mockito_1.anything)(), (0, ts_mockito_1.anything)(), (0, ts_mockito_1.anything)())).thenCall(async (...keys) => keys.map((k) => { var _a; return (_a = redisResults.get(k)) !== null && _a !== void 0 ? _a : null; }));
-            const cacheAdapter = new RedisCacheAdapter_1.default(entityConfiguration, {
+            (0, ts_mockito_1.when)(mockRedisClient.mget((0, ts_mockito_1.anything)(), (0, ts_mockito_1.anything)(), (0, ts_mockito_1.anything)())).thenCall(async (...keys) => keys.map((k) => redisResults.get(k) ?? null));
+            const genericCacher = new GenericRedisCacher_1.default({
                 redisClient: (0, ts_mockito_1.instance)(mockRedisClient),
                 makeKeyFn: (...parts) => parts.join(':'),
-                cacheKeyVersion: 1,
                 cacheKeyPrefix: 'hello-',
                 ttlSecondsPositive: 1,
                 ttlSecondsNegative: 2,
+            }, entityConfiguration);
+            const cacheKeyWat = genericCacher['makeCacheKey']('id', 'wat');
+            const cacheKeyWho = genericCacher['makeCacheKey']('id', 'who');
+            const cacheKeyWhy = genericCacher['makeCacheKey']('id', 'why');
+            redisResults.set(cacheKeyWat, JSON.stringify({ id: 'wat' }));
+            redisResults.set(cacheKeyWho, '');
+            const results = await genericCacher.loadManyAsync([cacheKeyWat, cacheKeyWho, cacheKeyWhy]);
+            expect(results.get(cacheKeyWat)).toMatchObject({
+                status: entity_1.CacheStatus.HIT,
+                item: { id: 'wat' },
             });
-            redisResults.set(cacheAdapter['makeCacheKey']('id', 'wat'), JSON.stringify({ id: 'wat' }));
-            redisResults.set(cacheAdapter['makeCacheKey']('id', 'who'), '');
-            const results = await cacheAdapter.loadManyAsync('id', ['wat', 'who', 'why']);
-            expect(results.get('wat')).toMatchObject({ status: entity_1.CacheStatus.HIT, item: { id: 'wat' } });
-            expect(results.get('who')).toMatchObject({ status: entity_1.CacheStatus.NEGATIVE });
-            expect(results.get('why')).toMatchObject({ status: entity_1.CacheStatus.MISS });
+            expect(results.get(cacheKeyWho)).toMatchObject({ status: entity_1.CacheStatus.NEGATIVE });
+            expect(results.get(cacheKeyWhy)).toMatchObject({ status: entity_1.CacheStatus.MISS });
             expect(results.size).toBe(3);
         });
         it('returns empty map when passed empty array of fieldValues', async () => {
-            const cacheAdapter = new RedisCacheAdapter_1.default(entityConfiguration, {
+            const genericCacher = new GenericRedisCacher_1.default({
                 redisClient: (0, ts_mockito_1.instance)((0, ts_mockito_1.mock)()),
                 makeKeyFn: (...parts) => parts.join(':'),
-                cacheKeyVersion: 1,
                 cacheKeyPrefix: 'hello-',
                 ttlSecondsPositive: 1,
                 ttlSecondsNegative: 2,
-            });
-            const results = await cacheAdapter.loadManyAsync('id', []);
+            }, entityConfiguration);
+            const results = await genericCacher.loadManyAsync([]);
             expect(results).toEqual(new Map());
         });
     });
@@ -63,16 +67,15 @@ describe(RedisCacheAdapter_1.default, () => {
             const pipeline = (0, ts_mockito_1.instance)(mockPipeline);
             const mockRedisClient = (0, ts_mockito_1.mock)();
             (0, ts_mockito_1.when)(mockRedisClient.multi()).thenReturn(pipeline);
-            const cacheAdapter = new RedisCacheAdapter_1.default(entityConfiguration, {
+            const genericCacher = new GenericRedisCacher_1.default({
                 redisClient: (0, ts_mockito_1.instance)(mockRedisClient),
                 makeKeyFn: (...parts) => parts.join(':'),
-                cacheKeyVersion: 1,
                 cacheKeyPrefix: 'hello-',
                 ttlSecondsPositive: 1,
                 ttlSecondsNegative: 2,
-            });
-            await cacheAdapter.cacheManyAsync('id', new Map([['wat', { id: 'wat' }]]));
-            const cacheKey = cacheAdapter['makeCacheKey']('id', 'wat');
+            }, entityConfiguration);
+            const cacheKey = genericCacher['makeCacheKey']('id', 'wat');
+            await genericCacher.cacheManyAsync(new Map([[cacheKey, { id: 'wat' }]]));
             expect(redisResults.get(cacheKey)).toMatchObject({
                 value: JSON.stringify({ id: 'wat' }),
                 code: 'EX',
@@ -92,16 +95,15 @@ describe(RedisCacheAdapter_1.default, () => {
             const pipeline = (0, ts_mockito_1.instance)(mockPipeline);
             const mockRedisClient = (0, ts_mockito_1.mock)();
             (0, ts_mockito_1.when)(mockRedisClient.multi()).thenReturn(pipeline);
-            const cacheAdapter = new RedisCacheAdapter_1.default(entityConfiguration, {
+            const genericCacher = new GenericRedisCacher_1.default({
                 redisClient: (0, ts_mockito_1.instance)(mockRedisClient),
                 makeKeyFn: (...parts) => parts.join(':'),
-                cacheKeyVersion: 1,
                 cacheKeyPrefix: 'hello-',
                 ttlSecondsPositive: 1,
                 ttlSecondsNegative: 2,
-            });
-            await cacheAdapter.cacheDBMissesAsync('id', ['wat']);
-            const cacheKey = cacheAdapter['makeCacheKey']('id', 'wat');
+            }, entityConfiguration);
+            const cacheKey = genericCacher['makeCacheKey']('id', 'wat');
+            await genericCacher.cacheDBMissesAsync([cacheKey]);
             expect(redisResults.get(cacheKey)).toMatchObject({
                 value: '',
                 code: 'EX',
@@ -113,29 +115,27 @@ describe(RedisCacheAdapter_1.default, () => {
         it('invalidates correctly', async () => {
             const mockRedisClient = (0, ts_mockito_1.mock)();
             (0, ts_mockito_1.when)(mockRedisClient.del()).thenResolve(1);
-            const cacheAdapter = new RedisCacheAdapter_1.default(entityConfiguration, {
+            const genericCacher = new GenericRedisCacher_1.default({
                 redisClient: (0, ts_mockito_1.instance)(mockRedisClient),
                 makeKeyFn: (...parts) => parts.join(':'),
-                cacheKeyVersion: 1,
                 cacheKeyPrefix: 'hello-',
                 ttlSecondsPositive: 1,
                 ttlSecondsNegative: 2,
-            });
-            await cacheAdapter.invalidateManyAsync('id', ['wat']);
-            const cacheKey = cacheAdapter['makeCacheKey']('id', 'wat');
+            }, entityConfiguration);
+            const cacheKey = genericCacher['makeCacheKey']('id', 'wat');
+            await genericCacher.invalidateManyAsync([cacheKey]);
             (0, ts_mockito_1.verify)(mockRedisClient.del(cacheKey)).once();
         });
         it('returns when passed empty array of fieldValues', async () => {
-            const cacheAdapter = new RedisCacheAdapter_1.default(entityConfiguration, {
+            const genericCacher = new GenericRedisCacher_1.default({
                 redisClient: (0, ts_mockito_1.instance)((0, ts_mockito_1.mock)()),
                 makeKeyFn: (...parts) => parts.join(':'),
-                cacheKeyVersion: 1,
                 cacheKeyPrefix: 'hello-',
                 ttlSecondsPositive: 1,
                 ttlSecondsNegative: 2,
-            });
-            await cacheAdapter.invalidateManyAsync('id', []);
+            }, entityConfiguration);
+            await genericCacher.invalidateManyAsync([]);
         });
     });
 });
-//# sourceMappingURL=RedisCacheAdapter-test.js.map
+//# sourceMappingURL=GenericRedisCacher-test.js.map

package/build/__tests__/GenericRedisCacher-test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"GenericRedisCacher-test.js","sourceRoot":"","sources":["../../src/__tests__/GenericRedisCacher-test.ts"],"names":[],"mappings":"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"}

package/build/index.d.ts

@@ -2,8 +2,6 @@
  * @packageDocumentation
  * @module @expo/entity-cache-adapter-redis
  */
-export { default as RedisCacheAdapter } from './RedisCacheAdapter';
-export * from './RedisCacheAdapter';
 export { default as RedisCacheAdapterProvider } from './RedisCacheAdapterProvider';
 export * from './RedisCommon';
 export { default as GenericRedisCacher } from './GenericRedisCacher';

package/build/index.js

@@ -22,10 +22,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GenericRedisCacher = exports.RedisCacheAdapterProvider = exports.RedisCacheAdapter = void 0;
-var RedisCacheAdapter_1 = require("./RedisCacheAdapter");
-Object.defineProperty(exports, "RedisCacheAdapter", { enumerable: true, get: function () { return __importDefault(RedisCacheAdapter_1).default; } });
-__exportStar(require("./RedisCacheAdapter"), exports);
+exports.GenericRedisCacher = exports.RedisCacheAdapterProvider = void 0;
 var RedisCacheAdapterProvider_1 = require("./RedisCacheAdapterProvider");
 Object.defineProperty(exports, "RedisCacheAdapterProvider", { enumerable: true, get: function () { return __importDefault(RedisCacheAdapterProvider_1).default; } });
 __exportStar(require("./RedisCommon"), exports);

package/build/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA,iCAAiC;AACjC;;;GAGG;;;;;;;;;;;;;;;;;;;;AAEH,yDAAmE;AAA1D,uIAAA,OAAO,OAAqB;AACrC,sDAAoC;AACpC,yEAAmF;AAA1E,uJAAA,OAAO,OAA6B;AAC7C,gDAA8B;AAC9B,2DAAqE;AAA5D,yIAAA,OAAO,OAAsB;AACtC,uDAAqC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA,iCAAiC;AACjC;;;GAGG;;;;;;;;;;;;;;;;;;;;AAEH,yEAAmF;AAA1E,uJAAA,OAAO,OAA6B;AAC7C,gDAA8B;AAC9B,2DAAqE;AAA5D,yIAAA,OAAO,OAAsB;AACtC,uDAAqC"}

package/build/testfixtures/RedisTestEntity.d.ts

@@ -1,11 +1,11 @@
 import { AlwaysAllowPrivacyPolicyRule, EntityPrivacyPolicy, ViewerContext, EntityConfiguration, EntityCompanionDefinition, Entity } from '@expo/entity';
-export declare type RedisTestEntityFields = {
+export type RedisTestEntityFields = {
     id: string;
     name: string;
     dateField: Date | null;
 };
 export default class RedisTestEntity extends Entity<RedisTestEntityFields, string, ViewerContext> {
-    static getCompanionDefinition(): EntityCompanionDefinition<RedisTestEntityFields, string, ViewerContext, RedisTestEntity, RedisTestEntityPrivacyPolicy>;
+    static defineCompanionDefinition(): EntityCompanionDefinition<RedisTestEntityFields, string, ViewerContext, RedisTestEntity, RedisTestEntityPrivacyPolicy>;
 }
 export declare class RedisTestEntityPrivacyPolicy extends EntityPrivacyPolicy<RedisTestEntityFields, string, ViewerContext, RedisTestEntity> {
     protected readonly createRules: AlwaysAllowPrivacyPolicyRule<RedisTestEntityFields, string, ViewerContext, RedisTestEntity, keyof RedisTestEntityFields>[];

package/build/testfixtures/RedisTestEntity.js

@@ -3,8 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.redisTestEntityConfiguration = exports.RedisTestEntityPrivacyPolicy = void 0;
 const entity_1 = require("@expo/entity");
 class RedisTestEntity extends entity_1.Entity {
-    static getCompanionDefinition() {
-        return redisTestEntityCompanionDefinition;
+    static defineCompanionDefinition() {
+        return {
+            entityClass: RedisTestEntity,
+            entityConfiguration: exports.redisTestEntityConfiguration,
+            privacyPolicyClass: RedisTestEntityPrivacyPolicy,
+        };
     }
 }
 exports.default = RedisTestEntity;
@@ -45,9 +49,4 @@ exports.redisTestEntityConfiguration = new entity_1.EntityConfiguration({
     databaseAdapterFlavor: 'postgres',
     cacheAdapterFlavor: 'redis',
 });
-const redisTestEntityCompanionDefinition = new entity_1.EntityCompanionDefinition({
-    entityClass: RedisTestEntity,
-    entityConfiguration: exports.redisTestEntityConfiguration,
-    privacyPolicyClass: RedisTestEntityPrivacyPolicy,
-});
 //# sourceMappingURL=RedisTestEntity.js.map

package/build/testfixtures/RedisTestEntity.js.map

@@ -1 +1 @@
-{"version":3,"file":"RedisTestEntity.js","sourceRoot":"","sources":["../../src/testfixtures/RedisTestEntity.ts"],"names":[],"mappings":";;;AAAA,yCAUsB;AAQtB,MAAqB,eAAgB,SAAQ,eAAoD;IAC/F,MAAM,CAAC,sBAAsB;QAO3B,OAAO,kCAAkC,CAAC;IAC5C,CAAC;CACF;AAVD,kCAUC;AAED,MAAa,4BAA6B,SAAQ,4BAKjD;IALD;;QAM8B,gBAAW,GAAG;YACxC,IAAI,qCAA4B,EAK7B;SACJ,CAAC;QAC0B,cAAS,GAAG;YACtC,IAAI,qCAA4B,EAK7B;SACJ,CAAC;QAC0B,gBAAW,GAAG;YACxC,IAAI,qCAA4B,EAK7B;SACJ,CAAC;QAC0B,gBAAW,GAAG;YACxC,IAAI,qCAA4B,EAK7B;SACJ,CAAC;IACJ,CAAC;CAAA;AAtCD,oEAsCC;AAEY,QAAA,4BAA4B,GAAG,IAAI,4BAAmB,CAAwB;IACzF,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,qBAAqB;IAChC,MAAM,EAAE;QACN,EAAE,EAAE,IAAI,kBAAS,CAAC;YAChB,UAAU,EAAE,IAAI;YAChB,KAAK,EAAE,IAAI;SACZ,CAAC;QACF,IAAI,EAAE,IAAI,oBAAW,CAAC;YACpB,UAAU,EAAE,MAAM;YAClB,KAAK,EAAE,IAAI;SACZ,CAAC;QACF,SAAS,EAAE,IAAI,kBAAS,CAAC;YACvB,UAAU,EAAE,YAAY;SACzB,CAAC;KACH;IACD,qBAAqB,EAAE,UAAU;IACjC,kBAAkB,EAAE,OAAO;CAC5B,CAAC,CAAC;AAEH,MAAM,kCAAkC,GAAG,IAAI,kCAAyB,CAAC;IACvE,WAAW,EAAE,eAAe;IAC5B,mBAAmB,EAAE,oCAA4B;IACjD,kBAAkB,EAAE,4BAA4B;CACjD,CAAC,CAAC"}
+{"version":3,"file":"RedisTestEntity.js","sourceRoot":"","sources":["../../src/testfixtures/RedisTestEntity.ts"],"names":[],"mappings":";;;AAAA,yCAUsB;AAQtB,MAAqB,eAAgB,SAAQ,eAAoD;IAC/F,MAAM,CAAC,yBAAyB;QAO9B,OAAO;YACL,WAAW,EAAE,eAAe;YAC5B,mBAAmB,EAAE,oCAA4B;YACjD,kBAAkB,EAAE,4BAA4B;SACjD,CAAC;IACJ,CAAC;CACF;AAdD,kCAcC;AAED,MAAa,4BAA6B,SAAQ,4BAKjD;IALD;;QAM8B,gBAAW,GAAG;YACxC,IAAI,qCAA4B,EAK7B;SACJ,CAAC;QAC0B,cAAS,GAAG;YACtC,IAAI,qCAA4B,EAK7B;SACJ,CAAC;QAC0B,gBAAW,GAAG;YACxC,IAAI,qCAA4B,EAK7B;SACJ,CAAC;QAC0B,gBAAW,GAAG;YACxC,IAAI,qCAA4B,EAK7B;SACJ,CAAC;IACJ,CAAC;CAAA;AAtCD,oEAsCC;AAEY,QAAA,4BAA4B,GAAG,IAAI,4BAAmB,CAAwB;IACzF,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,qBAAqB;IAChC,MAAM,EAAE;QACN,EAAE,EAAE,IAAI,kBAAS,CAAC;YAChB,UAAU,EAAE,IAAI;YAChB,KAAK,EAAE,IAAI;SACZ,CAAC;QACF,IAAI,EAAE,IAAI,oBAAW,CAAC;YACpB,UAAU,EAAE,MAAM;YAClB,KAAK,EAAE,IAAI;SACZ,CAAC;QACF,SAAS,EAAE,IAAI,kBAAS,CAAC;YACvB,UAAU,EAAE,YAAY;SACzB,CAAC;KACH;IACD,qBAAqB,EAAE,UAAU;IACjC,kBAAkB,EAAE,OAAO;CAC5B,CAAC,CAAC"}

package/build/testfixtures/createRedisIntegrationTestEntityCompanionProvider.d.ts

@@ -1,3 +1,3 @@
 import { IEntityMetricsAdapter, EntityCompanionProvider } from '@expo/entity';
-import { RedisCacheAdapterContext } from '../RedisCacheAdapter';
-export declare const createRedisIntegrationTestEntityCompanionProvider: (redisCacheAdapterContext: RedisCacheAdapterContext, metricsAdapter?: IEntityMetricsAdapter) => EntityCompanionProvider;
+import { GenericRedisCacheContext } from '../GenericRedisCacher';
+export declare const createRedisIntegrationTestEntityCompanionProvider: (genericRedisCacheContext: GenericRedisCacheContext, metricsAdapter?: IEntityMetricsAdapter) => EntityCompanionProvider;

package/build/testfixtures/createRedisIntegrationTestEntityCompanionProvider.js

@@ -8,7 +8,7 @@ const entity_1 = require("@expo/entity");
 const RedisCacheAdapterProvider_1 = __importDefault(require("../RedisCacheAdapterProvider"));
 // share across all in calls in test to simulate postgres
 const adapterProvider = new entity_1.StubDatabaseAdapterProvider();
-const createRedisIntegrationTestEntityCompanionProvider = (redisCacheAdapterContext, metricsAdapter = new entity_1.NoOpEntityMetricsAdapter()) => {
+const createRedisIntegrationTestEntityCompanionProvider = (genericRedisCacheContext, metricsAdapter = new entity_1.NoOpEntityMetricsAdapter()) => {
     return new entity_1.EntityCompanionProvider(metricsAdapter, new Map([
         [
             'postgres',
@@ -21,7 +21,7 @@ const createRedisIntegrationTestEntityCompanionProvider = (redisCacheAdapterCont
         [
             'redis',
             {
-                cacheAdapterProvider: new RedisCacheAdapterProvider_1.default(redisCacheAdapterContext),
+                cacheAdapterProvider: new RedisCacheAdapterProvider_1.default(genericRedisCacheContext),
             },
         ],
     ]));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/entity-cache-adapter-redis",
-  "version": "0.31.1",
+  "version": "0.33.0",
   "description": "Redis cache adapter for @expo/entity",
   "files": [
     "build",
@@ -19,7 +19,7 @@
     "barrelsby": "barrelsby --directory src --location top --exclude tests__ --singleQuotes --exportDefault --delete"
   },
   "engines": {
-    "node": ">=12"
+    "node": ">=16"
   },
   "keywords": [
     "entity"
@@ -31,8 +31,8 @@
     "ioredis": ">=5"
   },
   "devDependencies": {
-    "@expo/entity": "^0.31.1",
+    "@expo/entity": "^0.33.0",
     "ioredis": "^5.2.5"
   },
-  "gitHead": "83fe9cdea5b0cd69f38ac58eed12e96d5fa51d07"
+  "gitHead": "659e08386f2c5e33e9ac4c670fd832a62a2b6382"
 }

package/src/GenericRedisCacher.ts

@@ -6,6 +6,7 @@ import {
   transformFieldsToCacheObject,
   IEntityGenericCacher,
 } from '@expo/entity';
+import invariant from 'invariant';
 
 import { redisTransformerMap } from './RedisCommon';
 import wrapNativeRedisCallAsync from './errors/wrapNativeRedisCallAsync';
@@ -31,6 +32,18 @@ export interface GenericRedisCacheContext {
    */
   redisClient: IRedis;
 
+  /**
+   * Create a key string for key parts (cache key prefix, versions, entity name, etc).
+   * Most commonly a simple `parts.join(':')`. See integration test for example.
+   */
+  makeKeyFn: (...parts: string[]) => string;
+
+  /**
+   * Prefix prepended to all entity cache keys. Useful for adding a short, human-readable
+   * distintion for entity keys, e.g. `ent-`
+   */
+  cacheKeyPrefix: string;
+
   /**
    * TTL for caching database hits. Successive entity loads within this TTL
    * will be read from cache (unless invalidated).
@@ -131,4 +144,19 @@ export default class GenericRedisCacher<TFields> implements IEntityGenericCacher
 
     await wrapNativeRedisCallAsync(() => this.context.redisClient.del(...keys));
   }
+
+  public 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 ${String(fieldName)}`);
+    return this.context.makeKeyFn(
+      this.context.cacheKeyPrefix,
+      this.entityConfiguration.tableName,
+      `v2.${this.entityConfiguration.cacheKeyVersion}`,
+      columnName,
+      String(fieldValue)
+    );
+  }
 }

package/src/RedisCacheAdapterProvider.ts

@@ -1,13 +1,18 @@
-import { IEntityCacheAdapterProvider, EntityConfiguration, EntityCacheAdapter } from '@expo/entity';
+import {
+  IEntityCacheAdapterProvider,
+  EntityConfiguration,
+  IEntityCacheAdapter,
+  GenericEntityCacheAdapter,
+} from '@expo/entity';
 
-import RedisCacheAdapter, { RedisCacheAdapterContext } from './RedisCacheAdapter';
+import GenericRedisCacher, { GenericRedisCacheContext } from './GenericRedisCacher';
 
 export default class RedisCacheAdapterProvider implements IEntityCacheAdapterProvider {
-  constructor(private readonly context: RedisCacheAdapterContext) {}
+  constructor(private readonly context: GenericRedisCacheContext) {}
 
   getCacheAdapter<TFields>(
     entityConfiguration: EntityConfiguration<TFields>
-  ): EntityCacheAdapter<TFields> {
-    return new RedisCacheAdapter(entityConfiguration, this.context);
+  ): IEntityCacheAdapter<TFields> {
+    return new GenericEntityCacheAdapter(new GenericRedisCacher(this.context, entityConfiguration));
   }
 }

package/src/__integration-tests__/BatchedRedisCacheAdapter-integration-test.ts

@@ -6,8 +6,11 @@ import nullthrows from 'nullthrows';
 import { URL } from 'url';
 import { v4 as uuidv4 } from 'uuid';
 
-import { IRedis, IRedisTransaction } from '../GenericRedisCacher';
-import RedisCacheAdapter, { RedisCacheAdapterContext } from '../RedisCacheAdapter';
+import GenericRedisCacher, {
+  IRedis,
+  IRedisTransaction,
+  GenericRedisCacheContext,
+} from '../GenericRedisCacher';
 import RedisTestEntity from '../testfixtures/RedisTestEntity';
 import { createRedisIntegrationTestEntityCompanionProvider } from '../testfixtures/createRedisIntegrationTestEntityCompanionProvider';
 
@@ -54,14 +57,14 @@ class BatchedRedis implements IRedis {
   }
 }
 
-describe(RedisCacheAdapter, () => {
+describe(GenericRedisCacher, () => {
   const redis = new Redis(new URL(process.env['REDIS_URL']!).toString());
   const redisClient = new BatchedRedis(redis);
 
-  let redisCacheAdapterContext: RedisCacheAdapterContext;
+  let genericRedisCacheContext: GenericRedisCacheContext;
 
   beforeAll(() => {
-    redisCacheAdapterContext = {
+    genericRedisCacheContext = {
       redisClient,
       makeKeyFn(...parts: string[]): string {
         const delimiter = ':';
@@ -71,7 +74,6 @@ describe(RedisCacheAdapter, () => {
         return escapedParts.join(delimiter);
       },
       cacheKeyPrefix: 'test-',
-      cacheKeyVersion: 1,
       ttlSecondsPositive: 86400, // 1 day
       ttlSecondsNegative: 600, // 10 minutes
     };
@@ -88,16 +90,16 @@ describe(RedisCacheAdapter, () => {
   it('has correct caching behavior', async () => {
     // simulate two requests
     const viewerContext = new ViewerContext(
-      createRedisIntegrationTestEntityCompanionProvider(redisCacheAdapterContext)
+      createRedisIntegrationTestEntityCompanionProvider(genericRedisCacheContext)
     );
 
     const mgetSpy = jest.spyOn(redis, 'mget');
 
-    const cacheAdapter = viewerContext.entityCompanionProvider.getCompanionForEntity(
-      RedisTestEntity,
-      RedisTestEntity.getCompanionDefinition()
-    )['tableDataCoordinator']['cacheAdapter'];
-    const cacheKeyMaker = cacheAdapter['makeCacheKey'].bind(cacheAdapter);
+    const genericCacher =
+      viewerContext.entityCompanionProvider.getCompanionForEntity(RedisTestEntity)[
+        'tableDataCoordinator'
+      ]['cacheAdapter']['genericCacher'];
+    const cacheKeyMaker = genericCacher['makeCacheKey'].bind(genericCacher);
 
     const entity1Created = await RedisTestEntity.creator(viewerContext)
       .setField('name', 'blah')
@@ -106,13 +108,13 @@ describe(RedisCacheAdapter, () => {
     // loading an entity should put it in cache. load by multiple requests and multiple fields in same tick to ensure batch works
     mgetSpy.mockClear();
     const viewerContext1 = new ViewerContext(
-      createRedisIntegrationTestEntityCompanionProvider(redisCacheAdapterContext)
+      createRedisIntegrationTestEntityCompanionProvider(genericRedisCacheContext)
     );
     const viewerContext2 = new ViewerContext(
-      createRedisIntegrationTestEntityCompanionProvider(redisCacheAdapterContext)
+      createRedisIntegrationTestEntityCompanionProvider(genericRedisCacheContext)
     );
     const viewerContext3 = new ViewerContext(
-      createRedisIntegrationTestEntityCompanionProvider(redisCacheAdapterContext)
+      createRedisIntegrationTestEntityCompanionProvider(genericRedisCacheContext)
     );
     const [entity1, entity2, entity3] = await Promise.all([
       RedisTestEntity.loader(viewerContext1).enforcing().loadByIDAsync(entity1Created.getID()),

package/src/__integration-tests__/{RedisCacheAdapter-integration-test.ts → GenericRedisCacher-full-integration-test.ts}

@@ -4,19 +4,18 @@ import Redis from 'ioredis';
 import { URL } from 'url';
 import { v4 as uuidv4 } from 'uuid';
 
-import RedisCacheAdapter, { RedisCacheAdapterContext } from '../RedisCacheAdapter';
+import GenericRedisCacher, { GenericRedisCacheContext } from '../GenericRedisCacher';
 import RedisTestEntity from '../testfixtures/RedisTestEntity';
 import { createRedisIntegrationTestEntityCompanionProvider } from '../testfixtures/createRedisIntegrationTestEntityCompanionProvider';
 
 class TestViewerContext extends ViewerContext {}
 
-describe(RedisCacheAdapter, () => {
-  const redisClient = new Redis(new URL(process.env['REDIS_URL']!).toString());
-  let redisCacheAdapterContext: RedisCacheAdapterContext;
+describe(GenericRedisCacher, () => {
+  let genericRedisCacheContext: GenericRedisCacheContext;
 
   beforeAll(() => {
-    redisCacheAdapterContext = {
-      redisClient,
+    genericRedisCacheContext = {
+      redisClient: new Redis(new URL(process.env['REDIS_URL']!).toString()),
       makeKeyFn(...parts: string[]): string {
         const delimiter = ':';
         const escapedParts = parts.map((part) =>
@@ -25,28 +24,27 @@ describe(RedisCacheAdapter, () => {
         return escapedParts.join(delimiter);
       },
       cacheKeyPrefix: 'test-',
-      cacheKeyVersion: 1,
       ttlSecondsPositive: 86400, // 1 day
       ttlSecondsNegative: 600, // 10 minutes
     };
   });
 
   beforeEach(async () => {
-    await redisClient.flushdb();
+    await (genericRedisCacheContext.redisClient as Redis).flushdb();
   });
   afterAll(async () => {
-    redisClient.disconnect();
+    (genericRedisCacheContext.redisClient as Redis).disconnect();
   });
 
   it('has correct caching behavior', async () => {
     const viewerContext = new TestViewerContext(
-      createRedisIntegrationTestEntityCompanionProvider(redisCacheAdapterContext)
+      createRedisIntegrationTestEntityCompanionProvider(genericRedisCacheContext)
     );
-    const cacheAdapter = viewerContext.entityCompanionProvider.getCompanionForEntity(
-      RedisTestEntity,
-      RedisTestEntity.getCompanionDefinition()
-    )['tableDataCoordinator']['cacheAdapter'];
-    const cacheKeyMaker = cacheAdapter['makeCacheKey'].bind(cacheAdapter);
+    const genericCacher =
+      viewerContext.entityCompanionProvider.getCompanionForEntity(RedisTestEntity)[
+        'tableDataCoordinator'
+      ]['cacheAdapter']['genericCacher'];
+    const cacheKeyMaker = genericCacher['makeCacheKey'].bind(genericCacher);
 
     const entity1Created = await RedisTestEntity.creator(viewerContext)
       .setField('name', 'blah')
@@ -57,7 +55,9 @@ describe(RedisCacheAdapter, () => {
       .enforcing()
       .loadByIDAsync(entity1Created.getID());
 
-    const cachedJSON = await redisClient.get(cacheKeyMaker('id', entity1.getID()));
+    const cachedJSON = await (genericRedisCacheContext.redisClient as Redis).get(
+      cacheKeyMaker('id', entity1.getID())
+    );
     const cachedValue = JSON.parse(cachedJSON!);
     expect(cachedValue).toMatchObject({
       id: entity1.getID(),
@@ -72,7 +72,9 @@ describe(RedisCacheAdapter, () => {
     );
     expect(entityNonExistentResult.ok).toBe(false);
 
-    const nonExistentCachedValue = await redisClient.get(cacheKeyMaker('id', nonExistentId));
+    const nonExistentCachedValue = await (genericRedisCacheContext.redisClient as Redis).get(
+      cacheKeyMaker('id', nonExistentId)
+    );
     expect(nonExistentCachedValue).toEqual('');
 
     // load again through entities framework to ensure it reads negative result
@@ -83,13 +85,15 @@ describe(RedisCacheAdapter, () => {
 
     // invalidate from cache to ensure it invalidates correctly
     await RedisTestEntity.loader(viewerContext).invalidateFieldsAsync(entity1.getAllFields());
-    const cachedValueNull = await redisClient.get(cacheKeyMaker('id', entity1.getID()));
+    const cachedValueNull = await (genericRedisCacheContext.redisClient as Redis).get(
+      cacheKeyMaker('id', entity1.getID())
+    );
     expect(cachedValueNull).toBe(null);
   });
 
   it('caches and restores date fields', async () => {
     const viewerContext = new TestViewerContext(
-      createRedisIntegrationTestEntityCompanionProvider(redisCacheAdapterContext)
+      createRedisIntegrationTestEntityCompanionProvider(genericRedisCacheContext)
     );
     const date = new Date();
     const entity1 = await enforceAsyncResult(
@@ -104,7 +108,7 @@ describe(RedisCacheAdapter, () => {
 
     // simulate new request
     const vc2 = new TestViewerContext(
-      createRedisIntegrationTestEntityCompanionProvider(redisCacheAdapterContext)
+      createRedisIntegrationTestEntityCompanionProvider(genericRedisCacheContext)
     );
     const entity3 = await RedisTestEntity.loader(vc2).enforcing().loadByIDAsync(entity1.getID());
     expect(entity3.getField('dateField')).toEqual(date);
@@ -112,7 +116,7 @@ describe(RedisCacheAdapter, () => {
 
   it('caches and restores empty string field keys', async () => {
     const viewerContext = new TestViewerContext(
-      createRedisIntegrationTestEntityCompanionProvider(redisCacheAdapterContext)
+      createRedisIntegrationTestEntityCompanionProvider(genericRedisCacheContext)
     );
     const entity1 = await enforceAsyncResult(
       RedisTestEntity.creator(viewerContext).setField('name', '').createAsync()
@@ -124,7 +128,7 @@ describe(RedisCacheAdapter, () => {
 
     // simulate new request
     const vc2 = new TestViewerContext(
-      createRedisIntegrationTestEntityCompanionProvider(redisCacheAdapterContext)
+      createRedisIntegrationTestEntityCompanionProvider(genericRedisCacheContext)
     );
     const entity3 = await RedisTestEntity.loader(vc2)
       .enforcing()