refactor: move graphql-generated types to shopify strategy directory

Blazity · Feb 16, 2024 · c2c0229 · c2c0229
1 parent e3c5dea
commit c2c0229
Show file tree

Hide file tree

Showing 11 changed files with 544 additions and 90 deletions.
diff --git a/.graphqlrc.ts b/.graphqlrc.ts
@@ -8,13 +8,13 @@ export default {
       apiType: ApiType.Storefront,
       apiVersion: "2024-01",
       documents: ["./packages/core/**/*.storefront.{js,ts,jsx,tsx}", "./packages/core/**/fragments/*.{js,ts,jsx,tsx}"],
-      outputDir: "./types",
+      outputDir: "./packages/core/platform/shopify/types",
     }),
     admin: shopifyApiProject({
       apiType: ApiType.Admin,
       apiVersion: "2024-01",
       documents: ["./packages/core/**/*.admin.{js,ts,jsx,tsx}"],
-      outputDir: "./types/admin",
+      outputDir: "./packages/core/platform/shopify/types/admin",
     }),
   },
 }
diff --git a/apps/web/app/api/sync/route.ts b/apps/web/app/api/sync/route.ts
@@ -5,8 +5,6 @@ import { FailedAttemptError } from "p-retry"
 import { Root } from "shopify-webhooks"
 import { createHmac } from "crypto"
 
-import { SingleProductQuery } from "../../../../../types/storefront.generated"
-
 export async function POST(req: Request) {
   const hmac = req.headers.get("X-Shopify-Hmac-Sha256")
 
@@ -45,7 +43,8 @@ export async function POST(req: Request) {
   return Response.json({ status: "ok" })
 }
 
-function normalizeProduct(product: SingleProductQuery["product"] | undefined | null) {
+// TODO: provide agnostic type
+function normalizeProduct(product: any | undefined | null) {
   if (!product) return product
 
   return {

diff --git a/apps/web/views/Search/SearchView.tsx b/apps/web/views/Search/SearchView.tsx
@@ -107,6 +107,7 @@ export function SearchView({ searchParams }: { searchParams: Record<string, stri
             </DropdownMenu>
           </div>
           <NextInstantSearch
+            meilisearchOptions={{}}
             searchParams={{ ...parsedSearchParams, q: parsedSearchParams.q || " " }}
             options={{ revalidate: 60 }}
             indexName="products"

diff --git a/packages/core/platform/shopify/index.ts b/packages/core/platform/shopify/index.ts
@@ -7,9 +7,9 @@ import { getMenuQuery } from "./queries/menu.storefront"
 import { getLatestProductFeedQuery } from "./queries/product-feed.admin"
 import { getProductQuery, getProductsByHandleQuery } from "./queries/product.storefront"
 
-import type { LatestProductFeedsQuery, ProductFeedCreateMutation, ProductFullSyncMutation, WebhookSubscriptionCreateMutation } from "../../../../types/admin/admin.generated"
-import type { WebhookSubscriptionTopic } from "../../../../types/admin/admin.types"
-import type { MenuQuery, ProductsByHandleQuery, SingleProductQuery } from "../../../../types/storefront.generated"
+import type { LatestProductFeedsQuery, ProductFeedCreateMutation, ProductFullSyncMutation, WebhookSubscriptionCreateMutation } from "./types/admin/admin.generated"
+import type { WebhookSubscriptionTopic } from "./types/admin/admin.types"
+import type { MenuQuery, ProductsByHandleQuery, SingleProductQuery } from "./types/storefront.generated"
 
 interface CreateShopifyClientProps {
   storeDomain: string

diff --git a/types/admin/admin-2024-01.schema.json → ...ify/types/admin/admin-2024-01.schema.json b/types/admin/admin-2024-01.schema.json → ...ify/types/admin/admin-2024-01.schema.json
diff --git a/types/admin/admin.generated.d.ts → .../shopify/types/admin/admin.generated.d.ts b/types/admin/admin.generated.d.ts → .../shopify/types/admin/admin.generated.d.ts
diff --git a/types/admin/admin.types.d.ts → ...form/shopify/types/admin/admin.types.d.ts b/types/admin/admin.types.d.ts → ...form/shopify/types/admin/admin.types.d.ts
diff --git a/packages/core/platform/shopify/types/storefront-2024-01.schema.json b/packages/core/platform/shopify/types/storefront-2024-01.schema.json
diff --git a/types/storefront.generated.d.ts → ...m/shopify/types/storefront.generated.d.ts b/types/storefront.generated.d.ts → ...m/shopify/types/storefront.generated.d.ts
@@ -17,6 +17,18 @@ export type SingleCartFragment = (
                 ) }> }, featuredImage?: StorefrontTypes.Maybe<Pick<StorefrontTypes.Image, 'url' | 'altText' | 'width' | 'height'>>, images: { edges: Array<{ node: Pick<StorefrontTypes.Image, 'url' | 'altText' | 'width' | 'height'> }> }, seo: Pick<StorefrontTypes.Seo, 'description' | 'title'> }
           ) }
         ) }
