@faststore/core 3.0.15 → 3.0.17

package/.turbo/turbo-build.log

@@ -1,6 +1,6 @@
 $ yarn partytown & yarn generate && next build
-$ partytown copylib ./public/~partytown
 $ faststore generate-graphql -c
+$ partytown copylib ./public/~partytown
 Partytown lib copied to: /home/runner/work/faststore/faststore/packages/core/public/~partytown
 success - GraphQL schema, types, and optimizations successfully generated 🎉
 ⚠ No build cache found. Please configure build caching for faster rebuilds. Read more: https://nextjs.org/docs/messages/no-cache

package/.turbo/turbo-test.log

@@ -1,23 +1,23 @@
 $ jest
-PASS test/server/index.test.ts (21.226 s)
+PASS test/server/index.test.ts (21.812 s)
   FastStore GraphQL Layer
     @faststore/api
-      ✓ should return a valid GraphQL schema (9 ms)
-      ✓ should return a valid GraphQL schema contain all expected types (4 ms)
+      ✓ should return a valid GraphQL schema (8 ms)
+      ✓ should return a valid GraphQL schema contain all expected types (10 ms)
       ✓ should return a valid GraphQL schema contain all expected queries (1 ms)
       ✓ should return a valid GraphQL schema contain all expected mutations (1 ms)
     VTEX API Extension
-      ✓ getTypeDefsFromFolder function should return an Array (9 ms)
+      ✓ getTypeDefsFromFolder function should return an Array (8 ms)
     Third Party API Extension
-      ✓ getTypeDefsFromFolder function should return an Array (5 ms)
+      ✓ getTypeDefsFromFolder function should return an Array (7 ms)
     Final Schema after merging
-      ✓ should return a valid merged GraphQL schema (24 ms)
+      ✓ should return a valid merged GraphQL schema (27 ms)
     Envelop
-      ✓ should exist with its plugins (35 ms)
-      ✓ should handle options and execute (389 ms)
+      ✓ should exist with its plugins (32 ms)
+      ✓ should handle options and execute (584 ms)
 
 Test Suites: 1 passed, 1 total
 Tests:       9 passed, 9 total
 Snapshots:   0 total
-Time:        21.294 s
+Time:        21.888 s
 Ran all test suites.

package/cms/faststore/content-types.json

@@ -129,11 +129,24 @@
     "id": "plp",
     "name": "Product List Page",
     "scopes": ["plp"],
