@financial-times/cp-content-pipeline-schema 2.5.2 → 2.5.4

package/src/resolvers/picture.ts

@@ -1,4 +1,19 @@
-import { PictureResolvers } from '../generated'
+import {
+  PictureResolvers,
+  PictureFullBleedResolvers,
+  PictureInlineResolvers,
+  PictureStandardResolvers,
+} from '../generated'
+
+const pictureResolvers: PictureResolvers = {
+  alt: (parent) => parent.standard().alt(),
+  caption: (parent) => parent.standard().caption(),
+  credit: (parent) => parent.standard().credit(),
+  fallbackImage: (parent) => parent.standard(),
+  images: (parent) => parent.images(),
+  imageType: (parent) => parent.standard().type(),
+  layoutWidth: (parent) => parent.layoutWidth(),
+}
 
 const resolvers = {
   Picture: {
@@ -11,28 +26,25 @@ const resolvers = {
       } as const
       return layoutWidthToType[layoutWidth]
     },
-    layoutWidth(parent) {
-      return parent.layoutWidth()
-    },
-    images(parent) {
-      return parent.images()
-    },
-    fallbackImage(parent) {
-      return parent.standard()
-    },
-    caption(parent) {
-      return parent.standard().caption()
-    },
-    credit(parent) {
-      return parent.standard().credit()
-    },
-    alt(parent) {
-      return parent.standard().alt()
-    },
-    imageType(parent) {
-      return parent.standard().type()
-    },
+    ...pictureResolvers,
+  },
+
+  PictureStandard: {
+    ...pictureResolvers,
+  },
+
+  PictureInline: {
+    ...pictureResolvers,
+  },
+
+  PictureFullBleed: {
+    ...pictureResolvers,
   },
-} satisfies { Picture: PictureResolvers }
+} satisfies {
+  Picture: PictureResolvers
+  PictureFullBleed: PictureFullBleedResolvers
+  PictureInline: PictureInlineResolvers
+  PictureStandard: PictureStandardResolvers
+}
 
 export default resolvers

package/src/resolvers/richText.ts

@@ -1,15 +1,20 @@
-import { RichTextResolvers } from '../generated'
+import { RichTextResolvers, StructuredContentResolvers } from '../generated'
 
 const resolvers = {
   RichText: {
-    raw(parent) {
-      return parent.raw()
-    },
+    raw: (parent) => parent.raw(),
+    structured: (parent, _, context) => parent.structured(context),
+    source: (parent) => parent.source,
+  },
 
-    structured(parent, args, context) {
-      return parent.structured(context)
-    },
+  StructuredContent: {
+    tree: (parent) => parent.tree,
+    references: (parent) => parent.references,
+    text: (parent) => parent.text ?? null,
   },
-} satisfies { RichText: RichTextResolvers }
+} satisfies {
+  RichText: RichTextResolvers
+  StructuredContent: StructuredContentResolvers
+}
 
 export default resolvers

package/src/resolvers/scalars.ts

@@ -1,3 +1,4 @@
+import { GraphQLScalarType } from 'graphql'
 import { LiteralUnionScalar } from './literal-union'
 
 export const ImageFormat = new LiteralUnionScalar<
@@ -155,6 +156,7 @@ const resolvers = {
   ImageType,
   RichTextSource,
   ContentType,
+  JSON: new GraphQLScalarType({ name: 'JSON' }),
 }
 
 export default resolvers

package/src/resolvers/teaser.ts

@@ -2,8 +2,7 @@ import { TeaserResolvers } from '../generated'
 
 const resolvers = {
   Teaser: {
-    url: (parent, args) =>
-      args.relative ? parent.relativeUrl() : parent.url(),
+    url: (parent, args) => parent.url(args),
     type: (parent) =>
       parent
         .type()
@@ -28,6 +27,11 @@ const resolvers = {
       }
     },
     standfirst: (parent) => parent.standfirst(),
+    firstPublishedDate: (parent) => parent.firstPublishedDate(),
+    id: (parent) => parent.id(),
+    publishedDate: (parent) => parent.publishedDate(),
+    theme: (parent) => parent.design().theme,
+    title: (parent) => parent.title(),
   },
 } satisfies { Teaser: TeaserResolvers }
 

package/src/resolvers/topper.ts

@@ -6,17 +6,30 @@ import {
   TopperWithPackageResolvers,
   TopperWithThemeResolvers,
   PodcastTopperResolvers,
+  TopperWithHeadshotResolvers,
+  BasicTopperResolvers,
+  SplitTextTopperResolvers,
+  FullBleedTopperResolvers,
+  DeepLandscapeTopperResolvers,
+  DeepPortraitTopperResolvers,
+  BrandedTopperResolvers,
 } from '../generated'
 
