@naturalcycles/redis-lib 3.3.1 → 4.0.0

package/dist/index.d.ts

@@ -1,3 +1,3 @@
-export * from './redisClient';
-export * from './redisHashKeyValueDB';
-export * from './redisKeyValueDB';
+export * from './redisClient.js';
+export * from './redisHashKeyValueDB.js';
+export * from './redisKeyValueDB.js';

package/dist/index.js

@@ -1,6 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./redisClient"), exports);
-tslib_1.__exportStar(require("./redisHashKeyValueDB"), exports);
-tslib_1.__exportStar(require("./redisKeyValueDB"), exports);
+export * from './redisClient.js';
+export * from './redisHashKeyValueDB.js';
+export * from './redisKeyValueDB.js';

package/dist/redisClient.d.ts

@@ -1,8 +1,8 @@
-import { AnyObject, CommonLogger, NullableBuffer, NullableString, Promisable, UnixTimestampNumber } from '@naturalcycles/js-lib';
-import { ReadableTyped } from '@naturalcycles/nodejs-lib';
+import type { AnyObject, CommonLogger, NullableBuffer, NullableString, Promisable, UnixTimestamp } from '@naturalcycles/js-lib';
+import type { ReadableTyped } from '@naturalcycles/nodejs-lib';
 import type { Redis, RedisOptions } from 'ioredis';
-import type { ScanStreamOptions } from 'ioredis/built/types';
-import type { ChainableCommander } from 'ioredis/built/utils/RedisCommander';
+import type { ScanStreamOptions } from 'ioredis/built/types.js';
+import type { ChainableCommander } from 'ioredis/built/utils/RedisCommander.js';
 export interface CommonClient extends AsyncDisposable {
     connected: boolean;
     connect: () => Promise<void>;
@@ -48,8 +48,8 @@ export declare class RedisClient implements CommonClient {
     hmgetBuffer(key: string, fields: string[]): Promise<NullableBuffer[]>;
     hincr(key: string, field: string, increment?: number): Promise<number>;
     hincrBatch(key: string, incrementTuples: [string, number][]): Promise<[string, number][]>;
-    setWithTTL(key: string, value: string | number | Buffer, expireAt: UnixTimestampNumber): Promise<void>;
-    hsetWithTTL(_key: string, _value: AnyObject, _expireAt: UnixTimestampNumber): Promise<void>;
+    setWithTTL(key: string, value: string | number | Buffer, expireAt: UnixTimestamp): Promise<void>;
+    hsetWithTTL(_key: string, _value: AnyObject, _expireAt: UnixTimestamp): Promise<void>;
     mset(obj: Record<string, string | number>): Promise<void>;
     msetBuffer(obj: Record<string, Buffer>): Promise<void>;
     incr(key: string, by?: number): Promise<number>;

package/dist/redisClient.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RedisClient = void 0;
-const js_lib_1 = require("@naturalcycles/js-lib");
+import { _stringMapEntries } from '@naturalcycles/js-lib';
 /**
  Wraps the redis sdk with unified interface.
  Features:
@@ -10,9 +7,8 @@ const js_lib_1 = require("@naturalcycles/js-lib");
  - Reasonable defaults
  
  */
-class RedisClient {
+export class RedisClient {
     constructor(cfg = {}) {
-        this.connected = false;
         this.cfg = {
             logger: console,
             ...cfg,
@@ -23,6 +19,9 @@ class RedisClient {
             },
         };
     }
+    cfg;
+    connected = false;
+    _redis;
     redis() {
         if (this._redis)
             return this._redis;
@@ -108,7 +107,7 @@ class RedisClient {
                 });
             }
         });
-        const validResults = (0, js_lib_1._stringMapEntries)(results).filter(([_, v]) => v !== undefined);
+        const validResults = _stringMapEntries(results).filter(([_, v]) => v !== undefined);
         return validResults;
     }
     async setWithTTL(key, value, expireAt) {
@@ -142,7 +141,7 @@ class RedisClient {
                 });
             }
         });
-        const validResults = (0, js_lib_1._stringMapEntries)(results).filter(([_, v]) => v !== undefined);
+        const validResults = _stringMapEntries(results).filter(([_, v]) => v !== undefined);
         return validResults;
     }
     async ttl(key) {
@@ -215,4 +214,3 @@ class RedisClient {
         this.cfg.logger.log(...args);
     }
 }
-exports.RedisClient = RedisClient;

package/dist/redisHashKeyValueDB.d.ts

