@apvee/spfx-react-toolkit 1.3.0 → 2.0.0

package/lib/hooks/useSPFxPnPSearch.js

@@ -1,39 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 import { useState, useCallback, useRef, useEffect } from 'react';
 import { useSPFxPnPContext } from './useSPFxPnPContext';
 // Import PnPjs native search
@@ -53,7 +17,7 @@ import { SearchQueryBuilder } from '@pnp/sp/search';
  * );
  * ```
  */
-export var SearchVerticals = {
+export const SearchVerticals = {
     /**
      * All results (default) - no filtering
      */
@@ -308,364 +272,309 @@ export var SearchVerticals = {
  * ```
  */
 export function useSPFxPnPSearch(options, pnpContext) {
-    var _this = this;
-    var _a;
     // Get PnP context
-    var context = useSPFxPnPContext(pnpContext === null || pnpContext === void 0 ? void 0 : pnpContext.siteUrl);
-    var sp = context.sp;
+    const context = useSPFxPnPContext(pnpContext?.siteUrl);
+    const { sp } = context;
     // Default options
-    var defaultPageSize = (_a = options === null || options === void 0 ? void 0 : options.pageSize) !== null && _a !== void 0 ? _a : 50;
+    const defaultPageSize = options?.pageSize ?? 50;
     // State
-    var _b = useState([]), results = _b[0], setResults = _b[1];
-    var _c = useState(0), totalResults = _c[0], setTotalResults = _c[1];
-    var _d = useState([]), refiners = _d[0], setRefiners = _d[1];
-    var _e = useState(false), loading = _e[0], setLoading = _e[1];
-    var _f = useState(false), loadingMore = _f[0], setLoadingMore = _f[1];
-    var _g = useState(undefined), error = _g[0], setError = _g[1];
-    var _h = useState(false), hasMore = _h[0], setHasMore = _h[1];
+    const [results, setResults] = useState([]);
+    const [totalResults, setTotalResults] = useState(0);
+    const [refiners, setRefiners] = useState([]);
+    const [loading, setLoading] = useState(false);
+    const [loadingMore, setLoadingMore] = useState(false);
+    const [error, setError] = useState(undefined);
+    const [hasMore, setHasMore] = useState(false);
     // Tracking for pagination and refetch
     // Type is wrapper function that returns the original callback (to avoid React state comparison issues)
-    var _j = useState(null), lastQueryBuilder = _j[0], setLastQueryBuilder = _j[1];
-    var _k = useState(null), lastQueryText = _k[0], setLastQueryText = _k[1];
-    var _l = useState(undefined), lastPageSize = _l[0], setLastPageSize = _l[1];
-    var _m = useState(0), currentStartRow = _m[0], setCurrentStartRow = _m[1];
-    var _o = useState(new Map()), appliedRefiners = _o[0], setAppliedRefiners = _o[1];
+    const [lastQueryBuilder, setLastQueryBuilder] = useState(null);
+    const [lastQueryText, setLastQueryText] = useState(null);
+    const [lastPageSize, setLastPageSize] = useState(undefined);
+    const [currentStartRow, setCurrentStartRow] = useState(0);
+    const [appliedRefiners, setAppliedRefiners] = useState(new Map());
     // Refs
-    var mountedRef = useRef(true);
+    const mountedRef = useRef(true);
     // Cleanup on unmount
-    useEffect(function () {
+    useEffect(() => {
         mountedRef.current = true;
         return function cleanup() {
             mountedRef.current = false;
         };
     }, []);
     // Clear error handler
-    var clearError = useCallback(function () {
+    const clearError = useCallback(() => {
         setError(undefined);
     }, []);
     /**
      * Core search execution logic.
      * Builds query with defaults, executes search, parses results.
      */
-    var executeSearch = useCallback(function (query, queryOptions, startRow, appendResults, overrideRefiners) { return __awaiter(_this, void 0, void 0, function () {
-        var err, pageSize, row, builder, refinersToApply, refinementFilters_1, searchResults, rawResults, totalRows, parsedResults_1, refinerResults, parsedRefiners, finalResultsLength_1, err_1, error_1;
-        var _a, _b, _c, _d, _e, _f, _g, _h;
-        return __generator(this, function (_j) {
-            switch (_j.label) {
-                case 0:
-                    if (!sp || !(context === null || context === void 0 ? void 0 : context.isInitialized)) {
-                        err = new Error('[useSPFxPnPSearch] PnP context not initialized. Ensure @pnp/sp/search is imported.');
-                        setError(err);
-                        throw err;
-                    }
-                    _j.label = 1;
-                case 1:
-                    _j.trys.push([1, 3, , 4]);
-                    pageSize = (_b = (_a = queryOptions === null || queryOptions === void 0 ? void 0 : queryOptions.pageSize) !== null && _a !== void 0 ? _a : lastPageSize) !== null && _b !== void 0 ? _b : defaultPageSize;
-                    row = startRow !== null && startRow !== void 0 ? startRow : 0;
-                    builder = void 0;
-                    if (typeof query === 'string') {
-                        // String query case
-                        builder = SearchQueryBuilder(query);
-                    }
-                    else {
-                        // Builder callback case
-                        builder = SearchQueryBuilder('');
-                        // Apply default options BEFORE user callback
-                        if ((options === null || options === void 0 ? void 0 : options.selectProperties) && options.selectProperties.length > 0) {
-                            builder = builder.selectProperties.apply(builder, options.selectProperties);
-                        }
-                        if (options === null || options === void 0 ? void 0 : options.refiners) {
-                            builder = builder.refiners(options.refiners);
-                        }
-                        // Let user override everything
-                        builder = query(builder);
-                    }
-                    // Apply pagination
-                    builder = builder.rowLimit(pageSize);
-                    if (row > 0) {
-                        builder = builder.startRow(row);
-                    }
-                    refinersToApply = overrideRefiners !== null && overrideRefiners !== void 0 ? overrideRefiners : appliedRefiners;
-                    if (refinersToApply.size > 0) {
-                        refinementFilters_1 = [];
-                        refinersToApply.forEach(function (values, key) {
-                            values.forEach(function (value) {
-                                refinementFilters_1.push(key + ":equals('" + value + "')");
-                            });
-                        });
-                        if (refinementFilters_1.length > 0) {
-                            builder = builder.refinementFilters.apply(builder, refinementFilters_1);
-                        }
-                    }
-                    return [4 /*yield*/, sp.search(builder)];
-                case 2:
-                    searchResults = _j.sent();
-                    rawResults = (_c = searchResults.PrimarySearchResults) !== null && _c !== void 0 ? _c : [];
-                    totalRows = (_d = searchResults.TotalRows) !== null && _d !== void 0 ? _d : 0;
-                    parsedResults_1 = rawResults.map(function (result) {
-                        var _a, _b;
-                        // ISearchResult is already a flat object with all properties
-                        // Generate ID from Path or DocId
-                        var id = String((_b = (_a = result.DocId) !== null && _a !== void 0 ? _a : result.Path) !== null && _b !== void 0 ? _b : Math.random());
-                        var rank = result.Rank ? parseInt(String(result.Rank), 10) : undefined;
-                        return {
-                            id: id,
-                            data: result, // ISearchResult is already the data
-                            raw: result, // Keep original for reference
-                            rank: rank
-                        };
+    const executeSearch = useCallback(async (query, queryOptions, startRow, appendResults, overrideRefiners) => {
+        if (!sp || !context?.isInitialized) {
+            const err = new Error('[useSPFxPnPSearch] PnP context not initialized. Ensure @pnp/sp/search is imported.');
+            setError(err);
+            throw err;
+        }
+        try {
+            const pageSize = queryOptions?.pageSize ?? lastPageSize ?? defaultPageSize;
+            const row = startRow ?? 0;
+            // Initialize SearchQueryBuilder
+            let builder;
+            if (typeof query === 'string') {
+                // String query case
+                builder = SearchQueryBuilder(query);
+            }
+            else {
+                // Builder callback case
+                builder = SearchQueryBuilder('');
+                // Apply default options BEFORE user callback
+                if (options?.selectProperties && options.selectProperties.length > 0) {
+                    builder = builder.selectProperties(...options.selectProperties);
+                }
+                if (options?.refiners) {
+                    builder = builder.refiners(options.refiners);
+                }
+                // Let user override everything
+                builder = query(builder);
+            }
+            // Apply pagination
+            builder = builder.rowLimit(pageSize);
+            if (row > 0) {
+                builder = builder.startRow(row);
+            }
+            // Apply refinement filters if any
+            // Use overrideRefiners if provided (for applyRefiner race condition fix)
+            const refinersToApply = overrideRefiners ?? appliedRefiners;
+            if (refinersToApply.size > 0) {
+                const refinementFilters = [];
+                refinersToApply.forEach(function (values, key) {
+                    values.forEach(function (value) {
+                        refinementFilters.push(key + ":equals('" + value + "')");
                     });
-                    refinerResults = (_h = (_g = (_f = (_e = searchResults.RawSearchResults) === null || _e === void 0 ? void 0 : _e.PrimaryQueryResult) === null || _f === void 0 ? void 0 : _f.RefinementResults) === null || _g === void 0 ? void 0 : _g.Refiners) !== null && _h !== void 0 ? _h : [];
-                    parsedRefiners = refinerResults.map(function (refiner) {
-                        var _a, _b;
+                });
+                if (refinementFilters.length > 0) {
+                    builder = builder.refinementFilters(...refinementFilters);
+                }
+            }
+            // Execute search - sp.search() returns SearchResults (PnPjs v4)
+            // SearchResults exposes: ElapsedTime, RowCount, PrimarySearchResults, TotalRows
+            const searchResults = await sp.search(builder);
+            // PnPjs v4 SearchResults.PrimarySearchResults already contains parsed result objects
+            // Each result is an ISearchResult with properties like Title, Path, Rank, etc.
+            const rawResults = searchResults.PrimarySearchResults ?? [];
+            const totalRows = searchResults.TotalRows ?? 0;
+            // Map ISearchResult to our SearchResult<T> format
+            const parsedResults = rawResults.map(function (result) {
+                // ISearchResult is already a flat object with all properties
+                // Generate ID from Path or DocId
+                const id = String(result.DocId ?? result.Path ?? Math.random());
+                const rank = result.Rank ? parseInt(String(result.Rank), 10) : undefined;
+                return {
+                    id: id,
+                    data: result, // ISearchResult is already the data
+                    raw: result, // Keep original for reference
+                    rank: rank
+                };
+            });
+            // Parse refiners from RawSearchResults
+            // PnPjs v4: SearchResults.RawSearchResults.PrimaryQueryResult.RefinementResults.Refiners
+            const refinerResults = searchResults.RawSearchResults?.PrimaryQueryResult?.RefinementResults?.Refiners ?? [];
+            const parsedRefiners = refinerResults.map(function (refiner) {
+                return {
+                    name: refiner.Name ?? '',
+                    entries: (refiner.Entries ?? []).map(function (entry) {
                         return {
-                            name: (_a = refiner.Name) !== null && _a !== void 0 ? _a : '',
-                            entries: ((_b = refiner.Entries) !== null && _b !== void 0 ? _b : []).map(function (entry) {
-                                var _a, _b;
-                                return {
-                                    value: (_a = entry.RefinementName) !== null && _a !== void 0 ? _a : '',
-                                    count: parseInt(entry.RefinementCount, 10) || 0,
-                                    token: (_b = entry.RefinementToken) !== null && _b !== void 0 ? _b : ''
-                                };
-                            })
+                            value: entry.RefinementName ?? '',
+                            count: parseInt(entry.RefinementCount, 10) || 0,
+                            token: entry.RefinementToken ?? ''
                         };
-                    });
-                    // Update state
-                    if (!mountedRef.current) {
-                        return [2 /*return*/, parsedResults_1];
-                    }
-                    finalResultsLength_1 = 0;
-                    if (appendResults) {
-                        setResults(function (prev) {
-                            finalResultsLength_1 = prev.length + parsedResults_1.length;
-                            return prev.concat(parsedResults_1);
-                        });
-                    }
-                    else {
-                        finalResultsLength_1 = parsedResults_1.length;
-                        setResults(parsedResults_1);
-                    }
-                    setTotalResults(totalRows);
-                    setRefiners(parsedRefiners);
-                    setHasMore(finalResultsLength_1 < totalRows);
-                    return [2 /*return*/, parsedResults_1];
-                case 3:
-                    err_1 = _j.sent();
-                    error_1 = err_1 instanceof Error ? err_1 : new Error(String(err_1));
-                    setError(error_1);
-                    throw error_1;
-                case 4: return [2 /*return*/];
+                    })
+                };
+            });
+            // Update state
+            if (!mountedRef.current) {
+                return parsedResults;
             }
-        });
-    }); }, [sp, context === null || context === void 0 ? void 0 : context.isInitialized, options, defaultPageSize, lastPageSize, appliedRefiners]);
+            // Calculate new results length for hasMore using functional update
+            // This avoids needing results.length in the dependency array
+            let finalResultsLength = 0;
+            if (appendResults) {
+                setResults(function (prev) {
+                    finalResultsLength = prev.length + parsedResults.length;
+                    return prev.concat(parsedResults);
+                });
+            }
+            else {
+                finalResultsLength = parsedResults.length;
+                setResults(parsedResults);
+            }
+            setTotalResults(totalRows);
+            setRefiners(parsedRefiners);
+            setHasMore(finalResultsLength < totalRows);
+            return parsedResults;
+        }
+        catch (err) {
+            const error = err instanceof Error ? err : new Error(String(err));
+            setError(error);
+            throw error;
+        }
+    }, [sp, context?.isInitialized, options, defaultPageSize, lastPageSize, appliedRefiners]);
     /**
      * Executes a search query.
      */
-    var search = useCallback(function (query, queryOptions) { return __awaiter(_this, void 0, void 0, function () {
-        var parsedResults;
-        var _a;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    setLoading(true);
-                    setError(undefined);
-                    setCurrentStartRow(0);
-                    setAppliedRefiners(new Map()); // Reset refiners on new search
-                    _b.label = 1;
-                case 1:
-                    _b.trys.push([1, , 3, 4]);
-                    // Store query for refetch/loadMore
-                    if (typeof query === 'string') {
-                        setLastQueryText(query);
-                        setLastQueryBuilder(null);
-                    }
-                    else {
-                        setLastQueryBuilder(function () { return query; });
-                        setLastQueryText(null);
-                    }
-                    setLastPageSize((_a = queryOptions === null || queryOptions === void 0 ? void 0 : queryOptions.pageSize) !== null && _a !== void 0 ? _a : defaultPageSize);
-                    return [4 /*yield*/, executeSearch(query, queryOptions, 0, false)];
-                case 2:
-                    parsedResults = _b.sent();
-                    return [2 /*return*/, parsedResults];
-                case 3:
-                    if (mountedRef.current) {
-                        setLoading(false);
-                    }
-                    return [7 /*endfinally*/];
-                case 4: return [2 /*return*/];
+    const search = useCallback(async (query, queryOptions) => {
+        setLoading(true);
+        setError(undefined);
+        setCurrentStartRow(0);
+        setAppliedRefiners(new Map()); // Reset refiners on new search
+        try {
+            // Store query for refetch/loadMore
+            if (typeof query === 'string') {
+                setLastQueryText(query);
+                setLastQueryBuilder(null);
             }
-        });
-    }); }, [executeSearch, defaultPageSize]);
+            else {
+                setLastQueryBuilder(function () { return query; });
+                setLastQueryText(null);
+            }
+            setLastPageSize(queryOptions?.pageSize ?? defaultPageSize);
+            const parsedResults = await executeSearch(query, queryOptions, 0, false);
+            return parsedResults;
+        }
+        finally {
+            if (mountedRef.current) {
+                setLoading(false);
+            }
+        }
+    }, [executeSearch, defaultPageSize]);
     /**
      * Gets search suggestions.
      */
-    var suggest = useCallback(function (queryText) { return __awaiter(_this, void 0, void 0, function () {
-        var err, result, err_2, error_2;
-        var _a;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    if (!sp || !(context === null || context === void 0 ? void 0 : context.isInitialized)) {
-                        err = new Error('[useSPFxPnPSearch] PnP context not initialized.');
-                        setError(err);
-                        throw err;
-                    }
-                    _b.label = 1;
-                case 1:
-                    _b.trys.push([1, 3, , 4]);
-                    return [4 /*yield*/, sp.searchSuggest(queryText)];
-                case 2:
-                    result = _b.sent();
-                    return [2 /*return*/, (_a = result.Queries) !== null && _a !== void 0 ? _a : []];
-                case 3:
-                    err_2 = _b.sent();
-                    error_2 = err_2 instanceof Error ? err_2 : new Error(String(err_2));
-                    setError(error_2);
-                    throw error_2;
-                case 4: return [2 /*return*/];
-            }
-        });
-    }); }, [sp, context === null || context === void 0 ? void 0 : context.isInitialized]);
+    const suggest = useCallback(async (queryText) => {
+        if (!sp || !context?.isInitialized) {
+            const err = new Error('[useSPFxPnPSearch] PnP context not initialized.');
+            setError(err);
+            throw err;
+        }
+        try {
+            const result = await sp.searchSuggest(queryText);
+            return result.Queries ?? [];
+        }
+        catch (err) {
+            const error = err instanceof Error ? err : new Error(String(err));
+            setError(error);
+            throw error;
+        }
+    }, [sp, context?.isInitialized]);
     /**
      * Loads more results (pagination).
      */
-    var loadMore = useCallback(function () { return __awaiter(_this, void 0, void 0, function () {
-        var err, err, nextStartRow, query, parsedResults;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    if (!lastQueryBuilder && !lastQueryText) {
-                        err = new Error('[useSPFxPnPSearch] No previous search to load more from. Call search() first.');
-                        setError(err);
-                        throw err;
-                    }
-                    if (!lastPageSize) {
-                        err = new Error('[useSPFxPnPSearch] Cannot loadMore without pageSize. Specify pageSize in options or search call.');
-                        setError(err);
-                        throw err;
-                    }
-                    setLoadingMore(true);
-                    setError(undefined);
-                    _a.label = 1;
-                case 1:
-                    _a.trys.push([1, , 3, 4]);
-                    nextStartRow = currentStartRow + lastPageSize;
-                    query = lastQueryBuilder
-                        ? lastQueryBuilder()
-                        : lastQueryText;
-                    return [4 /*yield*/, executeSearch(query, { pageSize: lastPageSize }, nextStartRow, true // Append results
-                        )];
-                case 2:
-                    parsedResults = _a.sent();
-                    setCurrentStartRow(nextStartRow);
-                    return [2 /*return*/, parsedResults];
-                case 3:
-                    if (mountedRef.current) {
-                        setLoadingMore(false);
-                    }
-                    return [7 /*endfinally*/];
-                case 4: return [2 /*return*/];
+    const loadMore = useCallback(async () => {
+        if (!lastQueryBuilder && !lastQueryText) {
+            const err = new Error('[useSPFxPnPSearch] No previous search to load more from. Call search() first.');
+            setError(err);
+            throw err;
+        }
+        if (!lastPageSize) {
+            const err = new Error('[useSPFxPnPSearch] Cannot loadMore without pageSize. Specify pageSize in options or search call.');
+            setError(err);
+            throw err;
+        }
+        setLoadingMore(true);
+        setError(undefined);
+        try {
+            const nextStartRow = currentStartRow + lastPageSize;
+            // Call lastQueryBuilder() to get the original callback function
+            const query = lastQueryBuilder
+                ? lastQueryBuilder()
+                : lastQueryText;
+            const parsedResults = await executeSearch(query, { pageSize: lastPageSize }, nextStartRow, true // Append results
+            );
+            setCurrentStartRow(nextStartRow);
+            return parsedResults;
+        }
+        finally {
+            if (mountedRef.current) {
+                setLoadingMore(false);
             }
-        });
-    }); }, [lastQueryBuilder, lastQueryText, lastPageSize, currentStartRow, executeSearch]);
+        }
+    }, [lastQueryBuilder, lastQueryText, lastPageSize, currentStartRow, executeSearch]);
     /**
      * Re-executes the last search.
      */
-    var refetch = useCallback(function () { return __awaiter(_this, void 0, void 0, function () {
-        var err, query;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    if (!lastQueryBuilder && !lastQueryText) {
-                        err = new Error('[useSPFxPnPSearch] No previous search to refetch. Call search() first.');
-                        setError(err);
-                        throw err;
-                    }
-                    setLoading(true);
-                    setError(undefined);
-                    setCurrentStartRow(0);
-                    _a.label = 1;
-                case 1:
-                    _a.trys.push([1, , 3, 4]);
-                    query = lastQueryBuilder
-                        ? lastQueryBuilder()
-                        : lastQueryText;
-                    return [4 /*yield*/, executeSearch(query, { pageSize: lastPageSize }, 0, false)];
-                case 2:
-                    _a.sent();
-                    return [3 /*break*/, 4];
-                case 3:
-                    if (mountedRef.current) {
-                        setLoading(false);
-                    }
-                    return [7 /*endfinally*/];
-                case 4: return [2 /*return*/];
+    const refetch = useCallback(async () => {
+        if (!lastQueryBuilder && !lastQueryText) {
+            const err = new Error('[useSPFxPnPSearch] No previous search to refetch. Call search() first.');
+            setError(err);
+            throw err;
+        }
+        setLoading(true);
+        setError(undefined);
+        setCurrentStartRow(0);
+        try {
+            // Call lastQueryBuilder() to get the original callback function
+            const query = lastQueryBuilder
+                ? lastQueryBuilder()
+                : lastQueryText;
+            await executeSearch(query, { pageSize: lastPageSize }, 0, false);
+        }
+        finally {
+            if (mountedRef.current) {
+                setLoading(false);
             }
-        });
-    }); }, [lastQueryBuilder, lastQueryText, lastPageSize, executeSearch]);
+        }
+    }, [lastQueryBuilder, lastQueryText, lastPageSize, executeSearch]);
     /**
      * Applies a refiner filter to the current search.
      */
