@upstash/redis 1.36.0-rc.1 → 1.36.0-rc.3

package/{zmscore-BVyzI3wx.d.mts → zmscore-DQw_6S0p.d.mts}

@@ -326,7 +326,7 @@ type TextField = {
 };
 type NumericField = {
     type: "U64" | "I64" | "F64";
-    fast?: boolean;
+    fast: true;
 };
 type BoolField = {
     type: "BOOL";
@@ -356,47 +356,61 @@ type InferSchemaData<TSchema> = {
     [K in keyof TSchema]: TSchema[K] extends FieldType ? FieldValueType<TSchema[K]> : TSchema[K] extends DetailedField ? FieldValueType<ExtractFieldType<TSchema[K]>> : TSchema[K] extends NestedIndexSchema ? InferSchemaData<TSchema[K]> : never;
 };
 type QueryOptions<TSchema extends NestedIndexSchema | FlatIndexSchema> = {
+    filter: QueryFilter<TSchema>;
     /** Maximum number of results to return */
     limit?: number;
     /** Number of results to skip */
     offset?: number;
     /** Sort by field (requires FAST option on field) */
-    sortBy?: {
-        field: SchemaPaths<TSchema>;
-        direction?: "ASC" | "DESC";
-    };
-} & ({
-    noContent: true;
-} | {
-    noContent?: false;
+    orderBy?: {
+        [K in SchemaPaths<TSchema>]: {
+            [P in K]: "ASC" | "DESC";
+        };
+    }[SchemaPaths<TSchema>];
+    select?: Partial<{
+        [K in SchemaPaths<TSchema>]: true;
+    }>;
     highlight?: {
         fields: SchemaPaths<TSchema>[];
         preTag?: string;
         postTag?: string;
     };
-    /** Return only specific fields */
-    returnFields?: (SchemaPaths<TSchema> | "$")[];
-});
-type FieldValuePair<TSchema, TField extends string> = TField extends "$" ? {
-    $: InferSchemaData<TSchema>;
-} : TField extends SchemaPaths<TSchema> ? {
-    [K in TField]: GetFieldValueType<TSchema, TField>;
-} : never;
+};
+/**
+ * Converts dot notation paths to nested object structure type
+ * e.g. "content.title" | "content.author" becomes { content: { title: ..., author: ... } }
+ */
+type PathToNestedObject<TSchema, Path extends string, Value> = Path extends `${infer First}.${infer Rest}` ? {
+    [K in First]: PathToNestedObject<TSchema, Rest, Value>;
+} : {
+    [K in Path]: Value;
+};
+/**
+ * Merges intersection of objects into a single object type with proper nesting
+ */
+type DeepMerge<T> = T extends object ? {
+    [K in keyof T]: T[K] extends object ? DeepMerge<T[K]> : T[K];
+} : T;
+/**
+ * Build nested result type from selected paths
+ */
+type BuildNestedResult<TSchema, TFields> = DeepMerge<UnionToIntersection<{
+    [Path in keyof TFields & SchemaPaths<TSchema>]: PathToNestedObject<TSchema, Path & string, GetFieldValueType<TSchema, Path & string>>;
+}[keyof TFields & SchemaPaths<TSchema>]>>;
+type UnionToIntersection<U> = (U extends unknown ? (k: U) => void : never) extends (k: infer I) => void ? I : never;
 type QueryResult<TSchema extends NestedIndexSchema | FlatIndexSchema, TOptions extends QueryOptions<TSchema> | undefined = undefined> = TOptions extends {
-    noContent: true;
-} ? {
+    select: infer TFields;
+} ? {} extends TFields ? {
     key: string;
     score: string;
-} : TOptions extends {
-    returnFields: infer TFields extends readonly string[];
-} ? {
+} : {
     key: string;
     score: string;
-    fields: Array<FieldValuePair<TSchema, TFields[number]>>;
+    data: BuildNestedResult<TSchema, TFields>;
 } : {
     key: string;
     score: string;
-    fields: Array<FieldValuePair<TSchema, SchemaPaths<TSchema> | "$">>;
+    data: InferSchemaData<TSchema>;
 };
 type StringOperationMap<T extends string> = {
     $eq: T;
@@ -472,25 +486,25 @@ type QueryFilter<TSchema extends NestedIndexSchema | FlatIndexSchema> = QueryLea
         value: number;
     };
 };
