@expo/entity-cache-adapter-redis 0.55.0 → 0.58.0

package/README.md

@@ -16,7 +16,7 @@ const genericRedisCacherContext = {
   makeKeyFn(...parts: string[]): string {
     const delimiter = ':';
     const escapedParts = parts.map((part) =>
-      part.replace('\\', '\\\\').replace(delimiter, `\\${delimiter}`)
+      part.replaceAll('\\', '\\\\').replaceAll(delimiter, `\\${delimiter}`)
     );
     return escapedParts.join(delimiter);
   },

package/build/src/GenericRedisCacher.js

@@ -94,7 +94,7 @@ class GenericRedisCacher {
     makeCacheKeyForCacheKeyVersion(key, value, cacheKeyVersion) {
         const cacheKeyType = key.getLoadMethodType();
         const parts = key.createCacheKeyPartsForLoadValue(this.entityConfiguration, value);
-        return this.context.makeKeyFn(this.context.cacheKeyPrefix, cacheKeyType, this.entityConfiguration.tableName, `v2.${cacheKeyVersion}`, ...parts);
+        return this.context.makeKeyFn(this.context.cacheKeyPrefix, cacheKeyType, this.entityConfiguration.tableName, `v3.${cacheKeyVersion}`, ...parts);
     }
     makeCacheKeyForStorage(key, value) {
         return this.makeCacheKeyForCacheKeyVersion(key, value, this.entityConfiguration.cacheKeyVersion);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/entity-cache-adapter-redis",
-  "version": "0.55.0",
+  "version": "0.58.0",
   "description": "Redis cache adapter for @expo/entity",
   "files": [
     "build",
@@ -28,18 +28,18 @@
   "author": "Expo",
   "license": "MIT",
   "dependencies": {
-    "@expo/entity": "^0.55.0"
+    "@expo/entity": "^0.58.0"
   },
   "peerDependencies": {
     "ioredis": ">=5"
   },
   "devDependencies": {
     "@expo/batcher": "1.0.0",
-    "@expo/entity-testing-utils": "^0.55.0",
+    "@expo/entity-testing-utils": "^0.58.0",
     "@jest/globals": "30.2.0",
-    "ioredis": "5.9.2",
+    "ioredis": "5.10.0",
     "ts-mockito": "2.6.1",
     "typescript": "5.9.3"
   },
-  "gitHead": "de7548680dbffb722fb6f5c92106392319782fef"
+  "gitHead": "7dab49a36dafae2adba126ba6084512abab1afe1"
 }

package/src/GenericRedisCacher.ts

@@ -215,7 +215,7 @@ export class GenericRedisCacher<
       this.context.cacheKeyPrefix,
       cacheKeyType,
       this.entityConfiguration.tableName,
-      `v2.${cacheKeyVersion}`,
+      `v3.${cacheKeyVersion}`,
       ...parts,
     );
   }

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

@@ -1,6 +1,6 @@
 import { Batcher } from '@expo/batcher';
 import {
-  IEntityGenericCacher,
+  GenericEntityCacheAdapter,
   SingleFieldHolder,
   SingleFieldValueHolder,
   ViewerContext,
@@ -80,7 +80,7 @@ describe(GenericRedisCacher, () => {
       makeKeyFn(...parts: string[]): string {
         const delimiter = ':';
         const escapedParts = parts.map((part) =>
-          part.replace('\\', '\\\\').replace(delimiter, `\\${delimiter}`),
+          part.replaceAll('\\', '\\\\').replaceAll(delimiter, `\\${delimiter}`),
         );
         return escapedParts.join(delimiter);
       },
@@ -109,12 +109,11 @@ describe(GenericRedisCacher, () => {
 
     const mgetSpy = jest.spyOn(redis, 'mget');
 
-    const genericCacher = viewerContext.entityCompanionProvider.getCompanionForEntity(
-      RedisTestEntity,
-    )['tableDataCoordinator']['cacheAdapter']['genericCacher'] as IEntityGenericCacher<
-      RedisTestEntityFields,
-      'id'
-    >;
+    const genericCacher = (
+      viewerContext.entityCompanionProvider.getCompanionForEntity(RedisTestEntity)[
+        'tableDataCoordinator'
+      ]['cacheAdapter'] as GenericEntityCacheAdapter<RedisTestEntityFields, 'id'>
+    )['genericCacher'];
 
     const entity1Created = await RedisTestEntity.creator(viewerContext)
       .setField('name', 'blah')
@@ -187,7 +186,9 @@ describe(GenericRedisCacher, () => {
     expect(entityNonExistentResult2.ok).toBe(false);
 
     // invalidate from cache to ensure it invalidates correctly in both caches
-    await RedisTestEntity.loaderUtils(viewerContext).invalidateFieldsAsync(entity1.getAllFields());
+    await RedisTestEntity.invalidationUtils(viewerContext).invalidateFieldsAsync(
+      entity1.getAllFields(),
+    );
     await expect(redis.get(cacheKeyEntity1)).resolves.toBeNull();
     await expect(redis.get(cacheKeyEntity1NameField)).resolves.toBeNull();
   });

package/src/__integration-tests__/GenericRedisCacher-full-integration-test.ts

@@ -1,7 +1,7 @@
 import {
   CompositeFieldHolder,
   CompositeFieldValueHolder,
-  IEntityGenericCacher,
+  GenericEntityCacheAdapter,
   SingleFieldHolder,
   SingleFieldValueHolder,
   ViewerContext,
@@ -31,7 +31,7 @@ describe(GenericRedisCacher, () => {
       makeKeyFn(...parts: string[]): string {
         const delimiter = ':';
         const escapedParts = parts.map((part) =>
-          part.replace('\\', '\\\\').replace(delimiter, `\\${delimiter}`),
+          part.replaceAll('\\', '\\\\').replaceAll(delimiter, `\\${delimiter}`),
         );
         return escapedParts.join(delimiter);
       },
@@ -55,12 +55,11 @@ describe(GenericRedisCacher, () => {
     const viewerContext = new TestViewerContext(
       createRedisIntegrationTestEntityCompanionProvider(genericRedisCacheContext),
     );
-    const genericCacher = viewerContext.entityCompanionProvider.getCompanionForEntity(
-      RedisTestEntity,
-    )['tableDataCoordinator']['cacheAdapter']['genericCacher'] as IEntityGenericCacher<
-      RedisTestEntityFields,
-      'id'
-    >;
+    const genericCacher = (
+      viewerContext.entityCompanionProvider.getCompanionForEntity(RedisTestEntity)[
+        'tableDataCoordinator'
+      ]['cacheAdapter'] as GenericEntityCacheAdapter<RedisTestEntityFields, 'id'>
+    )['genericCacher'];
 
     const entity1Created = await RedisTestEntity.creator(viewerContext)
       .setField('name', 'blah')
@@ -144,7 +143,9 @@ describe(GenericRedisCacher, () => {
     expect(entityNonExistentCompositeResult2).toBe(null);
 
     // invalidate from cache to ensure it invalidates correctly
-    await RedisTestEntity.loaderUtils(viewerContext).invalidateFieldsAsync(entity1.getAllFields());
+    await RedisTestEntity.invalidationUtils(viewerContext).invalidateFieldsAsync(
+      entity1.getAllFields(),
+    );
     const cachedValueNullKeys = genericCacher.makeCacheKeysForInvalidation(
       new SingleFieldHolder('id'),
       new SingleFieldValueHolder(entity1.getID()),

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

@@ -26,7 +26,7 @@ describe(GenericRedisCacher, () => {
       makeKeyFn(...parts: string[]): string {
         const delimiter = ':';
         const escapedParts = parts.map((part) =>
-          part.replace('\\', '\\\\').replace(delimiter, `\\${delimiter}`),
+          part.replaceAll('\\', '\\\\').replaceAll(delimiter, `\\${delimiter}`),
         );
         return escapedParts.join(delimiter);
       },

package/src/__integration-tests__/errors-test.ts

@@ -23,7 +23,7 @@ describe(GenericRedisCacher, () => {
       makeKeyFn(...parts: string[]): string {
         const delimiter = ':';
         const escapedParts = parts.map((part) =>
-          part.replace('\\', '\\\\').replace(delimiter, `\\${delimiter}`),
+          part.replaceAll('\\', '\\\\').replaceAll(delimiter, `\\${delimiter}`),
         );
         return escapedParts.join(delimiter);
       },

package/src/__tests__/GenericRedisCacher-test.ts

@@ -109,7 +109,7 @@ describe(GenericRedisCacher, () => {
           return pipeline;
         },
       );
-      when(mockPipeline.exec()).thenResolve({} as any);
+      when(mockPipeline.exec()).thenResolve([]);
       const pipeline = instance(mockPipeline);
 
       const mockRedisClient = mock<Redis>();
@@ -154,7 +154,7 @@ describe(GenericRedisCacher, () => {
           return pipeline;
         },
       );
-      when(mockPipeline.exec()).thenResolve({} as any);
+      when(mockPipeline.exec()).thenResolve([]);
       const pipeline = instance(mockPipeline);
 
       const mockRedisClient = mock<Redis>();
@@ -212,7 +212,7 @@ describe(GenericRedisCacher, () => {
         new SingleFieldValueHolder('wat'),
       );
       expect(cacheKeys).toHaveLength(1);
-      expect(cacheKeys[0]).toBe('hello-:single:blah:v2.2:id:wat');
+      expect(cacheKeys[0]).toBe('hello-:single:blah:v3.2:id:wat');
 
       await genericCacher.invalidateManyAsync(cacheKeys);
       verify(mockRedisClient.del(...cacheKeys)).once();
@@ -240,9 +240,9 @@ describe(GenericRedisCacher, () => {
         new SingleFieldValueHolder('wat'),
       );
       expect(cacheKeys).toHaveLength(3);
-      expect(cacheKeys[0]).toBe('hello-:single:blah:v2.1:id:wat');
-      expect(cacheKeys[1]).toBe('hello-:single:blah:v2.2:id:wat');
-      expect(cacheKeys[2]).toBe('hello-:single:blah:v2.3:id:wat');
+      expect(cacheKeys[0]).toBe('hello-:single:blah:v3.1:id:wat');
+      expect(cacheKeys[1]).toBe('hello-:single:blah:v3.2:id:wat');
+      expect(cacheKeys[2]).toBe('hello-:single:blah:v3.3:id:wat');
 
       await genericCacher.invalidateManyAsync(cacheKeys);
       verify(mockRedisClient.del(...cacheKeys)).once();
@@ -278,10 +278,10 @@ describe(GenericRedisCacher, () => {
         new SingleFieldValueHolder('wat'),
       );
       expect(cacheKeys).toHaveLength(4);
-      expect(cacheKeys[0]).toBe('hello-:single:blah:v2.2:id:wat');
-      expect(cacheKeys[1]).toBe('hello-:single:blah:v2.3:id:wat');
-      expect(cacheKeys[2]).toBe('hello-:single:blah:v2.4:id:wat');
-      expect(cacheKeys[3]).toBe('hello-:single:blah:v2.5:id:wat');
+      expect(cacheKeys[0]).toBe('hello-:single:blah:v3.2:id:wat');
+      expect(cacheKeys[1]).toBe('hello-:single:blah:v3.3:id:wat');
+      expect(cacheKeys[2]).toBe('hello-:single:blah:v3.4:id:wat');
+      expect(cacheKeys[3]).toBe('hello-:single:blah:v3.5:id:wat');
 
       await genericCacher.invalidateManyAsync(cacheKeys);
       verify(mockRedisClient.del(...cacheKeys)).once();