+      ) | (
+        Pick<StorefrontTypes.ComponentizableCartLine, 'id' | 'quantity'>
+        & { cost: { totalAmount: Pick<StorefrontTypes.MoneyV2, 'amount' | 'currencyCode'> }, merchandise: (
+          Pick<StorefrontTypes.ProductVariant, 'id' | 'title'>
+          & { selectedOptions: Array<Pick<StorefrontTypes.SelectedOption, 'name' | 'value'>>, product: (
+            Pick<StorefrontTypes.Product, 'id' | 'handle' | 'title' | 'description' | 'descriptionHtml' | 'tags' | 'updatedAt'>
+            & { options: Array<Pick<StorefrontTypes.ProductOption, 'id' | 'name' | 'values'>>, priceRange: { maxVariantPrice: Pick<StorefrontTypes.MoneyV2, 'amount' | 'currencyCode'>, minVariantPrice: Pick<StorefrontTypes.MoneyV2, 'amount' | 'currencyCode'> }, variants: { edges: Array<{ node: (
+                  Pick<StorefrontTypes.ProductVariant, 'id' | 'title' | 'availableForSale'>
+                  & { selectedOptions: Array<Pick<StorefrontTypes.SelectedOption, 'name' | 'value'>>, price: Pick<StorefrontTypes.MoneyV2, 'amount' | 'currencyCode'> }
+                ) }> }, featuredImage?: StorefrontTypes.Maybe<Pick<StorefrontTypes.Image, 'url' | 'altText' | 'width' | 'height'>>, images: { edges: Array<{ node: Pick<StorefrontTypes.Image, 'url' | 'altText' | 'width' | 'height'> }> }, seo: Pick<StorefrontTypes.Seo, 'description' | 'title'> }
+          ) }
+        ) }
       ) }> } }
 );
 
@@ -62,6 +74,18 @@ export type CreateCartLineMutation = { cartLinesAdd?: StorefrontTypes.Maybe<{ ca
                     ) }> }, featuredImage?: StorefrontTypes.Maybe<Pick<StorefrontTypes.Image, 'url' | 'altText' | 'width' | 'height'>>, images: { edges: Array<{ node: Pick<StorefrontTypes.Image, 'url' | 'altText' | 'width' | 'height'> }> }, seo: Pick<StorefrontTypes.Seo, 'description' | 'title'> }
               ) }
             ) }
+          ) | (
+            Pick<StorefrontTypes.ComponentizableCartLine, 'id' | 'quantity'>
+            & { cost: { totalAmount: Pick<StorefrontTypes.MoneyV2, 'amount' | 'currencyCode'> }, merchandise: (
+              Pick<StorefrontTypes.ProductVariant, 'id' | 'title'>
+              & { selectedOptions: Array<Pick<StorefrontTypes.SelectedOption, 'name' | 'value'>>, product: (
+                Pick<StorefrontTypes.Product, 'id' | 'handle' | 'title' | 'description' | 'descriptionHtml' | 'tags' | 'updatedAt'>
+                & { options: Array<Pick<StorefrontTypes.ProductOption, 'id' | 'name' | 'values'>>, priceRange: { maxVariantPrice: Pick<StorefrontTypes.MoneyV2, 'amount' | 'currencyCode'>, minVariantPrice: Pick<StorefrontTypes.MoneyV2, 'amount' | 'currencyCode'> }, variants: { edges: Array<{ node: (
+                      Pick<StorefrontTypes.ProductVariant, 'id' | 'title' | 'availableForSale'>
+                      & { selectedOptions: Array<Pick<StorefrontTypes.SelectedOption, 'name' | 'value'>>, price: Pick<StorefrontTypes.MoneyV2, 'amount' | 'currencyCode'> }
+                    ) }> }, featuredImage?: StorefrontTypes.Maybe<Pick<StorefrontTypes.Image, 'url' | 'altText' | 'width' | 'height'>>, images: { edges: Array<{ node: Pick<StorefrontTypes.Image, 'url' | 'altText' | 'width' | 'height'> }> }, seo: Pick<StorefrontTypes.Seo, 'description' | 'title'> }
+              ) }
+            ) }
           ) }> } }
     )> }> };
 