-    "isSingleton": true,
     "configurationSchemaSets": [
       {
         "name": "Settings",
         "configurations": [
+          {
+            "name": "template",
+            "schema": {
+              "title": "Template",
+              "type": "object",
+              "properties": {
+                "value": {
+                  "title": "PLP template value (e.g. Slug: /department/category/subcategory)",
+                  "type": "string",
+                  "description": "PLP slug template (e.g. /office or /office/chairs) representing the /department/category/subcategory template). If this field is left empty, the generic PLP template will be applied."
+                }
+              }
+            }
+          },
           {
             "name": "productGallery",
             "schema": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faststore/core",
-  "version": "3.0.15",
+  "version": "3.0.17",
   "license": "MIT",
   "repository": "vtex/faststore",
   "browserslist": "supports es6-module and not dead",
@@ -128,5 +128,5 @@
     "node": "18.19.0",
     "yarn": "1.19.1"
   },
-  "gitHead": "0285725a6a9ace13dcbbb77b734ee1e48a93f7fb"
+  "gitHead": "ae2fd5e80daef2a86a865cbd615e3fa0d475d959"
 }

package/src/components/cms/GlobalSections.tsx

@@ -1,17 +1,17 @@
 import { Locator, Section } from '@vtex/client-cms'
+import storeConfig from 'faststore.config'
 import type { ComponentType } from 'react'
 import { PropsWithChildren, lazy } from 'react'
-import storeConfig from 'faststore.config'
 import CUSTOM_COMPONENTS from 'src/customizations/src/components'
-import { PageContentType, getPage, getPageByVersionId } from 'src/server/cms'
+import { PageContentType, getPage } from 'src/server/cms'
 
 import Toast from 'src/components/common/Toast'
 import RenderSections from './RenderSections'
 
 import { OverriddenDefaultAlert as Alert } from 'src/components/sections/Alert/OverriddenDefaultAlert'
+import Footer from 'src/components/sections/Footer'
 import { OverriddenDefaultNavbar as Navbar } from 'src/components/sections/Navbar/OverriddenDefaultNavbar'
 import { OverriddenDefaultRegionBar as RegionBar } from 'src/components/sections/RegionBar/OverriddenDefaultRegionBar'
-import Footer from 'src/components/sections/Footer'
 
 const RegionModal = lazy(() => import('src/components/region/RegionModal'))
 const CartSidebar = lazy(() => import('src/components/cart/CartSidebar'))
@@ -56,7 +56,7 @@ export const getGlobalSectionsData = async (
     const page = cmsData[GLOBAL_SECTIONS_CONTENT_TYPE][0]
 
     if (page) {
-      const pageData = await getPageByVersionId<PageContentType>({
+      const pageData = await getPage<PageContentType>({
         contentType: GLOBAL_SECTIONS_CONTENT_TYPE,
         documentId: page.documentId,
         versionId: page.versionId,

package/src/components/templates/LandingPage/LandingPage.tsx

@@ -1,18 +1,18 @@
+import type { Locator } from '@vtex/client-cms'
 import { NextSeo, SiteLinksSearchBoxJsonLd } from 'next-seo'
 import type { ComponentType } from 'react'
-import type { Locator } from '@vtex/client-cms'
 
-import MissingContentError from 'src/sdk/error/MissingContentError/MissingContentError'
 import RenderSections from 'src/components/cms/RenderSections'
 import { OverriddenDefaultBannerText as BannerText } from 'src/components/sections/BannerText/OverriddenDefaultBannerText'
 import { OverriddenDefaultHero as Hero } from 'src/components/sections/Hero/OverriddenDefaultHero'
+import Incentives from 'src/components/sections/Incentives'
 import { OverriddenDefaultNewsletter as Newsletter } from 'src/components/sections/Newsletter/OverriddenDefaultNewsletter'
 import { OverriddenDefaultProductShelf as ProductShelf } from 'src/components/sections/ProductShelf/OverriddenDefaultProductShelf'
-import Incentives from 'src/components/sections/Incentives'
 import ProductTiles from 'src/components/sections/ProductTiles'
-import { getPage, getPageByVersionId } from 'src/server/cms'
-import type { PageContentType } from 'src/server/cms'
 import CUSTOM_COMPONENTS from 'src/customizations/src/components'
+import MissingContentError from 'src/sdk/error/MissingContentError/MissingContentError'
+import type { PageContentType } from 'src/server/cms'
+import { getPage } from 'src/server/cms'
 
 import storeConfig from 'faststore.config'
 
@@ -92,7 +92,7 @@ export const getLandingPageBySlug = async (
       })
 
       if (pageBySlug) {
-        const landingPageData = await getPageByVersionId<PageContentType>({
+        const landingPageData = await getPage<PageContentType>({
           contentType: 'landingPage',
           documentId: pageBySlug.documentId,
           versionId: pageBySlug.versionId,

package/src/components/templates/ProductListingPage/ProductListing.tsx

@@ -1,24 +1,24 @@
+import { useSearch } from '@faststore/sdk'
 import type { ServerCollectionPageQueryQuery } from '@generated/graphql'
+import deepmerge from 'deepmerge'
 import { OverriddenDefaultBreadcrumb as Breadcrumb } from 'src/components/sections/Breadcrumb/OverriddenDefaultBreadcrumb'
 import { OverriddenDefaultHero as Hero } from 'src/components/sections/Hero/OverriddenDefaultHero'
 import { OverriddenDefaultProductGallery as ProductGallery } from 'src/components/sections/ProductGallery/OverriddenDefaultProductGallery'
 import { OverriddenDefaultProductShelf as ProductShelf } from 'src/components/sections/ProductShelf/OverriddenDefaultProductShelf'
 import ScrollToTopButton from 'src/components/sections/ScrollToTopButton'
 import { ITEMS_PER_PAGE } from 'src/constants'
-import deepmerge from 'deepmerge'
-import { useSearch } from '@faststore/sdk'
 
 import type { ComponentType } from 'react'
 import RenderSections from 'src/components/cms/RenderSections'
 import CUSTOM_COMPONENTS from 'src/customizations/src/components'
-import { PLPContentType } from 'src/server/cms'
+import { PLPContentType } from 'src/server/cms/plp'
 
+import PageProvider, { PLPContext } from 'src/sdk/overrides/PageProvider'
 import {
   useCreateUseGalleryPage,
   UseGalleryPageContext,
 } from 'src/sdk/product/usePageProductsQuery'
 import { useProductGalleryQuery } from 'src/sdk/product/useProductGalleryQuery'
-import PageProvider, { PLPContext } from 'src/sdk/overrides/PageProvider'
 
 export type ProductListingPageProps = {
   data: ServerCollectionPageQueryQuery

package/src/components/templates/ProductListingPage/ProductListingPage.tsx

@@ -12,7 +12,7 @@ import type { ServerCollectionPageQueryQuery } from '@generated/graphql'
 import { ITEMS_PER_PAGE } from 'src/constants'
 import { useApplySearchState } from 'src/sdk/search/state'
 
-import { PLPContentType } from 'src/server/cms'
+import { PLPContentType } from 'src/server/cms/plp'
 
 import storeConfig from '../../../../faststore.config'
 import ProductListing from './ProductListing'

package/src/pages/[...slug].tsx

@@ -1,6 +1,5 @@
 import { isNotFoundError } from '@faststore/api'
 import type { GetStaticPaths, GetStaticProps } from 'next'
-import storeConfig from 'faststore.config'
 
 import { gql } from '@generated'
 import type {
@@ -15,19 +14,15 @@ import GlobalSections, {
   getGlobalSectionsData,
   GlobalSectionsData,
 } from 'src/components/cms/GlobalSections'
-import {
-  getPage,
-  getPageByVersionId,
-  PageContentType,
-  PLPContentType,
-} from 'src/server/cms'
-import ProductListingPage, {
-  ProductListingPageProps,
-} from 'src/components/templates/ProductListingPage'
 import LandingPage, {
   getLandingPageBySlug,
   LandingPageProps,
 } from 'src/components/templates/LandingPage'
+import ProductListingPage, {
+  ProductListingPageProps,
+} from 'src/components/templates/ProductListingPage'
+import { PageContentType } from 'src/server/cms'
+import { getPLP, PLPContentType } from 'src/server/cms/plp'
 
 type BaseProps = {
   globalSections: GlobalSectionsData
@@ -106,7 +101,7 @@ export const getStaticProps: GetStaticProps<
     }
   }
 
-  const [{ data, errors = [] }] = await Promise.all([
+  const [{ data, errors = [] }, cmsPage] = await Promise.all([
     execute<
       ServerCollectionPageQueryQueryVariables,
       ServerCollectionPageQueryQuery
@@ -114,28 +109,9 @@ export const getStaticProps: GetStaticProps<
       variables: { slug },
       operation: query,
     }),
+    getPLP(slug, previewData),
   ])
 
-  let pageData
-
-  if (storeConfig.cms.data) {
-    const cmsData = JSON.parse(storeConfig.cms.data)
-    const page = cmsData['plp'][0]
-
-    if (page) {
-      pageData = await getPageByVersionId<PLPContentType>({
-        contentType: 'plp',
-        documentId: page.documentId,
-        versionId: page.versionId,
-      })
-    }
-  } else {
-    pageData = await getPage<PLPContentType>({
-      ...(previewData?.contentType === 'plp' ? previewData : null),
-      contentType: 'plp',
-    })
-  }
-
   const notFound = errors.find(isNotFoundError)
 
   if (notFound) {
@@ -152,7 +128,7 @@ export const getStaticProps: GetStaticProps<
   return {
     props: {
       data,
-      page: pageData,
+      page: cmsPage,
       globalSections: await globalSectionsPromise,
       type: 'plp',
       key: slug,

package/src/pages/[slug]/p.tsx

@@ -1,9 +1,9 @@
 import { isNotFoundError } from '@faststore/api'
 import type { Locator } from '@vtex/client-cms'
+import deepmerge from 'deepmerge'
 import type { GetStaticPaths, GetStaticProps } from 'next'
 import { BreadcrumbJsonLd, NextSeo, ProductJsonLd } from 'next-seo'
 import type { ComponentType } from 'react'
-import deepmerge from 'deepmerge'
 
 import { gql } from '@generated'
 import {
@@ -20,16 +20,15 @@ import CUSTOM_COMPONENTS from 'src/customizations/src/components'
 import { useSession } from 'src/sdk/session'
 import { mark } from 'src/sdk/tests/mark'
 import { execute } from 'src/server'
-import type { PDPContentType } from 'src/server/cms'
-import { getPage, getPageByVersionId } from 'src/server/cms'
 
+import storeConfig from 'faststore.config'
 import GlobalSections, {
   GlobalSectionsData,
   getGlobalSectionsData,
 } from 'src/components/cms/GlobalSections'
-import storeConfig from 'faststore.config'
-import { useProductQuery } from 'src/sdk/product/useProductQuery'
 import PageProvider, { PDPContext } from 'src/sdk/overrides/PageProvider'
+import { useProductQuery } from 'src/sdk/product/useProductQuery'
+import { PDPContentType, getPDP } from 'src/server/cms/pdp'
 
 /**
  * Sections: Components imported from each store's custom components and '../components/sections' only.
@@ -208,26 +207,6 @@ export const getStaticProps: GetStaticProps<
     getGlobalSectionsData(previewData),
   ])
 
-  let cmsPage
-
-  if (storeConfig.cms.data) {
-    const cmsData = JSON.parse(storeConfig.cms.data)
-    const page = cmsData['pdp'][0]
-
-    if (page) {
-      cmsPage = getPageByVersionId<PDPContentType>({
-        contentType: 'pdp',
-        documentId: page.documentId,
-        versionId: page.versionId,
-      })
-    }
-  } else {
-    cmsPage = getPage<PDPContentType>({
-      ...(previewData?.contentType === 'pdp' ? previewData : null),
-      contentType: 'pdp',
-    })
-  }
-
   const { data, errors = [] } = searchResult
 
   const notFound = errors.find(isNotFoundError)
@@ -242,6 +221,8 @@ export const getStaticProps: GetStaticProps<
     throw errors[0]
   }
 
+  const cmsPage: PDPContentType = await getPDP(slug, data.product, previewData)
+
   const { seo } = data.product
   const title = seo.title || storeConfig.seo.title
   const description = seo.description || storeConfig.seo.description

package/src/pages/index.tsx

@@ -6,14 +6,14 @@ import type { ComponentType } from 'react'
 import RenderSections from 'src/components/cms/RenderSections'
 import { OverriddenDefaultBannerText as BannerText } from 'src/components/sections/BannerText/OverriddenDefaultBannerText'
 import { OverriddenDefaultHero as Hero } from 'src/components/sections/Hero/OverriddenDefaultHero'
+import Incentives from 'src/components/sections/Incentives'
 import { OverriddenDefaultNewsletter as Newsletter } from 'src/components/sections/Newsletter/OverriddenDefaultNewsletter'
 import { OverriddenDefaultProductShelf as ProductShelf } from 'src/components/sections/ProductShelf/OverriddenDefaultProductShelf'
-import Incentives from 'src/components/sections/Incentives'
 import ProductTiles from 'src/components/sections/ProductTiles'
 import CUSTOM_COMPONENTS from 'src/customizations/src/components'
 import { mark } from 'src/sdk/tests/mark'
 import type { PageContentType } from 'src/server/cms'
-import { getPage, getPageByVersionId } from 'src/server/cms'
+import { getPage } from 'src/server/cms'
 
 import GlobalSections, {
   GlobalSectionsData,
@@ -92,7 +92,7 @@ export const getStaticProps: GetStaticProps<
     const page = cmsData['home'][0]
 
     if (page) {
-      const pageData = await getPageByVersionId<PageContentType>({
+      const pageData = await getPage<PageContentType>({
         contentType: 'home',
         documentId: page.documentId,
         versionId: page.versionId,

package/src/pages/s.tsx

@@ -14,14 +14,14 @@ import { useApplySearchState } from 'src/sdk/search/state'
 import { mark } from 'src/sdk/tests/mark'
 
 import { Locator } from '@vtex/client-cms'
+import storeConfig from 'faststore.config'
 import { GetStaticProps } from 'next'
 import GlobalSections, {
   getGlobalSectionsData,
   GlobalSectionsData,
 } from 'src/components/cms/GlobalSections'
-import { getPage, getPageByVersionId, SearchContentType } from 'src/server/cms'
-import storeConfig from 'faststore.config'
 import SearchPage from 'src/components/templates/SearchPage/SearchPage'
+import { getPage, SearchContentType } from 'src/server/cms'
 
 type Props = {
   page: SearchContentType
@@ -125,7 +125,7 @@ export const getStaticProps: GetStaticProps<
     const page = cmsData['search'][0]
 
     if (page) {
-      const pageData = await getPageByVersionId<SearchContentType>({
+      const pageData = await getPage<SearchContentType>({
         contentType: 'search',
         documentId: page.documentId,
         versionId: page.versionId,

package/src/server/{cms.ts → cms/index.ts}

@@ -1,14 +1,9 @@
 import type { ContentData, ContentTypeOptions, Locator } from '@vtex/client-cms'
 import ClientCMS from '@vtex/client-cms'
 
-import config from '../../faststore.config'
-import MultipleContentError from 'src/sdk/error/MultipleContentError'
 import MissingContentError from 'src/sdk/error/MissingContentError'
-
-export const clientCMS = new ClientCMS({
-  workspace: config.api.workspace,
-  tenant: config.api.storeId,
-})
+import MultipleContentError from 'src/sdk/error/MultipleContentError'
+import config from '../../../faststore.config'
 
 export type Options =
   | Locator
@@ -17,54 +12,6 @@ export type Options =
       filters?: Partial<ContentTypeOptions>
     }
 
-const isLocator = (x: any): x is Locator =>
-  typeof x.contentType === 'string' &&
-  (typeof x.releaseId === 'string' || typeof x.documentId === 'string')
-
-export const getPage = async <T extends ContentData>(options: Options) => {
-  const result = await (isLocator(options)
-    ? clientCMS.getCMSPage(options).then((page) => ({ data: [page] }))
-    : clientCMS.getCMSPagesByContentType(options.contentType, options.filters))
-
-  const pages = result.data
-
-  if (!pages[0]) {
-    throw new MissingContentError(options)
-  }
-
-  if (pages.length !== 1) {
-    throw new MultipleContentError(options)
-  }
-
-  return pages[0] as T
-}
-
-export type VersionOptions = {
-  contentType: string
-  documentId: string
-  versionId: string
-}
-
-export const getPageByVersionId = async <T extends ContentData>(
-  options: VersionOptions
-) => {
-  const result = await clientCMS
-    .getCMSPage(options)
-    .then((page) => ({ data: [page] }))
-
-  const pages = result.data
-
-  if (!pages[0]) {
-    throw new MissingContentError(options)
-  }
-
-  if (pages.length !== 1) {
-    throw new MultipleContentError(options)
-  }
-
-  return pages[0] as T
-}
-
 type ProductGallerySettings = {
   settings: {
     productGallery: {
@@ -74,8 +21,6 @@ type ProductGallerySettings = {
   }
 }
 
-export type PDPContentType = ContentData
-export type PLPContentType = ContentData & ProductGallerySettings
 export type SearchContentType = ContentData & ProductGallerySettings
 
 export type PageContentType = ContentData & {
@@ -88,3 +33,36 @@ export type PageContentType = ContentData & {
     }
   }
 }
+
+const isLocator = (x: any): x is Locator =>
+  typeof x.contentType === 'string' &&
+  (typeof x.releaseId === 'string' ||
+    typeof x.documentId === 'string' ||
+    typeof x.versionId === 'string')
+
+export const clientCMS = new ClientCMS({
+  workspace: config.api.workspace,
+  tenant: config.api.storeId,
+})
+
+export const getCMSPage = async (options: Options) => {
+  return await (isLocator(options)
+    ? clientCMS.getCMSPage(options).then((page) => ({ data: [page] }))
+    : clientCMS.getCMSPagesByContentType(options.contentType, options.filters))
+}
+
+export const getPage = async <T extends ContentData>(options: Options) => {
+  const result = await getCMSPage(options)
+
+  const pages = result.data
+
+  if (!pages[0]) {
+    throw new MissingContentError(options)
+  }
+
+  if (pages.length !== 1) {
+    throw new MultipleContentError(options)
+  }
+
+  return pages[0] as T
+}

package/src/server/cms/pdp.ts

@@ -0,0 +1,82 @@
+import { ServerProductQueryQuery } from '@generated/graphql'
+import type { ContentData, Locator } from '@vtex/client-cms'
+import MissingContentError from 'src/sdk/error/MissingContentError'
+import { findBestPDPTemplate } from 'src/utils/utilities'
+import { Options, getCMSPage, getPage } from '.'
+import config from '../../../faststore.config'
+
+type PDPSettings = {
+  settings: {
+    template?: {
+      value?: string
+    }
+  }
+}
+
+type PDPfromCmsEnvData = {
+  documentId: string
+  versionId: string
+} & PDPSettings
+
+export type PDPContentType = ContentData & PDPSettings
+
+export const getPDP = async (
+  slug: string,
+  product: ServerProductQueryQuery['product'],
+  previewData: Locator
+) => {
+  if (config.cms.data) {
+    const cmsData = JSON.parse(config.cms.data)
+    const allPDPsFromCmsEnvData: PDPfromCmsEnvData[] = cmsData['pdp']
+
+    return await getPDPFromCmsEnvData(
+      `/${slug}/p`,
+      product,
+      allPDPsFromCmsEnvData,
+      {
+        ...(previewData?.contentType === 'pdp' ? previewData : null),
+        contentType: 'pdp',
+      }
+    )
+  }
+
+  return (await getPDPFromCms(`/${slug}/p`, product, {
+    ...(previewData?.contentType === 'pdp' ? previewData : null),
+    contentType: 'pdp',
+  })) as PDPContentType
+}
+
+const getPDPFromCmsEnvData = async (
+  slug: string,
+  product: ServerProductQueryQuery['product'],
+  allPDPsFromCMSData: PDPfromCmsEnvData[],
+  options: Options
+): Promise<PDPContentType> => {
+  const pages: PDPfromCmsEnvData[] = allPDPsFromCMSData ?? []
+
+  if (!pages[0]) {
+    throw new MissingContentError(options)
+  }
+
+  const template = findBestPDPTemplate(pages, slug, product)
+
+  return getPage<PDPContentType>({
+    contentType: 'pdp',
+    documentId: template.documentId as string,
+    versionId: template.versionId,
+  })
+}
+
+const getPDPFromCms = async (
+  slug: string,
+  product: ServerProductQueryQuery['product'],
+  options: Options
+): Promise<Partial<PDPContentType>> => {
+  const pages = (await getCMSPage(options)).data
+
+  if (!pages[0]) {
+    throw new MissingContentError(options)
+  }
+
+  return findBestPDPTemplate(pages, slug, product)
+}

package/src/server/cms/plp.ts

@@ -0,0 +1,74 @@
+import { ContentData, Locator } from '@vtex/client-cms'
+import MissingContentError from 'src/sdk/error/MissingContentError'
+import { findBestPLPTemplate } from 'src/utils/utilities'
+import config from '../../../faststore.config'
+import { Options, getCMSPage, getPage } from '../cms'
+
+type PLPSettings = {
+  settings: {
+    template?: {
+      value?: string
+    }
+    productGallery: {
+      itemsPerPage: number
+      sortBySelection: string
+    }
+  }
+}
+
+type PLPfromCmsEnvData = {
+  documentId: string
+  versionId: string
+} & PLPSettings
+
+export type PLPContentType = ContentData & PLPSettings
+
+export const getPLP = async (slug: string, previewData: Locator) => {
+  if (config.cms.data) {
+    const cmsData = JSON.parse(config.cms.data)
+    const allPLPsFromCmsEnvData: PLPfromCmsEnvData[] = cmsData['plp']
+
+    return await getPLPFromCmsEnvData(`/${slug}/p`, allPLPsFromCmsEnvData, {
+      ...(previewData?.contentType === 'plp' ? previewData : null),
+      contentType: 'plp',
+    })
+  }
+
+  return (await getPLPFromCms(`/${slug}/p`, {
+    ...(previewData?.contentType === 'plp' ? previewData : null),
+    contentType: 'plp',
+  })) as PLPContentType
+}
+
+const getPLPFromCmsEnvData = async (
+  slug: string,
+  allPLPsFromCMSData: PLPfromCmsEnvData[],
+  options: Options
+): Promise<PLPContentType> => {
+  const pages: PLPfromCmsEnvData[] = allPLPsFromCMSData ?? []
+
+  if (!pages[0]) {
+    throw new MissingContentError(options)
+  }
+
+  const template = findBestPLPTemplate(pages, slug)
+
+  return getPage<PLPContentType>({
+    contentType: 'plp',
+    documentId: template.documentId as string,
+    versionId: template.versionId,
+  })
+}
+
+export const getPLPFromCms = async (
+  slug: string,
+  options: Options
+): Promise<Partial<PLPContentType>> => {
+  const pages = (await getCMSPage(options)).data
+
+  if (!pages[0]) {
+    throw new MissingContentError(options)
+  }
+
+  return findBestPLPTemplate(pages, slug)
+}