+const topperResolvers: TopperResolvers = {
+  backgroundBox: (topper) => topper.backgroundBox(),
+  backgroundColour: (topper) => topper.backgroundColour(),
+  displayConcept: (topper) => topper.displayConcept(),
+  followButtonVariant: (topper) => topper.followButtonVariant(),
+  genreConcept: (topper) => topper.genreConcept(),
+  headline: (topper) => topper.headline(),
+  intro: (topper) => topper.intro(),
+  textShadow: (topper) => topper.textShadow(),
+}
+
 const resolvers = {
   Topper: {
     __resolveType: (topper) => topper.type(),
-    headline: (topper) => topper.headline(),
-    intro: (topper) => topper.intro(),
-    backgroundColour: (topper) => topper.backgroundColour(),
-    displayConcept: (topper) => topper.displayConcept(),
-    followButtonVariant: (topper) => topper.followButtonVariant(),
-    genreConcept: (topper) => topper.genreConcept(),
+    ...topperResolvers,
   },
 
   TopperWithImages: {
@@ -34,26 +47,93 @@ const resolvers = {
     genreConcept: (topper) => topper.genreConcept(),
   },
 
+  TopperWithHeadshot: {
+    headshot: (topper, args) => topper.headshot(args),
+  },
+
   PodcastTopper: {
+    ...topperResolvers,
+    brandConcept: (topper) => topper.brandConcept(),
     headshot: (topper, args) => topper.headshot(args),
+    isLargeHeadline: (topper) => topper.isLargeHeadline(),
+    layout: (topper) => topper.layout(),
+    columnist: (topper) => topper.columnist(),
   },
 
   OpinionTopper: {
+    ...topperResolvers,
     headshot: (topper, args) => topper.headshot(args),
+    isLargeHeadline: (topper) => topper.isLargeHeadline(),
+    layout: (topper) => topper.layout(),
     columnist: (topper) => topper.columnist(),
   },
 
   TopperWithPackage: {
     design: (topper) => topper.design().theme,
   },
+
+  BasicTopper: {
+    ...topperResolvers,
+  },
+
+  BrandedTopper: {
+    ...topperResolvers,
+    brandConcept: (topper) => topper.brandConcept(),
+    isLargeHeadline: (topper) => topper.isLargeHeadline(),
+    layout: (topper) => topper.layout(),
+  },
+
+  DeepLandscapeTopper: {
+    ...topperResolvers,
+    brandConcept: (topper) => topper.brandConcept(),
+    isLargeHeadline: (topper) => topper.isLargeHeadline(),
+    layout: (topper) => topper.layout(),
+    fallbackImage: (topper) => topper.fallbackImage(),
+    images: (topper) => topper.images(),
+  },
+
+  DeepPortraitTopper: {
+    ...topperResolvers,
+    brandConcept: (topper) => topper.brandConcept(),
+    isLargeHeadline: (topper) => topper.isLargeHeadline(),
+    layout: (topper) => topper.layout(),
+    fallbackImage: (topper) => topper.fallbackImage(),
+    images: (topper) => topper.images(),
+  },
+
+  FullBleedTopper: {
+    ...topperResolvers,
+    brandConcept: (topper) => topper.brandConcept(),
+    isLargeHeadline: (topper) => topper.isLargeHeadline(),
+    layout: (topper) => topper.layout(),
+    fallbackImage: (topper) => topper.fallbackImage(),
+    images: (topper) => topper.images(),
+  },
+
+  SplitTextTopper: {
+    ...topperResolvers,
+    design: (topper) => topper.design().theme,
+    brandConcept: (topper) => topper.brandConcept(),
+    isLargeHeadline: (topper) => topper.isLargeHeadline(),
+    layout: (topper) => topper.layout(),
+    fallbackImage: (topper) => topper.fallbackImage(),
+    images: (topper) => topper.images(),
+  },
 } satisfies {
   Topper: TopperResolvers
   TopperWithImages: TopperWithImagesResolvers
   TopperWithTheme: TopperWithThemeResolvers
   TopperWithBrand: TopperWithBrandResolvers
+  TopperWithHeadshot: TopperWithHeadshotResolvers
   TopperWithPackage: TopperWithPackageResolvers
   PodcastTopper: PodcastTopperResolvers
   OpinionTopper: OpinionTopperResolvers
+  BasicTopper: BasicTopperResolvers
+  BrandedTopper: BrandedTopperResolvers
+  DeepLandscapeTopper: DeepLandscapeTopperResolvers
+  DeepPortraitTopper: DeepPortraitTopperResolvers
+  FullBleedTopper: FullBleedTopperResolvers
+  SplitTextTopper: SplitTextTopperResolvers
 }
 
 export default resolvers