@jay-framework/wix-stores 0.19.7 → 0.21.0

package/dist/index.js

@@ -1,12 +1,9 @@
 import { WIX_CART_CONTEXT, WIX_CART_SERVICE, cartIndicator, cartPage, provideWixCartContext, provideWixCartService } from "@jay-framework/wix-cart";
 import { createJayService, makeJayQuery, ActionError, RenderPipeline, makeJayStackComponent, makeJayInit, makeContractGenerator } from "@jay-framework/fullstack-component";
-import { customizationsV3, inventoryItemsV3, productsV3 } from "@wix/stores";
-import { categories } from "@wix/categories";
 import { registerService, getService } from "@jay-framework/stack-server-runtime";
-import { schemas } from "@wix/data-extension-schema";
+import { wixFetch, WIX_CLIENT_SERVICE } from "@jay-framework/wix-server-client";
 import { createJayContext } from "@jay-framework/runtime";
 import "@jay-framework/component";
-import { WIX_CLIENT_SERVICE } from "@jay-framework/wix-server-client";
 import * as fs from "fs";
 import * as path from "path";
 import * as yaml from "js-yaml";
@@ -25,48 +22,72 @@ var CurrentSort = /* @__PURE__ */ ((CurrentSort2) => {
   CurrentSort2[CurrentSort2["nameDesc"] = 5] = "nameDesc";
   return CurrentSort2;
 })(CurrentSort || {});
