@faststore/core 2.2.78 → 3.0.0

package/src/sdk/product/useProductGalleryQuery.ts

@@ -1,6 +1,6 @@
 import { sendAnalyticsEvent } from '@faststore/sdk'
-import { gql } from '@faststore/graphql-utils'
 
+import { gql } from '@generated'
 import { useQuery } from 'src/sdk/graphql/useQuery'
 import { useLocalizedVariables } from './useLocalizedVariables'
 import { useSession } from 'src/sdk/session'
@@ -14,13 +14,10 @@ import type { IntelligentSearchQueryEvent } from 'src/sdk/analytics/types'
 /**
  * This query is run on the browser and contains
  * the current search state of the user
+ *
+ * The query definition has to stay on top, or else it fails
  */
-export const query = gql`
-  fragment SearchEvent_metadata on SearchMetadata {
-    isTermMisspelled
-    logicalOperator
-  }
-
+export const query = gql(`
   query ClientProductGalleryQuery(
     $first: Int!
     $after: String!
@@ -49,7 +46,12 @@ export const query = gql`
       }
     }
   }
-`
+
+  fragment SearchEvent_metadata on SearchMetadata {
+    isTermMisspelled
+    logicalOperator
+  }
+`)
 
 export const useProductGalleryQuery = ({
   term,

package/src/sdk/product/useProductQuery.ts

@@ -1,6 +1,6 @@
-import { gql } from '@faststore/graphql-utils'
 import { useMemo } from 'react'
 
+import { gql } from '@generated'
 import type {
   ClientProductQueryQuery,
   ClientProductQueryQueryVariables,
@@ -9,14 +9,14 @@ import type {
 import { useQuery } from '../graphql/useQuery'
 import { useSession } from '../session'
 
-const query = gql`
+const query = gql(`
   query ClientProductQuery($locator: [IStoreSelectedFacet!]!) {
     ...ClientProduct
     product(locator: $locator) {
       ...ProductDetailsFragment_product
     }
   }
-`
+`)
 
 export const useProductQuery = <T extends ClientProductQueryQuery>(
   productID: string,

package/src/sdk/product/useProductsPrefetch.ts

@@ -1,13 +1,15 @@
-import { gql } from '@faststore/graphql-utils'
 import { useSearch } from '@faststore/sdk'
+
+import { gql } from '@generated'
 import { ClientManyProductsQueryQueryVariables } from '@generated/graphql'
 import { useEffect, useCallback } from 'react'
+
 import type { QueryOptions } from '../graphql/useQuery'
 import { useSWRConfig } from 'swr'
 import { prefetchQuery } from '../graphql/prefetchQuery'
 import { useLocalizedVariables } from './useLocalizedVariables'
 
-export const query = gql`
+export const query = gql(`
   query ClientManyProductsQuery(
     $first: Int!
     $after: String
@@ -35,7 +37,7 @@ export const query = gql`
       }
     }
   }
