@financial-times/cp-content-pipeline-schema 1.2.4 → 1.3.1

package/lib/resolvers/topper.d.ts

@@ -6,6 +6,7 @@ declare const resolvers: {
         backgroundColour: (topper: import("../model/Topper").Topper) => "paper" | "wheat" | "white" | "black" | "claret" | "oxford" | "slate" | "crimson" | "sky" | "matisse";
         displayConcept: (topper: import("../model/Topper").Topper) => import("../model/Concept").Concept | null;
         followButtonVariant: (topper: import("../model/Topper").Topper) => "standard" | "inverse" | "opinion" | "alphaville" | "monochrome" | "inverse-monochrome";
+        genreConcept: (topper: import("../model/Topper").Topper) => import("../model/Concept").Concept | null;
     };
     TopperWithImages: {
         images: (topper: import("../model/Topper").Topper) => import("../model/Image").CAPIImage[];
@@ -20,10 +21,10 @@ declare const resolvers: {
         genreConcept: (topper: import("../model/Topper").Topper) => import("../model/Concept").Concept | null;
     };
     PodcastTopper: {
-        headshot: (topper: import("../model/Topper").Topper, args: Partial<import("../generated").PodcastTopperHeadshotArgs>) => string | null;
+        headshot: (topper: import("../model/Topper").Topper, args: Partial<import("../generated").PodcastTopperHeadshotArgs>) => Promise<string | null>;
     };
     OpinionTopper: {
-        headshot(topper: import("../model/Topper").Topper, args: Partial<import("../generated").OpinionTopperHeadshotArgs>): Promise<string | null>;
+        headshot: (topper: import("../model/Topper").Topper, args: Partial<import("../generated").OpinionTopperHeadshotArgs>) => Promise<string | null>;
         columnist: (topper: import("../model/Topper").Topper) => import("../model/Concept").Concept | null;
     };
     TopperWithPackage: {

package/lib/resolvers/topper.js

@@ -8,6 +8,7 @@ const resolvers = {
         backgroundColour: (topper) => topper.backgroundColour(),
         displayConcept: (topper) => topper.displayConcept(),
         followButtonVariant: (topper) => topper.followButtonVariant(),
+        genreConcept: (topper) => topper.genreConcept(),
     },
     TopperWithImages: {
         images: (topper) => topper.images(),
@@ -25,9 +26,7 @@ const resolvers = {
         headshot: (topper, args) => topper.headshot(args),
     },
     OpinionTopper: {
-        async headshot(topper, args) {
-            return topper.columnist()?.headshot(args) || null;
-        },
+        headshot: (topper, args) => topper.headshot(args),
         columnist: (topper) => topper.columnist(),
     },
     TopperWithPackage: {

package/lib/resolvers/topper.js.map

@@ -1 +1 @@
-{"version":3,"file":"topper.js","sourceRoot":"","sources":["../../src/resolvers/topper.ts"],"names":[],"mappings":";;AAUA,MAAM,SAAS,GAAG;IAChB,MAAM,EAAE;QACN,aAAa,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE;QACxC,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE;QACvC,KAAK,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE;QACjC,gBAAgB,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,gBAAgB,EAAE;QACvD,cAAc,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,cAAc,EAAE;QACnD,mBAAmB,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,mBAAmB,EAAE;KAC9D;IAED,gBAAgB,EAAE;QAChB,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE;QACnC,aAAa,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,aAAa,EAAE;KAClD;IAED,eAAe,EAAE;QACf,eAAe,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,eAAe,EAAE;QACrD,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE;KACpC;IAED,eAAe,EAAE;QACf,YAAY,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,EAAE;QAC/C,YAAY,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,EAAE;KAChD;IAED,aAAa,EAAE;QACb,QAAQ,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;KAClD;IAED,aAAa,EAAE;QACb,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,IAAI;YACzB,OAAO,MAAM,CAAC,SAAS,EAAE,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,CAAA;QACnD,CAAC;QACD,SAAS,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE;KAC1C;IAED,iBAAiB,EAAE;QACjB,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,KAAK;KAC1C;CASF,CAAA;AAED,kBAAe,SAAS,CAAA"}
+{"version":3,"file":"topper.js","sourceRoot":"","sources":["../../src/resolvers/topper.ts"],"names":[],"mappings":";;AAUA,MAAM,SAAS,GAAG;IAChB,MAAM,EAAE;QACN,aAAa,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE;QACxC,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE;QACvC,KAAK,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE;QACjC,gBAAgB,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,gBAAgB,EAAE;QACvD,cAAc,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,cAAc,EAAE;QACnD,mBAAmB,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,mBAAmB,EAAE;QAC7D,YAAY,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,EAAE;KAChD;IAED,gBAAgB,EAAE;QAChB,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE;QACnC,aAAa,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,aAAa,EAAE;KAClD;IAED,eAAe,EAAE;QACf,eAAe,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,eAAe,EAAE;QACrD,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE;KACpC;IAED,eAAe,EAAE;QACf,YAAY,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,EAAE;QAC/C,YAAY,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,EAAE;KAChD;IAED,aAAa,EAAE;QACb,QAAQ,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;KAClD;IAED,aAAa,EAAE;QACb,QAAQ,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;QACjD,SAAS,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE;KAC1C;IAED,iBAAiB,EAAE;QACjB,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,KAAK;KAC1C;CASF,CAAA;AAED,kBAAe,SAAS,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@financial-times/cp-content-pipeline-schema",
-  "version": "1.2.4",
+  "version": "1.3.1",
   "description": "",
   "main": "lib/index.js",
   "scripts": {

package/src/generated/index.ts

@@ -120,6 +120,7 @@ export type BasicTopper = Topper & {
   readonly backgroundColour?: Maybe<Scalars['TopperBackgroundColour']['output']>;
   readonly displayConcept?: Maybe<Concept>;
   readonly followButtonVariant?: Maybe<Scalars['FollowButtonVariant']['output']>;
+  readonly genreConcept?: Maybe<Concept>;
   readonly headline: Scalars['String']['output'];
   readonly intro?: Maybe<RichText>;
   readonly textShadow?: Maybe<Scalars['Boolean']['output']>;
@@ -561,6 +562,7 @@ export type LiveBlogPost = Content & {
   readonly byline?: Maybe<StructuredContent>;
   readonly canBeSyndicated?: Maybe<Scalars['CanBeSyndicated']['output']>;
   readonly commentsEnabled?: Maybe<Scalars['Boolean']['output']>;
+  readonly containedIn?: Maybe<Content>;
   readonly design?: Maybe<Design>;
   readonly firstPublishedDate: Scalars['String']['output'];
   readonly id: Scalars['String']['output'];
@@ -612,6 +614,7 @@ export type OpinionTopper = Topper & TopperWithHeadshot & TopperWithTheme & {
   readonly columnist?: Maybe<Concept>;
   readonly displayConcept?: Maybe<Concept>;
   readonly followButtonVariant?: Maybe<Scalars['FollowButtonVariant']['output']>;
+  readonly genreConcept?: Maybe<Concept>;
   readonly headline: Scalars['String']['output'];
   readonly headshot?: Maybe<Scalars['String']['output']>;
   readonly intro?: Maybe<RichText>;
@@ -819,6 +822,7 @@ export type Topper = {
   readonly backgroundColour?: Maybe<Scalars['TopperBackgroundColour']['output']>;
   readonly displayConcept?: Maybe<Concept>;
   readonly followButtonVariant?: Maybe<Scalars['FollowButtonVariant']['output']>;
+  readonly genreConcept?: Maybe<Concept>;
   readonly headline: Scalars['String']['output'];
   readonly intro?: Maybe<RichText>;
   readonly textShadow?: Maybe<Scalars['Boolean']['output']>;
@@ -973,7 +977,7 @@ export type ResolversInterfaceTypes<RefType extends Record<string, unknown>> = R
   Image: ( ImageDesktop ) | ( ImageLandscape ) | ( ImageMobile ) | ( ImagePortrait ) | ( ImageSquare ) | ( ImageSquareFtEdit ) | ( ImageStandard ) | ( ImageStandardInline ) | ( ImageWide );
   Picture: ( Omit<PictureFullBleed, 'fallbackImage' | 'images'> & { fallbackImage: RefType['Image'], images: ReadonlyArray<RefType['Image']> } ) | ( Omit<PictureInline, 'fallbackImage' | 'images'> & { fallbackImage: RefType['Image'], images: ReadonlyArray<RefType['Image']> } ) | ( Omit<PictureStandard, 'fallbackImage' | 'images'> & { fallbackImage: RefType['Image'], images: ReadonlyArray<RefType['Image']> } );
   Reference: ( ReferenceWithCAPIData<ContentTree.Flourish> ) | ( ReferenceWithCAPIData<ContentTree.ImageSet> ) | ( ReferenceWithCAPIData<ContentTree.LayoutImage> ) | ( ReferenceWithCAPIData<ContentTree.ImageSet> ) | ( ReferenceWithCAPIData<RawImageNode> ) | ( ReferenceWithCAPIData<ContentTree.Recommended> ) | ( ReferenceWithCAPIData<ContentTree.ScrollyImage> ) | ( ReferenceWithCAPIData<ContentTree.Tweet> ) | ( ReferenceWithCAPIData<VideoNode> );
-  Topper: ( Omit<BasicTopper, 'displayConcept' | 'intro'> & { displayConcept?: Maybe<RefType['Concept']>, intro?: Maybe<RefType['RichText']> } ) | ( Omit<BrandedTopper, 'brandConcept' | 'displayConcept' | 'genreConcept' | 'intro'> & { brandConcept?: Maybe<RefType['Concept']>, displayConcept?: Maybe<RefType['Concept']>, genreConcept?: Maybe<RefType['Concept']>, intro?: Maybe<RefType['RichText']> } ) | ( Omit<DeepLandscapeTopper, 'brandConcept' | 'displayConcept' | 'fallbackImage' | 'genreConcept' | 'images' | 'intro'> & { brandConcept?: Maybe<RefType['Concept']>, displayConcept?: Maybe<RefType['Concept']>, fallbackImage?: Maybe<RefType['Image']>, genreConcept?: Maybe<RefType['Concept']>, images: ReadonlyArray<RefType['Image']>, intro?: Maybe<RefType['RichText']> } ) | ( Omit<DeepPortraitTopper, 'brandConcept' | 'displayConcept' | 'fallbackImage' | 'genreConcept' | 'images' | 'intro'> & { brandConcept?: Maybe<RefType['Concept']>, displayConcept?: Maybe<RefType['Concept']>, fallbackImage?: Maybe<RefType['Image']>, genreConcept?: Maybe<RefType['Concept']>, images: ReadonlyArray<RefType['Image']>, intro?: Maybe<RefType['RichText']> } ) | ( Omit<FullBleedTopper, 'brandConcept' | 'displayConcept' | 'fallbackImage' | 'genreConcept' | 'images' | 'intro'> & { brandConcept?: Maybe<RefType['Concept']>, displayConcept?: Maybe<RefType['Concept']>, fallbackImage?: Maybe<RefType['Image']>, genreConcept?: Maybe<RefType['Concept']>, images: ReadonlyArray<RefType['Image']>, intro?: Maybe<RefType['RichText']> } ) | ( TopperModel ) | ( TopperModel ) | ( Omit<SplitTextTopper, 'brandConcept' | 'displayConcept' | 'fallbackImage' | 'genreConcept' | 'images' | 'intro'> & { brandConcept?: Maybe<RefType['Concept']>, displayConcept?: Maybe<RefType['Concept']>, fallbackImage?: Maybe<RefType['Image']>, genreConcept?: Maybe<RefType['Concept']>, images: ReadonlyArray<RefType['Image']>, intro?: Maybe<RefType['RichText']> } );
+  Topper: ( Omit<BasicTopper, 'displayConcept' | 'genreConcept' | 'intro'> & { displayConcept?: Maybe<RefType['Concept']>, genreConcept?: Maybe<RefType['Concept']>, intro?: Maybe<RefType['RichText']> } ) | ( Omit<BrandedTopper, 'brandConcept' | 'displayConcept' | 'genreConcept' | 'intro'> & { brandConcept?: Maybe<RefType['Concept']>, displayConcept?: Maybe<RefType['Concept']>, genreConcept?: Maybe<RefType['Concept']>, intro?: Maybe<RefType['RichText']> } ) | ( Omit<DeepLandscapeTopper, 'brandConcept' | 'displayConcept' | 'fallbackImage' | 'genreConcept' | 'images' | 'intro'> & { brandConcept?: Maybe<RefType['Concept']>, displayConcept?: Maybe<RefType['Concept']>, fallbackImage?: Maybe<RefType['Image']>, genreConcept?: Maybe<RefType['Concept']>, images: ReadonlyArray<RefType['Image']>, intro?: Maybe<RefType['RichText']> } ) | ( Omit<DeepPortraitTopper, 'brandConcept' | 'displayConcept' | 'fallbackImage' | 'genreConcept' | 'images' | 'intro'> & { brandConcept?: Maybe<RefType['Concept']>, displayConcept?: Maybe<RefType['Concept']>, fallbackImage?: Maybe<RefType['Image']>, genreConcept?: Maybe<RefType['Concept']>, images: ReadonlyArray<RefType['Image']>, intro?: Maybe<RefType['RichText']> } ) | ( Omit<FullBleedTopper, 'brandConcept' | 'displayConcept' | 'fallbackImage' | 'genreConcept' | 'images' | 'intro'> & { brandConcept?: Maybe<RefType['Concept']>, displayConcept?: Maybe<RefType['Concept']>, fallbackImage?: Maybe<RefType['Image']>, genreConcept?: Maybe<RefType['Concept']>, images: ReadonlyArray<RefType['Image']>, intro?: Maybe<RefType['RichText']> } ) | ( TopperModel ) | ( TopperModel ) | ( Omit<SplitTextTopper, 'brandConcept' | 'displayConcept' | 'fallbackImage' | 'genreConcept' | 'images' | 'intro'> & { brandConcept?: Maybe<RefType['Concept']>, displayConcept?: Maybe<RefType['Concept']>, fallbackImage?: Maybe<RefType['Image']>, genreConcept?: Maybe<RefType['Concept']>, images: ReadonlyArray<RefType['Image']>, intro?: Maybe<RefType['RichText']> } );
   TopperWithBrand: ( Omit<BrandedTopper, 'brandConcept' | 'displayConcept' | 'genreConcept' | 'intro'> & { brandConcept?: Maybe<RefType['Concept']>, displayConcept?: Maybe<RefType['Concept']>, genreConcept?: Maybe<RefType['Concept']>, intro?: Maybe<RefType['RichText']> } ) | ( Omit<DeepLandscapeTopper, 'brandConcept' | 'displayConcept' | 'fallbackImage' | 'genreConcept' | 'images' | 'intro'> & { brandConcept?: Maybe<RefType['Concept']>, displayConcept?: Maybe<RefType['Concept']>, fallbackImage?: Maybe<RefType['Image']>, genreConcept?: Maybe<RefType['Concept']>, images: ReadonlyArray<RefType['Image']>, intro?: Maybe<RefType['RichText']> } ) | ( Omit<DeepPortraitTopper, 'brandConcept' | 'displayConcept' | 'fallbackImage' | 'genreConcept' | 'images' | 'intro'> & { brandConcept?: Maybe<RefType['Concept']>, displayConcept?: Maybe<RefType['Concept']>, fallbackImage?: Maybe<RefType['Image']>, genreConcept?: Maybe<RefType['Concept']>, images: ReadonlyArray<RefType['Image']>, intro?: Maybe<RefType['RichText']> } ) | ( Omit<FullBleedTopper, 'brandConcept' | 'displayConcept' | 'fallbackImage' | 'genreConcept' | 'images' | 'intro'> & { brandConcept?: Maybe<RefType['Concept']>, displayConcept?: Maybe<RefType['Concept']>, fallbackImage?: Maybe<RefType['Image']>, genreConcept?: Maybe<RefType['Concept']>, images: ReadonlyArray<RefType['Image']>, intro?: Maybe<RefType['RichText']> } ) | ( TopperModel ) | ( Omit<SplitTextTopper, 'brandConcept' | 'displayConcept' | 'fallbackImage' | 'genreConcept' | 'images' | 'intro'> & { brandConcept?: Maybe<RefType['Concept']>, displayConcept?: Maybe<RefType['Concept']>, fallbackImage?: Maybe<RefType['Image']>, genreConcept?: Maybe<RefType['Concept']>, images: ReadonlyArray<RefType['Image']>, intro?: Maybe<RefType['RichText']> } );
   TopperWithHeadshot: ( TopperModel ) | ( TopperModel );
   TopperWithImages: ( Omit<DeepLandscapeTopper, 'brandConcept' | 'displayConcept' | 'fallbackImage' | 'genreConcept' | 'images' | 'intro'> & { brandConcept?: Maybe<RefType['Concept']>, displayConcept?: Maybe<RefType['Concept']>, fallbackImage?: Maybe<RefType['Image']>, genreConcept?: Maybe<RefType['Concept']>, images: ReadonlyArray<RefType['Image']>, intro?: Maybe<RefType['RichText']> } ) | ( Omit<DeepPortraitTopper, 'brandConcept' | 'displayConcept' | 'fallbackImage' | 'genreConcept' | 'images' | 'intro'> & { brandConcept?: Maybe<RefType['Concept']>, displayConcept?: Maybe<RefType['Concept']>, fallbackImage?: Maybe<RefType['Image']>, genreConcept?: Maybe<RefType['Concept']>, images: ReadonlyArray<RefType['Image']>, intro?: Maybe<RefType['RichText']> } ) | ( Omit<FullBleedTopper, 'brandConcept' | 'displayConcept' | 'fallbackImage' | 'genreConcept' | 'images' | 'intro'> & { brandConcept?: Maybe<RefType['Concept']>, displayConcept?: Maybe<RefType['Concept']>, fallbackImage?: Maybe<RefType['Image']>, genreConcept?: Maybe<RefType['Concept']>, images: ReadonlyArray<RefType['Image']>, intro?: Maybe<RefType['RichText']> } ) | ( Omit<SplitTextTopper, 'brandConcept' | 'displayConcept' | 'fallbackImage' | 'genreConcept' | 'images' | 'intro'> & { brandConcept?: Maybe<RefType['Concept']>, displayConcept?: Maybe<RefType['Concept']>, fallbackImage?: Maybe<RefType['Image']>, genreConcept?: Maybe<RefType['Concept']>, images: ReadonlyArray<RefType['Image']>, intro?: Maybe<RefType['RichText']> } );
@@ -988,7 +992,7 @@ export type ResolversTypes = ResolversObject<{
   AltTitle: ResolverTypeWrapper<AltTitle>;
   Article: ResolverTypeWrapper<CapiResponse>;
   Audio: ResolverTypeWrapper<CapiResponse>;
-  BasicTopper: ResolverTypeWrapper<Omit<BasicTopper, 'displayConcept' | 'intro'> & { displayConcept?: Maybe<ResolversTypes['Concept']>, intro?: Maybe<ResolversTypes['RichText']> }>;
+  BasicTopper: ResolverTypeWrapper<Omit<BasicTopper, 'displayConcept' | 'genreConcept' | 'intro'> & { displayConcept?: Maybe<ResolversTypes['Concept']>, genreConcept?: Maybe<ResolversTypes['Concept']>, intro?: Maybe<ResolversTypes['RichText']> }>;
   Boolean: ResolverTypeWrapper<Scalars['Boolean']['output']>;
   BrandedTopper: ResolverTypeWrapper<Omit<BrandedTopper, 'brandConcept' | 'displayConcept' | 'genreConcept' | 'intro'> & { brandConcept?: Maybe<ResolversTypes['Concept']>, displayConcept?: Maybe<ResolversTypes['Concept']>, genreConcept?: Maybe<ResolversTypes['Concept']>, intro?: Maybe<ResolversTypes['RichText']> }>;
   CanBeSyndicated: ResolverTypeWrapper<Scalars['CanBeSyndicated']['output']>;
@@ -1066,7 +1070,7 @@ export type ResolversParentTypes = ResolversObject<{
   AltTitle: AltTitle;
   Article: CapiResponse;
   Audio: CapiResponse;
-  BasicTopper: Omit<BasicTopper, 'displayConcept' | 'intro'> & { displayConcept?: Maybe<ResolversParentTypes['Concept']>, intro?: Maybe<ResolversParentTypes['RichText']> };
+  BasicTopper: Omit<BasicTopper, 'displayConcept' | 'genreConcept' | 'intro'> & { displayConcept?: Maybe<ResolversParentTypes['Concept']>, genreConcept?: Maybe<ResolversParentTypes['Concept']>, intro?: Maybe<ResolversParentTypes['RichText']> };
   Boolean: Scalars['Boolean']['output'];
   BrandedTopper: Omit<BrandedTopper, 'brandConcept' | 'displayConcept' | 'genreConcept' | 'intro'> & { brandConcept?: Maybe<ResolversParentTypes['Concept']>, displayConcept?: Maybe<ResolversParentTypes['Concept']>, genreConcept?: Maybe<ResolversParentTypes['Concept']>, intro?: Maybe<ResolversParentTypes['RichText']> };
   CanBeSyndicated: Scalars['CanBeSyndicated']['output'];
@@ -1206,6 +1210,7 @@ export type BasicTopperResolvers<ContextType = QueryContext, ParentType extends
   backgroundColour?: Resolver<Maybe<ResolversTypes['TopperBackgroundColour']>, ParentType, ContextType>;
   displayConcept?: Resolver<Maybe<ResolversTypes['Concept']>, ParentType, ContextType>;
   followButtonVariant?: Resolver<Maybe<ResolversTypes['FollowButtonVariant']>, ParentType, ContextType>;
+  genreConcept?: Resolver<Maybe<ResolversTypes['Concept']>, ParentType, ContextType>;
   headline?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   intro?: Resolver<Maybe<ResolversTypes['RichText']>, ParentType, ContextType>;
   textShadow?: Resolver<Maybe<ResolversTypes['Boolean']>, ParentType, ContextType>;
@@ -1592,6 +1597,7 @@ export type LiveBlogPostResolvers<ContextType = QueryContext, ParentType extends
   byline?: Resolver<Maybe<ResolversTypes['StructuredContent']>, ParentType, ContextType, Partial<LiveBlogPostBylineArgs>>;
   canBeSyndicated?: Resolver<Maybe<ResolversTypes['CanBeSyndicated']>, ParentType, ContextType>;
   commentsEnabled?: Resolver<Maybe<ResolversTypes['Boolean']>, ParentType, ContextType>;
+  containedIn?: Resolver<Maybe<ResolversTypes['Content']>, ParentType, ContextType>;
   design?: Resolver<Maybe<ResolversTypes['Design']>, ParentType, ContextType>;
   firstPublishedDate?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   id?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
@@ -1630,6 +1636,7 @@ export type OpinionTopperResolvers<ContextType = QueryContext, ParentType extend
   columnist?: Resolver<Maybe<ResolversTypes['Concept']>, ParentType, ContextType>;
   displayConcept?: Resolver<Maybe<ResolversTypes['Concept']>, ParentType, ContextType>;
   followButtonVariant?: Resolver<Maybe<ResolversTypes['FollowButtonVariant']>, ParentType, ContextType>;
+  genreConcept?: Resolver<Maybe<ResolversTypes['Concept']>, ParentType, ContextType>;
   headline?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   headshot?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType, Partial<OpinionTopperHeadshotArgs>>;
   intro?: Resolver<Maybe<ResolversTypes['RichText']>, ParentType, ContextType>;
@@ -1824,6 +1831,7 @@ export type TopperResolvers<ContextType = QueryContext, ParentType extends Resol
   backgroundColour?: Resolver<Maybe<ResolversTypes['TopperBackgroundColour']>, ParentType, ContextType>;
   displayConcept?: Resolver<Maybe<ResolversTypes['Concept']>, ParentType, ContextType>;
   followButtonVariant?: Resolver<Maybe<ResolversTypes['FollowButtonVariant']>, ParentType, ContextType>;
+  genreConcept?: Resolver<Maybe<ResolversTypes['Concept']>, ParentType, ContextType>;
   headline?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   intro?: Resolver<Maybe<ResolversTypes['RichText']>, ParentType, ContextType>;
   textShadow?: Resolver<Maybe<ResolversTypes['Boolean']>, ParentType, ContextType>;

package/src/helpers/decorateHeadshotUrl.ts

@@ -0,0 +1,47 @@
+import { CapiPerson } from '../types/internal-content'
+
+export const UUID_REGEX =
+  /\b[0-9a-f]{8}-[0-9a-f]{4}-[1-9][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}\b/i
+
+const IMAGESET_REGEX = /fthead(?:-v\d)?\:[^?]+/
+
+export default function decorateHeadshotUrl(person: CapiPerson) {
+  const url = person?._imageUrl
+
+  if (!url) return null
+
+  if (isCloudfrontUrl(url)) {
+    return url
+  }
+
+  const ftcmsMatch = executeFtcmsMatch(url)
+
+  if (ftcmsMatch) {
+    return `ftcms:${ftcmsMatch.pop()}`
+  }
+
+  const ftheadSchemeMatch = executeFtheadMatch(url)
+
+  if (ftheadSchemeMatch) {
+    return ftheadSchemeMatch.pop()
+  }
+}
+
+function isCloudfrontUrl(url: string) {
+  const AWS_CLOUDFRONT_HOSTNAME = 'd1e00ek4ebabms.cloudfront.net'
+
+  try {
+    const urlHostname = new URL(url).hostname
+    return urlHostname && urlHostname === AWS_CLOUDFRONT_HOSTNAME
+  } catch {
+    return false
+  }
+}
+
+function executeFtcmsMatch(url: string) {
+  return UUID_REGEX.exec(url)
+}
+
+function executeFtheadMatch(url: string) {
+  return IMAGESET_REGEX.exec(url)
+}

package/src/model/Concept.test.ts

@@ -88,11 +88,9 @@ describe('Concept model', () => {
   })
 
   describe('headshot()', () => {
-    it('throws an error if the concept is not for an author', async () => {
+    it('returns null if the concept is not for an author', async () => {
       const model = new Concept(topic, context)
-      await expect(model.headshot()).rejects.toThrowError(
-        'Cannot request headshot for a non-Author concept'
-      )
+      expect(await model.headshot()).toEqual(null)
     })
 
     it('returns the headshot for an author', async () => {

package/src/model/Concept.ts

@@ -5,6 +5,7 @@ import imageServiceUrl from '../helpers/imageService'
 import isError from '../helpers/isError'
 import { logRecoverableError } from '@dotcom-reliability-kit/log-error'
 import conceptIds from '@financial-times/n-concept-ids'
+import decorateHeadshotUrl, { UUID_REGEX } from '../helpers/decorateHeadshotUrl'
 
 const CAPI_ID_PREFIX = /^https?:\/\/(?:www|api)\.ft\.com\/things?\//
 const BASE_URL = 'https://www.ft.com/stream/'
@@ -165,26 +166,30 @@ export class Concept {
   }
 
   async headshot(args?: HeadshotArguments) {
-    if (!this.isAuthor()) {
-      throw new Error('Cannot request headshot for a non-Author concept')
-    }
+    const uuid = this.apiUrl().match(UUID_REGEX)?.[0]
+
+    if (!this.isAuthor() || !uuid) return null
 
     try {
-      const peopleData = await this.context.dataSources.capi.getPerson(
-        this.uuid()
-      )
-
-      if (!peopleData || !peopleData._imageUrl) return null
-
-      return imageServiceUrl({
-        url: peopleData._imageUrl,
-        systemCode: this.#systemCode,
-        width: args?.width || 150,
-        dpr: args?.dpr ?? undefined,
-      })
-    } catch (err) {
+      const person = await this.context.dataSources.capi.getPerson(uuid)
+      const url = decorateHeadshotUrl(person)
+
+      return url
+        ? imageServiceUrl({
+            url,
+            systemCode: this.#systemCode,
+            width: args?.width || 150,
+            dpr: args?.dpr ?? undefined,
+          })
+        : null
+    } catch (error) {
+      if (isError(error)) {
+        logRecoverableError({
+          logger: this.context.logger,
+          error,
+        })
+      }
       return null
-      //TODO: log operational error here
     }
   }
 }

package/src/model/Picture.ts

@@ -30,6 +30,9 @@ export class Picture {
     const images = this.images()
     const standard =
       images.find((image) => image.format() === 'standard-inline') ?? images[0]
+
+    // this assert will never fail, as a Picture model won't be constructed if
+    // the imageset is empty. it's here for Typescript's benefit
     assertDefined(
       standard,
       'Picture must contain at least one image to display'

package/src/model/Topper.ts

@@ -132,10 +132,6 @@ export class Topper {
   }
 
   backgroundColour(): TopperBackgroundColourValues {
-    if (this.capiResponse.isAlphaville()) {
-      return 'matisse'
-    }
-
     if (
       this.capiResponse.type() === 'ContentPackage' &&
       this.capiResponse.design()
@@ -158,6 +154,10 @@ export class Topper {
       return this.capiResponse.isContainedInPackage() ? 'wheat' : 'sky'
     }
 
+    if (this.capiResponse.isAlphaville()) {
+      return 'matisse'
+    }
+
     if (type === 'PodcastTopper') {
       return 'slate'
     }
@@ -254,11 +254,11 @@ export class Topper {
   }
 
   columnist() {
-    if (this.capiResponse.isColumn()) {
-      return this.capiResponse.getAuthors()[0] ?? null
-    }
+    const authors = this.capiResponse.getAuthors()
+    const isOpinionOrColumn =
+      this.type() === 'OpinionTopper' || this.capiResponse.isColumn()
 
-    return null
+    return isOpinionOrColumn && authors.length ? authors[0] : null
   }
 
   brandConcept() {
@@ -279,14 +279,28 @@ export class Topper {
     return this.capiResponse.design()
   }
 
-  headshot(args: HeadshotArguments) {
-    const headshot = this.capiResponse.mainImage()
-    if (!headshot) {
+  async headshot(args: HeadshotArguments) {
+    let headshotUrl: string | undefined
+
+    if (this.capiResponse.isPodcast()) {
+      headshotUrl = this.capiResponse.mainImage()?.url()
+    }
+
+    if (this.capiResponse.isOpinion()) {
+      const authors = this.capiResponse.getAuthors()
+      const headshotUrls: (string | null)[] = await Promise.all(
+        authors.map(async (author) => await author.headshot(args))
+      ).then((res) => res.filter(Boolean))
+
+      headshotUrl = headshotUrls[0] ?? undefined
+    }
+
+    if (!headshotUrl) {
       return null
     }
 
     return imageServiceUrl({
-      url: headshot.url(),
+      url: headshotUrl,
       systemCode: this.#systemCode,
       width: args.width ?? undefined,
       dpr: args.dpr ?? undefined,

package/src/model/schemas/capi/base-schema.ts

@@ -7,6 +7,7 @@ const Concept = z.object({
   prefLabel: z.string(),
   type: z.string().optional(),
   types: z.string().array(),
+  headshot: z.string().optional(),
 })
 
 export const Annotation = Concept.extend({

package/src/resolvers/content-tree/Workarounds.ts

@@ -59,6 +59,11 @@ export interface Video extends ContentTree.Node {
   embedded: boolean
 }
 
+export interface YoutubeVideo extends ContentTree.Node {
+  type: 'youtube-video'
+  url: string
+}
+
 export interface Clip extends ContentTree.Node {
   type: 'clip'
   url: string
@@ -158,6 +163,7 @@ export type AnyNode =
   | TableRow
   | TableCell
   | Video
+  | YoutubeVideo
   | Clip
   | MainImage
   | RawImage

package/src/resolvers/content-tree/references/ImageSet.ts

@@ -14,7 +14,7 @@ export const ImageSet = {
           uuidFromUrl(embed.id) === uuidFromUrl(parent.reference.id)
       )
 
-    return imageSet && imageSet.members
+    return imageSet && imageSet.members && imageSet.members.length > 0
       ? new Picture(imageSet, isLiveBlog, context)
       : null
   },

package/src/resolvers/content-tree/tagMappings.ts

@@ -179,6 +179,18 @@ const commonTagMappings: TagMappings = {
     id: $el.attr('url') || '',
     embedded: $el.attr('data-embedded') === 'true' || true,
   }),
+  'a[data-asset-type="video"]': ($el) => {
+    const url = $el.attr('href')
+
+    if (url) {
+      return {
+        type: 'youtube-video',
+        url,
+      }
+    }
+
+    return []
+  },
   'ft-content[type="http://www.ft.com/ontology/content/clip"]': ($el) => ({
     type: 'clip',
     url: $el.attr('href') || '',
@@ -207,6 +219,12 @@ const commonTagMappings: TagMappings = {
       timestamp: $el.attr('data-time-stamp') || '',
     }
   },
+  'ft-related': ($el) => {
+    return {
+      id: $el.attr('url') ?? '',
+      type: 'recommended',
+    }
+  },
   recommended: ($el) => {
     const $firstLink = $el.find('ft-content').first()
     const $heading = $el.find('recommended-title').first()

package/src/resolvers/content.ts

@@ -67,6 +67,10 @@ const resolvers = {
     containedIn: (parent) => parent.containedIn(),
   },
 
+  LiveBlogPost: {
+    containedIn: (parent) => parent.containedIn(),
+  },
+
   LiveBlogPackage: {
     liveBlogPosts: (parent) => parent.liveBlogPosts(),
     pinnedPost: (parent) => parent.pinnedPost(),
@@ -87,6 +91,7 @@ const resolvers = {
 } satisfies {
   Article: ArticleResolvers
   Placeholder: PlaceholderResolvers
+  LiveBlogPost: ArticleResolvers
   Content: ContentResolvers
   LiveBlogPackage: LiveBlogPackageResolvers
   ContentPackage: ContentPackageResolvers

package/src/resolvers/topper.ts

@@ -16,6 +16,7 @@ const resolvers = {
     backgroundColour: (topper) => topper.backgroundColour(),
     displayConcept: (topper) => topper.displayConcept(),
     followButtonVariant: (topper) => topper.followButtonVariant(),
+    genreConcept: (topper) => topper.genreConcept(),
   },
 
   TopperWithImages: {
@@ -38,9 +39,7 @@ const resolvers = {
   },
 
   OpinionTopper: {
-    async headshot(topper, args) {
-      return topper.columnist()?.headshot(args) || null
-    },
+    headshot: (topper, args) => topper.headshot(args),
     columnist: (topper) => topper.columnist(),
   },