@@ -1,6 +1,6 @@
-import { CommonDBCreateOptions, CommonKeyValueDB, CommonKeyValueDBSaveBatchOptions, IncrementTuple, KeyValueDBTuple } from '@naturalcycles/db-lib';
-import { ReadableTyped } from '@naturalcycles/nodejs-lib';
-import { RedisKeyValueDBCfg } from './redisKeyValueDB';
+import type { CommonDBCreateOptions, CommonKeyValueDB, CommonKeyValueDBSaveBatchOptions, IncrementTuple, KeyValueDBTuple } from '@naturalcycles/db-lib';
+import type { ReadableTyped } from '@naturalcycles/nodejs-lib';
+import type { RedisKeyValueDBCfg } from './redisKeyValueDB.js';
 /**
  * RedisHashKeyValueDB is a KeyValueDB implementation that uses hash fields to simulate tables.
  * The value in the `table` arguments points to a hash field in Redis.

package/dist/redisHashKeyValueDB.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RedisHashKeyValueDB = void 0;
-const db_lib_1 = require("@naturalcycles/db-lib");
+import { commonKeyValueDBFullSupport } from '@naturalcycles/db-lib';
 /**
  * RedisHashKeyValueDB is a KeyValueDB implementation that uses hash fields to simulate tables.
  * The value in the `table` arguments points to a hash field in Redis.
@@ -14,13 +11,14 @@ const db_lib_1 = require("@naturalcycles/db-lib");
  * Once the available Redis version reaches 7.4.0+,
  * this implementation can take over for RedisKeyValueDB.
  */
