@rubixstudios/payload-typesense 1.2.4 → 1.3.0

package/dist/utils/useSearch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useSearch.d.ts","sourceRoot":"","sources":["../../src/utils/useSearch.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,aAAa,CAAA;AAEjD,KAAK,gBAAgB,CAAC,CAAC,IAAI;IACzB,OAAO,EAAE,MAAM,CAAA;IACf,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;IAC/B,cAAc,EAAE,MAAM,CAAA;IACtB,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC,KAAK,IAAI,CAAA;IAChD,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC,KAAK,IAAI,CAAA;IAC9D,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,wBAAgB,SAAS,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EACrD,OAAO,EACP,WAAW,EACX,cAAc,EACd,SAAS,EACT,QAAQ,EACR,OAAO,GACR,EAAE,gBAAgB,CAAC,CAAC,CAAC;;;;0BAsBE,MAAM;EA0E7B"}
+{"version":3,"file":"useSearch.d.ts","sourceRoot":"","sources":["../../src/utils/useSearch.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,aAAa,CAAA;AAEjD,KAAK,gBAAgB,CAAC,CAAC,IAAI;IACzB,OAAO,EAAE,MAAM,CAAA;IACf,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;IAC/B,cAAc,EAAE,MAAM,CAAA;IACtB,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC,KAAK,IAAI,CAAA;IAChD,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC,KAAK,IAAI,CAAA;IAC9D,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,wBAAgB,SAAS,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EACrD,OAAO,EACP,WAAW,EACX,cAAc,EACd,SAAS,EACT,QAAQ,EACR,OAAO,EACP,MAAc,GACf,EAAE,gBAAgB,CAAC,CAAC,CAAC;;;;0BAYE,MAAM;EA4D7B"}

package/dist/utils/useSearch.js

@@ -1,27 +1,13 @@
 'use client';
-import { useCallback, useEffect, useRef, useState } from 'react';
-export function useSearch({ baseUrl, collections, minQueryLength, onResults, onSearch, perPage }) {
+import { useCallback, useRef, useState } from 'react';
+export function useSearch({ baseUrl, collections, minQueryLength, onResults, onSearch, perPage, vector = false }) {
     const [results, setResults] = useState(null);
     const [isLoading, setIsLoading] = useState(false);
     const [error, setError] = useState(null);
-    const collectionsRef = useRef(collections);
     const onResultsRef = useRef(onResults);
     const onSearchRef = useRef(onSearch);
-    useEffect(()=>{
-        collectionsRef.current = collections;
-    }, [
-        collections
-    ]);
-    useEffect(()=>{
-        onResultsRef.current = onResults;
-    }, [
-        onResults
-    ]);
-    useEffect(()=>{
-        onSearchRef.current = onSearch;
-    }, [
-        onSearch
-    ]);
+    onResultsRef.current = onResults;
+    onSearchRef.current = onSearch;
     const search = useCallback(async (searchQuery)=>{
         if (searchQuery.length < minQueryLength) {
             setResults(null);
@@ -31,43 +17,45 @@ export function useSearch({ baseUrl, collections, minQueryLength, onResults, onS
         setIsLoading(true);
         setError(null);
         try {
-            const activeCollections = collectionsRef.current;
+            const params = new URLSearchParams({
+                per_page: String(perPage),
+                q: searchQuery
+            });
+            if (vector) {
+                params.append('vector', 'true');
+            }
             let searchUrl;
-            if (typeof activeCollections === 'string' && activeCollections) {
-                searchUrl = `${baseUrl}/api/search/${activeCollections}?q=${encodeURIComponent(searchQuery)}&per_page=${perPage}`;
-            } else if (Array.isArray(activeCollections) && activeCollections.length > 0) {
-                searchUrl = `${baseUrl}/api/search?q=${encodeURIComponent(searchQuery)}&per_page=${perPage * 2}`;
+            if (Array.isArray(collections) && collections.length > 0) {
+                if (collections.length === 1) {
+                    searchUrl = `${baseUrl}/api/search/${collections[0]}?${params.toString()}`;
+                } else {
+                    params.append('collections', collections.join(','));
+                    searchUrl = `${baseUrl}/api/search?${params.toString()}`;
+                }
             } else {
-                searchUrl = `${baseUrl}/api/search?q=${encodeURIComponent(searchQuery)}&per_page=${perPage}`;
+                searchUrl = `${baseUrl}/api/search?${params.toString()}`;
             }
             const response = await fetch(searchUrl);
             if (!response.ok) {
                 throw new Error(`Search failed: ${response.status} ${response.statusText}`);
             }
-            let searchResults = await response.json();
-            if (Array.isArray(activeCollections) && activeCollections.length > 0) {
-                const filteredHits = searchResults.hits?.filter((hit)=>hit.collection && activeCollections.includes(hit.collection)) || [];
-                const filteredCollections = searchResults.collections?.filter((col)=>col.collection && activeCollections.includes(col.collection)) || [];
-                searchResults = {
-                    ...searchResults,
-                    collections: filteredCollections,
-                    found: filteredHits.length,
-                    hits: filteredHits
-                };
-            }
+            const searchResults = await response.json();
             setResults(searchResults);
             onResultsRef.current?.(searchResults);
             onSearchRef.current?.(searchQuery, searchResults);
         } catch (err) {
-            setError(err instanceof Error ? err.message : 'Search failed');
+            const errorMessage = err instanceof Error ? err.message : 'Search failed';
+            setError(errorMessage);
             setResults(null);
         } finally{
             setIsLoading(false);
         }
     }, [
         baseUrl,
+        collections,
         minQueryLength,
-        perPage
+        perPage,
+        vector
     ]);
     return {
         error,

package/dist/utils/vectorSearch.d.ts

@@ -0,0 +1,7 @@
+import type Typesense from 'typesense';
+export declare function performVectorSearch(typesenseClient: Typesense.Client, query: string, options: {
+    collection: string;
+    page: number;
+    per_page: number;
+}): Promise<any>;
+//# sourceMappingURL=vectorSearch.d.ts.map

package/dist/utils/vectorSearch.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"vectorSearch.d.ts","sourceRoot":"","sources":["../../src/utils/vectorSearch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,WAAW,CAAA;AAEtC,wBAAsB,mBAAmB,CACvC,eAAe,EAAE,SAAS,CAAC,MAAM,EACjC,KAAK,EAAE,MAAM,EACb,OAAO,EAAE;IACP,UAAU,EAAE,MAAM,CAAA;IAClB,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,CAAA;CACjB,GACA,OAAO,CAAC,GAAG,CAAC,CAad"}

package/dist/utils/vectorSearch.js

@@ -0,0 +1,12 @@
+export async function performVectorSearch(typesenseClient, query, options) {
+    const { collection, page, per_page } = options;
+    const searchParams = {
+        num_typos: 0,
+        page,
+        per_page,
+        q: query,
+        query_by: 'embedding',
+        search_cutoff_ms: 5000
+    };
+    return await typesenseClient.collections(collection).documents().search(searchParams);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rubixstudios/payload-typesense",
-  "version": "1.2.4",
+  "version": "1.3.0",
   "description": "A production-ready search plugin that integrates Typesense with Payload CMS, offering fast, typo-tolerant search with real-time synchronization. This fork by Rubix Studios reduces bloat and introduces targeted changes for improved performance, maintainability, and flexibility.",
   "license": "MIT",
   "author": "Rubix Studios <hello@rubixstudios.com.au> (https://rubixstudios.com.au)",