diff --git a/lib/commands/CONFIG_GET.ts b/lib/commands/CONFIG_GET.ts index 423683c13a..35907742e2 100644 --- a/lib/commands/CONFIG_GET.ts +++ b/lib/commands/CONFIG_GET.ts @@ -1,7 +1,5 @@ -import { transformReplyTuples } from './generic-transformers'; - export function transformArguments(parameter: string): Array { return ['CONFIG', 'GET', parameter]; } -export const transformReply = transformReplyTuples; +export { transformReplyTuples as transformReply } from './generic-transformers'; diff --git a/lib/commands/COPY.ts b/lib/commands/COPY.ts index 534b0d9c48..c7a44e45c3 100644 --- a/lib/commands/COPY.ts +++ b/lib/commands/COPY.ts @@ -1,5 +1,3 @@ -import { transformReplyBoolean } from './generic-transformers'; - interface CopyCommandOptions { destinationDb?: number; replace?: boolean; @@ -21,4 +19,4 @@ export function transformArguments(source: string, destination: string, options? return args; } -export const transformReply = transformReplyBoolean; +export { transformReplyBoolean as transformReply } from './generic-transformers'; diff --git a/lib/commands/EXISTS.ts b/lib/commands/EXISTS.ts index aac164fc95..5a9c0e3be6 100644 --- a/lib/commands/EXISTS.ts +++ b/lib/commands/EXISTS.ts @@ -1,5 +1,5 @@ import { RedisCommandArguments } from '.'; -import { pushVerdictArguments, transformReplyBoolean } from './generic-transformers'; +import { pushVerdictArguments } from './generic-transformers'; export const FIRST_KEY_INDEX = 1; @@ -9,4 +9,4 @@ export function transformArguments(keys: string | Array): RedisCommandAr return pushVerdictArguments(['EXISTS'], keys); } -export const transformReply = transformReplyBoolean; +export { transformReplyBoolean as transformReply } from './generic-transformers'; diff --git a/lib/commands/EXPIRE.ts b/lib/commands/EXPIRE.ts index 04b0504a6f..36bcf8b882 100644 --- a/lib/commands/EXPIRE.ts +++ b/lib/commands/EXPIRE.ts @@ -1,7 +1,5 @@ -import { transformReplyBoolean } from './generic-transformers'; - export function transformArguments(key: string, seconds: number): Array { return ['EXPIRE', key, seconds.toString()]; } -export const transformReply = transformReplyBoolean; +export { transformReplyBoolean as transformReply } from './generic-transformers'; diff --git a/lib/commands/EXPIREAT.ts b/lib/commands/EXPIREAT.ts index b7bfdcaa42..72142e4cb7 100644 --- a/lib/commands/EXPIREAT.ts +++ b/lib/commands/EXPIREAT.ts @@ -1,4 +1,4 @@ -import { transformEXAT, transformReplyBoolean } from './generic-transformers'; +import { transformEXAT } from './generic-transformers'; export function transformArguments(key: string, timestamp: number | Date): Array { return [ @@ -8,4 +8,4 @@ export function transformArguments(key: string, timestamp: number | Date): Array ]; } -export const transformReply = transformReplyBoolean; +export { transformReplyBoolean as transformReply } from './generic-transformers'; diff --git a/lib/commands/GEOSEARCH_WITH.ts b/lib/commands/GEOSEARCH_WITH.ts index cd461c9677..64c6d88e33 100644 --- a/lib/commands/GEOSEARCH_WITH.ts +++ b/lib/commands/GEOSEARCH_WITH.ts @@ -1,5 +1,5 @@ import { RedisCommandArguments } from '.'; -import { GeoSearchFrom, GeoSearchBy, GeoReplyWith, GeoSearchOptions, transformGeoMembersWithReply } from './generic-transformers'; +import { GeoSearchFrom, GeoSearchBy, GeoReplyWith, GeoSearchOptions } from './generic-transformers'; import { transformArguments as geoSearchTransformArguments } from './GEOSEARCH'; export { FIRST_KEY_INDEX, IS_READ_ONLY } from './GEOSEARCH'; @@ -20,4 +20,4 @@ export function transformArguments( return args; } -export const transformReply = transformGeoMembersWithReply; +export { transformGeoMembersWithReply as transformReply } from './generic-transformers'; diff --git a/lib/commands/HEXISTS.ts b/lib/commands/HEXISTS.ts index 7cf0b158d9..0eae5e03e5 100644 --- a/lib/commands/HEXISTS.ts +++ b/lib/commands/HEXISTS.ts @@ -1,9 +1,7 @@ -import { transformReplyBoolean } from './generic-transformers'; - export const FIRST_KEY_INDEX = 1; export function transformArguments(key: string, field: string): Array { return ['HEXISTS', key, field]; } -export const transformReply = transformReplyBoolean; +export { transformReplyBoolean as transformReply } from './generic-transformers'; diff --git a/lib/commands/HGETALL.ts b/lib/commands/HGETALL.ts index 8ac14ec496..55c6d3456a 100644 --- a/lib/commands/HGETALL.ts +++ b/lib/commands/HGETALL.ts @@ -1,9 +1,7 @@ -import { transformReplyTuples } from './generic-transformers'; - export const FIRST_KEY_INDEX = 1; export function transformArguments(key: string): Array { return ['HGETALL', key]; } -export const transformReply = transformReplyTuples; +export { transformReplyTuples as transformReply } from './generic-transformers'; diff --git a/lib/commands/HRANDFIELD_COUNT_WITHVALUES.ts b/lib/commands/HRANDFIELD_COUNT_WITHVALUES.ts index 53856c1984..1769cae0b7 100644 --- a/lib/commands/HRANDFIELD_COUNT_WITHVALUES.ts +++ b/lib/commands/HRANDFIELD_COUNT_WITHVALUES.ts @@ -1,4 +1,3 @@ -import { transformReplyTuples } from './generic-transformers'; import { transformArguments as transformHRandFieldCountArguments } from './HRANDFIELD_COUNT'; export { FIRST_KEY_INDEX } from './HRANDFIELD_COUNT'; @@ -10,4 +9,4 @@ export function transformArguments(key: string, count: number): Array { ]; } -export const transformReply = transformReplyTuples; +export { transformReplyTuples as transformReply } from './generic-transformers'; diff --git a/lib/commands/HSETNX.ts b/lib/commands/HSETNX.ts index 0eef875252..83112f8945 100644 --- a/lib/commands/HSETNX.ts +++ b/lib/commands/HSETNX.ts @@ -1,9 +1,7 @@ -import { transformReplyBoolean } from './generic-transformers'; - export const FIRST_KEY_INDEX = 1; export function transformArguments(key: string, field: string, value: string): Array { return ['HSETNX', key, field, value]; } -export const transformReply = transformReplyBoolean; +export { transformReplyBoolean as transformReply } from './generic-transformers'; diff --git a/lib/commands/MOVE.ts b/lib/commands/MOVE.ts index 74bb88c5e7..93896a6305 100644 --- a/lib/commands/MOVE.ts +++ b/lib/commands/MOVE.ts @@ -1,7 +1,5 @@ -import { transformReplyBoolean } from './generic-transformers'; - export function transformArguments(key: string, db: number): Array { return ['MOVE', key, db.toString()]; } -export const transformReply = transformReplyBoolean; \ No newline at end of file +export { transformReplyBoolean as transformReply } from './generic-transformers'; diff --git a/lib/commands/MSETNX.ts b/lib/commands/MSETNX.ts index c9c8c84037..fb7b028bc2 100644 --- a/lib/commands/MSETNX.ts +++ b/lib/commands/MSETNX.ts @@ -1,5 +1,3 @@ -import { transformReplyBoolean } from './generic-transformers'; - export const FIRST_KEY_INDEX = 1; export function transformArguments(toSet: Array<[string, string]> | Array | Record): Array { @@ -16,4 +14,4 @@ export function transformArguments(toSet: Array<[string, string]> | Array { return ['PERSIST', key]; } -export const transformReply = transformReplyBoolean; +export { transformReplyBoolean as transformReply } from './generic-transformers'; diff --git a/lib/commands/PEXPIRE.ts b/lib/commands/PEXPIRE.ts index d795f2fc0d..f3b70279aa 100644 --- a/lib/commands/PEXPIRE.ts +++ b/lib/commands/PEXPIRE.ts @@ -1,9 +1,7 @@ -import { transformReplyBoolean } from './generic-transformers'; - export const FIRST_KEY_INDEX = 1; export function transformArguments(key: string, milliseconds: number): Array { return ['PEXPIRE', key, milliseconds.toString()]; } -export const transformReply = transformReplyBoolean; +export { transformReplyBoolean as transformReply } from './generic-transformers'; diff --git a/lib/commands/PEXPIREAT.ts b/lib/commands/PEXPIREAT.ts index 91f38f8894..5dded48d27 100644 --- a/lib/commands/PEXPIREAT.ts +++ b/lib/commands/PEXPIREAT.ts @@ -1,4 +1,4 @@ -import { transformPXAT, transformReplyBoolean } from './generic-transformers'; +import { transformPXAT } from './generic-transformers'; export const FIRST_KEY_INDEX = 1; @@ -10,4 +10,4 @@ export function transformArguments(key: string, millisecondsTimestamp: number | ]; } -export const transformReply = transformReplyBoolean; +export { transformReplyBoolean as transformReply } from './generic-transformers'; diff --git a/lib/commands/PFADD.ts b/lib/commands/PFADD.ts index 4328a18dfe..e45e83c3ae 100644 --- a/lib/commands/PFADD.ts +++ b/lib/commands/PFADD.ts @@ -1,5 +1,5 @@ import { RedisCommandArguments } from '.'; -import { pushVerdictArguments, transformReplyBoolean } from './generic-transformers'; +import { pushVerdictArguments } from './generic-transformers'; export const FIRST_KEY_INDEX = 1; @@ -7,4 +7,4 @@ export function transformArguments(key: string, element: string | Array) return pushVerdictArguments(['PFADD', key], element); } -export const transformReply = transformReplyBoolean; +export { transformReplyBoolean as transformReply } from './generic-transformers'; diff --git a/lib/commands/RENAMENX.ts b/lib/commands/RENAMENX.ts index 883d2ca296..2cfec00774 100644 --- a/lib/commands/RENAMENX.ts +++ b/lib/commands/RENAMENX.ts @@ -1,9 +1,7 @@ -import { transformReplyBoolean } from './generic-transformers'; - export const FIRST_KEY_INDEX = 1; export function transformArguments(key: string, newKey: string): Array { return ['RENAMENX', key, newKey]; } -export const transformReply = transformReplyBoolean; +export { transformReplyBoolean as transformReply } from './generic-transformers'; diff --git a/lib/commands/SCRIPT_EXISTS.ts b/lib/commands/SCRIPT_EXISTS.ts index ee89f955e5..d4f65cfd72 100644 --- a/lib/commands/SCRIPT_EXISTS.ts +++ b/lib/commands/SCRIPT_EXISTS.ts @@ -1,8 +1,8 @@ import { RedisCommandArguments } from '.'; -import { pushVerdictArguments, transformReplyBooleanArray } from './generic-transformers'; +import { pushVerdictArguments } from './generic-transformers'; export function transformArguments(sha1: string | Array): RedisCommandArguments { return pushVerdictArguments(['SCRIPT', 'EXISTS'], sha1); } -export const transformReply = transformReplyBooleanArray; +export { transformReplyBooleanArray as transformReply } from './generic-transformers'; diff --git a/lib/commands/SETNX.ts b/lib/commands/SETNX.ts index f009783658..b45e93b0f7 100644 --- a/lib/commands/SETNX.ts +++ b/lib/commands/SETNX.ts @@ -1,9 +1,7 @@ -import { transformReplyBoolean } from './generic-transformers'; - export const FIRST_KEY_INDEX = 1; export function transformArguments(key: string, value: string): Array { return ['SETNX', key, value]; } -export const transformReply = transformReplyBoolean; +export { transformReplyBoolean as transformReply } from './generic-transformers'; diff --git a/lib/commands/SISMEMBER.ts b/lib/commands/SISMEMBER.ts index 661410fce0..d8c47a76a6 100644 --- a/lib/commands/SISMEMBER.ts +++ b/lib/commands/SISMEMBER.ts @@ -1,9 +1,7 @@ -import { transformReplyBoolean } from './generic-transformers'; - export const FIRST_KEY_INDEX = 1; export function transformArguments(key: string, member: string): Array { return ['SISMEMBER', key, member]; } -export const transformReply = transformReplyBoolean; +export { transformReplyBoolean as transformReply } from './generic-transformers'; diff --git a/lib/commands/SMISMEMBER.ts b/lib/commands/SMISMEMBER.ts index 07637a689b..85b954bc3d 100644 --- a/lib/commands/SMISMEMBER.ts +++ b/lib/commands/SMISMEMBER.ts @@ -1,9 +1,7 @@ -import { transformReplyBooleanArray } from './generic-transformers'; - export const FIRST_KEY_INDEX = 1; export function transformArguments(key: string, members: Array): Array { return ['SMISMEMBER', key, ...members]; } -export const transformReply = transformReplyBooleanArray; +export { transformReplyBooleanArray as transformReply } from './generic-transformers'; diff --git a/lib/commands/SMOVE.ts b/lib/commands/SMOVE.ts index f8922f6ca3..7850b8f9dd 100644 --- a/lib/commands/SMOVE.ts +++ b/lib/commands/SMOVE.ts @@ -1,9 +1,7 @@ -import { transformReplyBoolean } from './generic-transformers'; - export const FIRST_KEY_INDEX = 1; export function transformArguments(source: string, destination: string, member: string): Array { return ['SMOVE', source, destination, member]; } -export const transformReply = transformReplyBoolean; +export { transformReplyBoolean as transformReply } from './generic-transformers'; diff --git a/lib/commands/XCLAIM.ts b/lib/commands/XCLAIM.ts index c5890a7579..c87d1551e8 100644 --- a/lib/commands/XCLAIM.ts +++ b/lib/commands/XCLAIM.ts @@ -1,4 +1,4 @@ -import { pushVerdictArguments, transformReplyStreamMessages } from './generic-transformers'; +import { pushVerdictArguments } from './generic-transformers'; export const FIRST_KEY_INDEX = 1; @@ -43,4 +43,4 @@ export function transformArguments( return args; } -export const transformReply = transformReplyStreamMessages; +export { transformReplyStreamMessages as transformReply } from './generic-transformers'; diff --git a/lib/commands/XGROUP_CREATECONSUMER.ts b/lib/commands/XGROUP_CREATECONSUMER.ts index 395688706e..f1a57e6fc4 100644 --- a/lib/commands/XGROUP_CREATECONSUMER.ts +++ b/lib/commands/XGROUP_CREATECONSUMER.ts @@ -1,9 +1,7 @@ -import { transformReplyBoolean } from './generic-transformers'; - export const FIRST_KEY_INDEX = 2; export function transformArguments(key: string, group: string, consumer: string): Array { return ['XGROUP', 'CREATECONSUMER', key, group, consumer]; } -export const transformReply = transformReplyBoolean; +export { transformReplyBoolean as transformReply } from './generic-transformers'; diff --git a/lib/commands/XGROUP_DESTROY.ts b/lib/commands/XGROUP_DESTROY.ts index 1fd25550c3..a4d67e5f4e 100644 --- a/lib/commands/XGROUP_DESTROY.ts +++ b/lib/commands/XGROUP_DESTROY.ts @@ -1,9 +1,7 @@ -import { transformReplyBoolean } from './generic-transformers'; - export const FIRST_KEY_INDEX = 2; export function transformArguments(key: string, group: string): Array { return ['XGROUP', 'DESTROY', key, group]; } -export const transformReply = transformReplyBoolean; +export { transformReplyBoolean as transformReply } from './generic-transformers'; diff --git a/lib/commands/XPENDING_RANGE.ts b/lib/commands/XPENDING_RANGE.ts index c9e8d898e8..d0b45f0fab 100644 --- a/lib/commands/XPENDING_RANGE.ts +++ b/lib/commands/XPENDING_RANGE.ts @@ -1,5 +1,3 @@ -import { transformReplyStreamMessages } from './generic-transformers'; - export const FIRST_KEY_INDEX = 1; export const IS_READ_ONLY = true; @@ -24,7 +22,7 @@ export function transformArguments( } args.push(start, end, count.toString()); - + if (options?.consumer) { args.push(options.consumer); } @@ -32,4 +30,4 @@ export function transformArguments( return args; } -export const transformReply = transformReplyStreamMessages; +export { transformReplyStreamMessages as transformReply } from './generic-transformers'; diff --git a/lib/commands/XRANGE.ts b/lib/commands/XRANGE.ts index 2902d0743d..b357266c95 100644 --- a/lib/commands/XRANGE.ts +++ b/lib/commands/XRANGE.ts @@ -1,5 +1,3 @@ -import { transformReplyStreamMessages } from './generic-transformers'; - export const FIRST_KEY_INDEX = 1; export const IS_READ_ONLY = true; @@ -18,4 +16,4 @@ export function transformArguments(key: string, start: string, end: string, opti return args; } -export const transformReply = transformReplyStreamMessages; +export { transformReplyStreamMessages as transformReply } from './generic-transformers'; diff --git a/lib/commands/XREAD.ts b/lib/commands/XREAD.ts index 1f4932837a..00d8aa959e 100644 --- a/lib/commands/XREAD.ts +++ b/lib/commands/XREAD.ts @@ -1,5 +1,3 @@ -import { transformReplyStreamsMessages } from './generic-transformers'; - export const FIRST_KEY_INDEX = (streams: Array | XReadStream): string => { return Array.isArray(streams) ? streams[0].key : streams.key; }; @@ -40,4 +38,4 @@ export function transformArguments(streams: Array | XReadStream, op return args; } -export const transformReply = transformReplyStreamsMessages; +export { transformReplyStreamsMessages as transformReply } from './generic-transformers'; diff --git a/lib/commands/XREADGROUP.ts b/lib/commands/XREADGROUP.ts index b01385e7c2..6d329d377f 100644 --- a/lib/commands/XREADGROUP.ts +++ b/lib/commands/XREADGROUP.ts @@ -1,5 +1,3 @@ -import { transformReplyStreamsMessages } from './generic-transformers'; - export interface XReadGroupStream { key: string; id: string; @@ -54,4 +52,4 @@ export function transformArguments( return args; } -export const transformReply = transformReplyStreamsMessages; +export { transformReplyStreamsMessages as transformReply } from './generic-transformers'; diff --git a/lib/commands/XREVRANGE.ts b/lib/commands/XREVRANGE.ts index a1fbbbc128..db48856cdc 100644 --- a/lib/commands/XREVRANGE.ts +++ b/lib/commands/XREVRANGE.ts @@ -1,5 +1,3 @@ -import { transformReplyStreamMessages } from './generic-transformers'; - interface XRangeRevOptions { COUNT?: number; } @@ -14,4 +12,4 @@ export function transformArguments(key: string, start: string, end: string, opti return args; } -export const transformReply = transformReplyStreamMessages; +export { transformReplyStreamMessages as transformReply } from './generic-transformers'; diff --git a/lib/commands/ZADD.ts b/lib/commands/ZADD.ts index 0e43ecaf50..69f01c8d53 100644 --- a/lib/commands/ZADD.ts +++ b/lib/commands/ZADD.ts @@ -1,4 +1,4 @@ -import { transformArgumentNumberInfinity, transformReplyNumberInfinity, ZMember } from './generic-transformers'; +import { transformArgumentNumberInfinity, ZMember } from './generic-transformers'; export const FIRST_KEY_INDEX = 1; @@ -56,11 +56,11 @@ export function transformArguments(key: string, members: ZMember | Array): return pushVerdictArguments(['ZMSCORE', key], member); } -export const transformReply = transformReplyNumberInfinityNullArray; +export { transformReplyNumberInfinityNullArray as transformReply } from './generic-transformers'; diff --git a/lib/commands/ZPOPMAX_COUNT.ts b/lib/commands/ZPOPMAX_COUNT.ts index abfa8494ec..abef32cca5 100644 --- a/lib/commands/ZPOPMAX_COUNT.ts +++ b/lib/commands/ZPOPMAX_COUNT.ts @@ -1,4 +1,3 @@ -import { transformReplySortedSetWithScores } from './generic-transformers'; import { transformArguments as transformZPopMaxArguments } from './ZPOPMAX'; export { FIRST_KEY_INDEX } from './ZPOPMAX'; @@ -10,4 +9,4 @@ export function transformArguments(key: string, count: number): Array { ]; } -export const transformReply = transformReplySortedSetWithScores; +export { transformReplySortedSetWithScores as transformReply } from './generic-transformers'; diff --git a/lib/commands/ZPOPMIN_COUNT.ts b/lib/commands/ZPOPMIN_COUNT.ts index e313b32dc8..7d290ebfe3 100644 --- a/lib/commands/ZPOPMIN_COUNT.ts +++ b/lib/commands/ZPOPMIN_COUNT.ts @@ -1,4 +1,3 @@ -import { transformReplySortedSetWithScores } from './generic-transformers'; import { transformArguments as transformZPopMinArguments } from './ZPOPMIN'; export { FIRST_KEY_INDEX } from './ZPOPMIN'; @@ -10,4 +9,4 @@ export function transformArguments(key: string, count: number): Array { ]; } -export const transformReply = transformReplySortedSetWithScores; +export { transformReplySortedSetWithScores as transformReply } from './generic-transformers'; diff --git a/lib/commands/ZRANDMEMBER_COUNT_WITHSCORES.ts b/lib/commands/ZRANDMEMBER_COUNT_WITHSCORES.ts index 6d79f41c95..8f49b326ad 100644 --- a/lib/commands/ZRANDMEMBER_COUNT_WITHSCORES.ts +++ b/lib/commands/ZRANDMEMBER_COUNT_WITHSCORES.ts @@ -1,4 +1,3 @@ -import { transformReplySortedSetWithScores } from './generic-transformers'; import { transformArguments as transformZRandMemberCountArguments } from './ZRANDMEMBER_COUNT'; export { FIRST_KEY_INDEX, IS_READ_ONLY } from './ZRANDMEMBER_COUNT'; @@ -10,4 +9,4 @@ export function transformArguments(...args: Parameters { return ['ZSCORE', key, member]; } -export const transformReply = transformReplyNumberInfinityNull; +export { transformReplyNumberInfinityNull as transformReply } from './generic-transformers'; diff --git a/lib/commands/ZUNION_WITHSCORES.ts b/lib/commands/ZUNION_WITHSCORES.ts index d361fd432b..3b93734192 100644 --- a/lib/commands/ZUNION_WITHSCORES.ts +++ b/lib/commands/ZUNION_WITHSCORES.ts @@ -1,5 +1,4 @@ import { RedisCommandArguments } from '.'; -import { transformReplySortedSetWithScores } from './generic-transformers'; import { transformArguments as transformZUnionArguments } from './ZUNION'; export { FIRST_KEY_INDEX, IS_READ_ONLY } from './ZUNION'; @@ -11,4 +10,4 @@ export function transformArguments(...args: Parameters