Remove MappedSearchModeResponse

Author: Dan Jones

src/query/response/response-mapping.ts

@@ -11,9 +11,10 @@ import {
   StreamedTokens,
   ProgressMessage,
   DateFilterValue,
-  MappedSearchModeResponse,
+  //MappedSearchModeResponse,
   WeaviateObjectWithCollection,
   WeaviateReturnWithCollection,
+  SearchModeResponse,
 } from "./response.js";
 
 import {
@@ -360,11 +361,11 @@ export const mapWeviateSearchResults = (
 export const mapSearchOnlyResponse = (
   response: ApiSearchModeResponse,
 ): {
-  mappedResponse: MappedSearchModeResponse;
+  mappedResponse: Omit<SearchModeResponse, "next">;
   apiSearches: ApiSearchResult[] | undefined;
 } => {
   const apiSearches = response.searches;
-  const mappedResponse: MappedSearchModeResponse = {
+  const mappedResponse: Omit<SearchModeResponse, "next"> = {
     originalQuery: response.original_query,
     searches: apiSearches ? mapInnerSearches(apiSearches) : undefined,
     usage: mapUsage(response.usage),

src/query/response/response.ts

@@ -271,14 +271,6 @@ export type WeaviateReturnWithCollection = WeaviateReturn<undefined> & {
   objects: WeaviateObjectWithCollection[];
 };
 
-export type MappedSearchModeResponse = {
-  originalQuery: string;
-  searches?: SearchResult[];
-  usage: Usage;
-  totalTime: number;
-  searchResults: WeaviateReturnWithCollection;
-};
-
 /** Options for the executing a prepared QueryAgent search. */
 export type SearchExecutionOptions = {
   /** The maximum number of results to return. */
@@ -287,6 +279,11 @@ export type SearchExecutionOptions = {
   offset?: number;
 };
 
-export type SearchModeResponse = MappedSearchModeResponse & {
+export type SearchModeResponse = {
+  originalQuery: string;
+  searches?: SearchResult[];
+  usage: Usage;
+  totalTime: number;
+  searchResults: WeaviateReturnWithCollection;
   next: (options: SearchExecutionOptions) => Promise<SearchModeResponse>;
 };