Merge branch 'main' into wilson-customs

Author: maxakuru

CHANGELOG.md

@@ -1,3 +1,17 @@
+# [1.11.0](https://github.com/adobe-rnd/helix-commerce-api/compare/v1.10.0...v1.11.0) (2024-12-11)
+
+
+### Features
+
+* product links block ([#53](https://github.com/adobe-rnd/helix-commerce-api/issues/53)) ([6544924](https://github.com/adobe-rnd/helix-commerce-api/commit/65449243b95dd1b0e7a7e3111e9114a5a4bcfe19))
+
+# [1.10.0](https://github.com/adobe-rnd/helix-commerce-api/compare/v1.9.0...v1.10.0) (2024-12-10)
+
+
+### Features
+
+* config validation and post ([#60](https://github.com/adobe-rnd/helix-commerce-api/issues/60)) ([9cd6cfc](https://github.com/adobe-rnd/helix-commerce-api/commit/9cd6cfc6e55e2de48dd12d3b6a1bf6d123d6d7f7))
+
 # [1.9.0](https://github.com/adobe-rnd/helix-commerce-api/compare/v1.8.1...v1.9.0) (2024-12-10)
 
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "helix-commerce-api",
-  "version": "1.9.0",
+  "version": "1.11.0",
   "private": true,
   "description": "API for markup content and a commerce graphql commerce proxy",
   "main": "src/index.js",

package.json

@@ -13,7 +13,8 @@
 import { errorResponse, errorWithResponse, ffetch } from '../utils/http.js';
 import getProductQuery, { adapter as productAdapter } from './queries/cs-product.js';
 import getVariantsQuery, { adapter as variantsAdapter } from './queries/cs-variants.js';
-import getProductSKUQuery from './queries/core-product-sku.js';
+import getProductSKUQueryCore from './queries/core-product-sku.js';
+import getProductSKUQueryCS from './queries/cs-product-sku.js';
 import htmlTemplateFromContext from '../templates/html/index.js';
 
 /**
@@ -22,7 +23,11 @@ import htmlTemplateFromContext from '../templates/html/index.js';
  */
 async function fetchProduct(sku, config) {
   const { catalogEndpoint = 'https://catalog-service.adobe.io/graphql' } = config;
-  const query = getProductQuery({ sku, imageRoles: config.imageRoles });
+  const query = getProductQuery({
+    sku,
+    imageRoles: config.imageRoles,
+    linkTypes: config.linkTypes,
+  });
   console.debug(query);
 
   const resp = await ffetch(`${catalogEndpoint}?query=${encodeURIComponent(query)}&view=${config.storeViewCode}`, {
@@ -111,8 +116,53 @@ async function fetchVariants(sku, config) {
  * @param {string} urlkey
  * @param {Config} config
  */
-async function lookupProductSKU(urlkey, config) {
-  const query = getProductSKUQuery({ urlkey });
+async function lookupProductSKUCS(urlkey, config) {
+  const { catalogEndpoint = 'https://catalog-service.adobe.io/graphql' } = config;
+  const query = getProductSKUQueryCS({ urlkey });
+  console.debug(query);
+
+  const resp = await ffetch(`${catalogEndpoint}?query=${encodeURIComponent(query)}`, {
+    headers: {
+      origin: config.origin ?? 'https://api.adobecommerce.live',
+      'x-api-key': config.apiKey,
+      'Magento-Environment-Id': config.magentoEnvironmentId,
+      'Magento-Website-Code': config.magentoWebsiteCode,
+      'Magento-Store-View-Code': config.storeViewCode,
+      'Magento-Store-Code': config.storeCode,
+      ...config.headers,
+    },
+    // don't disable cache, since it's unlikely to change
+  });
+  if (!resp.ok) {
+    console.warn('failed to fetch product sku (cs): ', resp.status, resp.statusText);
+    try {
+      console.info('body: ', await resp.text());
+    } catch { /* noop */ }
+    throw errorWithResponse(resp.status, 'failed to fetch product sku (cs)');
+  }
+
+  try {
+    const json = await resp.json();
+    const [product] = json?.data?.productSearch.items ?? [];
+    if (!product?.product?.sku) {
+      throw errorWithResponse(404, 'could not find product sku (cs)', json.errors);
+    }
+    return product.product.sku;
+  } catch (e) {
+    console.error('failed to parse product sku (cs): ', e);
+    if (e.response) {
+      throw errorWithResponse(e.response.status, e.message);
+    }
+    throw errorWithResponse(500, 'failed to parse product sku response (cs)');
+  }
+}
+
+/**
+ * @param {string} urlkey
+ * @param {Config} config
+ */
+async function lookupProductSKUCore(urlkey, config) {
+  const query = getProductSKUQueryCore({ urlkey });
   if (!config.coreEndpoint) {
     throw errorResponse(400, 'missing coreEndpoint');
   }
@@ -127,27 +177,38 @@ async function lookupProductSKU(urlkey, config) {
     // don't disable cache, since it's unlikely to change
   });
   if (!resp.ok) {
-    console.warn('failed to fetch product sku: ', resp.status, resp.statusText);
+    console.warn('failed to fetch product sku (core): ', resp.status, resp.statusText);
     try {
       console.info('body: ', await resp.text());
     } catch { /* noop */ }
-    throw errorWithResponse(resp.status, 'failed to fetch product sku');
+    throw errorWithResponse(resp.status, 'failed to fetch product sku (core)');
   }
 
   try {
     const json = await resp.json();
     const [product] = json?.data?.products?.items ?? [];
     if (!product?.sku) {
-      throw errorWithResponse(404, 'could not find product sku', json.errors);
+      throw errorWithResponse(404, 'could not find product sku (core)', json.errors);
     }
     return product.sku;
   } catch (e) {
-    console.error('failed to parse product sku: ', e);
+    console.error('failed to parse product sku (core): ', e);
     if (e.response) {
       throw errorWithResponse(e.response.status, e.message);
     }
-    throw errorWithResponse(500, 'failed to parse product sku response');
+    throw errorWithResponse(500, 'failed to parse product sku response (core)');
+  }
+}
+
+/**
+ * @param {string} urlkey
+ * @param {Config} config
+ */
+function lookupProductSKU(urlkey, config) {
+  if (config.liveSearchEnabled) {
+    return lookupProductSKUCS(urlkey, config);
   }
+  return lookupProductSKUCore(urlkey, config);
 }
 
 /**

src/content/adobe-commerce.js

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2024 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+import { gql } from '../../utils/product.js';
+
+/**
+ * @param {{ urlkey: string; }} param0
+ */
+// @ts-ignore
+export default ({ urlkey }) => gql`{
+  productSearch (
+    phrase:""
+    page_size: 1
+    filter: {
+      attribute: "url_key"
+      eq: "${urlkey}"
+    }
+  ) {
+    items {
+      product {
+        sku
+        uid
+      }
+    }
+  }
+}`;

src/content/queries/cs-product-sku.js

@@ -13,20 +13,26 @@
 import { forceImagesHTTPS } from '../../utils/http.js';
 import { gql, parseRating, parseSpecialToDate } from '../../utils/product.js';
 
+function extractMinMaxPrice(data) {
+  let minPrice = data.priceRange?.minimum ?? data.price;
+  let maxPrice = data.priceRange?.maximum ?? data.price;
+
+  if (minPrice == null) {
+    minPrice = maxPrice;
+  } else if (maxPrice == null) {
+    maxPrice = minPrice;
+  }
+  return { minPrice, maxPrice };
+}
+
 /**
  * @param {Config} config
  * @param {any} productData
  * @returns {Product}
  */
 export const adapter = (config, productData) => {
-  let minPrice = productData.priceRange?.minimum ?? productData.price;
-  let maxPrice = productData.priceRange?.maximum ?? productData.price;
+  const { minPrice, maxPrice } = extractMinMaxPrice(productData);
 
-  if (minPrice == null) {
-    minPrice = maxPrice;
-  } else if (maxPrice == null) {
-    maxPrice = minPrice;
-  }
   /** @type {Product} */
   const product = {
     sku: productData.sku,
@@ -41,6 +47,28 @@ export const adapter = (config, productData) => {
     addToCartAllowed: productData.addToCartAllowed,
     inStock: productData.inStock,
     externalId: productData.externalId,
+    links: (productData.links ?? []).map((l) => {
+      const { minPrice: lMinPrice, maxPrice: lMaxPrice } = extractMinMaxPrice(l.product);
+      return {
+        sku: l.product.sku,
+        urlKey: l.product.urlKey,
+        types: l.linkTypes,
+        prices: {
+          regular: {
+            amount: lMinPrice.regular.amount.value,
+            currency: lMinPrice.regular.amount.currency,
+            maximumAmount: lMaxPrice.regular.amount.value,
+            minimumAmount: lMinPrice.regular.amount.value,
+          },
+          final: {
+            amount: lMinPrice.final.amount.value,
+            currency: lMinPrice.final.amount.currency,
+            maximumAmount: lMaxPrice.final.amount.value,
+            minimumAmount: lMinPrice.final.amount.value,
+          },
+        },
+      };
+    }),
     images: forceImagesHTTPS(productData.images) ?? [],
     attributes: productData.attributes ?? [],
     attributeMap: Object.fromEntries((productData.attributes ?? [])
@@ -115,9 +143,10 @@ export const adapter = (config, productData) => {
  * @param {{
  *  sku: string;
  *  imageRoles?: string[];
+ *  linkTypes?: string[];
  * }} opts
  */
-export default ({ sku, imageRoles = [] }) => gql`{
+export default ({ sku, imageRoles = [], linkTypes = [] }) => gql`{
     products(
       skus: ["${sku}"]
     ) {
@@ -139,6 +168,64 @@ export default ({ sku, imageRoles = [] }) => gql`{
         url
         label
       }
+      links(linkTypes: [${linkTypes.map((s) => `"${s}"`).join(',')}]) {
+        product {
+          sku
+          urlKey
+          ... on SimpleProductView {
+            price {
+              final {
+                amount {
+                  value
+                  currency
+                }
+              }
+              regular {
+                amount {
+                  value
+                  currency
+                }
+              }
+              roles
+            }
+          }
+          ... on ComplexProductView {
+            priceRange {
+              maximum {
+                final {
+                  amount {
+                    value
+                    currency
+                  }
+                }
+                regular {
+                  amount {
+                    value
+                    currency
+                  }
+                }
+                roles
+              }
+              minimum {
+                final {
+                  amount {
+                    value
+                    currency
+                  }
+                }
+                regular {
+                  amount {
+                    value
+                    currency
+                  }
+                }
+                roles
+              }
+            }
+          }
+        }
+        linkTypes
+      }
       attributes(roles: ["visible_in_pdp"]) {
         name
         label