@fluid-topics/ft-search-context 1.1.37 → 1.1.39

package/build/store/FtSearchStateManager.d.ts

@@ -10,15 +10,13 @@ export declare class ClearAllFiltersEvent extends Event {
 }
 export declare class FtSearchStateManager {
     store: FtReduxStore<FtSearchPageState, FtSearchPageStateReducers>;
-    private serviceProvider;
-    static build(id: string): FtSearchStateManager;
-    service?: FtSearchService;
+    static build(id: string, service?: FtSearchService): FtSearchStateManager;
+    service: FtSearchService;
     errorHandler?: (e: Error) => void;
     ignoreEmptyQuery: boolean;
     openExternalDocumentInNewTab: boolean;
-    constructor(store: FtReduxStore<FtSearchPageState, FtSearchPageStateReducers>, serviceProvider: () => Promise<FtSearchService>);
+    constructor(store: FtReduxStore<FtSearchPageState, FtSearchPageStateReducers>, service?: FtSearchService);
     initService(): Promise<boolean>;
-    awaitService(): Promise<FtSearchService>;
     setQuery(query: string): void;
     setContentLocale(contentLocale?: string): string | undefined;
     setPageSize(pageSize: number): void;
@@ -41,7 +39,7 @@ export declare class FtSearchStateManager {
     private searchDebouncer;
     launchSearch(): Promise<boolean>;
     private suggestDebouncer;
-    launchSuggest(): Promise<void>;
+    launchSuggest(): Promise<boolean>;
     private cancelableSearch;
     private fetchSearchData;
     private cancelableSuggest;

package/build/store/FtSearchStateManager.js

@@ -1,4 +1,4 @@
-import { cancelable, CanceledPromiseError, Debouncer, waitFor } from "@fluid-topics/ft-wc-utils";
+import { cancelable, CanceledPromiseError, Debouncer } from "@fluid-topics/ft-wc-utils";
 import { createSearchPageStore } from "./redux";
 import { FtSearchScope, FtVirtualField } from "@fluid-topics/public-api";
 import { FtSearchService } from "./utils/FtSearchService";
@@ -12,25 +12,21 @@ class ClearAllFiltersEvent extends Event {
 ClearAllFiltersEvent.eventName = "search-context-clear-all-filters";
 export { ClearAllFiltersEvent };
 export class FtSearchStateManager {
-    static build(id) {
-        return new FtSearchStateManager(createSearchPageStore(id.trim() || "context"), FtSearchService.build);
+    static build(id, service) {
+        return new FtSearchStateManager(createSearchPageStore(id.trim() || "context"), service);
     }
-    constructor(store, serviceProvider) {
+    constructor(store, service) {
         this.store = store;
-        this.serviceProvider = serviceProvider;
         this.ignoreEmptyQuery = false;
         this.openExternalDocumentInNewTab = false;
         this.searchDebouncer = new Debouncer(100);
         this.suggestDebouncer = new Debouncer(300);
+        this.service = service !== null && service !== void 0 ? service : new FtSearchService();
     }
     async initService() {
-        this.service = await this.serviceProvider();
         this.store.actions.setLocales((await this.service.getAvailableSearchLocales()).contentLocales);
         return this.launchSearch();
     }
-    async awaitService() {
-        return waitFor(() => this.service);
-    }
     setQuery(query) {
         this.store.actions.setRequestQuery(query);
         this.store.actions.setLiveQuery(query);
@@ -144,13 +140,11 @@ export class FtSearchStateManager {
     setOpenExternalDocumentInNewTab(openExternalDocumentInNewTab) {
         this.openExternalDocumentInNewTab = openExternalDocumentInNewTab;
     }
-    async launchSearch() {
-        await this.awaitService();
+    launchSearch() {
         return this.searchDebouncer.run(() => this.fetchSearchData());
     }
-    async launchSuggest() {
-        await this.awaitService();
-        this.suggestDebouncer.run(() => this.fetchSuggestData());
+    launchSuggest() {
+        return this.suggestDebouncer.run(() => this.fetchSuggestData());
     }
     async fetchSearchData() {
         var _a, _b;

package/build/store/utils/FtSearchService.d.ts

@@ -1,9 +1,7 @@
-import type { FluidTopicsApi, FtSearchLocales, FtSearchRequest, FtSearchResults, FtSuggestRequest, FtSuggestResults } from "@fluid-topics/public-api";
-export declare class FtSearchService {
-    private api;
-    static build(): Promise<FtSearchService>;
-    private cache;
-    constructor(api: FluidTopicsApi);
+import type { FtSearchLocales, FtSearchRequest, FtSearchResults, FtSuggestRequest, FtSuggestResults } from "@fluid-topics/public-api";
+import { FtServiceWithCache } from "@fluid-topics/ft-app-context";
+export declare class FtSearchService extends FtServiceWithCache {
+    constructor();
     launchSearch(request: FtSearchRequest): Promise<FtSearchResults>;
     launchSuggest(request: FtSuggestRequest): Promise<FtSuggestResults>;
     getAvailableSearchLocales(): Promise<FtSearchLocales>;

package/build/store/utils/FtSearchService.js

@@ -1,12 +1,7 @@
-import { FluidTopicsApiProvider } from "@fluid-topics/ft-app-context";
-import { CacheRegistry } from "@fluid-topics/ft-wc-utils";
-export class FtSearchService {
-    static async build() {
-        return new FtSearchService(await FluidTopicsApiProvider.await());
-    }
-    constructor(api) {
-        this.api = api;
-        this.cache = new CacheRegistry();
+import { FtServiceWithCache } from "@fluid-topics/ft-app-context";
+export class FtSearchService extends FtServiceWithCache {
+    constructor() {
+        super();
         this.cache.registerFinal("available-locales", () => this.api.getAvailableSearchLocales());
     }
     async launchSearch(request) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluid-topics/ft-search-context",
-  "version": "1.1.37",
+  "version": "1.1.39",
   "description": "Context block for integrated search components",
   "keywords": [
     "Lit"
@@ -19,12 +19,12 @@
     "url": "ssh://git@scm.mrs.antidot.net:2222/fluidtopics/ft-web-components.git"
   },
   "dependencies": {
-    "@fluid-topics/ft-app-context": "1.1.37",
-    "@fluid-topics/ft-wc-utils": "1.1.37",
+    "@fluid-topics/ft-app-context": "1.1.39",
+    "@fluid-topics/ft-wc-utils": "1.1.39",
     "lit": "3.1.0"
   },
   "devDependencies": {
-    "@fluid-topics/public-api": "1.0.59"
+    "@fluid-topics/public-api": "1.0.60"
   },
-  "gitHead": "a2f1f35da13aa0735c3765b8149fc7564593a7ed"
+  "gitHead": "a9b7f979a6e94b58571a61de90a4b2655800690d"
 }