@rebuy/rebuy-hydrogen 1.0.2 → 2.0.0

package/README.md

@@ -1,396 +1,24 @@
 # Rebuy + Hydrogen Overview
 
-Rebuy + Hydrogen package is a web development framework used for building Shopify custom storefronts.  It includes providers, components, and tooling you need to get started so you can spend your time creating intelligent shopping experiences.
+Rebuy + Hydrogen package is a web development framework used for building Shopify custom storefronts. It includes providers, components, and tooling you need to get started so you can spend your time creating intelligent shopping experiences.
 
 ## How Rebuy + Hydrogen Works
 
-Rebuy + Hydrogen is a lightweight framework for creating personalized shopping experiences that are lightening fast.  The framework is composed of:
-1. Providers - these components build contextual objects that are used during network calls.
-2. Containers - these components get personalized data from Rebuy and pass the resulting information to children components via props.
-3. Components - these components can be used to render various merchandising UI.
-4. Events - these components automatically track user behaviors.
+Rebuy + Hydrogen is a lightweight framework for creating personalized shopping experiences that are lightening fast. The framework is composed of:
+
+1. **Providers** - these components build contextual objects that are used during network calls.
+2. **Containers** - these components get personalized data from Rebuy and pass the resulting information to children components via props.
+3. **Components** - these components can be used to render various merchandising UI.
+4. **Events** - these components automatically track user behaviors.
 
 ### Data Sources
 
-Rebuy + Hydrogen is powered by Rebuy's Data Sources, which allows for AI-powered product recommendations, custom defined rulesets, or mixture of human and computer derived output.  Data Sources are created in Rebuy's App Admin, and the data source URL is used in your Hydrogen project.  Separating the logic from the codebase allows non-technical team members to manage the merchandising rules without the need for costly code changes or redeployments.
+Rebuy + Hydrogen is powered by Rebuy's Data Sources, which allows for AI-powered product recommendations, custom defined rulesets, or mixture of human and computer derived output. Data Sources are created in Rebuy's App Admin, and the data source URL is used in your Hydrogen project. Separating the logic from the codebase allows non-technical team members to manage the merchandising rules without the need for costly code changes or redeployments.
 
 ### User Interfaces
 
