@expo/entity-cache-adapter-redis 0.45.0 → 0.46.0

package/build/{GenericRedisCacher.d.ts → src/GenericRedisCacher.d.ts}

@@ -79,7 +79,7 @@ export interface GenericRedisCacheContext {
      */
     invalidationConfig: GenericRedisCacheInvalidationConfig;
 }
-export default class GenericRedisCacher<TFields extends Record<string, any>, TIDField extends keyof TFields> implements IEntityGenericCacher<TFields, TIDField> {
+export declare class GenericRedisCacher<TFields extends Record<string, any>, TIDField extends keyof TFields> implements IEntityGenericCacher<TFields, TIDField> {
     private readonly context;
     private readonly entityConfiguration;
     constructor(context: GenericRedisCacheContext, entityConfiguration: EntityConfiguration<TFields, TIDField>);

package/build/{GenericRedisCacher.js → src/GenericRedisCacher.js}

@@ -1,12 +1,9 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RedisCacheInvalidationStrategy = void 0;
+exports.GenericRedisCacher = exports.RedisCacheInvalidationStrategy = void 0;
 const entity_1 = require("@expo/entity");
 const RedisCommon_1 = require("./RedisCommon");
-const wrapNativeRedisCallAsync_1 = __importDefault(require("./errors/wrapNativeRedisCallAsync"));
+const wrapNativeRedisCallAsync_1 = require("./errors/wrapNativeRedisCallAsync");
 const getSurroundingCacheKeyVersionsForInvalidation_1 = require("./utils/getSurroundingCacheKeyVersionsForInvalidation");
 // Sentinel value we store in Redis to negatively cache a database miss.
 // The sentinel value is distinct from any (positively) cached value.
@@ -44,7 +41,7 @@ class GenericRedisCacher {
         if (keys.length === 0) {
             return new Map();
         }
-        const redisResults = await (0, wrapNativeRedisCallAsync_1.default)(() => this.context.redisClient.mget(...keys));
+        const redisResults = await (0, wrapNativeRedisCallAsync_1.wrapNativeRedisCallAsync)(() => this.context.redisClient.mget(...keys));
         const results = new Map();
         for (let i = 0; i < keys.length; i++) {
             const key = keys[i];
@@ -76,7 +73,7 @@ class GenericRedisCacher {
         objectMap.forEach((object, key) => {
             redisTransaction = redisTransaction.set(key, JSON.stringify((0, entity_1.transformFieldsToCacheObject)(this.entityConfiguration, RedisCommon_1.redisTransformerMap, object)), 'EX', this.context.ttlSecondsPositive);
         });
-        await (0, wrapNativeRedisCallAsync_1.default)(() => redisTransaction.exec());
+        await (0, wrapNativeRedisCallAsync_1.wrapNativeRedisCallAsync)(() => redisTransaction.exec());
     }
     async cacheDBMissesAsync(keys) {
         if (keys.length === 0) {
@@ -86,13 +83,13 @@ class GenericRedisCacher {
         keys.forEach((key) => {
             redisTransaction = redisTransaction.set(key, DOES_NOT_EXIST_REDIS, 'EX', this.context.ttlSecondsNegative);
         });
-        await (0, wrapNativeRedisCallAsync_1.default)(() => redisTransaction.exec());
+        await (0, wrapNativeRedisCallAsync_1.wrapNativeRedisCallAsync)(() => redisTransaction.exec());
     }
     async invalidateManyAsync(keys) {
         if (keys.length === 0) {
             return;
         }
-        await (0, wrapNativeRedisCallAsync_1.default)(() => this.context.redisClient.del(...keys));
+        await (0, wrapNativeRedisCallAsync_1.wrapNativeRedisCallAsync)(() => this.context.redisClient.del(...keys));
     }
     makeCacheKeyForCacheKeyVersion(key, value, cacheKeyVersion) {
         const cacheKeyType = key.getLoadMethodType();
@@ -117,5 +114,5 @@ class GenericRedisCacher {
         }
     }
 }
-exports.default = GenericRedisCacher;
+exports.GenericRedisCacher = GenericRedisCacher;
 //# sourceMappingURL=GenericRedisCacher.js.map

package/build/src/GenericRedisCacher.js.map

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

package/build/{RedisCacheAdapterProvider.d.ts → src/RedisCacheAdapterProvider.d.ts}

@@ -1,6 +1,6 @@
-import { IEntityCacheAdapterProvider, EntityConfiguration, IEntityCacheAdapter } from '@expo/entity';
+import { EntityConfiguration, IEntityCacheAdapter, IEntityCacheAdapterProvider } from '@expo/entity';
 import { GenericRedisCacheContext } from './GenericRedisCacher';
-export default class RedisCacheAdapterProvider implements IEntityCacheAdapterProvider {
+export declare class RedisCacheAdapterProvider implements IEntityCacheAdapterProvider {
     private readonly context;
     constructor(context: GenericRedisCacheContext);
     getCacheAdapter<TFields extends Record<string, any>, TIDField extends keyof TFields>(entityConfiguration: EntityConfiguration<TFields, TIDField>): IEntityCacheAdapter<TFields, TIDField>;

package/build/src/RedisCacheAdapterProvider.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RedisCacheAdapterProvider = void 0;
+const entity_1 = require("@expo/entity");
+const GenericRedisCacher_1 = require("./GenericRedisCacher");
+class RedisCacheAdapterProvider {
+    context;
+    constructor(context) {
+        this.context = context;
+    }
+    getCacheAdapter(entityConfiguration) {
+        return new entity_1.GenericEntityCacheAdapter(new GenericRedisCacher_1.GenericRedisCacher(this.context, entityConfiguration));
+    }
+}
+exports.RedisCacheAdapterProvider = RedisCacheAdapterProvider;
+//# sourceMappingURL=RedisCacheAdapterProvider.js.map

package/build/src/RedisCacheAdapterProvider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RedisCacheAdapterProvider.js","sourceRoot":"","sources":["../../src/RedisCacheAdapterProvider.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AAEtB,6DAAoF;AAEpF,MAAa,yBAAyB;IACP;IAA7B,YAA6B,OAAiC;QAAjC,YAAO,GAAP,OAAO,CAA0B;IAAG,CAAC;IAElE,eAAe,CACb,mBAA2D;QAE3D,OAAO,IAAI,kCAAyB,CAAC,IAAI,uCAAkB,CAAC,IAAI,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAC,CAAC;IAClG,CAAC;CACF;AARD,8DAQC"}

package/build/src/RedisCommon.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RedisCommon.js","sourceRoot":"","sources":["../../src/RedisCommon.ts"],"names":[],"mappings":";;;AAAA,yCAAyC;AAE5B,QAAA,mBAAmB,GAAG,IAAI,GAAG,CAAC;IACzC;QACE,kBAAS,CAAC,IAAI;QACd;YACE;;;;;;;;;;;;;eAaG;YACH,KAAK,EAAE,CAAC,GAAS,EAAE,EAAE,CAAC,GAAG,EAAE,WAAW,EAAE,IAAI,IAAI;YAChD,IAAI,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;SAChD;KACF;CACF,CAAC,CAAC"}

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

@@ -0,0 +1 @@
+export {};

package/build/src/__integration-tests__/BatchedRedisCacheAdapter-integration-test.js

@@ -0,0 +1,125 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const batcher_1 = require("@expo/batcher");
+const entity_1 = require("@expo/entity");
+const globals_1 = require("@jest/globals");
+const invariant_1 = __importDefault(require("invariant"));
+const ioredis_1 = __importDefault(require("ioredis"));
+const nullthrows_1 = __importDefault(require("nullthrows"));
+const url_1 = require("url");
+const uuid_1 = require("uuid");
+const GenericRedisCacher_1 = require("../GenericRedisCacher");
+const RedisTestEntity_1 = require("../__testfixtures__/RedisTestEntity");
+const createRedisIntegrationTestEntityCompanionProvider_1 = require("../__testfixtures__/createRedisIntegrationTestEntityCompanionProvider");
+class BatchedRedis {
+    redis;
+    mgetBatcher = new batcher_1.Batcher(this.batchMgetAsync.bind(this), {
+        maxBatchInterval: 0,
+    });
+    constructor(redis) {
+        this.redis = redis;
+    }
+    async batchMgetAsync(keySets) {
+        // ordered distinct keys to fetch
+        const allKeysToFetch = [...new Set(keySets.flat())];
+        // fetch the distinct keys
+        const allResults = await this.redis.mget(...allKeysToFetch);
+        // put them into a map for fast lookup
+        const keysToResults = (0, entity_1.zipToMap)(allKeysToFetch, allResults);
+        // re-associate them with original key sets
+        return keySets.map((keySet) => keySet.map((key) => {
+            const result = keysToResults.get(key);
+            (0, invariant_1.default)(result !== undefined, 'result should not be undefined');
+            return result;
+        }));
+    }
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    async mget(...args) {
+        return await this.mgetBatcher.batchAsync(args);
+    }
+    multi() {
+        return this.redis.multi();
+    }
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    async del(...args) {
+        await this.redis.del(...args);
+    }
+}
+(0, globals_1.describe)(GenericRedisCacher_1.GenericRedisCacher, () => {
+    const redis = new ioredis_1.default(new url_1.URL(process.env['REDIS_URL']).toString());
+    const redisClient = new BatchedRedis(redis);
+    let genericRedisCacheContext;
+    (0, globals_1.beforeAll)(() => {
+        genericRedisCacheContext = {
+            redisClient,
+            makeKeyFn(...parts) {
+                const delimiter = ':';
+                const escapedParts = parts.map((part) => part.replace('\\', '\\\\').replace(delimiter, `\\${delimiter}`));
+                return escapedParts.join(delimiter);
+            },
+            cacheKeyPrefix: 'test-',
+            ttlSecondsPositive: 86400, // 1 day
+            ttlSecondsNegative: 600, // 10 minutes
+            invalidationConfig: {
+                invalidationStrategy: GenericRedisCacher_1.RedisCacheInvalidationStrategy.CURRENT_CACHE_KEY_VERSION,
+            },
+        };
+    });
+    (0, globals_1.beforeEach)(async () => {
+        await redis.flushdb();
+    });
+    (0, globals_1.afterAll)(async () => {
+        redis.disconnect();
+    });
+    (0, globals_1.it)('has correct caching behavior', async () => {
+        // simulate two requests
+        const viewerContext = new entity_1.ViewerContext((0, createRedisIntegrationTestEntityCompanionProvider_1.createRedisIntegrationTestEntityCompanionProvider)(genericRedisCacheContext));
+        const mgetSpy = globals_1.jest.spyOn(redis, 'mget');
+        const genericCacher = viewerContext.entityCompanionProvider.getCompanionForEntity(RedisTestEntity_1.RedisTestEntity)['tableDataCoordinator']['cacheAdapter']['genericCacher'];
+        const entity1Created = await RedisTestEntity_1.RedisTestEntity.creator(viewerContext)
+            .setField('name', 'blah')
+            .createAsync();
+        // 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 entity_1.ViewerContext((0, createRedisIntegrationTestEntityCompanionProvider_1.createRedisIntegrationTestEntityCompanionProvider)(genericRedisCacheContext));
+        const viewerContext2 = new entity_1.ViewerContext((0, createRedisIntegrationTestEntityCompanionProvider_1.createRedisIntegrationTestEntityCompanionProvider)(genericRedisCacheContext));
+        const viewerContext3 = new entity_1.ViewerContext((0, createRedisIntegrationTestEntityCompanionProvider_1.createRedisIntegrationTestEntityCompanionProvider)(genericRedisCacheContext));
+        const [entity1, entity2, entity3] = await Promise.all([
+            RedisTestEntity_1.RedisTestEntity.loader(viewerContext1).loadByIDAsync(entity1Created.getID()),
+            RedisTestEntity_1.RedisTestEntity.loader(viewerContext2).loadByIDAsync(entity1Created.getID()),
+            RedisTestEntity_1.RedisTestEntity.loader(viewerContext3).loadByFieldEqualingAsync('name', entity1Created.getField('name')),
+        ]);
+        (0, globals_1.expect)(mgetSpy).toHaveBeenCalledTimes(1);
+        (0, globals_1.expect)(mgetSpy.mock.calls[0]).toHaveLength(2); // should dedupe the first two loads
+        (0, globals_1.expect)(entity1.getID()).toEqual(entity2.getID());
+        (0, globals_1.expect)(entity2.getID()).toEqual((0, nullthrows_1.default)(entity3).getID());
+        const cacheKeyEntity1 = genericCacher.makeCacheKeyForStorage(new entity_1.SingleFieldHolder('id'), new entity_1.SingleFieldValueHolder(entity1Created.getID()));
+        const cachedJSON = await redis.get(cacheKeyEntity1);
+        const cachedValue = JSON.parse(cachedJSON);
+        (0, globals_1.expect)(cachedValue).toMatchObject({
+            id: entity1.getID(),
+            name: 'blah',
+        });
+        const cacheKeyEntity1NameField = genericCacher.makeCacheKeyForStorage(new entity_1.SingleFieldHolder('name'), new entity_1.SingleFieldValueHolder(entity1Created.getField('name')));
+        await RedisTestEntity_1.RedisTestEntity.loader(viewerContext).loadByFieldEqualingAsync('name', entity1Created.getField('name'));
+        await (0, globals_1.expect)(redis.get(cacheKeyEntity1NameField)).resolves.toEqual(cachedJSON);
+        // simulate non existent db fetch, should write negative result ('') to cache
+        const nonExistentId = (0, uuid_1.v4)();
+        const entityNonExistentResult = await RedisTestEntity_1.RedisTestEntity.loaderWithAuthorizationResults(viewerContext).loadByIDAsync(nonExistentId);
+        (0, globals_1.expect)(entityNonExistentResult.ok).toBe(false);
+        const cacheKeyNonExistent = genericCacher.makeCacheKeyForStorage(new entity_1.SingleFieldHolder('id'), new entity_1.SingleFieldValueHolder(nonExistentId));
+        const nonExistentCachedValue = await redis.get(cacheKeyNonExistent);
+        (0, globals_1.expect)(nonExistentCachedValue).toEqual('');
+        // load again through entities framework to ensure it reads negative result
+        const entityNonExistentResult2 = await RedisTestEntity_1.RedisTestEntity.loaderWithAuthorizationResults(viewerContext).loadByIDAsync(nonExistentId);
+        (0, globals_1.expect)(entityNonExistentResult2.ok).toBe(false);
+        // invalidate from cache to ensure it invalidates correctly in both caches
+        await RedisTestEntity_1.RedisTestEntity.loaderUtils(viewerContext).invalidateFieldsAsync(entity1.getAllFields());
+        await (0, globals_1.expect)(redis.get(cacheKeyEntity1)).resolves.toBeNull();
+        await (0, globals_1.expect)(redis.get(cacheKeyEntity1NameField)).resolves.toBeNull();
+    });
+});
+//# sourceMappingURL=BatchedRedisCacheAdapter-integration-test.js.map

package/build/src/__integration-tests__/BatchedRedisCacheAdapter-integration-test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"BatchedRedisCacheAdapter-integration-test.js","sourceRoot":"","sources":["../../../src/__integration-tests__/BatchedRedisCacheAdapter-integration-test.ts"],"names":[],"mappings":";;;;;AAAA,2CAAwC;AACxC,yCAMsB;AACtB,2CAA4F;AAC5F,0DAAkC;AAClC,sDAA4B;AAC5B,4DAAoC;AACpC,6BAA0B;AAC1B,+BAAoC;AAEpC,8DAM+B;AAC/B,yEAA6F;AAC7F,6IAA0I;AAE1I,MAAM,YAAY;IAQa;IAPZ,WAAW,GAAG,IAAI,iBAAO,CACxC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,EAC9B;QACE,gBAAgB,EAAE,CAAC;KACpB,CACF,CAAC;IAEF,YAA6B,KAAY;QAAZ,UAAK,GAAL,KAAK,CAAO;IAAG,CAAC;IAErC,KAAK,CAAC,cAAc,CAAC,OAAmB;QAC9C,iCAAiC;QACjC,MAAM,cAAc,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QAEpD,0BAA0B;QAC1B,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,CAAC;QAE5D,sCAAsC;QACtC,MAAM,aAAa,GAAG,IAAA,iBAAQ,EAAC,cAAc,EAAE,UAAU,CAAC,CAAC;QAE3D,2CAA2C;QAC3C,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAC5B,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YACjB,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACtC,IAAA,mBAAS,EAAC,MAAM,KAAK,SAAS,EAAE,gCAAgC,CAAC,CAAC;YAClE,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAED,gEAAgE;IAChE,KAAK,CAAC,IAAI,CAAC,GAAG,IAAc;QAC1B,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IACjD,CAAC;IAED,KAAK;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;IAC5B,CAAC;IAED,gEAAgE;IAChE,KAAK,CAAC,GAAG,CAAC,GAAG,IAAc;QACzB,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;IAChC,CAAC;CACF;AAED,IAAA,kBAAQ,EAAC,uCAAkB,EAAE,GAAG,EAAE;IAChC,MAAM,KAAK,GAAG,IAAI,iBAAK,CAAC,IAAI,SAAG,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;IACvE,MAAM,WAAW,GAAG,IAAI,YAAY,CAAC,KAAK,CAAC,CAAC;IAE5C,IAAI,wBAAkD,CAAC;IAEvD,IAAA,mBAAS,EAAC,GAAG,EAAE;QACb,wBAAwB,GAAG;YACzB,WAAW;YACX,SAAS,CAAC,GAAG,KAAe;gBAC1B,MAAM,SAAS,GAAG,GAAG,CAAC;gBACtB,MAAM,YAAY,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACtC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,KAAK,SAAS,EAAE,CAAC,CAChE,CAAC;gBACF,OAAO,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACtC,CAAC;YACD,cAAc,EAAE,OAAO;YACvB,kBAAkB,EAAE,KAAK,EAAE,QAAQ;YACnC,kBAAkB,EAAE,GAAG,EAAE,aAAa;YACtC,kBAAkB,EAAE;gBAClB,oBAAoB,EAAE,mDAA8B,CAAC,yBAAyB;aAC/E;SACF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,IAAA,oBAAU,EAAC,KAAK,IAAI,EAAE;QACpB,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC,CAAC,CAAC;IAEH,IAAA,kBAAQ,EAAC,KAAK,IAAI,EAAE;QAClB,KAAK,CAAC,UAAU,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,IAAA,YAAE,EAAC,8BAA8B,EAAE,KAAK,IAAI,EAAE;QAC5C,wBAAwB;QACxB,MAAM,aAAa,GAAG,IAAI,sBAAa,CACrC,IAAA,qGAAiD,EAAC,wBAAwB,CAAC,CAC5E,CAAC;QAEF,MAAM,OAAO,GAAG,cAAI,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAE1C,MAAM,aAAa,GAAG,aAAa,CAAC,uBAAuB,CAAC,qBAAqB,CAC/E,iCAAe,CAChB,CAAC,sBAAsB,CAAC,CAAC,cAAc,CAAC,CAAC,eAAe,CAGxD,CAAC;QAEF,MAAM,cAAc,GAAG,MAAM,iCAAe,CAAC,OAAO,CAAC,aAAa,CAAC;aAChE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;aACxB,WAAW,EAAE,CAAC;QAEjB,6HAA6H;QAC7H,OAAO,CAAC,SAAS,EAAE,CAAC;QACpB,MAAM,cAAc,GAAG,IAAI,sBAAa,CACtC,IAAA,qGAAiD,EAAC,wBAAwB,CAAC,CAC5E,CAAC;QACF,MAAM,cAAc,GAAG,IAAI,sBAAa,CACtC,IAAA,qGAAiD,EAAC,wBAAwB,CAAC,CAC5E,CAAC;QACF,MAAM,cAAc,GAAG,IAAI,sBAAa,CACtC,IAAA,qGAAiD,EAAC,wBAAwB,CAAC,CAC5E,CAAC;QACF,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACpD,iCAAe,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,aAAa,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;YAC5E,iCAAe,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,aAAa,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;YAC5E,iCAAe,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,wBAAwB,CAC7D,MAAM,EACN,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC,CAChC;SACF,CAAC,CAAC;QAEH,IAAA,gBAAM,EAAC,OAAO,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QACzC,IAAA,gBAAM,EAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,oCAAoC;QACnF,IAAA,gBAAM,EAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;QACjD,IAAA,gBAAM,EAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC,IAAA,oBAAU,EAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;QAE7D,MAAM,eAAe,GAAG,aAAa,CAAC,sBAAsB,CAC1D,IAAI,0BAAiB,CAAC,IAAI,CAAC,EAC3B,IAAI,+BAAsB,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC,CACnD,CAAC;QACF,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;QACpD,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,UAAW,CAAC,CAAC;QAC5C,IAAA,gBAAM,EAAC,WAAW,CAAC,CAAC,aAAa,CAAC;YAChC,EAAE,EAAE,OAAO,CAAC,KAAK,EAAE;YACnB,IAAI,EAAE,MAAM;SACb,CAAC,CAAC;QAEH,MAAM,wBAAwB,GAAG,aAAa,CAAC,sBAAsB,CACnE,IAAI,0BAAiB,CAAC,MAAM,CAAC,EAC7B,IAAI,+BAAsB,CAAC,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAC5D,CAAC;QACF,MAAM,iCAAe,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,wBAAwB,CAClE,MAAM,EACN,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC,CAChC,CAAC;QACF,MAAM,IAAA,gBAAM,EAAC,KAAK,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAE/E,6EAA6E;QAC7E,MAAM,aAAa,GAAG,IAAA,SAAM,GAAE,CAAC;QAC/B,MAAM,uBAAuB,GAC3B,MAAM,iCAAe,CAAC,8BAA8B,CAAC,aAAa,CAAC,CAAC,aAAa,CAC/E,aAAa,CACd,CAAC;QACJ,IAAA,gBAAM,EAAC,uBAAuB,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC/C,MAAM,mBAAmB,GAAG,aAAa,CAAC,sBAAsB,CAC9D,IAAI,0BAAiB,CAAC,IAAI,CAAC,EAC3B,IAAI,+BAAsB,CAAC,aAAa,CAAC,CAC1C,CAAC;QACF,MAAM,sBAAsB,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;QACpE,IAAA,gBAAM,EAAC,sBAAsB,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC3C,2EAA2E;QAC3E,MAAM,wBAAwB,GAC5B,MAAM,iCAAe,CAAC,8BAA8B,CAAC,aAAa,CAAC,CAAC,aAAa,CAC/E,aAAa,CACd,CAAC;QACJ,IAAA,gBAAM,EAAC,wBAAwB,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAEhD,0EAA0E;QAC1E,MAAM,iCAAe,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,qBAAqB,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;QAC/F,MAAM,IAAA,gBAAM,EAAC,KAAK,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;QAC7D,MAAM,IAAA,gBAAM,EAAC,KAAK,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;IACxE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

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

@@ -0,0 +1 @@
+export {};

package/build/src/__integration-tests__/GenericRedisCacher-full-integration-test.js

@@ -0,0 +1,114 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const entity_1 = require("@expo/entity");
+const results_1 = require("@expo/results");
+const globals_1 = require("@jest/globals");
+const ioredis_1 = __importDefault(require("ioredis"));
+const url_1 = require("url");
+const uuid_1 = require("uuid");
+const GenericRedisCacher_1 = require("../GenericRedisCacher");
+const RedisTestEntity_1 = require("../__testfixtures__/RedisTestEntity");
+const createRedisIntegrationTestEntityCompanionProvider_1 = require("../__testfixtures__/createRedisIntegrationTestEntityCompanionProvider");
+class TestViewerContext extends entity_1.ViewerContext {
+}
+(0, globals_1.describe)(GenericRedisCacher_1.GenericRedisCacher, () => {
+    let genericRedisCacheContext;
+    (0, globals_1.beforeAll)(() => {
+        genericRedisCacheContext = {
+            redisClient: new ioredis_1.default(new url_1.URL(process.env['REDIS_URL']).toString()),
+            makeKeyFn(...parts) {
+                const delimiter = ':';
+                const escapedParts = parts.map((part) => part.replace('\\', '\\\\').replace(delimiter, `\\${delimiter}`));
+                return escapedParts.join(delimiter);
+            },
+            cacheKeyPrefix: 'test-',
+            ttlSecondsPositive: 86400, // 1 day
+            ttlSecondsNegative: 600, // 10 minutes
+            invalidationConfig: {
+                invalidationStrategy: GenericRedisCacher_1.RedisCacheInvalidationStrategy.CURRENT_CACHE_KEY_VERSION,
+            },
+        };
+    });
+    (0, globals_1.beforeEach)(async () => {
+        await genericRedisCacheContext.redisClient.flushdb();
+    });
+    (0, globals_1.afterAll)(async () => {
+        genericRedisCacheContext.redisClient.disconnect();
+    });
+    (0, globals_1.it)('has correct caching behavior', async () => {
+        const viewerContext = new TestViewerContext((0, createRedisIntegrationTestEntityCompanionProvider_1.createRedisIntegrationTestEntityCompanionProvider)(genericRedisCacheContext));
+        const genericCacher = viewerContext.entityCompanionProvider.getCompanionForEntity(RedisTestEntity_1.RedisTestEntity)['tableDataCoordinator']['cacheAdapter']['genericCacher'];
+        const entity1Created = await RedisTestEntity_1.RedisTestEntity.creator(viewerContext)
+            .setField('name', 'blah')
+            .createAsync();
+        // loading an entity should put it in cache
+        const entity1 = await RedisTestEntity_1.RedisTestEntity.loader(viewerContext).loadByIDAsync(entity1Created.getID());
+        const cachedSingleJSON = await genericRedisCacheContext.redisClient.get(genericCacher.makeCacheKeyForStorage(new entity_1.SingleFieldHolder('id'), new entity_1.SingleFieldValueHolder(entity1.getID())));
+        const cachedSingleValue = JSON.parse(cachedSingleJSON);
+        (0, globals_1.expect)(cachedSingleValue).toMatchObject({
+            id: entity1.getID(),
+            name: 'blah',
+        });
+        // loading an entity by composite field should put it in cache
+        const entity2 = await RedisTestEntity_1.RedisTestEntity.loader(viewerContext).loadByCompositeFieldEqualingAsync(['name', 'id'], { name: 'blah', id: entity1.getID() });
+        const cachedCompositeJSON = await genericRedisCacheContext.redisClient.get(genericCacher.makeCacheKeyForStorage(new entity_1.CompositeFieldHolder(['id', 'name']), new entity_1.CompositeFieldValueHolder({ id: entity2.getID(), name: 'blah' })));
+        const cachedCompositeValue = JSON.parse(cachedCompositeJSON);
+        (0, globals_1.expect)(cachedCompositeValue).toMatchObject({
+            id: entity2.getID(),
+            name: 'blah',
+        });
+        // simulate non existent db fetch, should write negative result ('') to cache
+        const nonExistentId = (0, uuid_1.v4)();
+        const entityNonExistentResult = await RedisTestEntity_1.RedisTestEntity.loaderWithAuthorizationResults(viewerContext).loadByIDAsync(nonExistentId);
+        (0, globals_1.expect)(entityNonExistentResult.ok).toBe(false);
+        const nonExistentCachedValue = await genericRedisCacheContext.redisClient.get(genericCacher.makeCacheKeyForStorage(new entity_1.SingleFieldHolder('id'), new entity_1.SingleFieldValueHolder(nonExistentId)));
+        (0, globals_1.expect)(nonExistentCachedValue).toEqual('');
+        const entityNonExistentCompositeResult = await RedisTestEntity_1.RedisTestEntity.loader(viewerContext).loadByCompositeFieldEqualingAsync(['name', 'id'], { name: 'blah', id: nonExistentId });
+        (0, globals_1.expect)(entityNonExistentCompositeResult).toBe(null);
+        const nonExistentCompositeCachedValue = await genericRedisCacheContext.redisClient.get(genericCacher.makeCacheKeyForStorage(new entity_1.CompositeFieldHolder(['id', 'name']), new entity_1.CompositeFieldValueHolder({ id: nonExistentId, name: 'blah' })));
+        (0, globals_1.expect)(nonExistentCompositeCachedValue).toEqual('');
+        // load again through entities framework to ensure it reads negative result
+        const entityNonExistentResult2 = await RedisTestEntity_1.RedisTestEntity.loaderWithAuthorizationResults(viewerContext).loadByIDAsync(nonExistentId);
+        (0, globals_1.expect)(entityNonExistentResult2.ok).toBe(false);
+        const entityNonExistentCompositeResult2 = await RedisTestEntity_1.RedisTestEntity.loader(viewerContext).loadByCompositeFieldEqualingAsync(['name', 'id'], { name: 'blah', id: nonExistentId });
+        (0, globals_1.expect)(entityNonExistentCompositeResult2).toBe(null);
+        // invalidate from cache to ensure it invalidates correctly
+        await RedisTestEntity_1.RedisTestEntity.loaderUtils(viewerContext).invalidateFieldsAsync(entity1.getAllFields());
+        const cachedValueNullKeys = genericCacher.makeCacheKeysForInvalidation(new entity_1.SingleFieldHolder('id'), new entity_1.SingleFieldValueHolder(entity1.getID()));
+        const cachedValueNull = await genericRedisCacheContext.redisClient.mget(...cachedValueNullKeys);
+        (0, globals_1.expect)(cachedValueNull.every((c) => c === null)).toBe(true);
+        const cachedValueNullCompositeKeys = genericCacher.makeCacheKeysForInvalidation(new entity_1.CompositeFieldHolder(['id', 'name']), new entity_1.CompositeFieldValueHolder({ id: entity1.getID(), name: 'blah' }));
+        const cachedValueNullComposite = await genericRedisCacheContext.redisClient.mget(...cachedValueNullCompositeKeys);
+        (0, globals_1.expect)(cachedValueNullComposite.every((c) => c === null)).toBe(true);
+    });
+    (0, globals_1.it)('caches and restores date fields', async () => {
+        const viewerContext = new TestViewerContext((0, createRedisIntegrationTestEntityCompanionProvider_1.createRedisIntegrationTestEntityCompanionProvider)(genericRedisCacheContext));
+        const date = new Date();
+        const entity1 = await (0, results_1.enforceAsyncResult)(RedisTestEntity_1.RedisTestEntity.creatorWithAuthorizationResults(viewerContext)
+            .setField('dateField', date)
+            .createAsync());
+        (0, globals_1.expect)(entity1.getField('dateField')).toEqual(date);
+        const entity2 = await RedisTestEntity_1.RedisTestEntity.loader(viewerContext).loadByIDAsync(entity1.getID());
+        (0, globals_1.expect)(entity2.getField('dateField')).toEqual(date);
+        // simulate new request
+        const vc2 = new TestViewerContext((0, createRedisIntegrationTestEntityCompanionProvider_1.createRedisIntegrationTestEntityCompanionProvider)(genericRedisCacheContext));
+        const entity3 = await RedisTestEntity_1.RedisTestEntity.loader(vc2).loadByIDAsync(entity1.getID());
+        (0, globals_1.expect)(entity3.getField('dateField')).toEqual(date);
+    });
+    (0, globals_1.it)('caches and restores empty string field keys', async () => {
+        const viewerContext = new TestViewerContext((0, createRedisIntegrationTestEntityCompanionProvider_1.createRedisIntegrationTestEntityCompanionProvider)(genericRedisCacheContext));
+        const entity1 = await (0, results_1.enforceAsyncResult)(RedisTestEntity_1.RedisTestEntity.creatorWithAuthorizationResults(viewerContext)
+            .setField('name', '')
+            .createAsync());
+        const entity2 = await RedisTestEntity_1.RedisTestEntity.loader(viewerContext).loadByFieldEqualingAsync('name', '');
+        (0, globals_1.expect)(entity2?.getID()).toEqual(entity1.getID());
+        // simulate new request
+        const vc2 = new TestViewerContext((0, createRedisIntegrationTestEntityCompanionProvider_1.createRedisIntegrationTestEntityCompanionProvider)(genericRedisCacheContext));
+        const entity3 = await RedisTestEntity_1.RedisTestEntity.loader(vc2).loadByFieldEqualingAsync('name', '');
+        (0, globals_1.expect)(entity3?.getID()).toEqual(entity1.getID());
+    });
+});
+//# sourceMappingURL=GenericRedisCacher-full-integration-test.js.map

package/build/src/__integration-tests__/GenericRedisCacher-full-integration-test.js.map

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

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

@@ -0,0 +1 @@
+export {};

package/build/src/__integration-tests__/GenericRedisCacher-integration-test.js

@@ -0,0 +1,93 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const entity_1 = require("@expo/entity");
+const globals_1 = require("@jest/globals");
+const ioredis_1 = __importDefault(require("ioredis"));
+const url_1 = require("url");
+const GenericRedisCacher_1 = require("../GenericRedisCacher");
+const RedisTestEntity_1 = require("../__testfixtures__/RedisTestEntity");
+const createRedisIntegrationTestEntityCompanionProvider_1 = require("../__testfixtures__/createRedisIntegrationTestEntityCompanionProvider");
+class TestViewerContext extends entity_1.ViewerContext {
+}
+(0, globals_1.describe)(GenericRedisCacher_1.GenericRedisCacher, () => {
+    let genericRedisCacheContext;
+    (0, globals_1.beforeAll)(() => {
+        genericRedisCacheContext = {
+            redisClient: new ioredis_1.default(new url_1.URL(process.env['REDIS_URL']).toString()),
+            makeKeyFn(...parts) {
+                const delimiter = ':';
+                const escapedParts = parts.map((part) => part.replace('\\', '\\\\').replace(delimiter, `\\${delimiter}`));
+                return escapedParts.join(delimiter);
+            },
+            cacheKeyPrefix: 'test-',
+            ttlSecondsPositive: 86400, // 1 day
+            ttlSecondsNegative: 600, // 10 minutes
+            invalidationConfig: {
+                invalidationStrategy: GenericRedisCacher_1.RedisCacheInvalidationStrategy.CURRENT_CACHE_KEY_VERSION,
+            },
+        };
+    });
+    (0, globals_1.beforeEach)(async () => {
+        await genericRedisCacheContext.redisClient.flushdb();
+    });
+    (0, globals_1.afterAll)(async () => {
+        genericRedisCacheContext.redisClient.disconnect();
+    });
+    (0, globals_1.it)('has correct caching and loading behavior', async () => {
+        const viewerContext = new TestViewerContext((0, createRedisIntegrationTestEntityCompanionProvider_1.createRedisIntegrationTestEntityCompanionProvider)(genericRedisCacheContext));
+        const genericRedisCacher = new GenericRedisCacher_1.GenericRedisCacher(genericRedisCacheContext, RedisTestEntity_1.redisTestEntityConfiguration);
+        const date = new Date();
+        const entity1Created = await RedisTestEntity_1.RedisTestEntity.creator(viewerContext)
+            .setField('name', 'blah')
+            .setField('dateField', date)
+            .createAsync();
+        const testKey = `test-id-key-${entity1Created.getID()}`;
+        const objectMap = new Map([
+            [testKey, entity1Created.getAllFields()],
+        ]);
+        await genericRedisCacher.cacheManyAsync(objectMap);
+        const cachedJSON = await genericRedisCacheContext.redisClient.get(testKey);
+        const cachedValue = JSON.parse(cachedJSON);
+        (0, globals_1.expect)(cachedValue).toMatchObject({
+            id: entity1Created.getID(),
+            dateField: date.toISOString(),
+        });
+        const loadedObjectMap = await genericRedisCacher.loadManyAsync([testKey]);
+        const cacheLoadResult = loadedObjectMap.get(testKey);
+        (0, globals_1.expect)(cacheLoadResult).toMatchObject({
+            status: entity_1.CacheStatus.HIT,
+            item: entity1Created.getAllFields(),
+        });
+        (0, globals_1.expect)(loadedObjectMap.size).toBe(1);
+    });
+    (0, globals_1.it)('has correct negative caching behaviour', async () => {
+        const genericRedisCacher = new GenericRedisCacher_1.GenericRedisCacher(genericRedisCacheContext, RedisTestEntity_1.redisTestEntityConfiguration);
+        const testKey = `test-id-key-non-existent-id`;
+        await genericRedisCacher.cacheDBMissesAsync([testKey]);
+        const loadedObjectMap = await genericRedisCacher.loadManyAsync([testKey]);
+        const cacheLoadResult = loadedObjectMap.get(testKey);
+        (0, globals_1.expect)(cacheLoadResult.status).toBe(entity_1.CacheStatus.NEGATIVE);
+    });
+    (0, globals_1.it)('has correct invalidation behaviour', async () => {
+        const viewerContext = new TestViewerContext((0, createRedisIntegrationTestEntityCompanionProvider_1.createRedisIntegrationTestEntityCompanionProvider)(genericRedisCacheContext));
+        const genericRedisCacher = new GenericRedisCacher_1.GenericRedisCacher(genericRedisCacheContext, RedisTestEntity_1.redisTestEntityConfiguration);
+        const date = new Date();
+        const entity1Created = await RedisTestEntity_1.RedisTestEntity.creator(viewerContext)
+            .setField('name', 'blah')
+            .setField('dateField', date)
+            .createAsync();
+        const testKey = `test-id-key-${entity1Created.getID()}`;
+        const objectMap = new Map([
+            [testKey, entity1Created.getAllFields()],
+        ]);
+        await genericRedisCacher.cacheManyAsync(objectMap);
+        await genericRedisCacher.invalidateManyAsync([testKey]);
+        const loadedObjectMap = await genericRedisCacher.loadManyAsync([testKey]);
+        const cacheLoadResult = loadedObjectMap.get(testKey);
+        (0, globals_1.expect)(cacheLoadResult.status).toBe(entity_1.CacheStatus.MISS);
+    });
+});
+//# sourceMappingURL=GenericRedisCacher-integration-test.js.map

package/build/src/__integration-tests__/GenericRedisCacher-integration-test.js.map

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

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

@@ -0,0 +1 @@
+export {};

package/build/src/__integration-tests__/errors-test.js

@@ -0,0 +1,43 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const entity_1 = require("@expo/entity");
+const globals_1 = require("@jest/globals");
+const ioredis_1 = __importDefault(require("ioredis"));
+const url_1 = require("url");
+const GenericRedisCacher_1 = require("../GenericRedisCacher");
+const RedisTestEntity_1 = require("../__testfixtures__/RedisTestEntity");
+const createRedisIntegrationTestEntityCompanionProvider_1 = require("../__testfixtures__/createRedisIntegrationTestEntityCompanionProvider");
+class TestViewerContext extends entity_1.ViewerContext {
+}
+(0, globals_1.describe)(GenericRedisCacher_1.GenericRedisCacher, () => {
+    const redisClient = new ioredis_1.default(new url_1.URL(process.env['REDIS_URL']).toString());
+    let genericRedisCacheContext;
+    (0, globals_1.beforeAll)(() => {
+        genericRedisCacheContext = {
+            redisClient,
+            makeKeyFn(...parts) {
+                const delimiter = ':';
+                const escapedParts = parts.map((part) => part.replace('\\', '\\\\').replace(delimiter, `\\${delimiter}`));
+                return escapedParts.join(delimiter);
+            },
+            cacheKeyPrefix: 'test-',
+            ttlSecondsPositive: 86400, // 1 day
+            ttlSecondsNegative: 600, // 10 minutes
+            invalidationConfig: {
+                invalidationStrategy: GenericRedisCacher_1.RedisCacheInvalidationStrategy.CURRENT_CACHE_KEY_VERSION,
+            },
+        };
+    });
+    (0, globals_1.beforeEach)(async () => {
+        await redisClient.flushdb();
+    });
+    (0, globals_1.it)('throws when redis is disconnected', async () => {
+        redisClient.disconnect();
+        const vc1 = new TestViewerContext((0, createRedisIntegrationTestEntityCompanionProvider_1.createRedisIntegrationTestEntityCompanionProvider)(genericRedisCacheContext));
+        await (0, globals_1.expect)(RedisTestEntity_1.RedisTestEntity.creator(vc1).setField('name', 'blah').createAsync()).rejects.toThrow(entity_1.EntityCacheAdapterTransientError);
+    });
+});
+//# sourceMappingURL=errors-test.js.map

package/build/src/__integration-tests__/errors-test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"errors-test.js","sourceRoot":"","sources":["../../../src/__integration-tests__/errors-test.ts"],"names":[],"mappings":";;;;;AAAA,yCAA+E;AAC/E,2CAA4E;AAC5E,sDAA4B;AAC5B,6BAA0B;AAE1B,8DAI+B;AAC/B,yEAAsE;AACtE,6IAA0I;AAE1I,MAAM,iBAAkB,SAAQ,sBAAa;CAAG;AAEhD,IAAA,kBAAQ,EAAC,uCAAkB,EAAE,GAAG,EAAE;IAChC,MAAM,WAAW,GAAG,IAAI,iBAAK,CAAC,IAAI,SAAG,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC7E,IAAI,wBAAkD,CAAC;IAEvD,IAAA,mBAAS,EAAC,GAAG,EAAE;QACb,wBAAwB,GAAG;YACzB,WAAW;YACX,SAAS,CAAC,GAAG,KAAe;gBAC1B,MAAM,SAAS,GAAG,GAAG,CAAC;gBACtB,MAAM,YAAY,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACtC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,KAAK,SAAS,EAAE,CAAC,CAChE,CAAC;gBACF,OAAO,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACtC,CAAC;YACD,cAAc,EAAE,OAAO;YACvB,kBAAkB,EAAE,KAAK,EAAE,QAAQ;YACnC,kBAAkB,EAAE,GAAG,EAAE,aAAa;YACtC,kBAAkB,EAAE;gBAClB,oBAAoB,EAAE,mDAA8B,CAAC,yBAAyB;aAC/E;SACF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,IAAA,oBAAU,EAAC,KAAK,IAAI,EAAE;QACpB,MAAM,WAAW,CAAC,OAAO,EAAE,CAAC;IAC9B,CAAC,CAAC,CAAC;IAEH,IAAA,YAAE,EAAC,mCAAmC,EAAE,KAAK,IAAI,EAAE;QACjD,WAAW,CAAC,UAAU,EAAE,CAAC;QAEzB,MAAM,GAAG,GAAG,IAAI,iBAAiB,CAC/B,IAAA,qGAAiD,EAAC,wBAAwB,CAAC,CAC5E,CAAC;QAEF,MAAM,IAAA,gBAAM,EACV,iCAAe,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,WAAW,EAAE,CACpE,CAAC,OAAO,CAAC,OAAO,CAAC,yCAAgC,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/build/src/__testfixtures__/RedisTestEntity.d.ts

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

package/build/src/__testfixtures__/RedisTestEntity.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.redisTestEntityConfiguration = exports.RedisTestEntityPrivacyPolicy = exports.RedisTestEntity = void 0;
+const entity_1 = require("@expo/entity");
+class RedisTestEntity extends entity_1.Entity {
+    static defineCompanionDefinition() {
+        return {
+            entityClass: RedisTestEntity,
+            entityConfiguration: exports.redisTestEntityConfiguration,
+            privacyPolicyClass: RedisTestEntityPrivacyPolicy,
+        };
+    }
+}
+exports.RedisTestEntity = RedisTestEntity;
+class RedisTestEntityPrivacyPolicy extends entity_1.EntityPrivacyPolicy {
+    createRules = [
+        new entity_1.AlwaysAllowPrivacyPolicyRule(),
+    ];
+    readRules = [
+        new entity_1.AlwaysAllowPrivacyPolicyRule(),
+    ];
+    updateRules = [
+        new entity_1.AlwaysAllowPrivacyPolicyRule(),
+    ];
+    deleteRules = [
+        new entity_1.AlwaysAllowPrivacyPolicyRule(),
+    ];
+}
+exports.RedisTestEntityPrivacyPolicy = RedisTestEntityPrivacyPolicy;
+exports.redisTestEntityConfiguration = new entity_1.EntityConfiguration({
+    idField: 'id',
+    tableName: 'redis_test_entities',
+    schema: {
+        id: new entity_1.UUIDField({
+            columnName: 'id',
+            cache: true,
+        }),
+        name: new entity_1.StringField({
+            columnName: 'name',
+            cache: true,
+        }),
+        dateField: new entity_1.DateField({
+            columnName: 'date_field',
+        }),
+    },
+    databaseAdapterFlavor: 'postgres',
+    cacheAdapterFlavor: 'redis',
+    compositeFieldDefinitions: [
+        { compositeField: ['id', 'name'], cache: true },
+        { compositeField: ['id', 'dateField'], cache: true },
+    ],
+});
+//# sourceMappingURL=RedisTestEntity.js.map