@keyv/redis 2.3.2 → 2.3.5

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@keyv/redis",
-	"version": "2.3.2",
+	"version": "2.3.5",
 	"description": "Redis storage adapter for Keyv",
 	"main": "src/index.js",
 	"scripts": {
@@ -41,18 +41,18 @@
 	},
 	"homepage": "https://github.com/jaredwray/keyv",
 	"dependencies": {
-		"ioredis": "^5.0.3"
+		"ioredis": "^5.0.4"
 	},
 	"devDependencies": {
 		"@keyv/test-suite": "*",
-		"ava": "^4.1.0",
+		"ava": "^4.2.0",
 		"delay": "^5.0.0",
 		"keyv": "*",
 		"nyc": "^15.1.0",
 		"requirable": "^1.0.5",
 		"this": "^1.1.0",
 		"tsd": "^0.20.0",
-		"typescript": "^4.6.3",
+		"typescript": "^4.6.4",
 		"xo": "^0.48.0"
 	},
 	"tsd" : {

package/src/index.d.ts

@@ -1,14 +1,14 @@
 import {EventEmitter} from 'events';
 import {Store} from 'keyv';
-import {ClientOpts} from 'redis';
+import {Redis, Cluster} from 'ioredis';
 
 declare class KeyvRedis extends EventEmitter implements Store<string | undefined> {
 	readonly ttlSupport: false;
 	namespace?: string | undefined;
 	opts: Record<string, unknown>;
 	redis: any;
-	constructor(options?: KeyvRedis.Options);
-	constructor(uri: string, options?: KeyvRedis.Options);
+	constructor(options?: KeyvRedis.Options | Redis | Cluster);
+	constructor(uri: string | Redis | Cluster, options?: KeyvRedis.Options);
 	get(key: string): Promise<string | undefined>;
 	getMany(keys: string[]): Promise<string[] | undefined>;
 	set(key: string, value: string | undefined, ttl?: number): Promise<any>;
@@ -19,7 +19,7 @@ declare class KeyvRedis extends EventEmitter implements Store<string | undefined
 	has(key: string): boolean;
 }
 declare namespace KeyvRedis {
-	interface Options extends ClientOpts {
+	interface Options {
 		uri?: string | undefined;
 		dialect?: string | undefined;
 	}

package/src/index.js

@@ -80,12 +80,10 @@ class KeyvRedis extends EventEmitter {
 			}
 
 			const values = await get(keys);
-			for (const i in keys) {
-				if (Object.prototype.hasOwnProperty.call(keys, i)) {
-					const key = keys[i];
-					const value = values[i];
-					yield [key, value];
-				}
+			for (const [i] of keys.entries()) {
+				const key = keys[i];
+				const value = values[i];
+				yield [key, value];
 			}
 
 			if (cursor !== '0') {
@@ -93,13 +91,17 @@ class KeyvRedis extends EventEmitter {
 			}
 		}
 
-		yield * iterate(0, `${namespace ? namespace + ':' : ''}*`);
+		yield * iterate(0, `${namespace}:*`);
 	}
 
 	has(key) {
 		return this.redis.exists(key)
 			.then(value => value !== 0);
 	}
+
+	disconnect() {
+		return this.redis.disconnect();
+	}
 }
 
 module.exports = KeyvRedis;