-    var applyRefiner = useCallback(function (refinerName, refinerValue) { return __awaiter(_this, void 0, void 0, function () {
-        var err, newRefiners, existing, index, updated, query;
-        var _a;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    if (!lastQueryBuilder && !lastQueryText) {
-                        err = new Error('[useSPFxPnPSearch] No previous search to apply refiner to. Call search() first.');
-                        setError(err);
-                        throw err;
-                    }
-                    newRefiners = new Map();
-                    appliedRefiners.forEach(function (value, key) {
-                        newRefiners.set(key, value);
-                    });
-                    existing = (_a = newRefiners.get(refinerName)) !== null && _a !== void 0 ? _a : [];
-                    index = existing.indexOf(refinerValue);
-                    if (index > -1) {
-                        updated = existing.slice();
-                        updated.splice(index, 1);
-                        if (updated.length === 0) {
-                            newRefiners.delete(refinerName);
-                        }
-                        else {
-                            newRefiners.set(refinerName, updated);
-                        }
-                    }
-                    else {
-                        newRefiners.set(refinerName, existing.concat([refinerValue]));
-                    }
-                    // Update state for UI
-                    setAppliedRefiners(newRefiners);
-                    // Re-execute search with new refiners passed directly
-                    // This avoids the race condition where state isn't updated yet
-                    setLoading(true);
-                    setError(undefined);
-                    setCurrentStartRow(0);
-                    _b.label = 1;
-                case 1:
-                    _b.trys.push([1, , 3, 4]);
-                    query = lastQueryBuilder
-                        ? lastQueryBuilder()
-                        : lastQueryText;
-                    // Pass newRefiners directly to avoid race condition
-                    return [4 /*yield*/, executeSearch(query, { pageSize: lastPageSize }, 0, false, newRefiners)];
-                case 2:
-                    // Pass newRefiners directly to avoid race condition
-                    _b.sent();
-                    return [3 /*break*/, 4];
-                case 3:
-                    if (mountedRef.current) {
-                        setLoading(false);
-                    }
-                    return [7 /*endfinally*/];
-                case 4: return [2 /*return*/];
-            }
+    const applyRefiner = useCallback(async (refinerName, refinerValue) => {
+        if (!lastQueryBuilder && !lastQueryText) {
+            const err = new Error('[useSPFxPnPSearch] No previous search to apply refiner to. Call search() first.');
+            setError(err);
+            throw err;
+        }
+        // Calculate new refiners map (toggle logic)
+        const newRefiners = new Map();
+        appliedRefiners.forEach(function (value, key) {
+            newRefiners.set(key, value);
         });
-    }); }, [lastQueryBuilder, lastQueryText, lastPageSize, appliedRefiners, executeSearch]);
+        const existing = newRefiners.get(refinerName) ?? [];
+        // Toggle: if already exists, remove; otherwise add
+        const index = existing.indexOf(refinerValue);
+        if (index > -1) {
+            const updated = existing.slice();
+            updated.splice(index, 1);
+            if (updated.length === 0) {
+                newRefiners.delete(refinerName);
+            }
+            else {
+                newRefiners.set(refinerName, updated);
+            }
+        }
+        else {
+            newRefiners.set(refinerName, existing.concat([refinerValue]));
+        }
+        // Update state for UI
+        setAppliedRefiners(newRefiners);
+        // Re-execute search with new refiners passed directly
+        // This avoids the race condition where state isn't updated yet
+        setLoading(true);
+        setError(undefined);
+        setCurrentStartRow(0);
+        try {
+            // Call lastQueryBuilder() to get the original callback function
+            const query = lastQueryBuilder
+                ? lastQueryBuilder()
+                : lastQueryText;
+            // Pass newRefiners directly to avoid race condition
+            await executeSearch(query, { pageSize: lastPageSize }, 0, false, newRefiners);
+        }
+        finally {
+            if (mountedRef.current) {
+                setLoading(false);
+            }
+        }
+    }, [lastQueryBuilder, lastQueryText, lastPageSize, appliedRefiners, executeSearch]);
     return {
         search: search,
         suggest: suggest,