@upstash/redis 1.37.0-rc.8 → 1.37.0

package/{zmscore-CjaAkTRU.d.mts → error-8y4qG0W2.d.mts}

@@ -204,67 +204,6 @@ declare class Command<TResult, TData> {
     exec(client: Requester): Promise<TData>;
 }
 
-type ZUnionStoreCommandOptions = {
-    aggregate?: "sum" | "min" | "max";
-} & ({
-    weight: number;
-    weights?: never;
-} | {
-    weight?: never;
-    weights: number[];
-} | {
-    weight?: never;
-    weights?: never;
-});
-/**
- * @see https://redis.io/commands/zunionstore
- */
-declare class ZUnionStoreCommand extends Command<number, number> {
-    constructor(cmd: [destination: string, numKeys: 1, key: string, opts?: ZUnionStoreCommandOptions], cmdOpts?: CommandOptions<number, number>);
-    constructor(cmd: [destination: string, numKeys: number, keys: string[], opts?: ZUnionStoreCommandOptions], cmdOpts?: CommandOptions<number, number>);
-}
-
-type ZUnionCommandOptions = {
-    withScores?: boolean;
-    aggregate?: "sum" | "min" | "max";
-} & ({
-    weight: number;
-    weights?: never;
-} | {
-    weight?: never;
-    weights: number[];
-} | {
-    weight?: never;
-    weights?: never;
-});
-/**
- * @see https://redis.io/commands/zunion
- */
-declare class ZUnionCommand<TData extends unknown[]> extends Command<string[], TData> {
-    constructor(cmd: [numKeys: 1, key: string, opts?: ZUnionCommandOptions], cmdOpts?: CommandOptions<string[], TData>);
-    constructor(cmd: [numKeys: number, keys: string[], opts?: ZUnionCommandOptions], cmdOpts?: CommandOptions<string[], TData>);
-}
-
-type ZInterStoreCommandOptions = {
-    aggregate?: "sum" | "min" | "max";
-} & ({
-    weight: number;
-    weights?: never;
-} | {
-    weight?: never;
-    weights: number[];
-} | {
-    weight?: never;
-    weights?: never;
-});
-/**
- * @see https://redis.io/commands/zInterstore
- */
-declare class ZInterStoreCommand extends Command<number, number> {
-    constructor(cmd: [destination: string, numKeys: 1, key: string, opts?: ZInterStoreCommandOptions], cmdOpts?: CommandOptions<number, number>);
-    constructor(cmd: [destination: string, numKeys: number, keys: string[], opts?: ZInterStoreCommandOptions], cmdOpts?: CommandOptions<number, number>);
-}
-
 type Type = "string" | "list" | "set" | "zset" | "hash" | "none";
 /**
  * @see https://redis.io/commands/type
@@ -273,59 +212,7 @@ declare class TypeCommand extends Command<Type, Type> {
     constructor(cmd: [key: string], opts?: CommandOptions<Type, Type>);
 }
 
-type ScriptFlushCommandOptions = {
-    sync: true;
-    async?: never;
-} | {
-    sync?: never;
-    async: true;
-};
-/**
- * @see https://redis.io/commands/script-flush
- */
-declare class ScriptFlushCommand extends Command<"OK", "OK"> {
-    constructor([opts]: [opts?: ScriptFlushCommandOptions], cmdOpts?: CommandOptions<"OK", "OK">);
-}
-
-type GeoAddCommandOptions = {
-    nx?: boolean;
-    xx?: never;
-} | ({
-    nx?: never;
-    xx?: boolean;
-} & {
-    ch?: boolean;
-});
-type GeoMember<TMemberType> = {
-    latitude: number;
-    longitude: number;
-    member: TMemberType;
-};
-/**
- * @see https://redis.io/commands/geoadd
- */
-declare class GeoAddCommand<TMemberType = string> extends Command<number | null, number | null> {
-    constructor([key, arg1, ...arg2]: [
-        string,
-        GeoMember<TMemberType> | GeoAddCommandOptions,
-        ...GeoMember<TMemberType>[]
-    ], opts?: CommandOptions<number | null, number | null>);
-}
-
-type ExpireOption = "NX" | "nx" | "XX" | "xx" | "GT" | "gt" | "LT" | "lt";
-declare class ExpireCommand extends Command<"0" | "1", 0 | 1> {
-    constructor(cmd: [key: string, seconds: number, option?: ExpireOption], opts?: CommandOptions<"0" | "1", 0 | 1>);
-}
-
-type ClientSetInfoAttribute = "LIB-NAME" | "lib-name" | "LIB-VER" | "lib-ver";
-/**
- * @see https://redis.io/commands/client-setinfo
- */
-declare class ClientSetInfoCommand extends Command<string, string> {
-    constructor([attribute, value]: [attribute: ClientSetInfoAttribute, value: string], opts?: CommandOptions<string, string>);
-}
-
-declare const FIELD_TYPES: readonly ["TEXT", "U64", "I64", "F64", "BOOL", "DATE", "KEYWORD"];
+declare const FIELD_TYPES: readonly ["TEXT", "U64", "I64", "F64", "BOOL", "DATE", "KEYWORD", "FACET"];
 type FieldType = (typeof FIELD_TYPES)[number];
 type TextField = {
     type: "TEXT";
@@ -351,7 +238,10 @@ type DateField = {
 type KeywordField = {
     type: "KEYWORD";
 };
-type DetailedField = TextField | NumericField | BoolField | DateField | KeywordField;
+type FacetField = {
+    type: "FACET";
+};
+type DetailedField = TextField | NumericField | BoolField | DateField | KeywordField | FacetField;
 type NestedIndexSchema = {
     [key: string]: FieldType | DetailedField | NestedIndexSchema;
 };
@@ -365,7 +255,7 @@ type ExtractFieldType<T> = T extends FieldType ? T : T extends {
     type: infer U;
 } ? U extends FieldType ? U : never : never;
 type GetFieldAtPath<TSchema, Path extends string> = Path extends `${infer First}.${infer Rest}` ? First extends keyof TSchema ? GetFieldAtPath<TSchema[First], Rest> : never : Path extends keyof TSchema ? TSchema[Path] : never;
-type FieldValueType<T extends FieldType> = T extends "TEXT" ? string : T extends "U64" | "I64" | "F64" ? number : T extends "BOOL" ? boolean : T extends "DATE" ? string : T extends "KEYWORD" ? string : never;
+type FieldValueType<T extends FieldType> = T extends "TEXT" ? string : T extends "U64" | "I64" | "F64" ? number : T extends "BOOL" ? boolean : T extends "DATE" ? string : T extends "KEYWORD" ? string : T extends "FACET" ? string : never;
 type GetFieldValueType<TSchema, Path extends string> = GetFieldAtPath<TSchema, Path> extends infer Field ? Field extends FieldType | DetailedField ? FieldValueType<ExtractFieldType<Field>> : never : never;
 type HasFrom<T> = T extends {
     from: string;
@@ -376,7 +266,19 @@ type AsAnyIfUnknown<T> = unknown extends T ? any : T;
 type InferSchemaData<TSchema> = IsDefaultSchema<TSchema> extends true ? any : {
     [K in keyof TSchema as TSchema[K] extends DetailedField ? HasFrom<TSchema[K]> extends true ? never : K : K]: AsAnyIfUnknown<InferSchemaDataField<TSchema[K]>>;
 };
-type QueryOptions<TSchema extends NestedIndexSchema | FlatIndexSchema> = {
+type QueryOptions<TSchema extends NestedIndexSchema | FlatIndexSchema> = IsDefaultSchema<TSchema> extends true ? {
+    filter?: Record<string, any>;
+    limit?: number;
+    offset?: number;
+    select?: Record<string, true>;
+    highlight?: {
+        fields: string[];
+        preTag?: string;
+        postTag?: string;
+    };
+    orderBy?: Record<string, "ASC" | "DESC">;
+    scoreFunc?: ScoreBy<string>;
+} : {
     filter?: RootQueryFilter<TSchema>;
     /** Maximum number of results to return */
     limit?: number;
@@ -460,12 +362,12 @@ type PublicQueryResult<TSchema extends NestedIndexSchema | FlatIndexSchema, TSel
 } : undefined>;
 type StringOperationMap<T extends string> = {
     $eq: T;
-    $ne: T;
     $in: T[];
     $fuzzy: T | {
         value: T;
         distance?: number;
         transpositionCostOne?: boolean;
+        prefix?: boolean;
     };
     $phrase: T | {
         value: T;
@@ -483,7 +385,14 @@ type StringOperationMap<T extends string> = {
 };
 type NumberOperationMap<T extends number> = {
     $eq: T;
-    $ne: T;
+    $in: T[];
+    $gt: T;
+    $gte: T;
+    $lt: T;
+    $lte: T;
+};
+type KeywordOperationMap<T extends string> = {
+    $eq: T;
     $in: T[];
     $gt: T;
     $gte: T;
@@ -492,18 +401,20 @@ type NumberOperationMap<T extends number> = {
 };
 type BooleanOperationMap<T extends boolean> = {
     $eq: T;
-    $ne: T;
     $in: T[];
 };
 type DateOperationMap<T extends string | Date> = {
     $eq: T;
-    $ne: T;
     $in: T[];
     $gt: T;
     $gte: T;
     $lte: T;
     $lt: T;
 };
+type FacetOperationMap<T extends string> = {
+    $eq: T;
+    $in: T[];
+};
 type StringOperations = {
     [K in keyof StringOperationMap<string>]: {
         [P in K]: StringOperationMap<string>[K];
@@ -532,7 +443,21 @@ type DateOperations = {
         $boost?: number;
     };
 }[keyof DateOperationMap<string | Date>];
-type OperationsForFieldType<T extends FieldType> = T extends "TEXT" ? StringOperations : T extends "U64" | "I64" | "F64" ? NumberOperations : T extends "BOOL" ? BooleanOperations : T extends "DATE" ? DateOperations : T extends "KEYWORD" ? StringOperations : never;
+type KeywordOperations = {
+    [K in keyof KeywordOperationMap<string>]: {
+        [P in K]: KeywordOperationMap<string>[K];
+    } & {
+        $boost?: number;
+    };
+}[keyof KeywordOperationMap<string>];
+type FacetOperations = {
+    [K in keyof FacetOperationMap<string>]: {
+        [P in K]: FacetOperationMap<string>[K];
+    } & {
+        $boost?: number;
+    };
+}[keyof FacetOperationMap<string>];
+type OperationsForFieldType<T extends FieldType> = T extends "TEXT" ? StringOperations : T extends "U64" | "I64" | "F64" ? NumberOperations : T extends "BOOL" ? BooleanOperations : T extends "DATE" ? DateOperations : T extends "KEYWORD" ? KeywordOperations : T extends "FACET" ? FacetOperations : never;
 type PathOperations<TSchema, TPath extends string> = GetFieldAtPath<TSchema, TPath> extends infer Field ? Field extends FieldType | DetailedField ? OperationsForFieldType<ExtractFieldType<Field>> | FieldValueType<ExtractFieldType<Field>> : never : never;
 type QueryLeaf<TSchema> = {
     [K in SchemaPaths<TSchema>]?: PathOperations<TSchema, K>;
@@ -633,8 +558,8 @@ type BoolNode<TSchema extends NestedIndexSchema | FlatIndexSchema> = BoolBase<TS
     $and?: never;
     $or?: never;
 };
-type QueryFilter<TSchema extends NestedIndexSchema | FlatIndexSchema> = QueryLeaf<TSchema> | AndNode<TSchema> | OrNode<TSchema> | MustNode<TSchema> | ShouldNode<TSchema> | MustShouldNode<TSchema> | NotNode<TSchema> | AndNotNode<TSchema> | OrNotNode<TSchema> | ShouldNotNode<TSchema> | MustNotNode<TSchema> | BoolNode<TSchema>;
-type RootQueryFilter<TSchema extends NestedIndexSchema | FlatIndexSchema> = QueryLeaf<TSchema> | AndNode<TSchema> | RootOrNode<TSchema> | MustNode<TSchema> | ShouldNode<TSchema> | MustShouldNode<TSchema> | AndNotNode<TSchema> | ShouldNotNode<TSchema> | BoolNode<TSchema>;
+type QueryFilter<TSchema extends NestedIndexSchema | FlatIndexSchema> = IsDefaultSchema<TSchema> extends true ? Record<string, any> : QueryLeaf<TSchema> | AndNode<TSchema> | OrNode<TSchema> | MustNode<TSchema> | ShouldNode<TSchema> | MustShouldNode<TSchema> | NotNode<TSchema> | AndNotNode<TSchema> | OrNotNode<TSchema> | ShouldNotNode<TSchema> | MustNotNode<TSchema> | BoolNode<TSchema>;
+type RootQueryFilter<TSchema extends NestedIndexSchema | FlatIndexSchema> = IsDefaultSchema<TSchema> extends true ? Record<string, any> : QueryLeaf<TSchema> | AndNode<TSchema> | RootOrNode<TSchema> | MustNode<TSchema> | ShouldNode<TSchema> | MustShouldNode<TSchema> | AndNotNode<TSchema> | ShouldNotNode<TSchema> | BoolNode<TSchema>;
 type RootOrNode<TSchema extends NestedIndexSchema | FlatIndexSchema> = {
     [P in SchemaPaths<TSchema>]?: never;
 } & {
@@ -643,30 +568,40 @@ type RootOrNode<TSchema extends NestedIndexSchema | FlatIndexSchema> = {
     $and?: never;
     $must?: never;
     $should?: never;
-    $mustNot?: never;
+    $mustNot?: QueryFilter<TSchema> | QueryFilter<TSchema>[];
 };
 type DescribeFieldInfo = {
     type: FieldType;
     noTokenize?: boolean;
     noStem?: boolean;
     fast?: boolean;
+    from?: string;
 };
 type IndexDescription<TSchema extends NestedIndexSchema | FlatIndexSchema> = {
     name: string;
     dataType: "hash" | "string" | "json";
     prefixes: string[];
     language?: Language;
-    schema: Record<SchemaPaths<TSchema>, DescribeFieldInfo>;
+    schema: IsDefaultSchema<TSchema> extends true ? Record<string, DescribeFieldInfo> : Record<SchemaPaths<TSchema>, DescribeFieldInfo>;
 };
 type Language = "english" | "arabic" | "danish" | "dutch" | "finnish" | "french" | "german" | "greek" | "hungarian" | "italian" | "norwegian" | "portuguese" | "romanian" | "russian" | "spanish" | "swedish" | "tamil" | "turkish";
-type AggregateOptions<TSchema extends NestedIndexSchema | FlatIndexSchema> = {
+type FacetPaths<T, Prefix extends string = ""> = {
+    [K in keyof T]: K extends string ? T[K] extends "FACET" | {
+        type: "FACET";
+    } ? Prefix extends "" ? K : `${Prefix}${K}` : T[K] extends FieldType | DetailedField ? never : T[K] extends object ? FacetPaths<T[K], `${Prefix}${K}.`> : never : never;
+}[keyof T];
+type AggregateOptions<TSchema extends NestedIndexSchema | FlatIndexSchema> = IsDefaultSchema<TSchema> extends true ? {
+    filter?: Record<string, any>;
+    aggregations: {
+        [key: string]: Record<string, any>;
+    };
+} : {
     filter?: RootQueryFilter<TSchema>;
-    limit?: number;
     aggregations: {
         [key: string]: Aggregation<TSchema>;
     };
 };
-type Aggregation<TSchema extends NestedIndexSchema | FlatIndexSchema> = TermsAggregation<TSchema> | RangeAggregation<TSchema> | HistogramAggregation<TSchema> | StatsAggregation<TSchema> | AvgAggregation<TSchema> | SumAggregation<TSchema> | MinAggregation<TSchema> | MaxAggregation<TSchema> | CountAggregation<TSchema> | ExtendedStatsAggregation<TSchema> | PercentilesAggregation<TSchema> | CardinalityAggregation<TSchema>;
+type Aggregation<TSchema extends NestedIndexSchema | FlatIndexSchema> = IsDefaultSchema<TSchema> extends true ? Record<string, any> : TermsAggregation<TSchema> | RangeAggregation<TSchema> | HistogramAggregation<TSchema> | StatsAggregation<TSchema> | AvgAggregation<TSchema> | SumAggregation<TSchema> | MinAggregation<TSchema> | MaxAggregation<TSchema> | CountAggregation<TSchema> | ExtendedStatsAggregation<TSchema> | PercentilesAggregation<TSchema> | CardinalityAggregation<TSchema> | FacetAggregation<TSchema>;
 type BaseAggregation<TSchema extends NestedIndexSchema | FlatIndexSchema> = {
     $aggs?: {
         [key: string]: Aggregation<TSchema>;
@@ -748,11 +683,25 @@ type CardinalityAggregation<TSchema extends NestedIndexSchema | FlatIndexSchema>
         field: SchemaPaths<TSchema>;
     };
 };
-type AggregateResult<TSchema extends NestedIndexSchema | FlatIndexSchema, TOpts extends AggregateOptions<TSchema>> = TOpts["limit"] extends number ? [BuildAggregateResult<TSchema, TOpts["aggregations"]>, QueryResult<TSchema, undefined>[]] : BuildAggregateResult<TSchema, TOpts["aggregations"]>;
+type FacetAggregation<TSchema extends NestedIndexSchema | FlatIndexSchema> = BaseAggregation<TSchema> & {
+    $facet: {
+        field: FacetPaths<TSchema>;
+        path: string;
+        depth?: number;
+        size?: number;
+        minDocCount?: number;
+        order?: {
+            count: "desc" | "asc";
+        };
+    };
+};
+type AggregateResult<TSchema extends NestedIndexSchema | FlatIndexSchema, TOpts extends AggregateOptions<TSchema>> = IsDefaultSchema<TSchema> extends true ? Record<string, any> : BuildAggregateResult<TSchema, Extract<TOpts["aggregations"], {
+    [key: string]: Aggregation<TSchema>;
+}>>;
 type BuildAggregateResult<TSchema extends NestedIndexSchema | FlatIndexSchema, TAggs extends {
     [key: string]: Aggregation<TSchema>;
 }> = {
-    [K in keyof TAggs]: TAggs[K] extends TermsAggregation<TSchema> ? TermsResult<TSchema, TAggs[K]> : TAggs[K] extends RangeAggregation<TSchema> ? RangeResult<TSchema, TAggs[K]> : TAggs[K] extends HistogramAggregation<TSchema> ? HistogramResult<TSchema, TAggs[K]> : TAggs[K] extends StatsAggregation<TSchema> ? StatsResult : TAggs[K] extends AvgAggregation<TSchema> ? MetricValueResult : TAggs[K] extends SumAggregation<TSchema> ? MetricValueResult : TAggs[K] extends MinAggregation<TSchema> ? MetricValueResult : TAggs[K] extends MaxAggregation<TSchema> ? MetricValueResult : TAggs[K] extends CountAggregation<TSchema> ? MetricValueResult : TAggs[K] extends CardinalityAggregation<TSchema> ? MetricValueResult : TAggs[K] extends ExtendedStatsAggregation<TSchema> ? ExtendedStatsResult<TAggs[K]> : TAggs[K] extends PercentilesAggregation<TSchema> ? PercentilesResult<TAggs[K]> : never;
+    [K in keyof TAggs]: TAggs[K] extends TermsAggregation<TSchema> ? TermsResult<TSchema, TAggs[K]> : TAggs[K] extends RangeAggregation<TSchema> ? RangeResult<TSchema, TAggs[K]> : TAggs[K] extends HistogramAggregation<TSchema> ? HistogramResult<TSchema, TAggs[K]> : TAggs[K] extends StatsAggregation<TSchema> ? StatsResult : TAggs[K] extends AvgAggregation<TSchema> ? MetricValueResult : TAggs[K] extends SumAggregation<TSchema> ? MetricValueResult : TAggs[K] extends MinAggregation<TSchema> ? MetricValueResult : TAggs[K] extends MaxAggregation<TSchema> ? MetricValueResult : TAggs[K] extends CountAggregation<TSchema> ? MetricValueResult : TAggs[K] extends CardinalityAggregation<TSchema> ? MetricValueResult : TAggs[K] extends ExtendedStatsAggregation<TSchema> ? ExtendedStatsResult<TAggs[K]> : TAggs[K] extends PercentilesAggregation<TSchema> ? PercentilesResult<TAggs[K]> : TAggs[K] extends FacetAggregation<TSchema> ? FacetResult : never;
 };
 type Bucket<T> = {
     key: T;
@@ -764,8 +713,12 @@ type TermsResult<TSchema extends NestedIndexSchema | FlatIndexSchema, TAgg exten
     [key: string]: Aggregation<TSchema>;
 } ? {
     buckets: (Bucket<GetFieldValueType<TSchema, TAgg["$terms"]["field"]>> & BuildAggregateResult<TSchema, TAgg["$aggs"]>)[];
+    sumOtherDocCount: number;
+    docCountErrorUpperBound: number;
 } : {
     buckets: Bucket<GetFieldValueType<TSchema, TAgg["$terms"]["field"]>>[];
+    sumOtherDocCount: number;
+    docCountErrorUpperBound: number;
 };
 type RangeResult<TSchema extends NestedIndexSchema | FlatIndexSchema, TAgg extends RangeAggregation<TSchema>> = TAgg["$aggs"] extends {
     [key: string]: Aggregation<TSchema>;
@@ -827,6 +780,17 @@ type PercentilesResult<TAgg> = TAgg extends {
         [key: string]: number;
     };
 };
+type FacetChildNode = {
+    path: string;
+    docCount: number;
+    sumOtherDocCount: number;
+    children?: FacetChildNode[];
+};
+type FacetResult = {
+    path: string;
+    sumOtherDocCount: number;
+    children: FacetChildNode[];
+};
 
 type CreateIndexParameters<TSchema extends NestedIndexSchema | FlatIndexSchema> = {
     name: string;
@@ -858,8 +822,8 @@ declare class SearchIndex<TSchema extends NestedIndexSchema | FlatIndexSchema> {
     readonly schema?: TSchema;
     private client;
     constructor({ name, schema, client }: SearchIndexParameters<TSchema>);
-    waitIndexing(): Promise<void>;
-    describe(): Promise<IndexDescription<TSchema>>;
+    waitIndexing(): Promise<0 | 1>;
+    describe(): Promise<IndexDescription<TSchema> | null>;
     query<TOpts extends QueryOptions<TSchema>>(options?: TOpts): Promise<QueryResult<TSchema, TOpts>[]>;
     aggregate<TOpts extends AggregateOptions<TSchema>>(options: TOpts): Promise<AggregateResult<TSchema, TOpts>>;
     count({ filter }: {
@@ -962,6 +926,14 @@ declare class BitPosCommand extends Command<number, number> {
     constructor(cmd: [key: string, bit: 0 | 1, start?: number, end?: number], opts?: CommandOptions<number, number>);
 }
 
+type ClientSetInfoAttribute = "LIB-NAME" | "lib-name" | "LIB-VER" | "lib-ver";
+/**
+ * @see https://redis.io/commands/client-setinfo
+ */
+declare class ClientSetInfoCommand extends Command<string, string> {
+    constructor([attribute, value]: [attribute: ClientSetInfoAttribute, value: string], opts?: CommandOptions<string, string>);
+}
+
 /**
  * @see https://redis.io/commands/copy
  */
@@ -1041,6 +1013,11 @@ declare class ExistsCommand extends Command<number, number> {
     constructor(cmd: [...keys: string[]], opts?: CommandOptions<number, number>);
 }
 
+type ExpireOption = "NX" | "nx" | "XX" | "xx" | "GT" | "gt" | "LT" | "lt";
+declare class ExpireCommand extends Command<"0" | "1", 0 | 1> {
+    constructor(cmd: [key: string, seconds: number, option?: ExpireOption], opts?: CommandOptions<"0" | "1", 0 | 1>);
+}
+
 /**
  * @see https://redis.io/commands/expireat
  */
@@ -1066,6 +1043,31 @@ declare class FlushDBCommand extends Command<"OK", "OK"> {
     }], cmdOpts?: CommandOptions<"OK", "OK">);
 }
 
+type GeoAddCommandOptions = {
+    nx?: boolean;
+    xx?: never;
+} | ({
+    nx?: never;
+    xx?: boolean;
+} & {
+    ch?: boolean;
+});
+type GeoMember<TMemberType> = {
+    latitude: number;
+    longitude: number;
+    member: TMemberType;
+};
+/**
+ * @see https://redis.io/commands/geoadd
+ */
+declare class GeoAddCommand<TMemberType = string> extends Command<number | null, number | null> {
+    constructor([key, arg1, ...arg2]: [
+        string,
+        GeoMember<TMemberType> | GeoAddCommandOptions,
+        ...GeoMember<TMemberType>[]
+    ], opts?: CommandOptions<number | null, number | null>);
+}
+
 /**
  * @see https://redis.io/commands/geodist
  */
@@ -1851,6 +1853,19 @@ declare class LMoveCommand<TData = string> extends Command<TData, TData> {
     ], opts?: CommandOptions<TData, TData>);
 }
 
+/**
+ * @see https://redis.io/commands/lmpop
+ */
+declare class LmPopCommand<TValues> extends Command<[
+    string,
+    TValues[]
+] | null, [
+    string,
+    TValues[]
+] | null> {
+    constructor(cmd: [numkeys: number, keys: string[], "LEFT" | "RIGHT", count?: number], opts?: CommandOptions<[string, TValues[]] | null, [string, TValues[]] | null>);
+}
+
 /**
  * @see https://redis.io/commands/lpop
  */
@@ -1858,6 +1873,17 @@ declare class LPopCommand<TData = string> extends Command<unknown | null, TData
     constructor(cmd: [key: string, count?: number], opts?: CommandOptions<unknown | null, TData | null>);
 }
 
+/**
+ * @see https://redis.io/commands/lpos
+ */
+declare class LPosCommand<TData = number> extends Command<TData, TData> {
+    constructor(cmd: [key: string, element: unknown, opts?: {
+        rank?: number;
+        count?: number;
+        maxLen?: number;
+    }], opts?: CommandOptions<TData, TData>);
+}
+
 /**
  * @see https://redis.io/commands/lpush
  */
@@ -1930,6 +1956,27 @@ declare class PExpireAtCommand extends Command<"0" | "1", 0 | 1> {
     constructor(cmd: [key: string, unix: number, option?: ExpireOption], opts?: CommandOptions<"0" | "1", 0 | 1>);
 }
 
+/**
+ * @see https://redis.io/commands/pfadd
+ */
+declare class PfAddCommand<TData = string> extends Command<number, number> {
+    constructor(cmd: [string, ...TData[]], opts?: CommandOptions<number, number>);
+}
+
+/**
+ * @see https://redis.io/commands/pfcount
+ */
+declare class PfCountCommand extends Command<number, number> {
+    constructor(cmd: [string, ...string[]], opts?: CommandOptions<number, number>);
+}
+
+/**
+ * @see https://redis.io/commands/pfmerge
+ */
+declare class PfMergeCommand extends Command<"OK", "OK"> {
+    constructor(cmd: [destination_key: string, ...string[]], opts?: CommandOptions<"OK", "OK">);
+}
+
 /**
  * @see https://redis.io/commands/ping
  */
@@ -2021,6 +2068,20 @@ declare class ScriptExistsCommand<T extends string[]> extends Command<string[],
     constructor(hashes: T, opts?: CommandOptions<string[], number[]>);
 }
 
+type ScriptFlushCommandOptions = {
+    sync: true;
+    async?: never;
+} | {
+    sync?: never;
+    async: true;
+};
+/**
+ * @see https://redis.io/commands/script-flush
+ */
+declare class ScriptFlushCommand extends Command<"OK", "OK"> {
+    constructor([opts]: [opts?: ScriptFlushCommandOptions], cmdOpts?: CommandOptions<"OK", "OK">);
+}
+
 /**
  * @see https://redis.io/commands/script-load
  */
@@ -2132,6 +2193,15 @@ declare class SInterCommand<TData = string> extends Command<unknown[], TData[]>
     constructor(cmd: [key: string, ...keys: string[]], opts?: CommandOptions<unknown[], TData[]>);
 }
 
+/**
+ * @see https://redis.io/commands/sintercard
+ */
+declare class SInterCardCommand extends Command<number, number> {
+    constructor(cmd: [keys: string[], opts?: {
+        limit?: number;
+    }], cmdOpts?: CommandOptions<number, number>);
+}
+
 /**
  * @see https://redis.io/commands/sinterstore
  */
@@ -2250,6 +2320,13 @@ declare class UnlinkCommand extends Command<number, number> {
     constructor(cmd: [...keys: string[]], opts?: CommandOptions<number, number>);
 }
 
+/**
+ * @see https://redis.io/commands/xack
+ */
+declare class XAckCommand extends Command<number, number> {
+    constructor([key, group, id]: [key: string, group: string, id: string | string[]], opts?: CommandOptions<number, number>);
+}
+
 type XAckDelOption = "KEEPREF" | "keepref" | "DELREF" | "delref" | "ACKED" | "acked";
 /**
  * @see https://redis.io/commands/xackdel
@@ -2291,6 +2368,51 @@ declare class XAddCommand extends Command<string, string> {
     ], commandOptions?: CommandOptions<string, string>);
 }
 
+/**
+ * @see https://redis.io/commands/xautoclaim
+ */
+declare class XAutoClaim extends Command<unknown[], unknown[]> {
+    constructor([key, group, consumer, minIdleTime, start, options]: [
+        key: string,
+        group: string,
+        consumer: string,
+        minIdleTime: number,
+        start: string,
+        options?: {
+            count?: number;
+            justId?: boolean;
+        }
+    ], opts?: CommandOptions<unknown[], unknown[]>);
+}
+
+/**
+ * @see https://redis.io/commands/xclaim
+ */
+declare class XClaimCommand extends Command<unknown[], unknown[]> {
+    constructor([key, group, consumer, minIdleTime, id, options]: [
+        key: string,
+        group: string,
+        consumer: string,
+        minIdleTime: number,
+        id: string | string[],
+        options?: {
+            idleMS?: number;
+            timeMS?: number;
+            retryCount?: number;
+            force?: boolean;
+            justId?: boolean;
+            lastId?: number;
+        }
+    ], opts?: CommandOptions<unknown[], unknown[]>);
+}
+
+/**
+ * @see https://redis.io/commands/xdel
+ */
+declare class XDelCommand extends Command<number, number> {
+    constructor([key, ids]: [key: string, ids: string[] | string], opts?: CommandOptions<number, number>);
+}
+
 type XDelExOption = "KEEPREF" | "keepref" | "DELREF" | "delref" | "ACKED" | "acked";
 /**
  * @see https://redis.io/commands/xdelex
@@ -2299,6 +2421,78 @@ declare class XDelExCommand extends Command<number[], number[]> {
     constructor([key, opts, ...ids]: [key: string, opts?: XDelExOption, ...ids: string[]], cmdOpts?: CommandOptions<number[], number[]>);
 }
 
+type XGroupCommandType = {
+    type: "CREATE";
+    group: string;
+    id: `$` | string;
+    options?: {
+        MKSTREAM?: boolean;
+        ENTRIESREAD?: number;
+    };
+} | {
+    type: "CREATECONSUMER";
+    group: string;
+    consumer: string;
+} | {
+    type: "DELCONSUMER";
+    group: string;
+    consumer: string;
+} | {
+    type: "DESTROY";
+    group: string;
+} | {
+    type: "SETID";
+    group: string;
+    id: `$` | string;
+    options?: {
+        ENTRIESREAD?: number;
+    };
+};
+type XGroupReturnType<T extends XGroupCommandType> = T["type"] extends "CREATE" ? string : T["type"] extends "CREATECONSUMER" ? 0 | 1 : T["type"] extends "DELCONSUMER" ? number : T["type"] extends "DESTROY" ? 0 | 1 : T["type"] extends "SETID" ? string : never;
+/**
+ * @see https://redis.io/commands/xgroup
+ */
+declare class XGroupCommand<TOptions extends XGroupCommandType = XGroupCommandType> extends Command<any, XGroupReturnType<TOptions>> {
+    constructor([key, opts]: [key: string, opts: TOptions], commandOptions?: CommandOptions<any, any>);
+}
+
+type XInfoCommands = {
+    type: "CONSUMERS";
+    group: string;
+} | {
+    type: "GROUPS";
+};
+/**
+ * @see https://redis.io/commands/xinfo
+ */
+declare class XInfoCommand extends Command<number, unknown[]> {
+    constructor([key, options]: [key: string, options: XInfoCommands], opts?: CommandOptions<number, unknown[]>);
+}
+
+/**
+ * @see https://redis.io/commands/xlen
+ */
+declare class XLenCommand extends Command<number, number> {
+    constructor(cmd: [key: string], opts?: CommandOptions<number, number>);
+}
+
+/**
+ * @see https://redis.io/commands/xpending
+ */
+declare class XPendingCommand extends Command<unknown[], unknown[]> {
+    constructor([key, group, start, end, count, options]: [
+        key: string,
+        group: string,
+        start: string,
+        end: string,
+        count: number,
+        options?: {
+            idleTime?: number;
+            consumer?: string | string[];
+        }
+    ], opts?: CommandOptions<unknown[], unknown[]>);
+}
+
 declare class XRangeCommand<TData extends Record<string, Record<string, unknown>>> extends Command<string[][], TData> {
     constructor([key, start, end, count]: [key: string, start: string, end: string, count?: number], opts?: CommandOptions<unknown[], TData[]>);
 }
@@ -2371,6 +2565,23 @@ declare class XReadGroupCommand extends Command<number, unknown[]> {
     constructor([group, consumer, key, id, options]: XReadGroupOptions, opts?: CommandOptions<number, unknown[]>);
 }
 
+declare class XRevRangeCommand<TData extends Record<string, Record<string, unknown>>> extends Command<string[][], TData> {
+    constructor([key, end, start, count]: [key: string, end: string, start: string, count?: number], opts?: CommandOptions<unknown[], TData[]>);
+}
+
+/**
+ * @see https://redis.io/commands/xtrim
+ */
+type XTrimOptions = {
+    strategy: "MAXLEN" | "MINID";
+    exactness?: "~" | "=";
+    threshold: number | string;
+    limit?: number;
+};
+declare class XTrimCommand extends Command<number, number> {
+    constructor([key, options]: [key: string, options: XTrimOptions], opts?: CommandOptions<number, number>);
+}
+
 type NXAndXXOptions = {
     nx: true;
     xx?: never;
@@ -2429,6 +2640,26 @@ declare class ZIncrByCommand<TData> extends Command<number, number> {
     constructor(cmd: [key: string, increment: number, member: TData], opts?: CommandOptions<number, number>);
 }
 
+type ZInterStoreCommandOptions = {
+    aggregate?: "sum" | "min" | "max";
+} & ({
+    weight: number;
+    weights?: never;
+} | {
+    weight?: never;
+    weights: number[];
+} | {
+    weight?: never;
+    weights?: never;
+});
+/**
+ * @see https://redis.io/commands/zInterstore
+ */
+declare class ZInterStoreCommand extends Command<number, number> {
+    constructor(cmd: [destination: string, numKeys: 1, key: string, opts?: ZInterStoreCommandOptions], cmdOpts?: CommandOptions<number, number>);
+    constructor(cmd: [destination: string, numKeys: number, keys: string[], opts?: ZInterStoreCommandOptions], cmdOpts?: CommandOptions<number, number>);
+}
+
 /**
  * @see https://redis.io/commands/zlexcount
  */
@@ -2558,6 +2789,47 @@ declare class ZScoreCommand<TData> extends Command<string | null, number | null>
     constructor(cmd: [key: string, member: TData], opts?: CommandOptions<string | null, number | null>);
 }
 
+type ZUnionCommandOptions = {
+    withScores?: boolean;
+    aggregate?: "sum" | "min" | "max";
+} & ({
+    weight: number;
+    weights?: never;
+} | {
+    weight?: never;
+    weights: number[];
+} | {
+    weight?: never;
+    weights?: never;
+});
+/**
+ * @see https://redis.io/commands/zunion
+ */
+declare class ZUnionCommand<TData extends unknown[]> extends Command<string[], TData> {
+    constructor(cmd: [numKeys: 1, key: string, opts?: ZUnionCommandOptions], cmdOpts?: CommandOptions<string[], TData>);
+    constructor(cmd: [numKeys: number, keys: string[], opts?: ZUnionCommandOptions], cmdOpts?: CommandOptions<string[], TData>);
+}
+
+type ZUnionStoreCommandOptions = {
+    aggregate?: "sum" | "min" | "max";
+} & ({
+    weight: number;
+    weights?: never;
+} | {
+    weight?: never;
+    weights: number[];
+} | {
+    weight?: never;
+    weights?: never;
+});
+/**
+ * @see https://redis.io/commands/zunionstore
+ */
+declare class ZUnionStoreCommand extends Command<number, number> {
+    constructor(cmd: [destination: string, numKeys: 1, key: string, opts?: ZUnionStoreCommandOptions], cmdOpts?: CommandOptions<number, number>);
+    constructor(cmd: [destination: string, numKeys: number, keys: string[], opts?: ZUnionStoreCommandOptions], cmdOpts?: CommandOptions<number, number>);
+}
+
 type BaseMessageData<TMessage> = {
     channel: string;
     message: TMessage;
@@ -2595,6 +2867,20 @@ declare class Subscriber<TMessage = any> extends EventTarget {
     getSubscribedChannels(): string[];
 }
 
+/**
+ * @see https://redis.io/commands/zdiffstore
+ */
+declare class ZDiffStoreCommand extends Command<number, number> {
+    constructor(cmd: [destination: string, numkeys: number, ...keys: string[]], opts?: CommandOptions<number, number>);
+}
+
+/**
+ * @see https://redis.io/commands/zmscore
+ */
+declare class ZMScoreCommand<TData> extends Command<string[] | null, number[] | null> {
+    constructor(cmd: [key: string, members: TData[]], opts?: CommandOptions<string[] | null, number[] | null>);
+}
+
 type InferResponseData<T extends unknown[]> = {
     [K in keyof T]: T[K] extends Command<any, infer TData> ? TData : unknown;
 };
@@ -2692,11 +2978,11 @@ declare class Pipeline<TCommands extends Command<any, any>[] = []> {
     /**
      * @see https://redis.io/commands/append
      */
-    append: (key: string, value: string) => Pipeline<[...TCommands, Command<any, number>]>;
+    append: (...args: CommandArgs<typeof AppendCommand>) => Pipeline<[...TCommands, Command<any, number>]>;
     /**
      * @see https://redis.io/commands/bitcount
      */
-    bitcount: (key: string, start: number, end: number) => Pipeline<[...TCommands, Command<any, number>]>;
+    bitcount: (...args: CommandArgs<typeof BitCountCommand>) => Pipeline<[...TCommands, Command<any, number>]>;
     /**
      * Returns an instance that can be used to execute `BITFIELD` commands on one key.
      *
@@ -2713,7 +2999,7 @@ declare class Pipeline<TCommands extends Command<any, any>[] = []> {
      *
      * @see https://redis.io/commands/bitfield
      */
-    bitfield: (key: string) => BitFieldCommand<Pipeline<[...TCommands, Command<any, number[]>]>>;
+    bitfield: (...args: CommandArgs<typeof BitFieldCommand>) => BitFieldCommand<Pipeline<[...TCommands, Command<any, number[]>]>>;
     /**
      * @see https://redis.io/commands/bitop
      */
@@ -2726,21 +3012,19 @@ declare class Pipeline<TCommands extends Command<any, any>[] = []> {
     /**
      * @see https://redis.io/commands/bitpos
      */
-    bitpos: (key: string, bit: 0 | 1, start?: number | undefined, end?: number | undefined) => Pipeline<[...TCommands, Command<any, number>]>;
+    bitpos: (...args: CommandArgs<typeof BitPosCommand>) => Pipeline<[...TCommands, Command<any, number>]>;
     /**
      * @see https://redis.io/commands/client-setinfo
      */
-    clientSetinfo: (attribute: ClientSetInfoAttribute, value: string) => Pipeline<[...TCommands, Command<any, string>]>;
+    clientSetinfo: (...args: CommandArgs<typeof ClientSetInfoCommand>) => Pipeline<[...TCommands, Command<any, string>]>;
     /**
      * @see https://redis.io/commands/copy
      */
-    copy: (key: string, destinationKey: string, opts?: {
-        replace: boolean;
-    } | undefined) => Pipeline<[...TCommands, Command<any, "COPIED" | "NOT_COPIED">]>;
+    copy: (...args: CommandArgs<typeof CopyCommand>) => Pipeline<[...TCommands, Command<any, "COPIED" | "NOT_COPIED">]>;
     /**
      * @see https://redis.io/commands/zdiffstore
      */
-    zdiffstore: (destination: string, numkeys: number, ...keys: string[]) => Pipeline<[...TCommands, Command<any, number>]>;
+    zdiffstore: (...args: CommandArgs<typeof ZDiffStoreCommand>) => Pipeline<[...TCommands, Command<any, number>]>;
     /**
      * @see https://redis.io/commands/dbsize
      */
@@ -2748,11 +3032,11 @@ declare class Pipeline<TCommands extends Command<any, any>[] = []> {
     /**
      * @see https://redis.io/commands/decr
      */
-    decr: (key: string) => Pipeline<[...TCommands, Command<any, number>]>;
+    decr: (...args: CommandArgs<typeof DecrCommand>) => Pipeline<[...TCommands, Command<any, number>]>;
     /**
      * @see https://redis.io/commands/decrby
      */
-    decrby: (key: string, decrement: number) => Pipeline<[...TCommands, Command<any, number>]>;
+    decrby: (...args: CommandArgs<typeof DecrByCommand>) => Pipeline<[...TCommands, Command<any, number>]>;
     /**
      * @see https://redis.io/commands/del
      */
@@ -2760,23 +3044,23 @@ declare class Pipeline<TCommands extends Command<any, any>[] = []> {
     /**
      * @see https://redis.io/commands/echo
      */
-    echo: (message: string) => Pipeline<[...TCommands, Command<any, string>]>;
+    echo: (...args: CommandArgs<typeof EchoCommand>) => Pipeline<[...TCommands, Command<any, string>]>;
     /**
      * @see https://redis.io/commands/eval_ro
      */
-    evalRo: <TArgs extends unknown[], TData = unknown>(script: string, keys: string[], args: TArgs) => Pipeline<[...TCommands, Command<any, TData>]>;
+    evalRo: <TArgs extends unknown[], TData = unknown>(...args: [script: string, keys: string[], args: TArgs]) => Pipeline<[...TCommands, Command<any, TData>]>;
     /**
      * @see https://redis.io/commands/eval
      */
-    eval: <TArgs extends unknown[], TData = unknown>(script: string, keys: string[], args: TArgs) => Pipeline<[...TCommands, Command<any, TData>]>;
+    eval: <TArgs extends unknown[], TData = unknown>(...args: [script: string, keys: string[], args: TArgs]) => Pipeline<[...TCommands, Command<any, TData>]>;
     /**
      * @see https://redis.io/commands/evalsha_ro
      */
-    evalshaRo: <TArgs extends unknown[], TData = unknown>(sha1: string, keys: string[], args: TArgs) => Pipeline<[...TCommands, Command<any, TData>]>;
+    evalshaRo: <TArgs extends unknown[], TData = unknown>(...args: [sha1: string, keys: string[], args: TArgs]) => Pipeline<[...TCommands, Command<any, TData>]>;
     /**
      * @see https://redis.io/commands/evalsha
      */
-    evalsha: <TArgs extends unknown[], TData = unknown>(sha1: string, keys: string[], args: TArgs) => Pipeline<[...TCommands, Command<any, TData>]>;
+    evalsha: <TArgs extends unknown[], TData = unknown>(...args: [sha1: string, keys: string[], args: TArgs]) => Pipeline<[...TCommands, Command<any, TData>]>;
     /**
      * @see https://redis.io/commands/exists
      */
@@ -2784,11 +3068,11 @@ declare class Pipeline<TCommands extends Command<any, any>[] = []> {
     /**
      * @see https://redis.io/commands/expire
      */
-    expire: (key: string, seconds: number, option?: ExpireOption | undefined) => Pipeline<[...TCommands, Command<any, 0 | 1>]>;
+    expire: (...args: CommandArgs<typeof ExpireCommand>) => Pipeline<[...TCommands, Command<any, 0 | 1>]>;
     /**
      * @see https://redis.io/commands/expireat
      */
-    expireat: (key: string, unix: number, option?: ExpireOption | undefined) => Pipeline<[...TCommands, Command<any, 0 | 1>]>;
+    expireat: (...args: CommandArgs<typeof ExpireAtCommand>) => Pipeline<[...TCommands, Command<any, 0 | 1>]>;
     /**
      * @see https://redis.io/commands/flushall
      */
@@ -2796,60 +3080,30 @@ declare class Pipeline<TCommands extends Command<any, any>[] = []> {
     /**
      * @see https://redis.io/commands/flushdb
      */
-    flushdb: (opts?: {
-        async?: boolean;
-    } | undefined) => Pipeline<[...TCommands, Command<any, "OK">]>;
+    flushdb: (...args: CommandArgs<typeof FlushDBCommand>) => Pipeline<[...TCommands, Command<any, "OK">]>;
     /**
      * @see https://redis.io/commands/geoadd
      */
-    geoadd: <TData>(args_0: string, args_1: GeoAddCommandOptions | GeoMember<TData>, ...args_2: GeoMember<TData>[]) => Pipeline<[...TCommands, Command<any, number | null>]>;
+    geoadd: <TData>(...args: CommandArgs<typeof GeoAddCommand<TData>>) => Pipeline<[...TCommands, Command<any, number | null>]>;
     /**
      * @see https://redis.io/commands/geodist
      */
-    geodist: <TData>(key: string, member1: TData, member2: TData, unit?: "M" | "KM" | "FT" | "MI" | undefined) => Pipeline<[...TCommands, Command<any, number | null>]>;
+    geodist: <TData>(...args: CommandArgs<typeof GeoDistCommand<TData>>) => Pipeline<[...TCommands, Command<any, number | null>]>;
     /**
      * @see https://redis.io/commands/geopos
      */
-    geopos: <TData>(args_0: string, ...args_1: TData[]) => Pipeline<[...TCommands, Command<any, {
+    geopos: <TData>(...args: CommandArgs<typeof GeoPosCommand<TData>>) => Pipeline<[...TCommands, Command<any, {
         lng: number;
         lat: number;
     }[]>]>;
     /**
      * @see https://redis.io/commands/geohash
      */
-    geohash: <TData>(args_0: string, ...args_1: TData[]) => Pipeline<[...TCommands, Command<any, (string | null)[]>]>;
+    geohash: <TData>(...args: CommandArgs<typeof GeoHashCommand<TData>>) => Pipeline<[...TCommands, Command<any, (string | null)[]>]>;
     /**
      * @see https://redis.io/commands/geosearch
      */
-    geosearch: <TData>(key: string, centerPoint: {
-        type: "FROMLONLAT" | "fromlonlat";
-        coordinate: {
-            lon: number;
-            lat: number;
-        };
-    } | {
-        type: "FROMMEMBER" | "frommember";
-        member: TData;
-    }, shape: {
-        type: "BYRADIUS" | "byradius";
-        radius: number;
-        radiusType: "M" | "KM" | "FT" | "MI";
-    } | {
-        type: "BYBOX" | "bybox";
-        rect: {
-            width: number;
-            height: number;
-        };
-        rectType: "M" | "KM" | "FT" | "MI";
-    }, order: "ASC" | "DESC" | "asc" | "desc", opts?: {
-        count?: {
-            limit: number;
-            any?: boolean;
-        };
-        withCoord?: boolean;
-        withDist?: boolean;
-        withHash?: boolean;
-    } | undefined) => Pipeline<[...TCommands, Command<any, ({
+    geosearch: <TData>(...args: CommandArgs<typeof GeoSearchCommand<TData>>) => Pipeline<[...TCommands, Command<any, ({
         member: TData;
     } & {
         coord?: {
@@ -2862,89 +3116,27 @@ declare class Pipeline<TCommands extends Command<any, any>[] = []> {
     /**
      * @see https://redis.io/commands/geosearchstore
      */
-    geosearchstore: <TData>(destination: string, key: string, centerPoint: {
-        type: "FROMLONLAT" | "fromlonlat";
-        coordinate: {
-            lon: number;
-            lat: number;
-        };
-    } | {
-        type: "FROMMEMBER" | "frommember";
-        member: TData;
-    }, shape: {
-        type: "BYRADIUS" | "byradius";
-        radius: number;
-        radiusType: "M" | "KM" | "FT" | "MI";
-    } | {
-        type: "BYBOX" | "bybox";
-        rect: {
-            width: number;
-            height: number;
-        };
-        rectType: "M" | "KM" | "FT" | "MI";
-    }, order: "ASC" | "DESC" | "asc" | "desc", opts?: {
-        count?: {
-            limit: number;
-            any?: boolean;
-        };
-        storeDist?: boolean;
-    } | undefined) => Pipeline<[...TCommands, Command<any, number>]>;
+    geosearchstore: <TData>(...args: CommandArgs<typeof GeoSearchStoreCommand<TData>>) => Pipeline<[...TCommands, Command<any, number>]>;
     /**
      * @see https://redis.io/commands/get
      */
-    get: <TData>(key: string) => Pipeline<[...TCommands, Command<any, TData | null>]>;
+    get: <TData>(...args: CommandArgs<typeof GetCommand>) => Pipeline<[...TCommands, Command<any, TData | null>]>;
     /**
      * @see https://redis.io/commands/getbit
      */
-    getbit: (key: string, offset: number) => Pipeline<[...TCommands, Command<any, 0 | 1>]>;
+    getbit: (...args: CommandArgs<typeof GetBitCommand>) => Pipeline<[...TCommands, Command<any, 0 | 1>]>;
     /**
      * @see https://redis.io/commands/getdel
      */
-    getdel: <TData>(key: string) => Pipeline<[...TCommands, Command<any, TData | null>]>;
+    getdel: <TData>(...args: CommandArgs<typeof GetDelCommand>) => Pipeline<[...TCommands, Command<any, TData | null>]>;
     /**
      * @see https://redis.io/commands/getex
      */
-    getex: <TData>(key: string, opts?: ({
-        ex: number;
-        px?: never;
-        exat?: never;
-        pxat?: never;
-        persist?: never;
-    } | {
-        ex?: never;
-        px: number;
-        exat?: never;
-        pxat?: never;
-        persist?: never;
-    } | {
-        ex?: never;
-        px?: never;
-        exat: number;
-        pxat?: never;
-        persist?: never;
-    } | {
-        ex?: never;
-        px?: never;
-        exat?: never;
-        pxat: number;
-        persist?: never;
-    } | {
-        ex?: never;
-        px?: never;
-        exat?: never;
-        pxat?: never;
-        persist: true;
-    } | {
-        ex?: never;
-        px?: never;
-        exat?: never;
-        pxat?: never;
-        persist?: never;
-    }) | undefined) => Pipeline<[...TCommands, Command<any, TData | null>]>;
+    getex: <TData>(...args: CommandArgs<typeof GetExCommand>) => Pipeline<[...TCommands, Command<any, TData | null>]>;
     /**
      * @see https://redis.io/commands/getrange
      */
-    getrange: (key: string, start: number, end: number) => Pipeline<[...TCommands, Command<any, string>]>;
+    getrange: (...args: CommandArgs<typeof GetRangeCommand>) => Pipeline<[...TCommands, Command<any, string>]>;
     /**
      * @see https://redis.io/commands/getset
      */
@@ -2952,113 +3144,83 @@ declare class Pipeline<TCommands extends Command<any, any>[] = []> {
     /**
      * @see https://redis.io/commands/hdel
      */
-    hdel: (key: string, ...fields: string[]) => Pipeline<[...TCommands, Command<any, 0 | 1>]>;
+    hdel: (...args: CommandArgs<typeof HDelCommand>) => Pipeline<[...TCommands, Command<any, 0 | 1>]>;
     /**
      * @see https://redis.io/commands/hexists
      */
-    hexists: (key: string, field: string) => Pipeline<[...TCommands, Command<any, number>]>;
+    hexists: (...args: CommandArgs<typeof HExistsCommand>) => Pipeline<[...TCommands, Command<any, number>]>;
     /**
      * @see https://redis.io/commands/hexpire
      */
-    hexpire: (key: string, fields: string | number | (string | number)[], seconds: number, option?: ExpireOption | undefined) => Pipeline<[...TCommands, Command<any, (0 | 1 | 2 | -2)[]>]>;
+    hexpire: (...args: CommandArgs<typeof HExpireCommand>) => Pipeline<[...TCommands, Command<any, (0 | 1 | 2 | -2)[]>]>;
     /**
      * @see https://redis.io/commands/hexpireat
      */
-    hexpireat: (key: string, fields: string | number | (string | number)[], timestamp: number, option?: ExpireOption | undefined) => Pipeline<[...TCommands, Command<any, (0 | 1 | 2 | -2)[]>]>;
+    hexpireat: (...args: CommandArgs<typeof HExpireAtCommand>) => Pipeline<[...TCommands, Command<any, (0 | 1 | 2 | -2)[]>]>;
     /**
      * @see https://redis.io/commands/hexpiretime
      */
-    hexpiretime: (key: string, fields: string | number | (string | number)[]) => Pipeline<[...TCommands, Command<any, number[]>]>;
+    hexpiretime: (...args: CommandArgs<typeof HExpireTimeCommand>) => Pipeline<[...TCommands, Command<any, number[]>]>;
     /**
      * @see https://redis.io/commands/httl
      */
-    httl: (key: string, fields: string | number | (string | number)[]) => Pipeline<[...TCommands, Command<any, number[]>]>;
+    httl: (...args: CommandArgs<typeof HTtlCommand>) => Pipeline<[...TCommands, Command<any, number[]>]>;
     /**
      * @see https://redis.io/commands/hpexpire
      */
-    hpexpire: (key: string, fields: string | number | (string | number)[], milliseconds: number, option?: ExpireOption | undefined) => Pipeline<[...TCommands, Command<any, (0 | 1 | 2 | -2)[]>]>;
+    hpexpire: (...args: CommandArgs<typeof HPExpireCommand>) => Pipeline<[...TCommands, Command<any, (0 | 1 | 2 | -2)[]>]>;
     /**
      * @see https://redis.io/commands/hpexpireat
      */
-    hpexpireat: (key: string, fields: string | number | (string | number)[], timestamp: number, option?: ExpireOption | undefined) => Pipeline<[...TCommands, Command<any, (0 | 1 | 2 | -2)[]>]>;
+    hpexpireat: (...args: CommandArgs<typeof HPExpireAtCommand>) => Pipeline<[...TCommands, Command<any, (0 | 1 | 2 | -2)[]>]>;
     /**
      * @see https://redis.io/commands/hpexpiretime
      */
-    hpexpiretime: (key: string, fields: string | number | (string | number)[]) => Pipeline<[...TCommands, Command<any, number[]>]>;
+    hpexpiretime: (...args: CommandArgs<typeof HPExpireTimeCommand>) => Pipeline<[...TCommands, Command<any, number[]>]>;
     /**
      * @see https://redis.io/commands/hpttl
      */
-    hpttl: (key: string, fields: string | number | (string | number)[]) => Pipeline<[...TCommands, Command<any, number[]>]>;
+    hpttl: (...args: CommandArgs<typeof HPTtlCommand>) => Pipeline<[...TCommands, Command<any, number[]>]>;
     /**
      * @see https://redis.io/commands/hpersist
      */
-    hpersist: (key: string, fields: string | number | (string | number)[]) => Pipeline<[...TCommands, Command<any, (1 | -2 | -1)[]>]>;
+    hpersist: (...args: CommandArgs<typeof HPersistCommand>) => Pipeline<[...TCommands, Command<any, (1 | -2 | -1)[]>]>;
     /**
      * @see https://redis.io/commands/hget
      */
-    hget: <TData>(key: string, field: string) => Pipeline<[...TCommands, Command<any, TData | null>]>;
+    hget: <TData>(...args: CommandArgs<typeof HGetCommand>) => Pipeline<[...TCommands, Command<any, TData | null>]>;
     /**
      * @see https://redis.io/commands/hgetall
      */
-    hgetall: <TData extends Record<string, unknown>>(key: string) => Pipeline<[...TCommands, Command<any, TData | null>]>;
+    hgetall: <TData extends Record<string, unknown>>(...args: CommandArgs<typeof HGetAllCommand>) => Pipeline<[...TCommands, Command<any, TData | null>]>;
     /**
      * @see https://redis.io/commands/hgetdel
      */
-    hgetdel: <TData extends Record<string, unknown>>(key: string, ...fields: (string | number)[]) => Pipeline<[...TCommands, Command<any, TData | null>]>;
+    hgetdel: <TData extends Record<string, unknown>>(...args: CommandArgs<typeof HGetDelCommand>) => Pipeline<[...TCommands, Command<any, TData | null>]>;
     /**
      * @see https://redis.io/commands/hgetex
      */
-    hgetex: <TData extends Record<string, unknown>>(key: string, opts: {
-        ex: number;
-        px?: never;
-        exat?: never;
-        pxat?: never;
-        persist?: never;
-    } | {
-        ex?: never;
-        px: number;
-        exat?: never;
-        pxat?: never;
-        persist?: never;
-    } | {
-        ex?: never;
-        px?: never;
-        exat: number;
-        pxat?: never;
-        persist?: never;
-    } | {
-        ex?: never;
-        px?: never;
-        exat?: never;
-        pxat: number;
-        persist?: never;
-    } | {
-        ex?: never;
-        px?: never;
-        exat?: never;
-        pxat?: never;
-        persist: true;
-    }, ...fields: (string | number)[]) => Pipeline<[...TCommands, Command<any, TData | null>]>;
+    hgetex: <TData extends Record<string, unknown>>(...args: CommandArgs<typeof HGetExCommand>) => Pipeline<[...TCommands, Command<any, TData | null>]>;
     /**
      * @see https://redis.io/commands/hincrby
      */
-    hincrby: (key: string, field: string, increment: number) => Pipeline<[...TCommands, Command<any, number>]>;
+    hincrby: (...args: CommandArgs<typeof HIncrByCommand>) => Pipeline<[...TCommands, Command<any, number>]>;
     /**
      * @see https://redis.io/commands/hincrbyfloat
      */
-    hincrbyfloat: (key: string, field: string, increment: number) => Pipeline<[...TCommands, Command<any, number>]>;
+    hincrbyfloat: (...args: CommandArgs<typeof HIncrByFloatCommand>) => Pipeline<[...TCommands, Command<any, number>]>;
     /**
      * @see https://redis.io/commands/hkeys
      */
-    hkeys: (key: string) => Pipeline<[...TCommands, Command<any, string[]>]>;
+    hkeys: (...args: CommandArgs<typeof HKeysCommand>) => Pipeline<[...TCommands, Command<any, string[]>]>;
     /**
      * @see https://redis.io/commands/hlen
      */
-    hlen: (key: string) => Pipeline<[...TCommands, Command<any, number>]>;
+    hlen: (...args: CommandArgs<typeof HLenCommand>) => Pipeline<[...TCommands, Command<any, number>]>;
     /**
      * @see https://redis.io/commands/hmget
      */
-    hmget: <TData extends Record<string, unknown>>(key: string, ...fields: string[]) => Pipeline<[...TCommands, Command<any, TData | null>]>;
+    hmget: <TData extends Record<string, unknown>>(...args: CommandArgs<typeof HMGetCommand>) => Pipeline<[...TCommands, Command<any, TData | null>]>;
     /**
      * @see https://redis.io/commands/hmset
      */
@@ -3070,7 +3232,7 @@ declare class Pipeline<TCommands extends Command<any, any>[] = []> {
     /**
      * @see https://redis.io/commands/hscan
      */
-    hscan: (key: string, cursor: string | number, cmdOpts?: ScanCommandOptions | undefined) => Pipeline<[...TCommands, Command<any, [string, (string | number)[]]>]>;
+    hscan: (...args: CommandArgs<typeof HScanCommand>) => Pipeline<[...TCommands, Command<any, [string, (string | number)[]]>]>;
     /**
      * @see https://redis.io/commands/hset
      */
@@ -3078,46 +3240,7 @@ declare class Pipeline<TCommands extends Command<any, any>[] = []> {
     /**
      * @see https://redis.io/commands/hsetex
      */
-    hsetex: <TData>(key: string, opts: {
-        conditional?: "FNX" | "fnx" | "FXX" | "fxx";
-        expiration?: {
-            ex: number;
-            px?: never;
-            exat?: never;
-            pxat?: never;
-            keepttl?: never;
-        } | {
-            ex?: never;
-            px: number;
-            exat?: never;
-            pxat?: never;
-            keepttl?: never;
-        } | {
-            ex?: never;
-            px?: never;
-            exat: number;
-            pxat?: never;
-            keepttl?: never;
-        } | {
-            ex?: never;
-            px?: never;
-            exat?: never;
-            pxat: number;
-            keepttl?: never;
-        } | {
-            ex?: never;
-            px?: never;
-            exat?: never;
-            pxat?: never;
-            keepttl: true;
-        } | {
-            ex?: never;
-            px?: never;
-            exat?: never;
-            pxat?: never;
-            keepttl?: never;
-        };
-    }, kv: Record<string, TData>) => Pipeline<[...TCommands, Command<any, number>]>;
+    hsetex: <TData>(...args: CommandArgs<typeof HSetExCommand<TData>>) => Pipeline<[...TCommands, Command<any, number>]>;
     /**
      * @see https://redis.io/commands/hsetnx
      */
@@ -3125,31 +3248,31 @@ declare class Pipeline<TCommands extends Command<any, any>[] = []> {
     /**
      * @see https://redis.io/commands/hstrlen
      */
-    hstrlen: (key: string, field: string) => Pipeline<[...TCommands, Command<any, number>]>;
+    hstrlen: (...args: CommandArgs<typeof HStrLenCommand>) => Pipeline<[...TCommands, Command<any, number>]>;
     /**
      * @see https://redis.io/commands/hvals
      */
-    hvals: (key: string) => Pipeline<[...TCommands, Command<any, any>]>;
+    hvals: (...args: CommandArgs<typeof HValsCommand>) => Pipeline<[...TCommands, Command<any, any>]>;
     /**
      * @see https://redis.io/commands/incr
      */
-    incr: (key: string) => Pipeline<[...TCommands, Command<any, number>]>;
+    incr: (...args: CommandArgs<typeof IncrCommand>) => Pipeline<[...TCommands, Command<any, number>]>;
     /**
      * @see https://redis.io/commands/incrby
      */
-    incrby: (key: string, value: number) => Pipeline<[...TCommands, Command<any, number>]>;
+    incrby: (...args: CommandArgs<typeof IncrByCommand>) => Pipeline<[...TCommands, Command<any, number>]>;
     /**
      * @see https://redis.io/commands/incrbyfloat
      */
-    incrbyfloat: (key: string, value: number) => Pipeline<[...TCommands, Command<any, number>]>;
+    incrbyfloat: (...args: CommandArgs<typeof IncrByFloatCommand>) => Pipeline<[...TCommands, Command<any, number>]>;
     /**
      * @see https://redis.io/commands/keys
      */
-    keys: (pattern: string) => Pipeline<[...TCommands, Command<any, string[]>]>;
+    keys: (...args: CommandArgs<typeof KeysCommand>) => Pipeline<[...TCommands, Command<any, string[]>]>;
     /**
      * @see https://redis.io/commands/lindex
      */
-    lindex: (key: string, index: number) => Pipeline<[...TCommands, Command<any, any>]>;
+    lindex: (...args: CommandArgs<typeof LIndexCommand>) => Pipeline<[...TCommands, Command<any, any>]>;
     /**
      * @see https://redis.io/commands/linsert
      */
@@ -3157,27 +3280,23 @@ declare class Pipeline<TCommands extends Command<any, any>[] = []> {
     /**
      * @see https://redis.io/commands/llen
      */
-    llen: (key: string) => Pipeline<[...TCommands, Command<any, number>]>;
+    llen: (...args: CommandArgs<typeof LLenCommand>) => Pipeline<[...TCommands, Command<any, number>]>;
     /**
      * @see https://redis.io/commands/lmove
      */
-    lmove: <TData = string>(source: string, destination: string, whereFrom: "left" | "right", whereTo: "left" | "right") => Pipeline<[...TCommands, Command<any, TData>]>;
+    lmove: <TData = string>(...args: CommandArgs<typeof LMoveCommand>) => Pipeline<[...TCommands, Command<any, TData>]>;
     /**
      * @see https://redis.io/commands/lpop
      */
-    lpop: <TData>(key: string, count?: number | undefined) => Pipeline<[...TCommands, Command<any, TData | null>]>;
+    lpop: <TData>(...args: CommandArgs<typeof LPopCommand>) => Pipeline<[...TCommands, Command<any, TData | null>]>;
     /**
      * @see https://redis.io/commands/lmpop
      */
-    lmpop: <TData>(numkeys: number, keys: string[], args_2: "LEFT" | "RIGHT", count?: number | undefined) => Pipeline<[...TCommands, Command<any, [string, TData[]] | null>]>;
+    lmpop: <TData>(...args: CommandArgs<typeof LmPopCommand>) => Pipeline<[...TCommands, Command<any, [string, TData[]] | null>]>;
     /**
      * @see https://redis.io/commands/lpos
      */
-    lpos: <TData>(key: string, element: unknown, opts?: {
-        rank?: number;
-        count?: number;
-        maxLen?: number;
-    } | undefined) => Pipeline<[...TCommands, Command<any, TData>]>;
+    lpos: <TData>(...args: CommandArgs<typeof LPosCommand>) => Pipeline<[...TCommands, Command<any, TData>]>;
     /**
      * @see https://redis.io/commands/lpush
      */
@@ -3189,7 +3308,7 @@ declare class Pipeline<TCommands extends Command<any, any>[] = []> {
     /**
      * @see https://redis.io/commands/lrange
      */
-    lrange: <TResult = string>(key: string, start: number, end: number) => Pipeline<[...TCommands, Command<any, TResult[]>]>;
+    lrange: <TResult = string>(...args: CommandArgs<typeof LRangeCommand>) => Pipeline<[...TCommands, Command<any, TResult[]>]>;
     /**
      * @see https://redis.io/commands/lrem
      */
@@ -3201,7 +3320,7 @@ declare class Pipeline<TCommands extends Command<any, any>[] = []> {
     /**
      * @see https://redis.io/commands/ltrim
      */
-    ltrim: (key: string, start: number, end: number) => Pipeline<[...TCommands, Command<any, "OK">]>;
+    ltrim: (...args: CommandArgs<typeof LTrimCommand>) => Pipeline<[...TCommands, Command<any, "OK">]>;
     /**
      * @see https://redis.io/commands/mget
      */
@@ -3217,27 +3336,27 @@ declare class Pipeline<TCommands extends Command<any, any>[] = []> {
     /**
      * @see https://redis.io/commands/persist
      */
-    persist: (key: string) => Pipeline<[...TCommands, Command<any, 0 | 1>]>;
+    persist: (...args: CommandArgs<typeof PersistCommand>) => Pipeline<[...TCommands, Command<any, 0 | 1>]>;
     /**
      * @see https://redis.io/commands/pexpire
      */
-    pexpire: (key: string, milliseconds: number, option?: ExpireOption | undefined) => Pipeline<[...TCommands, Command<any, 0 | 1>]>;
+    pexpire: (...args: CommandArgs<typeof PExpireCommand>) => Pipeline<[...TCommands, Command<any, 0 | 1>]>;
     /**
      * @see https://redis.io/commands/pexpireat
      */
-    pexpireat: (key: string, unix: number, option?: ExpireOption | undefined) => Pipeline<[...TCommands, Command<any, 0 | 1>]>;
+    pexpireat: (...args: CommandArgs<typeof PExpireAtCommand>) => Pipeline<[...TCommands, Command<any, 0 | 1>]>;
     /**
      * @see https://redis.io/commands/pfadd
      */
-    pfadd: (args_0: string, ...args_1: unknown[]) => Pipeline<[...TCommands, Command<any, number>]>;
+    pfadd: (...args: CommandArgs<typeof PfAddCommand>) => Pipeline<[...TCommands, Command<any, number>]>;
     /**
      * @see https://redis.io/commands/pfcount
      */
-    pfcount: (args_0: string, ...args_1: string[]) => Pipeline<[...TCommands, Command<any, number>]>;
+    pfcount: (...args: CommandArgs<typeof PfCountCommand>) => Pipeline<[...TCommands, Command<any, number>]>;
     /**
      * @see https://redis.io/commands/pfmerge
      */
-    pfmerge: (destination_key: string, ...args_1: string[]) => Pipeline<[...TCommands, Command<any, "OK">]>;
+    pfmerge: (...args: CommandArgs<typeof PfMergeCommand>) => Pipeline<[...TCommands, Command<any, "OK">]>;
     /**
      * @see https://redis.io/commands/ping
      */
@@ -3249,11 +3368,11 @@ declare class Pipeline<TCommands extends Command<any, any>[] = []> {
     /**
      * @see https://redis.io/commands/pttl
      */
-    pttl: (key: string) => Pipeline<[...TCommands, Command<any, number>]>;
+    pttl: (...args: CommandArgs<typeof PTtlCommand>) => Pipeline<[...TCommands, Command<any, number>]>;
     /**
      * @see https://redis.io/commands/publish
      */
-    publish: (channel: string, message: unknown) => Pipeline<[...TCommands, Command<any, number>]>;
+    publish: (...args: CommandArgs<typeof PublishCommand>) => Pipeline<[...TCommands, Command<any, number>]>;
     /**
      * @see https://redis.io/commands/randomkey
      */
@@ -3261,15 +3380,15 @@ declare class Pipeline<TCommands extends Command<any, any>[] = []> {
     /**
      * @see https://redis.io/commands/rename
      */
-    rename: (source: string, destination: string) => Pipeline<[...TCommands, Command<any, "OK">]>;
+    rename: (...args: CommandArgs<typeof RenameCommand>) => Pipeline<[...TCommands, Command<any, "OK">]>;
     /**
      * @see https://redis.io/commands/renamenx
      */
-    renamenx: (source: string, destination: string) => Pipeline<[...TCommands, Command<any, 0 | 1>]>;
+    renamenx: (...args: CommandArgs<typeof RenameNXCommand>) => Pipeline<[...TCommands, Command<any, 0 | 1>]>;
     /**
      * @see https://redis.io/commands/rpop
      */
-    rpop: <TData = string>(key: string, count?: number | undefined) => Pipeline<[...TCommands, Command<any, TData | null>]>;
+    rpop: <TData = string>(...args: CommandArgs<typeof RPopCommand>) => Pipeline<[...TCommands, Command<any, TData | null>]>;
     /**
      * @see https://redis.io/commands/rpush
      */
@@ -3285,11 +3404,11 @@ declare class Pipeline<TCommands extends Command<any, any>[] = []> {
     /**
      * @see https://redis.io/commands/scan
      */
-    scan: (cursor: string | number, opts?: ScanCommandOptions | undefined) => Pipeline<[...TCommands, Command<any, any>]>;
+    scan: (...args: CommandArgs<typeof ScanCommand>) => Pipeline<[...TCommands, Command<any, any>]>;
     /**
      * @see https://redis.io/commands/scard
      */
-    scard: (key: string) => Pipeline<[...TCommands, Command<any, number>]>;
+    scard: (...args: CommandArgs<typeof SCardCommand>) => Pipeline<[...TCommands, Command<any, number>]>;
     /**
      * @see https://redis.io/commands/script-exists
      */
@@ -3297,16 +3416,16 @@ declare class Pipeline<TCommands extends Command<any, any>[] = []> {
     /**
      * @see https://redis.io/commands/script-flush
      */
-    scriptFlush: (opts?: ScriptFlushCommandOptions | undefined) => Pipeline<[...TCommands, Command<any, "OK">]>;
+    scriptFlush: (...args: CommandArgs<typeof ScriptFlushCommand>) => Pipeline<[...TCommands, Command<any, "OK">]>;
     /**
      * @see https://redis.io/commands/script-load
      */
-    scriptLoad: (script: string) => Pipeline<[...TCommands, Command<any, string>]>;
-    sdiff: (key: string, ...keys: string[]) => Pipeline<[...TCommands, Command<any, unknown[]>]>;
+    scriptLoad: (...args: CommandArgs<typeof ScriptLoadCommand>) => Pipeline<[...TCommands, Command<any, string>]>;
+    sdiff: (...args: CommandArgs<typeof SDiffCommand>) => Pipeline<[...TCommands, Command<any, unknown[]>]>;
     /**
      * @see https://redis.io/commands/sdiffstore
      */
-    sdiffstore: (destination: string, ...keys: string[]) => Pipeline<[...TCommands, Command<any, number>]>;
+    sdiffstore: (...args: CommandArgs<typeof SDiffStoreCommand>) => Pipeline<[...TCommands, Command<any, number>]>;
     /**
      * @see https://redis.io/commands/set
      */
@@ -3314,7 +3433,7 @@ declare class Pipeline<TCommands extends Command<any, any>[] = []> {
     /**
      * @see https://redis.io/commands/setbit
      */
-    setbit: (key: string, offset: number, value: 0 | 1) => Pipeline<[...TCommands, Command<any, 0 | 1>]>;
+    setbit: (...args: CommandArgs<typeof SetBitCommand>) => Pipeline<[...TCommands, Command<any, 0 | 1>]>;
     /**
      * @see https://redis.io/commands/setex
      */
@@ -3326,15 +3445,19 @@ declare class Pipeline<TCommands extends Command<any, any>[] = []> {
     /**
      * @see https://redis.io/commands/setrange
      */
-    setrange: (key: string, offset: number, value: string) => Pipeline<[...TCommands, Command<any, number>]>;
+    setrange: (...args: CommandArgs<typeof SetRangeCommand>) => Pipeline<[...TCommands, Command<any, number>]>;
     /**
      * @see https://redis.io/commands/sinter
      */
-    sinter: (key: string, ...keys: string[]) => Pipeline<[...TCommands, Command<any, string[]>]>;
+    sinter: (...args: CommandArgs<typeof SInterCommand>) => Pipeline<[...TCommands, Command<any, string[]>]>;
+    /**
+     * @see https://redis.io/commands/sintercard
+     */
+    sintercard: (...args: CommandArgs<typeof SInterCardCommand>) => Pipeline<[...TCommands, Command<any, number>]>;
     /**
      * @see https://redis.io/commands/sinterstore
      */
-    sinterstore: (destination: string, key: string, ...keys: string[]) => Pipeline<[...TCommands, Command<any, number>]>;
+    sinterstore: (...args: CommandArgs<typeof SInterStoreCommand>) => Pipeline<[...TCommands, Command<any, number>]>;
     /**
      * @see https://redis.io/commands/sismember
      */
@@ -3342,7 +3465,7 @@ declare class Pipeline<TCommands extends Command<any, any>[] = []> {
     /**
      * @see https://redis.io/commands/smembers
      */
-    smembers: <TData extends unknown[] = string[]>(key: string) => Pipeline<[...TCommands, Command<any, TData>]>;
+    smembers: <TData extends unknown[] = string[]>(...args: CommandArgs<typeof SMembersCommand>) => Pipeline<[...TCommands, Command<any, TData>]>;
     /**
      * @see https://redis.io/commands/smismember
      */
@@ -3354,11 +3477,11 @@ declare class Pipeline<TCommands extends Command<any, any>[] = []> {
     /**
      * @see https://redis.io/commands/spop
      */
-    spop: <TData>(key: string, count?: number | undefined) => Pipeline<[...TCommands, Command<any, TData | null>]>;
+    spop: <TData>(...args: CommandArgs<typeof SPopCommand>) => Pipeline<[...TCommands, Command<any, TData | null>]>;
     /**
      * @see https://redis.io/commands/srandmember
      */
-    srandmember: <TData>(key: string, count?: number | undefined) => Pipeline<[...TCommands, Command<any, TData | null>]>;
+    srandmember: <TData>(...args: CommandArgs<typeof SRandMemberCommand>) => Pipeline<[...TCommands, Command<any, TData | null>]>;
     /**
      * @see https://redis.io/commands/srem
      */
@@ -3366,19 +3489,19 @@ declare class Pipeline<TCommands extends Command<any, any>[] = []> {
     /**
      * @see https://redis.io/commands/sscan
      */
-    sscan: (key: string, cursor: string | number, opts?: ScanCommandOptions | undefined) => Pipeline<[...TCommands, Command<any, [string, (string | number)[]]>]>;
+    sscan: (...args: CommandArgs<typeof SScanCommand>) => Pipeline<[...TCommands, Command<any, [string, (string | number)[]]>]>;
     /**
      * @see https://redis.io/commands/strlen
      */
-    strlen: (key: string) => Pipeline<[...TCommands, Command<any, number>]>;
+    strlen: (...args: CommandArgs<typeof StrLenCommand>) => Pipeline<[...TCommands, Command<any, number>]>;
     /**
      * @see https://redis.io/commands/sunion
      */
-    sunion: (key: string, ...keys: string[]) => Pipeline<[...TCommands, Command<any, unknown[]>]>;
+    sunion: (...args: CommandArgs<typeof SUnionCommand>) => Pipeline<[...TCommands, Command<any, unknown[]>]>;
     /**
      * @see https://redis.io/commands/sunionstore
      */
-    sunionstore: (destination: string, key: string, ...keys: string[]) => Pipeline<[...TCommands, Command<any, number>]>;
+    sunionstore: (...args: CommandArgs<typeof SUnionStoreCommand>) => Pipeline<[...TCommands, Command<any, number>]>;
     /**
      * @see https://redis.io/commands/time
      */
@@ -3390,11 +3513,11 @@ declare class Pipeline<TCommands extends Command<any, any>[] = []> {
     /**
      * @see https://redis.io/commands/ttl
      */
-    ttl: (key: string) => Pipeline<[...TCommands, Command<any, number>]>;
+    ttl: (...args: CommandArgs<typeof TtlCommand>) => Pipeline<[...TCommands, Command<any, number>]>;
     /**
      * @see https://redis.io/commands/type
      */
-    type: (key: string) => Pipeline<[...TCommands, Command<any, Type>]>;
+    type: (...args: CommandArgs<typeof TypeCommand>) => Pipeline<[...TCommands, Command<any, Type>]>;
     /**
      * @see https://redis.io/commands/unlink
      */
@@ -3406,68 +3529,27 @@ declare class Pipeline<TCommands extends Command<any, any>[] = []> {
     /**
      * @see https://redis.io/commands/xadd
      */
-    xadd: (key: string, id: string, entries: Record<string, unknown>, opts?: {
-        nomkStream?: boolean;
-        trim?: ({
-            type: "MAXLEN" | "maxlen";
-            threshold: number;
-        } | {
-            type: "MINID" | "minid";
-            threshold: string;
-        }) & ({
-            comparison: "~";
-            limit?: number;
-        } | {
-            comparison: "=";
-            limit?: never;
-        });
-    } | undefined) => Pipeline<[...TCommands, Command<any, string>]>;
+    xadd: (...args: CommandArgs<typeof XAddCommand>) => Pipeline<[...TCommands, Command<any, string>]>;
     /**
      * @see https://redis.io/commands/xack
      */
-    xack: (key: string, group: string, id: string | string[]) => Pipeline<[...TCommands, Command<any, number>]>;
+    xack: (...args: CommandArgs<typeof XAckCommand>) => Pipeline<[...TCommands, Command<any, number>]>;
     /**
      * @see https://redis.io/commands/xackdel
      */
-    xackdel: (key: string, group: string, opts: "KEEPREF" | "keepref" | "DELREF" | "delref" | "ACKED" | "acked", ...ids: string[]) => Pipeline<[...TCommands, Command<any, number[]>]>;
+    xackdel: (...args: CommandArgs<typeof XAckDelCommand>) => Pipeline<[...TCommands, Command<any, number[]>]>;
     /**
      * @see https://redis.io/commands/xdel
      */
-    xdel: (key: string, ids: string | string[]) => Pipeline<[...TCommands, Command<any, number>]>;
+    xdel: (...args: CommandArgs<typeof XDelCommand>) => Pipeline<[...TCommands, Command<any, number>]>;
     /**
      * @see https://redis.io/commands/xdelex
      */
-    xdelex: (key: string, opts?: ("KEEPREF" | "keepref" | "DELREF" | "delref" | "ACKED" | "acked") | undefined, ...ids: string[]) => Pipeline<[...TCommands, Command<any, number[]>]>;
+    xdelex: (...args: CommandArgs<typeof XDelExCommand>) => Pipeline<[...TCommands, Command<any, number[]>]>;
     /**
      * @see https://redis.io/commands/xgroup
      */
-    xgroup: (key: string, opts: {
-        type: "CREATE";
-        group: string;
-        id: `$` | string;
-        options?: {
-            MKSTREAM?: boolean;
-            ENTRIESREAD?: number;
-        };
-    } | {
-        type: "CREATECONSUMER";
-        group: string;
-        consumer: string;
-    } | {
-        type: "DELCONSUMER";
-        group: string;
-        consumer: string;
-    } | {
-        type: "DESTROY";
-        group: string;
-    } | {
-        type: "SETID";
-        group: string;
-        id: `$` | string;
-        options?: {
-            ENTRIESREAD?: number;
-        };
-    }) => Pipeline<[...TCommands, Command<any, never>]>;
+    xgroup: (...args: CommandArgs<typeof XGroupCommand>) => Pipeline<[...TCommands, Command<any, never>]>;
     /**
      * @see https://redis.io/commands/xread
      */
@@ -3479,66 +3561,43 @@ declare class Pipeline<TCommands extends Command<any, any>[] = []> {
     /**
      * @see https://redis.io/commands/xinfo
      */
-    xinfo: (key: string, options: {
-        type: "CONSUMERS";
-        group: string;
-    } | {
-        type: "GROUPS";
-    }) => Pipeline<[...TCommands, Command<any, unknown[]>]>;
+    xinfo: (...args: CommandArgs<typeof XInfoCommand>) => Pipeline<[...TCommands, Command<any, unknown[]>]>;
     /**
      * @see https://redis.io/commands/xlen
      */
-    xlen: (key: string) => Pipeline<[...TCommands, Command<any, number>]>;
+    xlen: (...args: CommandArgs<typeof XLenCommand>) => Pipeline<[...TCommands, Command<any, number>]>;
     /**
      * @see https://redis.io/commands/xpending
      */
-    xpending: (key: string, group: string, start: string, end: string, count: number, options?: {
-        idleTime?: number;
-        consumer?: string | string[];
-    } | undefined) => Pipeline<[...TCommands, Command<any, unknown[]>]>;
+    xpending: (...args: CommandArgs<typeof XPendingCommand>) => Pipeline<[...TCommands, Command<any, unknown[]>]>;
     /**
      * @see https://redis.io/commands/xclaim
      */
-    xclaim: (key: string, group: string, consumer: string, minIdleTime: number, id: string | string[], options?: {
-        idleMS?: number;
-        timeMS?: number;
-        retryCount?: number;
-        force?: boolean;
-        justId?: boolean;
-        lastId?: number;
-    } | undefined) => Pipeline<[...TCommands, Command<any, unknown[]>]>;
+    xclaim: (...args: CommandArgs<typeof XClaimCommand>) => Pipeline<[...TCommands, Command<any, unknown[]>]>;
     /**
      * @see https://redis.io/commands/xautoclaim
      */
-    xautoclaim: (key: string, group: string, consumer: string, minIdleTime: number, start: string, options?: {
-        count?: number;
-        justId?: boolean;
-    } | undefined) => Pipeline<[...TCommands, Command<any, unknown[]>]>;
+    xautoclaim: (...args: CommandArgs<typeof XAutoClaim>) => Pipeline<[...TCommands, Command<any, unknown[]>]>;
     /**
      * @see https://redis.io/commands/xtrim
      */
-    xtrim: (key: string, options: {
-        strategy: "MAXLEN" | "MINID";
-        exactness?: "~" | "=";
-        threshold: number | string;
-        limit?: number;
-    }) => Pipeline<[...TCommands, Command<any, number>]>;
+    xtrim: (...args: CommandArgs<typeof XTrimCommand>) => Pipeline<[...TCommands, Command<any, number>]>;
     /**
      * @see https://redis.io/commands/xrange
      */
-    xrange: (key: string, start: string, end: string, count?: number | undefined) => Pipeline<[...TCommands, Command<any, Record<string, Record<string, unknown>>>]>;
+    xrange: <TData extends Record<string, unknown>>(...args: CommandArgs<typeof XRangeCommand>) => Pipeline<[...TCommands, Command<any, Record<string, TData>>]>;
     /**
      * @see https://redis.io/commands/xrevrange
      */
-    xrevrange: (key: string, end: string, start: string, count?: number | undefined) => Pipeline<[...TCommands, Command<any, Record<string, Record<string, unknown>>>]>;
+    xrevrange: <TData extends Record<string, unknown>>(...args: CommandArgs<typeof XRevRangeCommand>) => Pipeline<[...TCommands, Command<any, Record<string, TData>>]>;
     /**
      * @see https://redis.io/commands/zcard
      */
-    zcard: (key: string) => Pipeline<[...TCommands, Command<any, number>]>;
+    zcard: (...args: CommandArgs<typeof ZCardCommand>) => Pipeline<[...TCommands, Command<any, number>]>;
     /**
      * @see https://redis.io/commands/zcount
      */
-    zcount: (key: string, min: string | number, max: string | number) => Pipeline<[...TCommands, Command<any, number>]>;
+    zcount: (...args: CommandArgs<typeof ZCountCommand>) => Pipeline<[...TCommands, Command<any, number>]>;
     /**
      * @see https://redis.io/commands/zincrby
      */
@@ -3546,23 +3605,23 @@ declare class Pipeline<TCommands extends Command<any, any>[] = []> {
     /**
      * @see https://redis.io/commands/zinterstore
      */
-    zinterstore: (destination: string, numKeys: number, keys: string[], opts?: ZInterStoreCommandOptions | undefined) => Pipeline<[...TCommands, Command<any, number>]>;
+    zinterstore: (...args: CommandArgs<typeof ZInterStoreCommand>) => Pipeline<[...TCommands, Command<any, number>]>;
     /**
      * @see https://redis.io/commands/zlexcount
      */
-    zlexcount: (key: string, min: string, max: string) => Pipeline<[...TCommands, Command<any, number>]>;
+    zlexcount: (...args: CommandArgs<typeof ZLexCountCommand>) => Pipeline<[...TCommands, Command<any, number>]>;
     /**
      * @see https://redis.io/commands/zmscore
      */
-    zmscore: (key: string, members: unknown[]) => Pipeline<[...TCommands, Command<any, number[] | null>]>;
+    zmscore: (...args: CommandArgs<typeof ZMScoreCommand>) => Pipeline<[...TCommands, Command<any, number[] | null>]>;
     /**
      * @see https://redis.io/commands/zpopmax
      */
-    zpopmax: <TData>(key: string, count?: number | undefined) => Pipeline<[...TCommands, Command<any, TData[]>]>;
+    zpopmax: <TData>(...args: CommandArgs<typeof ZPopMaxCommand>) => Pipeline<[...TCommands, Command<any, TData[]>]>;
     /**
      * @see https://redis.io/commands/zpopmin
      */
-    zpopmin: <TData>(key: string, count?: number | undefined) => Pipeline<[...TCommands, Command<any, TData[]>]>;
+    zpopmin: <TData>(...args: CommandArgs<typeof ZPopMinCommand>) => Pipeline<[...TCommands, Command<any, TData[]>]>;
     /**
      * @see https://redis.io/commands/zrange
      */
@@ -3582,15 +3641,15 @@ declare class Pipeline<TCommands extends Command<any, any>[] = []> {
     /**
      * @see https://redis.io/commands/zremrangebylex
      */
-    zremrangebylex: (key: string, min: string, max: string) => Pipeline<[...TCommands, Command<any, number>]>;
+    zremrangebylex: (...args: CommandArgs<typeof ZRemRangeByLexCommand>) => Pipeline<[...TCommands, Command<any, number>]>;
     /**
      * @see https://redis.io/commands/zremrangebyrank
      */
-    zremrangebyrank: (key: string, start: number, stop: number) => Pipeline<[...TCommands, Command<any, number>]>;
+    zremrangebyrank: (...args: CommandArgs<typeof ZRemRangeByRankCommand>) => Pipeline<[...TCommands, Command<any, number>]>;
     /**
      * @see https://redis.io/commands/zremrangebyscore
      */
-    zremrangebyscore: (key: string, min: number | `(${number}` | "-inf" | "+inf", max: number | `(${number}` | "-inf" | "+inf") => Pipeline<[...TCommands, Command<any, number>]>;
+    zremrangebyscore: (...args: CommandArgs<typeof ZRemRangeByScoreCommand>) => Pipeline<[...TCommands, Command<any, number>]>;
     /**
      * @see https://redis.io/commands/zrevrank
      */
@@ -3598,7 +3657,7 @@ declare class Pipeline<TCommands extends Command<any, any>[] = []> {
     /**
      * @see https://redis.io/commands/zscan
      */
-    zscan: (key: string, cursor: string | number, opts?: ScanCommandOptions | undefined) => Pipeline<[...TCommands, Command<any, [string, (string | number)[]]>]>;
+    zscan: (...args: CommandArgs<typeof ZScanCommand>) => Pipeline<[...TCommands, Command<any, [string, (string | number)[]]>]>;
     /**
      * @see https://redis.io/commands/zscore
      */
@@ -3606,11 +3665,11 @@ declare class Pipeline<TCommands extends Command<any, any>[] = []> {
     /**
      * @see https://redis.io/commands/zunionstore
      */
-    zunionstore: (destination: string, numKeys: number, keys: string[], opts?: ZUnionStoreCommandOptions | undefined) => Pipeline<[...TCommands, Command<any, number>]>;
+    zunionstore: (...args: CommandArgs<typeof ZUnionStoreCommand>) => Pipeline<[...TCommands, Command<any, number>]>;
     /**
      * @see https://redis.io/commands/zunion
      */
-    zunion: (numKeys: number, keys: string[], opts?: ZUnionCommandOptions | undefined) => Pipeline<[...TCommands, Command<any, any>]>;
+    zunion: (...args: CommandArgs<typeof ZUnionCommand>) => Pipeline<[...TCommands, Command<any, any>]>;
     /**
      * @see https://redis.io/commands/?group=json
      */
@@ -3746,8 +3805,8 @@ declare class Pipeline<TCommands extends Command<any, any>[] = []> {
         stats: () => Pipeline<[...TCommands, Command<any, {
             engines: {
                 [k: string]: {
-                    librariesCount: unknown;
-                    functionsCount: unknown;
+                    librariesCount: any;
+                    functionsCount: any;
                 };
             };
         }>]>;
@@ -3788,6 +3847,7 @@ declare class Script<TResult = unknown> {
      * future major release.
      */
     sha1: string;
+    private initPromise;
     private readonly redis;
     constructor(redis: Redis, script: string);
     /**
@@ -3841,6 +3901,7 @@ declare class ScriptRO<TResult = unknown> {
      * future major release.
      */
     sha1: string;
+    private initPromise;
     private readonly redis;
     constructor(redis: Redis, script: string);
     private init;
@@ -4021,8 +4082,8 @@ declare class Redis {
         stats: () => Promise<{
             engines: {
                 [k: string]: {
-                    librariesCount: unknown;
-                    functionsCount: unknown;
+                    librariesCount: any;
+                    functionsCount: any;
                 };
             };
         }>;
@@ -4082,10 +4143,10 @@ declare class Redis {
             add: ({ indexName, alias }: {
                 indexName: string;
                 alias: string;
-            }) => Promise<1>;
+            }) => Promise<1 | 2>;
             delete: ({ alias }: {
                 alias: string;
-            }) => Promise<1>;
+            }) => Promise<0 | 1>;
         };
     };
     /**
@@ -4120,15 +4181,15 @@ declare class Redis {
      *
      * @see https://redis.io/commands/bitfield
      */
-    bitfield: (key: string) => BitFieldCommand<Promise<number[]>>;
+    bitfield: (...args: CommandArgs<typeof BitFieldCommand>) => BitFieldCommand<Promise<number[]>>;
     /**
      * @see https://redis.io/commands/append
      */
-    append: (key: string, value: string) => Promise<number>;
+    append: (...args: CommandArgs<typeof AppendCommand>) => Promise<number>;
     /**
      * @see https://redis.io/commands/bitcount
      */
-    bitcount: (key: string, start: number, end: number) => Promise<number>;
+    bitcount: (...args: CommandArgs<typeof BitCountCommand>) => Promise<number>;
     /**
      * @see https://redis.io/commands/bitop
      */
@@ -4141,17 +4202,15 @@ declare class Redis {
     /**
      * @see https://redis.io/commands/bitpos
      */
-    bitpos: (key: string, bit: 0 | 1, start?: number | undefined, end?: number | undefined) => Promise<number>;
+    bitpos: (...args: CommandArgs<typeof BitPosCommand>) => Promise<number>;
     /**
      * @see https://redis.io/commands/client-setinfo
      */
-    clientSetinfo: (attribute: ClientSetInfoAttribute, value: string) => Promise<string>;
+    clientSetinfo: (...args: CommandArgs<typeof ClientSetInfoCommand>) => Promise<string>;
     /**
      * @see https://redis.io/commands/copy
      */
-    copy: (key: string, destinationKey: string, opts?: {
-        replace: boolean;
-    } | undefined) => Promise<"COPIED" | "NOT_COPIED">;
+    copy: (...args: CommandArgs<typeof CopyCommand>) => Promise<"COPIED" | "NOT_COPIED">;
     /**
      * @see https://redis.io/commands/dbsize
      */
@@ -4159,11 +4218,11 @@ declare class Redis {
     /**
      * @see https://redis.io/commands/decr
      */
-    decr: (key: string) => Promise<number>;
+    decr: (...args: CommandArgs<typeof DecrCommand>) => Promise<number>;
     /**
      * @see https://redis.io/commands/decrby
      */
-    decrby: (key: string, decrement: number) => Promise<number>;
+    decrby: (...args: CommandArgs<typeof DecrByCommand>) => Promise<number>;
     /**
      * @see https://redis.io/commands/del
      */
@@ -4171,23 +4230,23 @@ declare class Redis {
     /**
      * @see https://redis.io/commands/echo
      */
-    echo: (message: string) => Promise<string>;
+    echo: (...args: CommandArgs<typeof EchoCommand>) => Promise<string>;
     /**
      * @see https://redis.io/commands/eval_ro
      */
-    evalRo: <TArgs extends unknown[], TData = unknown>(script: string, keys: string[], args: TArgs) => Promise<TData>;
+    evalRo: <TArgs extends unknown[], TData = unknown>(...args: [script: string, keys: string[], args: TArgs]) => Promise<TData>;
     /**
      * @see https://redis.io/commands/eval
      */
-    eval: <TArgs extends unknown[], TData = unknown>(script: string, keys: string[], args: TArgs) => Promise<TData>;
+    eval: <TArgs extends unknown[], TData = unknown>(...args: [script: string, keys: string[], args: TArgs]) => Promise<TData>;
     /**
      * @see https://redis.io/commands/evalsha_ro
      */
-    evalshaRo: <TArgs extends unknown[], TData = unknown>(sha1: string, keys: string[], args: TArgs) => Promise<TData>;
+    evalshaRo: <TArgs extends unknown[], TData = unknown>(...args: [sha1: string, keys: string[], args: TArgs]) => Promise<TData>;
     /**
      * @see https://redis.io/commands/evalsha
      */
-    evalsha: <TArgs extends unknown[], TData = unknown>(sha1: string, keys: string[], args: TArgs) => Promise<TData>;
+    evalsha: <TArgs extends unknown[], TData = unknown>(...args: [sha1: string, keys: string[], args: TArgs]) => Promise<TData>;
     /**
      * Generic method to execute any Redis command.
      */
@@ -4199,11 +4258,11 @@ declare class Redis {
     /**
      * @see https://redis.io/commands/expire
      */
-    expire: (key: string, seconds: number, option?: ExpireOption | undefined) => Promise<0 | 1>;
+    expire: (...args: CommandArgs<typeof ExpireCommand>) => Promise<0 | 1>;
     /**
      * @see https://redis.io/commands/expireat
      */
-    expireat: (key: string, unix: number, option?: ExpireOption | undefined) => Promise<0 | 1>;
+    expireat: (...args: CommandArgs<typeof ExpireAtCommand>) => Promise<0 | 1>;
     /**
      * @see https://redis.io/commands/flushall
      */
@@ -4211,60 +4270,30 @@ declare class Redis {
     /**
      * @see https://redis.io/commands/flushdb
      */
-    flushdb: (opts?: {
-        async?: boolean;
-    } | undefined) => Promise<"OK">;
+    flushdb: (...args: CommandArgs<typeof FlushDBCommand>) => Promise<"OK">;
     /**
      * @see https://redis.io/commands/geoadd
      */
-    geoadd: <TData>(args_0: string, args_1: GeoAddCommandOptions | GeoMember<TData>, ...args_2: GeoMember<TData>[]) => Promise<number | null>;
+    geoadd: <TData>(...args: CommandArgs<typeof GeoAddCommand<TData>>) => Promise<number | null>;
     /**
      * @see https://redis.io/commands/geopos
      */
-    geopos: <TData>(args_0: string, ...args_1: TData[]) => Promise<{
+    geopos: <TData>(...args: CommandArgs<typeof GeoPosCommand<TData>>) => Promise<{
         lng: number;
         lat: number;
     }[]>;
     /**
      * @see https://redis.io/commands/geodist
      */
-    geodist: <TData>(key: string, member1: TData, member2: TData, unit?: "M" | "KM" | "FT" | "MI" | undefined) => Promise<number | null>;
+    geodist: <TData>(...args: CommandArgs<typeof GeoDistCommand<TData>>) => Promise<number | null>;
     /**
      * @see https://redis.io/commands/geohash
      */
-    geohash: <TData>(args_0: string, ...args_1: TData[]) => Promise<(string | null)[]>;
+    geohash: <TData>(...args: CommandArgs<typeof GeoHashCommand<TData>>) => Promise<(string | null)[]>;
     /**
      * @see https://redis.io/commands/geosearch
      */
-    geosearch: <TData>(key: string, centerPoint: {
-        type: "FROMLONLAT" | "fromlonlat";
-        coordinate: {
-            lon: number;
-            lat: number;
-        };
-    } | {
-        type: "FROMMEMBER" | "frommember";
-        member: TData;
-    }, shape: {
-        type: "BYRADIUS" | "byradius";
-        radius: number;
-        radiusType: "M" | "KM" | "FT" | "MI";
-    } | {
-        type: "BYBOX" | "bybox";
-        rect: {
-            width: number;
-            height: number;
-        };
-        rectType: "M" | "KM" | "FT" | "MI";
-    }, order: "ASC" | "DESC" | "asc" | "desc", opts?: {
-        count?: {
-            limit: number;
-            any?: boolean;
-        };
-        withCoord?: boolean;
-        withDist?: boolean;
-        withHash?: boolean;
-    } | undefined) => Promise<({
+    geosearch: <TData>(...args: CommandArgs<typeof GeoSearchCommand<TData>>) => Promise<({
         member: TData;
     } & {
         coord?: {
@@ -4277,89 +4306,27 @@ declare class Redis {
     /**
      * @see https://redis.io/commands/geosearchstore
      */
-    geosearchstore: <TData>(destination: string, key: string, centerPoint: {
-        type: "FROMLONLAT" | "fromlonlat";
-        coordinate: {
-            lon: number;
-            lat: number;
-        };
-    } | {
-        type: "FROMMEMBER" | "frommember";
-        member: TData;
-    }, shape: {
-        type: "BYRADIUS" | "byradius";
-        radius: number;
-        radiusType: "M" | "KM" | "FT" | "MI";
-    } | {
-        type: "BYBOX" | "bybox";
-        rect: {
-            width: number;
-            height: number;
-        };
-        rectType: "M" | "KM" | "FT" | "MI";
-    }, order: "ASC" | "DESC" | "asc" | "desc", opts?: {
-        count?: {
-            limit: number;
-            any?: boolean;
-        };
-        storeDist?: boolean;
-    } | undefined) => Promise<number>;
+    geosearchstore: <TData>(...args: CommandArgs<typeof GeoSearchStoreCommand<TData>>) => Promise<number>;
     /**
      * @see https://redis.io/commands/get
      */
-    get: <TData>(key: string) => Promise<TData | null>;
+    get: <TData>(...args: CommandArgs<typeof GetCommand>) => Promise<TData | null>;
     /**
      * @see https://redis.io/commands/getbit
      */
-    getbit: (key: string, offset: number) => Promise<0 | 1>;
+    getbit: (...args: CommandArgs<typeof GetBitCommand>) => Promise<0 | 1>;
     /**
      * @see https://redis.io/commands/getdel
      */
-    getdel: <TData>(key: string) => Promise<TData | null>;
+    getdel: <TData>(...args: CommandArgs<typeof GetDelCommand>) => Promise<TData | null>;
     /**
      * @see https://redis.io/commands/getex
      */
-    getex: <TData>(key: string, opts?: ({
-        ex: number;
-        px?: never;
-        exat?: never;
-        pxat?: never;
-        persist?: never;
-    } | {
-        ex?: never;
-        px: number;
-        exat?: never;
-        pxat?: never;
-        persist?: never;
-    } | {
-        ex?: never;
-        px?: never;
-        exat: number;
-        pxat?: never;
-        persist?: never;
-    } | {
-        ex?: never;
-        px?: never;
-        exat?: never;
-        pxat: number;
-        persist?: never;
-    } | {
-        ex?: never;
-        px?: never;
-        exat?: never;
-        pxat?: never;
-        persist: true;
-    } | {
-        ex?: never;
-        px?: never;
-        exat?: never;
-        pxat?: never;
-        persist?: never;
-    }) | undefined) => Promise<TData | null>;
+    getex: <TData>(...args: CommandArgs<typeof GetExCommand>) => Promise<TData | null>;
     /**
      * @see https://redis.io/commands/getrange
      */
-    getrange: (key: string, start: number, end: number) => Promise<string>;
+    getrange: (...args: CommandArgs<typeof GetRangeCommand>) => Promise<string>;
     /**
      * @see https://redis.io/commands/getset
      */
@@ -4367,113 +4334,83 @@ declare class Redis {
     /**
      * @see https://redis.io/commands/hdel
      */
-    hdel: (key: string, ...fields: string[]) => Promise<0 | 1>;
+    hdel: (...args: CommandArgs<typeof HDelCommand>) => Promise<0 | 1>;
     /**
      * @see https://redis.io/commands/hexists
      */
-    hexists: (key: string, field: string) => Promise<number>;
+    hexists: (...args: CommandArgs<typeof HExistsCommand>) => Promise<number>;
     /**
      * @see https://redis.io/commands/hexpire
      */
-    hexpire: (key: string, fields: string | number | (string | number)[], seconds: number, option?: ExpireOption | undefined) => Promise<(0 | 1 | 2 | -2)[]>;
+    hexpire: (...args: CommandArgs<typeof HExpireCommand>) => Promise<(0 | 1 | 2 | -2)[]>;
     /**
      * @see https://redis.io/commands/hexpireat
      */
-    hexpireat: (key: string, fields: string | number | (string | number)[], timestamp: number, option?: ExpireOption | undefined) => Promise<(0 | 1 | 2 | -2)[]>;
+    hexpireat: (...args: CommandArgs<typeof HExpireAtCommand>) => Promise<(0 | 1 | 2 | -2)[]>;
     /**
      * @see https://redis.io/commands/hexpiretime
      */
-    hexpiretime: (key: string, fields: string | number | (string | number)[]) => Promise<number[]>;
+    hexpiretime: (...args: CommandArgs<typeof HExpireTimeCommand>) => Promise<number[]>;
     /**
      * @see https://redis.io/commands/httl
      */
-    httl: (key: string, fields: string | number | (string | number)[]) => Promise<number[]>;
+    httl: (...args: CommandArgs<typeof HTtlCommand>) => Promise<number[]>;
     /**
      * @see https://redis.io/commands/hpexpire
      */
-    hpexpire: (key: string, fields: string | number | (string | number)[], milliseconds: number, option?: ExpireOption | undefined) => Promise<(0 | 1 | 2 | -2)[]>;
+    hpexpire: (...args: CommandArgs<typeof HPExpireCommand>) => Promise<(0 | 1 | 2 | -2)[]>;
     /**
      * @see https://redis.io/commands/hpexpireat
      */
-    hpexpireat: (key: string, fields: string | number | (string | number)[], timestamp: number, option?: ExpireOption | undefined) => Promise<(0 | 1 | 2 | -2)[]>;
+    hpexpireat: (...args: CommandArgs<typeof HPExpireAtCommand>) => Promise<(0 | 1 | 2 | -2)[]>;
     /**
      * @see https://redis.io/commands/hpexpiretime
      */
-    hpexpiretime: (key: string, fields: string | number | (string | number)[]) => Promise<number[]>;
+    hpexpiretime: (...args: CommandArgs<typeof HPExpireTimeCommand>) => Promise<number[]>;
     /**
      * @see https://redis.io/commands/hpttl
      */
-    hpttl: (key: string, fields: string | number | (string | number)[]) => Promise<number[]>;
+    hpttl: (...args: CommandArgs<typeof HPTtlCommand>) => Promise<number[]>;
     /**
      * @see https://redis.io/commands/hpersist
      */
-    hpersist: (key: string, fields: string | number | (string | number)[]) => Promise<(1 | -2 | -1)[]>;
+    hpersist: (...args: CommandArgs<typeof HPersistCommand>) => Promise<(1 | -2 | -1)[]>;
     /**
      * @see https://redis.io/commands/hget
      */
-    hget: <TData>(key: string, field: string) => Promise<TData | null>;
+    hget: <TData>(...args: CommandArgs<typeof HGetCommand>) => Promise<TData | null>;
     /**
      * @see https://redis.io/commands/hgetall
      */
-    hgetall: <TData extends Record<string, unknown>>(key: string) => Promise<TData | null>;
+    hgetall: <TData extends Record<string, unknown>>(...args: CommandArgs<typeof HGetAllCommand>) => Promise<TData | null>;
     /**
      * @see https://redis.io/commands/hgetdel
      */
-    hgetdel: <TData extends Record<string, unknown>>(key: string, ...fields: (string | number)[]) => Promise<TData | null>;
+    hgetdel: <TData extends Record<string, unknown>>(...args: CommandArgs<typeof HGetDelCommand>) => Promise<TData | null>;
     /**
      * @see https://redis.io/commands/hgetex
      */
-    hgetex: <TData extends Record<string, unknown>>(key: string, opts: {
-        ex: number;
-        px?: never;
-        exat?: never;
-        pxat?: never;
-        persist?: never;
-    } | {
-        ex?: never;
-        px: number;
-        exat?: never;
-        pxat?: never;
-        persist?: never;
-    } | {
-        ex?: never;
-        px?: never;
-        exat: number;
-        pxat?: never;
-        persist?: never;
-    } | {
-        ex?: never;
-        px?: never;
-        exat?: never;
-        pxat: number;
-        persist?: never;
-    } | {
-        ex?: never;
-        px?: never;
-        exat?: never;
-        pxat?: never;
-        persist: true;
-    }, ...fields: (string | number)[]) => Promise<TData | null>;
+    hgetex: <TData extends Record<string, unknown>>(...args: CommandArgs<typeof HGetExCommand>) => Promise<TData | null>;
     /**
      * @see https://redis.io/commands/hincrby
      */
-    hincrby: (key: string, field: string, increment: number) => Promise<number>;
+    hincrby: (...args: CommandArgs<typeof HIncrByCommand>) => Promise<number>;
     /**
      * @see https://redis.io/commands/hincrbyfloat
      */
-    hincrbyfloat: (key: string, field: string, increment: number) => Promise<number>;
+    hincrbyfloat: (...args: CommandArgs<typeof HIncrByFloatCommand>) => Promise<number>;
     /**
      * @see https://redis.io/commands/hkeys
      */
-    hkeys: (key: string) => Promise<string[]>;
+    hkeys: (...args: CommandArgs<typeof HKeysCommand>) => Promise<string[]>;
     /**
      * @see https://redis.io/commands/hlen
      */
-    hlen: (key: string) => Promise<number>;
+    hlen: (...args: CommandArgs<typeof HLenCommand>) => Promise<number>;
     /**
      * @see https://redis.io/commands/hmget
      */
-    hmget: <TData extends Record<string, unknown>>(key: string, ...fields: string[]) => Promise<TData | null>;
+    hmget: <TData extends Record<string, unknown>>(...args: CommandArgs<typeof HMGetCommand>) => Promise<TData | null>;
     /**
      * @see https://redis.io/commands/hmset
      */
@@ -4489,7 +4426,7 @@ declare class Redis {
     /**
      * @see https://redis.io/commands/hscan
      */
-    hscan: (key: string, cursor: string | number, cmdOpts?: ScanCommandOptions | undefined) => Promise<[string, (string | number)[]]>;
+    hscan: (...args: CommandArgs<typeof HScanCommand>) => Promise<[string, (string | number)[]]>;
     /**
      * @see https://redis.io/commands/hset
      */
@@ -4497,46 +4434,7 @@ declare class Redis {
     /**
      * @see https://redis.io/commands/hsetex
      */
-    hsetex: <TData>(key: string, opts: {
-        conditional?: "FNX" | "fnx" | "FXX" | "fxx";
-        expiration?: {
-            ex: number;
-            px?: never;
-            exat?: never;
-            pxat?: never;
-            keepttl?: never;
-        } | {
-            ex?: never;
-            px: number;
-            exat?: never;
-            pxat?: never;
-            keepttl?: never;
-        } | {
-            ex?: never;
-            px?: never;
-            exat: number;
-            pxat?: never;
-            keepttl?: never;
-        } | {
-            ex?: never;
-            px?: never;
-            exat?: never;
-            pxat: number;
-            keepttl?: never;
-        } | {
-            ex?: never;
-            px?: never;
-            exat?: never;
-            pxat?: never;
-            keepttl: true;
-        } | {
-            ex?: never;
-            px?: never;
-            exat?: never;
-            pxat?: never;
-            keepttl?: never;
-        };
-    }, kv: Record<string, TData>) => Promise<number>;
+    hsetex: <TData>(...args: CommandArgs<typeof HSetExCommand<TData>>) => Promise<number>;
     /**
      * @see https://redis.io/commands/hsetnx
      */
@@ -4544,31 +4442,31 @@ declare class Redis {
     /**
      * @see https://redis.io/commands/hstrlen
      */
-    hstrlen: (key: string, field: string) => Promise<number>;
+    hstrlen: (...args: CommandArgs<typeof HStrLenCommand>) => Promise<number>;
     /**
      * @see https://redis.io/commands/hvals
      */
-    hvals: (key: string) => Promise<any>;
+    hvals: (...args: CommandArgs<typeof HValsCommand>) => Promise<any>;
     /**
      * @see https://redis.io/commands/incr
      */
-    incr: (key: string) => Promise<number>;
+    incr: (...args: CommandArgs<typeof IncrCommand>) => Promise<number>;
     /**
      * @see https://redis.io/commands/incrby
      */
-    incrby: (key: string, value: number) => Promise<number>;
+    incrby: (...args: CommandArgs<typeof IncrByCommand>) => Promise<number>;
     /**
      * @see https://redis.io/commands/incrbyfloat
      */
-    incrbyfloat: (key: string, value: number) => Promise<number>;
+    incrbyfloat: (...args: CommandArgs<typeof IncrByFloatCommand>) => Promise<number>;
     /**
      * @see https://redis.io/commands/keys
      */
-    keys: (pattern: string) => Promise<string[]>;
+    keys: (...args: CommandArgs<typeof KeysCommand>) => Promise<string[]>;
     /**
      * @see https://redis.io/commands/lindex
      */
-    lindex: (key: string, index: number) => Promise<any>;
+    lindex: (...args: CommandArgs<typeof LIndexCommand>) => Promise<any>;
     /**
      * @see https://redis.io/commands/linsert
      */
@@ -4576,27 +4474,23 @@ declare class Redis {
     /**
      * @see https://redis.io/commands/llen
      */
-    llen: (key: string) => Promise<number>;
+    llen: (...args: CommandArgs<typeof LLenCommand>) => Promise<number>;
     /**
      * @see https://redis.io/commands/lmove
      */
-    lmove: <TData = string>(source: string, destination: string, whereFrom: "left" | "right", whereTo: "left" | "right") => Promise<TData>;
+    lmove: <TData = string>(...args: CommandArgs<typeof LMoveCommand>) => Promise<TData>;
     /**
      * @see https://redis.io/commands/lpop
      */
-    lpop: <TData>(key: string, count?: number | undefined) => Promise<TData | null>;
+    lpop: <TData>(...args: CommandArgs<typeof LPopCommand>) => Promise<TData | null>;
     /**
      * @see https://redis.io/commands/lmpop
      */
-    lmpop: <TData>(numkeys: number, keys: string[], args_2: "LEFT" | "RIGHT", count?: number | undefined) => Promise<[string, TData[]] | null>;
+    lmpop: <TData>(...args: CommandArgs<typeof LmPopCommand>) => Promise<[string, TData[]] | null>;
     /**
      * @see https://redis.io/commands/lpos
      */
-    lpos: <TData = number>(key: string, element: unknown, opts?: {
-        rank?: number;
-        count?: number;
-        maxLen?: number;
-    } | undefined) => Promise<TData>;
+    lpos: <TData = number>(...args: CommandArgs<typeof LPosCommand>) => Promise<TData>;
     /**
      * @see https://redis.io/commands/lpush
      */
@@ -4608,7 +4502,7 @@ declare class Redis {
     /**
      * @see https://redis.io/commands/lrange
      */
-    lrange: <TResult = string>(key: string, start: number, end: number) => Promise<TResult[]>;
+    lrange: <TResult = string>(...args: CommandArgs<typeof LRangeCommand>) => Promise<TResult[]>;
     /**
      * @see https://redis.io/commands/lrem
      */
@@ -4620,7 +4514,7 @@ declare class Redis {
     /**
      * @see https://redis.io/commands/ltrim
      */
-    ltrim: (key: string, start: number, end: number) => Promise<"OK">;
+    ltrim: (...args: CommandArgs<typeof LTrimCommand>) => Promise<"OK">;
     /**
      * @see https://redis.io/commands/mget
      */
@@ -4636,27 +4530,27 @@ declare class Redis {
     /**
      * @see https://redis.io/commands/persist
      */
-    persist: (key: string) => Promise<0 | 1>;
+    persist: (...args: CommandArgs<typeof PersistCommand>) => Promise<0 | 1>;
     /**
      * @see https://redis.io/commands/pexpire
      */
-    pexpire: (key: string, milliseconds: number, option?: ExpireOption | undefined) => Promise<0 | 1>;
+    pexpire: (...args: CommandArgs<typeof PExpireCommand>) => Promise<0 | 1>;
     /**
      * @see https://redis.io/commands/pexpireat
      */
-    pexpireat: (key: string, unix: number, option?: ExpireOption | undefined) => Promise<0 | 1>;
+    pexpireat: (...args: CommandArgs<typeof PExpireAtCommand>) => Promise<0 | 1>;
     /**
      * @see https://redis.io/commands/pfadd
      */
-    pfadd: (args_0: string, ...args_1: unknown[]) => Promise<number>;
+    pfadd: (...args: CommandArgs<typeof PfAddCommand>) => Promise<number>;
     /**
      * @see https://redis.io/commands/pfcount
      */
-    pfcount: (args_0: string, ...args_1: string[]) => Promise<number>;
+    pfcount: (...args: CommandArgs<typeof PfCountCommand>) => Promise<number>;
     /**
      * @see https://redis.io/commands/pfmerge
      */
-    pfmerge: (destination_key: string, ...args_1: string[]) => Promise<"OK">;
+    pfmerge: (...args: CommandArgs<typeof PfMergeCommand>) => Promise<"OK">;
     /**
      * @see https://redis.io/commands/ping
      */
@@ -4672,11 +4566,11 @@ declare class Redis {
     /**
      * @see https://redis.io/commands/pttl
      */
-    pttl: (key: string) => Promise<number>;
+    pttl: (...args: CommandArgs<typeof PTtlCommand>) => Promise<number>;
     /**
      * @see https://redis.io/commands/publish
      */
-    publish: (channel: string, message: unknown) => Promise<number>;
+    publish: (...args: CommandArgs<typeof PublishCommand>) => Promise<number>;
     /**
      * @see https://redis.io/commands/randomkey
      */
@@ -4684,15 +4578,15 @@ declare class Redis {
     /**
      * @see https://redis.io/commands/rename
      */
-    rename: (source: string, destination: string) => Promise<"OK">;
+    rename: (...args: CommandArgs<typeof RenameCommand>) => Promise<"OK">;
     /**
      * @see https://redis.io/commands/renamenx
      */
-    renamenx: (source: string, destination: string) => Promise<0 | 1>;
+    renamenx: (...args: CommandArgs<typeof RenameNXCommand>) => Promise<0 | 1>;
     /**
      * @see https://redis.io/commands/rpop
      */
-    rpop: <TData = string>(key: string, count?: number | undefined) => Promise<TData | null>;
+    rpop: <TData = string>(...args: CommandArgs<typeof RPopCommand>) => Promise<TData | null>;
     /**
      * @see https://redis.io/commands/rpush
      */
@@ -4715,7 +4609,7 @@ declare class Redis {
     /**
      * @see https://redis.io/commands/scard
      */
-    scard: (key: string) => Promise<number>;
+    scard: (...args: CommandArgs<typeof SCardCommand>) => Promise<number>;
     /**
      * @see https://redis.io/commands/script-exists
      */
@@ -4723,19 +4617,19 @@ declare class Redis {
     /**
      * @see https://redis.io/commands/script-flush
      */
-    scriptFlush: (opts?: ScriptFlushCommandOptions | undefined) => Promise<"OK">;
+    scriptFlush: (...args: CommandArgs<typeof ScriptFlushCommand>) => Promise<"OK">;
     /**
      * @see https://redis.io/commands/script-load
      */
-    scriptLoad: (script: string) => Promise<string>;
+    scriptLoad: (...args: CommandArgs<typeof ScriptLoadCommand>) => Promise<string>;
     /**
      * @see https://redis.io/commands/sdiff
      */
-    sdiff: (key: string, ...keys: string[]) => Promise<unknown[]>;
+    sdiff: (...args: CommandArgs<typeof SDiffCommand>) => Promise<unknown[]>;
     /**
      * @see https://redis.io/commands/sdiffstore
      */
-    sdiffstore: (destination: string, ...keys: string[]) => Promise<number>;
+    sdiffstore: (...args: CommandArgs<typeof SDiffStoreCommand>) => Promise<number>;
     /**
      * @see https://redis.io/commands/set
      */
@@ -4743,7 +4637,7 @@ declare class Redis {
     /**
      * @see https://redis.io/commands/setbit
      */
-    setbit: (key: string, offset: number, value: 0 | 1) => Promise<0 | 1>;
+    setbit: (...args: CommandArgs<typeof SetBitCommand>) => Promise<0 | 1>;
     /**
      * @see https://redis.io/commands/setex
      */
@@ -4755,15 +4649,19 @@ declare class Redis {
     /**
      * @see https://redis.io/commands/setrange
      */
-    setrange: (key: string, offset: number, value: string) => Promise<number>;
+    setrange: (...args: CommandArgs<typeof SetRangeCommand>) => Promise<number>;
     /**
      * @see https://redis.io/commands/sinter
      */
-    sinter: (key: string, ...keys: string[]) => Promise<string[]>;
+    sinter: (...args: CommandArgs<typeof SInterCommand>) => Promise<string[]>;
+    /**
+     * @see https://redis.io/commands/sintercard
+     */
+    sintercard: (...args: CommandArgs<typeof SInterCardCommand>) => Promise<number>;
     /**
      * @see https://redis.io/commands/sinterstore
      */
-    sinterstore: (destination: string, key: string, ...keys: string[]) => Promise<number>;
+    sinterstore: (...args: CommandArgs<typeof SInterStoreCommand>) => Promise<number>;
     /**
      * @see https://redis.io/commands/sismember
      */
@@ -4775,7 +4673,7 @@ declare class Redis {
     /**
      * @see https://redis.io/commands/smembers
      */
-    smembers: <TData extends unknown[] = string[]>(key: string) => Promise<TData>;
+    smembers: <TData extends unknown[] = string[]>(...args: CommandArgs<typeof SMembersCommand>) => Promise<TData>;
     /**
      * @see https://redis.io/commands/smove
      */
@@ -4783,11 +4681,11 @@ declare class Redis {
     /**
      * @see https://redis.io/commands/spop
      */
-    spop: <TData>(key: string, count?: number | undefined) => Promise<TData | null>;
+    spop: <TData>(...args: CommandArgs<typeof SPopCommand>) => Promise<TData | null>;
     /**
      * @see https://redis.io/commands/srandmember
      */
-    srandmember: <TData>(key: string, count?: number | undefined) => Promise<TData | null>;
+    srandmember: <TData>(...args: CommandArgs<typeof SRandMemberCommand>) => Promise<TData | null>;
     /**
      * @see https://redis.io/commands/srem
      */
@@ -4795,11 +4693,11 @@ declare class Redis {
     /**
      * @see https://redis.io/commands/sscan
      */
-    sscan: (key: string, cursor: string | number, opts?: ScanCommandOptions | undefined) => Promise<[string, (string | number)[]]>;
+    sscan: (...args: CommandArgs<typeof SScanCommand>) => Promise<[string, (string | number)[]]>;
     /**
      * @see https://redis.io/commands/strlen
      */
-    strlen: (key: string) => Promise<number>;
+    strlen: (...args: CommandArgs<typeof StrLenCommand>) => Promise<number>;
     /**
      * @see https://redis.io/commands/subscribe
      */
@@ -4807,11 +4705,11 @@ declare class Redis {
     /**
      * @see https://redis.io/commands/sunion
      */
-    sunion: (key: string, ...keys: string[]) => Promise<unknown[]>;
+    sunion: (...args: CommandArgs<typeof SUnionCommand>) => Promise<unknown[]>;
     /**
      * @see https://redis.io/commands/sunionstore
      */
-    sunionstore: (destination: string, key: string, ...keys: string[]) => Promise<number>;
+    sunionstore: (...args: CommandArgs<typeof SUnionStoreCommand>) => Promise<number>;
     /**
      * @see https://redis.io/commands/time
      */
@@ -4823,11 +4721,11 @@ declare class Redis {
     /**
      * @see https://redis.io/commands/ttl
      */
-    ttl: (key: string) => Promise<number>;
+    ttl: (...args: CommandArgs<typeof TtlCommand>) => Promise<number>;
     /**
      * @see https://redis.io/commands/type
      */
-    type: (key: string) => Promise<Type>;
+    type: (...args: CommandArgs<typeof TypeCommand>) => Promise<Type>;
     /**
      * @see https://redis.io/commands/unlink
      */
@@ -4835,68 +4733,27 @@ declare class Redis {
     /**
      * @see https://redis.io/commands/xadd
      */
-    xadd: (key: string, id: string, entries: Record<string, unknown>, opts?: {
-        nomkStream?: boolean;
-        trim?: ({
-            type: "MAXLEN" | "maxlen";
-            threshold: number;
-        } | {
-            type: "MINID" | "minid";
-            threshold: string;
-        }) & ({
-            comparison: "~";
-            limit?: number;
-        } | {
-            comparison: "=";
-            limit?: never;
-        });
-    } | undefined) => Promise<string>;
+    xadd: (...args: CommandArgs<typeof XAddCommand>) => Promise<string>;
     /**
      * @see https://redis.io/commands/xack
      */
-    xack: (key: string, group: string, id: string | string[]) => Promise<number>;
+    xack: (...args: CommandArgs<typeof XAckCommand>) => Promise<number>;
     /**
      * @see https://redis.io/commands/xackdel
      */
-    xackdel: (key: string, group: string, opts: "KEEPREF" | "keepref" | "DELREF" | "delref" | "ACKED" | "acked", ...ids: string[]) => Promise<number[]>;
+    xackdel: (...args: CommandArgs<typeof XAckDelCommand>) => Promise<number[]>;
     /**
      * @see https://redis.io/commands/xdel
      */
-    xdel: (key: string, ids: string | string[]) => Promise<number>;
+    xdel: (...args: CommandArgs<typeof XDelCommand>) => Promise<number>;
     /**
      * @see https://redis.io/commands/xdelex
      */
-    xdelex: (key: string, opts?: ("KEEPREF" | "keepref" | "DELREF" | "delref" | "ACKED" | "acked") | undefined, ...ids: string[]) => Promise<number[]>;
+    xdelex: (...args: CommandArgs<typeof XDelExCommand>) => Promise<number[]>;
     /**
      * @see https://redis.io/commands/xgroup
      */
-    xgroup: (key: string, opts: {
-        type: "CREATE";
-        group: string;
-        id: `$` | string;
-        options?: {
-            MKSTREAM?: boolean;
-            ENTRIESREAD?: number;
-        };
-    } | {
-        type: "CREATECONSUMER";
-        group: string;
-        consumer: string;
-    } | {
-        type: "DELCONSUMER";
-        group: string;
-        consumer: string;
-    } | {
-        type: "DESTROY";
-        group: string;
-    } | {
-        type: "SETID";
-        group: string;
-        id: `$` | string;
-        options?: {
-            ENTRIESREAD?: number;
-        };
-    }) => Promise<never>;
+    xgroup: (...args: CommandArgs<typeof XGroupCommand>) => Promise<never>;
     /**
      * @see https://redis.io/commands/xread
      */
@@ -4908,58 +4765,35 @@ declare class Redis {
     /**
      * @see https://redis.io/commands/xinfo
      */
-    xinfo: (key: string, options: {
-        type: "CONSUMERS";
-        group: string;
-    } | {
-        type: "GROUPS";
-    }) => Promise<unknown[]>;
+    xinfo: (...args: CommandArgs<typeof XInfoCommand>) => Promise<unknown[]>;
     /**
      * @see https://redis.io/commands/xlen
      */
-    xlen: (key: string) => Promise<number>;
+    xlen: (...args: CommandArgs<typeof XLenCommand>) => Promise<number>;
     /**
      * @see https://redis.io/commands/xpending
      */
-    xpending: (key: string, group: string, start: string, end: string, count: number, options?: {
-        idleTime?: number;
-        consumer?: string | string[];
-    } | undefined) => Promise<unknown[]>;
+    xpending: (...args: CommandArgs<typeof XPendingCommand>) => Promise<unknown[]>;
     /**
      * @see https://redis.io/commands/xclaim
      */
-    xclaim: (key: string, group: string, consumer: string, minIdleTime: number, id: string | string[], options?: {
-        idleMS?: number;
-        timeMS?: number;
-        retryCount?: number;
-        force?: boolean;
-        justId?: boolean;
-        lastId?: number;
-    } | undefined) => Promise<unknown[]>;
+    xclaim: (...args: CommandArgs<typeof XClaimCommand>) => Promise<unknown[]>;
     /**
      * @see https://redis.io/commands/xautoclaim
      */
-    xautoclaim: (key: string, group: string, consumer: string, minIdleTime: number, start: string, options?: {
-        count?: number;
-        justId?: boolean;
-    } | undefined) => Promise<unknown[]>;
+    xautoclaim: (...args: CommandArgs<typeof XAutoClaim>) => Promise<unknown[]>;
     /**
      * @see https://redis.io/commands/xtrim
      */
-    xtrim: (key: string, options: {
-        strategy: "MAXLEN" | "MINID";
-        exactness?: "~" | "=";
-        threshold: number | string;
-        limit?: number;
-    }) => Promise<number>;
+    xtrim: (...args: CommandArgs<typeof XTrimCommand>) => Promise<number>;
     /**
      * @see https://redis.io/commands/xrange
      */
-    xrange: (key: string, start: string, end: string, count?: number | undefined) => Promise<Record<string, Record<string, unknown>>>;
+    xrange: <TData extends Record<string, unknown>>(...args: CommandArgs<typeof XRangeCommand>) => Promise<Record<string, TData>>;
     /**
      * @see https://redis.io/commands/xrevrange
      */
-    xrevrange: (key: string, end: string, start: string, count?: number | undefined) => Promise<Record<string, Record<string, unknown>>>;
+    xrevrange: <TData extends Record<string, unknown>>(...args: CommandArgs<typeof XRevRangeCommand>) => Promise<Record<string, TData>>;
     /**
      * @see https://redis.io/commands/zadd
      */
@@ -4967,15 +4801,15 @@ declare class Redis {
     /**
      * @see https://redis.io/commands/zcard
      */
-    zcard: (key: string) => Promise<number>;
+    zcard: (...args: CommandArgs<typeof ZCardCommand>) => Promise<number>;
     /**
      * @see https://redis.io/commands/zcount
      */
-    zcount: (key: string, min: string | number, max: string | number) => Promise<number>;
+    zcount: (...args: CommandArgs<typeof ZCountCommand>) => Promise<number>;
     /**
      * @see https://redis.io/commands/zdiffstore
      */
-    zdiffstore: (destination: string, numkeys: number, ...keys: string[]) => Promise<number>;
+    zdiffstore: (...args: CommandArgs<typeof ZDiffStoreCommand>) => Promise<number>;
     /**
      * @see https://redis.io/commands/zincrby
      */
@@ -4983,23 +4817,23 @@ declare class Redis {
     /**
      * @see https://redis.io/commands/zinterstore
      */
-    zinterstore: (destination: string, numKeys: number, keys: string[], opts?: ZInterStoreCommandOptions | undefined) => Promise<number>;
+    zinterstore: (...args: CommandArgs<typeof ZInterStoreCommand>) => Promise<number>;
     /**
      * @see https://redis.io/commands/zlexcount
      */
-    zlexcount: (key: string, min: string, max: string) => Promise<number>;
+    zlexcount: (...args: CommandArgs<typeof ZLexCountCommand>) => Promise<number>;
     /**
      * @see https://redis.io/commands/zmscore
      */
-    zmscore: (key: string, members: unknown[]) => Promise<number[] | null>;
+    zmscore: (...args: CommandArgs<typeof ZMScoreCommand>) => Promise<number[] | null>;
     /**
      * @see https://redis.io/commands/zpopmax
      */
-    zpopmax: <TData>(key: string, count?: number | undefined) => Promise<TData[]>;
+    zpopmax: <TData>(...args: CommandArgs<typeof ZPopMaxCommand>) => Promise<TData[]>;
     /**
      * @see https://redis.io/commands/zpopmin
      */
-    zpopmin: <TData>(key: string, count?: number | undefined) => Promise<TData[]>;
+    zpopmin: <TData>(...args: CommandArgs<typeof ZPopMinCommand>) => Promise<TData[]>;
     /**
      * @see https://redis.io/commands/zrange
      */
@@ -5019,15 +4853,15 @@ declare class Redis {
     /**
      * @see https://redis.io/commands/zremrangebylex
      */
-    zremrangebylex: (key: string, min: string, max: string) => Promise<number>;
+    zremrangebylex: (...args: CommandArgs<typeof ZRemRangeByLexCommand>) => Promise<number>;
     /**
      * @see https://redis.io/commands/zremrangebyrank
      */
-    zremrangebyrank: (key: string, start: number, stop: number) => Promise<number>;
+    zremrangebyrank: (...args: CommandArgs<typeof ZRemRangeByRankCommand>) => Promise<number>;
     /**
      * @see https://redis.io/commands/zremrangebyscore
      */
-    zremrangebyscore: (key: string, min: number | `(${number}` | "-inf" | "+inf", max: number | `(${number}` | "-inf" | "+inf") => Promise<number>;
+    zremrangebyscore: (...args: CommandArgs<typeof ZRemRangeByScoreCommand>) => Promise<number>;
     /**
      * @see https://redis.io/commands/zrevrank
      */
@@ -5035,7 +4869,7 @@ declare class Redis {
     /**
      * @see https://redis.io/commands/zscan
      */
-    zscan: (key: string, cursor: string | number, opts?: ScanCommandOptions | undefined) => Promise<[string, (string | number)[]]>;
+    zscan: (...args: CommandArgs<typeof ZScanCommand>) => Promise<[string, (string | number)[]]>;
     /**
      * @see https://redis.io/commands/zscore
      */
@@ -5043,11 +4877,11 @@ declare class Redis {
     /**
      * @see https://redis.io/commands/zunion
      */
-    zunion: (numKeys: number, keys: string[], opts?: ZUnionCommandOptions | undefined) => Promise<any>;
+    zunion: (...args: CommandArgs<typeof ZUnionCommand>) => Promise<any>;
     /**
      * @see https://redis.io/commands/zunionstore
      */
-    zunionstore: (destination: string, numKeys: number, keys: string[], opts?: ZUnionStoreCommandOptions | undefined) => Promise<number>;
+    zunionstore: (...args: CommandArgs<typeof ZUnionStoreCommand>) => Promise<number>;
 }
 
 type UpstashErrorOptions = Pick<NonNullable<ConstructorParameters<typeof Error>[1]>, "cause">;
@@ -5074,18 +4908,4 @@ declare namespace error {
   export { error_UpstashError as UpstashError, error_UpstashJSONParseError as UpstashJSONParseError, error_UrlError as UrlError };
 }
 
-/**
- * @see https://redis.io/commands/zdiffstore
- */
-declare class ZDiffStoreCommand extends Command<number, number> {
-    constructor(cmd: [destination: string, numkeys: number, ...keys: string[]], opts?: CommandOptions<number, number>);
-}
-
-/**
- * @see https://redis.io/commands/zmscore
- */
-declare class ZMScoreCommand<TData> extends Command<string[] | null, number[] | null> {
-    constructor(cmd: [key: string, members: TData[]], opts?: CommandOptions<string[] | null, number[] | null>);
-}
-
-export { HPExpireCommand as $, AppendCommand as A, BitCountCommand as B, ClientSetInfoCommand as C, DBSizeCommand as D, EchoCommand as E, FlushAllCommand as F, GeoAddCommand as G, type HttpClientConfig as H, GeoPosCommand as I, GeoSearchCommand as J, GeoSearchStoreCommand as K, GetCommand as L, GetBitCommand as M, type NumericField as N, GetDelCommand as O, Pipeline as P, GetExCommand as Q, type RedisOptions as R, GetRangeCommand as S, GetSetCommand as T, type UpstashRequest as U, HDelCommand as V, HExistsCommand as W, HExpireCommand as X, HExpireAtCommand as Y, HExpireTimeCommand as Z, HTtlCommand as _, type NestedIndexSchema as a, PExpireAtCommand as a$, HPExpireAtCommand as a0, HPExpireTimeCommand as a1, HPTtlCommand as a2, HPersistCommand as a3, HGetCommand as a4, HGetAllCommand as a5, HGetDelCommand as a6, HGetExCommand as a7, HIncrByCommand as a8, HIncrByFloatCommand as a9, JsonNumIncrByCommand as aA, JsonNumMultByCommand as aB, JsonObjKeysCommand as aC, JsonObjLenCommand as aD, JsonRespCommand as aE, JsonSetCommand as aF, JsonStrAppendCommand as aG, JsonStrLenCommand as aH, JsonToggleCommand as aI, JsonTypeCommand as aJ, KeysCommand as aK, LIndexCommand as aL, LInsertCommand as aM, LLenCommand as aN, LMoveCommand as aO, LPopCommand as aP, LPushCommand as aQ, LPushXCommand as aR, LRangeCommand as aS, LRemCommand as aT, LSetCommand as aU, LTrimCommand as aV, MGetCommand as aW, MSetCommand as aX, MSetNXCommand as aY, PersistCommand as aZ, PExpireCommand as a_, HKeysCommand as aa, HLenCommand as ab, HMGetCommand as ac, HMSetCommand as ad, HRandFieldCommand as ae, HScanCommand as af, HSetCommand as ag, HSetExCommand as ah, HSetNXCommand as ai, HStrLenCommand as aj, HValsCommand as ak, IncrCommand as al, IncrByCommand as am, IncrByFloatCommand as an, JsonArrAppendCommand as ao, JsonArrIndexCommand as ap, JsonArrInsertCommand as aq, JsonArrLenCommand as ar, JsonArrPopCommand as as, JsonArrTrimCommand as at, JsonClearCommand as au, JsonDelCommand as av, JsonForgetCommand as aw, JsonGetCommand as ax, JsonMergeCommand as ay, JsonMGetCommand as az, type RequesterConfig as b, ZRankCommand as b$, PingCommand as b0, PSetEXCommand as b1, PTtlCommand as b2, PublishCommand as b3, RandomKeyCommand as b4, RenameCommand as b5, RenameNXCommand as b6, RPopCommand as b7, RPushCommand as b8, RPushXCommand as b9, SUnionCommand as bA, SUnionStoreCommand as bB, TimeCommand as bC, TouchCommand as bD, TtlCommand as bE, type Type as bF, TypeCommand as bG, UnlinkCommand as bH, XAddCommand as bI, XAckDelCommand as bJ, XDelExCommand as bK, XRangeCommand as bL, type ScoreMember as bM, type ZAddCommandOptions as bN, ZAddCommand as bO, ZCardCommand as bP, ZCountCommand as bQ, ZDiffStoreCommand as bR, ZIncrByCommand as bS, ZInterStoreCommand as bT, type ZInterStoreCommandOptions as bU, ZLexCountCommand as bV, ZMScoreCommand as bW, ZPopMaxCommand as bX, ZPopMinCommand as bY, ZRangeCommand as bZ, type ZRangeCommandOptions as b_, SAddCommand as ba, ScanCommand as bb, type ScanCommandOptions as bc, SCardCommand as bd, ScriptExistsCommand as be, ScriptFlushCommand as bf, ScriptLoadCommand as bg, SDiffCommand as bh, SDiffStoreCommand as bi, SetCommand as bj, type SetCommandOptions as bk, SetBitCommand as bl, SetExCommand as bm, SetNxCommand as bn, SetRangeCommand as bo, SInterCommand as bp, SInterStoreCommand as bq, SIsMemberCommand as br, SMembersCommand as bs, SMIsMemberCommand as bt, SMoveCommand as bu, SPopCommand as bv, SRandMemberCommand as bw, SRemCommand as bx, SScanCommand as by, StrLenCommand as bz, Redis as c, ZRemCommand as c0, ZRemRangeByLexCommand as c1, ZRemRangeByRankCommand as c2, ZRemRangeByScoreCommand as c3, ZRevRankCommand as c4, ZScanCommand as c5, ZScoreCommand as c6, ZUnionCommand as c7, type ZUnionCommandOptions as c8, ZUnionStoreCommand as c9, type ZUnionStoreCommandOptions as ca, SearchIndex as cb, type SearchIndexParameters as cc, type CreateIndexParameters as cd, type InferFilterFromSchema as ce, type FlatIndexSchema as cf, type PublicQueryResult as cg, type Requester as d, error as e, type UpstashResponse as f, BitOpCommand as g, BitPosCommand as h, type ClientSetInfoAttribute as i, CopyCommand as j, DecrCommand as k, DecrByCommand as l, DelCommand as m, EvalROCommand as n, EvalCommand as o, EvalshaROCommand as p, EvalshaCommand as q, ExistsCommand as r, ExpireCommand as s, type ExpireOption as t, ExpireAtCommand as u, FlushDBCommand as v, type GeoAddCommandOptions as w, type GeoMember as x, GeoDistCommand as y, GeoHashCommand as z };
+export { HMGetCommand as $, AppendCommand as A, BitCountCommand as B, type ClientSetInfoAttribute as C, DBSizeCommand as D, EchoCommand as E, FlushAllCommand as F, GeoAddCommand as G, type HttpClientConfig as H, GetCommand as I, GetDelCommand as J, GetExCommand as K, GetRangeCommand as L, GetSetCommand as M, HDelCommand as N, HExistsCommand as O, HExpireAtCommand as P, HExpireCommand as Q, Redis as R, HExpireTimeCommand as S, HGetAllCommand as T, HGetCommand as U, HGetDelCommand as V, HGetExCommand as W, HIncrByCommand as X, HIncrByFloatCommand as Y, HKeysCommand as Z, HLenCommand as _, type RedisOptions as a, RPushCommand as a$, HMSetCommand as a0, HPExpireAtCommand as a1, HPExpireCommand as a2, HPExpireTimeCommand as a3, HPTtlCommand as a4, HPersistCommand as a5, HRandFieldCommand as a6, HScanCommand as a7, HSetCommand as a8, HSetExCommand as a9, JsonStrLenCommand as aA, JsonToggleCommand as aB, JsonTypeCommand as aC, KeysCommand as aD, LIndexCommand as aE, LInsertCommand as aF, LLenCommand as aG, LMoveCommand as aH, LPopCommand as aI, LPushCommand as aJ, LPushXCommand as aK, LRangeCommand as aL, LRemCommand as aM, LSetCommand as aN, LTrimCommand as aO, MGetCommand as aP, MSetCommand as aQ, MSetNXCommand as aR, PExpireAtCommand as aS, PExpireCommand as aT, PSetEXCommand as aU, PTtlCommand as aV, PersistCommand as aW, PingCommand as aX, Pipeline as aY, PublishCommand as aZ, RPopCommand as a_, HSetNXCommand as aa, HStrLenCommand as ab, HTtlCommand as ac, HValsCommand as ad, IncrByCommand as ae, IncrByFloatCommand as af, IncrCommand as ag, JsonArrAppendCommand as ah, JsonArrIndexCommand as ai, JsonArrInsertCommand as aj, JsonArrLenCommand as ak, JsonArrPopCommand as al, JsonArrTrimCommand as am, JsonClearCommand as an, JsonDelCommand as ao, JsonForgetCommand as ap, JsonGetCommand as aq, JsonMGetCommand as ar, JsonMergeCommand as as, JsonNumIncrByCommand as at, JsonNumMultByCommand as au, JsonObjKeysCommand as av, JsonObjLenCommand as aw, JsonRespCommand as ax, JsonSetCommand as ay, JsonStrAppendCommand as az, type RequesterConfig as b, ZRemRangeByLexCommand as b$, RPushXCommand as b0, RandomKeyCommand as b1, RenameCommand as b2, RenameNXCommand as b3, type Requester as b4, SAddCommand as b5, SCardCommand as b6, SDiffCommand as b7, SDiffStoreCommand as b8, SInterCardCommand as b9, TouchCommand as bA, TtlCommand as bB, type Type as bC, TypeCommand as bD, UnlinkCommand as bE, type UpstashRequest as bF, type UpstashResponse as bG, XAckDelCommand as bH, XAddCommand as bI, XDelExCommand as bJ, XRangeCommand as bK, ZAddCommand as bL, type ZAddCommandOptions as bM, ZCardCommand as bN, ZCountCommand as bO, ZDiffStoreCommand as bP, ZIncrByCommand as bQ, ZInterStoreCommand as bR, type ZInterStoreCommandOptions as bS, ZLexCountCommand as bT, ZMScoreCommand as bU, ZPopMaxCommand as bV, ZPopMinCommand as bW, ZRangeCommand as bX, type ZRangeCommandOptions as bY, ZRankCommand as bZ, ZRemCommand as b_, SInterCommand as ba, SInterStoreCommand as bb, SIsMemberCommand as bc, SMIsMemberCommand as bd, SMembersCommand as be, SMoveCommand as bf, SPopCommand as bg, SRandMemberCommand as bh, SRemCommand as bi, SScanCommand as bj, SUnionCommand as bk, SUnionStoreCommand as bl, ScanCommand as bm, type ScanCommandOptions as bn, type ScoreMember as bo, ScriptExistsCommand as bp, ScriptFlushCommand as bq, ScriptLoadCommand as br, SetBitCommand as bs, SetCommand as bt, type SetCommandOptions as bu, SetExCommand as bv, SetNxCommand as bw, SetRangeCommand as bx, StrLenCommand as by, TimeCommand as bz, BitOpCommand as c, ZRemRangeByRankCommand as c0, ZRemRangeByScoreCommand as c1, ZRevRankCommand as c2, ZScanCommand as c3, ZScoreCommand as c4, ZUnionCommand as c5, type ZUnionCommandOptions as c6, ZUnionStoreCommand as c7, type ZUnionStoreCommandOptions as c8, error as c9, type NumericField as ca, type NestedIndexSchema as cb, type CreateIndexParameters as cc, type FlatIndexSchema as cd, type InferFilterFromSchema as ce, type PublicQueryResult as cf, SearchIndex as cg, type SearchIndexParameters as ch, BitPosCommand as d, ClientSetInfoCommand as e, CopyCommand as f, DecrByCommand as g, DecrCommand as h, DelCommand as i, EvalCommand as j, EvalROCommand as k, EvalshaCommand as l, EvalshaROCommand as m, ExistsCommand as n, ExpireAtCommand as o, ExpireCommand as p, type ExpireOption as q, FlushDBCommand as r, type GeoAddCommandOptions as s, GeoDistCommand as t, GeoHashCommand as u, type GeoMember as v, GeoPosCommand as w, GeoSearchCommand as x, GeoSearchStoreCommand as y, GetBitCommand as z };