-const instances = {
-  productsV3ClientInstance: void 0,
-  categoriesClientInstance: void 0,
-  inventoryV3ClientInstance: void 0,
-  customizationsV3ClientInstance: void 0
-};
-function getProductsV3Client(wixClient) {
-  if (!instances.productsV3ClientInstance) {
-    instances.productsV3ClientInstance = wixClient.use(productsV3);
+function normalizeCategory(cat) {
+  if (!cat) return cat;
+  const normalized = { ...cat };
+  if (normalized.id && !normalized._id) {
+    normalized._id = normalized.id;
+  }
+  const parentCategory = normalized.parentCategory;
+  if (parentCategory?.id && !parentCategory?._id) {
+    normalized.parentCategory = { ...parentCategory, _id: parentCategory.id };
+  }
+  return normalized;
+}
+async function queryCategories(client, options) {
+  const result = await wixFetch(
+    client,
+    "/categories/v1/categories/query",
+    {
+      method: "POST",
+      body: {
+        query: {
+          filter: options?.filter,
+          sort: options?.sort,
+          cursorPaging: options?.cursorPaging || { limit: 100 }
+        },
+        treeReference: options?.treeReference || { appNamespace: "@wix/stores" }
+      }
+    }
+  );
+  if (result.categories) {
+    result.categories = result.categories.map(
+      (c) => normalizeCategory(c)
+    );
   }
-  return instances.productsV3ClientInstance;
+  return result;
 }
-function getCategoriesClient(wixClient) {
-  if (!instances.categoriesClientInstance) {
-    instances.categoriesClientInstance = wixClient.use(categories);
-  }
-  return instances.categoriesClientInstance;
+async function queryCustomizations(client, options) {
+  return wixFetch(client, "/stores/v3/customizations/query", {
+    method: "POST",
+    body: {
+      query: {
+        filter: options?.filter,
+        paging: options?.paging
+      }
+    }
+  });
 }
-function getInventoryClient(wixClient) {
-  if (!instances.inventoryV3ClientInstance) {
-    instances.inventoryV3ClientInstance = wixClient.use(inventoryItemsV3);
-  }
-  return instances.inventoryV3ClientInstance;
+async function querySchemas(client, options) {
+  const namespace = options?.filter?.namespace || "";
+  const params = namespace ? `?fqdn=${encodeURIComponent(namespace)}` : "";
+  return wixFetch(client, `/schema-service/v1/schemas${params}`, {
+    method: "GET"
+  });
 }
-function getCustomizationsV3Client(wixClient) {
-  if (!instances.customizationsV3ClientInstance) {
-    instances.customizationsV3ClientInstance = wixClient.use(customizationsV3);
-  }
-  return instances.customizationsV3ClientInstance;
+async function getAllProductsCategory(client) {
+  return wixFetch(client, "/stores/v3/all-products-category", {
+    method: "GET"
+  });
 }
 const WIX_STORES_SERVICE_MARKER = createJayService("Wix Store Service");
 function provideWixStoresService(wixClient, options) {
   let cachedTree = null;
   let cachedCustomizations = null;
   let cachedExtensionSchemas = null;
-  const categoriesClient = getCategoriesClient(wixClient);
-  const customizationsClient = getCustomizationsV3Client(wixClient);
+  let cachedAllProductsCategoryId;
   const service = {
-    products: getProductsV3Client(wixClient),
-    categories: categoriesClient,
-    inventory: getInventoryClient(wixClient),
-    customizations: customizationsClient,
+    wixClient,
     urls: options?.urls ?? { product: "/products/{slug}", category: null },
     defaultCategory: options?.defaultCategory ?? null,
     async getCategoryTree() {
@@ -91,11 +112,16 @@ function provideWixStoresService(wixClient, options) {
             }
           }
         };
-        let result = await categoriesClient.queryCategories({ treeReference: { appNamespace: "@wix/stores" } }).eq("visible", true).limit(100).find();
-        processItems(result.items || []);
-        while (result.hasNext()) {
-          result = await result.next();
-          processItems(result.items || []);
+        let cursor;
+        let hasMore = true;
+        while (hasMore) {
+          const result = await queryCategories(
+            wixClient,
+            cursor ? { cursorPaging: { cursor } } : { filter: { visible: true }, cursorPaging: { limit: 100 } }
+          );
+          processItems(result.categories || []);
+          cursor = result.pagingMetadata?.cursors?.next;
+          hasMore = !!cursor;
         }
       } catch (error) {
         console.error("[wix-stores] Failed to build category tree:", error);
@@ -106,8 +132,11 @@ function provideWixStoresService(wixClient, options) {
     async getCustomizations() {
       if (cachedCustomizations) return cachedCustomizations;
       try {
-        const result = await customizationsClient.queryCustomizations().eq("customizationType", "PRODUCT_OPTION").limit(100).find();
-        cachedCustomizations = result.items || [];
+        const result = await queryCustomizations(wixClient, {
+          filter: { customizationType: "PRODUCT_OPTION" },
+          paging: { limit: 100 }
+        });
+        cachedCustomizations = result.customizations || [];
       } catch (error) {
         console.error("[wix-stores] Failed to load customizations:", error);
         cachedCustomizations = [];
@@ -117,10 +146,9 @@ function provideWixStoresService(wixClient, options) {
     async getDataExtensionSchemas() {
       if (cachedExtensionSchemas) return cachedExtensionSchemas;
       try {
-        const client = wixClient.use(schemas);
-        const result = await client.listDataExtensionSchemas(
-          "wix.stores.catalog.v3.product"
-        );
+        const result = await querySchemas(wixClient, {
+          filter: { namespace: "wix.stores.catalog.v3.product" }
+        });
         cachedExtensionSchemas = result?.dataExtensionSchemas ?? [];
         const fieldCount = cachedExtensionSchemas.reduce(
           (n, s) => n + Object.keys(s.jsonSchema?.properties ?? {}).length,
@@ -134,6 +162,17 @@ function provideWixStoresService(wixClient, options) {
         cachedExtensionSchemas = [];
       }
       return cachedExtensionSchemas;
+    },
+    async getAllProductsCategoryId() {
+      if (cachedAllProductsCategoryId !== void 0) return cachedAllProductsCategoryId;
+      try {
+        const result = await getAllProductsCategory(wixClient);
+        cachedAllProductsCategoryId = result.categoryId ?? null;
+      } catch (error) {
+        console.error("[wix-stores] Failed to get All Products category:", error);
+        cachedAllProductsCategoryId = null;
+      }
+      return cachedAllProductsCategoryId;
     }
   };
   registerService(WIX_STORES_SERVICE_MARKER, service);
@@ -178,6 +217,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 parseWixMediaUrl(url) {
   if (!url) return null;
   const match = url.match(
@@ -214,7 +256,7 @@ function formatWixMediaUrl(_id, url, resize) {
     }
   }
   if ((url == null ? void 0 : url.startsWith("http://")) || (url == null ? void 0 : url.startsWith("https://"))) {
-    return url;
+    return stripWixMediaResize(url) + resizeFragment;
   }
   if (_id) {
     return `https://static.wixstatic.com/media/${_id}${resizeFragment}`;
@@ -456,6 +498,220 @@ function mapProductToCard(product, urls, tree) {
     ...mapQuickAddOptions(product)
   };
 }
+function raw(value) {
+  return value;
+}
+function rawArray(value) {
+  return value;
+}
+function str(value) {
+  return value;
+}
+function normalizeProduct(product) {
+  if (!product) return product;
+  const normalized = { ...product };
+  if (normalized.id && !normalized._id) {
+    normalized._id = normalized.id;
+  }
+  const media = raw(normalized.media);
+  if (media?.main) {
+    const main = raw(media.main);
+    const mainImage = raw(main.image);
+    normalized.media = {
+      ...media,
+      main: {
+        _id: main.id || main._id,
+        url: mainImage?.url || main.url,
+        altText: mainImage?.altText || main.altText,
+        mediaType: main.mediaType,
+        width: mainImage?.width,
+        height: mainImage?.height
+      }
+    };
+  }
+  const updatedMedia = raw(normalized.media);
+  const itemsInfo = raw(updatedMedia?.itemsInfo);
+  if (itemsInfo?.items) {
+    itemsInfo.items = rawArray(itemsInfo.items).map((item) => {
+      const image = raw(item.image);
+      return {
+        _id: item.id || item._id,
+        url: image?.url || item.url,
+        altText: image?.altText || item.altText,
+        mediaType: item.mediaType,
+        width: image?.width,
+        height: image?.height
+      };
+    });
+  }
+  if (normalized.options) {
+    normalized.options = rawArray(normalized.options).map((opt) => {
+      const choicesSettings = raw(opt.choicesSettings);
+      return {
+        ...opt,
+        _id: opt.id || opt._id,
+        choices: choicesSettings?.choices ? rawArray(choicesSettings.choices).map((c) => {
+          const linkedMedia = c.linkedMedia;
+          const firstMedia = linkedMedia?.[0];
+          const firstMediaImage = firstMedia ? raw(firstMedia.image) : void 0;
+          return {
+            ...c,
+            _id: c.choiceId || c._id,
+            value: c.name || c.value,
+            media: firstMedia ? {
+              _id: firstMedia.id,
+              url: str(firstMediaImage?.url) || firstMedia.url,
+              mediaType: firstMedia.mediaType
+            } : void 0
+          };
+        }) : void 0
+      };
+    });
+  }
+  if (normalized.modifiers) {
+    normalized.modifiers = rawArray(normalized.modifiers).map((mod) => {
+      const choicesSettings = raw(mod.choicesSettings);
+      return {
+        ...mod,
+        _id: mod.id || mod._id,
+        choices: choicesSettings?.choices ? rawArray(choicesSettings.choices).map((c) => ({
+          ...c,
+          _id: c.choiceId || c._id,
+          value: c.name || c.value
+        })) : void 0
+      };
+    });
+  }
+  if (normalized.infoSections) {
+    normalized.infoSections = rawArray(normalized.infoSections).map((s) => ({
+      ...s,
+      _id: s.id || s._id
+    }));
+  }
+  const variantsInfo = raw(normalized.variantsInfo);
+  if (variantsInfo?.variants) {
+    variantsInfo.variants = rawArray(variantsInfo.variants).map((v) => ({
+      ...v,
+      _id: v.id || v._id
+    }));
+  }
+  if (normalized.ribbon) {
+    const ribbon = raw(normalized.ribbon);
+    normalized.ribbon = {
+      ...ribbon,
+      _id: ribbon.id || ribbon._id
+    };
+  }
+  return normalized;
+}
+function normalizeProducts(products) {
+  return products.map(normalizeProduct);
+}
+async function queryProducts(client, query) {
+  const result = await wixFetch(client, "/stores/v3/products/query", {
+    method: "POST",
+    body: {
+      query: {
+        filter: query.filter,
+        sort: query.sort,
+        paging: query.paging
+      },
+      ...query.fields ? { fields: query.fields } : {}
+    }
+  });
+  if (result.products) {
+    result.products = normalizeProducts(result.products);
+  }
+  return result;
+}
+async function searchProducts$1(client, search, options) {
+  const result = await wixFetch(client, "/stores/v3/products/search", {
+    method: "POST",
+    body: {
+      search,
+      ...options?.fields ? { fields: options.fields } : {}
+    }
+  });
+  if (result.products) {
+    result.products = normalizeProducts(result.products);
+  }
+  return result;
+}
+const searchProducts$2 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+  __proto__: null,
+  searchProducts: searchProducts$1
+}, Symbol.toStringTag, { value: "Module" }));
+async function getProduct(client, productId, options) {
+  const params = new URLSearchParams();
+  {
+    params.set("includeMerchantSpecificData", "true");
+  }
+  if (options?.fields) {
+    for (const f of options.fields) {
+      params.append("fields", f);
+    }
+  }
+  const qs = params.toString();
+  const result = await wixFetch(
+    client,
+    `/stores/v3/products/${productId}${qs ? "?" + qs : ""}`,
+    {
+      method: "GET"
+    }
+  );
+  if (result.product) {
+    result.product = normalizeProduct(result.product);
+  }
+  return result;
+}
+async function getProductBySlug$1(client, slug, options) {
+  const params = new URLSearchParams();
+  if (options?.includeMerchantSpecificData) {
+    params.set("includeMerchantSpecificData", "true");
+  }
+  if (options?.fields) {
+    for (const f of options.fields) {
+      params.append("fields", f);
+    }
+  }
+  const qs = params.toString();
+  const result = await wixFetch(
+    client,
+    `/stores/v3/products/slug/${slug}${qs ? "?" + qs : ""}`,
+    {
+      method: "GET"
+    }
+  );
+  if (result.product) {
+    result.product = normalizeProduct(result.product);
+  }
+  return result;
+}
+async function getCategory(client, categoryId) {
+  const result = await wixFetch(
+    client,
+    `/categories/v1/categories/${categoryId}`,
+    {
+      method: "GET"
+    }
+  );
+  if (result.category) {
+    const raw2 = result.category;
+    if (raw2.id && !result.category._id) {
+      result.category._id = raw2.id;
+    }
+    if (result.category.parentCategory) {
+      const rawParent = result.category.parentCategory;
+      if (rawParent.id && !result.category.parentCategory._id) {
+        result.category.parentCategory = {
+          ...result.category.parentCategory,
+          _id: rawParent.id
+        };
+      }
+    }
+  }
+  return result;
+}
 function needsCategoryInfo(wixStores) {
   const template = wixStores.urls.product;
   return template.includes("{category}") || template.includes("{prefix}");
@@ -630,7 +886,8 @@ const searchProducts = makeJayQuery("wixStores.searchProducts").withServices(WIX
           }
         }
       ];
-      const searchResult = await wixStores.products.searchProducts(
+      const searchResult = await searchProducts$1(
+        wixStores.wixClient,
         {
           filter,
           sort: sort.length > 0 ? sort : void 0,
@@ -719,7 +976,8 @@ const getProductBySlug = makeJayQuery("wixStores.getProductBySlug").withServices
         "CURRENCY",
         ...needsCategoryInfo(wixStores) ? ["ALL_CATEGORIES_INFO"] : []
       ];
-      const result = await wixStores.products.getProductBySlug(slug, {
+      const result = await getProductBySlug$1(wixStores.wixClient, slug, {
+        includeMerchantSpecificData: true,
         fields: [...fields]
       });
       const product = result.product;
@@ -737,10 +995,12 @@ const getProductBySlug = makeJayQuery("wixStores.getProductBySlug").withServices
 const getVariantStock = makeJayQuery("wixStores.getVariantStock").withServices(WIX_STORES_SERVICE_MARKER).withHandler(
   async (input, wixStores) => {
     try {
-      const product = await wixStores.products.getProduct(input.productId, {
+      const result = await getProduct(wixStores.wixClient, input.productId, {
+        includeMerchantSpecificData: true,
         fields: ["VARIANT_OPTION_CHOICE_NAMES"]
       });
-      return buildVariantStockMap(product);
+      if (!result.product) return {};
+      return buildVariantStockMap(result.product);
     } catch (error) {
       console.error("[wixStores.getVariantStock] Failed:", error);
       return {};
@@ -750,12 +1010,10 @@ const getVariantStock = makeJayQuery("wixStores.getVariantStock").withServices(W
 const getCategories = makeJayQuery("wixStores.getCategories").withServices(WIX_STORES_SERVICE_MARKER).withCaching({ maxAge: 3600 }).withHandler(
   async (_input, wixStores) => {
     try {
-      const result = await wixStores.categories.queryCategories({
-        treeReference: {
-          appNamespace: "@wix/stores"
-        }
-      }).eq("visible", true).find();
-      return (result.items || []).map((cat) => ({
+      const result = await queryCategories(wixStores.wixClient, {
+        filter: { visible: true }
+      });
+      return (result.categories || []).map((cat) => ({
         categoryId: cat._id || "",
         categoryName: cat.name || ""
       }));
@@ -877,21 +1135,25 @@ const EMPTY_CATEGORY_HEADER = {
   breadcrumbs: [],
   seoData: { tags: [], settings: { preventAutoRedirect: false, keywords: [] } }
 };
-async function findCategoryBySlug$1(categoriesClient, slug) {
-  const result = await categoriesClient.queryCategories({ treeReference: { appNamespace: "@wix/stores" } }).eq("slug", slug).eq("visible", true).limit(1).find();
-  return result.items?.[0] ?? null;
+async function findCategoryBySlug$1(wixClient, slug) {
+  const result = await queryCategories(wixClient, {
+    filter: { slug, visible: true },
+    cursorPaging: { limit: 1 }
+  });
+  return result.categories?.[0] ?? null;
 }
-async function loadCategoryDetails(categoriesClient, categoryId) {
+async function loadCategoryDetails(wixClient, categoryId) {
   try {
-    return await categoriesClient.getCategory(categoryId, { appNamespace: "@wix/stores" }, { fields: ["DESCRIPTION", "BREADCRUMBS_INFO"] });
+    const result = await getCategory(wixClient, categoryId);
+    return result.category ?? null;
   } catch {
     return null;
   }
 }
 async function buildCategoryHeader(wixStoreService, category, categoryUrlTemplate) {
-  const details = await loadCategoryDetails(wixStoreService.categories, category._id);
+  const details = await loadCategoryDetails(wixStoreService.wixClient, category._id);
   const cat = details || category;
-  const imageUrl = cat.image ? formatWixMediaUrl("", cat.image) : "";
+  const imageUrl = cat.image?.url ? formatWixMediaUrl(cat.image.id || "", cat.image.url) : "";
   const description = cat.description || "";
   const categoryTree = await wixStoreService.getCategoryTree();
   const breadcrumbs = [
@@ -941,13 +1203,13 @@ async function buildCategoryHeader(wixStoreService, category, categoryUrlTemplat
     seoData
   };
   if ((!description || !imageUrl) && cat.parentCategory?._id) {
-    const parent = await loadCategoryDetails(wixStoreService.categories, cat.parentCategory._id);
+    const parent = await loadCategoryDetails(wixStoreService.wixClient, cat.parentCategory._id);
     if (parent) {
       if (!header.description && parent.description) {
         header = { ...header, description: parent.description };
       }
       if (!header.imageUrl) {
-        const parentImage = parent.image ? formatWixMediaUrl("", parent.image) : "";
+        const parentImage = parent.image?.url ? formatWixMediaUrl(parent.image.id || "", parent.image.url) : "";
         if (parentImage) {
           header = { ...header, imageUrl: parentImage, hasImage: true };
         }
@@ -964,26 +1226,25 @@ async function renderSlowlyChanging$4(props, wixStores) {
   let activeCategory = null;
   let baseCategoryId = null;
   if (categorySlug) {
-    activeCategory = await findCategoryBySlug$1(wixStores.categories, categorySlug);
+    activeCategory = await findCategoryBySlug$1(wixStores.wixClient, categorySlug);
     baseCategoryId = activeCategory?._id ?? null;
   } else if (prefixSlug) {
-    activeCategory = await findCategoryBySlug$1(wixStores.categories, prefixSlug);
+    activeCategory = await findCategoryBySlug$1(wixStores.wixClient, prefixSlug);
     baseCategoryId = activeCategory?._id ?? null;
   } else if (defaultCategorySlug) {
-    activeCategory = await findCategoryBySlug$1(wixStores.categories, defaultCategorySlug);
+    activeCategory = await findCategoryBySlug$1(wixStores.wixClient, defaultCategorySlug);
   }
   const tree = await wixStores.getCategoryTree();
   const categoryHeader = activeCategory ? await buildCategoryHeader(wixStores, activeCategory, wixStores.urls.category) : EMPTY_CATEGORY_HEADER;
+  const allProductsCategoryId = await wixStores.getAllProductsCategoryId();
   return Pipeline.try(async () => {
-    let query = wixStores.categories.queryCategories({
-      treeReference: { appNamespace: "@wix/stores" }
-    }).eq("visible", true);
+    const categoryFilter = { visible: true };
     if (baseCategoryId) {
-      query = query.eq("parentCategory.id", baseCategoryId);
+      categoryFilter["parentCategory.id"] = baseCategoryId;
     }
     const baseCategoryIds = baseCategoryId ? [baseCategoryId] : [];
     const [categoriesResult, productsResult] = await Promise.all([
-      query.find(),
+      queryCategories(wixStores.wixClient, { filter: categoryFilter }),
       searchProducts({
         query: "",
         filters: {
@@ -992,14 +1253,15 @@ async function renderSlowlyChanging$4(props, wixStores) {
         pageSize: PAGE_SIZE
       })
     ]);
+    const categories = (categoriesResult.categories || []).filter((cat) => cat._id !== allProductsCategoryId);
     return {
-      categories: categoriesResult.items || [],
+      categories,
       productsResult
     };
   }).recover((error) => {
     return handleError(error);
-  }).toPhaseOutput(({ categories: categories2, productsResult }) => {
-    const categoryInfos = categories2.map((cat) => ({
+  }).toPhaseOutput(({ categories, productsResult }) => {
+    const categoryInfos = categories.map((cat) => ({
       categoryId: cat._id || "",
       categoryName: cat.name || "",
       categorySlug: cat.slug || "",
@@ -1156,20 +1418,21 @@ async function* loadSearchParams([wixStores]) {
       if (rootSlug) {
         params.push({ prefix: rootSlug, category: node.slug });
       } else {
-        params.push({ prefix: node.slug });
+        params.push({ category: node.slug });
       }
       for (const child of node.children) {
         collectParams(child, rootSlug ?? node.slug);
       }
     };
+    const allProductsCategoryId = await wixStores.getAllProductsCategoryId();
     const allCategories = [];
-    let result = await wixStores.categories.queryCategories({
-      treeReference: { appNamespace: "@wix/stores" }
-    }).eq("visible", true).limit(100).find();
-    allCategories.push(...result.items || []);
-    while (result.hasNext()) {
-      result = await result.next();
-      allCategories.push(...result.items || []);
+    let cursor;
+    let hasMore = true;
+    while (hasMore) {
+      const result = await queryCategories(wixStores.wixClient, cursor ? { cursorPaging: { cursor } } : { filter: { visible: true }, cursorPaging: { limit: 100 } });
+      allCategories.push(...result.categories || []);
+      cursor = result.pagingMetadata?.cursors?.next;
+      hasMore = !!cursor;
     }
     const nodeById = /* @__PURE__ */ new Map();
     const roots = [];
@@ -1177,6 +1440,8 @@ async function* loadSearchParams([wixStores]) {
     for (const cat of allCategories) {
       if (!cat._id)
         continue;
+      if (cat._id === allProductsCategoryId)
+        continue;
       const node = {
         slug: cat.slug || "",
         itemCount: cat.itemCounter ?? 0,
@@ -1206,7 +1471,7 @@ async function* loadSearchParams([wixStores]) {
     for (const root of roots) {
       sumItems(root);
     }
-    const params = [];
+    const params = [{}];
     for (const root of roots) {
       collectParams(root, null);
     }
@@ -1259,9 +1524,9 @@ var MediaType = /* @__PURE__ */ ((MediaType2) => {
   return MediaType2;
 })(MediaType || {});
 function mapExtendedFields(product) {
-  const raw = product.extendedFields?.namespaces?.["_user_fields"] ?? {};
+  const raw2 = product.extendedFields?.namespaces?.["_user_fields"] ?? {};
   const result = {};
-  for (const [key, value] of Object.entries(raw)) {
+  for (const [key, value] of Object.entries(raw2)) {
     if (Array.isArray(value)) {
       result[key] = value.map((item, i) => typeof item === "object" && item !== null ? { ...item, _index: i } : { value: item, _index: i });
     } else {
@@ -1278,7 +1543,7 @@ async function* loadProductParams([wixStores]) {
   const fields = needsCategories ? ["ALL_CATEGORIES_INFO"] : [];
   try {
     const tree = needsCategories ? await wixStores.getCategoryTree() : null;
-    let result = await wixStores.products.queryProducts({ fields: [...fields] }).find();
+    let result = await queryProducts(wixStores.wixClient, { fields: [...fields] });
     const mapProduct = (product) => {
       const slug = product.slug ?? "";
       if (!slug)
@@ -1294,11 +1559,7 @@ async function* loadProductParams([wixStores]) {
       }
       return params;
     };
-    yield result.items.map(mapProduct).filter((p) => p !== null);
-    while (result.hasNext()) {
-      result = await result.next();
-      yield result.items.map(mapProduct).filter((p) => p !== null);
-    }
+    yield (result.products || []).map(mapProduct).filter((p) => p !== null);
   } catch (error) {
     console.error("Failed to load product slugs:", error);
     yield [];
@@ -1464,7 +1725,8 @@ async function renderSlowlyChanging$3(props, wixStores) {
       ...needsCategories ? ["ALL_CATEGORIES_INFO"] : []
     ];
     const [response, tree] = await Promise.all([
-      wixStores.products.getProductBySlug(props.slug, {
+      getProductBySlug$1(wixStores.wixClient, props.slug, {
+        includeMerchantSpecificData: true,
         fields: [...fields]
       }),
       wixStores.getCategoryTree()
@@ -1583,15 +1845,18 @@ async function renderSlowlyChanging$2(props, wixStores) {
       return { categoryName: "", products: [] };
     }
     const [categoryResult, searchResult] = await Promise.all([
-      wixStores.categories.queryCategories({ treeReference: { appNamespace: "@wix/stores" } }).eq("_id", categoryId).limit(1).find().catch(() => null),
+      queryCategories(wixStores.wixClient, {
+        filter: { _id: categoryId },
+        cursorPaging: { limit: 1 }
+      }).catch(() => null),
       searchProducts({
         query: "",
         filters: { categoryIds: [categoryId] },
         pageSize: limit + 1
       })
     ]);
-    if (categoryResult?.items?.[0]?.name) {
-      categoryName = categoryResult.items[0].name;
+    if (categoryResult?.categories?.[0]?.name) {
+      categoryName = categoryResult.categories[0].name;
     }
     const products = searchResult.products.filter((p) => p._id !== props.productId).slice(0, limit);
     return { categoryName, products };
@@ -1699,34 +1964,33 @@ async function renderFastChanging(_props, carryForward, _wixStores) {
   });
 }
 const productSpotlight = makeJayStackComponent().withProps().withServices(WIX_STORES_SERVICE_MARKER).withSlowlyRender(renderSlowlyChanging$1).withFastRender(renderFastChanging);
-async function findCategoryBySlug(categoriesClient, slug) {
-  const result = await categoriesClient.queryCategories({ treeReference: { appNamespace: "@wix/stores" } }).eq("slug", slug).eq("visible", true).limit(1).find();
-  return result.items?.[0] ?? null;
+async function findCategoryBySlug(wixClient, slug) {
+  const result = await queryCategories(wixClient, {
+    filter: { slug, visible: true },
+    cursorPaging: { limit: 1 }
+  });
+  return result.categories?.[0] ?? null;
 }
 async function renderSlowlyChanging(props, wixStores) {
   const Pipeline = RenderPipeline.for();
   const parentCategorySlug = props.parentCategory ?? wixStores.defaultCategory;
   let parentCategoryId = null;
   if (parentCategorySlug) {
-    const parentCat = await findCategoryBySlug(wixStores.categories, parentCategorySlug);
+    const parentCat = await findCategoryBySlug(wixStores.wixClient, parentCategorySlug);
     parentCategoryId = parentCat?._id ?? null;
   }
   return Pipeline.try(async () => {
-    let query = wixStores.categories.queryCategories({
-      treeReference: {
-        appNamespace: "@wix/stores"
-      }
-    }).eq("visible", true);
+    const filter = { visible: true };
     if (parentCategoryId) {
-      query = query.eq("parentCategory.id", parentCategoryId);
+      filter["parentCategory.id"] = parentCategoryId;
     }
-    const result = await query.find();
-    return result.items || [];
+    const result = await queryCategories(wixStores.wixClient, { filter });
+    return result.categories || [];
   }).recover((error) => {
     console.error("Failed to load categories:", error);
     return Pipeline.ok([]);
-  }).toPhaseOutput((categories2) => {
-    const categoryItems = categories2.map((cat) => ({
+  }).toPhaseOutput((categories) => {
+    const categoryItems = categories.map((cat) => ({
       _id: cat._id || "",
       name: cat.name || "",
       slug: cat.slug || "",
@@ -1756,17 +2020,17 @@ function loadWixStoresConfig(projectRoot) {
     return defaults;
   }
   const fileContents = fs.readFileSync(configPath, "utf8");
-  const raw = yaml.load(fileContents);
-  if (!raw) {
+  const raw2 = yaml.load(fileContents);
+  if (!raw2) {
     return defaults;
   }
-  const urls = raw.urls;
+  const urls = raw2.urls;
   return {
     urls: {
       product: typeof urls?.product === "string" ? urls.product : defaults.urls.product,
       category: typeof urls?.category === "string" ? urls.category : null
     },
-    defaultCategory: typeof raw.defaultCategory === "string" ? raw.defaultCategory : null
+    defaultCategory: typeof raw2.defaultCategory === "string" ? raw2.defaultCategory : null
   };
 }
 const init = makeJayInit().withServer(async () => {
@@ -1787,6 +2051,9 @@ const init = makeJayInit().withServer(async () => {
     enableClientSearch: true
   };
 });
+function wixStoresStaticContractPath(contractName) {
+  return `node_modules/@jay-framework/wix-stores/dist/contracts/${contractName}.jay-contract`;
+}
 function flattenCategoryTree(roots, parentNames = [], parentSlugs = [], rootSlug = null, rootName = null, rootHasChildren = null) {
   const entries = [];
   for (const node of roots) {
@@ -1899,9 +2166,10 @@ function buildCategoryPrompt(config, entry) {
     `  category-products — pass categorySlug="${node.slug}" to show products from this category; optionally pass productId to exclude a product`,
     "",
     "Contracts:",
-    "  agent-kit/materialized-contracts/wix-stores/product-search.jay-contract",
-    "  agent-kit/materialized-contracts/wix-stores/category-list.jay-contract",
-    "  agent-kit/materialized-contracts/wix-stores/category-products.jay-contract",
+    `  ${wixStoresStaticContractPath("product-search")}`,
+    `  ${wixStoresStaticContractPath("category-list")}`,
+    `  ${wixStoresStaticContractPath("category-products")}`,
+    "  Related products on a product page: agent-kit/designer/related-products.md",
     "",
     "Bind ViewState and refs per agent-kit/designer/INSTRUCTIONS.md."
   );
@@ -1932,16 +2200,39 @@ function buildCategoryAddMenuItems(roots, config) {
     prompt: buildCategoryPrompt(config, entry)
   }));
 }
+const PUBLIC_THUMBNAIL_ROOT = path.join("public", "aiditor-add-menu-thumbnails");
+function copyAiditorAddMenuThumbnails(ctx, resolvePackagePath, pluginName) {
+  const sourceDir = resolvePackagePath(
+    path.join("agent-kit", "aiditor", "thumbnails", pluginName)
+  );
+  if (!fs.existsSync(sourceDir)) return [];
+  const destDir = path.join(ctx.projectRoot, PUBLIC_THUMBNAIL_ROOT, pluginName);
+  const created = [];
+  fs.mkdirSync(destDir, { recursive: true });
+  for (const entry of fs.readdirSync(sourceDir, { withFileTypes: true })) {
+    if (!entry.isFile()) continue;
+    const src = path.join(sourceDir, entry.name);
+    const dest = path.join(destDir, entry.name);
+    if (!fs.existsSync(dest) || ctx.force) {
+      fs.copyFileSync(src, dest);
+      created.push(path.posix.join(PUBLIC_THUMBNAIL_ROOT, pluginName, entry.name));
+    }
+  }
+  return created;
+}
 const CONFIG_FILE_NAME = ".wix-stores.yaml";
 const ADD_MENU_OUTPUT_REL = "agent-kit/aiditor/add-menu/wix-stores.yaml";
 const ADD_MENU_GENERATED_REL = "agent-kit/aiditor/add-menu/wix-stores.generated.yaml";
-function resolveAddMenuTemplatePath() {
+function resolvePackageAgentKitPath(relativePath) {
   const thisDir = path.dirname(fileURLToPath(import.meta.url));
-  const fromDist = path.join(thisDir, "agent-kit/aiditor/add-menu.template.yaml");
+  const fromDist = path.join(thisDir, relativePath);
   if (fs.existsSync(fromDist)) {
     return fromDist;
   }
-  return path.join(thisDir, "..", "agent-kit/aiditor/add-menu.template.yaml");
+  return path.join(thisDir, "..", relativePath);
+}
+function resolveAddMenuTemplatePath() {
+  return resolvePackageAgentKitPath("agent-kit/aiditor/add-menu.template.yaml");
 }
 function writeAddMenuCatalog(ctx) {
   const outputPath = path.join(ctx.projectRoot, ADD_MENU_OUTPUT_REL);
@@ -2009,7 +2300,8 @@ async function setupWixStores(ctx) {
   }
   const service = getService(WIX_STORES_SERVICE_MARKER);
   try {
-    await service.products.searchProducts({});
+    const { searchProducts: searchProductsApi } = await Promise.resolve().then(() => searchProducts$2);
+    await searchProductsApi(service.wixClient, {});
   } 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 V3 API — if using Catalog V1, use @jay-framework/wix-stores-v1 instead";
@@ -2022,6 +2314,9 @@ async function setupWixStores(ctx) {
   if (addMenuCreated) {
     configCreated.push(addMenuCreated);
   }
+  configCreated.push(
+    ...copyAiditorAddMenuThumbnails(ctx, resolvePackageAgentKitPath, "wix-stores")
+  );
   const message = `Wix Stores configured (product URL: ${service.urls.product})`;
   return {
     status: "configured",
@@ -2041,13 +2336,16 @@ async function generateWixStoresReferences(ctx) {
   }
   fs.mkdirSync(ctx.referencesDir, { recursive: true });
   const allCategories = [];
-  let result = await storesService.categories.queryCategories({
-    treeReference: { appNamespace: "@wix/stores" }
-  }).eq("visible", true).limit(100).find();
-  allCategories.push(...result.items || []);
-  while (result.hasNext()) {
-    result = await result.next();
-    allCategories.push(...result.items || []);
+  let cursor;
+  let hasMore = true;
+  while (hasMore) {
+    const result = await queryCategories(
+      storesService.wixClient,
+      cursor ? { cursorPaging: { cursor } } : { filter: { visible: true }, cursorPaging: { limit: 100 } }
+    );
+    allCategories.push(...result.categories || []);
+    cursor = result.pagingMetadata?.cursors?.next;
+    hasMore = !!cursor;
   }
   const nodeMap = /* @__PURE__ */ new Map();
   for (const cat of allCategories) {
@@ -2214,8 +2512,8 @@ function jsonSchemaToContractTags(properties, indent = 4) {
   }
   return tags;
 }
-function buildExtendedFieldsSubContract(schemas2, indent = 2) {
-  const userFieldsSchema = schemas2.find((s) => s.namespace === "_user_fields");
+function buildExtendedFieldsSubContract(schemas, indent = 2) {
+  const userFieldsSchema = schemas.find((s) => s.namespace === "_user_fields");
   const properties = userFieldsSchema?.jsonSchema?.properties;
   if (!properties || Object.keys(properties).length === 0) {
     return null;
@@ -2336,8 +2634,8 @@ tags:
 
   # SEO data is injected into <head> via headTags (Design Log #127), not part of the contract view state.`;
 const generator = makeContractGenerator().withServices(WIX_STORES_SERVICE_MARKER).generateWith(async (wixStoresService) => {
-  const schemas2 = await wixStoresService.getDataExtensionSchemas();
-  const extendedFieldsBlock = buildExtendedFieldsSubContract(schemas2);
+  const schemas = await wixStoresService.getDataExtensionSchemas();
+  const extendedFieldsBlock = buildExtendedFieldsSubContract(schemas);
   let yaml2 = BASE_CONTRACT_YAML;
   if (extendedFieldsBlock) {
     yaml2 = yaml2 + "\n\n" + extendedFieldsBlock;
@@ -2347,7 +2645,7 @@ const generator = makeContractGenerator().withServices(WIX_STORES_SERVICE_MARKER
       yaml: yaml2,
       description: "Product page with data extension fields",
       metadata: {
-        extendedFieldCount: schemas2.reduce(
+        extendedFieldCount: schemas.reduce(
           (count, s) => count + Object.keys(s.jsonSchema?.properties ?? {}).length,
           0
         )