-`
+`)
 
 export const useProductsQueryPrefetch = (
   variables: ClientManyProductsQueryQueryVariables,

package/src/sdk/product/useProductsQuery.ts

@@ -1,5 +1,4 @@
-import { gql } from '@faststore/graphql-utils'
-
+import { gql } from '@generated'
 import type {
   ClientManyProductsQueryQuery,
   ClientManyProductsQueryQueryVariables,
@@ -9,7 +8,7 @@ import type { QueryOptions } from '../graphql/useQuery'
 import { useQuery } from '../graphql/useQuery'
 import { useLocalizedVariables } from './useLocalizedVariables'
 
-export const query = gql`
+export const query = gql(`
   query ClientManyProductsQuery(
     $first: Int!
     $after: String
@@ -37,7 +36,7 @@ export const query = gql`
       }
     }
   }
-`
+`)
 
 /**
  * Use this hook for fetching a list of products, like shelves and tiles

package/src/sdk/search/useSuggestions.ts

@@ -1,9 +1,9 @@
 import { useMemo } from 'react'
 
 import { sendAnalyticsEvent } from '@faststore/sdk'
-import { gql } from '@faststore/graphql-utils'
 import { useQuery } from 'src/sdk/graphql/useQuery'
 
+import { gql } from '@generated'
 import type {
   ClientSearchSuggestionsQueryQuery as Query,
   ClientSearchSuggestionsQueryQueryVariables as Variables,
@@ -12,7 +12,7 @@ import type { IntelligentSearchQueryEvent } from '../analytics/types'
 
 import { useSession } from '../session'
 
-const query = gql`
+const query = gql(`
   query ClientSearchSuggestionsQuery(
     $term: String!
     $selectedFacets: [IStoreSelectedFacet!]
@@ -37,7 +37,7 @@ const query = gql`
       }
     }
   }
-`
+`)
 
 function useSuggestions(term: string) {
   const { channel, locale } = useSession()

package/src/sdk/search/useTopSearch.ts

@@ -1,6 +1,5 @@
-import { gql } from '@faststore/graphql-utils'
-
 import { useQuery } from 'src/sdk/graphql/useQuery'
+import { gql } from '@generated'
 import type {
   ClientSearchSuggestionsQueryQuery as Query,
   ClientSearchSuggestionsQueryQueryVariables as Variables,
@@ -8,7 +7,7 @@ import type {
 
 import { useSession } from '../session'
 
-const query = gql`
+const query = gql(`
   query ClientTopSearchSuggestionsQuery(
     $term: String!
     $selectedFacets: [IStoreSelectedFacet!]
@@ -22,7 +21,7 @@ const query = gql`
       }
     }
   }
-`
+`)
 
 function useTopSearch() {
   const { channel, locale } = useSession()

package/src/sdk/session/index.ts

@@ -1,18 +1,18 @@
-import { gql } from '@faststore/graphql-utils'
 import type { Session } from '@faststore/sdk'
 import { createSessionStore } from '@faststore/sdk'
 import { useMemo } from 'react'
 
+import { gql } from '@generated'
 import type {
   ValidateSessionMutation,
   ValidateSessionMutationVariables,
-} from '../../../@generated/graphql/index'
+} from '@generated/graphql'
 import storeConfig from '../../../faststore.config'
 import { cartStore } from '../cart'
 import { request } from '../graphql/request'
 import { createValidationStore, useStore } from '../useStore'
 
-export const mutation = gql`
+export const mutation = gql(`
   mutation ValidateSession($session: IStoreSession!, $search: String!) {
     validateSession(session: $session, search: $search) {
       locale
@@ -44,7 +44,7 @@ export const mutation = gql`
       }
     }
   }
-`
+`)
 
 export const validateSession = async (session: Session) => {
   const data = await request<

package/src/sdk/shipping/index.ts

@@ -1,6 +1,6 @@
 import type { IShippingItem } from '@faststore/api'
-import { gql } from '@faststore/graphql-utils'
 
+import { gql } from '@generated'
 import type {
   ClientShippingSimulationQueryQuery as Query,
   ClientShippingSimulationQueryQueryVariables as Variables,
@@ -8,7 +8,7 @@ import type {
 
 import { request } from '../graphql/request'
 
-const query = gql`
+const query = gql(`
   query ClientShippingSimulationQuery(
     $postalCode: String!
     $country: String!
@@ -37,7 +37,7 @@ const query = gql`
       }
     }
   }
-`
+`)
 
 export type ShippingQueryData = {
   items: IShippingItem[]

package/src/server/generator/schema.ts

@@ -70,7 +70,7 @@ export const getMergedSchema = (): GraphQLSchema =>
 export function writeGraphqlSchemaFile(apiSchema: GraphQLSchema) {
   try {
     writeFileSync(
-      path.join(process.cwd(), '@generated', 'graphql', 'schema.graphql'),
+      path.join(process.cwd(), '@generated', 'schema.graphql'),
       printSchemaWithDirectives(apiSchema)
     )
 

package/src/server/index.ts

@@ -21,15 +21,16 @@ import { makeExecutableSchema } from '@graphql-tools/schema'
 import { loadFilesSync } from '@graphql-tools/load-files'
 import type { TypeSource } from '@graphql-tools/utils'
 
-import persisted from '../../@generated/graphql/persisted.json'
+import persisted from '@generated/persisted-documents.json'
 
 import vtexExtensionsResolvers from '../customizations/src/graphql/vtex/resolvers'
 import thirdPartyResolvers from '../customizations/src/graphql/thirdParty/resolvers'
 
 import { apiOptions } from './options'
+import { TypedDocumentString } from '@generated/graphql'
 
 interface ExecuteOptions<V = Record<string, unknown>> {
-  operationName: string
+  operation: Pick<TypedDocumentString<any, any>, '__meta__'>
   variables: V
   query?: string | null
 }
@@ -49,7 +50,7 @@ const formatError: FormatErrorHandler = (err) => {
 }
 
 function loadGeneratedSchema(): TypeSource {
-  return loadFilesSync(path.join(process.cwd(), '@generated', 'graphql'), {
+  return loadFilesSync(path.join(process.cwd(), '@generated'), {
     extensions: ['graphql'],
   })
 }
@@ -89,11 +90,15 @@ export const execute = async <V extends Maybe<{ [key: string]: unknown }>, D>(
     cookies: Map<string, Record<string, string>> | null
   }
 }> => {
-  const { operationName, variables, query: maybeQuery } = options
-  const query = maybeQuery ?? persistedQueries.get(operationName)
+  const { operation, variables, query: maybeQuery } = options
+  const { operationHash, operationName } = operation['__meta__']
+
+  const query = maybeQuery ?? persistedQueries.get(operationHash)
 
   if (query == null) {
-    throw new Error(`No query found for operationName: ${operationName}`)
+    throw new Error(
+      `No query found for operationName ${operationName} and operationHash ${operationHash}`
+    )
   }
 
   const enveloped = await envelopPromise

package/src/typings/overrides.ts

@@ -49,6 +49,7 @@ import Alert from '../components/sections/Alert'
 import Breadcrumb from '../components/sections/Breadcrumb'
 import BannerText from '../components/sections/BannerText'
 import CrossSellingShelf from '../components/sections/CrossSellingShelf'
+import EmptyState from '../components/sections/EmptyState'
 import Hero from '../components/sections/Hero'
 import ProductShelf from '../components/sections/ProductShelf'
 import ProductDetails from '../components/sections/ProductDetails'
@@ -137,7 +138,7 @@ export type SectionsOverrides = {
     }
   }
   EmptyState: {
-    Section: never
+    Section: typeof EmptyState
     components: {
       EmptyState: ComponentOverrideDefinition<
         PropsWithChildren<EmptyStateProps>,
@@ -154,7 +155,7 @@ export type SectionsOverrides = {
     }
   }
   Navbar: {
-    Section: typeof Navbar,
+    Section: typeof Navbar
     components: {
       Navbar: ComponentOverrideDefinition<NavbarProps, NavbarProps>
       NavbarLinks: ComponentOverrideDefinition<

package/test/server/index.test.ts

@@ -138,7 +138,12 @@ describe('FastStore GraphQL Layer', () => {
     it('should handle options and execute', async () => {
       const result = await execute({
         variables: { slug: storeConfig.cypress.pages.collection.slice(1) },
-        operationName: 'ServerCollectionPageQuery',
+        operation: {
+          __meta__: {
+            operationName: 'ServerCollectionPageQuery',
+            operationHash: '4b33c5c07f440dc7489e55619dc2211a13786e72',
+          },
+        },
       })
       expect(result.data).toBeDefined()
     })

package/.babelrc

@@ -1,4 +0,0 @@
-{
-  "presets": ["next/babel"],
-  "plugins": ["@faststore/graphql-utils/babel"]
-}

package/.next/cache/next-server.js.nft.json

@@ -1 +0,0 @@
-{"version":1,"cacheKey":"11c6821dd3328014cb60963fdb04fe2fb22b03d8cf2a4edce16a375d2a682d96","files":["../node_modules/next/dist/server/next-server.js","../node_modules/next/package.json","../node_modules/next/dist/server/node-polyfill-fetch.js","../node_modules/next/dist/server/node-polyfill-web-streams.js","../node_modules/next/dist/server/request-meta.js","../node_modules/next/dist/server/server-route-utils.js","../node_modules/next/dist/server/serve-static.js","../node_modules/next/dist/server/render.js","../node_modules/next/dist/server/app-render.js","../node_modules/next/dist/server/base-server.js","../node_modules/next/dist/server/require.js","../node_modules/next/dist/server/load-components.js","../node_modules/next/dist/server/body-streams.js","../node_modules/next/dist/server/utils.js","../node_modules/next/dist/server/image-optimizer.js","../node_modules/next/dist/server/lib/recursive-readdir-sync.js","../node_modules/next/dist/server/base-http/node.js","../node_modules/next/dist/server/api-utils/node.js","../node_modules/next/dist/lib/is-error.js","../node_modules/next/dist/server/web/utils.js","../node_modules/next/dist/shared/lib/utils.js","../node_modules/next/dist/shared/lib/constants.js","../node_modules/next/dist/shared/lib/router/utils/path-match.js","../node_modules/next/dist/shared/lib/router/utils/get-route-from-asset-path.js","../node_modules/next/dist/shared/lib/i18n/detect-domain-locale.js","../node_modules/next/dist/shared/lib/router/utils/parse-url.js","../node_modules/next/dist/build/output/log.js","../node_modules/next/dist/build/webpack/require-hook.js","../node_modules/next/dist/shared/lib/page-path/denormalize-page-path.js","../node_modules/next/dist/shared/lib/page-path/normalize-page-path.js","../node_modules/next/dist/shared/lib/router/utils/relativize-url.js","../node_modules/next/dist/shared/lib/router/utils/prepare-destination.js","../node_modules/next/dist/shared/lib/i18n/normalize-locale-path.js","../node_modules/next/dist/shared/lib/router/utils/route-matcher.js","../node_modules/next/dist/shared/lib/router/utils/middleware-route-matcher.js","../node_modules/next/dist/shared/lib/router/utils/querystring.js","../node_modules/next/dist/shared/lib/router/utils/remove-trailing-slash.js","../node_modules/next/dist/shared/lib/router/utils/get-next-pathname-info.js","../node_modules/next/dist/build/webpack/loaders/next-serverless-loader/utils.js","../node_modules/next/dist/shared/lib/router/utils/route-regex.js","../node_modules/next/dist/shared/lib/router/utils/app-paths.js","../node_modules/next/dist/server/send-payload/index.js","../node_modules/next/dist/server/api-utils/index.js","../node_modules/next/dist/server/response-cache/index.js","../node_modules/next/dist/server/web/sandbox/index.js","../node_modules/next/dist/server/lib/incremental-cache/index.js","../node_modules/next/dist/shared/lib/router/utils/index.js","../node_modules/next/dist/lib/redirect-status.js","../node_modules/next/dist/lib/constants.js","../node_modules/next/dist/lib/is-serializable-props.js","../node_modules/next/dist/shared/lib/amp-mode.js","../node_modules/next/dist/shared/lib/amp-context.js","../node_modules/next/dist/shared/lib/head.js","../node_modules/next/dist/shared/lib/head-manager-context.js","../node_modules/next/dist/shared/lib/loadable.js","../node_modules/next/dist/shared/lib/loadable-context.js","../node_modules/next/dist/shared/lib/router-context.js","../node_modules/next/dist/shared/lib/router/utils/is-dynamic.js","../node_modules/next/dist/shared/lib/html-context.js","../node_modules/next/dist/server/render-result.js","../node_modules/next/dist/server/node-web-streams-helper.js","../node_modules/next/dist/shared/lib/image-config-context.js","../node_modules/next/dist/server/internal-utils.js","../node_modules/next/dist/server/post-process.js","../node_modules/next/dist/server/htmlescape.js","../node_modules/next/dist/shared/lib/flush-effects.js","../node_modules/next/dist/lib/interop-default.js","../node_modules/next/dist/server/lib/mock-request.js","../node_modules/next/dist/shared/lib/match-remote-pattern.js","../node_modules/next/dist/shared/lib/image-blur-svg.js","../node_modules/next/dist/shared/lib/is-plain-object.js","../node_modules/next/dist/server/lib/squoosh/main.js","../node_modules/next/dist/server/base-http/index.js","../node_modules/next/dist/server/crypto-utils.js","../node_modules/next/dist/server/lib/etag.js","../node_modules/next/dist/client/components/match-segments.js","../node_modules/next/dist/client/components/hooks-server-context.js","../node_modules/next/dist/client/components/hooks-server.js","../node_modules/next/dist/lib/chalk.js","../node_modules/next/dist/shared/lib/runtime-config.js","../node_modules/next/dist/server/router.js","../node_modules/next/dist/server/send-payload/revalidate-headers.js","../node_modules/next/dist/shared/lib/router/utils/is-bot.js","../node_modules/next/dist/shared/lib/router/utils/escape-path-delimiters.js","../node_modules/next/dist/shared/lib/router/utils/remove-path-prefix.js","../node_modules/next/dist/shared/lib/i18n/get-locale-redirect.js","../node_modules/next/dist/shared/lib/get-hostname.js","../node_modules/next/dist/shared/lib/page-path/normalize-path-sep.js","../node_modules/next/dist/shared/lib/page-path/ensure-leading-slash.js","../node_modules/next/dist/shared/lib/router/utils/parse-relative-url.js","../node_modules/next/dist/shared/lib/escape-regexp.js","../node_modules/next/dist/shared/lib/router/utils/path-has-prefix.js","../node_modules/next/dist/server/accept-header.js","../node_modules/next/dist/shared/lib/i18n/detect-locale-cookie.js","../node_modules/next/dist/server/response-cache/types.js","../node_modules/next/dist/server/web/sandbox/sandbox.js","../node_modules/next/dist/server/web/sandbox/context.js","../node_modules/next/dist/server/lib/incremental-cache/file-system-cache.js","../node_modules/next/dist/lib/non-nullable.js","../node_modules/next/dist/server/optimize-amp.js","../node_modules/next/dist/server/font-utils.js","../node_modules/next/dist/shared/lib/isomorphic/path.js","../node_modules/next/dist/shared/lib/router/utils/sorted-routes.js","../node_modules/next/dist/shared/lib/side-effect.js","../node_modules/next/dist/shared/lib/image-config.js","../node_modules/next/dist/compiled/react-server-dom-webpack/writer.browser.server.js","../node_modules/next/dist/shared/lib/router/utils/format-next-pathname-info.js","../node_modules/next/dist/compiled/react-server-dom-webpack/package.json","../node_modules/next/dist/lib/web/chalk.js","../node_modules/next/dist/compiled/@edge-runtime/primitives/streams.js","../node_modules/next/dist/shared/lib/router/utils/format-url.js","../node_modules/styled-jsx/style.js","../node_modules/next/dist/compiled/@edge-runtime/primitives/package.json","../node_modules/next/dist/compiled/@next/react-dev-overlay/dist/middleware.js","../node_modules/next/dist/server/google-font-metrics.json","../node_modules/styled-jsx/package.json","../node_modules/next/dist/shared/lib/router/utils/parse-path.js","../node_modules/next/dist/compiled/react-server-dom-webpack/index.js","../node_modules/next/dist/compiled/node-fetch/package.json","../node_modules/next/dist/compiled/node-fetch/index.js","../node_modules/next/dist/compiled/get-orientation/package.json","../node_modules/next/dist/compiled/get-orientation/index.js","../node_modules/next/dist/compiled/image-size/package.json","../node_modules/next/dist/compiled/image-size/index.js","../node_modules/next/dist/compiled/is-animated/package.json","../node_modules/next/dist/compiled/is-animated/index.js","../node_modules/next/dist/compiled/content-disposition/package.json","../node_modules/next/dist/compiled/content-disposition/index.js","../node_modules/next/dist/compiled/chalk/package.json","../node_modules/next/dist/compiled/chalk/index.js","../node_modules/next/dist/compiled/compression/package.json","../node_modules/next/dist/compiled/compression/index.js","../node_modules/next/dist/compiled/http-proxy/package.json","../node_modules/next/dist/compiled/http-proxy/index.js","../node_modules/next/dist/compiled/send/package.json","../node_modules/next/dist/compiled/send/index.js","../node_modules/next/dist/compiled/strip-ansi/package.json","../node_modules/next/dist/compiled/strip-ansi/index.js","../node_modules/next/dist/compiled/@next/react-dev-overlay/package.json","../node_modules/next/dist/compiled/react-is/package.json","../node_modules/next/dist/compiled/react-is/index.js","../node_modules/@next/env/package.json","../node_modules/@next/env/dist/index.js","../node_modules/next/dist/lib/pick.js","../node_modules/next/dist/server/web/sandbox/fetch-inline-assets.js","../node_modules/styled-jsx/index.js","../node_modules/next/dist/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-writer.browser.production.min.server.js","../node_modules/next/dist/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-writer.browser.development.server.js","../node_modules/next/dist/compiled/@hapi/accept/package.json","../node_modules/next/dist/compiled/@hapi/accept/index.js","../node_modules/next/dist/compiled/bytes/package.json","../node_modules/next/dist/compiled/bytes/index.js","../node_modules/next/dist/compiled/jsonwebtoken/package.json","../node_modules/next/dist/compiled/jsonwebtoken/index.js","../node_modules/next/dist/compiled/content-type/package.json","../node_modules/next/dist/compiled/content-type/index.js","../node_modules/next/dist/compiled/raw-body/package.json","../node_modules/next/dist/compiled/raw-body/index.js","../node_modules/next/dist/compiled/cookie/package.json","../node_modules/next/dist/compiled/cookie/index.js","../node_modules/@swc/helpers/lib/_async_to_generator.js","../node_modules/@swc/helpers/lib/_extends.js","../node_modules/@swc/helpers/lib/_interop_require_default.js","../node_modules/@swc/helpers/lib/_interop_require_wildcard.js","../node_modules/next/dist/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack.production.min.js","../node_modules/next/dist/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack.development.js","../node_modules/next/dist/shared/lib/router/utils/add-path-prefix.js","../node_modules/next/dist/shared/lib/router/utils/add-path-suffix.js","../node_modules/next/dist/shared/lib/router/utils/add-locale.js","../node_modules/@swc/helpers/package.json","../node_modules/next/dist/compiled/path-to-regexp/index.js","../node_modules/next/dist/compiled/fresh/package.json","../node_modules/next/dist/compiled/fresh/index.js","../node_modules/next/dist/compiled/react-is/cjs/react-is.production.min.js","../node_modules/next/dist/compiled/react-is/cjs/react-is.development.js","../node_modules/next/dist/compiled/node-html-parser/package.json","../node_modules/next/dist/compiled/node-html-parser/index.js","../node_modules/next/dist/compiled/micromatch/package.json","../node_modules/next/dist/compiled/micromatch/index.js","../node_modules/styled-jsx/dist/index/index.js","../node_modules/next/dist/compiled/jest-worker/package.json","../node_modules/next/dist/compiled/jest-worker/index.js","../node_modules/next/dist/compiled/edge-runtime/package.json","../node_modules/next/dist/compiled/edge-runtime/index.js","../node_modules/next/dist/compiled/lru-cache/package.json","../node_modules/next/dist/compiled/lru-cache/index.js","../node_modules/next/dist/compiled/path-browserify/package.json","../node_modules/next/dist/compiled/path-browserify/index.js","../node_modules/next/dist/compiled/debug/package.json","../node_modules/next/dist/compiled/debug/index.js","../node_modules/next/dist/compiled/semver/package.json","../node_modules/next/dist/compiled/semver/index.js","../node_modules/next/dist/compiled/@edge-runtime/primitives/encoding.js","../node_modules/next/dist/compiled/@edge-runtime/primitives/console.js","../node_modules/next/dist/compiled/@edge-runtime/primitives/abort-controller.js","../node_modules/next/dist/compiled/@edge-runtime/primitives/url.js","../node_modules/next/dist/compiled/@edge-runtime/primitives/blob.js","../node_modules/next/dist/compiled/@edge-runtime/primitives/cache.js","../node_modules/next/dist/compiled/@edge-runtime/primitives/fetch.js","../node_modules/next/dist/compiled/@edge-runtime/primitives/crypto.js","../node_modules/next/dist/compiled/@edge-runtime/primitives/events.js","../node_modules/next/dist/compiled/@edge-runtime/primitives/structured-clone.js"]}