@@ -84,6 +108,18 @@ export type CreateCartMutation = { cartCreate?: StorefrontTypes.Maybe<{ cart?: S
                     ) }> }, featuredImage?: StorefrontTypes.Maybe<Pick<StorefrontTypes.Image, 'url' | 'altText' | 'width' | 'height'>>, images: { edges: Array<{ node: Pick<StorefrontTypes.Image, 'url' | 'altText' | 'width' | 'height'> }> }, seo: Pick<StorefrontTypes.Seo, 'description' | 'title'> }
               ) }
             ) }
+          ) | (
+            Pick<StorefrontTypes.ComponentizableCartLine, 'id' | 'quantity'>
+            & { cost: { totalAmount: Pick<StorefrontTypes.MoneyV2, 'amount' | 'currencyCode'> }, merchandise: (
+              Pick<StorefrontTypes.ProductVariant, 'id' | 'title'>
+              & { selectedOptions: Array<Pick<StorefrontTypes.SelectedOption, 'name' | 'value'>>, product: (
+                Pick<StorefrontTypes.Product, 'id' | 'handle' | 'title' | 'description' | 'descriptionHtml' | 'tags' | 'updatedAt'>
+                & { options: Array<Pick<StorefrontTypes.ProductOption, 'id' | 'name' | 'values'>>, priceRange: { maxVariantPrice: Pick<StorefrontTypes.MoneyV2, 'amount' | 'currencyCode'>, minVariantPrice: Pick<StorefrontTypes.MoneyV2, 'amount' | 'currencyCode'> }, variants: { edges: Array<{ node: (
+                      Pick<StorefrontTypes.ProductVariant, 'id' | 'title' | 'availableForSale'>
+                      & { selectedOptions: Array<Pick<StorefrontTypes.SelectedOption, 'name' | 'value'>>, price: Pick<StorefrontTypes.MoneyV2, 'amount' | 'currencyCode'> }
+                    ) }> }, featuredImage?: StorefrontTypes.Maybe<Pick<StorefrontTypes.Image, 'url' | 'altText' | 'width' | 'height'>>, images: { edges: Array<{ node: Pick<StorefrontTypes.Image, 'url' | 'altText' | 'width' | 'height'> }> }, seo: Pick<StorefrontTypes.Seo, 'description' | 'title'> }
+              ) }
+            ) }
           ) }> } }
     )> }> };
 
@@ -107,6 +143,18 @@ export type EditCartLineMutation = { cartLinesUpdate?: StorefrontTypes.Maybe<{ c
                     ) }> }, featuredImage?: StorefrontTypes.Maybe<Pick<StorefrontTypes.Image, 'url' | 'altText' | 'width' | 'height'>>, images: { edges: Array<{ node: Pick<StorefrontTypes.Image, 'url' | 'altText' | 'width' | 'height'> }> }, seo: Pick<StorefrontTypes.Seo, 'description' | 'title'> }
               ) }
             ) }
+          ) | (
+            Pick<StorefrontTypes.ComponentizableCartLine, 'id' | 'quantity'>
+            & { cost: { totalAmount: Pick<StorefrontTypes.MoneyV2, 'amount' | 'currencyCode'> }, merchandise: (
+              Pick<StorefrontTypes.ProductVariant, 'id' | 'title'>
+              & { selectedOptions: Array<Pick<StorefrontTypes.SelectedOption, 'name' | 'value'>>, product: (
+                Pick<StorefrontTypes.Product, 'id' | 'handle' | 'title' | 'description' | 'descriptionHtml' | 'tags' | 'updatedAt'>
+                & { options: Array<Pick<StorefrontTypes.ProductOption, 'id' | 'name' | 'values'>>, priceRange: { maxVariantPrice: Pick<StorefrontTypes.MoneyV2, 'amount' | 'currencyCode'>, minVariantPrice: Pick<StorefrontTypes.MoneyV2, 'amount' | 'currencyCode'> }, variants: { edges: Array<{ node: (
+                      Pick<StorefrontTypes.ProductVariant, 'id' | 'title' | 'availableForSale'>
+                      & { selectedOptions: Array<Pick<StorefrontTypes.SelectedOption, 'name' | 'value'>>, price: Pick<StorefrontTypes.MoneyV2, 'amount' | 'currencyCode'> }
+                    ) }> }, featuredImage?: StorefrontTypes.Maybe<Pick<StorefrontTypes.Image, 'url' | 'altText' | 'width' | 'height'>>, images: { edges: Array<{ node: Pick<StorefrontTypes.Image, 'url' | 'altText' | 'width' | 'height'> }> }, seo: Pick<StorefrontTypes.Seo, 'description' | 'title'> }
+              ) }
+            ) }
           ) }> } }
     )> }> };
 
