Search in current drive instead of current server

Author: Polleps

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 This changelog covers all three packages, as they are (for now) updated as a whole
 
+## URELEASED
+
+### @tomic/lib
+
+#### Breaking changes
+
+- `buildSearchSubject` now takes a serverURL instead of the store.
+
 ## v0.35.0
 
 ### @tomic/browser

lib/src/search.ts

@@ -1,5 +1,3 @@
-import { Store } from './index.js';
-
 export interface SearchOpts {
   /** Fetch full resources instead of subjects */
   include?: boolean;
@@ -53,12 +51,12 @@ function buildFilterString(filters: { [key: string]: string }): string {
 
 /** Returns the URL of the search query. Fetch that and you get your results! */
 export function buildSearchSubject(
-  store: Store,
+  serverURL: string,
   query: string,
   opts: SearchOpts = {},
 ) {
   const { include = false, limit = 30, scope, filters } = opts;
-  const url = new URL(store.getServerUrl());
+  const url = new URL(serverURL);
   url.pathname = 'search';
   query && url.searchParams.set('q', query);
   include && url.searchParams.set('include', include.toString());

react/src/useServerSearch.tsx

@@ -1,6 +1,6 @@
 import { buildSearchSubject, SearchOpts, urls } from '@tomic/lib';
 import { useEffect, useMemo, useState } from 'react';
-import { useArray, useDebounce, useResource, useStore } from './index.js';
+import { useArray, useDebounce, useResource, useServerURL } from './index.js';
 
 interface SearchResults {
   /** Subject URLs for resources that match the query */
@@ -27,13 +27,13 @@ export function useServerSearch(
   const { debounce = 50 } = opts;
 
   const [results, setResults] = useState<string[]>([]);
-  const store = useStore();
+  const [serverURL] = useServerURL();
   // Calculating the query takes a while, so we debounce it
   const debouncedQuery = useDebounce(query, debounce) ?? '';
 
   const searchSubjectURL: string = useMemo(
-    () => buildSearchSubject(store, debouncedQuery, opts),
-    [debouncedQuery, opts],
+    () => buildSearchSubject(serverURL, debouncedQuery, opts),
+    [debouncedQuery, opts, serverURL],
   );
 
   const resource = useResource(searchSubjectURL, {