-type QueryResponse<TSchema extends NestedIndexSchema | FlatIndexSchema, TOptions extends QueryOptions<TSchema> | undefined = undefined> = Array<QueryResult<TSchema, TOptions>>;
-type IndexDescription = {
-    indexName: string;
+type DescribeFieldInfo = {
+    type: FieldType;
+    noTokenize?: boolean;
+    noStem?: boolean;
+    fast?: boolean;
+};
+type IndexDescription<TSchema extends NestedIndexSchema | FlatIndexSchema> = {
+    name: string;
     dataType: "hash" | "string";
     prefixes: string[];
-    language?: string;
-    fields: Array<{
-        name: string;
-        type: FieldType;
-        noTokenize?: boolean;
-        noStem?: boolean;
-        fast?: boolean;
-    }>;
+    language?: Language;
+    schema: 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 CreateSearchIndexProps<TSchema extends NestedIndexSchema | FlatIndexSchema> = {
-    indexName: string;
+type createIndexProps<TSchema extends NestedIndexSchema | FlatIndexSchema> = {
+    name: string;
     prefix: string | string[];
-    language?: "english" | "turkish";
+    language?: Language;
     client: Requester;
 } & ({
     dataType: "string";
@@ -499,22 +513,26 @@ type CreateSearchIndexProps<TSchema extends NestedIndexSchema | FlatIndexSchema>
     dataType: "hash";
     schema: TSchema extends FlatIndexSchema ? TSchema : never;
 });
-type SearchIndexProps<TSchema extends NestedIndexSchema | FlatIndexSchema> = Pick<CreateSearchIndexProps<TSchema>, "indexName" | "client"> & {
-    schema?: CreateSearchIndexProps<TSchema>["schema"];
+type SearchIndexProps<TSchema extends NestedIndexSchema | FlatIndexSchema> = Pick<createIndexProps<TSchema>, "name" | "client"> & {
+    schema?: createIndexProps<TSchema>["schema"];
 };
-declare class SearchIndex<TSchema extends NestedIndexSchema | FlatIndexSchema, TProps extends SearchIndexProps<TSchema>> {
-    indexName: TProps["indexName"];
-    schema?: TSchema;
-    client: Requester;
-    constructor({ indexName, schema, client }: TProps);
+declare class SearchIndex<TSchema extends NestedIndexSchema | FlatIndexSchema> {
+    readonly name: SearchIndexProps<TSchema>["name"];
+    readonly schema?: TSchema;
+    private client;
+    constructor({ name, schema, client }: SearchIndexProps<TSchema>);
     waitIndexing(): Promise<string>;
-    describe(): Promise<IndexDescription>;
-    query<TOptions extends QueryOptions<TSchema>>(filter: QueryFilter<TSchema>, options?: TOptions): Promise<QueryResponse<TSchema, TOptions>>;
-    count(filter: QueryFilter<TSchema>): Promise<number>;
+    describe(): Promise<IndexDescription<TSchema>>;
+    query<TOptions extends QueryOptions<TSchema>>(options: TOptions): Promise<QueryResult<TSchema, TOptions>[]>;
+    count({ filter }: {
+        filter: QueryFilter<TSchema>;
+    }): Promise<{
+        count: number;
+    }>;
     drop(): Promise<string>;
 }
-declare function createSearchIndex<TSchema extends NestedIndexSchema | FlatIndexSchema>(props: CreateSearchIndexProps<TSchema>): Promise<SearchIndex<TSchema, SearchIndexProps<TSchema>>>;
-declare function getSearchIndex<TSchema extends NestedIndexSchema | FlatIndexSchema>(props: SearchIndexProps<TSchema>): SearchIndex<TSchema, SearchIndexProps<TSchema>>;
+declare function createIndex<TSchema extends NestedIndexSchema | FlatIndexSchema>(props: createIndexProps<TSchema>): Promise<SearchIndex<TSchema>>;
+declare function index<TSchema extends NestedIndexSchema | FlatIndexSchema>(client: Requester, name: SearchIndexProps<TSchema>["name"], schema?: SearchIndexProps<TSchema>["schema"]): SearchIndex<TSchema>;
 
 /**
  * @see https://redis.io/commands/append
@@ -3353,8 +3371,10 @@ declare class Redis {
     createScript<TResult = unknown, TReadonly extends boolean = false>(script: string, opts?: {
         readonly?: TReadonly;
     }): TReadonly extends true ? ScriptRO<TResult> : Script<TResult>;
-    createSearchIndex: <TSchema extends NestedIndexSchema | FlatIndexSchema>(props: Omit<CreateSearchIndexProps<TSchema>, "client">) => Promise<SearchIndex<TSchema, SearchIndexProps<TSchema>>>;
-    getSearchIndex: <TSchema extends NestedIndexSchema | FlatIndexSchema>(props: Omit<SearchIndexProps<TSchema>, "client">) => SearchIndex<TSchema, SearchIndexProps<TSchema>>;
+    get search(): {
+        createIndex: <TSchema extends NestedIndexSchema | FlatIndexSchema>(props: Omit<createIndexProps<TSchema>, "client">) => Promise<SearchIndex<TSchema>>;
+        index: <TSchema extends NestedIndexSchema | FlatIndexSchema>(name: string, schema?: TSchema extends NestedIndexSchema ? TSchema : never) => SearchIndex<TSchema>;
+    };
     /**
      * Create a new pipeline that allows you to send requests in bulk.
      *
@@ -4260,4 +4280,4 @@ declare class ZMScoreCommand<TData> extends Command<string[] | null, number[] |
     constructor(cmd: [key: string, members: TData[]], opts?: CommandOptions<string[] | null, number[] | null>);
 }
 
-export { HPTtlCommand as $, AppendCommand as A, BitCountCommand as B, CopyCommand as C, DBSizeCommand as D, EchoCommand as E, FlushAllCommand as F, GeoAddCommand as G, type HttpClientConfig as H, GetCommand as I, GetBitCommand as J, GetDelCommand as K, GetExCommand as L, GetRangeCommand as M, type NestedIndexSchema as N, GetSetCommand as O, Pipeline as P, HDelCommand as Q, type RedisOptions as R, HExistsCommand as S, HExpireCommand as T, type UpstashRequest as U, HExpireAtCommand as V, HExpireTimeCommand as W, HTtlCommand as X, HPExpireCommand as Y, HPExpireAtCommand as Z, HPExpireTimeCommand as _, type RequesterConfig as a, RenameCommand as a$, HPersistCommand as a0, HGetCommand as a1, HGetAllCommand as a2, HIncrByCommand as a3, HIncrByFloatCommand as a4, HKeysCommand as a5, HLenCommand as a6, HMGetCommand as a7, HMSetCommand as a8, HRandFieldCommand as a9, JsonStrAppendCommand as aA, JsonStrLenCommand as aB, JsonToggleCommand as aC, JsonTypeCommand as aD, KeysCommand as aE, LIndexCommand as aF, LInsertCommand as aG, LLenCommand as aH, LMoveCommand as aI, LPopCommand as aJ, LPushCommand as aK, LPushXCommand as aL, LRangeCommand as aM, LRemCommand as aN, LSetCommand as aO, LTrimCommand as aP, MGetCommand as aQ, MSetCommand as aR, MSetNXCommand as aS, PersistCommand as aT, PExpireCommand as aU, PExpireAtCommand as aV, PingCommand as aW, PSetEXCommand as aX, PTtlCommand as aY, PublishCommand as aZ, RandomKeyCommand as a_, HScanCommand as aa, HSetCommand as ab, HSetNXCommand as ac, HStrLenCommand as ad, HValsCommand as ae, IncrCommand as af, IncrByCommand as ag, IncrByFloatCommand as ah, JsonArrAppendCommand as ai, JsonArrIndexCommand as aj, JsonArrInsertCommand as ak, JsonArrLenCommand as al, JsonArrPopCommand as am, JsonArrTrimCommand as an, JsonClearCommand as ao, JsonDelCommand as ap, JsonForgetCommand as aq, JsonGetCommand as ar, JsonMergeCommand as as, JsonMGetCommand as at, JsonNumIncrByCommand as au, JsonNumMultByCommand as av, JsonObjKeysCommand as aw, JsonObjLenCommand as ax, JsonRespCommand as ay, JsonSetCommand as az, Redis as b, ZUnionCommand as b$, RenameNXCommand as b0, RPopCommand as b1, RPushCommand as b2, RPushXCommand as b3, SAddCommand as b4, ScanCommand as b5, type ScanCommandOptions as b6, SCardCommand as b7, ScriptExistsCommand as b8, ScriptFlushCommand as b9, TypeCommand as bA, UnlinkCommand as bB, XAddCommand as bC, XRangeCommand as bD, type ScoreMember as bE, type ZAddCommandOptions as bF, ZAddCommand as bG, ZCardCommand as bH, ZCountCommand as bI, ZDiffStoreCommand as bJ, ZIncrByCommand as bK, ZInterStoreCommand as bL, type ZInterStoreCommandOptions as bM, ZLexCountCommand as bN, ZMScoreCommand as bO, ZPopMaxCommand as bP, ZPopMinCommand as bQ, ZRangeCommand as bR, type ZRangeCommandOptions as bS, ZRankCommand as bT, ZRemCommand as bU, ZRemRangeByLexCommand as bV, ZRemRangeByRankCommand as bW, ZRemRangeByScoreCommand as bX, ZRevRankCommand as bY, ZScanCommand as bZ, ZScoreCommand as b_, ScriptLoadCommand as ba, SDiffCommand as bb, SDiffStoreCommand as bc, SetCommand as bd, type SetCommandOptions as be, SetBitCommand as bf, SetExCommand as bg, SetNxCommand as bh, SetRangeCommand as bi, SInterCommand as bj, SInterStoreCommand as bk, SIsMemberCommand as bl, SMembersCommand as bm, SMIsMemberCommand as bn, SMoveCommand as bo, SPopCommand as bp, SRandMemberCommand as bq, SRemCommand as br, SScanCommand as bs, StrLenCommand as bt, SUnionCommand as bu, SUnionStoreCommand as bv, TimeCommand as bw, TouchCommand as bx, TtlCommand as by, type Type as bz, type Requester as c, type ZUnionCommandOptions as c0, ZUnionStoreCommand as c1, type ZUnionStoreCommandOptions as c2, createSearchIndex as c3, getSearchIndex as c4, type SearchIndexProps as c5, type CreateSearchIndexProps as c6, type FlatIndexSchema as c7, type UpstashResponse as d, error as e, BitOpCommand as f, BitPosCommand as g, DecrCommand as h, DecrByCommand as i, DelCommand as j, EvalROCommand as k, EvalCommand as l, EvalshaROCommand as m, EvalshaCommand as n, ExistsCommand as o, ExpireCommand as p, type ExpireOption as q, ExpireAtCommand as r, FlushDBCommand as s, type GeoAddCommandOptions as t, type GeoMember as u, GeoDistCommand as v, GeoHashCommand as w, GeoPosCommand as x, GeoSearchCommand as y, GeoSearchStoreCommand as z };
+export { HPExpireTimeCommand as $, AppendCommand as A, BitCountCommand as B, CopyCommand as C, DBSizeCommand as D, EchoCommand as E, FlushAllCommand as F, GeoAddCommand as G, type HttpClientConfig as H, GeoSearchStoreCommand as I, GetCommand as J, GetBitCommand as K, GetDelCommand as L, GetExCommand as M, type NumericField as N, GetRangeCommand as O, Pipeline as P, GetSetCommand as Q, type RedisOptions as R, HDelCommand as S, HExistsCommand as T, type UpstashRequest as U, HExpireCommand as V, HExpireAtCommand as W, HExpireTimeCommand as X, HTtlCommand as Y, HPExpireCommand as Z, HPExpireAtCommand as _, type NestedIndexSchema as a, RandomKeyCommand as a$, HPTtlCommand as a0, HPersistCommand as a1, HGetCommand as a2, HGetAllCommand as a3, HIncrByCommand as a4, HIncrByFloatCommand as a5, HKeysCommand as a6, HLenCommand as a7, HMGetCommand as a8, HMSetCommand as a9, JsonSetCommand as aA, JsonStrAppendCommand as aB, JsonStrLenCommand as aC, JsonToggleCommand as aD, JsonTypeCommand as aE, KeysCommand as aF, LIndexCommand as aG, LInsertCommand as aH, LLenCommand as aI, LMoveCommand as aJ, LPopCommand as aK, LPushCommand as aL, LPushXCommand as aM, LRangeCommand as aN, LRemCommand as aO, LSetCommand as aP, LTrimCommand as aQ, MGetCommand as aR, MSetCommand as aS, MSetNXCommand as aT, PersistCommand as aU, PExpireCommand as aV, PExpireAtCommand as aW, PingCommand as aX, PSetEXCommand as aY, PTtlCommand as aZ, PublishCommand as a_, HRandFieldCommand as aa, HScanCommand as ab, HSetCommand as ac, HSetNXCommand as ad, HStrLenCommand as ae, HValsCommand as af, IncrCommand as ag, IncrByCommand as ah, IncrByFloatCommand as ai, JsonArrAppendCommand as aj, JsonArrIndexCommand as ak, JsonArrInsertCommand as al, JsonArrLenCommand as am, JsonArrPopCommand as an, JsonArrTrimCommand as ao, JsonClearCommand as ap, JsonDelCommand as aq, JsonForgetCommand as ar, JsonGetCommand as as, JsonMergeCommand as at, JsonMGetCommand as au, JsonNumIncrByCommand as av, JsonNumMultByCommand as aw, JsonObjKeysCommand as ax, JsonObjLenCommand as ay, JsonRespCommand as az, type RequesterConfig as b, ZScoreCommand as b$, RenameCommand as b0, RenameNXCommand as b1, RPopCommand as b2, RPushCommand as b3, RPushXCommand as b4, SAddCommand as b5, ScanCommand as b6, type ScanCommandOptions as b7, SCardCommand as b8, ScriptExistsCommand as b9, type Type as bA, TypeCommand as bB, UnlinkCommand as bC, XAddCommand as bD, XRangeCommand as bE, type ScoreMember as bF, type ZAddCommandOptions as bG, ZAddCommand as bH, ZCardCommand as bI, ZCountCommand as bJ, ZDiffStoreCommand as bK, ZIncrByCommand as bL, ZInterStoreCommand as bM, type ZInterStoreCommandOptions as bN, ZLexCountCommand as bO, ZMScoreCommand as bP, ZPopMaxCommand as bQ, ZPopMinCommand as bR, ZRangeCommand as bS, type ZRangeCommandOptions as bT, ZRankCommand as bU, ZRemCommand as bV, ZRemRangeByLexCommand as bW, ZRemRangeByRankCommand as bX, ZRemRangeByScoreCommand as bY, ZRevRankCommand as bZ, ZScanCommand as b_, ScriptFlushCommand as ba, ScriptLoadCommand as bb, SDiffCommand as bc, SDiffStoreCommand as bd, SetCommand as be, type SetCommandOptions as bf, SetBitCommand as bg, SetExCommand as bh, SetNxCommand as bi, SetRangeCommand as bj, SInterCommand as bk, SInterStoreCommand as bl, SIsMemberCommand as bm, SMembersCommand as bn, SMIsMemberCommand as bo, SMoveCommand as bp, SPopCommand as bq, SRandMemberCommand as br, SRemCommand as bs, SScanCommand as bt, StrLenCommand as bu, SUnionCommand as bv, SUnionStoreCommand as bw, TimeCommand as bx, TouchCommand as by, TtlCommand as bz, Redis as c, ZUnionCommand as c0, type ZUnionCommandOptions as c1, ZUnionStoreCommand as c2, type ZUnionStoreCommandOptions as c3, createIndex as c4, index as c5, type SearchIndexProps as c6, type createIndexProps as c7, type FlatIndexSchema as c8, type Requester as d, error as e, type UpstashResponse as f, BitOpCommand as g, BitPosCommand as h, DecrCommand as i, DecrByCommand as j, DelCommand as k, EvalROCommand as l, EvalCommand as m, EvalshaROCommand as n, EvalshaCommand as o, ExistsCommand as p, ExpireCommand as q, type ExpireOption as r, ExpireAtCommand as s, FlushDBCommand as t, type GeoAddCommandOptions as u, type GeoMember as v, GeoDistCommand as w, GeoHashCommand as x, GeoPosCommand as y, GeoSearchCommand as z };

package/{zmscore-BVyzI3wx.d.ts → zmscore-DQw_6S0p.d.ts}

@@ -326,7 +326,7 @@ type TextField = {
 };
 type NumericField = {
     type: "U64" | "I64" | "F64";
-    fast?: boolean;
+    fast: true;
 };
 type BoolField = {
     type: "BOOL";
@@ -356,47 +356,61 @@ type InferSchemaData<TSchema> = {
     [K in keyof TSchema]: TSchema[K] extends FieldType ? FieldValueType<TSchema[K]> : TSchema[K] extends DetailedField ? FieldValueType<ExtractFieldType<TSchema[K]>> : TSchema[K] extends NestedIndexSchema ? InferSchemaData<TSchema[K]> : never;
 };
 type QueryOptions<TSchema extends NestedIndexSchema | FlatIndexSchema> = {
+    filter: QueryFilter<TSchema>;
     /** Maximum number of results to return */
     limit?: number;
     /** Number of results to skip */
     offset?: number;
     /** Sort by field (requires FAST option on field) */
-    sortBy?: {
-        field: SchemaPaths<TSchema>;
-        direction?: "ASC" | "DESC";
-    };
-} & ({
-    noContent: true;
-} | {
-    noContent?: false;
+    orderBy?: {
+        [K in SchemaPaths<TSchema>]: {
+            [P in K]: "ASC" | "DESC";
+        };
+    }[SchemaPaths<TSchema>];
+    select?: Partial<{
+        [K in SchemaPaths<TSchema>]: true;
+    }>;
     highlight?: {
         fields: SchemaPaths<TSchema>[];
         preTag?: string;
         postTag?: string;
     };
-    /** Return only specific fields */
-    returnFields?: (SchemaPaths<TSchema> | "$")[];
-});
-type FieldValuePair<TSchema, TField extends string> = TField extends "$" ? {
-    $: InferSchemaData<TSchema>;
-} : TField extends SchemaPaths<TSchema> ? {
-    [K in TField]: GetFieldValueType<TSchema, TField>;
-} : never;
+};
+/**
+ * Converts dot notation paths to nested object structure type
+ * e.g. "content.title" | "content.author" becomes { content: { title: ..., author: ... } }
+ */
+type PathToNestedObject<TSchema, Path extends string, Value> = Path extends `${infer First}.${infer Rest}` ? {
+    [K in First]: PathToNestedObject<TSchema, Rest, Value>;
+} : {
+    [K in Path]: Value;
+};
+/**
+ * Merges intersection of objects into a single object type with proper nesting
+ */
+type DeepMerge<T> = T extends object ? {
+    [K in keyof T]: T[K] extends object ? DeepMerge<T[K]> : T[K];
+} : T;
+/**
+ * Build nested result type from selected paths
+ */
+type BuildNestedResult<TSchema, TFields> = DeepMerge<UnionToIntersection<{
+    [Path in keyof TFields & SchemaPaths<TSchema>]: PathToNestedObject<TSchema, Path & string, GetFieldValueType<TSchema, Path & string>>;
+}[keyof TFields & SchemaPaths<TSchema>]>>;
+type UnionToIntersection<U> = (U extends unknown ? (k: U) => void : never) extends (k: infer I) => void ? I : never;
 type QueryResult<TSchema extends NestedIndexSchema | FlatIndexSchema, TOptions extends QueryOptions<TSchema> | undefined = undefined> = TOptions extends {
-    noContent: true;
-} ? {
+    select: infer TFields;
+} ? {} extends TFields ? {
     key: string;
     score: string;
-} : TOptions extends {
-    returnFields: infer TFields extends readonly string[];
-} ? {
+} : {
     key: string;
     score: string;
-    fields: Array<FieldValuePair<TSchema, TFields[number]>>;
+    data: BuildNestedResult<TSchema, TFields>;
 } : {
     key: string;
     score: string;
-    fields: Array<FieldValuePair<TSchema, SchemaPaths<TSchema> | "$">>;
+    data: InferSchemaData<TSchema>;
 };
 type StringOperationMap<T extends string> = {
     $eq: T;
@@ -472,25 +486,25 @@ type QueryFilter<TSchema extends NestedIndexSchema | FlatIndexSchema> = QueryLea
         value: number;
     };
 };
-type QueryResponse<TSchema extends NestedIndexSchema | FlatIndexSchema, TOptions extends QueryOptions<TSchema> | undefined = undefined> = Array<QueryResult<TSchema, TOptions>>;
-type IndexDescription = {
-    indexName: string;
+type DescribeFieldInfo = {
+    type: FieldType;
+    noTokenize?: boolean;
+    noStem?: boolean;
+    fast?: boolean;
+};
+type IndexDescription<TSchema extends NestedIndexSchema | FlatIndexSchema> = {
+    name: string;
     dataType: "hash" | "string";
     prefixes: string[];
-    language?: string;
-    fields: Array<{
-        name: string;
-        type: FieldType;
-        noTokenize?: boolean;
-        noStem?: boolean;
-        fast?: boolean;
-    }>;
+    language?: Language;
+    schema: 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 CreateSearchIndexProps<TSchema extends NestedIndexSchema | FlatIndexSchema> = {
-    indexName: string;
+type createIndexProps<TSchema extends NestedIndexSchema | FlatIndexSchema> = {
+    name: string;
     prefix: string | string[];
-    language?: "english" | "turkish";
+    language?: Language;
     client: Requester;
 } & ({
     dataType: "string";
@@ -499,22 +513,26 @@ type CreateSearchIndexProps<TSchema extends NestedIndexSchema | FlatIndexSchema>
     dataType: "hash";
     schema: TSchema extends FlatIndexSchema ? TSchema : never;
 });
-type SearchIndexProps<TSchema extends NestedIndexSchema | FlatIndexSchema> = Pick<CreateSearchIndexProps<TSchema>, "indexName" | "client"> & {
-    schema?: CreateSearchIndexProps<TSchema>["schema"];
+type SearchIndexProps<TSchema extends NestedIndexSchema | FlatIndexSchema> = Pick<createIndexProps<TSchema>, "name" | "client"> & {
+    schema?: createIndexProps<TSchema>["schema"];
 };
-declare class SearchIndex<TSchema extends NestedIndexSchema | FlatIndexSchema, TProps extends SearchIndexProps<TSchema>> {
-    indexName: TProps["indexName"];
-    schema?: TSchema;
-    client: Requester;
-    constructor({ indexName, schema, client }: TProps);
+declare class SearchIndex<TSchema extends NestedIndexSchema | FlatIndexSchema> {
+    readonly name: SearchIndexProps<TSchema>["name"];
+    readonly schema?: TSchema;
+    private client;
+    constructor({ name, schema, client }: SearchIndexProps<TSchema>);
     waitIndexing(): Promise<string>;
-    describe(): Promise<IndexDescription>;
-    query<TOptions extends QueryOptions<TSchema>>(filter: QueryFilter<TSchema>, options?: TOptions): Promise<QueryResponse<TSchema, TOptions>>;
-    count(filter: QueryFilter<TSchema>): Promise<number>;
+    describe(): Promise<IndexDescription<TSchema>>;
+    query<TOptions extends QueryOptions<TSchema>>(options: TOptions): Promise<QueryResult<TSchema, TOptions>[]>;
+    count({ filter }: {
+        filter: QueryFilter<TSchema>;
+    }): Promise<{
+        count: number;
+    }>;
     drop(): Promise<string>;
 }
-declare function createSearchIndex<TSchema extends NestedIndexSchema | FlatIndexSchema>(props: CreateSearchIndexProps<TSchema>): Promise<SearchIndex<TSchema, SearchIndexProps<TSchema>>>;
-declare function getSearchIndex<TSchema extends NestedIndexSchema | FlatIndexSchema>(props: SearchIndexProps<TSchema>): SearchIndex<TSchema, SearchIndexProps<TSchema>>;
+declare function createIndex<TSchema extends NestedIndexSchema | FlatIndexSchema>(props: createIndexProps<TSchema>): Promise<SearchIndex<TSchema>>;
+declare function index<TSchema extends NestedIndexSchema | FlatIndexSchema>(client: Requester, name: SearchIndexProps<TSchema>["name"], schema?: SearchIndexProps<TSchema>["schema"]): SearchIndex<TSchema>;
 
 /**
  * @see https://redis.io/commands/append
@@ -3353,8 +3371,10 @@ declare class Redis {
     createScript<TResult = unknown, TReadonly extends boolean = false>(script: string, opts?: {
         readonly?: TReadonly;
     }): TReadonly extends true ? ScriptRO<TResult> : Script<TResult>;
-    createSearchIndex: <TSchema extends NestedIndexSchema | FlatIndexSchema>(props: Omit<CreateSearchIndexProps<TSchema>, "client">) => Promise<SearchIndex<TSchema, SearchIndexProps<TSchema>>>;
-    getSearchIndex: <TSchema extends NestedIndexSchema | FlatIndexSchema>(props: Omit<SearchIndexProps<TSchema>, "client">) => SearchIndex<TSchema, SearchIndexProps<TSchema>>;
+    get search(): {
+        createIndex: <TSchema extends NestedIndexSchema | FlatIndexSchema>(props: Omit<createIndexProps<TSchema>, "client">) => Promise<SearchIndex<TSchema>>;
+        index: <TSchema extends NestedIndexSchema | FlatIndexSchema>(name: string, schema?: TSchema extends NestedIndexSchema ? TSchema : never) => SearchIndex<TSchema>;
+    };
     /**
      * Create a new pipeline that allows you to send requests in bulk.
      *
@@ -4260,4 +4280,4 @@ declare class ZMScoreCommand<TData> extends Command<string[] | null, number[] |
     constructor(cmd: [key: string, members: TData[]], opts?: CommandOptions<string[] | null, number[] | null>);
 }
 
-export { HPTtlCommand as $, AppendCommand as A, BitCountCommand as B, CopyCommand as C, DBSizeCommand as D, EchoCommand as E, FlushAllCommand as F, GeoAddCommand as G, type HttpClientConfig as H, GetCommand as I, GetBitCommand as J, GetDelCommand as K, GetExCommand as L, GetRangeCommand as M, type NestedIndexSchema as N, GetSetCommand as O, Pipeline as P, HDelCommand as Q, type RedisOptions as R, HExistsCommand as S, HExpireCommand as T, type UpstashRequest as U, HExpireAtCommand as V, HExpireTimeCommand as W, HTtlCommand as X, HPExpireCommand as Y, HPExpireAtCommand as Z, HPExpireTimeCommand as _, type RequesterConfig as a, RenameCommand as a$, HPersistCommand as a0, HGetCommand as a1, HGetAllCommand as a2, HIncrByCommand as a3, HIncrByFloatCommand as a4, HKeysCommand as a5, HLenCommand as a6, HMGetCommand as a7, HMSetCommand as a8, HRandFieldCommand as a9, JsonStrAppendCommand as aA, JsonStrLenCommand as aB, JsonToggleCommand as aC, JsonTypeCommand as aD, KeysCommand as aE, LIndexCommand as aF, LInsertCommand as aG, LLenCommand as aH, LMoveCommand as aI, LPopCommand as aJ, LPushCommand as aK, LPushXCommand as aL, LRangeCommand as aM, LRemCommand as aN, LSetCommand as aO, LTrimCommand as aP, MGetCommand as aQ, MSetCommand as aR, MSetNXCommand as aS, PersistCommand as aT, PExpireCommand as aU, PExpireAtCommand as aV, PingCommand as aW, PSetEXCommand as aX, PTtlCommand as aY, PublishCommand as aZ, RandomKeyCommand as a_, HScanCommand as aa, HSetCommand as ab, HSetNXCommand as ac, HStrLenCommand as ad, HValsCommand as ae, IncrCommand as af, IncrByCommand as ag, IncrByFloatCommand as ah, JsonArrAppendCommand as ai, JsonArrIndexCommand as aj, JsonArrInsertCommand as ak, JsonArrLenCommand as al, JsonArrPopCommand as am, JsonArrTrimCommand as an, JsonClearCommand as ao, JsonDelCommand as ap, JsonForgetCommand as aq, JsonGetCommand as ar, JsonMergeCommand as as, JsonMGetCommand as at, JsonNumIncrByCommand as au, JsonNumMultByCommand as av, JsonObjKeysCommand as aw, JsonObjLenCommand as ax, JsonRespCommand as ay, JsonSetCommand as az, Redis as b, ZUnionCommand as b$, RenameNXCommand as b0, RPopCommand as b1, RPushCommand as b2, RPushXCommand as b3, SAddCommand as b4, ScanCommand as b5, type ScanCommandOptions as b6, SCardCommand as b7, ScriptExistsCommand as b8, ScriptFlushCommand as b9, TypeCommand as bA, UnlinkCommand as bB, XAddCommand as bC, XRangeCommand as bD, type ScoreMember as bE, type ZAddCommandOptions as bF, ZAddCommand as bG, ZCardCommand as bH, ZCountCommand as bI, ZDiffStoreCommand as bJ, ZIncrByCommand as bK, ZInterStoreCommand as bL, type ZInterStoreCommandOptions as bM, ZLexCountCommand as bN, ZMScoreCommand as bO, ZPopMaxCommand as bP, ZPopMinCommand as bQ, ZRangeCommand as bR, type ZRangeCommandOptions as bS, ZRankCommand as bT, ZRemCommand as bU, ZRemRangeByLexCommand as bV, ZRemRangeByRankCommand as bW, ZRemRangeByScoreCommand as bX, ZRevRankCommand as bY, ZScanCommand as bZ, ZScoreCommand as b_, ScriptLoadCommand as ba, SDiffCommand as bb, SDiffStoreCommand as bc, SetCommand as bd, type SetCommandOptions as be, SetBitCommand as bf, SetExCommand as bg, SetNxCommand as bh, SetRangeCommand as bi, SInterCommand as bj, SInterStoreCommand as bk, SIsMemberCommand as bl, SMembersCommand as bm, SMIsMemberCommand as bn, SMoveCommand as bo, SPopCommand as bp, SRandMemberCommand as bq, SRemCommand as br, SScanCommand as bs, StrLenCommand as bt, SUnionCommand as bu, SUnionStoreCommand as bv, TimeCommand as bw, TouchCommand as bx, TtlCommand as by, type Type as bz, type Requester as c, type ZUnionCommandOptions as c0, ZUnionStoreCommand as c1, type ZUnionStoreCommandOptions as c2, createSearchIndex as c3, getSearchIndex as c4, type SearchIndexProps as c5, type CreateSearchIndexProps as c6, type FlatIndexSchema as c7, type UpstashResponse as d, error as e, BitOpCommand as f, BitPosCommand as g, DecrCommand as h, DecrByCommand as i, DelCommand as j, EvalROCommand as k, EvalCommand as l, EvalshaROCommand as m, EvalshaCommand as n, ExistsCommand as o, ExpireCommand as p, type ExpireOption as q, ExpireAtCommand as r, FlushDBCommand as s, type GeoAddCommandOptions as t, type GeoMember as u, GeoDistCommand as v, GeoHashCommand as w, GeoPosCommand as x, GeoSearchCommand as y, GeoSearchStoreCommand as z };
+export { HPExpireTimeCommand as $, AppendCommand as A, BitCountCommand as B, CopyCommand as C, DBSizeCommand as D, EchoCommand as E, FlushAllCommand as F, GeoAddCommand as G, type HttpClientConfig as H, GeoSearchStoreCommand as I, GetCommand as J, GetBitCommand as K, GetDelCommand as L, GetExCommand as M, type NumericField as N, GetRangeCommand as O, Pipeline as P, GetSetCommand as Q, type RedisOptions as R, HDelCommand as S, HExistsCommand as T, type UpstashRequest as U, HExpireCommand as V, HExpireAtCommand as W, HExpireTimeCommand as X, HTtlCommand as Y, HPExpireCommand as Z, HPExpireAtCommand as _, type NestedIndexSchema as a, RandomKeyCommand as a$, HPTtlCommand as a0, HPersistCommand as a1, HGetCommand as a2, HGetAllCommand as a3, HIncrByCommand as a4, HIncrByFloatCommand as a5, HKeysCommand as a6, HLenCommand as a7, HMGetCommand as a8, HMSetCommand as a9, JsonSetCommand as aA, JsonStrAppendCommand as aB, JsonStrLenCommand as aC, JsonToggleCommand as aD, JsonTypeCommand as aE, KeysCommand as aF, LIndexCommand as aG, LInsertCommand as aH, LLenCommand as aI, LMoveCommand as aJ, LPopCommand as aK, LPushCommand as aL, LPushXCommand as aM, LRangeCommand as aN, LRemCommand as aO, LSetCommand as aP, LTrimCommand as aQ, MGetCommand as aR, MSetCommand as aS, MSetNXCommand as aT, PersistCommand as aU, PExpireCommand as aV, PExpireAtCommand as aW, PingCommand as aX, PSetEXCommand as aY, PTtlCommand as aZ, PublishCommand as a_, HRandFieldCommand as aa, HScanCommand as ab, HSetCommand as ac, HSetNXCommand as ad, HStrLenCommand as ae, HValsCommand as af, IncrCommand as ag, IncrByCommand as ah, IncrByFloatCommand as ai, JsonArrAppendCommand as aj, JsonArrIndexCommand as ak, JsonArrInsertCommand as al, JsonArrLenCommand as am, JsonArrPopCommand as an, JsonArrTrimCommand as ao, JsonClearCommand as ap, JsonDelCommand as aq, JsonForgetCommand as ar, JsonGetCommand as as, JsonMergeCommand as at, JsonMGetCommand as au, JsonNumIncrByCommand as av, JsonNumMultByCommand as aw, JsonObjKeysCommand as ax, JsonObjLenCommand as ay, JsonRespCommand as az, type RequesterConfig as b, ZScoreCommand as b$, RenameCommand as b0, RenameNXCommand as b1, RPopCommand as b2, RPushCommand as b3, RPushXCommand as b4, SAddCommand as b5, ScanCommand as b6, type ScanCommandOptions as b7, SCardCommand as b8, ScriptExistsCommand as b9, type Type as bA, TypeCommand as bB, UnlinkCommand as bC, XAddCommand as bD, XRangeCommand as bE, type ScoreMember as bF, type ZAddCommandOptions as bG, ZAddCommand as bH, ZCardCommand as bI, ZCountCommand as bJ, ZDiffStoreCommand as bK, ZIncrByCommand as bL, ZInterStoreCommand as bM, type ZInterStoreCommandOptions as bN, ZLexCountCommand as bO, ZMScoreCommand as bP, ZPopMaxCommand as bQ, ZPopMinCommand as bR, ZRangeCommand as bS, type ZRangeCommandOptions as bT, ZRankCommand as bU, ZRemCommand as bV, ZRemRangeByLexCommand as bW, ZRemRangeByRankCommand as bX, ZRemRangeByScoreCommand as bY, ZRevRankCommand as bZ, ZScanCommand as b_, ScriptFlushCommand as ba, ScriptLoadCommand as bb, SDiffCommand as bc, SDiffStoreCommand as bd, SetCommand as be, type SetCommandOptions as bf, SetBitCommand as bg, SetExCommand as bh, SetNxCommand as bi, SetRangeCommand as bj, SInterCommand as bk, SInterStoreCommand as bl, SIsMemberCommand as bm, SMembersCommand as bn, SMIsMemberCommand as bo, SMoveCommand as bp, SPopCommand as bq, SRandMemberCommand as br, SRemCommand as bs, SScanCommand as bt, StrLenCommand as bu, SUnionCommand as bv, SUnionStoreCommand as bw, TimeCommand as bx, TouchCommand as by, TtlCommand as bz, Redis as c, ZUnionCommand as c0, type ZUnionCommandOptions as c1, ZUnionStoreCommand as c2, type ZUnionStoreCommandOptions as c3, createIndex as c4, index as c5, type SearchIndexProps as c6, type createIndexProps as c7, type FlatIndexSchema as c8, type Requester as d, error as e, type UpstashResponse as f, BitOpCommand as g, BitPosCommand as h, DecrCommand as i, DecrByCommand as j, DelCommand as k, EvalROCommand as l, EvalCommand as m, EvalshaROCommand as n, EvalshaCommand as o, ExistsCommand as p, ExpireCommand as q, type ExpireOption as r, ExpireAtCommand as s, FlushDBCommand as t, type GeoAddCommandOptions as u, type GeoMember as v, GeoDistCommand as w, GeoHashCommand as x, GeoPosCommand as y, GeoSearchCommand as z };