@financial-times/cp-content-pipeline-schema 2.5.1 → 2.5.3

package/src/resolvers/content.ts

@@ -1,5 +1,4 @@
 import { Topper } from '../model/Topper'
-import { Byline } from '../model/Byline'
 import {
   ArticleResolvers,
   PlaceholderResolvers,
@@ -8,8 +7,40 @@ import {
   ContentResolvers,
   LiveBlogPackageResolvers,
   LiveBlogPostResolvers,
+  VideoResolvers,
+  TableOfContentsResolvers,
+  AltStandfirstResolvers,
+  AltTitleResolvers,
+  DesignResolvers,
+  IndicatorsResolvers,
+  MediaResolvers,
 } from '../generated'
-import { RichText } from '../model/RichText'
+
+const contentResolvers: ContentResolvers = {
+  accessLevel: (parent) => parent.accessLevel(),
+  altStandfirst: (parent) => parent.alternativeStandfirst(),
+  altTitle: (parent) => parent.alternativeTitle(),
+  annotations: (parent) => parent.annotations(),
+  body: (parent) => parent.body(),
+  bodyXML: (parent) => parent.bodyXML(),
+  byline: (parent, args) => parent.byline(args),
+  canBeSyndicated: (parent) => parent.canBeSyndicated(),
+  commentsEnabled: (parent) => parent.commentsEnabled(),
+  design: (parent) => parent.design(),
+  editorialDesk: (parent) => parent.editorialDesk(),
+  firstPublishedDate: (parent) => parent.firstPublishedDate(),
+  id: (parent) => parent.id(),
+  instantAlertConcept: (parent) => parent.instantAlertConcept(),
+  mainImage: (parent) => parent.mainImage(),
+  originatingParty: (parent) => parent.originatingParty(),
+  publishedDate: (parent) => parent.publishedDate(),
+  standfirst: (parent) => parent.standfirst(),
+  teaser: (parent) => parent.teaser(),
+  title: (parent) => parent.title(),
+  topper: (parent, _, context) => new Topper(parent, context),
+  type: (parent) => parent.type(),
+  url: (parent, args) => parent.url(args),
+}
 
 const resolvers = {
   Content: {
@@ -26,78 +57,90 @@ const resolvers = {
 
       return type
     },
-    body(parent) {
-      return new RichText('bodyXML', parent.bodyXML(), parent)
-    },
-    topper: (parent, _, context) => new Topper(parent, context),
-    byline(parent, args, context) {
-      const vanity = Boolean(args.vanity)
-      const bylineText = parent.byline()
-
-      if (!bylineText) return null
-      const authorUrlMapping = parent.getAuthorUrlMapping()
-
-      return new Byline(
-        bylineText,
-        vanity,
-        authorUrlMapping,
-        context
-      ).buildBylineTree()
-    },
-    url: (parent, args) =>
-      args.relative
-        ? parent.relativeUrl(args?.vanity)
-        : parent.url(args?.vanity),
-    type: (parent) => parent.type(),
-    mainImage: (parent) => parent.mainImage(),
-    altTitle: (parent) => parent.alternativeTitle(),
-    altStandfirst: (parent) => parent.alternativeStandfirst(),
-    publishedDate: (parent) => parent.publishedDate(),
-    annotations: (parent) => parent.annotations(),
-    accessLevel: (parent) => parent.accessLevel(),
-    editorialDesk: (parent) => parent.editorialDesk(),
-    canBeSyndicated: (parent) => parent.canBeSyndicated(),
-    instantAlertConcept: (parent) => parent.instantAlertConcept(),
-    originatingParty: (parent) => parent.originatingParty(),
-    commentsEnabled: (parent) => parent.commentsEnabled(),
-    design: (parent) => parent.design(),
+    ...contentResolvers,
   },
 
   Article: {
+    ...contentResolvers,
     containedIn: (parent) => parent.containedIn(),
   },
 
   Placeholder: {
+    ...contentResolvers,
     containedIn: (parent) => parent.containedIn(),
   },
 
   LiveBlogPost: {
+    ...contentResolvers,
     containedIn: (parent) => parent.containedIn(),
-    isPinned: (parent) => parent.isPinned(),
     indicators(parent) {
       return {
         isOpinion: parent.isOpinion(),
       }
     },
+    isPinned: (parent) => parent.isPinned(),
   },
 
   LiveBlogPackage: {
+    ...contentResolvers,
     liveBlogPosts: (parent) => parent.liveBlogPosts(),
     pinnedPost: (parent) => parent.pinnedPost(),
     realtime: (parent) => parent.realtime(),
   },
 
   ContentPackage: {
+    ...contentResolvers,
     contains: (parent, args) => parent.contains(args),
+    tableOfContents: (parent) => parent.tableOfContents(),
     containsLength: (parent) => parent.containsLength(),
   },
 
   Audio: {
+    ...contentResolvers,
     media: (parent) =>
       // TODO:20230712:IM should probably return captions too
       parent.media()?.filter(({ mediaType }) => mediaType === 'audio/mpeg') ??
       null,
   },
+
+  Video: {
+    ...contentResolvers,
+  },
+
+  AltStandfirst: {
+    promotionalStandfirst: (parent) => parent.promotionalStandfirst ?? null,
+  },
+
+  AltTitle: {
+    promotionalTitle: (parent) => parent.promotionalTitle ?? null,
+  },
+
+  Design: {
+    layout: (parent) => parent.layout ?? null,
+    theme: (parent) => parent.theme ?? null,
+  },
+
+  Indicators: {
+    accessLevel: (parent) => parent.accessLevel ?? null,
+    isOpinion: (parent) => parent.isOpinion ?? null,
+    isColumn: (parent) => parent.isColumn ?? null,
+    isPodcast: (parent) => parent.isPodcast ?? null,
+    isEditorsChoice: (parent) => parent.isEditorsChoice ?? null,
+    isExclusive: (parent) => parent.isExclusive ?? null,
+    isScoop: (parent) => parent.isScoop ?? null,
+  },
+
+  Media: {
+    url: (parent) => parent.url ?? null,
+    duration: (parent) => parent.duration ?? null,
+    filesize: (parent) => parent.filesize ?? null,
+    mediaType: (parent) => parent.mediaType ?? null,
+  },
+
+  TableOfContents: {
+    labelType: (parent) => parent.labelType ?? null,
+    sequence: (parent) => parent.sequence ?? null,
+  },
 } satisfies {
   Article: ArticleResolvers
   Placeholder: PlaceholderResolvers
@@ -106,6 +149,13 @@ const resolvers = {
   LiveBlogPackage: LiveBlogPackageResolvers
   ContentPackage: ContentPackageResolvers
   Audio: AudioResolvers
+  Video: VideoResolvers
+  AltStandfirst: AltStandfirstResolvers
+  AltTitle: AltTitleResolvers
+  Design: DesignResolvers
+  Indicators: IndicatorsResolvers
+  TableOfContents: TableOfContentsResolvers
+  Media: MediaResolvers
 }
 
 export default resolvers

package/src/resolvers/image.ts

@@ -1,4 +1,16 @@
-import { ImageResolvers } from '../generated'
+import {
+  ImageDesktopResolvers,
+  ImageLandscapeResolvers,
+  ImageMobileResolvers,
+  ImagePortraitResolvers,
+  ImageResolvers,
+  ImageSourceResolvers,
+  ImageSquareFtEditResolvers,
+  ImageSquareResolvers,
+  ImageStandardInlineResolvers,
+  ImageStandardResolvers,
+  ImageWideResolvers,
+} from '../generated'
 import { LiteralUnionScalarValues } from './literal-union'
 import { ImageFormat } from './scalars'
 
@@ -47,9 +59,7 @@ const resolveImageTypeFromTree = (
   return 'ImageStandard'
 }
 
-const resolvers = {
-  Image: {
-    __resolveType: (image) => resolveImageTypeFromTree(image.format()),
+const imageResolvers: ImageResolvers = {
     type: (image) => image.type(),
     format: (image) => image.format(),
     caption: (image) => image.caption(),
@@ -60,7 +70,67 @@ const resolvers = {
     height: async (image) => (await image.dimensions())?.height ?? null,
     sourceSet: (image, args) => image.sourceSet(args),
     altText: (image) => image.alt(),
+}
+
+const resolvers = {
+  Image: {
+    __resolveType: (image) => resolveImageTypeFromTree(image.format()),
+    ...imageResolvers,
   },
-} satisfies { Image: ImageResolvers }
+
+  ImageDesktop: {
+    ...imageResolvers,
+  },
+
+  ImageMobile: {
+    ...imageResolvers,
+  },
+
+  ImagePortrait: {
+    ...imageResolvers,
+  },
+
+  ImageLandscape: {
+    ...imageResolvers,
+  },
+
+  ImageSquare: {
+    ...imageResolvers,
+  },
+
+  ImageSquareFTEdit: {
+    ...imageResolvers,
+  },
+
+  ImageStandard: {
+    ...imageResolvers,
+  },
+
+  ImageStandardInline: {
+    ...imageResolvers,
+  },
+
+  ImageWide: {
+    ...imageResolvers,
+  },
+
+  ImageSource: {
+    url: (image) => image.url,
+    width: (image) => image.width ?? null,
+    dpr: (image) => image.dpr ?? null,
+  },
+} satisfies {
+  Image: ImageResolvers
+  ImageDesktop: ImageDesktopResolvers
+  ImageMobile: ImageMobileResolvers
+  ImagePortrait: ImagePortraitResolvers
+  ImageLandscape: ImageLandscapeResolvers
+  ImageSquare: ImageSquareResolvers
+  ImageSquareFTEdit: ImageSquareFtEditResolvers
+  ImageStandard: ImageStandardResolvers
+  ImageStandardInline: ImageStandardInlineResolvers
+  ImageWide: ImageWideResolvers
+  ImageSource: ImageSourceResolvers
+}
 
 export default resolvers

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<
@@ -63,7 +64,7 @@ export const TopperBackgroundColour = new LiteralUnionScalar<
   ],
 })
 
-export const FollowButtonVariant = new LiteralUnionScalar<
+const FollowButtonVariant = new LiteralUnionScalar<
   [
     'standard',
     'inverse',
@@ -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