@wix/headless-stores 0.0.18 → 0.0.20

package/cjs/dist/services/catalog-service.d.ts

@@ -0,0 +1,35 @@
+import { type ServiceFactoryConfig } from "@wix/services-definitions";
+import { type Signal } from "@wix/services-definitions/core-services/signals";
+export interface ProductOption {
+    id: string;
+    name: string;
+    choices: ProductChoice[];
+    optionRenderType?: string;
+}
+export interface ProductChoice {
+    id: string;
+    name: string;
+    colorCode?: string;
+}
+export interface CatalogPriceRange {
+    minPrice: number;
+    maxPrice: number;
+}
+export interface CatalogServiceAPI {
+    catalogOptions: Signal<ProductOption[] | null>;
+    catalogPriceRange: Signal<CatalogPriceRange | null>;
+    isLoading: Signal<boolean>;
+    error: Signal<string | null>;
+    loadCatalogData: (categoryId?: string) => Promise<void>;
+}
+export declare const CatalogServiceDefinition: string & {
+    __api: CatalogServiceAPI;
+    __config: {};
+    isServiceDefinition?: boolean;
+} & CatalogServiceAPI;
+export declare const CatalogService: import("@wix/services-definitions").ServiceFactory<string & {
+    __api: CatalogServiceAPI;
+    __config: {};
+    isServiceDefinition?: boolean;
+} & CatalogServiceAPI, {}>;
+export declare function loadCatalogServiceConfig(): Promise<ServiceFactoryConfig<typeof CatalogService>>;

package/{dist/services/catalog-options-service.js → cjs/dist/services/catalog-service.js}

@@ -9,6 +9,12 @@ const extractAggregationValues = (aggregationResponse, name) => {
         aggregationResponse.aggregationData?.results?.find((r) => r.name === name);
     return aggregation?.values?.results?.map((item) => item.value) || [];
 };
+const extractScalarAggregationValue = (aggregationResponse, name) => {
+    const aggregation = aggregationResponse.aggregations?.[name] ||
+        aggregationResponse.aggregationData?.results?.find((r) => r.name === name);
+    const value = aggregation?.scalar?.value;
+    return value !== undefined && value !== null ? parseFloat(value) : null;
+};
 const matchesAggregationName = (name, aggregationNames) => {
     return aggregationNames.some((aggName) => aggName.toLowerCase() === name.toLowerCase());
 };
@@ -37,19 +43,34 @@ const buildCategoryFilter = (categoryId) => {
         },
     };
 };
