@baeta/cache-ioredis 2.0.0-next.13 → 2.0.0-next.15

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @baeta/cache-ioredis
 
+## 2.0.0-next.15
+
+### Patch Changes
+
+- Drop Node v23 and v25 by [@andreisergiu98](https://github.com/andreisergiu98) in [#474](https://github.com/andreisergiu98/baeta/pull/474)
+
+- Use transactions when peristing queries by [@andreisergiu98](https://github.com/andreisergiu98) in [#495](https://github.com/andreisergiu98/baeta/pull/495)
+- Updated dependencies [[`dc89e17`](https://github.com/andreisergiu98/baeta/commit/dc89e1728926f4bd5a5e1351635c38bf8d5938dc), [`b7d088a`](https://github.com/andreisergiu98/baeta/commit/b7d088a79cddf256216cf932d82a67d35fc4264f), [`2c303b2`](https://github.com/andreisergiu98/baeta/commit/2c303b217c87fe2c585cfe8d60c3e901d5fedbe1)]:
+  - @baeta/cache-redis-common@2.0.0-next.13
+  - @baeta/cache@2.0.0-next.15
+
+## 2.0.0-next.14
+
+### Patch Changes
+
+- Updated dependencies:
+  - @baeta/cache@2.0.0-next.14
+
 ## 2.0.0-next.13
 
 ### Patch Changes

package/README.md

@@ -35,10 +35,11 @@ Building GraphQL APIs shouldn't be complicated. **Baeta** is a modern, modular,
 - **Middleware & Directives**: Easy integration of custom behaviors
 - **High Performance**: Built for scalability and efficiency
 
-#### And optional extensions and plugins
+#### And optional app plugins and libraries
 
-- **@baeta/extension-auth**: Add powerful scope-based authorization
-- **@baeta/extension-cache**: Implement automatic caching with simple update patterns
+- **@baeta/auth**: Add powerful scope-based authorization
+- **@baeta/complexity**: Reject resource-exhausting queries with depth, breadth and complexity limits
+- **@baeta/cache**: Type-safe caching with declarative queries and automatic reconciliation
 - ... and more!
 
 ## Why use Baeta?
@@ -89,7 +90,7 @@ const usersQuery = Query.users.resolve(() => {
   return dataSource.user.findMany();
 });
 
-Query.$fields({
+export default Query.$fields({
   user: userQuery,
   users: usersQuery,
 });
@@ -98,17 +99,13 @@ Query.$fields({
 #### 3. Add authorization
 
 ```typescript
+import { auth, rule, scope } from "./lib/auth.ts";
 import { UserModule } from "./typedef.ts";
 
 const { Query } = UserModule;
 
 const userQuery = Query.user
-  .$auth({
-    $or: {
-      isPublic: true,
-      isLoggedIn: true,
-    },
-  })
+  .$use(auth(rule.or(scope.isPublic, scope.isLoggedIn)))
   .resolve(async ({ args }) => {
     // ...
   });
@@ -117,23 +114,33 @@ const userQuery = Query.user
 #### 4. Add caching
 
 ```typescript
-const { Query, Mutation, User } = UserModule;
-
-export const userCache = User.$createCache();
-
-const userQuery = Query.user
-  .$auth({
-    // ...
+import { createCache, defineQuery } from "@baeta/cache";
+import { redisClient } from "./lib/redis.ts";
+
+const { Query, Mutation } = UserModule;
+
+export const userCache = createCache(redisClient, {
+  name: "UserCache",
+  parse: JSON.parse,
+  serialize: JSON.stringify,
+})
+  .withQueries({
+    findUser: defineQuery({
+      resolve: async (args: { id: string }) => {
+        return dataSource.user.findUnique({ where: args });
+      },
+    }),
   })
-  .$useCache(userCache)
-  .resolve(async ({ args }) => {
-    // ...
-  });
+  .build();
+
+const userQuery = Query.user.map(({ args }) =>
+  userCache.queries.findUser({ id: args.where.id }),
+);
 
 const updateUserMutation = Mutation.updateUser
   .$use(async (next) => {
     const user = await next();
-    await userCache.save(user);
+    if (user) await userCache.update(user);
     return user;
   })
   .resolve(async ({ args }) => {

package/dist/index.js

@@ -1,6 +1,6 @@
 import { CacheClient } from "@baeta/cache";
-import { doBatched } from "@baeta/cache/sdk";
 import { assertNoPipelineErrors, batchPipeline, createRedisScripts } from "@baeta/cache-redis-common";
+import { doBatched } from "@baeta/cache/sdk";
 //#region lib/cache-client.ts
 const INDEX_BUFFER_MS = 1e3;
 const MAX_PIPELINE_SIZE_LIMIT = 50 * 1024 * 1024;
@@ -46,15 +46,10 @@ var RedisCacheClient = class extends CacheClient {
 			makePipeline: () => this.redis.pipeline(),
 			addCommand: (pipeline, item) => {
 				if (saveOptions.disableOverwrite !== true) pipeline.set(item.key, item.value, "PXAT", expiresAt);
-				else {
-					pipeline.setnx(item.key, item.value);
-					pipeline.pexpireat(item.key, expiresAt);
-				}
+				else pipeline.set(item.key, item.value, "PXAT", expiresAt, "NX");
 			},
 			executePipeline: async (pipeline) => {
-				const result = await pipeline.exec();
-				if (result == null) throw new Error("Unexpected null result from Redis pipeline");
-				assertNoPipelineErrors(result);
+				assertNoPipelineErrors(await pipeline.exec());
 				return [];
 			},
 			estimateSize: (item) => {
@@ -71,18 +66,19 @@ var RedisCacheClient = class extends CacheClient {
 	async saveItemsWithDiff(items, options) {
 		if (items.length === 0) return [];
 		const expiresAt = Date.now() + options.ttlMs;
-		const keys = new Array(items.length);
-		const values = new Array(items.length);
-		for (let i = 0; i < items.length; i++) {
-			keys[i] = items[i][0];
-			values[i] = options.serialize(items[i][1]);
+		const tx = this.redis.multi();
+		for (const item of items) {
+			tx.get(item[0]);
+			tx.set(item[0], options.serialize(item[1]), "PXAT", expiresAt);
 		}
-		const result = await this.scripts.saveWithDiffScript(keys, [...values, expiresAt.toString()]);
-		if (!Array.isArray(result)) throw new Error(`Unexpected non-array result from Redis script: ${typeof result}`);
-		return result.map((value) => {
-			if (typeof value === "string") return options.parse(value);
-			return null;
-		});
+		const result = await tx.exec();
+		assertNoPipelineErrors(result);
+		const results = [];
+		for (let i = 0; i < result.length; i += 2) {
+			const value = result[i][1];
+			results.push(value == null ? null : options.parse(value));
+		}
+		return results;
 	}
 	async deleteItems(keys) {
 		if (keys.length === 0) return;
@@ -92,12 +88,19 @@ var RedisCacheClient = class extends CacheClient {
 	}
 	async deleteItemsWithDiff(keys, options) {
 		if (keys.length === 0) return [];
-		const result = await this.scripts.deleteWithDiffScript(keys, []);
-		if (!Array.isArray(result)) throw new Error(`Unexpected non-array result from Redis script: ${typeof result}`);
-		return result.map((value) => {
-			if (typeof value === "string") return options.parse(value);
-			return null;
-		});
+		const tx = this.redis.multi();
+		for (const key of keys) {
+			tx.get(key);
+			tx.unlink(key);
+		}
+		const result = await tx.exec();
+		assertNoPipelineErrors(result);
+		const results = [];
+		for (let i = 0; i < result.length; i += 2) {
+			const value = result[i][1];
+			results.push(value == null ? null : options.parse(value));
+		}
+		return results;
 	}
 	async getQuery(key, options) {
 		const meta = await this.redis.get(key);
@@ -106,14 +109,14 @@ var RedisCacheClient = class extends CacheClient {
 	async saveQuery(key, indexes, metadata, options) {
 		const now = Date.now();
 		const expiresAt = now + options.ttlMs;
-		const pipeline = this.redis.pipeline();
-		pipeline.set(key, options.serialize(metadata), "PXAT", expiresAt);
+		const tx = this.redis.multi();
+		tx.set(key, options.serialize(metadata), "PXAT", expiresAt);
 		for (const indexKey of indexes) {
-			pipeline.zadd(indexKey, expiresAt, key);
-			pipeline.zremrangebyscore(indexKey, "-inf", now - INDEX_BUFFER_MS);
-			pipeline.pexpireat(indexKey, expiresAt + INDEX_BUFFER_MS);
+			tx.zadd(indexKey, expiresAt, key);
+			tx.zremrangebyscore(indexKey, "-inf", now - INDEX_BUFFER_MS);
+			tx.pexpireat(indexKey, expiresAt + INDEX_BUFFER_MS);
 		}
-		assertNoPipelineErrors(await pipeline.exec());
+		assertNoPipelineErrors(await tx.exec());
 	}
 	async deleteQueries(indexes) {
 		if (indexes.length === 0) return;

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":[],"sources":["../lib/cache-client.ts"],"sourcesContent":["import type {\n\tCacheClientSaveOptions,\n\tItemCacheKey,\n\tQueryCacheIndexKey,\n\tQueryCacheKey,\n} from '@baeta/cache';\nimport { CacheClient, type CacheClientArgs, type CacheClientOptions } from '@baeta/cache';\nimport { doBatched } from '@baeta/cache/sdk';\nimport {\n\tassertNoPipelineErrors,\n\tbatchPipeline,\n\tcreateRedisScripts,\n\ttype RedisScripts,\n} from '@baeta/cache-redis-common';\nimport type Redis from 'ioredis';\nimport type { Cluster as RedisCluster } from 'ioredis';\n\nconst INDEX_BUFFER_MS = 1_000;\nconst MAX_PIPELINE_SIZE_LIMIT = 50 * 1024 * 1024; // 50MB\nconst MAX_PIPELINE_COMMAND_LIMIT = 100_000;\nconst MAX_COMMAND_KEYS_LIMIT = 100_000;\n\nexport interface RedisCacheClientOptions extends CacheClientOptions {\n\t/**\n\t * Maximum total size of commands in a single pipeline batch. If the batch exceeds this size, it will be executed immediately.\n\t * @defaultValue 50 * 1024 * 1024 (50MB)\n\t */\n\tmaxPipelineSizeLimit?: number;\n\t/**\n\t * Maximum number of commands in a single pipeline batch. If the batch exceeds this number, it will be executed immediately.\n\t * @defaultValue 100_000\n\t */\n\tmaxPipelineCommandLimit?: number;\n\t/**\n\t * Maximum number of keys in a single command. If the number of keys exceeds this limit, multiple commands will be executed.\n\t * @defaultValue 100_000\n\t */\n\tmaxCommandKeysLimit?: number;\n}\n\nexport class RedisCacheClient extends CacheClient {\n\tredis: Redis | RedisCluster;\n\tprotected maxPipelineSizeLimit: number;\n\tprotected maxPipelineCommandLimit: number;\n\tprotected maxCommandKeysLimit: number;\n\tprotected scripts: RedisScripts;\n\n\tconstructor(redis: Redis | RedisCluster, options?: RedisCacheClientOptions) {\n\t\tsuper({\n\t\t\tnamespace: options?.namespace,\n\t\t\trevision: options?.revision,\n\t\t\tttlMs: options?.ttlMs,\n\t\t});\n\t\tthis.redis = redis;\n\t\tthis.maxPipelineSizeLimit = options?.maxPipelineSizeLimit ?? MAX_PIPELINE_SIZE_LIMIT;\n\t\tthis.maxPipelineCommandLimit = options?.maxPipelineCommandLimit ?? MAX_PIPELINE_COMMAND_LIMIT;\n\t\tthis.maxCommandKeysLimit = options?.maxCommandKeysLimit ?? MAX_COMMAND_KEYS_LIMIT;\n\t\tconst loadScript = async (script: string) => {\n\t\t\treturn await this.redis.script('LOAD', script);\n\t\t};\n\t\tconst evalSha = async (sha: string, keys: string[], args: string[]) => {\n\t\t\treturn await this.redis.evalsha(sha, keys.length, ...keys, ...args);\n\t\t};\n\t\tthis.scripts = createRedisScripts(loadScript, evalSha);\n\t}\n\n\tasync getPartialItems<Item>(\n\t\tkeys: ItemCacheKey[],\n\t\toptions: CacheClientArgs<Item>,\n\t): Promise<Array<Item | null>> {\n\t\tif (keys.length === 0) {\n\t\t\treturn [];\n\t\t}\n\t\tconst values: Array<Item | null> = [];\n\t\tawait doBatched(keys, this.maxCommandKeysLimit, async (batch) => {\n\t\t\tconst batchValues = await this.redis.mget(batch);\n\t\t\tfor (const value of batchValues) {\n\t\t\t\tvalues.push(value == null ? null : options.parse(value));\n\t\t\t}\n\t\t});\n\t\treturn values;\n\t}\n\n\tasync saveItems<Item>(\n\t\titems: Array<[ItemCacheKey, Item]>,\n\t\toptions: CacheClientArgs<Item>,\n\t\tsaveOptions: CacheClientSaveOptions = {},\n\t): Promise<void> {\n\t\tif (items.length === 0) {\n\t\t\treturn;\n\t\t}\n\t\tconst expiresAt = Date.now() + options.ttlMs;\n\t\tconst serialized = items.map(([key, value]) => ({\n\t\t\tkey,\n\t\t\tvalue: options.serialize(value),\n\t\t}));\n\t\tawait batchPipeline({\n\t\t\tmakePipeline: () => this.redis.pipeline(),\n\t\t\taddCommand: (pipeline, item) => {\n\t\t\t\tif (saveOptions.disableOverwrite !== true) {\n\t\t\t\t\tpipeline.set(item.key, item.value, 'PXAT', expiresAt);\n\t\t\t\t} else {\n\t\t\t\t\tpipeline.setnx(item.key, item.value);\n\t\t\t\t\tpipeline.pexpireat(item.key, expiresAt);\n\t\t\t\t}\n\t\t\t},\n\t\t\texecutePipeline: async (pipeline) => {\n\t\t\t\tconst result = await pipeline.exec();\n\t\t\t\tif (result == null) {\n\t\t\t\t\tthrow new Error('Unexpected null result from Redis pipeline');\n\t\t\t\t}\n\t\t\t\tassertNoPipelineErrors(result);\n\t\t\t\treturn [];\n\t\t\t},\n\t\t\testimateSize: (item) => {\n\t\t\t\treturn item.key.length + item.value.length;\n\t\t\t},\n\t\t\titems: serialized,\n\t\t\tmaxBatchBytes: this.maxPipelineSizeLimit,\n\t\t\tmaxBatchCount: this.maxPipelineCommandLimit,\n\t\t});\n\t}\n\n\tasync saveItemsWithDiff<Item>(\n\t\titems: Array<[ItemCacheKey, Item]>,\n\t\toptions: CacheClientArgs<Item>,\n\t): Promise<Array<Item | null>> {\n\t\tif (items.length === 0) {\n\t\t\treturn [];\n\t\t}\n\t\tconst expiresAt = Date.now() + options.ttlMs;\n\t\tconst keys: ItemCacheKey[] = new Array(items.length);\n\t\tconst values: string[] = new Array(items.length);\n\t\tfor (let i = 0; i < items.length; i++) {\n\t\t\tkeys[i] = items[i][0];\n\t\t\tvalues[i] = options.serialize(items[i][1]);\n\t\t}\n\t\tconst result = await this.scripts.saveWithDiffScript(keys, [...values, expiresAt.toString()]);\n\t\tif (!Array.isArray(result)) {\n\t\t\tthrow new Error(`Unexpected non-array result from Redis script: ${typeof result}`);\n\t\t}\n\t\treturn result.map((value) => {\n\t\t\tif (typeof value === 'string') {\n\t\t\t\treturn options.parse(value);\n\t\t\t}\n\t\t\treturn null;\n\t\t});\n\t}\n\n\tasync deleteItems(keys: ItemCacheKey[]): Promise<void> {\n\t\tif (keys.length === 0) {\n\t\t\treturn;\n\t\t}\n\t\tawait doBatched(keys, this.maxCommandKeysLimit, async (batch) => {\n\t\t\tawait this.redis.unlink(batch);\n\t\t});\n\t}\n\n\tasync deleteItemsWithDiff<Item>(\n\t\tkeys: ItemCacheKey[],\n\t\toptions: CacheClientArgs<Item>,\n\t): Promise<Array<Item | null>> {\n\t\tif (keys.length === 0) {\n\t\t\treturn [];\n\t\t}\n\t\tconst result = await this.scripts.deleteWithDiffScript(keys, []);\n\t\tif (!Array.isArray(result)) {\n\t\t\tthrow new Error(`Unexpected non-array result from Redis script: ${typeof result}`);\n\t\t}\n\t\treturn result.map((value) => {\n\t\t\tif (typeof value === 'string') {\n\t\t\t\treturn options.parse(value);\n\t\t\t}\n\t\t\treturn null;\n\t\t});\n\t}\n\n\tasync getQuery<QueryMetadata>(\n\t\tkey: QueryCacheKey,\n\t\toptions: CacheClientArgs<QueryMetadata>,\n\t): Promise<QueryMetadata | null> {\n\t\tconst meta = await this.redis.get(key);\n\t\treturn meta == null ? null : options.parse(meta);\n\t}\n\n\tasync saveQuery<QueryMetadata>(\n\t\tkey: QueryCacheKey,\n\t\tindexes: QueryCacheIndexKey[],\n\t\tmetadata: QueryMetadata,\n\t\toptions: CacheClientArgs<QueryMetadata>,\n\t): Promise<void> {\n\t\tconst now = Date.now();\n\t\tconst expiresAt = now + options.ttlMs;\n\t\tconst pipeline = this.redis.pipeline();\n\t\tpipeline.set(key, options.serialize(metadata), 'PXAT', expiresAt);\n\t\tfor (const indexKey of indexes) {\n\t\t\tpipeline.zadd(indexKey, expiresAt, key);\n\t\t\tpipeline.zremrangebyscore(indexKey, '-inf', now - INDEX_BUFFER_MS);\n\t\t\tpipeline.pexpireat(indexKey, expiresAt + INDEX_BUFFER_MS);\n\t\t}\n\t\tconst result = await pipeline.exec();\n\t\tassertNoPipelineErrors(result);\n\t}\n\n\tasync deleteQueries(indexes: QueryCacheIndexKey[]): Promise<void> {\n\t\tif (indexes.length === 0) {\n\t\t\treturn;\n\t\t}\n\t\tconst result = await this.scripts.deleteQueriesScript(indexes, []);\n\t\tif (typeof result !== 'number') {\n\t\t\tthrow new Error(`Unexpected non-number result from Redis script: ${typeof result}`);\n\t\t}\n\t}\n}\n"],"mappings":"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"}
+{"version":3,"file":"index.js","names":[],"sources":["../lib/cache-client.ts"],"sourcesContent":["import {\n\tCacheClient,\n\ttype CacheClientSaveOptions,\n\ttype ItemCacheKey,\n\ttype QueryCacheIndexKey,\n\ttype QueryCacheKey,\n\ttype CacheClientArgs,\n\ttype CacheClientOptions,\n} from '@baeta/cache';\nimport {\n\tassertNoPipelineErrors,\n\tbatchPipeline,\n\tcreateRedisScripts,\n\ttype RedisScripts,\n} from '@baeta/cache-redis-common';\nimport { doBatched } from '@baeta/cache/sdk';\nimport type Redis from 'ioredis';\nimport type { Cluster as RedisCluster } from 'ioredis';\n\nconst INDEX_BUFFER_MS = 1_000;\nconst MAX_PIPELINE_SIZE_LIMIT = 50 * 1024 * 1024; // 50MB\nconst MAX_PIPELINE_COMMAND_LIMIT = 100_000;\nconst MAX_COMMAND_KEYS_LIMIT = 100_000;\n\nexport interface RedisCacheClientOptions extends CacheClientOptions {\n\t/**\n\t * Maximum total size of commands in a single pipeline batch. If the batch exceeds this size, it will be executed immediately.\n\t * @defaultValue 50 * 1024 * 1024 (50MB)\n\t */\n\tmaxPipelineSizeLimit?: number;\n\t/**\n\t * Maximum number of commands in a single pipeline batch. If the batch exceeds this number, it will be executed immediately.\n\t * @defaultValue 100_000\n\t */\n\tmaxPipelineCommandLimit?: number;\n\t/**\n\t * Maximum number of keys in a single command. If the number of keys exceeds this limit, multiple commands will be executed.\n\t * @defaultValue 100_000\n\t */\n\tmaxCommandKeysLimit?: number;\n}\n\nexport class RedisCacheClient extends CacheClient {\n\tredis: Redis | RedisCluster;\n\tprotected maxPipelineSizeLimit: number;\n\tprotected maxPipelineCommandLimit: number;\n\tprotected maxCommandKeysLimit: number;\n\tprotected scripts: RedisScripts;\n\n\tconstructor(redis: Redis | RedisCluster, options?: RedisCacheClientOptions) {\n\t\tsuper({\n\t\t\tnamespace: options?.namespace,\n\t\t\trevision: options?.revision,\n\t\t\tttlMs: options?.ttlMs,\n\t\t});\n\t\tthis.redis = redis;\n\t\tthis.maxPipelineSizeLimit = options?.maxPipelineSizeLimit ?? MAX_PIPELINE_SIZE_LIMIT;\n\t\tthis.maxPipelineCommandLimit = options?.maxPipelineCommandLimit ?? MAX_PIPELINE_COMMAND_LIMIT;\n\t\tthis.maxCommandKeysLimit = options?.maxCommandKeysLimit ?? MAX_COMMAND_KEYS_LIMIT;\n\t\tconst loadScript = async (script: string) => {\n\t\t\treturn await this.redis.script('LOAD', script);\n\t\t};\n\t\tconst evalSha = async (sha: string, keys: string[], args: string[]) => {\n\t\t\treturn await this.redis.evalsha(sha, keys.length, ...keys, ...args);\n\t\t};\n\t\tthis.scripts = createRedisScripts(loadScript, evalSha);\n\t}\n\n\tasync getPartialItems<Item>(\n\t\tkeys: ItemCacheKey[],\n\t\toptions: CacheClientArgs<Item>,\n\t): Promise<Array<Item | null>> {\n\t\tif (keys.length === 0) {\n\t\t\treturn [];\n\t\t}\n\t\tconst values: Array<Item | null> = [];\n\t\tawait doBatched(keys, this.maxCommandKeysLimit, async (batch) => {\n\t\t\tconst batchValues = await this.redis.mget(batch);\n\t\t\tfor (const value of batchValues) {\n\t\t\t\tvalues.push(value == null ? null : options.parse(value));\n\t\t\t}\n\t\t});\n\t\treturn values;\n\t}\n\n\tasync saveItems<Item>(\n\t\titems: Array<[ItemCacheKey, Item]>,\n\t\toptions: CacheClientArgs<Item>,\n\t\tsaveOptions: CacheClientSaveOptions = {},\n\t): Promise<void> {\n\t\tif (items.length === 0) {\n\t\t\treturn;\n\t\t}\n\t\tconst expiresAt = Date.now() + options.ttlMs;\n\t\tconst serialized = items.map(([key, value]) => ({\n\t\t\tkey,\n\t\t\tvalue: options.serialize(value),\n\t\t}));\n\t\tawait batchPipeline({\n\t\t\tmakePipeline: () => this.redis.pipeline(),\n\t\t\taddCommand: (pipeline, item) => {\n\t\t\t\tif (saveOptions.disableOverwrite !== true) {\n\t\t\t\t\tpipeline.set(item.key, item.value, 'PXAT', expiresAt);\n\t\t\t\t} else {\n\t\t\t\t\tpipeline.set(item.key, item.value, 'PXAT', expiresAt, 'NX');\n\t\t\t\t}\n\t\t\t},\n\t\t\texecutePipeline: async (pipeline) => {\n\t\t\t\tconst result = await pipeline.exec();\n\t\t\t\tassertNoPipelineErrors(result);\n\t\t\t\treturn [];\n\t\t\t},\n\t\t\testimateSize: (item) => {\n\t\t\t\treturn item.key.length + item.value.length;\n\t\t\t},\n\t\t\titems: serialized,\n\t\t\tmaxBatchBytes: this.maxPipelineSizeLimit,\n\t\t\tmaxBatchCount: this.maxPipelineCommandLimit,\n\t\t});\n\t}\n\n\tasync saveItemsWithDiff<Item>(\n\t\titems: Array<[ItemCacheKey, Item]>,\n\t\toptions: CacheClientArgs<Item>,\n\t): Promise<Array<Item | null>> {\n\t\tif (items.length === 0) {\n\t\t\treturn [];\n\t\t}\n\t\tconst expiresAt = Date.now() + options.ttlMs;\n\t\tconst tx = this.redis.multi();\n\t\tfor (const item of items) {\n\t\t\ttx.get(item[0]);\n\t\t\ttx.set(item[0], options.serialize(item[1]), 'PXAT', expiresAt);\n\t\t}\n\t\tconst result = await tx.exec();\n\t\tassertNoPipelineErrors(result);\n\t\tconst results: Array<Item | null> = [];\n\t\tfor (let i = 0; i < result.length; i += 2) {\n\t\t\tconst value = result[i][1];\n\t\t\tresults.push(value == null ? null : options.parse(value as string));\n\t\t}\n\t\treturn results;\n\t}\n\n\tasync deleteItems(keys: ItemCacheKey[]): Promise<void> {\n\t\tif (keys.length === 0) {\n\t\t\treturn;\n\t\t}\n\t\tawait doBatched(keys, this.maxCommandKeysLimit, async (batch) => {\n\t\t\tawait this.redis.unlink(batch);\n\t\t});\n\t}\n\n\tasync deleteItemsWithDiff<Item>(\n\t\tkeys: ItemCacheKey[],\n\t\toptions: CacheClientArgs<Item>,\n\t): Promise<Array<Item | null>> {\n\t\tif (keys.length === 0) {\n\t\t\treturn [];\n\t\t}\n\t\tconst tx = this.redis.multi();\n\t\tfor (const key of keys) {\n\t\t\ttx.get(key);\n\t\t\ttx.unlink(key);\n\t\t}\n\t\tconst result = await tx.exec();\n\t\tassertNoPipelineErrors(result);\n\t\tconst results: Array<Item | null> = [];\n\t\tfor (let i = 0; i < result.length; i += 2) {\n\t\t\tconst value = result[i][1];\n\t\t\tresults.push(value == null ? null : options.parse(value as string));\n\t\t}\n\t\treturn results;\n\t}\n\n\tasync getQuery<QueryMetadata>(\n\t\tkey: QueryCacheKey,\n\t\toptions: CacheClientArgs<QueryMetadata>,\n\t): Promise<QueryMetadata | null> {\n\t\tconst meta = await this.redis.get(key);\n\t\treturn meta == null ? null : options.parse(meta);\n\t}\n\n\tasync saveQuery<QueryMetadata>(\n\t\tkey: QueryCacheKey,\n\t\tindexes: QueryCacheIndexKey[],\n\t\tmetadata: QueryMetadata,\n\t\toptions: CacheClientArgs<QueryMetadata>,\n\t): Promise<void> {\n\t\tconst now = Date.now();\n\t\tconst expiresAt = now + options.ttlMs;\n\t\tconst tx = this.redis.multi();\n\t\ttx.set(key, options.serialize(metadata), 'PXAT', expiresAt);\n\t\tfor (const indexKey of indexes) {\n\t\t\ttx.zadd(indexKey, expiresAt, key);\n\t\t\ttx.zremrangebyscore(indexKey, '-inf', now - INDEX_BUFFER_MS);\n\t\t\ttx.pexpireat(indexKey, expiresAt + INDEX_BUFFER_MS);\n\t\t}\n\t\tconst result = await tx.exec();\n\t\tassertNoPipelineErrors(result);\n\t}\n\n\tasync deleteQueries(indexes: QueryCacheIndexKey[]): Promise<void> {\n\t\tif (indexes.length === 0) {\n\t\t\treturn;\n\t\t}\n\t\tconst result = await this.scripts.deleteQueriesScript(indexes, []);\n\t\tif (typeof result !== 'number') {\n\t\t\tthrow new Error(`Unexpected non-number result from Redis script: ${typeof result}`);\n\t\t}\n\t}\n}\n"],"mappings":"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"}

package/package.json

@@ -1,81 +1,82 @@
 {
   "name": "@baeta/cache-ioredis",
-  "version": "2.0.0-next.13",
+  "version": "2.0.0-next.15",
+  "description": "ioredis cache adapter for Baeta.",
   "keywords": [
     "baeta",
+    "builder",
+    "framework",
     "graphql",
     "schema",
     "types",
-    "typescript",
-    "framework",
-    "builder"
+    "typescript"
   ],
   "homepage": "https://github.com/andreisergiu98/baeta#readme",
   "bugs": {
     "url": "https://github.com/andreisergiu98/baeta/issues"
   },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/andreisergiu98/baeta.git",
-    "directory": "packages/cache-ioredis"
-  },
   "license": "MIT",
   "author": {
     "name": "Andrei Pampu",
     "url": "https://github.com/andreisergiu98"
   },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/andreisergiu98/baeta.git",
+    "directory": "packages/cache-ioredis"
+  },
+  "files": [
+    "dist"
+  ],
   "type": "module",
+  "sideEffects": false,
+  "types": "dist/index.d.ts",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
       "default": "./dist/index.js"
     }
   },
-  "types": "dist/index.d.ts",
-  "files": [
-    "dist",
-    "package.json"
-  ],
+  "publishConfig": {
+    "exports": {
+      ".": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
+    },
+    "access": "public"
+  },
   "scripts": {
     "build": "builder build",
     "check:deps": "builder check-deps",
-    "prepack": "builder prepare",
     "postpack": "builder prepare --restore",
-    "test": "builder test --skip-coverage",
+    "prepack": "builder prepare",
+    "test": "builder test",
     "types": "tsc --noEmit"
   },
-  "ava": {
-    "extensions": [
-      "ts"
-    ]
-  },
   "dependencies": {
-    "@baeta/cache-redis-common": "^2.0.0-next.12"
+    "@baeta/cache-redis-common": "^2.0.0-next.13"
   },
   "devDependencies": {
     "@baeta/builder": "^0.0.0",
-    "@baeta/cache": "^2.0.0-next.13",
+    "@baeta/cache": "^2.0.0-next.15",
     "@baeta/testing": "^0.0.0",
     "@baeta/tests-cache-clients": "^0.0.0",
     "@baeta/tsconfig": "^0.0.0",
-    "ioredis": "^5.10.1",
+    "ioredis": "^5.11.0",
     "typescript": "^6.0.0"
   },
   "peerDependencies": {
-    "@baeta/cache": "^2.0.0-next.13",
+    "@baeta/cache": "^2.0.0-next.15",
     "ioredis": "^5.10.0"
   },
-  "engines": {
-    "node": ">=22.20.0"
+  "ava": {
+    "extensions": [
+      "ts"
+    ]
   },
-  "publishConfig": {
-    "access": "public",
-    "exports": {
-      ".": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.js"
-      }
-    }
+  "engines": {
+    "node": "^22.20.0 || ^24.0.0 || >=26.0.0"
   },
   "typedocOptions": {
     "entryPoints": [