@misiki/gocommerce-connector 0.13.0 → 0.15.0

package/dist/services/index.cjs

@@ -1197,14 +1197,17 @@ var CatalogService = class extends BaseService {
     const attr = Object.entries(q.attributes ?? {}).flatMap(
       ([handle, values]) => values.filter(Boolean).map((v) => `${handle}:${v}`)
     );
-    if (q.facets && !legacyListing.has(this.engineBase())) {
+    const refined = attr.length > 0 || !!(q.tags?.length || q.vendors?.length || q.productTypes?.length);
+    const triedIndex = !!search && !refined;
+    const counted = q.facets && !legacyListing.has(this.engineBase());
+    const facetListing = async (page2, limit2) => {
       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", {
+      return this.engine("/api/products", {
         query: {
           q: search,
-          page,
-          limit,
+          page: page2,
+          limit: limit2,
           channel: this.creds.channel,
           category: q.category,
           tag: q.tags,
@@ -1217,6 +1220,16 @@ var CatalogService = class extends BaseService {
           facets: 1
         }
       });
+    };
+    if (triedIndex && await this.facts.pluginOn("meilisearch")) {
+      const [found, rail] = await Promise.all([
+        this.fromIndex(q, { page, limit, search, sortKey, wantsRange, hierarchy }),
+        counted ? facetListing(1, 1).catch(() => null) : null
+      ]);
+      if (found) return rail?.meta?.facets ? { ...found, facets: rail.meta.facets } : found;
+    }
+    if (counted) {
+      const env2 = await facetListing(page, limit);
       if (env2.meta?.facets) {
         return {
           ...toPage(env2, (p) => toProduct(p)),
@@ -1227,39 +1240,9 @@ var CatalogService = class extends BaseService {
       }
       legacyListing.add(this.engineBase());
     }
-    if ((sortKey || wantsRange) && await this.facts.pluginOn("meilisearch")) {
-      const filters = [];
-      if (q.category) {
-        const names = (await this.facts.subtree(q.category).catch(() => [])).map(
-          (c) => quote(c.full_name)
-        );
-        if (!names.length) return { ...emptyCatalog(limit), categoryHierarchy: hierarchy, sorted: true };
-        filters.push(`category IN [${names.join(", ")}]`);
-      }
-      if (wantsRange) {
-        const { currency } = await this.facts.ready();
-        if (Number.isFinite(q.priceFrom)) filters.push(`price_minor >= ${toMinor(q.priceFrom, currency)}`);
-        if (Number.isFinite(q.priceTo)) filters.push(`price_minor <= ${toMinor(q.priceTo, currency)}`);
-      }
-      const res = await this.data("/x/meilisearch/search", {
-        query: {
-          q: search ?? "",
-          limit,
-          offset: (page - 1) * limit,
-          filter: filters.join(" AND ") || void 0,
-          sort: sortKey
-        }
-      });
-      const total = res.total ?? 0;
-      return {
-        data: (res.hits ?? []).map(fromSearchDoc),
-        count: total,
-        pageSize: limit,
-        noOfPage: Math.max(1, Math.ceil(total / limit)),
-        page,
-        categoryHierarchy: hierarchy,
-        sorted: true
-      };
+    if (!triedIndex && (sortKey || wantsRange)) {
+      const found = await this.fromIndex(q, { page, limit, search, sortKey, wantsRange, hierarchy });
+      if (found) return found;
     }
     const sorted = !sortKey && !wantsRange;
     if (q.category && !search) {
@@ -1279,6 +1262,45 @@ var CatalogService = class extends BaseService {
     });
     return { ...toPage(env, (p) => toProduct(p)), categoryHierarchy: hierarchy, sorted };
   }
+  /**
+   * The shelf from the Meilisearch module, or null when the store has it off,
+   * sells through a channel, finds nothing for the words, or it cannot answer (Meilisearch down: the engine says `unavailable`), so
+   * the caller asks the database instead of showing the shopper an error.
+   */
+  async fromIndex(q, o) {
+    if (this.creds.channel || !await this.facts.pluginOn("meilisearch")) return null;
+    const filters = [];
+    if (q.category) {
+      const names = (await this.facts.subtree(q.category).catch(() => [])).map((c) => quote(c.full_name));
+      if (!names.length) return { ...emptyCatalog(o.limit), categoryHierarchy: o.hierarchy, sorted: true };
+      filters.push(`category IN [${names.join(", ")}]`);
+    }
+    if (o.wantsRange) {
+      const { currency } = await this.facts.ready();
+      if (Number.isFinite(q.priceFrom)) filters.push(`price_minor >= ${toMinor(q.priceFrom, currency)}`);
+      if (Number.isFinite(q.priceTo)) filters.push(`price_minor <= ${toMinor(q.priceTo, currency)}`);
+    }
+    const res = await this.data("/x/meilisearch/search", {
+      query: {
+        q: o.search ?? "",
+        limit: o.limit,
+        offset: (o.page - 1) * o.limit,
+        filter: filters.join(" AND ") || void 0,
+        sort: o.sortKey
+      }
+    }).catch(() => null);
+    if (!res || res.unavailable || o.search && !res.hits?.length) return null;
+    const total = res.total ?? 0;
+    return {
+      data: (res.hits ?? []).map(fromSearchDoc),
+      count: total,
+      pageSize: o.limit,
+      noOfPage: Math.max(1, Math.ceil(total / o.limit)),
+      page: o.page,
+      categoryHierarchy: o.hierarchy,
+      sorted: true
+    };
+  }
 };
 function emptyCatalog(limit = PAGE_SIZE) {
   return { data: [], count: 0, pageSize: limit, noOfPage: 0, page: 1 };
@@ -1576,10 +1598,8 @@ var MeilisearchService = class extends CatalogService {
   async searchAutoComplete({ query, search, limit = 8 } = {}) {
     const q = (query ?? search ?? "").trim();
     if (!q) return { data: [] };
-    if (await this.facts.pluginOn("meilisearch")) {
-      const res = await this.data("/x/meilisearch/search", { query: { q, limit } });
-      return { data: (res.hits ?? []).map(fromSearchDoc) };
-    }
+    const found = await this.fromIndex({}, { page: 1, limit, search: q, wantsRange: false, hierarchy: [] });
+    if (found) return { data: found.data };
     const rows = await this.data("/api/products", { query: { q, limit, channel: this.creds.channel } }) ?? [];
     return { data: rows.map((p) => toProduct(p)) };
   }
@@ -3007,6 +3027,12 @@ var StoreService = class extends BaseService {
       ...profile?.name ? { name: profile.name } : {},
       ...profile?.email ? { businessEmail: profile.email } : {},
       ...profile?.phone ? { businessPhone: profile.phone } : {},
+      // The store's pictures (D148), the same: one it has not chosen keeps the static one.
+      // Its own logo also replaces the static dark logo, which would be the deployment's
+      // mark beside this store's; without a dark one of its own, its logo is the fallback.
+      ...profile?.logo_url ? { logo: mediaUrl(profile.logo_url), logoDark: void 0 } : {},
+      ...profile?.logo_dark_url ? { logoDark: mediaUrl(profile.logo_dark_url) } : {},
+      ...profile?.icon_url ? { favicon: mediaUrl(profile.icon_url) } : {},
       currencyCode: code,
       currencySymbol: sameCurrency ? base.currencySymbol ?? symbolFor(code) : symbolFor(code),
       currency: {
@@ -3029,7 +3055,18 @@ var StoreService = class extends BaseService {
         newsletter: { ...basePlugins.newsletter, ...flag(plugins.has("newsletter")) },
         // Discount codes are core: every GoCommerce store takes them, so
         // the code box is shown whatever the static record says.
-        isDiscountCoupons: { ...basePlugins.isDiscountCoupons, active: true }
+        isDiscountCoupons: { ...basePlugins.isDiscountCoupons, active: true },
+        // The engine resizes the store's own pictures in Cloudflare's URL shape
+        // (D139), so the storefront's srcset asks it for each width. Its public
+        // origin, not the proxy path: an <img> needs no CORS, and the proxy would
+        // put every picture through the storefront's server.
+        ...profile?.images_path && this.creds.apiUrl ? {
+          imageCdn: {
+            provider: "cloudflare",
+            url: this.creds.apiUrl.trim().replace(/\/+$/, "") + profile.images_path,
+            active: true
+          }
+        } : {}
       },
       ...menus?.length ? { menu: menus } : {},
       ...deliverable(base, ships),