-export const CatalogOptionsServiceDefinition = defineService("catalogOptions");
-export const CatalogOptionsService = implementService.withConfig()(CatalogOptionsServiceDefinition, ({ getService }) => {
+export const CatalogServiceDefinition = defineService("catalog");
+export const CatalogService = implementService.withConfig()(CatalogServiceDefinition, ({ getService }) => {
     const signalsService = getService(SignalsServiceDefinition);
     const catalogOptions = signalsService.signal(null);
+    const catalogPriceRange = signalsService.signal(null);
     const isLoading = signalsService.signal(false);
     const error = signalsService.signal(null);
-    const loadCatalogOptions = async (categoryId) => {
+    const loadCatalogData = async (categoryId) => {
         isLoading.set(true);
         error.set(null);
         try {
-            // Step 1: Get unique option and choice names from catalog via aggregation (no products returned)
+            // Single aggregation request to get ALL catalog data at once
             const aggregationRequest = {
                 aggregations: [
+                    // Price range aggregations
+                    {
+                        name: "minPrice",
+                        fieldPath: "actualPriceRange.minValue.amount",
+                        type: "SCALAR",
+                        scalar: { type: "MIN" },
+                    },
+                    {
+                        name: "maxPrice",
+                        fieldPath: "actualPriceRange.maxValue.amount",
+                        type: "SCALAR",
+                        scalar: { type: "MAX" },
+                    },
+                    // Options aggregations
                     {
                         name: "optionNames",
                         fieldPath: "options.name",
@@ -85,16 +106,31 @@ export const CatalogOptionsService = implementService.withConfig()(CatalogOption
                 includeProducts: false,
                 cursorPaging: { limit: 0 },
             };
-            const aggregationResponse = await productsV3.searchProducts(aggregationRequest);
+            // Make the single aggregation request
+            const [aggregationResponse, customizationsResponse] = await Promise.all([
+                productsV3.searchProducts(aggregationRequest),
+                customizationsV3.queryCustomizations().find(),
+            ]);
+            // Process price range data
+            const minPrice = extractScalarAggregationValue(aggregationResponse, "minPrice");
+            const maxPrice = extractScalarAggregationValue(aggregationResponse, "maxPrice");
+            if (minPrice !== null &&
+                maxPrice !== null &&
+                (minPrice > 0 || maxPrice > 0)) {
+                catalogPriceRange.set({
+                    minPrice,
+                    maxPrice,
+                });
+            }
+            else {
+                catalogPriceRange.set(null);
+            }
+            // Process options data
             const optionNames = extractAggregationValues(aggregationResponse, "optionNames");
             const choiceNames = extractAggregationValues(aggregationResponse, "choiceNames");
             const inventoryStatuses = extractAggregationValues(aggregationResponse, "inventoryStatus");
-            // Step 2: Get option structure from customizations API
-            const customizationsResponse = await customizationsV3
-                .queryCustomizations()
-                .find();
             const customizations = customizationsResponse.items || [];
-            // Step 3: Build options by matching customizations with aggregation data
+            // Build options by matching customizations with aggregation data
             const options = customizations
                 .filter((customization) => customization.name &&
                 customization._id &&
@@ -119,11 +155,11 @@ export const CatalogOptionsService = implementService.withConfig()(CatalogOption
                 };
             })
                 .filter((option) => option.choices.length > 0);
-            // Step 4: Add inventory filter if there are multiple inventory statuses
+            // Add inventory filter if there are multiple inventory statuses
             if (inventoryStatuses.length > 1) {
                 const inventoryChoices = inventoryStatuses.map((status) => ({
-                    id: status.toUpperCase(), // Use uppercase to match actual availabilityStatus values
-                    name: status.toUpperCase(), // Use raw status value - UI components will handle display conversion
+                    id: status.toUpperCase(),
+                    name: status.toUpperCase(),
                 }));
                 options.push({
                     id: "inventory-filter",
@@ -135,9 +171,10 @@ export const CatalogOptionsService = implementService.withConfig()(CatalogOption
             catalogOptions.set(options);
         }
         catch (err) {
-            console.error("Failed to load catalog options:", err);
-            error.set(err instanceof Error ? err.message : "Failed to load catalog options");
+            console.error("Failed to load catalog data:", err);
+            error.set(err instanceof Error ? err.message : "Failed to load catalog data");
             catalogOptions.set([]);
+            catalogPriceRange.set(null);
         }
         finally {
             isLoading.set(false);
@@ -145,11 +182,12 @@ export const CatalogOptionsService = implementService.withConfig()(CatalogOption
     };
     return {
         catalogOptions,
+        catalogPriceRange,
         isLoading,
         error,
-        loadCatalogOptions,
+        loadCatalogData,
     };
 });
-export async function loadCatalogOptionsServiceConfig() {
+export async function loadCatalogServiceConfig() {
     return {};
 }

package/cjs/dist/services/collection-service.d.ts

@@ -1,6 +1,6 @@
 import { type ServiceFactoryConfig } from "@wix/services-definitions";
-import { type Signal } from "@wix/services-definitions/core-services/signals";
-import * as productsV3 from "@wix/auto_sdk_stores_products-v-3";
+import type { Signal } from "@wix/services-definitions/core-services/signals";
+import { productsV3 } from "@wix/stores";
 import { type Filter } from "./filter-service.js";
 import { type SortBy } from "./sort-service.js";
 export interface CollectionServiceAPI {

package/cjs/dist/services/collection-service.js

@@ -1,10 +1,10 @@
 import { defineService, implementService, } from "@wix/services-definitions";
-import { SignalsServiceDefinition, } from "@wix/services-definitions/core-services/signals";
-import * as productsV3 from "@wix/auto_sdk_stores_products-v-3";
-import * as readOnlyVariantsV3 from "@wix/auto_sdk_stores_read-only-variants-v-3";
+import { SignalsServiceDefinition } from "@wix/services-definitions/core-services/signals";
+import { productsV3, readOnlyVariantsV3 } from "@wix/stores";
 import { FilterServiceDefinition } from "./filter-service.js";
 import { CategoryServiceDefinition } from "./category-service.js";
 import { SortServiceDefinition } from "./sort-service.js";
+import { CatalogServiceDefinition } from "./catalog-service.js";
 import { URLParamsUtils } from "../utils/url-params.js";
 import { SortType } from "../enums/sort-enums.js";
 const { SortDirection } = productsV3;
@@ -159,6 +159,7 @@ export const CollectionService = implementService.withConfig()(CollectionService
     const collectionFilters = getService(FilterServiceDefinition);
     const categoryService = getService(CategoryServiceDefinition);
     const sortService = getService(SortServiceDefinition);
+    const catalogService = getService(CatalogServiceDefinition);
     const hasMoreProducts = signalsService.signal((config.initialHasMore ?? true));
     let nextCursor = config.initialCursor;
     const initialProducts = config.initialProducts || [];
@@ -287,13 +288,11 @@ export const CollectionService = implementService.withConfig()(CollectionService
     const initializeCatalogData = async () => {
         isInitializingCatalogData = true; // Set flag BEFORE loading
         const selectedCategory = categoryService.selectedCategory.get();
-        await collectionFilters.loadCatalogPriceRange(selectedCategory || undefined);
-        await collectionFilters.loadCatalogOptions(selectedCategory || undefined);
+        // Load catalog data from the combined catalog service
+        await catalogService.loadCatalogData(selectedCategory || undefined);
         // Reset flag to allow filter changes to trigger refreshes
         isInitializingCatalogData = false;
     };
-    // Load catalog data on initialization
-    void initializeCatalogData();
     signalsService.effect(() => {
         sortService.currentSort.get();
         debouncedRefresh(false);

package/cjs/dist/services/filter-service.d.ts

@@ -1,14 +1,5 @@
-import { type Signal, type ReadOnlySignal } from "@wix/services-definitions/core-services/signals";
-export interface ProductOption {
-    id: string;
-    name: string;
-    choices: {
-        id: string;
-        name: string;
-        colorCode?: string;
-    }[];
-    optionRenderType?: string;
-}
+import type { Signal, ReadOnlySignal } from "@wix/services-definitions/core-services/signals";
+import { type ProductOption } from "./catalog-service.js";
 export interface PriceRange {
     min: number;
     max: number;
@@ -37,8 +28,6 @@ export interface FilterServiceAPI {
             max: number;
         };
     }>;
-    loadCatalogPriceRange: (categoryId?: string) => Promise<void>;
-    loadCatalogOptions: (categoryId?: string) => Promise<void>;
     isFullyLoaded: ReadOnlySignal<boolean>;
 }
 export declare const FilterServiceDefinition: string & {

package/cjs/dist/services/filter-service.js

@@ -1,8 +1,7 @@
 import { defineService, implementService } from "@wix/services-definitions";
-import { SignalsServiceDefinition, } from "@wix/services-definitions/core-services/signals";
+import { SignalsServiceDefinition } from "@wix/services-definitions/core-services/signals";
 import { URLParamsUtils } from "../utils/url-params.js";
-import { CatalogPriceRangeServiceDefinition } from "./catalog-price-range-service.js";
-import { CatalogOptionsServiceDefinition } from "./catalog-options-service.js";
+import { CatalogServiceDefinition, } from "./catalog-service.js";
 export const FilterServiceDefinition = defineService("filtered-collection");
 export const defaultFilter = {
     priceRange: { min: 0, max: 0 },
@@ -10,13 +9,12 @@ export const defaultFilter = {
 };
 export const FilterService = implementService.withConfig()(FilterServiceDefinition, ({ getService, config }) => {
     const signalsService = getService(SignalsServiceDefinition);
-    const catalogPriceRangeService = getService(CatalogPriceRangeServiceDefinition);
-    const catalogOptionsService = getService(CatalogOptionsServiceDefinition);
+    const catalogService = getService(CatalogServiceDefinition);
     const currentFilters = signalsService.signal((config?.initialFilters || defaultFilter));
     // Use computed signal for availableOptions to automatically track dependencies
     const availableOptions = signalsService.computed(() => {
-        const catalogPriceRange = catalogPriceRangeService.catalogPriceRange.get();
-        const catalogOptions = catalogOptionsService.catalogOptions.get();
+        const catalogPriceRange = catalogService.catalogPriceRange.get();
+        const catalogOptions = catalogService.catalogOptions.get();
         const priceRange = catalogPriceRange &&
             catalogPriceRange.minPrice < catalogPriceRange.maxPrice
             ? { min: catalogPriceRange.minPrice, max: catalogPriceRange.maxPrice }
@@ -29,8 +27,8 @@ export const FilterService = implementService.withConfig()(FilterServiceDefiniti
     });
     // Use computed signal for isFullyLoaded to automatically track dependencies
     const isFullyLoaded = signalsService.computed(() => {
-        const catalogPriceRange = catalogPriceRangeService.catalogPriceRange.get();
-        const catalogOptions = catalogOptionsService.catalogOptions.get();
+        const catalogPriceRange = catalogService.catalogPriceRange.get();
+        const catalogOptions = catalogService.catalogOptions.get();
         // Price range data is considered loaded whether it's null (no prices) or has valid data
         const hasPriceRangeData = catalogPriceRange !== undefined; // includes null case
         const hasOptionsData = !!(catalogOptions && catalogOptions.length >= 0); // Even 0 options is valid
@@ -38,7 +36,7 @@ export const FilterService = implementService.withConfig()(FilterServiceDefiniti
     });
     // Effect to update currentFilters when catalog data loads (only if filters are at defaults)
     signalsService.effect(() => {
-        const catalogPriceRange = catalogPriceRangeService.catalogPriceRange.get();
+        const catalogPriceRange = catalogService.catalogPriceRange.get();
         if (catalogPriceRange &&
             catalogPriceRange.minPrice < catalogPriceRange.maxPrice) {
             const priceRange = {
@@ -111,23 +109,11 @@ export const FilterService = implementService.withConfig()(FilterServiceDefiniti
         }
         URLParamsUtils.updateURL(urlParams);
     };
-    // Note: calculateAvailableOptions was removed as it's no longer needed
-    // Options are now loaded from the catalog-wide service via loadCatalogOptions
-    const loadCatalogPriceRange = async (categoryId) => {
-        // Just call the catalog service - subscriptions will handle signal updates
-        await catalogPriceRangeService.loadCatalogPriceRange(categoryId);
-    };
-    const loadCatalogOptions = async (categoryId) => {
-        // Just call the catalog service - subscriptions will handle signal updates
-        await catalogOptionsService.loadCatalogOptions(categoryId);
-    };
     return {
         currentFilters,
         applyFilters,
         clearFilters,
         availableOptions,
-        loadCatalogPriceRange,
-        loadCatalogOptions,
         isFullyLoaded,
     };
 });

package/cjs/dist/services/index.d.ts

@@ -1,9 +1,8 @@
 export { buyNowServiceBinding, loadBuyNowServiceInitialData, } from "./buy-now-service.js";
 export { payNowServiceBinding, loadPayNowServiceInitialData, } from "./pay-now-service.js";
-export { CatalogOptionsService, CatalogOptionsServiceDefinition, loadCatalogOptionsServiceConfig, } from "./catalog-options-service.js";
+export { CatalogService, CatalogServiceDefinition, loadCatalogServiceConfig, } from "./catalog-service.js";
 export { CategoryService, CategoryServiceDefinition, loadCategoriesConfig, } from "./category-service.js";
 export { CollectionService, CollectionServiceDefinition, loadCollectionServiceConfig, } from "./collection-service.js";
-export { CatalogPriceRangeService, CatalogPriceRangeServiceDefinition, loadCatalogPriceRangeServiceConfig, } from "./catalog-price-range-service.js";
 export { FilterService, FilterServiceDefinition, Filter, AvailableOptions, } from "./filter-service.js";
 export { ProductModifiersService, ProductModifiersServiceDefinition, } from "./product-modifiers-service.js";
 export { ProductService, ProductServiceDefinition, loadProductServiceConfig, } from "./product-service.js";

package/cjs/dist/services/index.js

@@ -1,9 +1,8 @@
 export { buyNowServiceBinding, loadBuyNowServiceInitialData, } from "./buy-now-service.js";
 export { payNowServiceBinding, loadPayNowServiceInitialData, } from "./pay-now-service.js";
-export { CatalogOptionsService, CatalogOptionsServiceDefinition, loadCatalogOptionsServiceConfig, } from "./catalog-options-service.js";
+export { CatalogService, CatalogServiceDefinition, loadCatalogServiceConfig, } from "./catalog-service.js";
 export { CategoryService, CategoryServiceDefinition, loadCategoriesConfig, } from "./category-service.js";
 export { CollectionService, CollectionServiceDefinition, loadCollectionServiceConfig, } from "./collection-service.js";
-export { CatalogPriceRangeService, CatalogPriceRangeServiceDefinition, loadCatalogPriceRangeServiceConfig, } from "./catalog-price-range-service.js";
 export { FilterService, FilterServiceDefinition, } from "./filter-service.js";
 export { ProductModifiersService, ProductModifiersServiceDefinition, } from "./product-modifiers-service.js";
 export { ProductService, ProductServiceDefinition, loadProductServiceConfig, } from "./product-service.js";

package/dist/services/catalog-service.d.ts

@@ -0,0 +1,35 @@
+import { type ServiceFactoryConfig } from "@wix/services-definitions";
+import { type Signal } from "@wix/services-definitions/core-services/signals";
+export interface ProductOption {
+    id: string;
+    name: string;
+    choices: ProductChoice[];
+    optionRenderType?: string;
+}
+export interface ProductChoice {
+    id: string;
+    name: string;
+    colorCode?: string;
+}
+export interface CatalogPriceRange {
+    minPrice: number;
+    maxPrice: number;
+}
+export interface CatalogServiceAPI {
+    catalogOptions: Signal<ProductOption[] | null>;
+    catalogPriceRange: Signal<CatalogPriceRange | null>;
+    isLoading: Signal<boolean>;
+    error: Signal<string | null>;
+    loadCatalogData: (categoryId?: string) => Promise<void>;
+}
+export declare const CatalogServiceDefinition: string & {
+    __api: CatalogServiceAPI;
+    __config: {};
+    isServiceDefinition?: boolean;
+} & CatalogServiceAPI;
+export declare const CatalogService: import("@wix/services-definitions").ServiceFactory<string & {
+    __api: CatalogServiceAPI;
+    __config: {};
+    isServiceDefinition?: boolean;
+} & CatalogServiceAPI, {}>;
+export declare function loadCatalogServiceConfig(): Promise<ServiceFactoryConfig<typeof CatalogService>>;

package/{cjs/dist/services/catalog-options-service.js → dist/services/catalog-service.js}

@@ -9,6 +9,12 @@ const extractAggregationValues = (aggregationResponse, name) => {
         aggregationResponse.aggregationData?.results?.find((r) => r.name === name);
     return aggregation?.values?.results?.map((item) => item.value) || [];
 };
+const extractScalarAggregationValue = (aggregationResponse, name) => {
+    const aggregation = aggregationResponse.aggregations?.[name] ||
+        aggregationResponse.aggregationData?.results?.find((r) => r.name === name);
+    const value = aggregation?.scalar?.value;
+    return value !== undefined && value !== null ? parseFloat(value) : null;
+};
 const matchesAggregationName = (name, aggregationNames) => {
     return aggregationNames.some((aggName) => aggName.toLowerCase() === name.toLowerCase());
 };
@@ -37,19 +43,34 @@ const buildCategoryFilter = (categoryId) => {
         },
     };
 };
-export const CatalogOptionsServiceDefinition = defineService("catalogOptions");
-export const CatalogOptionsService = implementService.withConfig()(CatalogOptionsServiceDefinition, ({ getService }) => {
+export const CatalogServiceDefinition = defineService("catalog");
+export const CatalogService = implementService.withConfig()(CatalogServiceDefinition, ({ getService }) => {
     const signalsService = getService(SignalsServiceDefinition);
     const catalogOptions = signalsService.signal(null);
+    const catalogPriceRange = signalsService.signal(null);
     const isLoading = signalsService.signal(false);
     const error = signalsService.signal(null);
-    const loadCatalogOptions = async (categoryId) => {
+    const loadCatalogData = async (categoryId) => {
         isLoading.set(true);
         error.set(null);
         try {
-            // Step 1: Get unique option and choice names from catalog via aggregation (no products returned)
+            // Single aggregation request to get ALL catalog data at once
             const aggregationRequest = {
                 aggregations: [
+                    // Price range aggregations
+                    {
+                        name: "minPrice",
+                        fieldPath: "actualPriceRange.minValue.amount",
+                        type: "SCALAR",
+                        scalar: { type: "MIN" },
+                    },
+                    {
+                        name: "maxPrice",
+                        fieldPath: "actualPriceRange.maxValue.amount",
+                        type: "SCALAR",
+                        scalar: { type: "MAX" },
+                    },
+                    // Options aggregations
                     {
                         name: "optionNames",
                         fieldPath: "options.name",
@@ -85,16 +106,31 @@ export const CatalogOptionsService = implementService.withConfig()(CatalogOption
                 includeProducts: false,
                 cursorPaging: { limit: 0 },
             };
-            const aggregationResponse = await productsV3.searchProducts(aggregationRequest);
+            // Make the single aggregation request
+            const [aggregationResponse, customizationsResponse] = await Promise.all([
+                productsV3.searchProducts(aggregationRequest),
+                customizationsV3.queryCustomizations().find(),
+            ]);
+            // Process price range data
+            const minPrice = extractScalarAggregationValue(aggregationResponse, "minPrice");
+            const maxPrice = extractScalarAggregationValue(aggregationResponse, "maxPrice");
+            if (minPrice !== null &&
+                maxPrice !== null &&
+                (minPrice > 0 || maxPrice > 0)) {
+                catalogPriceRange.set({
+                    minPrice,
+                    maxPrice,
+                });
+            }
+            else {
+                catalogPriceRange.set(null);
+            }
+            // Process options data
             const optionNames = extractAggregationValues(aggregationResponse, "optionNames");
             const choiceNames = extractAggregationValues(aggregationResponse, "choiceNames");
             const inventoryStatuses = extractAggregationValues(aggregationResponse, "inventoryStatus");
-            // Step 2: Get option structure from customizations API
-            const customizationsResponse = await customizationsV3
-                .queryCustomizations()
-                .find();
             const customizations = customizationsResponse.items || [];
-            // Step 3: Build options by matching customizations with aggregation data
+            // Build options by matching customizations with aggregation data
             const options = customizations
                 .filter((customization) => customization.name &&
                 customization._id &&
@@ -119,11 +155,11 @@ export const CatalogOptionsService = implementService.withConfig()(CatalogOption
                 };
             })
                 .filter((option) => option.choices.length > 0);
-            // Step 4: Add inventory filter if there are multiple inventory statuses
+            // Add inventory filter if there are multiple inventory statuses
             if (inventoryStatuses.length > 1) {
                 const inventoryChoices = inventoryStatuses.map((status) => ({
-                    id: status.toUpperCase(), // Use uppercase to match actual availabilityStatus values
-                    name: status.toUpperCase(), // Use raw status value - UI components will handle display conversion
+                    id: status.toUpperCase(),
+                    name: status.toUpperCase(),
                 }));
                 options.push({
                     id: "inventory-filter",
@@ -135,9 +171,10 @@ export const CatalogOptionsService = implementService.withConfig()(CatalogOption
             catalogOptions.set(options);
         }
         catch (err) {
-            console.error("Failed to load catalog options:", err);
-            error.set(err instanceof Error ? err.message : "Failed to load catalog options");
+            console.error("Failed to load catalog data:", err);
+            error.set(err instanceof Error ? err.message : "Failed to load catalog data");
             catalogOptions.set([]);
+            catalogPriceRange.set(null);
         }
         finally {
             isLoading.set(false);
@@ -145,11 +182,12 @@ export const CatalogOptionsService = implementService.withConfig()(CatalogOption
     };
     return {
         catalogOptions,
+        catalogPriceRange,
         isLoading,
         error,
-        loadCatalogOptions,
+        loadCatalogData,
     };
 });
-export async function loadCatalogOptionsServiceConfig() {
+export async function loadCatalogServiceConfig() {
     return {};
 }

package/dist/services/collection-service.d.ts

@@ -1,6 +1,6 @@
 import { type ServiceFactoryConfig } from "@wix/services-definitions";
-import { type Signal } from "@wix/services-definitions/core-services/signals";
-import * as productsV3 from "@wix/auto_sdk_stores_products-v-3";
+import type { Signal } from "@wix/services-definitions/core-services/signals";
+import { productsV3 } from "@wix/stores";
 import { type Filter } from "./filter-service.js";
 import { type SortBy } from "./sort-service.js";
 export interface CollectionServiceAPI {

package/dist/services/collection-service.js

@@ -1,10 +1,10 @@
 import { defineService, implementService, } from "@wix/services-definitions";
-import { SignalsServiceDefinition, } from "@wix/services-definitions/core-services/signals";
-import * as productsV3 from "@wix/auto_sdk_stores_products-v-3";
-import * as readOnlyVariantsV3 from "@wix/auto_sdk_stores_read-only-variants-v-3";
+import { SignalsServiceDefinition } from "@wix/services-definitions/core-services/signals";
+import { productsV3, readOnlyVariantsV3 } from "@wix/stores";
 import { FilterServiceDefinition } from "./filter-service.js";
 import { CategoryServiceDefinition } from "./category-service.js";
 import { SortServiceDefinition } from "./sort-service.js";
+import { CatalogServiceDefinition } from "./catalog-service.js";
 import { URLParamsUtils } from "../utils/url-params.js";
 import { SortType } from "../enums/sort-enums.js";
 const { SortDirection } = productsV3;
@@ -159,6 +159,7 @@ export const CollectionService = implementService.withConfig()(CollectionService
     const collectionFilters = getService(FilterServiceDefinition);
     const categoryService = getService(CategoryServiceDefinition);
     const sortService = getService(SortServiceDefinition);
+    const catalogService = getService(CatalogServiceDefinition);
     const hasMoreProducts = signalsService.signal((config.initialHasMore ?? true));
     let nextCursor = config.initialCursor;
     const initialProducts = config.initialProducts || [];
@@ -287,13 +288,11 @@ export const CollectionService = implementService.withConfig()(CollectionService
     const initializeCatalogData = async () => {
         isInitializingCatalogData = true; // Set flag BEFORE loading
         const selectedCategory = categoryService.selectedCategory.get();
-        await collectionFilters.loadCatalogPriceRange(selectedCategory || undefined);
-        await collectionFilters.loadCatalogOptions(selectedCategory || undefined);
+        // Load catalog data from the combined catalog service
+        await catalogService.loadCatalogData(selectedCategory || undefined);
         // Reset flag to allow filter changes to trigger refreshes
         isInitializingCatalogData = false;
     };
-    // Load catalog data on initialization
-    void initializeCatalogData();
     signalsService.effect(() => {
         sortService.currentSort.get();
         debouncedRefresh(false);

package/dist/services/filter-service.d.ts

@@ -1,14 +1,5 @@
-import { type Signal, type ReadOnlySignal } from "@wix/services-definitions/core-services/signals";
-export interface ProductOption {
-    id: string;
-    name: string;
-    choices: {
-        id: string;
-        name: string;
-        colorCode?: string;
-    }[];
-    optionRenderType?: string;
-}
+import type { Signal, ReadOnlySignal } from "@wix/services-definitions/core-services/signals";
+import { type ProductOption } from "./catalog-service.js";
 export interface PriceRange {
     min: number;
     max: number;
@@ -37,8 +28,6 @@ export interface FilterServiceAPI {
             max: number;
         };
     }>;
-    loadCatalogPriceRange: (categoryId?: string) => Promise<void>;
-    loadCatalogOptions: (categoryId?: string) => Promise<void>;
     isFullyLoaded: ReadOnlySignal<boolean>;
 }
 export declare const FilterServiceDefinition: string & {

package/dist/services/filter-service.js

@@ -1,8 +1,7 @@
 import { defineService, implementService } from "@wix/services-definitions";
-import { SignalsServiceDefinition, } from "@wix/services-definitions/core-services/signals";
+import { SignalsServiceDefinition } from "@wix/services-definitions/core-services/signals";
 import { URLParamsUtils } from "../utils/url-params.js";
-import { CatalogPriceRangeServiceDefinition } from "./catalog-price-range-service.js";
-import { CatalogOptionsServiceDefinition } from "./catalog-options-service.js";
+import { CatalogServiceDefinition, } from "./catalog-service.js";
 export const FilterServiceDefinition = defineService("filtered-collection");
 export const defaultFilter = {
     priceRange: { min: 0, max: 0 },
@@ -10,13 +9,12 @@ export const defaultFilter = {
 };
 export const FilterService = implementService.withConfig()(FilterServiceDefinition, ({ getService, config }) => {
     const signalsService = getService(SignalsServiceDefinition);
-    const catalogPriceRangeService = getService(CatalogPriceRangeServiceDefinition);
-    const catalogOptionsService = getService(CatalogOptionsServiceDefinition);
+    const catalogService = getService(CatalogServiceDefinition);
     const currentFilters = signalsService.signal((config?.initialFilters || defaultFilter));
     // Use computed signal for availableOptions to automatically track dependencies
     const availableOptions = signalsService.computed(() => {
-        const catalogPriceRange = catalogPriceRangeService.catalogPriceRange.get();
-        const catalogOptions = catalogOptionsService.catalogOptions.get();
+        const catalogPriceRange = catalogService.catalogPriceRange.get();
+        const catalogOptions = catalogService.catalogOptions.get();
         const priceRange = catalogPriceRange &&
             catalogPriceRange.minPrice < catalogPriceRange.maxPrice
             ? { min: catalogPriceRange.minPrice, max: catalogPriceRange.maxPrice }
@@ -29,8 +27,8 @@ export const FilterService = implementService.withConfig()(FilterServiceDefiniti
     });
     // Use computed signal for isFullyLoaded to automatically track dependencies
     const isFullyLoaded = signalsService.computed(() => {
-        const catalogPriceRange = catalogPriceRangeService.catalogPriceRange.get();
-        const catalogOptions = catalogOptionsService.catalogOptions.get();
+        const catalogPriceRange = catalogService.catalogPriceRange.get();
+        const catalogOptions = catalogService.catalogOptions.get();
         // Price range data is considered loaded whether it's null (no prices) or has valid data
         const hasPriceRangeData = catalogPriceRange !== undefined; // includes null case
         const hasOptionsData = !!(catalogOptions && catalogOptions.length >= 0); // Even 0 options is valid
@@ -38,7 +36,7 @@ export const FilterService = implementService.withConfig()(FilterServiceDefiniti
     });
     // Effect to update currentFilters when catalog data loads (only if filters are at defaults)
     signalsService.effect(() => {
-        const catalogPriceRange = catalogPriceRangeService.catalogPriceRange.get();
+        const catalogPriceRange = catalogService.catalogPriceRange.get();
         if (catalogPriceRange &&
             catalogPriceRange.minPrice < catalogPriceRange.maxPrice) {
             const priceRange = {
@@ -111,23 +109,11 @@ export const FilterService = implementService.withConfig()(FilterServiceDefiniti
         }
         URLParamsUtils.updateURL(urlParams);
     };
-    // Note: calculateAvailableOptions was removed as it's no longer needed
-    // Options are now loaded from the catalog-wide service via loadCatalogOptions
-    const loadCatalogPriceRange = async (categoryId) => {
-        // Just call the catalog service - subscriptions will handle signal updates
-        await catalogPriceRangeService.loadCatalogPriceRange(categoryId);
-    };
-    const loadCatalogOptions = async (categoryId) => {
-        // Just call the catalog service - subscriptions will handle signal updates
-        await catalogOptionsService.loadCatalogOptions(categoryId);
-    };
     return {
         currentFilters,
         applyFilters,
         clearFilters,
         availableOptions,
-        loadCatalogPriceRange,
-        loadCatalogOptions,
         isFullyLoaded,
     };
 });

package/dist/services/index.d.ts

@@ -1,9 +1,8 @@
 export { buyNowServiceBinding, loadBuyNowServiceInitialData, } from "./buy-now-service.js";
 export { payNowServiceBinding, loadPayNowServiceInitialData, } from "./pay-now-service.js";
-export { CatalogOptionsService, CatalogOptionsServiceDefinition, loadCatalogOptionsServiceConfig, } from "./catalog-options-service.js";
+export { CatalogService, CatalogServiceDefinition, loadCatalogServiceConfig, } from "./catalog-service.js";
 export { CategoryService, CategoryServiceDefinition, loadCategoriesConfig, } from "./category-service.js";
 export { CollectionService, CollectionServiceDefinition, loadCollectionServiceConfig, } from "./collection-service.js";
-export { CatalogPriceRangeService, CatalogPriceRangeServiceDefinition, loadCatalogPriceRangeServiceConfig, } from "./catalog-price-range-service.js";
 export { FilterService, FilterServiceDefinition, Filter, AvailableOptions, } from "./filter-service.js";
 export { ProductModifiersService, ProductModifiersServiceDefinition, } from "./product-modifiers-service.js";
 export { ProductService, ProductServiceDefinition, loadProductServiceConfig, } from "./product-service.js";

package/dist/services/index.js

@@ -1,9 +1,8 @@
 export { buyNowServiceBinding, loadBuyNowServiceInitialData, } from "./buy-now-service.js";
 export { payNowServiceBinding, loadPayNowServiceInitialData, } from "./pay-now-service.js";
-export { CatalogOptionsService, CatalogOptionsServiceDefinition, loadCatalogOptionsServiceConfig, } from "./catalog-options-service.js";
+export { CatalogService, CatalogServiceDefinition, loadCatalogServiceConfig, } from "./catalog-service.js";
 export { CategoryService, CategoryServiceDefinition, loadCategoriesConfig, } from "./category-service.js";
 export { CollectionService, CollectionServiceDefinition, loadCollectionServiceConfig, } from "./collection-service.js";
-export { CatalogPriceRangeService, CatalogPriceRangeServiceDefinition, loadCatalogPriceRangeServiceConfig, } from "./catalog-price-range-service.js";
 export { FilterService, FilterServiceDefinition, } from "./filter-service.js";
 export { ProductModifiersService, ProductModifiersServiceDefinition, } from "./product-modifiers-service.js";
 export { ProductService, ProductServiceDefinition, loadProductServiceConfig, } from "./product-service.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/headless-stores",
-  "version": "0.0.18",
+  "version": "0.0.20",
   "type": "module",
   "scripts": {
     "prebuild": "cd ../media && yarn build && cd ../ecom && yarn build",
@@ -58,8 +58,8 @@
     "@wix/auto_sdk_stores_read-only-variants-v-3": "^1.0.23",
     "@wix/ecom": "^1.0.1238",
     "@wix/essentials": "^0.1.22",
-    "@wix/headless-ecom": "^0.0.5",
-    "@wix/headless-media": "^0.0.2",
+    "@wix/headless-ecom": "^0.0.7",
+    "@wix/headless-media": "^0.0.4",
     "@wix/redirects": "^1.0.79",
     "@wix/services-definitions": "^0.1.4",
     "@wix/services-manager-react": "^0.1.26"

package/astro/actions/package.json

@@ -1,4 +0,0 @@
-{
-  "main": "../../cjs/dist/astro/actions/index.js",
-  "types": "../../dist/astro/actions/index.d.ts"
-}

package/cjs/dist/services/catalog-options-service.d.ts

@@ -1,30 +0,0 @@
-import { type ServiceFactoryConfig } from "@wix/services-definitions";
-import { type Signal } from "@wix/services-definitions/core-services/signals";
-export interface ProductOption {
-    id: string;
-    name: string;
-    choices: ProductChoice[];
-    optionRenderType?: string;
-}
-export interface ProductChoice {
-    id: string;
-    name: string;
-    colorCode?: string;
-}
-export interface CatalogOptionsServiceAPI {
-    catalogOptions: Signal<ProductOption[] | null>;
-    isLoading: Signal<boolean>;
-    error: Signal<string | null>;
-    loadCatalogOptions: (categoryId?: string) => Promise<void>;
-}
-export declare const CatalogOptionsServiceDefinition: string & {
-    __api: CatalogOptionsServiceAPI;
-    __config: {};
-    isServiceDefinition?: boolean;
-} & CatalogOptionsServiceAPI;
-export declare const CatalogOptionsService: import("@wix/services-definitions").ServiceFactory<string & {
-    __api: CatalogOptionsServiceAPI;
-    __config: {};
-    isServiceDefinition?: boolean;
-} & CatalogOptionsServiceAPI, {}>;
-export declare function loadCatalogOptionsServiceConfig(): Promise<ServiceFactoryConfig<typeof CatalogOptionsService>>;

package/cjs/dist/services/catalog-price-range-service.d.ts

@@ -1,23 +0,0 @@
-import { type ServiceFactoryConfig } from "@wix/services-definitions";
-import { type Signal } from "@wix/services-definitions/core-services/signals";
-export interface CatalogPriceRange {
-    minPrice: number;
-    maxPrice: number;
-}
-export interface CatalogPriceRangeServiceAPI {
-    catalogPriceRange: Signal<CatalogPriceRange | null>;
-    isLoading: Signal<boolean>;
-    error: Signal<string | null>;
-    loadCatalogPriceRange: (categoryId?: string) => Promise<void>;
-}
-export declare const CatalogPriceRangeServiceDefinition: string & {
-    __api: CatalogPriceRangeServiceAPI;
-    __config: {};
-    isServiceDefinition?: boolean;
-} & CatalogPriceRangeServiceAPI;
-export declare const CatalogPriceRangeService: import("@wix/services-definitions").ServiceFactory<string & {
-    __api: CatalogPriceRangeServiceAPI;
-    __config: {};
-    isServiceDefinition?: boolean;
-} & CatalogPriceRangeServiceAPI, {}>;
-export declare function loadCatalogPriceRangeServiceConfig(): Promise<ServiceFactoryConfig<typeof CatalogPriceRangeService>>;

package/cjs/dist/services/catalog-price-range-service.js

@@ -1,93 +0,0 @@
-import { defineService, implementService, } from "@wix/services-definitions";
-import { SignalsServiceDefinition, } from "@wix/services-definitions/core-services/signals";
-import * as productsV3 from "@wix/auto_sdk_stores_products-v-3";
-// Helper function to extract scalar aggregation values
-const extractScalarAggregationValue = (aggregationResponse, name) => {
-    const aggregation = aggregationResponse.aggregations?.[name] ||
-        aggregationResponse.aggregationData?.results?.find((r) => r.name === name);
-    const value = aggregation?.scalar?.value;
-    return value !== undefined && value !== null ? parseFloat(value) : null;
-};
-const buildCategoryFilter = (categoryId) => {
-    if (!categoryId) {
-        return { visible: true };
-    }
-    return {
-        visible: true,
-        "allCategoriesInfo.categories": {
-            $matchItems: [{ _id: { $in: [categoryId] } }],
-        },
-    };
-};
-export const CatalogPriceRangeServiceDefinition = defineService("catalogPriceRange");
-export const CatalogPriceRangeService = implementService.withConfig()(CatalogPriceRangeServiceDefinition, ({ getService }) => {
-    const signalsService = getService(SignalsServiceDefinition);
-    // Signal declarations
-    const catalogPriceRange = signalsService.signal(null);
-    const isLoading = signalsService.signal(false);
-    const error = signalsService.signal(null);
-    /**
-     * Load the catalog-wide price range using a single aggregation query
-     * This fetches min/max prices from ALL products in the catalog using SCALAR aggregations
-     */
-    const loadCatalogPriceRange = async (categoryId) => {
-        isLoading.set(true);
-        error.set(null);
-        try {
-            // Single aggregation request to get both min and max prices (no products returned)
-            const aggregationRequest = {
-                aggregations: [
-                    {
-                        name: "minPrice",
-                        fieldPath: "actualPriceRange.minValue.amount",
-                        type: "SCALAR",
-                        scalar: { type: "MIN" },
-                    },
-                    {
-                        name: "maxPrice",
-                        fieldPath: "actualPriceRange.maxValue.amount",
-                        type: "SCALAR",
-                        scalar: { type: "MAX" },
-                    },
-                ],
-                filter: buildCategoryFilter(categoryId),
-                includeProducts: false,
-                cursorPaging: { limit: 0 },
-            };
-            const aggregationResponse = await productsV3.searchProducts(aggregationRequest);
-            const minPrice = extractScalarAggregationValue(aggregationResponse, "minPrice");
-            const maxPrice = extractScalarAggregationValue(aggregationResponse, "maxPrice");
-            // Only set price range if we found valid prices
-            if (minPrice !== null &&
-                maxPrice !== null &&
-                (minPrice > 0 || maxPrice > 0)) {
-                catalogPriceRange.set({
-                    minPrice,
-                    maxPrice,
-                });
-            }
-            else {
-                // No products found or no valid prices - don't show the filter
-                catalogPriceRange.set(null);
-            }
-        }
-        catch (err) {
-            console.error("Failed to load catalog price range:", err);
-            error.set(err instanceof Error ? err.message : "Failed to load price range");
-            // Don't set fallback values - let the component handle the error state
-            catalogPriceRange.set(null);
-        }
-        finally {
-            isLoading.set(false);
-        }
-    };
-    return {
-        catalogPriceRange,
-        isLoading,
-        error,
-        loadCatalogPriceRange,
-    };
-});
-export async function loadCatalogPriceRangeServiceConfig() {
-    return {};
-}

package/dist/services/catalog-options-service.d.ts

@@ -1,30 +0,0 @@
-import { type ServiceFactoryConfig } from "@wix/services-definitions";
-import { type Signal } from "@wix/services-definitions/core-services/signals";
-export interface ProductOption {
-    id: string;
-    name: string;
-    choices: ProductChoice[];
-    optionRenderType?: string;
-}
-export interface ProductChoice {
-    id: string;
-    name: string;
-    colorCode?: string;
-}
-export interface CatalogOptionsServiceAPI {
-    catalogOptions: Signal<ProductOption[] | null>;
-    isLoading: Signal<boolean>;
-    error: Signal<string | null>;
-    loadCatalogOptions: (categoryId?: string) => Promise<void>;
-}
-export declare const CatalogOptionsServiceDefinition: string & {
-    __api: CatalogOptionsServiceAPI;
-    __config: {};
-    isServiceDefinition?: boolean;
-} & CatalogOptionsServiceAPI;
-export declare const CatalogOptionsService: import("@wix/services-definitions").ServiceFactory<string & {
-    __api: CatalogOptionsServiceAPI;
-    __config: {};
-    isServiceDefinition?: boolean;
-} & CatalogOptionsServiceAPI, {}>;
-export declare function loadCatalogOptionsServiceConfig(): Promise<ServiceFactoryConfig<typeof CatalogOptionsService>>;

package/dist/services/catalog-price-range-service.d.ts

@@ -1,23 +0,0 @@
-import { type ServiceFactoryConfig } from "@wix/services-definitions";
-import { type Signal } from "@wix/services-definitions/core-services/signals";
-export interface CatalogPriceRange {
-    minPrice: number;
-    maxPrice: number;
-}
-export interface CatalogPriceRangeServiceAPI {
-    catalogPriceRange: Signal<CatalogPriceRange | null>;
-    isLoading: Signal<boolean>;
-    error: Signal<string | null>;
-    loadCatalogPriceRange: (categoryId?: string) => Promise<void>;
-}
-export declare const CatalogPriceRangeServiceDefinition: string & {
-    __api: CatalogPriceRangeServiceAPI;
-    __config: {};
-    isServiceDefinition?: boolean;
-} & CatalogPriceRangeServiceAPI;
-export declare const CatalogPriceRangeService: import("@wix/services-definitions").ServiceFactory<string & {
-    __api: CatalogPriceRangeServiceAPI;
-    __config: {};
-    isServiceDefinition?: boolean;
-} & CatalogPriceRangeServiceAPI, {}>;
-export declare function loadCatalogPriceRangeServiceConfig(): Promise<ServiceFactoryConfig<typeof CatalogPriceRangeService>>;

package/dist/services/catalog-price-range-service.js

@@ -1,93 +0,0 @@
-import { defineService, implementService, } from "@wix/services-definitions";
-import { SignalsServiceDefinition, } from "@wix/services-definitions/core-services/signals";
-import * as productsV3 from "@wix/auto_sdk_stores_products-v-3";
-// Helper function to extract scalar aggregation values
-const extractScalarAggregationValue = (aggregationResponse, name) => {
-    const aggregation = aggregationResponse.aggregations?.[name] ||
-        aggregationResponse.aggregationData?.results?.find((r) => r.name === name);
-    const value = aggregation?.scalar?.value;
-    return value !== undefined && value !== null ? parseFloat(value) : null;
-};
-const buildCategoryFilter = (categoryId) => {
-    if (!categoryId) {
-        return { visible: true };
-    }
-    return {
-        visible: true,
-        "allCategoriesInfo.categories": {
-            $matchItems: [{ _id: { $in: [categoryId] } }],
-        },
-    };
-};
-export const CatalogPriceRangeServiceDefinition = defineService("catalogPriceRange");
-export const CatalogPriceRangeService = implementService.withConfig()(CatalogPriceRangeServiceDefinition, ({ getService }) => {
-    const signalsService = getService(SignalsServiceDefinition);
-    // Signal declarations
-    const catalogPriceRange = signalsService.signal(null);
-    const isLoading = signalsService.signal(false);
-    const error = signalsService.signal(null);
-    /**
-     * Load the catalog-wide price range using a single aggregation query
-     * This fetches min/max prices from ALL products in the catalog using SCALAR aggregations
-     */
-    const loadCatalogPriceRange = async (categoryId) => {
-        isLoading.set(true);
-        error.set(null);
-        try {
-            // Single aggregation request to get both min and max prices (no products returned)
-            const aggregationRequest = {
-                aggregations: [
-                    {
-                        name: "minPrice",
-                        fieldPath: "actualPriceRange.minValue.amount",
-                        type: "SCALAR",
-                        scalar: { type: "MIN" },
-                    },
-                    {
-                        name: "maxPrice",
-                        fieldPath: "actualPriceRange.maxValue.amount",
-                        type: "SCALAR",
-                        scalar: { type: "MAX" },
-                    },
-                ],
-                filter: buildCategoryFilter(categoryId),
-                includeProducts: false,
-                cursorPaging: { limit: 0 },
-            };
-            const aggregationResponse = await productsV3.searchProducts(aggregationRequest);
-            const minPrice = extractScalarAggregationValue(aggregationResponse, "minPrice");
-            const maxPrice = extractScalarAggregationValue(aggregationResponse, "maxPrice");
-            // Only set price range if we found valid prices
-            if (minPrice !== null &&
-                maxPrice !== null &&
-                (minPrice > 0 || maxPrice > 0)) {
-                catalogPriceRange.set({
-                    minPrice,
-                    maxPrice,
-                });
-            }
-            else {
-                // No products found or no valid prices - don't show the filter
-                catalogPriceRange.set(null);
-            }
-        }
-        catch (err) {
-            console.error("Failed to load catalog price range:", err);
-            error.set(err instanceof Error ? err.message : "Failed to load price range");
-            // Don't set fallback values - let the component handle the error state
-            catalogPriceRange.set(null);
-        }
-        finally {
-            isLoading.set(false);
-        }
-    };
-    return {
-        catalogPriceRange,
-        isLoading,
-        error,
-        loadCatalogPriceRange,
-    };
-});
-export async function loadCatalogPriceRangeServiceConfig() {
-    return {};
-}

package/react/package.json

@@ -1,4 +0,0 @@
-{
-  "main": "../cjs/dist/react/index.js",
-  "types": "../dist/react/index.d.ts"
-}

package/server-actions/package.json

@@ -1,4 +0,0 @@
-{
-  "main": "../cjs/dist/server-actions/index.js",
-  "types": "../dist/server-actions/index.d.ts"
-}

package/services/package.json

@@ -1,4 +0,0 @@
-{
-  "main": "../cjs/dist/services/index.js",
-  "types": "../dist/services/index.d.ts"
-}