@jay-framework/wix-stores-v1 0.19.7 → 0.21.0

package/dist/index.client.js

@@ -4,8 +4,7 @@ import { makeJayStackComponent, makeJayInit } from "@jay-framework/fullstack-com
 import { registerReactiveGlobalContext, createSignal, createMemo, createEffect } from "@jay-framework/component";
 import { patch, REPLACE } from "@jay-framework/json-patch";
 import { createJayContext, useGlobalContext } from "@jay-framework/runtime";
-import { WIX_CLIENT_CONTEXT } from "@jay-framework/wix-server-client/client";
-import { products, collections } from "@wix/stores";
+import { wixFetch, WIX_CLIENT_CONTEXT } from "@jay-framework/wix-server-client/client";
 import { createActionCaller } from "@jay-framework/stack-client-runtime";
 var StockStatus = /* @__PURE__ */ ((StockStatus2) => {
   StockStatus2[StockStatus2["OUT_OF_STOCK"] = 0] = "OUT_OF_STOCK";
@@ -17,21 +16,82 @@ var Selected = /* @__PURE__ */ ((Selected2) => {
   Selected2[Selected2["notSelected"] = 1] = "notSelected";
   return Selected2;
 })(Selected || {});
-const instances = {
-  productsClientInstance: void 0,
-  collectionsClientInstance: void 0
-};
-function getProductsClient(wixClient) {
-  if (!instances.productsClientInstance) {
-    instances.productsClientInstance = wixClient.use(products);
+function normalizeProduct(product) {
+  const p = { ...product };
+  const raw = product;
+  if (raw.id && !p._id) {
+    p._id = raw.id;
+  }
+  return p;
+}
+async function queryProducts(client, request) {
+  const query = {};
+  if (request?.filter) query.filter = JSON.stringify(request.filter);
+  if (request?.sort) {
+    const v1Sort = request.sort.map((s) => ({
+      [s.fieldName]: (s.order || "ASC").toLowerCase()
+    }));
+    query.sort = JSON.stringify(v1Sort);
   }
-  return instances.productsClientInstance;
+  if (request?.paging) query.paging = request.paging;
+  const result = await wixFetch(client, "/stores/v1/products/query", {
+    method: "POST",
+    body: {
+      query,
+      includeVariants: request?.includeVariants ?? true,
+      includeMerchantSpecificData: request?.includeMerchantSpecificData ?? true
+    }
+  });
+  if (result.products) {
+    result.products = result.products.map(
+      (p) => normalizeProduct(p)
+    );
+  }
+  return result;
 }
-function getCollectionsClient(wixClient) {
-  if (!instances.collectionsClientInstance) {
-    instances.collectionsClientInstance = wixClient.use(collections);
+async function getProduct(client, productId, options) {
+  const params = new URLSearchParams();
+  const qs = params.toString();
+  const result = await wixFetch(
+    client,
+    `/stores/v1/products/${productId}${qs ? "?" + qs : ""}`,
+    { method: "GET" }
+  );
+  if (result.product) {
+    const raw = result.product;
+    if (raw.id && !result.product._id) {
+      result.product._id = raw.id;
+    }
   }
-  return instances.collectionsClientInstance;
+  return result;
+}
+function normalizeCollection(col) {
+  const c = { ...col };
+  if (col.id && !c._id) {
+    c._id = col.id;
+  }
+  return c;
+}
+async function queryCollections(client, request) {
+  const query = {};
+  const result = await wixFetch(
+    client,
+    "/stores/v1/collections/query",
+    {
+      method: "POST",
+      body: {
+        query,
+        includeNumberOfProducts: true,
+        includeDescription: true
+      }
+    }
+  );
+  if (result.collections) {
+    result.collections = result.collections.map(
+      (c) => normalizeCollection(c)
+    );
+  }
+  return result;
 }
 var MediaType = /* @__PURE__ */ ((MediaType2) => {
   MediaType2[MediaType2["IMAGE"] = 0] = "IMAGE";
@@ -71,6 +131,9 @@ var ChoiceType = /* @__PURE__ */ ((ChoiceType2) => {
   ChoiceType2[ChoiceType2["ONE_COLOR"] = 1] = "ONE_COLOR";
   return ChoiceType2;
 })(ChoiceType || {});
+function stripWixMediaResize(url) {
+  return url.replace(/\/v1\/(?:fit|fill|crop)\/[^/]+\/file\.\w+$/, "");
+}
 function mapAvailabilityStatus(status) {
   switch (status) {
     case "OUT_OF_STOCK":
@@ -145,14 +208,12 @@ function mapProductToCard(product, productPagePath = DEFAULT_PRODUCT_PAGE_PATH)
     slug,
     productUrl: slug ? `${productPagePath}/${slug}` : "",
     mainMedia: {
-      // V1 provides complete URLs
-      url: mainMedia?.image?.url || "",
+      url: stripWixMediaResize(mainMedia?.image?.url || ""),
       altText: mainMedia?.title || product.name || "",
       mediaType: mapMediaType(mainMedia?.mediaType)
     },
     thumbnail: {
-      // V1 provides complete thumbnail URLs
-      url: mainMedia?.thumbnail?.url || "",
+      url: stripWixMediaResize(mainMedia?.thumbnail?.url || ""),
       altText: mainMedia?.title || product.name || "",
       width: mainMedia?.thumbnail?.width || 300,
       height: mainMedia?.thumbnail?.height || 300
@@ -188,7 +249,7 @@ function mapCollectionToViewState(collection) {
     name: collection.name || "",
     slug: collection.slug || "",
     description: collection.description || "",
-    imageUrl: collection.media?.mainMedia?.image?.url || "",
+    imageUrl: stripWixMediaResize(collection.media?.mainMedia?.image?.url || ""),
     productCount: collection.numberOfProducts || 0
   };
 }
@@ -197,15 +258,13 @@ function provideWixStoresV1Context() {
   const wixClientContext = useGlobalContext(WIX_CLIENT_CONTEXT);
   const wixClient = wixClientContext.client;
   const cartContext = useGlobalContext(WIX_CART_CONTEXT);
-  const productsClient = getProductsClient(wixClient);
-  const collectionsClient = getCollectionsClient(wixClient);
   const storesContext = registerReactiveGlobalContext(WIX_STORES_V1_CONTEXT, () => {
     async function addToCart(productId, quantity = 1, variantId) {
       console.log(`[WixStoresV1] Adding to cart: ${productId} x ${quantity}`);
       let finalVariantId = variantId;
       let productSlug;
       try {
-        const productResult = await productsClient.getProduct(productId);
+        const productResult = await getProduct(wixClient, productId);
         const product = productResult.product;
         productSlug = product?.slug;
         if (!finalVariantId && product?.variants?.[0]) {
@@ -221,11 +280,14 @@ function provideWixStoresV1Context() {
     }
     async function loadMoreCollectionProducts(collectionId, page, pageSize) {
       try {
-        const result = await productsClient.queryProducts().hasSome("collectionIds", [collectionId]).skip((page - 1) * pageSize).limit(pageSize).find();
-        const products2 = (result.items || []).map((p) => mapProductToCard(p));
-        const totalProducts = result.totalCount ?? products2.length;
+        const result = await queryProducts(wixClient, {
+          filter: { "collections.id": { $hasSome: [collectionId] } },
+          paging: { limit: pageSize, offset: (page - 1) * pageSize }
+        });
+        const products = (result.products || []).map((p) => mapProductToCard(p));
+        const totalProducts = result.totalResults ?? products.length;
         const hasMore = page * pageSize < totalProducts;
-        return { products: products2, hasMore, totalProducts };
+        return { products, hasMore, totalProducts };
       } catch (error) {
         console.error("[WixStoresV1] Failed to load collection products:", error);
         return { products: [], hasMore: false, totalProducts: 0 };
@@ -233,8 +295,8 @@ function provideWixStoresV1Context() {
     }
     async function getCollections() {
       try {
-        const result = await collectionsClient.queryCollections().find();
-        return (result.items || []).map((col) => mapCollectionToViewState(col));
+        const result = await queryCollections(wixClient);
+        return (result.collections || []).map((col) => mapCollectionToViewState(col));
       } catch (error) {
         console.error("[WixStoresV1] Failed to load collections:", error);
         return [];
@@ -693,7 +755,7 @@ function ProductSearchInteractive(props, refs, viewStateSignals, fastCarryForwar
 const productSearch = makeJayStackComponent().withProps().withContexts(WIX_STORES_V1_CONTEXT).withInteractive(ProductSearchInteractive);
 const PAGE_SIZE = 20;
 function CollectionPageInteractive(_props, refs, viewStateSignals, fastCarryForward, storesContext) {
-  const { products: [products2], loadedProducts: [loadedProducts, setLoadedProducts], hasMore: [hasMore, setHasMore], loadedCount: [loadedCount, setLoadedCount], isLoading: [isLoading, setIsLoading], hasProducts: [hasProducts, setHasProducts] } = viewStateSignals;
+  const { products: [products], loadedProducts: [loadedProducts, setLoadedProducts], hasMore: [hasMore, setHasMore], loadedCount: [loadedCount, setLoadedCount], isLoading: [isLoading, setIsLoading], hasProducts: [hasProducts, setHasProducts] } = viewStateSignals;
   const { collectionId, totalProducts } = fastCarryForward;
   let currentOffset = fastCarryForward.currentOffset;
   refs.loadMoreButton?.onclick(async () => {
@@ -763,7 +825,7 @@ function CollectionPageInteractive(_props, refs, viewStateSignals, fastCarryForw
   });
   return {
     render: () => ({
-      products: products2(),
+      products: products(),
       loadedProducts: loadedProducts(),
       hasMore: hasMore(),
       loadedCount: loadedCount(),

package/dist/index.d.ts

@@ -1,73 +1,17 @@
-import { getCurrentCartClient, CartState } from '@jay-framework/wix-cart';
+import { CartState } from '@jay-framework/wix-cart';
 export { AddToCartOptions, CartIndicatorState, CartLineItem, CartState, CartSummary, WIX_CART_CONTEXT, WIX_CART_SERVICE, WixCartContext, WixCartService, cartIndicator, cartPage, provideWixCartContext, provideWixCartService } from '@jay-framework/wix-cart';
 import * as _jay_framework_fullstack_component from '@jay-framework/fullstack-component';
 import { Signals, PageProps, UrlParams } from '@jay-framework/fullstack-component';
 import { WixClient } from '@wix/sdk';
-import { products, collections, inventory } from '@wix/stores';
-import { BuildDescriptors } from '@wix/sdk-types';
 import * as _jay_framework_runtime from '@jay-framework/runtime';
 import { HTMLElementCollectionProxy, HTMLElementProxy } from '@jay-framework/runtime';
 import { Getter } from '@jay-framework/reactive';
 import * as _jay_framework_component from '@jay-framework/component';
 
-/**
- * Wix Store V1 API Client Factories
- *
- * These functions create singleton instances of Wix Catalog V1 API clients.
- * Used by both the server service and client context.
- *
- * Key difference from V3:
- * - Uses `products` module instead of `productsV3`
- * - Uses `collections` module instead of `@wix/categories`
- *
- * Note: Cart client is provided by @jay-framework/wix-cart package.
- */
-
-/**
- * Get a configured Wix Stores Products client (Catalog V1) (singleton)
- *
- * The Products API (V1) is the original Wix Stores catalog API.
- *
- * @returns Products client instance from @wix/stores
- * @see https://dev.wix.com/docs/sdk/backend-modules/stores/products/introduction
- */
-declare function getProductsClient(wixClient: WixClient): BuildDescriptors<typeof products, {}>;
-/**
- * Get a configured Wix Stores Collections client (singleton)
- *
- * The Collections API allows you to manage product Collections in your Wix store.
- * Note: V3 uses @wix/categories instead.
- *
- * @returns Collections client instance from @wix/stores
- * @see https://dev.wix.com/docs/sdk/backend-modules/stores/collections/introduction
- */
-declare function getCollectionsClient(wixClient: WixClient): BuildDescriptors<typeof collections, {}>;
-/**
- * Get a configured Wix Stores Inventory client (singleton)
- *
- * The Inventory API allows you to manage product inventory in your Wix store.
- *
- * @returns Inventory client instance from @wix/stores
- * @see https://dev.wix.com/docs/sdk/backend-modules/stores/inventory/introduction
- */
-declare function getInventoryClient(wixClient: WixClient): BuildDescriptors<typeof inventory, {}>;
-
 interface WixStoresV1Service {
-    products: ReturnType<typeof getProductsClient>;
-    collections: ReturnType<typeof getCollectionsClient>;
-    inventory: ReturnType<typeof getInventoryClient>;
-    /** @deprecated Use WIX_CART_SERVICE from @jay-framework/wix-cart instead */
-    cart: ReturnType<typeof getCurrentCartClient>;
+    wixClient: WixClient;
 }
-/**
- * Server service marker for Wix Stores V1.
- * Use with `.withServices(WIX_STORES_V1_SERVICE_MARKER)` in component definitions.
- */
 declare const WIX_STORES_V1_SERVICE_MARKER: _jay_framework_fullstack_component.ServiceMarker<WixStoresV1Service>;
-/**
- * Creates, registers, and returns a Wix Stores V1 service instance.
- * Called during server initialization.
- */
 declare function provideWixStoresV1Service(wixClient: WixClient): WixStoresV1Service;
 
 declare enum OptionRenderType$1 {
@@ -188,6 +132,37 @@ interface ProductCardRepeatedRefs {
   quickOption: ProductOptionsRepeatedRefs
 }
 
+interface V1Media {
+    mainMedia?: V1MediaItem;
+    items?: V1MediaItem[];
+}
+interface V1MediaItem {
+    _id?: string;
+    mediaType?: string;
+    title?: string;
+    image?: {
+        url?: string;
+        width?: number;
+        height?: number;
+    };
+    video?: {
+        url?: string;
+    };
+    thumbnail?: {
+        url?: string;
+        width?: number;
+        height?: number;
+    };
+}
+interface V1Collection {
+    _id?: string;
+    name?: string;
+    slug?: string;
+    description?: string;
+    media?: V1Media;
+    numberOfProducts?: number;
+}
+
 /**
  * Wix Stores Catalog V1 Product Mapping Utilities
  *
@@ -203,20 +178,6 @@ interface ProductCardRepeatedRefs {
  * Reference: wix/exploration/query-products-catalog-v1/output/individual/*.json
  */
 
-interface V1Collection {
-    _id?: string;
-    name?: string;
-    slug?: string;
-    description?: string;
-    media?: {
-        mainMedia?: {
-            image?: {
-                url: string;
-            };
-        };
-    };
-    numberOfProducts?: number;
-}
 interface CollectionViewState {
     _id: string;
     name: string;
@@ -273,39 +234,19 @@ interface WixStoresV1Context {
  */
 declare const WIX_STORES_V1_CONTEXT: _jay_framework_runtime.ContextMarker<WixStoresV1Context>;
 
-/**
- * Sort options for product search
- */
 type ProductSortField = 'relevance' | 'price_asc' | 'price_desc' | 'name_asc' | 'name_desc' | 'newest';
-/**
- * Product search filters
- */
 interface ProductSearchFilters {
-    /** Minimum price filter */
     minPrice?: number;
-    /** Maximum price filter */
     maxPrice?: number;
-    /** Filter by collection IDs (V1 uses collections, not categories) */
     collectionIds?: string[];
 }
-/**
- * Input for searchProducts action
- */
 interface SearchProductsInput {
-    /** Search query text */
     query: string;
-    /** Filters to apply */
     filters?: ProductSearchFilters;
-    /** Sort order */
     sortBy?: ProductSortField;
-    /** Page number for pagination (1-based) */
     page?: number;
-    /** Items per page (default: 12) */
     pageSize?: number;
 }
-/**
- * Price range bucket for filter UI
- */
 interface PriceRangeBucket {
     rangeId: string;
     label: string;
@@ -313,96 +254,24 @@ interface PriceRangeBucket {
     maxValue: number | null;
     isSelected: boolean;
 }
-/**
- * Price aggregation data for filter UI
- */
 interface PriceAggregationData {
-    /** Minimum price across all products */
     minBound: number;
-    /** Maximum price across all products */
     maxBound: number;
-    /** Computed price range buckets */
     ranges: PriceRangeBucket[];
 }
-/**
- * Output for searchProducts action
- */
 interface SearchProductsOutput {
-    /** List of matching products */
     products: ProductCardViewState[];
-    /** Total number of matching products */
     totalCount: number;
-    /** Current page number */
     currentPage: number;
-    /** Total number of pages */
     totalPages: number;
-    /** Whether there are more results */
     hasMore: boolean;
-    /** Price aggregation data (bounds and computed ranges) */
     priceAggregation: PriceAggregationData;
 }
-/**
- * Input for getProductBySlug action
- */
 interface GetProductBySlugInput {
-    /** Product URL slug */
     slug: string;
 }
-/**
- * Search products using the Wix Stores Catalog V1 queryProducts API.
- *
- * V1 uses skip-based pagination and query builder syntax.
- *
- * Server-side filtering/sorting:
- * - name: startsWith() for text search
- * - collectionIds: hasSome() for collection filtering
- * - priceData.price: ge()/le() for price range filtering
- * - Sorting: ascending()/descending() on price, name, lastUpdated
- *
- * Also fetches min/max prices in parallel for price range filter UI.
- *
- * @see https://dev.wix.com/docs/sdk/backend-modules/stores/products/query-products
- *
- * @example
- * ```typescript
- * const results = await searchProducts({
- *     query: 'whisky',
- *     filters: { minPrice: 50, maxPrice: 200 },
- *     sortBy: 'price_asc',
- *     pageSize: 12,
- *     page: 1
- * });
- * // results.priceAggregation = {
- * //   minBound: 25,
- * //   maxBound: 500,
- * //   ranges: [
- * //     { rangeId: 'all', label: 'Show all', minValue: null, maxValue: null, isSelected: true },
- * //     { rangeId: '0-100', label: '$0 - $100', minValue: 0, maxValue: 100, isSelected: false },
- * //     { rangeId: '100-200', label: '$100 - $200', ... },
- * //     ...
- * //   ]
- * // }
- * ```
- */
 declare const searchProducts: _jay_framework_fullstack_component.JayAction<SearchProductsInput, SearchProductsOutput> & _jay_framework_fullstack_component.JayActionDefinition<SearchProductsInput, SearchProductsOutput, [WixStoresV1Service]>;
-/**
- * Get a single product by its URL slug.
- *
- * @example
- * ```typescript
- * const product = await getProductBySlug({ slug: 'peat-s-beast-px-finish-54-1' });
- * ```
- */
 declare const getProductBySlug: _jay_framework_fullstack_component.JayAction<GetProductBySlugInput, ProductCardViewState> & _jay_framework_fullstack_component.JayActionDefinition<GetProductBySlugInput, ProductCardViewState, [WixStoresV1Service]>;
-/**
- * Get available collections for filtering.
- * V1 uses collections instead of categories.
- *
- * @example
- * ```typescript
- * const collections = await getCollections();
- * ```
- */
 declare const getCollections: _jay_framework_fullstack_component.JayAction<Record<string, never>, CollectionViewState[]> & _jay_framework_fullstack_component.JayActionDefinition<Record<string, never>, CollectionViewState[], [WixStoresV1Service]>;
 
 declare enum MediaType$1 {

package/dist/index.js

@@ -1,46 +1,76 @@
-import { getCurrentCartClient } from "@jay-framework/wix-cart";
 import { WIX_CART_CONTEXT, WIX_CART_SERVICE, cartIndicator, cartPage, provideWixCartContext, provideWixCartService } from "@jay-framework/wix-cart";
-import { inventory, collections, products } from "@wix/stores";
 import { createJayService, makeJayQuery, ActionError, makeJayStackComponent, RenderPipeline, makeJayInit } from "@jay-framework/fullstack-component";
 import { registerService, getService } from "@jay-framework/stack-server-runtime";
 import { createJayContext } from "@jay-framework/runtime";
 import "@jay-framework/component";
-import { WIX_CLIENT_SERVICE } from "@jay-framework/wix-server-client";
-const instances = {
-  productsClientInstance: void 0,
-  collectionsClientInstance: void 0,
-  inventoryClientInstance: void 0
-};
-function getProductsClient(wixClient) {
-  if (!instances.productsClientInstance) {
-    instances.productsClientInstance = wixClient.use(products);
-  }
-  return instances.productsClientInstance;
-}
-function getCollectionsClient(wixClient) {
-  if (!instances.collectionsClientInstance) {
-    instances.collectionsClientInstance = wixClient.use(collections);
-  }
-  return instances.collectionsClientInstance;
-}
-function getInventoryClient(wixClient) {
-  if (!instances.inventoryClientInstance) {
-    instances.inventoryClientInstance = wixClient.use(inventory);
-  }
-  return instances.inventoryClientInstance;
-}
+import { wixFetch, WIX_CLIENT_SERVICE } from "@jay-framework/wix-server-client";
 const WIX_STORES_V1_SERVICE_MARKER = createJayService("Wix Store V1 Service");
 function provideWixStoresV1Service(wixClient) {
-  const service = {
-    products: getProductsClient(wixClient),
-    collections: getCollectionsClient(wixClient),
-    inventory: getInventoryClient(wixClient),
-    // Keep cart for backward compatibility, but prefer WIX_CART_SERVICE
-    cart: getCurrentCartClient(wixClient)
-  };
+  const service = { wixClient };
   registerService(WIX_STORES_V1_SERVICE_MARKER, service);
   return service;
 }
+function normalizeProduct(product) {
+  const p = { ...product };
+  const raw = product;
+  if (raw.id && !p._id) {
+    p._id = raw.id;
+  }
+  return p;
+}
+async function queryProducts(client, request) {
+  const query = {};
+  if (request?.filter) query.filter = JSON.stringify(request.filter);
+  if (request?.sort) {
+    const v1Sort = request.sort.map((s) => ({
+      [s.fieldName]: (s.order || "ASC").toLowerCase()
+    }));
+    query.sort = JSON.stringify(v1Sort);
+  }
+  if (request?.paging) query.paging = request.paging;
+  const result = await wixFetch(client, "/stores/v1/products/query", {
+    method: "POST",
+    body: {
+      query,
+      includeVariants: request?.includeVariants ?? true,
+      includeMerchantSpecificData: request?.includeMerchantSpecificData ?? true
+    }
+  });
+  if (result.products) {
+    result.products = result.products.map(
+      (p) => normalizeProduct(p)
+    );
+  }
+  return result;
+}
+function normalizeCollection(col) {
+  const c = { ...col };
+  if (col.id && !c._id) {
+    c._id = col.id;
+  }
+  return c;
+}
+async function queryCollections(client, request) {
+  const query = {};
+  const result = await wixFetch(
+    client,
+    "/stores/v1/collections/query",
+    {
+      method: "POST",
+      body: {
+        query,
+        includeNumberOfProducts: true,
+        includeDescription: true
+      }
+    }
+  );
+  if (result.collections) {
+    result.collections = result.collections.map(
+      (c) => normalizeCollection(c)
+    );
+  }
+  return result;
+}
 var MediaType$2 = /* @__PURE__ */ ((MediaType2) => {
   MediaType2[MediaType2["IMAGE"] = 0] = "IMAGE";
   MediaType2[MediaType2["VIDEO"] = 1] = "VIDEO";
@@ -79,6 +109,9 @@ var ChoiceType$1 = /* @__PURE__ */ ((ChoiceType2) => {
   ChoiceType2[ChoiceType2["ONE_COLOR"] = 1] = "ONE_COLOR";
   return ChoiceType2;
 })(ChoiceType$1 || {});
+function stripWixMediaResize(url) {
+  return url.replace(/\/v1\/(?:fit|fill|crop)\/[^/]+\/file\.\w+$/, "");
+}
 function mapAvailabilityStatus(status) {
   switch (status) {
     case "OUT_OF_STOCK":
@@ -153,14 +186,12 @@ function mapProductToCard(product, productPagePath = DEFAULT_PRODUCT_PAGE_PATH)
     slug,
     productUrl: slug ? `${productPagePath}/${slug}` : "",
     mainMedia: {
-      // V1 provides complete URLs
-      url: mainMedia?.image?.url || "",
+      url: stripWixMediaResize(mainMedia?.image?.url || ""),
       altText: mainMedia?.title || product.name || "",
       mediaType: mapMediaType(mainMedia?.mediaType)
     },
     thumbnail: {
-      // V1 provides complete thumbnail URLs
-      url: mainMedia?.thumbnail?.url || "",
+      url: stripWixMediaResize(mainMedia?.thumbnail?.url || ""),
       altText: mainMedia?.title || product.name || "",
       width: mainMedia?.thumbnail?.width || 300,
       height: mainMedia?.thumbnail?.height || 300
@@ -196,7 +227,7 @@ function mapCollectionToViewState(collection) {
     name: collection.name || "",
     slug: collection.slug || "",
     description: collection.description || "",
-    imageUrl: collection.media?.mainMedia?.image?.url || "",
+    imageUrl: stripWixMediaResize(collection.media?.mainMedia?.image?.url || ""),
     productCount: collection.numberOfProducts || 0
   };
 }
@@ -234,10 +265,9 @@ function generatePriceBuckets(minPrice, maxPrice, currencySymbol = "$") {
     const from = Math.round(allBoundaries[i]);
     const to = Math.round(allBoundaries[i + 1]);
     if (from < to) {
-      const label = `${currencySymbol}${from} - ${currencySymbol}${to}`;
       buckets.push({
         rangeId: `${from}-${to}`,
-        label,
+        label: `${currencySymbol}${from} - ${currencySymbol}${to}`,
         minValue: from,
         maxValue: to,
         isSelected: false
@@ -246,63 +276,81 @@ function generatePriceBuckets(minPrice, maxPrice, currencySymbol = "$") {
   }
   return buckets;
 }
+function buildBaseFilter(query, filters) {
+  const conditions = [];
+  if (query && query.trim().length > 0) {
+    conditions.push({ name: { $startsWith: query.trim() } });
+  }
+  if (filters.collectionIds && filters.collectionIds.length > 0) {
+    conditions.push({ "collections.id": { $hasSome: filters.collectionIds } });
+  }
+  if (conditions.length === 0) return {};
+  if (conditions.length === 1) return conditions[0];
+  return { $and: conditions };
+}
+function buildPriceFilter(baseFilter, minPrice, maxPrice) {
+  const priceFilter = {};
+  if (minPrice !== void 0 && minPrice > 0) {
+    priceFilter.price = { $gte: minPrice };
+  }
+  if (maxPrice !== void 0 && maxPrice > 0) {
+    const existing = priceFilter.price;
+    priceFilter.price = typeof existing === "object" && existing !== null ? { ...existing, $lte: maxPrice } : { $lte: maxPrice };
+  }
+  if (Object.keys(priceFilter).length === 0) return baseFilter;
+  if (Object.keys(baseFilter).length === 0) return priceFilter;
+  return { $and: [baseFilter, priceFilter] };
+}
 const searchProducts = makeJayQuery("wixStoresV1.searchProducts").withServices(WIX_STORES_V1_SERVICE_MARKER).withHandler(
   async (input, wixStores) => {
     const { query, filters = {}, sortBy = "relevance", page = 1, pageSize = 12 } = input;
     try {
-      const buildBaseQuery = () => {
-        let q = wixStores.products.queryProducts();
-        if (query && query.trim().length > 0) {
-          q = q.startsWith("name", query.trim());
-        }
-        if (filters.collectionIds && filters.collectionIds.length > 0) {
-          q = q.hasSome("collectionIds", filters.collectionIds);
-        }
-        return q;
-      };
-      const buildProductsQuery = () => {
-        let q = buildBaseQuery().limit(pageSize).skip((page - 1) * pageSize);
-        if (filters.minPrice !== void 0 && filters.minPrice > 0) {
-          q = q.ge("priceData.price", filters.minPrice);
-        }
-        if (filters.maxPrice !== void 0 && filters.maxPrice > 0) {
-          q = q.le("priceData.price", filters.maxPrice);
-        }
-        switch (sortBy) {
-          case "price_asc":
-            q = q.ascending("price");
-            break;
-          case "price_desc":
-            q = q.descending("price");
-            break;
-          case "name_asc":
-            q = q.ascending("name");
-            break;
-          case "name_desc":
-            q = q.descending("name");
-            break;
-          case "newest":
-            q = q.descending("lastUpdated");
-            break;
-        }
-        return q;
-      };
-      const minPriceQuery = buildBaseQuery().ascending("price").limit(1).find();
-      const maxPriceQuery = buildBaseQuery().descending("price").limit(1).find();
+      const baseFilter = buildBaseFilter(query, filters);
+      const fullFilter = buildPriceFilter(baseFilter, filters.minPrice, filters.maxPrice);
+      const sort = [];
+      switch (sortBy) {
+        case "price_asc":
+          sort.push({ fieldName: "price", order: "ASC" });
+          break;
+        case "price_desc":
+          sort.push({ fieldName: "price", order: "DESC" });
+          break;
+        case "name_asc":
+          sort.push({ fieldName: "name", order: "ASC" });
+          break;
+        case "name_desc":
+          sort.push({ fieldName: "name", order: "DESC" });
+          break;
+        case "newest":
+          sort.push({ fieldName: "lastUpdated", order: "DESC" });
+          break;
+      }
       const [result, minPriceResult, maxPriceResult] = await Promise.all([
-        buildProductsQuery().find(),
-        minPriceQuery,
-        maxPriceQuery
+        queryProducts(wixStores.wixClient, {
+          filter: fullFilter,
+          sort: sort.length > 0 ? sort : void 0,
+          paging: { limit: pageSize, offset: (page - 1) * pageSize }
+        }),
+        queryProducts(wixStores.wixClient, {
+          filter: baseFilter,
+          sort: [{ fieldName: "price", order: "ASC" }],
+          paging: { limit: 1 }
+        }),
+        queryProducts(wixStores.wixClient, {
+          filter: baseFilter,
+          sort: [{ fieldName: "price", order: "DESC" }],
+          paging: { limit: 1 }
+        })
       ]);
-      const products2 = result.items || [];
-      const minBound = minPriceResult.items?.[0]?.price?.price ?? minPriceResult.items?.[0]?.priceData?.price ?? 0;
-      const maxBound = maxPriceResult.items?.[0]?.price?.price ?? maxPriceResult.items?.[0]?.priceData?.price ?? 0;
-      const currency = products2[0]?.price?.currency || products2[0]?.priceData?.currency || minPriceResult.items?.[0]?.price?.currency;
+      const products = result.products || [];
+      const minBound = minPriceResult.products?.[0]?.price?.price ?? 0;
+      const maxBound = maxPriceResult.products?.[0]?.price?.price ?? 0;
+      const currency = products[0]?.price?.currency || minPriceResult.products?.[0]?.price?.currency;
       const currencySymbol = currency === "ILS" ? "₪" : currency === "USD" ? "$" : currency === "EUR" ? "€" : currency === "GBP" ? "£" : "$";
       const ranges = generatePriceBuckets(minBound, maxBound, currencySymbol);
-      const totalCount = result.totalCount ?? result.items?.length ?? 0;
+      const totalCount = result.totalResults ?? products.length;
       const totalPages = Math.ceil(totalCount / pageSize);
-      const mappedProducts = products2.map((p) => mapProductToCard(p));
+      const mappedProducts = products.map((p) => mapProductToCard(p));
       return {
         products: mappedProducts,
         totalCount,
@@ -324,14 +372,18 @@ const getProductBySlug = makeJayQuery("wixStoresV1.getProductBySlug").withServic
       throw new ActionError("INVALID_INPUT", "Product slug is required");
     }
     try {
-      let result = await wixStores.products.queryProducts().eq("slug", slug).limit(1).find();
-      if (!result.items?.length) {
-        result = await wixStores.products.queryProducts().eq("_id", slug).limit(1).find();
-      }
-      const product = result.items?.[0];
-      if (!product) {
-        return null;
+      let result = await queryProducts(wixStores.wixClient, {
+        filter: { slug },
+        paging: { limit: 1 }
+      });
+      if (!result.products?.length) {
+        result = await queryProducts(wixStores.wixClient, {
+          filter: { id: slug },
+          paging: { limit: 1 }
+        });
       }
+      const product = result.products?.[0];
+      if (!product) return null;
       return mapProductToCard(product);
     } catch (error) {
       console.error("[wixStoresV1.getProductBySlug] Failed to get product:", error);
@@ -342,8 +394,8 @@ const getProductBySlug = makeJayQuery("wixStoresV1.getProductBySlug").withServic
 const getCollections = makeJayQuery("wixStoresV1.getCollections").withServices(WIX_STORES_V1_SERVICE_MARKER).withCaching({ maxAge: 3600 }).withHandler(
   async (_input, wixStores) => {
     try {
-      const result = await wixStores.collections.queryCollections().find();
-      return (result.items || []).map((col) => mapCollectionToViewState(col));
+      const result = await queryCollections(wixStores.wixClient);
+      return (result.collections || []).map((col) => mapCollectionToViewState(col));
     } catch (error) {
       console.error("[wixStoresV1.getCollections] Failed to load collections:", error);
       throw new ActionError("LOAD_FAILED", "Failed to load collections");
@@ -399,7 +451,7 @@ function mapInfoSections(sections) {
 function mapMedia(product) {
   const mainMedia = product.media?.mainMedia;
   const mediaItems = product.media?.items || [];
-  const mainUrl = mainMedia?.image?.url || "";
+  const mainUrl = stripWixMediaResize(mainMedia?.image?.url || "");
   const mainMediaType = mainMedia?.mediaType === "video" ? MediaType$1.VIDEO : MediaType$1.IMAGE;
   return {
     selectedMedia: {
@@ -409,7 +461,7 @@ function mapMedia(product) {
     availableMedia: mediaItems.map((item, index) => ({
       mediaId: item._id || String(index),
       media: {
-        url: item.image?.url || "",
+        url: stripWixMediaResize(item.image?.url || ""),
         mediaType: item.mediaType === "video" ? MediaType$1.VIDEO : MediaType$1.IMAGE
       },
       selected: item._id === mainMedia?._id ? Selected.selected : Selected.notSelected
@@ -478,12 +530,18 @@ function mapSeoHeadTags(product, seoData) {
   return headTags;
 }
 async function* loadProductParams([wixStores]) {
+  const PAGE_SIZE2 = 100;
   try {
-    let result = await wixStores.products.queryProducts().find();
-    yield result.items.map((product) => ({ slug: product.slug || "" }));
-    while (result.hasNext()) {
-      result = await result.next();
-      yield result.items.map((product) => ({ slug: product.slug || "" }));
+    let offset = 0;
+    let hasMore = true;
+    while (hasMore) {
+      const result = await queryProducts(wixStores.wixClient, {
+        paging: { limit: PAGE_SIZE2, offset }
+      });
+      const products = result.products || [];
+      yield products.map((product) => ({ slug: product.slug || "" }));
+      offset += products.length;
+      hasMore = products.length === PAGE_SIZE2;
     }
   } catch (error) {
     console.error("[ProductPage V1] Failed to load product slugs:", error);
@@ -493,15 +551,21 @@ async function* loadProductParams([wixStores]) {
 async function renderSlowlyChanging$3(props, wixStores) {
   const Pipeline = RenderPipeline.for();
   return Pipeline.try(async () => {
-    const bySlug = await wixStores.products.queryProducts().eq("slug", props.slug).limit(1).find();
-    if (bySlug.items?.length)
+    const bySlug = await queryProducts(wixStores.wixClient, {
+      filter: { slug: props.slug },
+      paging: { limit: 1 }
+    });
+    if (bySlug.products?.length)
       return bySlug;
-    return wixStores.products.queryProducts().eq("_id", props.slug).limit(1).find();
+    return queryProducts(wixStores.wixClient, {
+      filter: { id: props.slug },
+      paging: { limit: 1 }
+    });
   }).recover((error) => {
     console.error("[ProductPage V1] Error loading product:", error);
     return Pipeline.clientError(404, "Product not found");
   }).toPhaseOutput((result) => {
-    const product = result.items?.[0];
+    const product = result.products?.[0];
     if (!product) {
       throw new Error("Product not found");
     }
@@ -570,13 +634,13 @@ const PAGE_SIZE$1 = 12;
 async function renderSlowlyChanging$2(props, wixStores) {
   const Pipeline = RenderPipeline.for();
   return Pipeline.try(async () => {
-    const collectionsResult = await wixStores.collections.queryCollections().find();
-    return collectionsResult.items || [];
+    const collectionsResult = await queryCollections(wixStores.wixClient);
+    return collectionsResult.collections || [];
   }).recover((error) => {
     console.error("[ProductSearch V1] Failed to load collections:", error);
     return Pipeline.ok([]);
-  }).toPhaseOutput((collections2) => {
-    const collectionInfos = collections2.map((col) => ({
+  }).toPhaseOutput((collections) => {
+    const collectionInfos = collections.map((col) => ({
       categoryId: col._id || "",
       categoryName: col.name || "",
       categorySlug: col.slug || ""
@@ -686,14 +750,14 @@ const productSearch = makeJayStackComponent().withProps().withServices(WIX_STORE
 async function renderSlowlyChanging$1(props, wixStores) {
   const Pipeline = RenderPipeline.for();
   return Pipeline.try(async () => {
-    const result = await wixStores.collections.queryCollections().find();
-    return result.items || [];
+    const result = await queryCollections(wixStores.wixClient);
+    return result.collections || [];
   }).recover((error) => {
     console.error("[CollectionList V1] Failed to load collections:", error);
     return Pipeline.ok([]);
-  }).toPhaseOutput((collections2) => {
-    const collectionItems = collections2.map((col) => {
-      const imageUrl = col.media?.mainMedia?.image?.url || "";
+  }).toPhaseOutput((collections) => {
+    const collectionItems = collections.map((col) => {
+      const imageUrl = stripWixMediaResize(col.media?.mainMedia?.image?.url || "");
       return {
         _id: col._id || "",
         name: col.name || "",
@@ -735,19 +799,22 @@ var MediaType = /* @__PURE__ */ ((MediaType2) => {
 const PAGE_SIZE = 20;
 async function* loadCollectionParams([wixStores]) {
   try {
-    const result = await wixStores.collections.queryCollections().find();
-    yield (result.items || []).filter((col) => col.slug).map((col) => ({ slug: col.slug }));
+    const result = await queryCollections(wixStores.wixClient);
+    yield (result.collections || []).filter((col) => col.slug).map((col) => ({ slug: col.slug }));
   } catch (error) {
     console.error("[CollectionPage V1] Failed to load collection slugs:", error);
     yield [];
   }
 }
 async function loadCollectionProducts(collectionId, wixStores, offset = 0) {
-  const result = await wixStores.products.queryProducts().hasSome("collectionIds", [collectionId]).skip(offset).limit(PAGE_SIZE).find();
-  const products2 = (result.items || []).map((product) => mapProductToCard(product, "/products"));
+  const result = await queryProducts(wixStores.wixClient, {
+    filter: { "collections.id": { $hasSome: [collectionId] } },
+    paging: { limit: PAGE_SIZE, offset }
+  });
+  const products = (result.products || []).map((product) => mapProductToCard(product, "/products"));
   return {
-    products: products2,
-    total: result.totalCount || products2.length
+    products,
+    total: result.totalResults || products.length
   };
 }
 function mapCollectionMedia(collection) {
@@ -755,7 +822,7 @@ function mapCollectionMedia(collection) {
   return {
     mainMedia: mainMedia?.image?.url ? {
       _id: "",
-      url: mainMedia.image.url,
+      url: stripWixMediaResize(mainMedia.image.url),
       altText: collection.name || "",
       mediaType: MediaType.IMAGE
     } : void 0,
@@ -765,8 +832,8 @@ function mapCollectionMedia(collection) {
 async function renderSlowlyChanging(props, wixStores) {
   const Pipeline = RenderPipeline.for();
   return Pipeline.try(async () => {
-    const result = await wixStores.collections.queryCollections().find();
-    const collection = (result.items || []).find((col) => col.slug === props.slug);
+    const result = await queryCollections(wixStores.wixClient);
+    const collection = (result.collections || []).find((col) => col.slug === props.slug);
     if (!collection) {
       throw new Error("Collection not found");
     }
@@ -871,7 +938,7 @@ async function setupWixStoresV1(ctx) {
     };
   }
   try {
-    await service.products.queryProducts().limit(1).find();
+    await queryProducts(service.wixClient, { paging: { limit: 1 } });
   } catch (e) {
     const msg = e.message || "";
     const hint = msg.includes("404") || msg.includes("not found") ? "Wix Stores may not be installed on this site" : msg.includes("403") || msg.includes("permission") ? "API key may lack Wix Stores permissions" : "This package requires the Stores Catalog V1 API — if using Catalog V3, use @jay-framework/wix-stores instead";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jay-framework/wix-stores-v1",
-  "version": "0.19.7",
+  "version": "0.21.0",
   "type": "module",
   "description": "Wix Stores Catalog V1 API client for Jay Framework",
   "license": "Apache-2.0",
@@ -35,27 +35,25 @@
     "test": ":"
   },
   "dependencies": {
-    "@jay-framework/component": "^0.19.7",
-    "@jay-framework/fullstack-component": "^0.19.7",
-    "@jay-framework/reactive": "^0.19.7",
-    "@jay-framework/runtime": "^0.19.7",
-    "@jay-framework/secure": "^0.19.7",
-    "@jay-framework/stack-client-runtime": "^0.19.7",
-    "@jay-framework/stack-server-runtime": "^0.19.7",
-    "@jay-framework/wix-cart": "^0.19.7",
-    "@jay-framework/wix-server-client": "^0.19.7",
-    "@jay-framework/wix-utils": "^0.19.7",
-    "@wix/sdk": "^1.21.5",
-    "@wix/sdk-runtime": "^1.0.11",
-    "@wix/stores": "^1.0.742"
+    "@jay-framework/component": "^0.21.0",
+    "@jay-framework/fullstack-component": "^0.21.0",
+    "@jay-framework/reactive": "^0.21.0",
+    "@jay-framework/runtime": "^0.21.0",
+    "@jay-framework/secure": "^0.21.0",
+    "@jay-framework/stack-client-runtime": "^0.21.0",
+    "@jay-framework/stack-server-runtime": "^0.21.0",
+    "@jay-framework/wix-cart": "^0.21.0",
+    "@jay-framework/wix-server-client": "^0.21.0",
+    "@jay-framework/wix-utils": "^0.21.0",
+    "@wix/sdk": "^1.21.5"
   },
   "devDependencies": {
     "@babel/core": "^7.23.7",
     "@babel/preset-env": "^7.23.8",
     "@babel/preset-typescript": "^7.23.3",
-    "@jay-framework/compiler-jay-stack": "^0.19.7",
-    "@jay-framework/jay-cli": "^0.19.7",
-    "@jay-framework/vite-plugin": "^0.19.7",
+    "@jay-framework/compiler-jay-stack": "^0.21.0",
+    "@jay-framework/jay-cli": "^0.21.0",
+    "@jay-framework/vite-plugin": "^0.21.0",
     "nodemon": "^3.0.3",
     "rimraf": "^5.0.5",
     "tslib": "^2.6.2",