@uniformdev/search 0.0.1 → 0.0.3

package/dist/react.js

@@ -21,10 +21,15 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var react_exports = {};
 __export(react_exports, {
   DOTS: () => DOTS,
+  SearchContext: () => SearchContext,
+  SearchItemDefaultUrlResolverProvider: () => SearchItemDefaultUrlResolverProvider,
+  SearchItemUrlResolverProvider: () => SearchItemUrlResolverProvider,
   SearchProvider: () => SearchProvider,
+  createDefaultUrlResolver: () => createDefaultUrlResolver,
   usePagination: () => usePagination,
   useSearch: () => useSearch,
-  useSearchPagination: () => useSearchPagination
+  useSearchPagination: () => useSearchPagination,
+  useUrlResolver: () => useUrlResolver
 });
 module.exports = __toCommonJS(react_exports);
 
@@ -41,7 +46,14 @@ var DEFAULT_PAGE_SIZE = 10;
 
 // src/utils.ts
 var buildOrderByQuery = (orderBy) => {
-  return `${orderBy.field}_${orderBy.direction}`;
+  var _a;
+  const field = orderBy.field;
+  if (field && typeof field === "object" && "field" in field) {
+    const sv = field;
+    return `${sv.field}_${sv.direction.toUpperCase()}`;
+  }
+  if (!field || field === "relevance") return "";
+  return `${field}_${(_a = orderBy.direction) != null ? _a : "ASC"}`;
 };
 var getSearchParamsFromUrl = (urlString) => {
   if (!urlString) {
@@ -61,13 +73,13 @@ var getSearchParamsFromUrl = (urlString) => {
 
 // src/flattenBlockParams.ts
 function resolveFieldValue(field, locale = "en-us") {
-  var _a, _b;
+  var _a;
   if (!field || typeof field !== "object") return field;
   if (field.type === "$block" && Array.isArray(field.value)) {
     return flattenBlockParams(field.value, locale);
   }
   if (field.locales && typeof field.locales === "object") {
-    return (_b = (_a = field.locales[locale]) != null ? _a : Object.values(field.locales)[0]) != null ? _b : field.value;
+    return (_a = field.locales[locale]) != null ? _a : field.value;
   }
   return field.value;
 }
@@ -87,67 +99,71 @@ function flattenBlockParams(items, locale = "en-us") {
 
 // src/react/SearchProvider.tsx
 var import_jsx_runtime = require("react/jsx-runtime");
-var ALL_COLLECTIONS = ["entries", "compositions", "assets"];
 var SearchContext = (0, import_react.createContext)(null);
 var SearchProvider = ({
   children,
   performSearch,
-  contentType,
-  filterBy: filterByRaw,
   orderBy: orderByRaw,
-  baseFilters: baseFiltersRaw,
+  baseFilterString,
   pageSizes: pageSizesRaw,
-  collections: collectionsRaw,
-  searchDebounceMs = 300
+  queryBy,
+  searchDebounceMs = 300,
+  locale,
+  maxFacetValues = 100
 }) => {
-  var _a;
-  const filterBy = (0, import_react.useMemo)(() => flattenBlockParams(filterByRaw), [filterByRaw]);
-  const baseFiltersFlat = (0, import_react.useMemo)(() => flattenBlockParams(baseFiltersRaw), [baseFiltersRaw]);
-  const orderByFlat = (0, import_react.useMemo)(() => flattenBlockParams(orderByRaw), [orderByRaw]);
-  const pageSizesFlat = (0, import_react.useMemo)(() => flattenBlockParams(pageSizesRaw), [pageSizesRaw]);
-  const initCollections = (0, import_react.useMemo)(() => {
-    if (!collectionsRaw) return void 0;
-    const items = Array.isArray(collectionsRaw) ? collectionsRaw : collectionsRaw.split(",").map((s) => s.trim());
-    const valid = items.filter(
-      (c) => ["entries", "compositions", "assets"].includes(c)
-    );
-    return valid.length > 0 ? valid : void 0;
-  }, [collectionsRaw]);
-  const baseFilterQuery = (0, import_react.useMemo)(
-    () => baseFiltersFlat.reduce((acc, filter) => {
-      if (!(filter == null ? void 0 : filter.fieldKey) || !Array.isArray(filter.values)) return acc;
-      return {
-        ...acc,
-        [`${filter.fieldKey}[eq]`]: filter.values.map((v) => v.value)
-      };
-    }, {}),
-    [baseFiltersFlat]
-  );
+  var _a, _b;
+  const [filterBy, setFilterOptions] = (0, import_react.useState)([]);
+  const registerFilterOption = (0, import_react.useCallback)((filter) => {
+    if (!(filter == null ? void 0 : filter.fieldKey)) return;
+    setFilterOptions((prev) => [...prev.filter((f) => f.fieldKey !== filter.fieldKey), filter]);
+  }, []);
+  const unregisterFilterOption = (0, import_react.useCallback)((fieldKey) => {
+    setFilterOptions((prev) => prev.filter((f) => f.fieldKey !== fieldKey));
+  }, []);
+  const [orderByRegistry, setOrderByRegistry] = (0, import_react.useState)([]);
+  const registerOrderBy = (0, import_react.useCallback)((id, raw) => {
+    if (!id) return;
+    const options = flattenBlockParams(raw);
+    setOrderByRegistry((prev) => [...prev.filter((e) => e.id !== id), { id, options }]);
+  }, []);
+  const unregisterOrderBy = (0, import_react.useCallback)((id) => {
+    setOrderByRegistry((prev) => prev.filter((e) => e.id !== id));
+  }, []);
+  const propOrderByFlat = (0, import_react.useMemo)(() => flattenBlockParams(orderByRaw), [orderByRaw]);
+  const lastRegisteredOrderBy = [...orderByRegistry].reverse().find((e) => e.options.length > 0);
+  const orderByFlat = lastRegisteredOrderBy ? lastRegisteredOrderBy.options : propOrderByFlat;
+  const [pageSizesRegistry, setPageSizesRegistry] = (0, import_react.useState)([]);
+  const registerPageSizes = (0, import_react.useCallback)((id, raw) => {
+    if (!id) return;
+    const sizes = flattenBlockParams(raw);
+    setPageSizesRegistry((prev) => [...prev.filter((e) => e.id !== id), { id, sizes }]);
+  }, []);
+  const unregisterPageSizes = (0, import_react.useCallback)((id) => {
+    setPageSizesRegistry((prev) => prev.filter((e) => e.id !== id));
+  }, []);
+  const propPageSizesFlat = (0, import_react.useMemo)(() => flattenBlockParams(pageSizesRaw), [pageSizesRaw]);
+  const lastRegisteredPageSizes = [...pageSizesRegistry].reverse().find((e) => e.sizes.length > 0);
+  const pageSizesFlat = lastRegisteredPageSizes ? lastRegisteredPageSizes.sizes : propPageSizesFlat;
   const facetBy = (0, import_react.useMemo)(
-    () => filterBy.filter((f) => (f == null ? void 0 : f.enableFaceting) && (f == null ? void 0 : f.fieldKey)).map((f) => f.fieldKey).join(","),
+    () => filterBy.filter((f) => f == null ? void 0 : f.fieldKey).map((f) => f.fieldKey).join(","),
     [filterBy]
   );
   const defaultOrderByQuery = (0, import_react.useMemo)(
-    () => orderByFlat[0] ? buildOrderByQuery(orderByFlat[0]) : "created_at_DESC",
+    () => orderByFlat[0] ? buildOrderByQuery(orderByFlat[0]) : void 0,
     [orderByFlat]
   );
   const orderByOptions = (0, import_react.useMemo)(
     () => orderByFlat.map((o) => ({ title: o.title, value: buildOrderByQuery(o) })),
     [orderByFlat]
   );
-  const initPerPage = ((_a = pageSizesFlat[0]) == null ? void 0 : _a.size) || DEFAULT_PAGE_SIZE;
-  const hasFetchedInitial = (0, import_react.useRef)(false);
+  const initPerPage = ((_a = pageSizesFlat.find((ps) => ps.default)) == null ? void 0 : _a.size) || ((_b = pageSizesFlat[0]) == null ? void 0 : _b.size) || DEFAULT_PAGE_SIZE;
   const searchDebounceRef = (0, import_react.useRef)(null);
-  const [selectedCollections, setSelectedCollections] = (0, import_react.useState)(
-    initCollections || ALL_COLLECTIONS
-  );
+  const searchRequestIdRef = (0, import_react.useRef)(0);
   const [urlParams, setUrlParams] = (0, import_react.useState)(() => {
     if (typeof window === "undefined") return {};
     return getSearchParamsFromUrl(window.location.href);
   });
-  const [searchBoxValue, setSearchBoxValue] = (0, import_react.useState)(
-    (urlParams == null ? void 0 : urlParams[UNIFORM_SEARCH_QUERY_KEY]) || ""
-  );
+  const [searchBoxValue, setSearchBoxValue] = (0, import_react.useState)((urlParams == null ? void 0 : urlParams[UNIFORM_SEARCH_QUERY_KEY]) || "");
   const [isLoading, setIsLoading] = (0, import_react.useState)(true);
   const [entries, setEntries] = (0, import_react.useState)({
     items: [],
@@ -157,17 +173,16 @@ var SearchProvider = ({
     totalPages: 0
   });
   const [facets, setFacets] = (0, import_react.useState)({});
-  const [collectionResults, setCollectionResults] = (0, import_react.useState)({});
   const pathname = (0, import_react.useMemo)(() => {
     if (typeof window === "undefined") return "/";
     return window.location.pathname;
   }, []);
-  const page = Number(urlParams == null ? void 0 : urlParams[UNIFORM_SEARCH_PAGE_KEY]) - 1 && Number(urlParams == null ? void 0 : urlParams[UNIFORM_SEARCH_PAGE_KEY]) - 1 > 0 ? Number(urlParams == null ? void 0 : urlParams[UNIFORM_SEARCH_PAGE_KEY]) - 1 : FIRST_PAGE;
+  const page = Number(urlParams == null ? void 0 : urlParams[UNIFORM_SEARCH_PAGE_KEY]) - 1 > 0 ? Number(urlParams == null ? void 0 : urlParams[UNIFORM_SEARCH_PAGE_KEY]) - 1 : FIRST_PAGE;
   const search = (urlParams == null ? void 0 : urlParams[UNIFORM_SEARCH_QUERY_KEY]) || "";
   const perPage = Number(urlParams == null ? void 0 : urlParams[UNIFORM_SEARCH_PAGE_SIZE_KEY]) || initPerPage;
   const selectedFilters = (0, import_react.useMemo)(
     () => filterBy.reduce((acc, filter) => {
-      const value2 = urlParams == null ? void 0 : urlParams[filter.fieldId];
+      const value2 = urlParams == null ? void 0 : urlParams[filter.fieldKey];
       if (value2) {
         acc[filter.fieldKey] = Array.isArray(value2) ? value2 : [value2];
       }
@@ -176,10 +191,13 @@ var SearchProvider = ({
     [filterBy, urlParams]
   );
   (0, import_react.useEffect)(() => {
+    const requestId = ++searchRequestIdRef.current;
     const doFetch = async () => {
-      var _a2;
-      const filterQuery = Object.entries(selectedFilters).reduce((acc, [fieldKey, values]) => {
+      var _a2, _b2;
+      const currentOrderByQuery = (urlParams == null ? void 0 : urlParams[UNIFORM_SEARCH_ORDER_BY_KEY]) || defaultOrderByQuery;
+      const buildFilters = (excludeField) => Object.entries(selectedFilters).reduce((acc, [fieldKey, values]) => {
         var _a3;
+        if (excludeField && fieldKey === excludeField) return acc;
         if (!values || values.length === 0) return acc;
         const filterType = (_a3 = filterBy.find((f) => f.fieldKey === fieldKey)) == null ? void 0 : _a3.type;
         if (filterType === "range") {
@@ -188,65 +206,69 @@ var SearchProvider = ({
         }
         return { ...acc, [`${fieldKey}[in]`]: values };
       }, {});
-      const currentOrderByQuery = (urlParams == null ? void 0 : urlParams[UNIFORM_SEARCH_ORDER_BY_KEY]) || defaultOrderByQuery;
-      const filters = {
-        ...baseFilterQuery,
-        ...filterQuery
-      };
-      if (contentType) {
-        filters["contentType[eq]"] = contentType;
-      }
-      const { results } = await performSearch({
-        page,
-        perPage,
-        filters,
-        facetBy,
-        search,
-        orderBy: currentOrderByQuery,
-        collections: selectedCollections
+      const selectedFacetFields = Object.keys(selectedFilters).filter((k) => {
+        var _a3;
+        return ((_a3 = selectedFilters[k]) == null ? void 0 : _a3.length) > 0;
       });
-      setCollectionResults(results || {});
-      const allItems = [];
-      let totalCount = 0;
-      let mergedFacets = {};
-      for (const col of selectedCollections) {
-        const colResult = results == null ? void 0 : results[col];
-        if ((_a2 = colResult == null ? void 0 : colResult.data) == null ? void 0 : _a2.items) {
-          allItems.push(...colResult.data.items);
-          totalCount += colResult.data.total || 0;
-        }
-        if (colResult == null ? void 0 : colResult.facets) {
-          mergedFacets = { ...mergedFacets, ...colResult.facets };
-        }
-      }
-      setEntries({
-        items: allItems,
-        total: totalCount,
-        page,
-        perPage,
-        totalPages: Math.ceil(totalCount / perPage)
+      const queryByString = (queryBy == null ? void 0 : queryBy.length) ? queryBy.join(",") : void 0;
+      const [mainResult, ...disjunctiveResults] = await Promise.all([
+        performSearch({
+          page,
+          perPage,
+          filters: buildFilters(),
+          baseFilterBy: baseFilterString,
+          facetBy,
+          queryBy: queryByString,
+          search,
+          orderBy: currentOrderByQuery,
+          locale,
+          maxFacetValues
+        }),
+        ...selectedFacetFields.map(
+          (field) => performSearch({
+            page: 0,
+            perPage: 0,
+            filters: buildFilters(field),
+            baseFilterBy: baseFilterString,
+            facetBy: field,
+            queryBy: queryByString,
+            search,
+            orderBy: currentOrderByQuery,
+            locale,
+            maxFacetValues
+          })
+        )
+      ]);
+      if (requestId !== searchRequestIdRef.current) return;
+      const mergedFacets = { ...(_a2 = mainResult.facets) != null ? _a2 : {} };
+      selectedFacetFields.forEach((field, i) => {
+        var _a3, _b3;
+        const counts = (_b3 = (_a3 = disjunctiveResults[i]) == null ? void 0 : _a3.facets) == null ? void 0 : _b3[field];
+        if (counts) mergedFacets[field] = counts;
       });
+      setEntries((_b2 = mainResult.data) != null ? _b2 : { items: [], total: 0, page, perPage, totalPages: 0 });
       setFacets(mergedFacets);
     };
     setIsLoading(true);
-    doFetch().catch((error) => console.error("[alex] Search fetch error:", error)).finally(() => {
-      setIsLoading(false);
-      hasFetchedInitial.current = true;
-    });
+    doFetch().catch((error) => console.error("Search fetch error:", error)).finally(() => setIsLoading(false));
   }, [
-    baseFilterQuery,
-    contentType,
+    baseFilterString,
     defaultOrderByQuery,
     facetBy,
     filterBy,
+    locale,
     urlParams,
     page,
     perPage,
     performSearch,
     search,
-    selectedCollections,
     selectedFilters
   ]);
+  (0, import_react.useEffect)(() => {
+    return () => {
+      if (searchDebounceRef.current) clearTimeout(searchDebounceRef.current);
+    };
+  }, []);
   const updateUrl = (0, import_react.useCallback)(
     (params, { replace = false } = {}) => {
       const qs = params.toString();
@@ -276,26 +298,15 @@ var SearchProvider = ({
   const setSearchQuery = (0, import_react.useCallback)(
     (value2) => {
       setSearchBoxValue(value2);
-      if (searchDebounceRef.current) {
-        clearTimeout(searchDebounceRef.current);
-      }
+      if (searchDebounceRef.current) clearTimeout(searchDebounceRef.current);
       if (!value2) {
         commitSearchToUrl(value2);
       } else {
-        searchDebounceRef.current = setTimeout(() => {
-          commitSearchToUrl(value2);
-        }, searchDebounceMs);
+        searchDebounceRef.current = setTimeout(() => commitSearchToUrl(value2), searchDebounceMs);
       }
     },
     [commitSearchToUrl, searchDebounceMs]
   );
-  (0, import_react.useEffect)(() => {
-    return () => {
-      if (searchDebounceRef.current) {
-        clearTimeout(searchDebounceRef.current);
-      }
-    };
-  }, []);
   const setPage = (0, import_react.useCallback)(
     (p) => {
       const params = new URLSearchParams(window.location.search);
@@ -328,28 +339,22 @@ var SearchProvider = ({
   );
   const setSelectedFilters = (0, import_react.useCallback)(
     (nextSelected) => {
-      const params = new URLSearchParams();
+      const params = new URLSearchParams(window.location.search);
       params.delete(UNIFORM_SEARCH_PAGE_KEY);
-      if (search) {
-        params.set(UNIFORM_SEARCH_QUERY_KEY, search);
-      }
+      filterBy.forEach((f) => params.delete(f.fieldKey));
       Object.entries(nextSelected).forEach(([key, value2]) => {
         const filter = filterBy.find((f) => f.fieldKey === key);
         if (!filter) return;
-        value2.forEach((v) => {
-          params.append(filter.fieldId, v);
-        });
+        value2.forEach((v) => params.append(key, v));
       });
       updateUrl(params);
     },
-    [filterBy, search, updateUrl]
+    [filterBy, updateUrl]
   );
   const clearFilters = (0, import_react.useCallback)(() => {
     setIsLoading(true);
     setSearchBoxValue("");
-    if (searchDebounceRef.current) {
-      clearTimeout(searchDebounceRef.current);
-    }
+    if (searchDebounceRef.current) clearTimeout(searchDebounceRef.current);
     window.history.pushState({}, "", pathname);
     setUrlParams(getSearchParamsFromUrl(window.location.href));
   }, [pathname]);
@@ -374,7 +379,6 @@ var SearchProvider = ({
       results: entries,
       facets,
       isLoading,
-      collectionResults,
       searchBoxValue,
       setSearchQuery,
       page,
@@ -382,32 +386,42 @@ var SearchProvider = ({
       pageSize: perPage,
       setPageSize,
       pageSizes: pageSizesFlat,
+      registerPageSizes,
+      unregisterPageSizes,
       orderByOptions,
-      selectedOrderBy: (urlParams == null ? void 0 : urlParams[UNIFORM_SEARCH_ORDER_BY_KEY]) || defaultOrderByQuery,
+      selectedOrderBy: (urlParams == null ? void 0 : urlParams[UNIFORM_SEARCH_ORDER_BY_KEY]) || defaultOrderByQuery || "",
       setOrderBy,
+      registerOrderBy,
+      unregisterOrderBy,
       filterOptions: filterBy,
+      setFilterOptions,
+      registerFilterOption,
+      unregisterFilterOption,
       selectedFilters,
       setSelectedFilters,
       clearFilters,
-      selectedCollections,
-      setSelectedCollections,
       formatResultsSummary
     }),
     [
       clearFilters,
-      collectionResults,
       defaultOrderByQuery,
       entries,
       facets,
       filterBy,
+      setFilterOptions,
+      registerFilterOption,
+      unregisterFilterOption,
       formatResultsSummary,
       isLoading,
       orderByOptions,
+      registerOrderBy,
+      unregisterOrderBy,
       page,
       pageSizesFlat,
+      registerPageSizes,
+      unregisterPageSizes,
       perPage,
       searchBoxValue,
-      selectedCollections,
       selectedFilters,
       setOrderBy,
       setPage,
@@ -508,12 +522,74 @@ function useSearchPagination(siblingCount) {
     isLoading
   };
 }
+
+// src/react/SearchItemUrlResolver.tsx
+var import_react5 = require("react");
+var import_jsx_runtime2 = require("react/jsx-runtime");
+var NOOP_RESOLVER = () => void 0;
+var UserUrlResolverContext = (0, import_react5.createContext)(null);
+var DefaultUrlResolverContext = (0, import_react5.createContext)(NOOP_RESOLVER);
+var SearchItemUrlResolverProvider = ({
+  resolver,
+  children
+}) => /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(UserUrlResolverContext.Provider, { value: resolver, children });
+var SearchItemDefaultUrlResolverProvider = ({
+  resolver,
+  children
+}) => /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(DefaultUrlResolverContext.Provider, { value: resolver, children });
+function useUrlResolver() {
+  const user = (0, import_react5.useContext)(UserUrlResolverContext);
+  const def = (0, import_react5.useContext)(DefaultUrlResolverContext);
+  return user != null ? user : def;
+}
+function resolveField(obj, path) {
+  return path.split(".").reduce((current, key) => {
+    if (current == null) {
+      return void 0;
+    }
+    if (Array.isArray(current)) {
+      current = current[0];
+    }
+    return current == null ? void 0 : current[key];
+  }, obj);
+}
+function createDefaultUrlResolver(configs, options = {}) {
+  const { pathsByNodeId = {}, locale } = options;
+  return (hit) => {
+    var _a;
+    const hitSource = typeof hit.source === "string" ? hit.source : "";
+    const hitType = typeof hit.type === "string" ? hit.type : "";
+    const config = configs.find((c) => c.source === hitSource && c.type === hitType);
+    if (config) {
+      const template = (_a = config.nodeId ? pathsByNodeId[config.nodeId] : void 0) != null ? _a : config.urlTemplate;
+      if (template) {
+        return template.replace(/:([a-zA-Z0-9_-]+)/g, (_, token) => {
+          var _a2, _b;
+          if (token === "locale") return locale != null ? locale : "";
+          const fieldKey = (_a2 = config.tokenMapping) == null ? void 0 : _a2[token];
+          if (!fieldKey) return "";
+          const val = resolveField(hit, fieldKey);
+          return Array.isArray(val) ? String((_b = val[0]) != null ? _b : "") : String(val != null ? val : "");
+        });
+      }
+    }
+    if (hitSource === "composition" && typeof hit.path === "string") {
+      return hit.path;
+    }
+    return void 0;
+  };
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   DOTS,
+  SearchContext,
+  SearchItemDefaultUrlResolverProvider,
+  SearchItemUrlResolverProvider,
   SearchProvider,
+  createDefaultUrlResolver,
   usePagination,
   useSearch,
-  useSearchPagination
+  useSearchPagination,
+  useUrlResolver
 });
 //# sourceMappingURL=react.js.map