keyv 4.2.0 → 4.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "keyv",
-	"version": "4.2.0",
+	"version": "4.2.1",
 	"description": "Simple key-value storage with support for multiple backends",
 	"main": "src/index.js",
 	"scripts": {
@@ -9,9 +9,9 @@
 		"clean": "rm -rf node_modules && rm -rf .nyc_output && rm -rf coverage.lcov && rm -rf ./test/testdb.sqlite"
 	},
 	"xo": {
-		"extends": "xo-lukechilds",
 		"rules": {
-			"unicorn/prefer-module": 0
+			"unicorn/prefer-module": 0,
+			"unicorn/prefer-node-protocol": 0
 		}
 	},
 	"repository": {
@@ -38,7 +38,6 @@
 	"devDependencies": {
 		"@keyv/test-suite": "*",
 		"ava": "^4.1.0",
-		"eslint-config-xo-lukechilds": "^1.0.1",
 		"eslint-plugin-promise": "^6.0.0",
 		"nyc": "^15.1.0",
 		"pify": "5.0.0",

package/src/index.d.ts

@@ -1,9 +1,9 @@
-import EventEmitter from 'node:events';
+import {EventEmitter} from 'events';
 
-declare class Keyv extends EventEmitter {
+declare class Keyv<T = any> extends EventEmitter {
 	constructor(uri: string, options: Keyv.Options);
-	get(key: string, options: any): Promise<any>;
-	set(key: string, value: any, ttl: number): Promise<boolean>;
+	get(key: string, options?: any): Promise<T>;
+	set(key: string, value: T, ttl?: number): Promise<boolean>;
 	delete(key: string): Promise<boolean>;
 	clear(): Promise<void>;
 	has(key: string): Promise<boolean>;
@@ -16,6 +16,8 @@ declare namespace Keyv {
 		deserialize?: ((data: string) => any | undefined) | undefined;
 		ttl?: number | undefined;
 	}
+
+	type Store<T> = Keyv<T>;
 }
 
 export = Keyv;

package/src/index.js

@@ -38,21 +38,21 @@ class Keyv extends EventEmitter {
 			namespace: 'keyv',
 			serialize: JSONB.stringify,
 			deserialize: JSONB.parse,
-			...((typeof uri === 'string') ? { uri } : uri),
+			...((typeof uri === 'string') ? {uri} : uri),
 			...options,
 		};
 
 		if (!this.opts.store) {
-			const adapterOptions = { ...this.opts };
+			const adapterOptions = {...this.opts};
 			this.opts.store = loadStore(adapterOptions);
 		}
 
 		if (this.opts.compress) {
 			const brotli = compressBrotli(this.opts.compress.opts);
-			this.opts.serialize = async ({ value, expires }) => brotli.serialize({ value: await brotli.compress(value), expires });
+			this.opts.serialize = async ({value, expires}) => brotli.serialize({value: await brotli.compress(value), expires});
 			this.opts.deserialize = async data => {
-				const { value, expires } = brotli.deserialize(data);
-				return { value: await brotli.decompress(value), expires };
+				const {value, expires} = brotli.deserialize(data);
+				return {value: await brotli.decompress(value), expires};
 			};
 		}
 
@@ -113,7 +113,7 @@ class Keyv extends EventEmitter {
 	}
 
 	get(key, options) {
-		const { store } = this.opts;
+		const {store} = this.opts;
 		const isArray = Array.isArray(key);
 		const keyPrefixed = isArray ? this._getKeyPrefixArray(key) : this._getKeyPrefix(key);
 		if (isArray && store.getMany === undefined) {
@@ -201,7 +201,7 @@ class Keyv extends EventEmitter {
 			ttl = undefined;
 		}
 
-		const { store } = this.opts;
+		const {store} = this.opts;
 
 		return Promise.resolve()
 			.then(() => {
@@ -210,7 +210,7 @@ class Keyv extends EventEmitter {
 					this.emit('error', 'symbol cannot be serialized');
 				}
 
-				value = { value, expires };
+				value = {value, expires};
 				return this.opts.serialize(value);
 			})
 			.then(value => store.set(keyPrefixed, value, ttl))
@@ -218,7 +218,7 @@ class Keyv extends EventEmitter {
 	}
 
 	delete(key) {
-		const { store } = this.opts;
+		const {store} = this.opts;
 		if (Array.isArray(key)) {
 			const keyPrefixed = this._getKeyPrefixArray(key);
 			if (store.deleteMany === undefined) {
@@ -241,14 +241,14 @@ class Keyv extends EventEmitter {
 	}
 
 	clear() {
-		const { store } = this.opts;
+		const {store} = this.opts;
 		return Promise.resolve()
 			.then(() => store.clear());
 	}
 
 	has(key) {
 		const keyPrefixed = this._getKeyPrefix(key);
-		const { store } = this.opts;
+		const {store} = this.opts;
 		return Promise.resolve()
 			.then(async () => {
 				if (typeof store.has === 'function') {