From a685bc1f8fff915bcf82ffdd73570dd4d6e28580 Mon Sep 17 00:00:00 2001
From: flycran <cffhidol@163.com>
Date: Mon, 5 May 2025 11:05:50 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E6=9B=B4=E6=96=B0index.d.ts=20=20=20-=20?=
 =?UTF-8?q?=E4=B8=BAIndex=E7=9A=84search=E7=AD=89=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=8E=A8=E6=96=AD=E8=BF=94=E5=9B=9E=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.d.ts | 43 +++++++++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/index.d.ts b/index.d.ts
index 1a61e90..ab4f5cf 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -108,8 +108,8 @@ declare module "flexsearch" {
         ? {
             [K in keyof D]: K extends string
                 ? D[K] extends Array<infer U>
-                    ? `${K}` | `${K}[]:${FieldName<U> & string}`
-                    : K | `${K}:${FieldName<D[K]> & string}`
+                    ? `${ K }` | `${ K }[]:${ FieldName<U> & string }`
+                    : K | `${ K }:${ FieldName<D[K]> & string }`
                 : never
         }[keyof D]
         : never
@@ -219,7 +219,7 @@ declare module "flexsearch" {
 
     type DefaultSearchResults = Id[];
     type IntermediateSearchResults = Array<Id[]>;
-    type SearchResults = DefaultSearchResults | Resolver;
+    type SearchResults<R extends boolean = false> = R extends true ? Resolver : DefaultSearchResults;
 
     /**
      * **Document:**
@@ -242,13 +242,15 @@ declare module "flexsearch" {
 
         remove(id: Id): this | Promise<this>;
 
-        search(query: string, options?: Limit | SearchOptions): SearchResults | Promise<SearchResults>;
-        search(query: string, limit: number, options: SearchOptions): SearchResults | Promise<SearchResults>;
-        search(options: SearchOptions): SearchResults | Promise<SearchResults>;
+        search(query: string, limit?: Limit): SearchResults | Promise<SearchResults>;
+        search<R extends boolean = false>(query: string, options?: SearchOptions<R>): SearchResults<R> | Promise<SearchResults<R>>;
+        search<R extends boolean = false>(query: string, limit: Limit, options: SearchOptions<R>): SearchResults<R> | Promise<SearchResults<R>>;
+        search<R extends boolean = false>(options: SearchOptions<R>): SearchResults<R> | Promise<SearchResults<R>>;
 
-        searchCache(query: string, options?: Limit | SearchOptions): SearchResults | Promise<SearchResults>;
-        searchCache(query: string, limit: number, options: SearchOptions): SearchResults | Promise<SearchResults>;
-        searchCache(options: SearchOptions): SearchResults | Promise<SearchResults>;
+        searchCache(query: string, limit?: Limit): SearchResults | Promise<SearchResults>;
+        searchCache<R extends boolean = false>(query: string, options?: Limit | SearchOptions<R>): SearchResults<R> | Promise<SearchResults<R>>;
+        searchCache<R extends boolean = false>(query: string, limit: Limit, options: SearchOptions<R>): SearchResults<R> | Promise<SearchResults<R>>;
+        searchCache<R extends boolean = false>(options: SearchOptions<R>): SearchResults<R> | Promise<SearchResults<R>>;
 
         // https://github.com/nextapps-de/flexsearch#check-existence-of-already-indexed-ids
         contain(id: Id): boolean | Promise<boolean>;
@@ -299,19 +301,24 @@ declare module "flexsearch" {
 
         searchAsync(
             query: string,
-            options?: Limit | SearchOptions,
+            limit?: Limit,
             callback?: AsyncCallback<SearchResults>,
         ): Promise<SearchResults>
-        searchAsync(
+        searchAsync<R extends boolean = false>(
+            query: string,
+            options?: SearchOptions<R>,
+            callback?: AsyncCallback<SearchResults<R>>,
+        ): Promise<SearchResults<R>>
+        searchAsync<R extends boolean = false>(
             query: string,
             limit: Limit,
-            options?: SearchOptions,
-            callback?: AsyncCallback<SearchResults>,
-        ): Promise<SearchResults>;
-        searchAsync(
-            options: SearchOptions,
-            callback?: AsyncCallback<SearchResults>,
-        ): Promise<SearchResults>;
+            options?: SearchOptions<R>,
+            callback?: AsyncCallback<SearchResults<R>>,
+        ): Promise<SearchResults<R>>;
+        searchAsync<R extends boolean = false>(
+            options: SearchOptions<R>,
+            callback?: AsyncCallback<SearchResults<R>>,
+        ): Promise<SearchResults<R>>;
     }
 
     /**