@misiki/gocommerce-connector 0.9.1 → 0.11.0

package/dist/services/index.cjs

@@ -1067,11 +1067,14 @@ var StoreFacts = class extends BaseService {
 
 // src/services/catalog.ts
 var PAGE_SIZE = 24;
-function indexSort(sort) {
-  if (!sort) return void 0;
+function sortParts(sort) {
   const s = sort.trim();
   const [field, dir] = s.startsWith("-") ? [s.slice(1), "desc"] : s.includes(":") ? s.split(":") : [s, "asc"];
-  const d = dir === "desc" ? "desc" : "asc";
+  return [field, dir === "desc" ? "desc" : "asc"];
+}
+function indexSort(sort) {
+  if (!sort) return void 0;
+  const [field, d] = sortParts(sort);
   switch (field) {
     case "price":
       return `price_minor:${d}`;
@@ -1087,6 +1090,20 @@ function indexSort(sort) {
       return void 0;
   }
 }
+function engineSort(sort) {
+  if (!sort || NATURAL.has(sort)) return {};
+  const [field, order] = sortParts(sort);
+  const key = {
+    price: "price",
+    createdAt: "created_at",
+    created_at: "created_at",
+    updatedAt: "updated_at",
+    updated_at: "updated_at",
+    title: "title",
+    name: "title"
+  }[field];
+  return key ? { sort: key, order } : {};
+}
 var NATURAL = /* @__PURE__ */ new Set([
   "-createdAt",
   "createdAt:desc",
@@ -1096,6 +1113,7 @@ var NATURAL = /* @__PURE__ */ new Set([
   "popularity:desc"
 ]);
 var quote = (s) => `"${s.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"`;
+var legacyListing = /* @__PURE__ */ new Set();
 var CatalogService = class extends BaseService {
   facts = new StoreFacts(this._fetch);
   async queryCatalog(q) {
@@ -1105,6 +1123,39 @@ var CatalogService = class extends BaseService {
     const wantsRange = Number.isFinite(q.priceFrom) || Number.isFinite(q.priceTo);
     const sortKey = q.sort && !NATURAL.has(q.sort) ? indexSort(q.sort) : void 0;
     const hierarchy = q.category ? await this.facts.hierarchy(q.category) : [];
+    const attr = Object.entries(q.attributes ?? {}).flatMap(
+      ([handle, values]) => values.filter(Boolean).map((v) => `${handle}:${v}`)
+    );
+    if (q.facets && !legacyListing.has(this.engineBase())) {
+      const { currency } = await this.facts.ready();
+      const minor = (n) => Number.isFinite(n) ? Math.max(0, toMinor(n, currency)) : void 0;
+      const env2 = await this.engine("/api/products", {
+        query: {
+          q: search,
+          page,
+          limit,
+          channel: this.creds.channel,
+          category: q.category,
+          tag: q.tags,
+          vendor: q.vendors,
+          product_type: q.productTypes,
+          attr,
+          price_min: minor(q.priceFrom),
+          price_max: minor(q.priceTo),
+          ...engineSort(q.sort),
+          facets: 1
+        }
+      });
+      if (env2.meta?.facets) {
+        return {
+          ...toPage(env2, (p) => toProduct(p)),
+          categoryHierarchy: hierarchy,
+          sorted: true,
+          facets: env2.meta.facets
+        };
+      }
+      legacyListing.add(this.engineBase());
+    }
     if ((sortKey || wantsRange) && await this.facts.pluginOn("meilisearch")) {
       const filters = [];
       if (q.category) {
@@ -1152,9 +1203,6 @@ var CatalogService = class extends BaseService {
         sorted
       };
     }
-    const attr = Object.entries(q.attributes ?? {}).flatMap(
-      ([handle, values]) => values.filter(Boolean).map((v) => `${handle}:${v}`)
-    );
     const env = await this.engine("/api/products", {
       query: { q: search, page, limit, channel: this.creds.channel, attr }
     });
@@ -1320,16 +1368,44 @@ var num = (v) => {
   const n = Number(v);
   return Number.isFinite(n) ? n : void 0;
 };
+function decodeOnce(v) {
+  try {
+    return decodeURIComponent(v);
+  } catch {
+    return v;
+  }
+}
+function listParam(p, key) {
+  const out = p.getAll(key).flatMap((v) => decodeOnce(v).split(",")).map((v) => v.trim()).filter(Boolean);
+  return out.length ? out : void 0;
+}
 function attributesFrom(p) {
   const out = {};
-  for (const [key, value] of p) {
+  for (const key of new Set(p.keys())) {
     if (!key.startsWith("attributes.")) continue;
     const handle = key.slice("attributes.".length);
-    const values = value.split(",").map((v) => decodeURIComponent(v).trim()).filter(Boolean);
-    if (handle && values.length) out[handle] = [...out[handle] ?? [], ...values];
+    const values = listParam(p, key);
+    if (handle && values) out[handle] = values;
   }
   return Object.keys(out).length ? out : void 0;
 }
+var counts = (values) => Object.fromEntries((values ?? []).map((v) => [v.value, v.count]));
+function toStorefrontFacets(f) {
+  if (!f) return { priceStat: {}, categories: [], tags: [], allFilters: {} };
+  const allFilters = {};
+  const group = (key, values) => {
+    if (values?.length) allFilters[key] = counts(values);
+  };
+  group("vendor", f.vendors);
+  group("product_type", f.product_types);
+  for (const [handle, values] of Object.entries(f.attributes ?? {})) group(`attributes.${handle}`, values);
+  return {
+    priceStat: f.price ? { min: toMajor(f.price.min), max: toMajor(f.price.max) } : {},
+    categories: (f.categories ?? []).map((c) => ({ name: c.title, slug: c.slug, count: c.count })),
+    tags: (f.tags ?? []).map((t) => ({ name: t.value, count: t.count })),
+    allFilters
+  };
+}
 var SearchService = class extends CatalogService {
   emptyResult() {
     return {
@@ -1337,7 +1413,7 @@ var SearchService = class extends CatalogService {
       count: 0,
       totalPages: 0,
       categoryHierarchy: [],
-      facets: { priceStat: {}, categories: [], tags: [], allFilters: {} }
+      facets: toStorefrontFacets()
     };
   }
   async searchWithUrl(url, slug) {
@@ -1352,7 +1428,11 @@ var SearchService = class extends CatalogService {
         category: slug || p.get("categories")?.split(",")[0] || void 0,
         priceFrom: num(p.get("priceFrom")) ?? num(from ?? null),
         priceTo: num(p.get("priceTo")) ?? num(to ?? null),
-        attributes: attributesFrom(p)
+        attributes: attributesFrom(p),
+        tags: listParam(p, "tags"),
+        vendors: listParam(p, "vendor"),
+        productTypes: listParam(p, "product_type"),
+        facets: true
       });
       return {
         data: res.data,
@@ -1360,7 +1440,7 @@ var SearchService = class extends CatalogService {
         totalPages: res.noOfPage,
         page: res.page,
         categoryHierarchy: res.categoryHierarchy,
-        facets: { priceStat: {}, categories: [], tags: [], allFilters: {} }
+        facets: toStorefrontFacets(res.facets)
       };
     } catch (err) {
       if (err?.status === 404) return this.emptyResult();
@@ -2580,21 +2660,38 @@ var MenuService = class extends BaseService {
     const m = await this.data(`/x/navigation/menus/${encodeURIComponent(handle)}`);
     return { menuId: m.handle, name: m.title, items: (m.items ?? []).map(toItem) };
   }
-  /** The header and footer menus, or `null` when the module is not there. Cached: a menu is store-level. */
+  /**
+   * The header and footer menus, or `null` when the module is not there. Cached: a menu is
+   * store-level. Each is the menu the shop chose for it in the theme editor's header or footer
+   * (GoCommerce D131), still under the `header` / `footer` id every storefront looks for, so the
+   * choice reaches every place that draws one; the menus named so are the default.
+   */
   async engineMenus() {
     if (!await this.facts.pluginOn("navigation")) return null;
     return remember(`${this.engineBase()}|${this.store ?? ""}|menus`, async () => {
       const out = [];
-      for (const handle of ["header", "footer"]) {
+      for (const part of ["header", "footer"]) {
         try {
-          const m = await this.data(`/x/navigation/menus/${handle}`);
-          out.push({ menuId: handle, name: m.title, items: (m.items ?? []).map(toItem) });
+          const handle = await this.chosenMenu(part);
+          const m = await this.data(`/x/navigation/menus/${encodeURIComponent(handle)}`);
+          out.push({ menuId: part, name: m.title, items: (m.items ?? []).map(toItem) });
         } catch {
         }
       }
       return out;
     }).catch(() => null);
   }
+  /** The handle of the menu the published header or footer names, else the part's own name. */
+  async chosenMenu(part) {
+    if (!await this.facts.pluginOn("layouts")) return part;
+    try {
+      const layout = await this.data(`/x/layouts/${part}`);
+      const menu = layout?.sections?.find((s) => s.type === part)?.settings?.menu;
+      return typeof menu === "string" && menu ? menu : part;
+    } catch {
+      return part;
+    }
+  }
 };
 var menuService = new MenuService();
 var readStaticStore = async () => {
@@ -2712,7 +2809,10 @@ var StoreService = class extends BaseService {
         isProductReviewsAndRatings: {
           ...basePlugins.isProductReviewsAndRatings,
           ...flag(plugins.has("product-reviews"))
-        }
+        },
+        // The footer's sign-up box posts to ext/newsletter, and the theme editor's footer
+        // switch (D131) can only show it while that is on.
+        newsletter: { ...basePlugins.newsletter, ...flag(plugins.has("newsletter")) }
       },
       ...menus?.length ? { menu: menus } : {},
       ...deliverable(base, ships),
@@ -2827,6 +2927,35 @@ var LayoutService = class extends BaseService {
       return null;
     }
   }
+  /**
+   * The header the shop set in the theme editor (D131), drawn on every
+   * page: the published one, or a preview key's draft. Null — the
+   * storefront's own header — when none is published, the editor is off, the
+   * engine is older, or anything fails: a header is never worth an error page.
+   */
+  async getHeader({ preview } = {}) {
+    return this.chrome("header", preview);
+  }
+  /** The footer the shop set in the theme editor (D131); null for the storefront's own, as getHeader. */
+  async getFooter({ preview } = {}) {
+    return this.chrome("footer", preview);
+  }
+  async chrome(page, preview) {
+    let layout;
+    try {
+      layout = await this.getPageLayout(page, { preview });
+    } catch {
+      return null;
+    }
+    const section = layout?.sections.find((s) => s.type === page);
+    if (!layout || !section) return null;
+    const settings = { ...section.settings };
+    let menu = null;
+    if (typeof settings.menu === "string" && settings.menu) {
+      menu = await new MenuService(this._fetch).getMenu(settings.menu).catch(() => null);
+    }
+    return { revision: layout.revision, preview: layout.preview, settings, menu };
+  }
 };
 function tokens(v) {
   return v && typeof v === "object" && !Array.isArray(v) && Object.keys(v).length ? { ...v } : null;
@@ -3496,6 +3625,7 @@ exports.staticStore = staticStore;
 exports.storeForHost = storeForHost;
 exports.storeService = storeService;
 exports.toPage = toPage;
+exports.toStorefrontFacets = toStorefrontFacets;
 exports.uploadService = uploadService;
 exports.userService = userService;
 exports.variantService = variantService;