-Rebuy + Hydrogen uses a React container pattern to separate the data fetching logic and state managment from the presentional components.  As such, container components do not render user interface elements.  They simply pass their own properties, as well as data received from Rebuy, to their children components for consumption.  This allows you to build your own user interface with your existing components, or use Rebuy's out of the box components to get up and running quickly.
-
-
-# Getting Started
-
-In this tutorial, you'll extend your Hydrogen app with the Rebuy + Hydrogen framework.  After completing this tutorial you'll have accomplished the following:
-
-- Installed the Rebuy + Hydrogen framework
-- Configured your environment
-- Generated AI-powered product recommendations
-
-## Requirements
-
-In order to complete this tutorial, you will need the following:
-- [Shopify](https://www.shopify.com/) account
-- [Rebuy](https://www.rebuyengine.com/) installed in your Shopify store
-- [Hydrogen App](https://shopify.dev/custom-storefronts/hydrogen/getting-started/create#step-1-create-a-new-hydrogen-storefront)
-
-### Install Dependencies
-Additionally, you will need the following dependencies:
-- [npm](https://www.npmjs.com/)
-- [Node.js](https://nodejs.org/en/) (version 16.5.0 or higher)
-
-
-# Step 1: Create a new Hydrogen app
-
-You can create a Hydrogen app locally using `yarn`, `npm`, or `npx`.
-
-If you want to [integrate with an existing React framework](https://shopify.dev/custom-storefronts/hydrogen/framework/integrate-react-frameworks), like [Next.js](https://nextjs.org/) or [Gatsby](https://www.gatsbyjs.com/), then you can add the [@shopify/hydrogen](https://www.npmjs.com/package/@shopify/hydrogen) `npm` package to your project.
-
-#### 1. Navigate to your working directoy
-Navigate to the directory where you want to create your project and run the following command:
-```
-cd <directory>
-```
-
-#### 2. Create your project
-Create a new Hydrogen project with a default template linked to a demo-store with the following command:
-```
-npm init @shopify/hydrogen -- --template demo-store
-```
-
-#### 3. Name your project
-Follow the prompts to name your new Hydrogen application.
-
-
-# Step 2: Link your Shopify Storefront
-Connect your Hydrogen app to your Shopify storefront by updating the properties in the `hydrogen.config.js` file.  You will need to [generate a Storefront API access token](https://help.shopify.com/en/manual/apps/custom-apps?shpxid=5ef5d325-B992-4F4F-3A6D-0FACECA2B482#install-the-app-and-get-the-api-access-tokens) for your Hydrogen app to communicate with your Shopify store.
-
-#### 1. Open your `hydrogen.config.js` file
-Open `hydrogen.config.js` file located in the root of your project directory.
-
-#### 2. Update your config file
-Edit your `hydrogen.config.js` file with the following changes and save the file:
-- Update storeDomain to specify your store's domain name.
-- Update storefrontToken to specify your Storefront API access token.
-- Update storefrontApiVersion to specify the Storefront API version that you want to use.
-```
-export default defineConfig({
-  shopify: {
-    storeDomain: 'YOUR_STORE_NAME.myshopify.com',
-    storefrontToken: 'YOUR_STOREFRONT_ACCESS_TOKEN',
-    storefrontApiVersion: '2022-07',
-  },
-});
-```
-
-
-# Step 3: Start a development server
-Create a new local development server to start testing your changes.
-
-#### 1. Navigate to your project directoy
-Navigate to the root of your project directory:
-```
-cd <directory>
-```
-
-#### 2. Start the development server
-Start up a new local development server on `localhost`:
-```
-npm run dev
-```
-
-The development environment will open automatically at [http://localhost:3000](http://localhost:3000).
-
-
-# Step 4: Install Rebuy + Hydrogen Package
-Once you have successfully created your new Hydrogen app and linked it to your Shopify store, it's now time to install the Rebuy + Hydrogen package.  If you currently have your development server running, you can terminate the server with the following command `Ctrl` + `C`.
-
-#### 1. Navigate to your project directoy
-Navigate to the root of your project directory:
-```
-cd <directory>
-```
-
-#### 2. Install the Rebuy + Hydrogen package
-Install the Rebuy + Hydrogen package from [npm](https://www.npmjs.com/) with the following command:
-```
-npm install @rebuy/rebuy-hydrogen
-```
-
-#### 3. Update your `.env` with your Rebuy public API key
-You can find your [Rebuy public API key](https://rebuyengine.com/account/keys) in Rebuy admin > Account > API Keys. Once located, update your `.env` with the following:
-```
-PUBLIC_REBUY_API_KEY=yourRebuyAPIKey
-```
-*If your project does not have an `.env` file, you can create a new one and save it in the project root directory.*
-
-
-# Step 5: Build Personalized Shopping Experiences
-Once you have included Rebuy + Hydrogen in your project, it's time to start building dynamic, personalized shopping experiences!  In this tutorial, we will accomplish the following:
-
-- Customize the product details page
-- Display a list of AI-powered product recommendations
-- Display a list of recently viewed products
-
-#### 1. Create a Recommended Products Component
-Create a new file in `src/components` called `ProductRecommendations.jsx`, and add the following to the file:
-```
-import {
-  ProductOptionsProvider,
-  AddToCartButton,
-} from '@shopify/hydrogen';
-import ProductCard from './ProductCard';
-import {
-  BUTTON_PRIMARY_CLASSES,
-} from './Button.client';
-
-function AddToCartMarkup({product}) {
-  const selectedVariant = product.variants.edges[0].node;
-  const isOutOfStock = !selectedVariant.availableForSale;
-
-  return (
-    <div className="space-y-2 mb-8">
-      <AddToCartButton
-        className={BUTTON_PRIMARY_CLASSES}
-        disabled={isOutOfStock}
-        product={product}
-        variantId={selectedVariant.id}
-        attributes={[
-          {key: '_source', value: 'Rebuy'},
-          {key: '_attribution', value: 'Product Recommendations'
-        }]}
-      >
-        {isOutOfStock ? 'Out of stock' : 'Add to bag'}
-      </AddToCartButton>
-    </div>
-  );
-}
-
-export default function ProductRecommendations(props) {
-  const {product, products, metadata} = props;
-
-  console.log('ProductRecommendations component properties:', props);
-
-  return(
-    <>
-      <h1 className="font-bold text-4xl md:text-5xl text-gray-900 mb-6 mt-6">If you like {product.title}, you'll also love these</h1>
-      <ul className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-8 mb-16">
-        {products.map((product) => (
-          <li key={product.id}>
-            <ProductOptionsProvider data={product} initialVariantId={product.variants.edges[0].node.id}>
-              <ProductCard product={product} />
-              <AddToCartMarkup product={product} />
-            </ProductOptionsProvider>
-          </li>
-        ))}
-      </ul>
-    </>
-  )
-}
-```
-
-#### 2. Create a Recently Viewed Products Component
-Create a new file in `src/components` called `RecentlyViewedProducts.jsx`, and add the following to the file:
-```
-import {
-  ProductOptionsProvider,
-  AddToCartButton,
-} from '@shopify/hydrogen';
-import ProductCard from './ProductCard';
-import {
-  BUTTON_PRIMARY_CLASSES,
-} from './Button.client';
-
-function AddToCartMarkup({product}) {
-  const selectedVariant = product.variants.edges[0].node;
-  const isOutOfStock = !selectedVariant.availableForSale;
-
-  return (
-    <div className="space-y-2 mb-8">
-      <AddToCartButton
-        className={BUTTON_PRIMARY_CLASSES}
-        disabled={isOutOfStock}
-        product={product}
-        variantId={selectedVariant.id}
-        attributes={[
-          {key: '_source', value: 'Rebuy'},
-          {key: '_attribution', value: 'Recently Viewed Product'
-        }]}
-      >
-        {isOutOfStock ? 'Out of stock' : 'Add to bag'}
-      </AddToCartButton>
-    </div>
-  );
-}
-
-export default function RecentlyViewedProducts(props) {
-  const {product, products, metadata} = props;
-
-  console.log('RecentlyViewedProducts component properties:', props);
-
-  return(
-    <>
-      <h1 className="font-bold text-4xl md:text-5xl text-gray-900 mb-6 mt-6">Recently Viewed</h1>
-      <ul className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-8 mb-16">
-        {products.map((product) => (
-          <li key={product.id}>
-            <ProductOptionsProvider data={product} initialVariantId={product.variants.edges[0].node.id}>
-              <ProductCard product={product} />
-              <AddToCartMarkup product={product} />
-            </ProductOptionsProvider>
-          </li>
-        ))}
-      </ul>
-    </>
-  )
-}
-```
-
-#### 3. Install the RebuyContextProvider
-Open `/src/App.server.jsx` file and install the `RebuyContextProvider`, so all Rebuy API calls are enriched with contextual information.  Open the file and make the following edits:
-
-##### Import your the provider
-```
-import {RebuyContextProvider} from '@rebuy/rebuy-hydrogen/RebuyContextProvider.client';
-```
-
-##### Add RebuyContextProvider component
-Wrap the `<Route>` component with the `RebuyContextProvider`, as follows:
-```
-<RebuyContextProvider>
-  <Route path="*" page={<NotFound />} />
-</RebuyContextProvider>
-```
-
-#### 4. Customize the Product Details Page
-Let's include our new components to the `ProductDetails` client component, located in `src/components/ProductDetails.client.jsx`. We will be wrapping our new components with a `RebuyWidgetContainer` components, which will give us an interface to request data from Rebuy.
-
-##### Import your new UI components
-Import the `ProductRecommendations` and `RecentlyViewedProducts` components in to the `ProductDetails.client.jsx` file.
-```
-import ProductRecommendations from './ProductRecommendations';
-import RecentlyViewedProducts from './RecentlyViewedProducts';
-```
-
-##### Import Rebuy components
-Import the `RebuyWidgetContainer` and `RebuyProductViewed` components in to the `ProductDetails.client.jsx` file.
-```
-import RebuyWidgetContainer from '@rebuy/rebuy-hydrogen/RebuyWidgetContainer.client';
-import RebuyProductViewed from '@rebuy/rebuy-hydrogen/RebuyProductViewed.client';
-```
-
-##### Add imported components in to the `ProductDetails` functional component
-Before the closing `</ProductOptionsProvider>` tag, insert our imported components:
-```
-<RebuyWidgetContainer product={product} dataSource="/api/v1/products/recommended" limit="6">
-  <ProductRecommendations />
-</RebuyWidgetContainer>
-
-<RebuyWidgetContainer product={product} dataSource="/api/v1/products/viewed" limit="6">
-  <RecentlyViewedProducts />
-</RebuyWidgetContainer>
-
-<RebuyProductViewed product={product} />
-```
-
-##### Review your changes
-When you look at the product details page, you should now see two new sections:
-1. AI-powered product recommendations
-2. Recently viewed products
-
-Additionally, we included the `<RebuyProductViewed product={product} />` component, which will automatically send a `user -> viewed -> product` event to Rebuy.  This event is powering the recently viewed component in real-time!  As you navigate the site, your browsing history will be tracked and display for easy navigation to previous product pages!
-
-
-# Documentation
-Below you will find documentation on each of the components included in the Rebuy + Hydrogen package.
-
-## RebuyContextProvider
-The `RebuyContextProvider` is a React provider component.  It is responsible for collecting environment and state-based information as a `RebuyContext`.  It will gather information about the current URL, session UTM parameters, as well as cart information such as the cart token, subtotal, line items, etc.  As a provider component, no UI is rendered, it simply creates a React context value that can be requested by any child component.
-
-The `RebuyContextProvider` is a client component, which means it renders in the browser.  It has two dependencies, which are `useUrl` and `useCart`, so the component should be located high up in the component tree but **below** the `ShopifyProvider` and `CartProvider`.
-
-The recommended location is in `src/App.server.jsx` and wrapping the `<Route>` component, which makes the `RebuyContext` automatically available on all pages across the site.
-
-#### Import the RebuyContextProvider
-```
-import {RebuyContextProvider} from '@rebuy/rebuy-hydrogen/RebuyContextProvider.client';
-```
-
-#### Wrap the Route compontent with RebuyContextProvider
-```
-<RebuyContextProvider>
-  <Route path="*" page={<NotFound />} />
-</RebuyContextProvider>
-```
-
-#### Access RebuyContext
-Rebuy + Hydrogen components will automatically include and use `RebuyContext`, but if you would like to use this context information in your own components, you certainly can!
-
-```
-import React from 'react';
-import {RebuyContext} from '@rebuy/rebuy-hydrogen/RebuyContextProvider.client';
-
-// Access context parameters with React's useContext method
-const contextParameters = React.useContext(RebuyContext);
-```
-
-## RebuyWidgetContainer
-The `RebuyWidgetContainer` is a React container component. This component is responsible for fetching data and state management.  It does not render any UI components, and will pass along its properties and data received from Rebuy to all of their children components.  This abstraction allows you to use your existing application components or Rebuy's out of the box components.
-
-#### Component properties
-The component accepts argments via props to allow for different API responses.  All props listed below are optional, if no `dataSource` prop is provided then `'/api/v1/products/recommended'` will be used.
-
-| Property | Value |
-| -------- | ----- |
-| dataSource | `{String}` A relative URL path of your Rebuy data source (i.e. '/api/v1/products/recommended) |
-| product | `{Object}` A product object with an `id` |
-| productId | `{String}` A product ID string in graphQL URL format |
-| variant | `{Object}` A variant object with an `id` |
-| variantId | `{String}` A variant ID string in graphQL URL format |
-| collection | `{Object}` A collection object with an `id` |
-| collectionId | `{String}` A collection ID string in graphQL URL format |
-| limit | `{Number}` A number of products to return from Rebuy's API |
-| options | `{Object}` An object with key, value pairs of Rebuy REST API arguments (i.e. metafields: yes) |
-
-#### Children components properties
-All child components will inherit the container props, in addition to two container generated props `products` and `metadata`.  So if you've provided a `product={product}` prop to the container, then each child compontent will have the following properties `product`, `products`, and `metadata`.
-
-| Property | Value |
-| -------- | ----- |
-| products | `{Array}` An array of product objects returned from Rebuy's API |
-| metadata | `{Object}` An object with metadata about the input data, rules matched, rules not matched, excluded products, and cache info |
-
-#### Example implementation
-In the following example, we are using an example compontent called `ProductRecommendations` which is a UI component used to render data provided to it via props by the `RebuyWidgetContainer` component.
-
-When the components are rendered, it will display `6` products powered by Rebuy's AI algorithm based on the provided input `product`.  So if the input product was ketchup, you would likely see recommended products like mustard, mayo, or other condiments.
-
-```
-import ProductRecommendations from './ProductRecommendations';
-import RebuyWidgetContainer from '@rebuy/rebuy-hydrogen/RebuyWidgetContainer.client';
-
- <RebuyWidgetContainer product={product} dataSource="/api/v1/products/recommended" limit="6">
-   <ProductRecommendations />
-</RebuyWidgetContainer>
-```
-
-## RebuyProductViewed
-The `RebuyProductViewed` is a client component, which helps automate customer browsing behavior.  This behavior is used to train the AI as well as power recently viewed products.  This component would typically live in your `ProductDetails` component, so as a customer is browsing your site we automatically record the product pages they are viewing.
-
-#### Component properties
-The component accepts argments via props to allow for registering different products that have been viewed. One of the following properties are required to fire the event.
-
-| Property | Value |
-| -------- | ----- |
-| product | `{Object}` A product object with an `id` |
-| productId | `{String}` A product ID string in graphQL URL format |
-| productHandle | `{String}` A product handle string |
-
-#### Example implementation
-The following example would be included in the `ProductDetails.client.jsx` component to automatically register customer product view events.  The current product displayed is passed to the `RebuyProductViewed` component via props as `product={product}`.
+Rebuy + Hydrogen uses a React container pattern to separate the data fetching logic and state management from the presentational components. As such, container components do not render user interface elements. They simply pass their own properties, as well as data received from Rebuy, to their children components for consumption. This allows you to build your own user interface with your existing components, or use Rebuy's out of the box components to get up and running quickly.
 
-```
-import RebuyProductViewed from '@rebuy/rebuy-hydrogen/RebuyProductViewed.client';
+### Getting Started
 
-<RebuyProductViewed product={product} />
-```
+To get started, please visit our [Rebuy + Shopify Hydrogen documentation](https://developers.rebuyengine.com/reference/shopify-hydrogen-getting-started).

package/RebuyContextProvider.client.jsx

@@ -1,13 +1,33 @@
-import { useUrl, useCart } from '@shopify/hydrogen';
-
-import React, { createContext, useMemo } from 'react';
-
+import { RebuyClient } from '@rebuy/rebuy';
+import { RebuyContext } from '@rebuy/rebuy-hydrogen/RebuyContexts.client';
 import * as Utilities from '@rebuy/rebuy/utilities';
+import { useCart, useShop, useUrl } from '@shopify/hydrogen';
+import { useEffect, useMemo, useState } from 'react';
+
+const REBUY_API_KEY = import.meta.env.PUBLIC_REBUY_API_KEY;
+const API = '/api/v1';
+
+const getEncodedAttributes = (attributes) =>
+    encodeURIComponent(
+        JSON.stringify(
+            attributes.reduce(
+                (merged, { key, value }) => ({ ...merged, [key]: value }),
+                {}
+            )
+        )
+    );
 
-export const RebuyContext = createContext(null);
-
-export function RebuyContextProvider({ children }) {
+export const RebuyContextProvider = ({ children }) => {
+    // Shopify
+    const cart = useCart();
+    const shop = useShop();
     const url = useUrl();
+
+    // Default state
+    const [initialized, setInitialized] = useState(false);
+    const [rebuyConfig, setRebuyConfig] = useState(null);
+    const [config, setConfig] = useState({ shop: null });
+    // const [Rebuy, setRebuy] = useState(null);
     const queryObject = Utilities.queryStringToObject(url.search);
     const utmObject = Utilities.utmObjectFromString(url);
 
@@ -17,114 +37,186 @@ export function RebuyContextProvider({ children }) {
         }
     }
 
-    const cart = useCart();
-
-    const contextParameters = {};
-
-    // Set URL
-    contextParameters.url = url.href;
+    // Initialization
+    useEffect(() => {
+        const getRebuyConfig = async () => {
+            try {
+                const request = {
+                    url: `${API}/user/config`,
+                    parameters: { shop: shop.storeDomain },
+                };
+
+                const { data: rebuy, ...response } = await new RebuyClient(
+                    REBUY_API_KEY
+                ).getDataFromCDN(request.url, request.parameters);
+
+                // Missing Rebuy shop data?
+                if (!rebuy?.shop) {
+                    throw new Error(
+                        'Rebuy configuration is not properly set up - missing shop',
+                        { cause: response }
+                    );
+                }
 
-    // Set time
-    if (queryObject.hasOwnProperty('time')) {
-        contextParameters.time = queryObject.time;
-    }
+                setRebuyConfig(rebuy);
+            } catch (err) {
+                console.warn('Error fetching Rebuy shop config');
+                console.error(err, err.cause);
+            }
+        };
 
-    // Cart object
-    const cartContext = {};
+        const onBeforeReady = async () => {
+            // Initializing...
+            if (!rebuyConfig?.shop) {
+                return await getRebuyConfig();
+            }
+        };
+
+        onBeforeReady();
+    }, [rebuyConfig, shop]);
+
+    useEffect(() => {
+        const applyConfig = async () => {
+            // Still fetching Rebuy config OR config already applied. Abort!
+            if (!rebuyConfig || config.shop) return;
+
+            // Bring it all together
+            const appConfig = { ...config, ...rebuyConfig };
+
+            setConfig(appConfig);
+        };
+
+        applyConfig();
+    }, [config, rebuyConfig]);
+
+    useEffect(() => {
+        const onReady = () => {
+            // Still initializing... Abort!
+            if (!config.shop) return;
+
+            // Initialized!
+            setInitialized(true);
+            // const { api_key, cache_key } = config.shop;
+            // setRebuy(new RebuyClient(api_key, { cache_key }));
+        };
+
+        onReady();
+    }, [config]);
+
+    const contextParameters = useMemo(() => {
+        // Still initializing... Abort!
+        if (!config.shop) return null;
+
+        const { cache_key } = config.shop;
+        const contextParameters = {
+            url: url.href,
+            cache_key,
+        };
+        // Cart object
+        const cartContext = {};
+
+        // Set time
+        if (Object.prototype.hasOwnProperty.call(queryObject, 'time')) {
+            contextParameters.time = queryObject.time;
+        }
 
-    // Set Cart: token
-    if (cart.id) {
-        cartContext.token = Utilities.getIdFromGraphUrl(cart.id, 'Cart');
-        contextParameters.cart_token = Utilities.getIdFromGraphUrl(cart.id, 'Cart');
-    }
+        // Set Cart: token
+        if (cart.id) {
+            cartContext.token = Utilities.getIdFromGraphUrl(cart.id, 'Cart');
+            contextParameters.cart_token = Utilities.getIdFromGraphUrl(
+                cart.id,
+                'Cart'
+            );
+        }
 
-    // Set Cart: subtotal
-    if (
-        cart.estimatedCost &&
-        cart.estimatedCost.subtotalAmount &&
-        cart.estimatedCost.subtotalAmount &&
-        cart.estimatedCost.subtotalAmount.amount
-    ) {
-        cartContext.subtotal = Utilities.amountToCents(cart.estimatedCost.subtotalAmount.amount);
-        contextParameters.cart_subtotal = Utilities.amountToCents(cart.estimatedCost.subtotalAmount.amount);
-    }
+        // Set Cart: subtotal
+        if (cart.cost?.subtotalAmount?.amount) {
+            const { amount } = cart.cost.subtotalAmount;
 
-    // Set Cart: line count
-    if (typeof cart.lines != 'undefined') {
-        cartContext.line_count = cart.lines.length;
-        contextParameters.cart_count = cart.lines.length;
-        contextParameters.cart_line_count = cart.lines.length;
-    }
+            cartContext.subtotal = Utilities.amountToCents(amount);
+            contextParameters.cart_subtotal = Utilities.amountToCents(amount);
+        }
 
-    // Set Cart: item count
-    if (typeof cart.totalQuantity != 'undefined') {
-        cartContext.item_count = cart.totalQuantity;
-        contextParameters.cart_item_count = cart.totalQuantity;
-    }
+        // Set Cart: line count
+        if (typeof cart.lines != 'undefined') {
+            const totalLines = cart.lines.length;
 
-    // Set Cart: line items
-    if (typeof cart.lines != 'undefined') {
-        cartContext.items = [];
-        for (let i = 0; i < cart.lines.length; i++) {
-            const cartItem = cart.lines[i];
+            cartContext.line_count = totalLines;
+            contextParameters.cart_count = totalLines;
+            contextParameters.cart_line_count = totalLines;
+        }
 
-            const item = {};
+        // Set Cart: item count
+        if (typeof cart.totalQuantity != 'undefined') {
+            const { totalQuantity } = cart;
 
-            if (cartItem.product?.id) {
-                item.product_id = Utilities.getIdFromGraphUrl(cartItem.product.id, 'Product');
-            }
+            cartContext.item_count = totalQuantity;
+            contextParameters.cart_item_count = totalQuantity;
+        }
 
-            if (cartItem.merchandise?.id) {
-                item.variant_id = Utilities.getIdFromGraphUrl(cartItem.merchandise.id, 'ProductVariant');
-            }
+        // Set Cart: line items
+        if (typeof cart.lines != 'undefined') {
+            cartContext.items = [];
 
-            item.quantity = cartItem.quantity;
+            for (const cartItem of cart.lines) {
+                const item = {
+                    quantity: cartItem.quantity,
+                };
 
-            if (cartItem.attributes) {
-                const attributes = {};
+                if (cartItem.product?.id) {
+                    item.product_id = Utilities.getIdFromGraphUrl(
+                        cartItem.product.id,
+                        'Product'
+                    );
+                }
 
-                for (let i = 0; i < cartItem.attributes.length; i++) {
-                    const key = cartItem.attributes[i].key;
-                    const value = cartItem.attributes[i].value;
-                    attributes[key] = value;
+                if (cartItem.merchandise?.id) {
+                    item.variant_id = Utilities.getIdFromGraphUrl(
+                        cartItem.merchandise.id,
+                        'ProductVariant'
+                    );
                 }
 
-                item.properties = JSON.stringify(attributes);
-            }
+                if (cartItem.attributes) {
+                    item.properties = getEncodedAttributes(cartItem.attributes);
+                }
 
-            // TBD: item.selling_plan
+                // TBD: item.selling_plan
 
-            cartContext.items.push(item);
+                cartContext.items.push(item);
+            }
         }
-    }
 
-    // Set Cart: attributes
-    if (cart.attributes) {
-        const attributes = {};
-
-        for (let i = 0; i < cart.attributes.length; i++) {
-            const key = cart.attributes[i].key;
-            const value = cart.attributes[i].value;
-            attributes[key] = value;
+        // Set Cart: attributes
+        if (cart.attributes) {
+            cartContext.attributes = getEncodedAttributes(cart.attributes);
         }
 
-        cartContext.attributes = JSON.stringify(attributes);
-    }
+        // Set Cart: notes
+        if (cart.note) {
+            cartContext.note = cart.note;
+        }
 
-    // Set Cart: notes
-    if (cart.note) {
-        cartContext.note = cart.note;
-    }
+        // Set cart
+        contextParameters.cart = cartContext;
 
-    // Set cart
-    contextParameters.cart = cartContext;
+        return contextParameters;
+    }, [cart, config, queryObject, url]);
 
-    const value = useMemo(
-        () => ({
-            ...contextParameters,
-        }),
-        [contextParameters]
+    // Static reference (JSON) + memoization
+    // ^ prevent re-rendering children when context params are unchanged
+    const contextParametersJSON = JSON.stringify(contextParameters);
+    const contextValue = useMemo(
+        () => ({ contextParameters: JSON.parse(contextParametersJSON) }),
+        [contextParametersJSON]
     );
 
-    return React.createElement(RebuyContext.Provider, { value }, children);
-}
+    // Still initializing...
+    if (!initialized) return null;
+
+    return (
+        <RebuyContext.Provider value={contextValue}>
+            {children}
+        </RebuyContext.Provider>
+    );
+};

package/RebuyContexts.client.jsx

@@ -0,0 +1,3 @@
+import { createContext } from 'react';
+
+export const RebuyContext = createContext(null);

package/RebuyProductRecommendations.client.jsx

@@ -0,0 +1,63 @@
+import { AddToCartButton, ProductOptionsProvider } from '@shopify/hydrogen';
+import { Section } from '~/components';
+import { ProductCard } from '~/components/cards';
+import { Button } from '~/components/elements';
+
+const AddToCartMarkup = ({ product }) => {
+    const selectedVariant = product.variants.nodes[0];
+    const isOutOfStock = !selectedVariant.availableForSale;
+
+    return (
+        <div className="space-y-2 mb-8">
+            <AddToCartButton
+                disabled={isOutOfStock}
+                product={product}
+                variantId={selectedVariant?.id}
+                quantity={1}
+                accessibleAddingToCartLabel="Adding item to your cart"
+                type="button"
+                attributes={[
+                    { key: '_source', value: 'Rebuy' },
+                    { key: '_attribution', value: 'Product Recommendations' },
+                ]}
+            >
+                <Button
+                    width="full"
+                    variant={isOutOfStock ? 'secondary' : 'primary'}
+                    as="span"
+                >
+                    {isOutOfStock ? 'Out of stock' : 'Add to bag'}
+                </Button>
+            </AddToCartButton>
+        </div>
+    );
+};
+
+export const RebuyProductRecommendations = ({ product, products }) => {
+    const title = `Like ${product.title}? You may also like:`;
+
+    return (
+        products.length > 0 && (
+            <Section heading={title} padding="y">
+                <ul className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-8 px-6 md:px-8 lg:px-12">
+                    {products.map((product) => (
+                        <li key={product.id}>
+                            <ProductOptionsProvider
+                                data={product}
+                                initialVariantId={product.variants.nodes[0].id}
+                            >
+                                <ProductCard
+                                    product={product}
+                                    className={'w-100'}
+                                />
+                                <AddToCartMarkup product={product} />
+                            </ProductOptionsProvider>
+                        </li>
+                    ))}
+                </ul>
+            </Section>
+        )
+    );
+};
+
+export default RebuyProductRecommendations;

package/RebuyProductViewed.client.jsx

@@ -1,42 +1,62 @@
-import React, { useState, useEffect } from 'react';
-
+import { RebuyClient } from '@rebuy/rebuy';
 import * as Utilities from '@rebuy/rebuy/utilities';
-import RebuyClient from '@rebuy/rebuy/client';
+import { useEffect, useMemo, useState } from 'react';
 
 const REBUY_API_KEY = import.meta.env.PUBLIC_REBUY_API_KEY;
 
-export default function RebuyProductViewed(props) {
-    const { product, productId, productHandle, children } = props;
+export const RebuyProductViewed = ({ children, ...props }) => {
+    const { product, productId, productHandle } = props;
 
+    // eslint-disable-next-line no-unused-vars
     const [event, setEvent] = useState(null);
+    const [Rebuy, setRebuy] = useState(null);
+    const [initialized, setInitialized] = useState(false);
+    const shopifyProductId = product?.id ?? productId ?? null;
+
+    const request = useMemo(() => {
+        const request = {
+            parameters: {},
+        };
+
+        if (shopifyProductId) {
+            request.parameters.shopify_product_id = Utilities.getIdFromGraphUrl(
+                shopifyProductId,
+                'Product'
+            );
+        } else if (productHandle) {
+            request.parameters.shopify_product_handle = productHandle;
+        }
+
+        return request;
+    }, [productHandle, shopifyProductId]);
 
-    const Rebuy = new RebuyClient(REBUY_API_KEY);
+    useEffect(() => {
+        const recordView = async () => {
+            const response = await Rebuy.trackProductViewed(request.parameters);
 
-    const request = {
-        parameters: {},
-    };
+            setEvent(response.data);
+        };
 
-    if (product) {
-        request.parameters.shopify_product_id = Utilities.getIdFromGraphUrl(product.id, 'Product');
-    } else if (productId) {
-        request.parameters.shopify_product_id = Utilities.getIdFromGraphUrl(productId, 'Product');
-    } else if (productHandle) {
-        request.parameters.shopify_product_handle = productHandle;
-    }
+        if (!initialized) {
+            const client = new RebuyClient(REBUY_API_KEY);
 
-    if (Object.keys(request.parameters).length == 0) {
-        console.log('No parameters!');
-        return;
-    }
+            setRebuy(client);
+            setInitialized(true);
 
-    useEffect(() => {
+            // Abort
+            return;
+        }
+
+        // Initialized
         recordView();
-    }, []);
+    }, [Rebuy, request, initialized]);
+
+    if (Object.keys(request.parameters).length === 0) {
+        console.warn('No parameters!');
+        return;
+    }
 
-    const recordView = async () => {
-        const response = await Rebuy.trackProductViewed(request.parameters);
-        setEvent(response.data);
-    };
+    return children;
+};
 
-    return <>{children}</>;
-}
+export default RebuyProductViewed;

package/RebuyRecentlyViewedProducts.client.jsx

@@ -0,0 +1,65 @@
+import { AddToCartButton, ProductOptionsProvider } from '@shopify/hydrogen';
+import { Section } from '~/components';
+import { ProductCard } from '~/components/cards';
+import { Button } from '~/components/elements';
+
+const AddToCartMarkup = ({ product }) => {
+    const selectedVariant = product.variants.nodes[0];
+    const isOutOfStock = !selectedVariant.availableForSale;
+
+    return (
+        <div className="space-y-2 mb-8">
+            <AddToCartButton
+                disabled={isOutOfStock}
+                product={product}
+                variantId={selectedVariant?.id}
+                quantity={1}
+                accessibleAddingToCartLabel="Adding item to your cart"
+                type="button"
+                attributes={[
+                    { key: '_source', value: 'Rebuy' },
+                    { key: '_attribution', value: 'Recently Viewed Product' },
+                ]}
+            >
+                <Button
+                    width="full"
+                    variant={isOutOfStock ? 'secondary' : 'primary'}
+                    as="span"
+                >
+                    {isOutOfStock ? 'Out of stock' : 'Add to bag'}
+                </Button>
+            </AddToCartButton>
+        </div>
+    );
+};
+
+export const RebuyRecentlyViewedProducts = ({ product, products }) => {
+    const title = 'Recently Viewed';
+    // Filter current product from recently viewed
+    const filtered = products.filter((recent) => recent.id !== product.id);
+
+    return (
+        filtered.length > 0 && (
+            <Section heading={title} padding="y">
+                <ul className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-8 mb-16 px-6 md:px-8 lg:px-12">
+                    {filtered.map((product) => (
+                        <li key={product.id}>
+                            <ProductOptionsProvider
+                                data={product}
+                                initialVariantId={product.variants.nodes[0].id}
+                            >
+                                <ProductCard
+                                    product={product}
+                                    className={'w-100'}
+                                />
+                                <AddToCartMarkup product={product} />
+                            </ProductOptionsProvider>
+                        </li>
+                    ))}
+                </ul>
+            </Section>
+        )
+    );
+};
+
+export default RebuyRecentlyViewedProducts;

package/RebuyWidgetContainer.client.jsx

@@ -1,87 +1,136 @@
-import React, { useState, useEffect, useContext } from 'react';
-import { RebuyContext } from './RebuyContextProvider.client';
-import { flattenConnection } from '@shopify/hydrogen';
-
+import { RebuyClient } from '@rebuy/rebuy';
+import { RebuyContext } from '@rebuy/rebuy-hydrogen/RebuyContexts.client';
 import * as Utilities from '@rebuy/rebuy/utilities';
-import RebuyClient from '@rebuy/rebuy/client';
+import { flattenConnection, useCart } from '@shopify/hydrogen';
+import React, { useContext, useEffect, useMemo, useState } from 'react';
 
 const REBUY_API_KEY = import.meta.env.PUBLIC_REBUY_API_KEY;
 
-export default function RebuyWidgetContainer(props) {
-    const { product, productId, variant, variantId, collection, collectionId, dataSource, limit, options, children } =
-        props;
-
-    const contextParameters = useContext(RebuyContext);
+export const RebuyWidgetContainer = ({ children, ...props }) => {
+    const {
+        collection,
+        collectionId,
+        dataSource,
+        limit,
+        options,
+        product,
+        productId,
+        variant,
+        variantId,
+    } = props;
+
+    const cart = useCart();
+    const { contextParameters } = useContext(RebuyContext);
     const [products, setProducts] = useState([]);
     const [metadata, setMetadata] = useState([]);
+    const [Rebuy, setRebuy] = useState(null);
+    const [initialized, setInitialized] = useState(false);
+    const isCartReady = ['uninitialized', 'idle'].includes(cart.status); // uninitialized, creating, fetching, updating, idle
+    const shopifyProductId = product?.id ?? productId ?? null;
+    const shopifyVariantId = variant?.id ?? variantId ?? null;
+    const shopifyCollectionId = collection?.id ?? collectionId ?? null;
+
+    // Initialize Rebuy API client
+    useEffect(() => {
+        if (!Rebuy) {
+            const client = new RebuyClient(REBUY_API_KEY);
+            client.setContextParameters(contextParameters);
 
-    const Rebuy = new RebuyClient(REBUY_API_KEY);
-
-    Rebuy.setContextParameters(contextParameters);
-
-    const request = {
-        url: '/api/v1/products/recommended',
-        parameters: {},
-    };
-
-    if (dataSource) {
-        request.url = dataSource;
-    }
+            if (options) {
+                client.setDefaultParameters(options);
+            }
 
-    if (product) {
-        request.parameters.shopify_product_ids = Utilities.getIdFromGraphUrl(product.id, 'Product');
-    } else if (productId) {
-        request.parameters.shopify_product_ids = Utilities.getIdFromGraphUrl(productId, 'Product');
-    }
+            setRebuy(client);
+            setInitialized(true);
+        }
+    }, [Rebuy, contextParameters, options]);
 
-    if (variant) {
-        request.parameters.shopify_variant_ids = Utilities.getIdFromGraphUrl(variant.id, 'ProductVariant');
-    } else if (variantId) {
-        request.parameters.shopify_variant_ids = Utilities.getIdFromGraphUrl(variantId, 'ProductVariant');
-    }
+    // Update context params
+    useEffect(() => {
+        if (!Rebuy) return;
+
+        Rebuy.setContextParameters(contextParameters);
+    }, [Rebuy, contextParameters]);
+
+    // Memoize request object on prop changes (e.g. product)
+    const request = useMemo(() => {
+        const request = {
+            url: dataSource || '/api/v1/products/recommended',
+            parameters: {},
+        };
+
+        if (shopifyProductId) {
+            request.parameters.shopify_product_ids =
+                Utilities.getIdFromGraphUrl(shopifyProductId, 'Product');
+        }
+
+        if (shopifyVariantId) {
+            request.parameters.shopify_variant_ids =
+                Utilities.getIdFromGraphUrl(shopifyVariantId, 'ProductVariant');
+        }
+
+        if (shopifyCollectionId) {
+            request.parameters.shopify_collection_ids =
+                Utilities.getIdFromGraphUrl(shopifyCollectionId, 'Collection');
+        }
+
+        if (limit) {
+            request.parameters.limit = limit;
+        }
+
+        return request;
+    }, [
+        dataSource,
+        limit,
+        shopifyCollectionId,
+        shopifyProductId,
+        shopifyVariantId,
+    ]);
+
+    // Update product recommendations on cart or request change
+    useEffect(() => {
+        let ignore = false;
+
+        // Initializing...
+        if (!initialized || !Rebuy || !isCartReady) return;
+
+        const fetchData = async () => {
+            const { data, metadata } = await Rebuy.getStorefrontData(
+                request.url,
+                request.parameters
+            );
+
+            data.forEach((product) => {
+                product.variants = {
+                    nodes: flattenConnection(product.variants),
+                };
+            });
+
+            // Set state only if mounted
+            if (!ignore) {
+                setProducts(data);
+                setMetadata(metadata);
+            }
+        };
 
-    if (collection) {
-        request.parameters.shopify_collection_ids = Utilities.getIdFromGraphUrl(collection.id, 'Collection');
-    } else if (collectionId) {
-        request.parameters.shopify_collection_ids = Utilities.getIdFromGraphUrl(collectionId, 'Collection');
-    }
+        fetchData();
 
-    if (limit) {
-        request.parameters.limit = limit;
-    }
+        // Unmounted?
+        return () => {
+            ignore = true;
+        };
+    }, [Rebuy, initialized, request, isCartReady]);
 
-    if (options) {
-        Rebuy.setDefaultParameters(options);
-    }
+    const childrenWithProps = (props) =>
+        React.Children.map(children, (child) =>
+            React.isValidElement(child)
+                ? React.cloneElement(child, props)
+                : child
+        );
 
-    useEffect(() => {
-        fetchData();
-    }, []);
-
-    const fetchData = async () => {
-        const response = await Rebuy.getStorefrontData(request.url, request.parameters);
-
-        const { data, metadata } = response;
-        data.forEach((product) => {
-            product.variants = {
-                nodes: flattenConnection(product.variants),
-            };
-        });
-
-        setProducts(data);
-        setMetadata(metadata);
-    };
-
-    const childrenWithProps = (data) => {
-        return React.Children.map(children, (child) => {
-            if (React.isValidElement(child)) {
-                return React.cloneElement(child, data);
-            }
-            return child;
-        });
-    };
+    const childProps = { ...props, products, metadata };
 
-    const data = Object.assign({}, props, { products, metadata });
+    return childrenWithProps(childProps);
+};
 
-    return <>{childrenWithProps(data)}</>;
-}
+export default RebuyWidgetContainer;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@rebuy/rebuy-hydrogen",
     "description": "This is the default library for Rebuy + Shopify Hydrogen",
-    "version": "1.0.2",
+    "version": "2.0.0",
     "license": "MIT",
     "author": "Rebuy, Inc.",
     "type": "module",
@@ -10,10 +10,12 @@
     },
     "files": [
         "README.md",
+        "**/*.js",
         "**/*.jsx"
     ],
     "scripts": {
-        "lint": "eslint . --ext .js,.jsx",
+        "format": "npm run lint -- --fix",
+        "lint": "eslint . --ext .js,.jsx,.json",
         "prepare": "husky install",
         "test": "echo \"Error: no test specified\" && exit 1"
     },
@@ -34,26 +36,39 @@
     },
     "homepage": "https://bitbucket.org/rebuyengine/npm-rebuy-hydrogen#readme",
     "devDependencies": {
-        "@commitlint/cli": "^17.0.2",
-        "@commitlint/config-conventional": "^17.0.2",
+        "@commitlint/cli": "^17.2.0",
+        "@commitlint/config-conventional": "^17.2.0",
         "@semantic-release/changelog": "^6.0.1",
         "@semantic-release/commit-analyzer": "^9.0.2",
         "@semantic-release/git": "^10.0.1",
         "@semantic-release/npm": "^9.0.1",
         "@semantic-release/release-notes-generator": "^10.0.3",
-        "@shopify/hydrogen": "^1.0.1",
+        "@shopify/hydrogen": "^1.6.1",
         "conventional-changelog-eslint": "^3.0.9",
         "cz-conventional-changelog": "^3.3.0",
-        "cz-customizable": "^6.3.0",
-        "eslint": "^8.17.0",
-        "eslint-plugin-react": "^7.30.0",
+        "cz-customizable": "^6.9.2",
+        "eslint": "^8.26.0",
+        "eslint-config-prettier": "^8.5.0",
+        "eslint-plugin-import": "^2.26.0",
+        "eslint-plugin-json": "^3.1.0",
+        "eslint-plugin-prettier": "^4.2.1",
+        "eslint-plugin-react": "^7.31.10",
+        "eslint-plugin-react-hooks": "^4.6.0",
         "husky": "^8.0.1",
-        "semantic-release": "^19.0.3"
+        "lint-staged": "^13.0.3",
+        "prettier": "^2.7.1",
+        "semantic-release": "^19.0.5"
     },
     "dependencies": {
-        "@rebuy/rebuy": "^1.0.1"
+        "@rebuy/rebuy": "^1.3.9"
     },
     "peerDependencies": {
-        "@shopify/hydrogen": "^1.0.1"
+        "@shopify/hydrogen": "^1.6.1"
+    },
+    "lint-staged": {
+        "**/*.{js,jsx,json}": [
+            "npm run format",
+            "prettier --write"
+        ]
     }
 }