-class RedisHashKeyValueDB {
+export class RedisHashKeyValueDB {
+    cfg;
     constructor(cfg) {
         this.cfg = cfg;
-        this.support = {
-            ...db_lib_1.commonKeyValueDBFullSupport,
-        };
     }
+    support = {
+        ...commonKeyValueDBFullSupport,
+    };
     async ping() {
         await this.cfg.client.ping();
     }
@@ -102,4 +100,3 @@ class RedisHashKeyValueDB {
         await this.cfg.client.del([table]);
     }
 }
-exports.RedisHashKeyValueDB = RedisHashKeyValueDB;

package/dist/redisKeyValueDB.d.ts

@@ -1,6 +1,6 @@
-import { CommonDBCreateOptions, CommonKeyValueDB, CommonKeyValueDBSaveBatchOptions, IncrementTuple, KeyValueDBTuple } from '@naturalcycles/db-lib';
-import { ReadableTyped } from '@naturalcycles/nodejs-lib';
-import { RedisClient } from './redisClient';
+import type { CommonDBCreateOptions, CommonKeyValueDB, CommonKeyValueDBSaveBatchOptions, IncrementTuple, KeyValueDBTuple } from '@naturalcycles/db-lib';
+import type { ReadableTyped } from '@naturalcycles/nodejs-lib';
+import type { RedisClient } from './redisClient.js';
 export interface RedisKeyValueDBCfg {
     client: RedisClient;
 }

package/dist/redisKeyValueDB.js

@@ -1,15 +1,13 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RedisKeyValueDB = void 0;
-const db_lib_1 = require("@naturalcycles/db-lib");
-const js_lib_1 = require("@naturalcycles/js-lib");
-class RedisKeyValueDB {
+import { commonKeyValueDBFullSupport } from '@naturalcycles/db-lib';
+import { _isTruthy, _zip } from '@naturalcycles/js-lib';
+export class RedisKeyValueDB {
+    cfg;
     constructor(cfg) {
         this.cfg = cfg;
-        this.support = {
-            ...db_lib_1.commonKeyValueDBFullSupport,
-        };
     }
+    support = {
+        ...commonKeyValueDBFullSupport,
+    };
     async ping() {
         await this.cfg.client.ping();
     }
@@ -63,7 +61,7 @@ class RedisKeyValueDB {
             match: `${table}:*`,
         })
             .flatMap(async (keys) => {
-            return (await this.cfg.client.mgetBuffer(keys)).filter(js_lib_1._isTruthy);
+            return (await this.cfg.client.mgetBuffer(keys)).filter(_isTruthy);
         }, {
             concurrency: 16,
         })
@@ -77,7 +75,7 @@ class RedisKeyValueDB {
             .flatMap(async (keys) => {
             // casting as Buffer[], because values are expected to exist for given keys
             const bufs = (await this.cfg.client.mgetBuffer(keys));
-            return (0, js_lib_1._zip)(this.keysToIds(table, keys), bufs);
+            return _zip(this.keysToIds(table, keys), bufs);
         }, {
             concurrency: 16,
         })
@@ -113,4 +111,3 @@ class RedisKeyValueDB {
         return key.slice(table.length + 1);
     }
 }
-exports.RedisKeyValueDB = RedisKeyValueDB;

package/package.json

@@ -1,5 +1,6 @@
 {
   "name": "@naturalcycles/redis-lib",
+  "type": "module",
   "scripts": {
     "prepare": "husky",
     "build": "dev-lib build",
@@ -9,15 +10,17 @@
     "lbt": "dev-lib lbt"
   },
   "dependencies": {
-    "@naturalcycles/db-lib": "^9.9.2",
-    "@naturalcycles/js-lib": "^14.217.0",
-    "@naturalcycles/nodejs-lib": "^13.8.0",
-    "ioredis": "^5.3.2"
+    "@naturalcycles/db-lib": "^10",
+    "@naturalcycles/js-lib": "^14",
+    "@naturalcycles/nodejs-lib": "^13",
+    "ioredis": "^5"
   },
   "devDependencies": {
-    "@naturalcycles/dev-lib": "^15.22.0",
-    "@types/node": "^22.7.5",
-    "jest": "^29.7.0"
+    "@naturalcycles/dev-lib": "^17",
+    "@types/node": "^22",
+    "@vitest/coverage-v8": "^3",
+    "tsx": "^4",
+    "vitest": "^3"
   },
   "files": [
     "dist",
@@ -38,9 +41,9 @@
     "url": "https://github.com/NaturalCycles/redis-lib"
   },
   "engines": {
-    "node": ">=20.13"
+    "node": ">=22.10"
   },
-  "version": "3.3.1",
+  "version": "4.0.0",
   "description": "Redis implementation of CommonKeyValueDB interface",
   "author": "Natural Cycles Team",
   "license": "MIT"

package/src/index.ts

@@ -1,3 +1,3 @@
-export * from './redisClient'
-export * from './redisHashKeyValueDB'
-export * from './redisKeyValueDB'
+export * from './redisClient.js'
+export * from './redisHashKeyValueDB.js'
+export * from './redisKeyValueDB.js'

package/src/redisClient.ts

@@ -1,20 +1,18 @@
-import {
-  _stringMapEntries,
+import type {
   AnyObject,
   CommonLogger,
   NullableBuffer,
   NullableString,
   Promisable,
   StringMap,
-  UnixTimestampNumber,
+  UnixTimestamp,
 } from '@naturalcycles/js-lib'
-import { ReadableTyped } from '@naturalcycles/nodejs-lib'
-// eslint-disable-next-line import-x/no-duplicates
+import { _stringMapEntries } from '@naturalcycles/js-lib'
+import type { ReadableTyped } from '@naturalcycles/nodejs-lib'
 import type { Redis, RedisOptions } from 'ioredis'
-// eslint-disable-next-line import-x/no-duplicates
 import type * as RedisLib from 'ioredis'
-import type { ScanStreamOptions } from 'ioredis/built/types'
-import type { ChainableCommander } from 'ioredis/built/utils/RedisCommander'
+import type { ScanStreamOptions } from 'ioredis/built/types.js'
+import type { ChainableCommander } from 'ioredis/built/utils/RedisCommander.js'
 
 export interface CommonClient extends AsyncDisposable {
   connected: boolean
@@ -181,16 +179,12 @@ export class RedisClient implements CommonClient {
   async setWithTTL(
     key: string,
     value: string | number | Buffer,
-    expireAt: UnixTimestampNumber,
+    expireAt: UnixTimestamp,
   ): Promise<void> {
     await this.redis().set(key, value, 'EXAT', expireAt)
   }
 
-  async hsetWithTTL(
-    _key: string,
-    _value: AnyObject,
-    _expireAt: UnixTimestampNumber,
-  ): Promise<void> {
+  async hsetWithTTL(_key: string, _value: AnyObject, _expireAt: UnixTimestamp): Promise<void> {
     throw new Error('Not supported until Redis 7.4.0')
     // const valueKeys = Object.keys(value)
     // const numberOfKeys = valueKeys.length

package/src/redisHashKeyValueDB.ts

@@ -1,13 +1,13 @@
-import {
+import type {
   CommonDBCreateOptions,
   CommonKeyValueDB,
-  commonKeyValueDBFullSupport,
   CommonKeyValueDBSaveBatchOptions,
   IncrementTuple,
   KeyValueDBTuple,
 } from '@naturalcycles/db-lib'
-import { ReadableTyped } from '@naturalcycles/nodejs-lib'
-import { RedisKeyValueDBCfg } from './redisKeyValueDB'
+import { commonKeyValueDBFullSupport } from '@naturalcycles/db-lib'
+import type { ReadableTyped } from '@naturalcycles/nodejs-lib'
+import type { RedisKeyValueDBCfg } from './redisKeyValueDB.js'
 
 /**
  * RedisHashKeyValueDB is a KeyValueDB implementation that uses hash fields to simulate tables.

package/src/redisKeyValueDB.ts

@@ -1,14 +1,14 @@
-import {
+import type {
   CommonDBCreateOptions,
   CommonKeyValueDB,
-  commonKeyValueDBFullSupport,
   CommonKeyValueDBSaveBatchOptions,
   IncrementTuple,
   KeyValueDBTuple,
 } from '@naturalcycles/db-lib'
+import { commonKeyValueDBFullSupport } from '@naturalcycles/db-lib'
 import { _isTruthy, _zip } from '@naturalcycles/js-lib'
-import { ReadableTyped } from '@naturalcycles/nodejs-lib'
-import { RedisClient } from './redisClient'
+import type { ReadableTyped } from '@naturalcycles/nodejs-lib'
+import type { RedisClient } from './redisClient.js'
 
 export interface RedisKeyValueDBCfg {
   client: RedisClient