Merge branch 'master' of https://github.com/vercel/commerce into custom-checkout

framework/shopify/utils/normalize.ts

@@ -1,4 +1,7 @@
-import { Product } from '@commerce/types'
+import type { Page } from '../types/page'
+import type { Product } from '../types/product'
+import type { Cart, LineItem } from '../types/cart'
+import type { Category } from '../types/site'
 
 import {
   Product as ShopifyProduct,
@@ -9,9 +12,11 @@ import {
   ProductVariantConnection,
   MoneyV2,
   ProductOption,
+  Page as ShopifyPage,
+  PageEdge,
+  Collection,
 } from '../schema'
-
-import type { Cart, LineItem } from '../types'
+import { colorMap } from '@lib/colors'
 
 const money = ({ amount, currencyCode }: MoneyV2) => {
   return {
@@ -28,15 +33,18 @@ const normalizeProductOption = ({
   return {
     __typename: 'MultipleChoiceOption',
     id,
-    displayName,
+    displayName: displayName.toLowerCase(),
     values: values.map((value) => {
       let output: any = {
         label: value,
       }
       if (displayName.match(/colou?r/gi)) {
-        output = {
-          ...output,
-          hexColors: [value],
+        const mapedColor = colorMap[value.toLowerCase().replace(/ /g, '')]
+        if (mapedColor) {
+          output = {
+            ...output,
+            hexColors: [mapedColor],
+          }
         }
       }
       return output
@@ -53,7 +61,16 @@ const normalizeProductImages = ({ edges }: ImageConnection) =>
 const normalizeProductVariants = ({ edges }: ProductVariantConnection) => {
   return edges?.map(
     ({
-      node: { id, selectedOptions, sku, title, priceV2, compareAtPriceV2 },
+      node: {
+        id,
+        selectedOptions,
+        sku,
+        title,
+        priceV2,
+        compareAtPriceV2,
+        requiresShipping,
+        availableForSale,
+      },
     }) => {
       return {
         id,
@@ -61,7 +78,8 @@ const normalizeProductVariants = ({ edges }: ProductVariantConnection) => {
         sku: sku ?? id,
         price: +priceV2.amount,
         listPrice: +compareAtPriceV2?.amount,
-        requiresShipping: true,
+        requiresShipping,
+        availableForSale,
         options: selectedOptions.map(({ name, value }: SelectedOption) => {
           const options = normalizeProductOption({
             id,
@@ -76,22 +94,21 @@ const normalizeProductVariants = ({ edges }: ProductVariantConnection) => {
   )
 }
 
-export function normalizeProduct(productNode: ShopifyProduct): Product {
-  const {
-    id,
-    title: name,
-    vendor,
-    images,
-    variants,
-    description,
-    descriptionHtml,
-    handle,
-    priceRange,
-    options,
-    ...rest
-  } = productNode
-
-  const product = {
+export function normalizeProduct({
+  id,
+  title: name,
+  vendor,
+  images,
+  variants,
+  description,
+  descriptionHtml,
+  handle,
+  priceRange,
+  options,
+  metafields,
+  ...rest
+}: ShopifyProduct): Product {
+  return {
     id,
     name,
     vendor,
@@ -109,13 +126,12 @@ export function normalizeProduct(productNode: ShopifyProduct): Product {
     ...(descriptionHtml && { descriptionHtml }),
     ...rest,
   }
-
-  return product
 }
 
 export function normalizeCart(checkout: Checkout): Cart {
   return {
     id: checkout.id,
+    url: checkout.webUrl,
     customerId: '',
     email: '',
     createdAt: checkout.createdAt,
@@ -132,7 +148,7 @@ export function normalizeCart(checkout: Checkout): Cart {
 }
 
 function normalizeLineItem({
-  node: { id, title, variant, quantity, ...rest },
+  node: { id, title, variant, quantity },
 }: CheckoutLineItemEdge): LineItem {
   return {
     id,
@@ -145,7 +161,7 @@ function normalizeLineItem({
       sku: variant?.sku ?? '',
       name: variant?.title!,
       image: {
-        url: variant?.image?.originalSrc ?? '/product-img-placeholder.svg',
+        url: variant?.image?.originalSrc || '/product-img-placeholder.svg',
       },
       requiresShipping: variant?.requiresShipping ?? false,
       price: variant?.priceV2?.amount,
@@ -153,8 +169,29 @@ function normalizeLineItem({
     },
     path: String(variant?.product?.handle),
     discounts: [],
-    options:
-      // By default Shopify adds a default variant with default names, we're removing it. https://community.shopify.com/c/Shopify-APIs-SDKs/Adding-new-product-variant-is-automatically-adding-quot-Default/td-p/358095
-      variant?.title == 'Default Title' ? [] : variant?.selectedOptions,
+    options: variant?.title == 'Default Title' ? [] : variant?.selectedOptions,
   }
 }
+
+export const normalizePage = (
+  { title: name, handle, ...page }: ShopifyPage,
+  locale: string
+): Page => ({
+  ...page,
+  url: `/${locale}/${handle}`,
+  name,
+})
+
+export const normalizePages = (edges: PageEdge[], locale: string): Page[] =>
+  edges?.map((edge) => normalizePage(edge.node, locale))
+
+export const normalizeCategory = ({
+  title: name,
+  handle,
+  id,
+}: Collection): Category => ({
+  id,
+  name,
+  slug: handle,
+  path: `/${handle}`,
+})