chore: reorganize and cleanup files (#2408)

Author: chanceaclark

.changeset/sour-jeans-show.md

@@ -0,0 +1,13 @@
+---
+"@bigcommerce/catalyst-core": minor
+---
+
+Reorganize and cleanup files:
+- Moved `core/context/search-context` to `core/lib/search`.
+- Moved `core/client/mutations/add-cart-line-item.ts` and `core/client/mutations/create-cart.ts` into `core/lib/cart/*`.
+- Removed `core/client/queries/get-cart.ts` in favor of a smaller, more focused query within `core/lib/cart/validate-cart.ts`.
+
+### Migration
+- Replace imports from `~/context/search-context` to `~/lib/search`.
+- Replace imports from `~/client/mutations/` to `~/lib/cart/`.
+- Remove any direct imports from `~/client/queries/get-cart.ts` and use the new `validate-cart.ts` query instead. If you need the previous `getCart` function, you can copy it from the old file and adapt it to your needs.

core/app/providers.tsx

@@ -3,7 +3,7 @@
 import { PropsWithChildren } from 'react';
 
 import { Toaster } from '@/vibes/soul/primitives/toaster';
-import { SearchProvider } from '~/context/search-context';
+import { SearchProvider } from '~/lib/search';
 
 export function Providers({ children }: PropsWithChildren) {
   return (

core/client/queries/get-cart.ts

@@ -1,7 +1,6 @@
 import { getSessionCustomerAccessToken } from '~/auth';
-
-import { client } from '..';
-import { graphql, VariablesOf } from '../graphql';
+import { client } from '~/client';
+import { graphql, VariablesOf } from '~/client/graphql';
 
 const AddCartLineItemMutation = graphql(`
   mutation AddCartLineItemMutation($input: AddCartLineItemsInput!) {

…e/client/mutations/add-cart-line-item.ts core/lib/cart/add-cart-line-item.tscore/client/mutations/add-cart-line-item.ts renamed to core/lib/cart/add-cart-line-item.ts core/client/mutations/add-cart-line-item.ts renamed to core/lib/cart/add-cart-line-item.ts

@@ -1,9 +1,8 @@
 import { getSessionCustomerAccessToken } from '~/auth';
+import { client } from '~/client';
+import { graphql, VariablesOf } from '~/client/graphql';
 import { getPreferredCurrencyCode } from '~/lib/currency';
 
-import { client } from '..';
-import { graphql, VariablesOf } from '../graphql';
-
 const CreateCartMutation = graphql(`
   mutation CreateCartMutation($createCartInput: CreateCartInput!) {
     cart {

core/client/mutations/create-cart.ts core/lib/cart/create-cart.tscore/client/mutations/create-cart.ts renamed to core/lib/cart/create-cart.ts

@@ -3,10 +3,10 @@
 import { unstable_expireTag } from 'next/cache';
 
 import { auth, getAnonymousSession, updateAnonymousSession, updateSession } from '~/auth';
-import { addCartLineItem, AddCartLineItemsInput } from '~/client/mutations/add-cart-line-item';
-import { createCart, CreateCartInput } from '~/client/mutations/create-cart';
-import { getCart } from '~/client/queries/get-cart';
 import { TAGS } from '~/client/tags';
+import { addCartLineItem, AddCartLineItemsInput } from '~/lib/cart/add-cart-line-item';
+import { createCart, CreateCartInput } from '~/lib/cart/create-cart';
+import { validateCartId } from '~/lib/cart/validate-cart';
 
 import { MissingCartError } from './error';
 
@@ -50,7 +50,7 @@ export async function addToOrCreateCart(
   data: CreateCartInput | AddCartLineItemsInput['data'],
 ): Promise<void> {
   const cartId = await getCartId();
-  const cart = await getCart(cartId);
+  const cart = await validateCartId(cartId);
 
   if (cart) {
     const response = await addCartLineItem(cart.entityId, data);

core/lib/cart/index.ts

@@ -0,0 +1,32 @@
+import { getSessionCustomerAccessToken } from '~/auth';
+import { client } from '~/client';
+import { graphql } from '~/client/graphql';
+import { TAGS } from '~/client/tags';
+
+const ValidateCartQuery = graphql(`
+  query ValidateCartQuery($cartId: String) {
+    site {
+      cart(entityId: $cartId) {
+        entityId
+      }
+    }
+  }
+`);
+
+export async function validateCartId(cartId?: string) {
+  const customerAccessToken = await getSessionCustomerAccessToken();
+
+  const response = await client.fetch({
+    document: ValidateCartQuery,
+    variables: { cartId },
+    customerAccessToken,
+    fetchOptions: {
+      cache: 'no-store',
+      next: {
+        tags: [TAGS.cart],
+      },
+    },
+  });
+
+  return response.data.site.cart;
+}

core/lib/cart/validate-cart.ts

@@ -27,8 +27,8 @@ import { Logo } from '@/vibes/soul/primitives/logo';
 import { Price } from '@/vibes/soul/primitives/price-label';
 import { ProductCard } from '@/vibes/soul/primitives/product-card';
 import { Link } from '~/components/link';
-import { useSearch } from '~/context/search-context';
 import { usePathname, useRouter } from '~/i18n/routing';
+import { useSearch } from '~/lib/search';
 
 interface Link {
   label: string;

core/context/search-context.tsx core/lib/search.tsxcore/context/search-context.tsx renamed to core/lib/search.tsx

@@ -2,7 +2,7 @@
 
 import { Button } from '@/vibes/soul/primitives/button';
 import { SectionLayout } from '@/vibes/soul/sections/section-layout';
-import { useSearch } from '~/context/search-context';
+import { useSearch } from '~/lib/search';
 
 export interface NotFoundProps {
   title?: string;