@@ -130,6 +178,18 @@ export type RemoveCartLineMutation = { cartLinesRemove?: StorefrontTypes.Maybe<{
                     ) }> }, featuredImage?: StorefrontTypes.Maybe<Pick<StorefrontTypes.Image, 'url' | 'altText' | 'width' | 'height'>>, images: { edges: Array<{ node: Pick<StorefrontTypes.Image, 'url' | 'altText' | 'width' | 'height'> }> }, seo: Pick<StorefrontTypes.Seo, 'description' | 'title'> }
               ) }
             ) }
+          ) | (
+            Pick<StorefrontTypes.ComponentizableCartLine, 'id' | 'quantity'>
+            & { cost: { totalAmount: Pick<StorefrontTypes.MoneyV2, 'amount' | 'currencyCode'> }, merchandise: (
+              Pick<StorefrontTypes.ProductVariant, 'id' | 'title'>
+              & { selectedOptions: Array<Pick<StorefrontTypes.SelectedOption, 'name' | 'value'>>, product: (
+                Pick<StorefrontTypes.Product, 'id' | 'handle' | 'title' | 'description' | 'descriptionHtml' | 'tags' | 'updatedAt'>
+                & { options: Array<Pick<StorefrontTypes.ProductOption, 'id' | 'name' | 'values'>>, priceRange: { maxVariantPrice: Pick<StorefrontTypes.MoneyV2, 'amount' | 'currencyCode'>, minVariantPrice: Pick<StorefrontTypes.MoneyV2, 'amount' | 'currencyCode'> }, variants: { edges: Array<{ node: (
+                      Pick<StorefrontTypes.ProductVariant, 'id' | 'title' | 'availableForSale'>
+                      & { selectedOptions: Array<Pick<StorefrontTypes.SelectedOption, 'name' | 'value'>>, price: Pick<StorefrontTypes.MoneyV2, 'amount' | 'currencyCode'> }
+                    ) }> }, featuredImage?: StorefrontTypes.Maybe<Pick<StorefrontTypes.Image, 'url' | 'altText' | 'width' | 'height'>>, images: { edges: Array<{ node: Pick<StorefrontTypes.Image, 'url' | 'altText' | 'width' | 'height'> }> }, seo: Pick<StorefrontTypes.Seo, 'description' | 'title'> }
+              ) }
+            ) }
           ) }> } }
     )> }> };
 
@@ -152,6 +212,18 @@ export type SingleCartQuery = { cart?: StorefrontTypes.Maybe<(
                   ) }> }, featuredImage?: StorefrontTypes.Maybe<Pick<StorefrontTypes.Image, 'url' | 'altText' | 'width' | 'height'>>, images: { edges: Array<{ node: Pick<StorefrontTypes.Image, 'url' | 'altText' | 'width' | 'height'> }> }, seo: Pick<StorefrontTypes.Seo, 'description' | 'title'> }
             ) }
           ) }
+        ) | (
+          Pick<StorefrontTypes.ComponentizableCartLine, 'id' | 'quantity'>
+          & { cost: { totalAmount: Pick<StorefrontTypes.MoneyV2, 'amount' | 'currencyCode'> }, merchandise: (
+            Pick<StorefrontTypes.ProductVariant, 'id' | 'title'>
+            & { selectedOptions: Array<Pick<StorefrontTypes.SelectedOption, 'name' | 'value'>>, product: (
+              Pick<StorefrontTypes.Product, 'id' | 'handle' | 'title' | 'description' | 'descriptionHtml' | 'tags' | 'updatedAt'>
+              & { options: Array<Pick<StorefrontTypes.ProductOption, 'id' | 'name' | 'values'>>, priceRange: { maxVariantPrice: Pick<StorefrontTypes.MoneyV2, 'amount' | 'currencyCode'>, minVariantPrice: Pick<StorefrontTypes.MoneyV2, 'amount' | 'currencyCode'> }, variants: { edges: Array<{ node: (
+                    Pick<StorefrontTypes.ProductVariant, 'id' | 'title' | 'availableForSale'>
+                    & { selectedOptions: Array<Pick<StorefrontTypes.SelectedOption, 'name' | 'value'>>, price: Pick<StorefrontTypes.MoneyV2, 'amount' | 'currencyCode'> }
+                  ) }> }, featuredImage?: StorefrontTypes.Maybe<Pick<StorefrontTypes.Image, 'url' | 'altText' | 'width' | 'height'>>, images: { edges: Array<{ node: Pick<StorefrontTypes.Image, 'url' | 'altText' | 'width' | 'height'> }> }, seo: Pick<StorefrontTypes.Seo, 'description' | 'title'> }
+            ) }
+          ) }
         ) }> } }
   )> };