searchsocket 0.4.0 → 0.5.0

package/dist/client.cjs

@@ -1,60 +1,50 @@
 'use strict';
 
-// src/merge.ts
-function mergeSearchResults(initial, reranked, options) {
-  const maxDisplacement = options?.maxDisplacement ?? 3;
-  const initialUrls = initial.results.map((r) => r.url);
-  const rerankedUrls = reranked.results.map((r) => r.url);
-  const initialPos = /* @__PURE__ */ new Map();
-  for (let i = 0; i < initialUrls.length; i++) {
-    initialPos.set(initialUrls[i], i);
-  }
-  const rerankedPos = /* @__PURE__ */ new Map();
-  for (let i = 0; i < rerankedUrls.length; i++) {
-    rerankedPos.set(rerankedUrls[i], i);
-  }
-  const displacements = [];
-  for (const url of initialUrls) {
-    const iPos = initialPos.get(url);
-    const rPos = rerankedPos.get(url);
-    const displacement = rPos !== void 0 ? Math.abs(iPos - rPos) : 0;
-    displacements.push({ url, displacement });
+// src/client.ts
+var SNIPPET_TARGET_MAX_WORDS = 12;
+function normalizeTargetText(value) {
+  return value.replace(/\u2026/g, " ").replace(/\.{3,}/g, " ").replace(/\s+/g, " ").trim();
+}
+function shortenForTarget(value) {
+  const words = value.split(/\s+/).filter(Boolean);
+  if (words.length <= SNIPPET_TARGET_MAX_WORDS) {
+    return value;
   }
-  const totalResults = displacements.length;
-  if (totalResults === 0) {
-    return {
-      response: reranked,
-      usedRerankedOrder: true,
-      displacements
-    };
+  return words.slice(0, SNIPPET_TARGET_MAX_WORDS).join(" ");
+}
+function selectTextTarget(result) {
+  const sectionTitle = normalizeTargetText(result.sectionTitle ?? "");
+  const snippetCandidate = normalizeTargetText(result.chunks?.[0]?.snippet ?? result.snippet);
+  if (snippetCandidate) {
+    if (!sectionTitle || snippetCandidate.toLowerCase().includes(sectionTitle.toLowerCase())) {
+      return shortenForTarget(snippetCandidate);
+    }
   }
-  const hasLargeDisplacement = displacements.some((d) => d.displacement > maxDisplacement);
-  if (hasLargeDisplacement) {
-    return {
-      response: reranked,
-      usedRerankedOrder: true,
-      displacements
-    };
+  return sectionTitle;
+}
+function buildResultUrl(result) {
+  const textTarget = selectTextTarget(result);
+  if (!textTarget) {
+    return result.url;
   }
-  const rerankedScoreMap = /* @__PURE__ */ new Map();
-  for (const result of reranked.results) {
-    rerankedScoreMap.set(result.url, result.score);
+  const hashIdx = result.url.indexOf("#");
+  const beforeHash = hashIdx >= 0 ? result.url.slice(0, hashIdx) : result.url;
+  const existingHash = hashIdx >= 0 ? result.url.slice(hashIdx) : "";
+  const queryIdx = beforeHash.indexOf("?");
+  const path = queryIdx >= 0 ? beforeHash.slice(0, queryIdx) : beforeHash;
+  const existingQuery = queryIdx >= 0 ? beforeHash.slice(queryIdx + 1) : "";
+  const params = new URLSearchParams(existingQuery);
+  if (result.sectionTitle) {
+    params.set("_ssk", result.sectionTitle);
+  } else {
+    params.delete("_ssk");
   }
-  const mergedResults = initial.results.map((result) => ({
-    ...result,
-    score: rerankedScoreMap.get(result.url) ?? result.score
-  }));
-  return {
-    response: {
-      ...reranked,
-      results: mergedResults
-    },
-    usedRerankedOrder: false,
-    displacements
-  };
+  params.set("_sskt", textTarget);
+  const textFragment = `:~:text=${encodeURIComponent(textTarget)}`;
+  const hashWithoutTextFragment = existingHash.replace(/:~:text=.*$/u, "");
+  const hash = existingHash ? `${hashWithoutTextFragment}${textFragment}` : `#${textFragment}`;
+  return `${path}?${params.toString()}${hash}`;
 }
-
-// src/client.ts
 function createSearchClient(options = {}) {
   const endpoint = options.endpoint ?? "/api/search";
   const fetchImpl = options.fetchImpl ?? fetch;
@@ -81,77 +71,11 @@ function createSearchClient(options = {}) {
         throw new Error(message);
       }
       return payload;
-    },
-    async streamSearch(request, onPhase) {
-      const response = await fetchImpl(endpoint, {
-        method: "POST",
-        headers: {
-          "content-type": "application/json"
-        },
-        body: JSON.stringify(request)
-      });
-      if (!response.ok) {
-        let payload;
-        try {
-          payload = await response.json();
-        } catch {
-          throw new Error("Search failed");
-        }
-        const message = payload.error?.message ?? "Search failed";
-        throw new Error(message);
-      }
-      const contentType = response.headers.get("content-type") ?? "";
-      if (contentType.includes("application/json")) {
-        const data = await response.json();
-        onPhase({ phase: "initial", data });
-        return data;
-      }
-      if (!response.body) {
-        throw new Error("Response body is not readable");
-      }
-      const reader = response.body.getReader();
-      const decoder = new TextDecoder();
-      let buffer = "";
-      let lastResponse = null;
-      for (; ; ) {
-        const { done, value } = await reader.read();
-        if (done) break;
-        buffer += decoder.decode(value, { stream: true });
-        let newlineIdx;
-        while ((newlineIdx = buffer.indexOf("\n")) !== -1) {
-          const line = buffer.slice(0, newlineIdx).trim();
-          buffer = buffer.slice(newlineIdx + 1);
-          if (line.length === 0) continue;
-          const event = JSON.parse(line);
-          if (event.phase === "error") {
-            const errData = event.data;
-            throw new Error(errData.error.message ?? "Streaming search error");
-          }
-          const searchEvent = event;
-          onPhase(searchEvent);
-          lastResponse = searchEvent.data;
-        }
-      }
-      const remaining = buffer.trim();
-      if (remaining.length > 0) {
-        const event = JSON.parse(remaining);
-        if (event.phase === "error") {
-          const errData = event.data;
-          throw new Error(errData.error.message ?? "Streaming search error");
-        }
-        const searchEvent = event;
-        onPhase(searchEvent);
-        lastResponse = searchEvent.data;
-      }
-      if (!lastResponse) {
-        throw new Error("No search results received");
-      }
-      return lastResponse;
     }
   };
 }
 
+exports.buildResultUrl = buildResultUrl;
 exports.createSearchClient = createSearchClient;
-exports.mergeSearchResults = mergeSearchResults;
 //# sourceMappingURL=client.cjs.map
 //# sourceMappingURL=client.cjs.map

package/dist/client.d.cts

@@ -1,26 +1,12 @@
-import { S as SearchResponse, M as MergeSearchOptions, a as MergeSearchResult, b as SearchRequest, c as StreamSearchEvent } from './types-z2dw3H6E.cjs';
-
-/**
- * Smart merge of initial (pre-rerank) and reranked search results.
- *
- * If the reranker barely changed the ordering, we keep the initial order
- * (which the user already saw) and just update scores from the reranked response.
- * If the reranker moved any single result by more than `maxDisplacement`
- * positions, we adopt the reranked order — the reranker is semantic and
- * expensive, so if it strongly disagrees on even one result, trust it.
- */
-declare function mergeSearchResults(initial: SearchResponse, reranked: SearchResponse, options?: MergeSearchOptions): MergeSearchResult;
+import { S as SearchRequest, a as SearchResponse, b as SearchResult } from './types-Dk43uz25.cjs';
 
+declare function buildResultUrl(result: SearchResult): string;
 interface SearchClientOptions {
     endpoint?: string;
     fetchImpl?: typeof fetch;
 }
 declare function createSearchClient(options?: SearchClientOptions): {
     search(request: SearchRequest): Promise<SearchResponse>;
-    streamSearch(request: SearchRequest & {
-        stream: true;
-        rerank: true;
-    }, onPhase: (event: StreamSearchEvent) => void): Promise<SearchResponse>;
 };
 
-export { type SearchClientOptions, createSearchClient, mergeSearchResults };
+export { type SearchClientOptions, buildResultUrl, createSearchClient };

package/dist/client.d.ts

@@ -1,26 +1,12 @@
-import { S as SearchResponse, M as MergeSearchOptions, a as MergeSearchResult, b as SearchRequest, c as StreamSearchEvent } from './types-z2dw3H6E.js';
-
-/**
- * Smart merge of initial (pre-rerank) and reranked search results.
- *
- * If the reranker barely changed the ordering, we keep the initial order
- * (which the user already saw) and just update scores from the reranked response.
- * If the reranker moved any single result by more than `maxDisplacement`
- * positions, we adopt the reranked order — the reranker is semantic and
- * expensive, so if it strongly disagrees on even one result, trust it.
- */
-declare function mergeSearchResults(initial: SearchResponse, reranked: SearchResponse, options?: MergeSearchOptions): MergeSearchResult;
+import { S as SearchRequest, a as SearchResponse, b as SearchResult } from './types-Dk43uz25.js';
 
+declare function buildResultUrl(result: SearchResult): string;
 interface SearchClientOptions {
     endpoint?: string;
     fetchImpl?: typeof fetch;
 }
 declare function createSearchClient(options?: SearchClientOptions): {
     search(request: SearchRequest): Promise<SearchResponse>;
-    streamSearch(request: SearchRequest & {
-        stream: true;
-        rerank: true;
-    }, onPhase: (event: StreamSearchEvent) => void): Promise<SearchResponse>;
 };
 
-export { type SearchClientOptions, createSearchClient, mergeSearchResults };
+export { type SearchClientOptions, buildResultUrl, createSearchClient };

package/dist/client.js

@@ -1,58 +1,48 @@
-// src/merge.ts
-function mergeSearchResults(initial, reranked, options) {
-  const maxDisplacement = options?.maxDisplacement ?? 3;
-  const initialUrls = initial.results.map((r) => r.url);
-  const rerankedUrls = reranked.results.map((r) => r.url);
-  const initialPos = /* @__PURE__ */ new Map();
-  for (let i = 0; i < initialUrls.length; i++) {
-    initialPos.set(initialUrls[i], i);
-  }
-  const rerankedPos = /* @__PURE__ */ new Map();
-  for (let i = 0; i < rerankedUrls.length; i++) {
-    rerankedPos.set(rerankedUrls[i], i);
-  }
-  const displacements = [];
-  for (const url of initialUrls) {
-    const iPos = initialPos.get(url);
-    const rPos = rerankedPos.get(url);
-    const displacement = rPos !== void 0 ? Math.abs(iPos - rPos) : 0;
-    displacements.push({ url, displacement });
+// src/client.ts
+var SNIPPET_TARGET_MAX_WORDS = 12;
+function normalizeTargetText(value) {
+  return value.replace(/\u2026/g, " ").replace(/\.{3,}/g, " ").replace(/\s+/g, " ").trim();
+}
+function shortenForTarget(value) {
+  const words = value.split(/\s+/).filter(Boolean);
+  if (words.length <= SNIPPET_TARGET_MAX_WORDS) {
+    return value;
   }
-  const totalResults = displacements.length;
-  if (totalResults === 0) {
-    return {
-      response: reranked,
-      usedRerankedOrder: true,
-      displacements
-    };
+  return words.slice(0, SNIPPET_TARGET_MAX_WORDS).join(" ");
+}
+function selectTextTarget(result) {
+  const sectionTitle = normalizeTargetText(result.sectionTitle ?? "");
+  const snippetCandidate = normalizeTargetText(result.chunks?.[0]?.snippet ?? result.snippet);
+  if (snippetCandidate) {
+    if (!sectionTitle || snippetCandidate.toLowerCase().includes(sectionTitle.toLowerCase())) {
+      return shortenForTarget(snippetCandidate);
+    }
   }
-  const hasLargeDisplacement = displacements.some((d) => d.displacement > maxDisplacement);
-  if (hasLargeDisplacement) {
-    return {
-      response: reranked,
-      usedRerankedOrder: true,
-      displacements
-    };
+  return sectionTitle;
+}
+function buildResultUrl(result) {
+  const textTarget = selectTextTarget(result);
+  if (!textTarget) {
+    return result.url;
   }
-  const rerankedScoreMap = /* @__PURE__ */ new Map();
-  for (const result of reranked.results) {
-    rerankedScoreMap.set(result.url, result.score);
+  const hashIdx = result.url.indexOf("#");
+  const beforeHash = hashIdx >= 0 ? result.url.slice(0, hashIdx) : result.url;
+  const existingHash = hashIdx >= 0 ? result.url.slice(hashIdx) : "";
+  const queryIdx = beforeHash.indexOf("?");
+  const path = queryIdx >= 0 ? beforeHash.slice(0, queryIdx) : beforeHash;
+  const existingQuery = queryIdx >= 0 ? beforeHash.slice(queryIdx + 1) : "";
+  const params = new URLSearchParams(existingQuery);
+  if (result.sectionTitle) {
+    params.set("_ssk", result.sectionTitle);
+  } else {
+    params.delete("_ssk");
   }
-  const mergedResults = initial.results.map((result) => ({
-    ...result,
-    score: rerankedScoreMap.get(result.url) ?? result.score
-  }));
-  return {
-    response: {
-      ...reranked,
-      results: mergedResults
-    },
-    usedRerankedOrder: false,
-    displacements
-  };
+  params.set("_sskt", textTarget);
+  const textFragment = `:~:text=${encodeURIComponent(textTarget)}`;
+  const hashWithoutTextFragment = existingHash.replace(/:~:text=.*$/u, "");
+  const hash = existingHash ? `${hashWithoutTextFragment}${textFragment}` : `#${textFragment}`;
+  return `${path}?${params.toString()}${hash}`;
 }
-
-// src/client.ts
 function createSearchClient(options = {}) {
   const endpoint = options.endpoint ?? "/api/search";
   const fetchImpl = options.fetchImpl ?? fetch;
@@ -79,76 +69,10 @@ function createSearchClient(options = {}) {
         throw new Error(message);
       }
       return payload;
-    },
-    async streamSearch(request, onPhase) {
-      const response = await fetchImpl(endpoint, {
-        method: "POST",
-        headers: {
-          "content-type": "application/json"
-        },
-        body: JSON.stringify(request)
-      });
-      if (!response.ok) {
-        let payload;
-        try {
-          payload = await response.json();
-        } catch {
-          throw new Error("Search failed");
-        }
-        const message = payload.error?.message ?? "Search failed";
-        throw new Error(message);
-      }
-      const contentType = response.headers.get("content-type") ?? "";
-      if (contentType.includes("application/json")) {
-        const data = await response.json();
-        onPhase({ phase: "initial", data });
-        return data;
-      }
-      if (!response.body) {
-        throw new Error("Response body is not readable");
-      }
-      const reader = response.body.getReader();
-      const decoder = new TextDecoder();
-      let buffer = "";
-      let lastResponse = null;
-      for (; ; ) {
-        const { done, value } = await reader.read();
-        if (done) break;
-        buffer += decoder.decode(value, { stream: true });
-        let newlineIdx;
-        while ((newlineIdx = buffer.indexOf("\n")) !== -1) {
-          const line = buffer.slice(0, newlineIdx).trim();
-          buffer = buffer.slice(newlineIdx + 1);
-          if (line.length === 0) continue;
-          const event = JSON.parse(line);
-          if (event.phase === "error") {
-            const errData = event.data;
-            throw new Error(errData.error.message ?? "Streaming search error");
-          }
-          const searchEvent = event;
-          onPhase(searchEvent);
-          lastResponse = searchEvent.data;
-        }
-      }
-      const remaining = buffer.trim();
-      if (remaining.length > 0) {
-        const event = JSON.parse(remaining);
-        if (event.phase === "error") {
-          const errData = event.data;
-          throw new Error(errData.error.message ?? "Streaming search error");
-        }
-        const searchEvent = event;
-        onPhase(searchEvent);
-        lastResponse = searchEvent.data;
-      }
-      if (!lastResponse) {
-        throw new Error("No search results received");
-      }
-      return lastResponse;
     }
   };
 }
 
-export { createSearchClient, mergeSearchResults };
+export { buildResultUrl, createSearchClient };
 //# sourceMappingURL=client.js.map
 //# sourceMappingURL=client.js.map